Merge pull request #5253 from UdjinM6/bp_18.2.2

[v18.2.x] backport: backports and version bump to 18.2.2
dashpay · Mar 20, 2023 · 1f3f0e0 · 1f3f0e0
2 parents cc4239d + 125a2bb
commit 1f3f0e0
Show file tree

Hide file tree

Showing 28 changed files with 470 additions and 186 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 18)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2023)

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,17 +1,15 @@
-Dash Core version v18.2.1
+Dash Core version v18.2.2
 =========================
 
 Release is now available from:
 
   <https://www.dash.org/downloads/#wallets>
 
-This is a new hotfix version release, bringing various bugfixes.
+This is a new hotfix version release.
 
-Please note that v18.2.0 was revoked due to a bug; this version fixes that bug.
-
-This release is optional for all nodes; however, v18.2.1 is required to be
-able to use both mainnet and testnet. Currently, v18.2.0 is not working on mainnet,
-and v18.1.1 is not working on testnet; v18.2.1 will work on both networks.
+This release is optional for all nodes; however, v18.2.2 or higher is required
+to be able to use testnet right until v19 hard fork activation. Earlier
+versions will not be able to sync past block 847000 on testnet.
 
 Please report bugs using the issue tracker at GitHub:
 
@@ -41,45 +39,29 @@ downgrade to an older version is only possible with a reindex
 Downgrade warning
 -----------------
 
-### Downgrade to a version < v18.2.1
+### Downgrade to a version < v18.2.2
 
-Downgrading to a version older than v18.2.1 is supported.
+Downgrading to a version older than v18.2.2 is supported.
 
 ### Downgrade to a version < v18.0.1
 
 Downgrading to a version older than v18.0.1 is not supported due to changes in
 the indexes database folder. If you need to use an older version, you must
 either reindex or re-sync the whole chain.
 
-### Downgrade of masternodes to < 18.2.1
-
-It is highly recommended not to downgrade masternodes below 18.2.1, as 18.2.1 (and 18.1.1)
-fix important bugs which may result in your masternode being PoSe banned.
-
-### Downgrade of masternodes to < v18.0.1
-
-Starting with the 0.16 release, masternodes verify the protocol version of other
-masternodes. This results in PoSe punishment/banning for outdated masternodes,
-so downgrading even prior to the activation of the introduced hard-fork changes
-is not recommended.
-
-Versioning
-----------
-
-Dash Core imperfectly follows semantic versioning. Breaking changes should be
-expected in a major release. The number and severity of breaking changes in minor
-releases are minimized, however we do not guarantee there are no breaking changes.
-Bitcoin backports often introduce breaking changes, and are a likely source of
-breaking changes in minor releases. Patch releases should never contain breaking changes.
-
 Notable changes
 ===============
-See #5145 and #5142; these 2 PR fix important bugs in previous versions. Specifically,
-#5145 fixes an issue where qfcommit messages can be replayed from the past, then are
-validated and propagated to other nodes. This patch prevents old qfcommits
-from being relayed. #5142 is a fix which enables this version to function both on testnet
-and mainnet.
 
