Merge pull request #5385 from PastaPastaPasta/v19.x

backport: v19.1.0 backports

Author: PastaPastaPasta

.github/workflows/merge-check.yml

@@ -0,0 +1,29 @@
+name: Check Merge Fast-Forward Only
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  check_merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Git
+        run: |
+          git config user.name "GitHub Action"
+          git config user.email "[email protected]"
+
+      - name: Check merge --ff-only
+        run: |
+          git fetch origin master:master
+          git checkout master
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
+            git merge --ff-only ${{ github.event.pull_request.head.sha }}
+          else
+            git merge --ff-only ${{ github.sha }}
+          fi

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 19)
-define(_CLIENT_VERSION_MINOR, 0)
+define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

contrib/containers/ci/Dockerfile

@@ -43,8 +43,9 @@ RUN pip3 install \
     multiprocess
 
 # dash_hash
-RUN git clone --depth 1 --no-tags https://github.com/dashpay/dash_hash
-RUN cd dash_hash && python3 setup.py install
+ARG DASH_HASH_VERSION=1.4.0
+RUN git clone --depth 1 --no-tags --branch=${DASH_HASH_VERSION} https://github.com/dashpay/dash_hash
+RUN cd dash_hash && pip3 install -r requirements.txt .
 
 ARG USER_ID=1000
 ARG GROUP_ID=1000

contrib/macdeploy/detached-sig-create.sh

@@ -22,7 +22,7 @@ fi
 rm -rf ${TEMPDIR}
 mkdir -p ${TEMPDIR}
 
-${SIGNAPPLE} sign -f --detach "${TEMPDIR}/${OUTROOT}"  "$@" "${BUNDLE}"
+${SIGNAPPLE} sign --hardened-runtime -f --detach "${TEMPDIR}/${OUTROOT}"  "$@" "${BUNDLE}"
 
 tar -C "${TEMPDIR}" -czf "${OUT}" .
 rm -rf "${TEMPDIR}"

doc/release-notes.md

@@ -1,13 +1,13 @@
-# Dash Core version v19.0.0
+# Dash Core version v19.1.0
 
 Release is now available from:
 
   <https://www.dash.org/downloads/#wallets>
 
-This is a new major version release, bringing new features, various bugfixes
-and other improvements.
+This is a new minor version release, bringing various bugfixes and other improvements.
 
-This release is mandatory for all nodes.
+This release is mandatory for all nodes. This release delays v19 hard fork activation and
+will effectively hard fork the network. v19.0.0 nodes must upgrade to continue syncing properly.
 
 Please report bugs using the issue tracker at GitHub:
 
@@ -34,184 +34,23 @@ downgrade to an older version is only possible with a reindex
 
 ## Downgrade warning
 
+### Downgrade to a version < v19.1.0
+Downgrading below v19.1.0 is not supported as v19.0.0 will attempt to hard fork, however this hardfork is problematic
+and is being delayed with this version
+
 ### Downgrade to a version < v19.0.0
 Downgrading to a version older than v19.0.0 is not supported due to changes in the evodb database. If you need to use an older version, you must either reindex or re-sync the whole chain.
 
 # Notable changes
 
-## High-Performance Masternodes
-
-In preparation for the release of Dash Platform to mainnet, a new masternode type has been added. High-performance masternodes will be responsible for hosting Dash Platform services (once they are on mainnet) in addition to the existing responsibilities like ChainLocks and InstantSend.
-
-Activation of the DashCore v19.0 hard fork will enable registration of the new 4000 DASH collateral masternodes. Until Dash Platform is released to mainnet, high-performance masternodes will provide the same services as regular masternodes with one small exception. Regular masternodes will no longer participate in the Platform-specific LLMQ after the hard fork since they will not be responsible for hosting Dash Platform.
-
-Note: In DashCore v19.0 the relative rewards and voting power are equivalent between regular and high-performance masternodes. Masternodes effectively receive one payout and one governance vote per 1000 DASH collateral. So, there is no difference in reward amount for running four regular masternodes or one high-performance masternode. In v19.0, high-performance masternodes simply receive payments in four consecutive blocks when they are selected for payout. Some frequently asked questions may be found at https://www.dash.org/hpmn-faq/.
-
-## BLS Scheme Upgrade
-
-Once the v19 hard fork is activated, all remaining messages containing BLS public keys or signatures will serialise them using the new basic BLS scheme.
-The motivation behind this change is the need to be aligned with IETF standards.
-
-List of affected messages:
-`dsq`, `dstx`, `mnauth`, `govobj`, `govobjvote`, `qrinfo`, `qsigshare`, `qsigrec`, `isdlock`, `clsig`, and all DKG messages (`qfcommit`, `qcontrib`, `qcomplaint`, `qjustify`, `qpcommit`).
-
-### `qfcommit`
-
-Once the v19 hard fork is activated, `quorumPublicKey` will be serialised using the basic BLS scheme.
-To support syncing of older blocks containing the transactions using the legacy BLS scheme, the `version` field indicates which scheme to use for serialisation of `quorumPublicKey`.
-
-| Version | Version Description                                    | Includes `quorumIndex` field |
-|---------|--------------------------------------------------------|------------------------------|
-| 1       | Non-rotated qfcommit serialised using legacy BLS scheme | No                           |
-| 2       | Rotated qfcommit serialised using legacy BLS scheme     | Yes                          |
-| 3       | Non-rotated qfcommit serialised using basic BLS scheme  | No                           |
-| 4       | Rotated qfcommit serialised using basic BLS scheme      | Yes                          |
-
-### `MNLISTDIFF` P2P message
-
-Starting with protocol version 70225, the following field is added to the `MNLISTDIFF` message between `cbTx` and `deletedQuorumsCount`.
-
-| Field               | Type | Size | Description                       |
-|---------------------| ---- | ---- |-----------------------------------|
-| version             | uint16_t | 2 | Version of the `MNLISTDIFF` reply |
-
-The `version` field indicates which BLS scheme is used to serialise the `pubKeyOperator` field for all SML entries of `mnList`.
-
-| Version | Version Description                                       |
-|---------|-----------------------------------------------------------|
-| 1       | Serialisation of `pubKeyOperator` using legacy BLS scheme |
-| 2       | Serialisation of `pubKeyOperator` using basic BLS scheme  |
-
-### `ProTx` txs family
-
-`proregtx` and `proupregtx` will support a new `version` value:
-
-| Version | Version Description                                       |
-|---------|-----------------------------------------------------------|
-| 1       | Serialisation of `pubKeyOperator` using legacy BLS scheme |
-| 2       | Serialisation of `pubKeyOperator` using basic BLS scheme  |
-
-`proupservtx` and `prouprevtx` will support a new `version` value:
-
-| Version | Version Description                            |
-|---------|------------------------------------------------|
-| 1       | Serialisation of `sig` using legacy BLS scheme |
-| 2       | Serialisation of `sig` using basic BLS scheme  |
-
-### `MNHFTx`
-
-`MNHFTx` will support a new `version` value:
-
-| Version | Version Description                            |
-|---------|------------------------------------------------|
-| 1       | Serialisation of `sig` using legacy BLS scheme |
-| 2       | Serialisation of `sig` using basic BLS scheme  |
-
-## Wallet
-
-## Automatic wallet creation removed
-
-Dash Core will no longer automatically create new wallets on startup. It will
-load existing wallets specified by -wallet options on the command line or in
-dash.conf or settings.json files. And by default it will also load a
-top-level unnamed ("") wallet. However, if specified wallets don't exist,
-Dash Core will now just log warnings instead of creating new wallets with
-new keys and addresses like previous releases did.
-
-New wallets can be created through the GUI (which has a more prominent create
-wallet option), through the dash-wallet create command or the createwallet RPC.
-
-## P2P and Network Changes
-
-## Removal of reject network messages from Dash Core (BIP61)
-
-The command line option to enable BIP61 (-enablebip61) has been removed.
-
-Nodes on the network can not generally be trusted to send valid ("reject")
-messages, so this should only ever be used when connected to a trusted node.
-Please use the recommended alternatives if you rely on this deprecated feature:
-
-- Testing or debugging of implementations of the Dash P2P network protocol
-should be done by inspecting the log messages that are produced by a recent
-version of Dash Core. Dash Core logs debug messages
-(-debug=<category>) to a stream (-printtoconsole) or to a file
-(-debuglogfile=<debug.log>).
-
-- Testing the validity of a block can be achieved by specific RPCs:
-    - submitblock
-    - getblocktemplate with 'mode' set to 'proposal' for blocks with
-    - potentially invalid POW
-    - Testing the validity of a transaction can be achieved by specific RPCs:
-      - sendrawtransaction
-      - testmempoolaccept
-
-## CoinJoin update
-
-A minor update in several CoinJoin-related network messages improves support
-for mixing from SPV clients. These changes make it easier for SPV clients to
-participate in the CoinJoin process by using masternode information they can
-readily obtain and verify via [DIP-0004](https://github.com/dashpay/dips/blob/master/dip-0004.md).
-
-## Remote Procedure Call (RPC) Changes
-
-### The new RPCs are:
-- In order to support BLS public keys encoded in the legacy BLS scheme, `protx register_legacy`, `protx register_fund_legacy`, and `protx register_prepare_legacy` were added.
-- `cleardiscouraged` clears all the already discouraged peers.
-- The following RPCs were added: `protx register_hpmn`, `protx register_fund_hpmn`, `protx register_prepare_hpmn` and `protx update_service_hpmn`.
-  These HPMN RPCs correspond to the standard masternode RPCs but have the following additional mandatory arguments: `platformNodeID`, `platformP2PPort` and `platformHTTPPort`.
-- `upgradewallet`
-
-### The removed RPCs are:
-
-None
-
-### Changes in existing RPCs introduced through bitcoin backports:
-
-- The `utxoupdatepsbt` RPC method has been updated to take a descriptors
-argument. When provided, input and output scripts and keys will be filled in
-when known. See the RPC help text for full details.
-
-
-### Dash-specific changes in existing RPCs:
-
-- `masternodelist`: New mode `recent` was added in order to hide banned masternodes for more than one `SuperblockCycle`. If the mode `recent` is used, then the reply mode is JSON (can be additionally filtered)
-- `quorum info`: The new `previousConsecutiveDKGFailures` field will be returned for rotated LLMQs. This field will hold the number of previous consecutive DKG failures for the corresponding quorumIndex before the currently active one. Note: If no previous commitments were found then 0 will be returned for `previousConsecutiveDKGFailures`.
-- `bls generate` and `bls fromsecret`: The new `scheme` field will be returned indicating which scheme was used to serialise the public key. Valid returned values are `legacy` and`basic`.
-- `bls generate` and `bls fromsecret`: Both RPCs accept an incoming optional boolean argument `legacy` that enforces the use of legacy BLS scheme for the serialisation of the reply even if v19 is active.
-- `masternode status`: now returns the type of the masternode.
-- `masternode count`: now returns a detailed summary of total and enabled masternodes per type.
-- `gobject getcurrentvotes`: reply is enriched by adding the vote weight at the end of each line. Possible values are 1 or 4. Example: "7cb20c883c6093b8489f795b3ec0aad0d9c2c2821610ae9ed938baaf42fec66d": "277e6345359071410ab691c21a3a16f8f46c9229c2f8ec8f028c9a95c0f1c0e7-1:1670019339:yes:funding:4"
-- Once the v19 hard fork is activated, `protx register`, `protx register_fund`, and `protx register_prepare` RPCs will decode BLS operator public keys using the new basic BLS scheme.
-
-Please check `help <command>` for more detailed information on specific RPCs.
-
-## Command-line options
-
-A number of command-line option changes were made related to testing and
-removal of BIP61 support.
-
-New cmd-line options:
-- `llmqplatform` (devnet only)
-- `unsafesqlitesync`
-
-Removed cmd-line options:
-- `enablebip61`
-- `upgradewallet`
-
-Changes in existing cmd-line options:
-- `llmqinstantsend` and `llmqinstantsenddip0024` can be used in regtest now
-- Passing an invalid `-rpcauth` argument now cause dashd to fail to start.
-
-Please check `Help -> Command-line options` in Qt wallet or `dashd --help` for
-more information.
-
-## Backports from Bitcoin Core
+## Delaying v19 Hard Fork
 
-This release introduces many updates from Bitcoin v0.18-v0.21 as well as numerous updates from Bitcoin v22 and more recent versions. Bitcoin changes that do not align with Dash’s product needs, such as SegWit and RBF, are excluded from our backporting. For additional detail on what’s included in Bitcoin, please refer to their release notes.
+The start date for the v19 Hard Fork has been delayed until June 14th. The earliest hard fork date will be roughly two
+weeks after that date. A new version will be required before this date to ensure a smooth hard fork.
 
-# v19.0.0 Change log
+# v19.1.0 Change log
 
-See detailed [set of changes](https://github.com/dashpay/dash/compare/v18.2.2...dashpay:v19.0.0).
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v19.0.0...dashpay:v19.1.0).
 
 # Credits
 
@@ -250,6 +89,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:
 
+- [v19.0.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-19.0.0.md) released Apr/14/2023
 - [v18.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.2.2.md) released Mar/21/2023
 - [v18.2.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-18.2.1.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

src/chainparams.cpp

@@ -238,8 +238,8 @@ class CMainParams : public CChainParams {
 
         // Deployment of Deployment of Basic BLS, AssetLocks, EHF
         consensus.vDeployments[Consensus::DEPLOYMENT_V19].bit = 8;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V19].nStartTime = 1682380800;     // Tuesday, April 25, 2023 0:00:00
-        consensus.vDeployments[Consensus::DEPLOYMENT_V19].nTimeout = 1714003200;     // Thursday, April 25, 2024 0:00:00
+        consensus.vDeployments[Consensus::DEPLOYMENT_V19].nStartTime = 1686700800;     // Wednesday, June 14, 2023 12:00:00 AM
+        consensus.vDeployments[Consensus::DEPLOYMENT_V19].nTimeout = 1718323200;       // Friday, June 14, 2024 12:00:00 AM
         consensus.vDeployments[Consensus::DEPLOYMENT_V19].nWindowSize = 4032;
         consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdStart = 3226;       // 80% of 4032
         consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdMin = 2420;         // 60% of 4032

src/qt/intro.cpp

@@ -206,7 +206,7 @@ bool Intro::pickDataDirectory(interfaces::Node& node)
         }
 
         /* Let the user choose one */
-        Intro intro(0, node.getAssumedChainStateSize(), node.getAssumedChainStateSize());
+        Intro intro(0, node.getAssumedBlockchainSize(), node.getAssumedChainStateSize());
         GUIUtil::disableMacFocusRect(&intro);
         GUIUtil::loadStyleSheet(true);
         intro.setDataDirectory(dataDirDefaultCurrent);

src/wallet/wallet.cpp

@@ -324,6 +324,12 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, const std::strin
             wallet->m_spk_man->NewKeyPool();
             // end TODO
 
+            // backup the wallet we just encrypted
+            if (!wallet->AutoBackupWallet("", error, warnings) && !error.original.empty()) {
+                status = DatabaseStatus::FAILED_ENCRYPT;
+                return nullptr;
+            }
+
             // Relock the wallet
             wallet->Lock();
         }