+Testnet Breaking Changes
+------------------------
+
+A new testnet only LLMQ has been added. This LLMQ is of the type LLMQ_25_67; this LLMQ is only active on testnet.
+This LLMQ will not remove the LLMQ_100_67 from testnet; however that quorum (likely) will not form and will perform no role.
+See the [diff](https://github.com/dashpay/dash/pull/5225/files#diff-e70a38a3e8c2a63ca0494627301a5c7042141ad301193f78338d97cb1b300ff9R451-R469) for specific parameters of the LLMQ.
+
+This LLMQ will become active at the height of 847000. **This will be a breaking change and a hard fork for testnet**
+This LLMQ is not activated with the v19 hardfork; as such testnet will experience two hardforks. One at height 847000,
+and the other to be determined by the BIP9 hard fork process.
 
 Remote Procedure Call (RPC) Changes
 -----------------------------------
@@ -109,20 +91,21 @@ Backports from Bitcoin Core
 ---------------------------
 None
 
-v18.2.1 Change log
+Other changes
+-------------
+#5247 is backported to improve debugging experience.
+
+v18.2.2 Change log
 ==================
 
-See detailed [set of changes](https://github.com/dashpay/dash/compare/v18.2.0...dashpay:v18.2.1).
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v18.2.1...dashpay:v18.2.2).
 
 Credits
 =======
 
 Thanks to everyone who directly contributed to this release:
 
-- Kittywhiskers Van Gogh
-- Konstantin Akimov
 - Odysseas Gabrielides
-- PastaPastaPasta
 - UdjinM6
 
 As well as everyone that submitted issues, reviewed pull requests, helped debug the release candidates, and write DIPs that were implemented in this release.
@@ -150,6 +133,7 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
 
 These release are considered obsolete. Old release notes can be found here:
 
+- [v18.2.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.2.2.md) released Jan/17/2023
 - [v18.2.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.2.0.md) released Jan/01/2023
 - [v18.1.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.1.1.md) released January/08/2023
 - [v18.1.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.1.0.md) released October/09/2022

diff --git a/doc/release-notes/dash/release-notes-18.2.1.md b/doc/release-notes/dash/release-notes-18.2.1.md
@@ -0,0 +1,187 @@
+Dash Core version v18.2.1
+=========================
+
+Release is now available from:
+
+  <https://www.dash.org/downloads/#wallets>
+
+This is a new hotfix version release, bringing various bugfixes.
+
+Please note that v18.2.0 was revoked due to a bug; this version fixes that bug.
+
+This release is optional for all nodes; however, v18.2.1 is required to be
+able to use both mainnet and testnet. Currently, v18.2.0 is not working on mainnet,
+and v18.1.1 is not working on testnet; v18.2.1 will work on both networks.
+
+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 for older versions), then run the
+installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or
+dashd/dash-qt (on Linux). If you upgrade after DIP0003 activation and you were
+using version < 0.13 you will have to reindex (start with -reindex-chainstate
+or -reindex) to make sure your wallet has all the new data synced. Upgrading
+from version 0.13 should not require any additional actions.
+
+When upgrading from a version prior to 18.0.1, the
+first startup of Dash Core will run a migration process which can take anywhere
+from a few minutes to thirty minutes to finish. After the migration, a
+downgrade to an older version is only possible with a reindex
+(or reindex-chainstate).
+
+Downgrade warning
+-----------------
+
+### Downgrade to a version < v18.2.1
+
+Downgrading to a version older than v18.2.1 is supported.
+
+### Downgrade to a version < v18.0.1
+
+Downgrading to a version older than v18.0.1 is not supported due to changes in
+the indexes database folder. If you need to use an older version, you must
+either reindex or re-sync the whole chain.
+
+### Downgrade of masternodes to < 18.2.1
+
+It is highly recommended not to downgrade masternodes below 18.2.1, as 18.2.1 (and 18.1.1)
+fix important bugs which may result in your masternode being PoSe banned.
+
+### Downgrade of masternodes to < v18.0.1
+
+Starting with the 0.16 release, masternodes verify the protocol version of other
+masternodes. This results in PoSe punishment/banning for outdated masternodes,
+so downgrading even prior to the activation of the introduced hard-fork changes
+is not recommended.
+
+Versioning
+----------
+
+Dash Core imperfectly follows semantic versioning. Breaking changes should be
+expected in a major release. The number and severity of breaking changes in minor
+releases are minimized, however we do not guarantee there are no breaking changes.
+Bitcoin backports often introduce breaking changes, and are a likely source of
+breaking changes in minor releases. Patch releases should never contain breaking changes.
+
+Notable changes
+===============
+See #5145 and #5142; these 2 PR fix important bugs in previous versions. Specifically,
+#5145 fixes an issue where qfcommit messages can be replayed from the past, then are
+validated and propagated to other nodes. This patch prevents old qfcommits
+from being relayed. #5142 is a fix which enables this version to function both on testnet
+and mainnet.
+
+
+Remote Procedure Call (RPC) Changes
+-----------------------------------
+
+### The new RPCs are:
+None
+
+### The removed RPCs are:
+None
+
+### Changes in existing RPCs introduced through bitcoin backports:
+None
+
+### Dash-specific changes in existing RPCs:
+None
+
+Please check `help <command>` for more detailed information on specific RPCs.
+
+Command-line options
+--------------------
+None
+
+Please check `Help -> Command-line options` in Qt wallet or `dashd --help` for
+more information.
+
+Backports from Bitcoin Core
+---------------------------
+None
+
+v18.2.1 Change log
+==================
+
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v18.2.0...dashpay:v18.2.1).
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- Kittywhiskers Van Gogh
+- Konstantin Akimov
+- Odysseas Gabrielides
+- PastaPastaPasta
+- UdjinM6
+
+As well as everyone that submitted issues, reviewed pull requests, helped debug the release candidates, and write DIPs that were implemented in this release.
+
+Older releases
+==============
+
+Dash was previously known as Darkcoin.
+
+Darkcoin tree 0.8.x was a fork of Litecoin tree 0.8, original name was XCoin
+which was first released on Jan/18/2014.
+
+Darkcoin tree 0.9.x was the open source implementation of masternodes based on
+the 0.8.x tree and was first released on Mar/13/2014.
+
+Darkcoin tree 0.10.x used to be the closed source implementation of Darksend
+which was released open source on Sep/25/2014.
+
+Dash Core tree 0.11.x was a fork of Bitcoin Core tree 0.9,
+Darkcoin was rebranded to Dash.
+
+Dash Core tree 0.12.0.x was a fork of Bitcoin Core tree 0.10.
+
+Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
+
+These release are considered obsolete. Old release notes can be found here:
+
+- [v18.2.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.2.0.md) released Jan/01/2023
+- [v18.1.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.1.1.md) released January/08/2023
+- [v18.1.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.1.0.md) released October/09/2022
+- [v18.0.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.0.2.md) released October/09/2022
+- [v18.0.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.0.1.md) released August/17/2022
+- [v0.17.0.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.17.0.3.md) released June/07/2021
+- [v0.17.0.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.17.0.2.md) released May/19/2021
+- [v0.16.1.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.16.1.1.md) released November/17/2020
+- [v0.16.1.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.16.1.0.md) released November/14/2020
+- [v0.16.0.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.16.0.1.md) released September/30/2020
+- [v0.15.0.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.15.0.0.md) released Febrary/18/2020
+- [v0.14.0.5](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.5.md) released December/08/2019
+- [v0.14.0.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.4.md) released November/22/2019
+- [v0.14.0.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.3.md) released August/15/2019
+- [v0.14.0.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.2.md) released July/4/2019
+- [v0.14.0.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.1.md) released May/31/2019
+- [v0.14.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.md) released May/22/2019
+- [v0.13.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.3.md) released Apr/04/2019
+- [v0.13.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.2.md) released Mar/15/2019
+- [v0.13.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.1.md) released Feb/9/2019
+- [v0.13.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.13.0.md) released Jan/14/2019
+- [v0.12.3.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.4.md) released Dec/14/2018
+- [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
+- [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
+- [v0.12.3.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.1.md) released Jul/03/2018
+- [v0.12.2.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.3.md) released Jan/12/2018
+- [v0.12.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.2.md) released Dec/17/2017
+- [v0.12.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.md) released Nov/08/2017
+- [v0.12.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.1.md) released Feb/06/2017
+- [v0.12.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.0.md) released Aug/15/2015
+- [v0.11.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.2.md) released Mar/04/2015
+- [v0.11.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015
+- [v0.11.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015
+- [v0.10.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.10.0.md) released Sep/25/2014
+- [v0.9.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.9.0.md) released Mar/13/2014
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -110,7 +110,7 @@ static CBlock FindDevNetGenesisBlock(const CBlock &prevBlock, const CAmount& rew
 
 void CChainParams::AddLLMQ(Consensus::LLMQType llmqType)
 {
-    assert(!HasLLMQ(llmqType));
+    assert(!GetLLMQ(llmqType).has_value());
     for (const auto& llmq_param : Consensus::available_llmqs) {
         if (llmq_param.type == llmqType) {
             consensus.llmqs.push_back(llmq_param);
@@ -121,25 +121,14 @@ void CChainParams::AddLLMQ(Consensus::LLMQType llmqType)
     assert(false);
 }
 
-const Consensus::LLMQParams& CChainParams::GetLLMQ(Consensus::LLMQType llmqType) const
+std::optional<Consensus::LLMQParams> CChainParams::GetLLMQ(Consensus::LLMQType llmqType) const
 {
     for (const auto& llmq_param : consensus.llmqs) {
         if (llmq_param.type == llmqType) {
-            return llmq_param;
+            return std::make_optional(llmq_param);
         }
     }
-    error("CChainParams::%s: unknown LLMQ type %d", __func__, static_cast<uint8_t>(llmqType));
-    assert(false);
-}
-
-bool CChainParams::HasLLMQ(Consensus::LLMQType llmqType) const
-{
-    for (const auto& llmq_param : consensus.llmqs) {
-        if (llmq_param.type == llmqType) {
-            return true;
-        }
-    }
-    return false;
+    return std::nullopt;
 }
 
 /**
@@ -523,10 +512,11 @@ class CTestNetParams : public CChainParams {
         AddLLMQ(Consensus::LLMQType::LLMQ_400_60);
         AddLLMQ(Consensus::LLMQType::LLMQ_400_85);
         AddLLMQ(Consensus::LLMQType::LLMQ_100_67);
+        AddLLMQ(Consensus::LLMQType::LLMQ_25_67);
         consensus.llmqTypeChainLocks = Consensus::LLMQType::LLMQ_50_60;
         consensus.llmqTypeInstantSend = Consensus::LLMQType::LLMQ_50_60;
         consensus.llmqTypeDIP0024InstantSend = Consensus::LLMQType::LLMQ_60_75;
-        consensus.llmqTypePlatform = Consensus::LLMQType::LLMQ_100_67;
+        consensus.llmqTypePlatform = Consensus::LLMQType::LLMQ_25_67;
         consensus.llmqTypeMnhf = Consensus::LLMQType::LLMQ_50_60;
 
         fDefaultConsistencyChecks = false;
@@ -1230,7 +1220,10 @@ void CDevNetParams::UpdateDevnetLLMQChainLocksFromArgs(const ArgsManager& args)
 {
     if (!args.IsArgSet("-llmqchainlocks")) return;
 
-    std::string strLLMQType = gArgs.GetArg("-llmqchainlocks", std::string(GetLLMQ(consensus.llmqTypeChainLocks).name));
+    const auto& llmq_params_opt = GetLLMQ(consensus.llmqTypeChainLocks);
+    assert(llmq_params_opt.has_value());
+
+    std::string strLLMQType = gArgs.GetArg("-llmqchainlocks", std::string(llmq_params_opt->name));
 
     Consensus::LLMQType llmqType = Consensus::LLMQType::LLMQ_NONE;
     for (const auto& params : consensus.llmqs) {
@@ -1252,7 +1245,10 @@ void CDevNetParams::UpdateDevnetLLMQInstantSendFromArgs(const ArgsManager& args)
 {
     if (!args.IsArgSet("-llmqinstantsend")) return;
 
-    std::string strLLMQType = gArgs.GetArg("-llmqinstantsend", std::string(GetLLMQ(consensus.llmqTypeInstantSend).name));
+    const auto& llmq_params_opt = GetLLMQ(consensus.llmqTypeInstantSend);
+    assert(llmq_params_opt.has_value());
+
+    std::string strLLMQType = gArgs.GetArg("-llmqinstantsend", std::string(llmq_params_opt->name));
 
     Consensus::LLMQType llmqType = Consensus::LLMQType::LLMQ_NONE;
     for (const auto& params : consensus.llmqs) {
@@ -1274,7 +1270,10 @@ void CDevNetParams::UpdateDevnetLLMQInstantSendDIP0024FromArgs(const ArgsManager
 {
     if (!args.IsArgSet("-llmqinstantsenddip0024")) return;
 
-    std::string strLLMQType = gArgs.GetArg("-llmqinstantsenddip0024", std::string(GetLLMQ(consensus.llmqTypeDIP0024InstantSend).name));
+    const auto& llmq_params_opt = GetLLMQ(consensus.llmqTypeDIP0024InstantSend);
+    assert(llmq_params_opt.has_value());
+
+    std::string strLLMQType = gArgs.GetArg("-llmqinstantsenddip0024", std::string(llmq_params_opt->name));
 
     Consensus::LLMQType llmqType = Consensus::LLMQType::LLMQ_NONE;
     for (const auto& params : consensus.llmqs) {