@@ -4637,11 +4643,16 @@ bool CWallet::AutoBackupWallet(const fs::path& wallet_path, bilingual_str& error
         strWalletName = "wallet.dat";
     }
 
-    if (!IsBDBFile(BDBDataFile(wallet_path))) {
+    if (!wallet_path.empty() && !IsBDBFile(BDBDataFile(wallet_path))) {
         WalletLogPrintf("Automatic wallet backups are currently only supported with Berkeley DB!\n");
         return false;
     }
 
+    if (IsWalletFlagSet(WALLET_FLAG_BLANK_WALLET)) {
+        WalletLogPrintf("Wallet is blank, won't create new backup for it!\n");
+        return false;
+    }
+
     if (nWalletBackups <= 0) {
         WalletLogPrintf("Automatic wallet backups are disabled!\n");
         return false;

test/README.md

@@ -27,7 +27,7 @@ Before tests can be run locally, Dash Core must be built.  See the [building ins
 Many Dash specific tests require dash_hash. To install it:
 
 - Clone the repo `git clone https://github.com/dashpay/dash_hash`
-- Install dash_hash `cd dash_hash && python3 setup.py install`
+- Install dash_hash `cd dash_hash && pip3 install -r requirements.txt .`
 
 The ZMQ functional test requires a python ZMQ library. To install it: