From 37f96f5a3ad7c72eb5b6f3c27fd7cd41320a9c93 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 21 Nov 2019 23:52:35 +0300 Subject: [PATCH] Bump version to 0.15 and update few const-s/chainparams (#3204) * Bump const-s * Bump version to 0.15 * Run gen-manpages.sh --- README.md | 4 +- configure.ac | 4 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 2 +- contrib/gitian-descriptors/gitian-win.yml | 2 +- doc/man/dash-cli.1 | 14 +++-- doc/man/dash-qt.1 | 66 ++++++++++----------- doc/man/dash-tx.1 | 8 +-- doc/man/dashd.1 | 66 ++++++++++----------- src/chainparams.cpp | 20 ++++--- src/qt/intro.cpp | 2 +- 11 files changed, 99 insertions(+), 91 deletions(-) diff --git a/README.md b/README.md index 64dbf2f430..b39ee1fe7d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Dash Core staging tree 0.14.1 -============================= +Dash Core staging tree 0.15 +=========================== `master:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=master)](https://travis-ci.org/dashpay/dash) `develop:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=develop)](https://travis-ci.org/dashpay/dash/branches) diff --git a/configure.ac b/configure.ac index a10349e786..a283622091 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) -define(_CLIENT_VERSION_MINOR, 14) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_MINOR, 15) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2019) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index c88c1e1b57..75668d1f7c 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "dash-linux-0.14" +name: "dash-linux-0.15" enable_cache: true suites: - "bionic" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index fb24837c53..40021232f0 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "dash-osx-0.14" +name: "dash-osx-0.15" enable_cache: true suites: - "bionic" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 9bd9ec9053..12d51be033 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "dash-win-0.14" +name: "dash-win-0.15" enable_cache: true suites: - "bionic" diff --git a/doc/man/dash-cli.1 b/doc/man/dash-cli.1 index 579c1700a4..4d18d51fe8 100644 --- a/doc/man/dash-cli.1 +++ b/doc/man/dash-cli.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH DASH-CLI "1" "June 2019" "dash-cli v0.14.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH DASH-CLI "1" "November 2019" "dash-cli v0.15.0.0" "User Commands" .SH NAME -dash-cli \- manual page for dash-cli v0.14.1.0 +dash-cli \- manual page for dash-cli v0.15.0.0 .SH DESCRIPTION -Dash Core RPC client version v0.14.1.0 +Dash Core RPC client version v0.15.0.0 .SS "Usage:" .TP dash\-cli [options] [params] @@ -75,6 +75,12 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default: .IP Read extra arguments from standard input, one per line until EOF/Ctrl\-D (recommended for sensitive information such as passphrases) +.HP +\fB\-rpcwallet=\fR +.IP +Send RPC for non\-default wallet on RPC server (argument is wallet +filename in bitcoind directory, required if bitcoind/\-Qt runs +with multiple wallets) .SH COPYRIGHT Copyright (C) 2014-2019 The Dash Core developers Copyright (C) 2009-2019 The Bitcoin Core developers diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1 index d11551a96d..3ee402380d 100644 --- a/doc/man/dash-qt.1 +++ b/doc/man/dash-qt.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH DASH-QT "1" "June 2019" "dash-qt v0.14.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH DASH-QT "1" "November 2019" "dash-qt v0.15.0.0" "User Commands" .SH NAME -dash-qt \- manual page for dash-qt v0.14.1.0 +dash-qt \- manual page for dash-qt v0.15.0.0 .SH DESCRIPTION -Dash Core version v0.14.1.0 (64\-bit) +Dash Core version v0.15.0.0 (64\-bit) Usage: .IP dash\-qt [command\-line options] @@ -17,10 +17,6 @@ Print this help message and exit .IP Print version and exit .HP -\fB\-alerts\fR -.IP -Receive and display P2P network alerts (default: 1) -.HP \fB\-alertnotify=\fR .IP Execute command when a relevant alert is received or we see a really @@ -36,9 +32,9 @@ block hash) 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: -000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70, +000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661, testnet: -0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843) +000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029) .HP \fB\-conf=\fR .IP @@ -56,9 +52,9 @@ Set database cache size in megabytes (4 to 16384, default: 300) .IP Imports blocks from external blk000??.dat file on startup .HP -\fB\-maxorphantx=\fR +\fB\-maxorphantxsize=\fR .IP -Keep at most unconnectable transactions in memory (default: 100) +Maximum total size of all orphan transactions in megabytes (default: 10) .HP \fB\-maxmempool=\fR .IP @@ -69,6 +65,10 @@ Keep the transaction memory pool below megabytes (default: 300) Do not keep transactions in the mempool longer than hours (default: 336) .HP +\fB\-persistmempool\fR +.IP +Whether to save the mempool on shutdown and load on restart (default: 1) +.HP \fB\-blockreconstructionextratxn=\fR .IP Extra transactions to keep in memory for compact block reconstructions @@ -132,7 +132,8 @@ Connection options: .HP \fB\-addnode=\fR .IP -Add a node to connect to and attempt to keep the connection open +Add a node to connect to and attempt to keep the connection open (see +the `addnode` RPC command help for more info) .HP \fB\-allowprivatenet\fR .IP @@ -155,7 +156,8 @@ for IPv6 \fB\-connect=\fR .IP Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic -connections +connections (the rules for this peer are the same as for +\fB\-addnode\fR) .HP \fB\-discover\fR .IP @@ -291,6 +293,14 @@ Set key pool size to (default: 1000) A fee rate (in DASH/kB) that will be used when fee estimation has insufficient data (default: 0.00001) .HP +\fB\-discardfee=\fR +.IP +The fee rate (in DASH/kB) that indicates your tolerance for discarding +change by adding it to the fee (default: 0.0001). Note: An output +is discarded if it is dust at this rate, but we will always +discard up to the dust relay fee and a discard fee above that is +limited by the fee estimate for the longest target +.HP \fB\-mintxfee=\fR .IP Fees (in DASH/kB) smaller than this are considered zero fee for @@ -453,7 +463,7 @@ mempool, http, bench, zmq, db, rpc, estimatefee, addrman, selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej, libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend, keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync, -privatesend, spork, alert. +privatesend, spork. .HP \fB\-debugexclude=\fR .IP @@ -519,20 +529,21 @@ you. .PP Masternode options: .HP -\fB\-masternode\fR -.IP -Enable the client to act as a masternode (0\-1, default: 0) -.HP \fB\-masternodeblsprivkey=\fR .IP -Set the masternode BLS private key +Set the masternode BLS private key and enable the client to act as a +masternode .PP PrivateSend options: .HP \fB\-enableprivatesend\fR .IP -Enable use of automated PrivateSend for funds stored in this wallet -(0\-1, default: 0) +Enable use of PrivateSend for funds stored in this wallet (0\-1, default: +0) +.HP +\fB\-privatesendautostart\fR +.IP +Start PrivateSend automatically (0\-1, default: 0) .HP \fB\-privatesendmultisession\fR .IP @@ -556,20 +567,9 @@ Keep N DASH mixed (2\-21000000, default: 1000) .IP Create up to N inputs of each denominated amount (10\-100000, default: 300) -.HP -\fB\-liquidityprovider=\fR -.IP -Provide liquidity to PrivateSend by infrequently mixing coins on a -continual basis (0\-100, default: 0, 1=very frequent, high fees, -100=very infrequent, low fees) .PP InstantSend options: .HP -\fB\-enableinstantsend\fR -.IP -Enable InstantSend, show confirmations for locked transactions (0\-1, -default: 1) -.HP \fB\-instantsendnotify=\fR .IP Execute command when a wallet InstantSend transaction is successfully diff --git a/doc/man/dash-tx.1 b/doc/man/dash-tx.1 index d4ecd6b3c8..a6b203d2aa 100644 --- a/doc/man/dash-tx.1 +++ b/doc/man/dash-tx.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH DASH-TX "1" "June 2019" "dash-tx v0.14.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH DASH-TX "1" "November 2019" "dash-tx v0.15.0.0" "User Commands" .SH NAME -dash-tx \- manual page for dash-tx v0.14.1.0 +dash-tx \- manual page for dash-tx v0.15.0.0 .SH DESCRIPTION -Dash Core dash\-tx utility version v0.14.1.0 +Dash Core dash\-tx utility version v0.15.0.0 .SS "Usage:" .TP dash\-tx [options] [commands] diff --git a/doc/man/dashd.1 b/doc/man/dashd.1 index 3c2b4236b3..b7ec37d1df 100644 --- a/doc/man/dashd.1 +++ b/doc/man/dashd.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH DASHD "1" "June 2019" "dashd v0.14.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH DASHD "1" "November 2019" "dashd v0.15.0.0" "User Commands" .SH NAME -dashd \- manual page for dashd v0.14.1.0 +dashd \- manual page for dashd v0.15.0.0 .SH DESCRIPTION -Dash Core Daemon version v0.14.1.0 +Dash Core Daemon version v0.15.0.0 .SS "Usage:" .TP dashd [options] @@ -18,10 +18,6 @@ Print this help message and exit .IP Print version and exit .HP -\fB\-alerts\fR -.IP -Receive and display P2P network alerts (default: 1) -.HP \fB\-alertnotify=\fR .IP Execute command when a relevant alert is received or we see a really @@ -37,9 +33,9 @@ block hash) 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: -000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70, +000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661, testnet: -0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843) +000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029) .HP \fB\-conf=\fR .IP @@ -61,9 +57,9 @@ Set database cache size in megabytes (4 to 16384, default: 300) .IP Imports blocks from external blk000??.dat file on startup .HP -\fB\-maxorphantx=\fR +\fB\-maxorphantxsize=\fR .IP -Keep at most unconnectable transactions in memory (default: 100) +Maximum total size of all orphan transactions in megabytes (default: 10) .HP \fB\-maxmempool=\fR .IP @@ -74,6 +70,10 @@ Keep the transaction memory pool below megabytes (default: 300) Do not keep transactions in the mempool longer than hours (default: 336) .HP +\fB\-persistmempool\fR +.IP +Whether to save the mempool on shutdown and load on restart (default: 1) +.HP \fB\-blockreconstructionextratxn=\fR .IP Extra transactions to keep in memory for compact block reconstructions @@ -137,7 +137,8 @@ Connection options: .HP \fB\-addnode=\fR .IP -Add a node to connect to and attempt to keep the connection open +Add a node to connect to and attempt to keep the connection open (see +the `addnode` RPC command help for more info) .HP \fB\-allowprivatenet\fR .IP @@ -160,7 +161,8 @@ for IPv6 \fB\-connect=\fR .IP Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic -connections +connections (the rules for this peer are the same as for +\fB\-addnode\fR) .HP \fB\-discover\fR .IP @@ -296,6 +298,14 @@ Set key pool size to (default: 1000) A fee rate (in DASH/kB) that will be used when fee estimation has insufficient data (default: 0.00001) .HP +\fB\-discardfee=\fR +.IP +The fee rate (in DASH/kB) that indicates your tolerance for discarding +change by adding it to the fee (default: 0.0001). Note: An output +is discarded if it is dust at this rate, but we will always +discard up to the dust relay fee and a discard fee above that is +limited by the fee estimate for the longest target +.HP \fB\-mintxfee=\fR .IP Fees (in DASH/kB) smaller than this are considered zero fee for @@ -454,7 +464,7 @@ mempool, http, bench, zmq, db, rpc, estimatefee, addrman, selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej, libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend, keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync, -privatesend, spork, alert. +privatesend, spork. .HP \fB\-debugexclude=\fR .IP @@ -520,20 +530,21 @@ you. .PP Masternode options: .HP -\fB\-masternode\fR -.IP -Enable the client to act as a masternode (0\-1, default: 0) -.HP \fB\-masternodeblsprivkey=\fR .IP -Set the masternode BLS private key +Set the masternode BLS private key and enable the client to act as a +masternode .PP PrivateSend options: .HP \fB\-enableprivatesend\fR .IP -Enable use of automated PrivateSend for funds stored in this wallet -(0\-1, default: 0) +Enable use of PrivateSend for funds stored in this wallet (0\-1, default: +0) +.HP +\fB\-privatesendautostart\fR +.IP +Start PrivateSend automatically (0\-1, default: 0) .HP \fB\-privatesendmultisession\fR .IP @@ -557,20 +568,9 @@ Keep N DASH mixed (2\-21000000, default: 1000) .IP Create up to N inputs of each denominated amount (10\-100000, default: 300) -.HP -\fB\-liquidityprovider=\fR -.IP -Provide liquidity to PrivateSend by infrequently mixing coins on a -continual basis (0\-100, default: 0, 1=very frequent, high fees, -100=very infrequent, low fees) .PP InstantSend options: .HP -\fB\-enableinstantsend\fR -.IP -Enable InstantSend, show confirmations for locked transactions (0\-1, -default: 1) -.HP \fB\-instantsendnotify=\fR .IP Execute command when a wallet InstantSend transaction is successfully diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 30e8c7d88a..72144fe317 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -302,10 +302,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 3226; // 80% of 4032 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000146103ebd818111fae85"); // 1067570 + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000020a5cd0e7d1481a5f8d5"); // 1167570 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70"); // 1067570 + consensus.defaultAssumeValid = uint256S("0x000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661"); // 1167570 /** * The message start string is designed to be unlikely to occur in normal data. @@ -392,14 +392,15 @@ public: {888900, uint256S("0x0000000000000026c29d576073ab51ebd1d3c938de02e9a44c7ee9e16f82db28")}, {967800, uint256S("0x0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4")}, {1067570, uint256S("0x000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70")}, + {1167570, uint256S("0x000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661")}, } }; chainTxData = ChainTxData{ - 1557610432, // * UNIX timestamp of last known number of transactions (Block 1068571) - 14380723, // * total number of transactions between genesis and that timestamp + 1574164758, // * UNIX timestamp of last known number of transactions (Block 1173619) + 19444536, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) - 0.1 // * estimated number of transactions per second after that timestamp + 0.2 // * estimated number of transactions per second after that timestamp }; } }; @@ -481,10 +482,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 50% of 100 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000062cd3e94ad2d62"); // 95930 + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000098ebee572c3cd1"); // 200000 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843"); // 95930 + consensus.defaultAssumeValid = uint256S("0x000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029"); // 200000 pchMessageStart[0] = 0xce; pchMessageStart[1] = 0xe2; @@ -548,12 +549,13 @@ public: {1999, uint256S("0x00000052e538d27fa53693efe6fb6892a0c1d26c0235f599171c48a3cce553b1")}, {2999, uint256S("0x0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5")}, {96090, uint256S("0x00000000033df4b94d17ab43e999caaf6c4735095cc77703685da81254d09bba")}, + {200000, uint256S("0x000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029")}, } }; chainTxData = ChainTxData{ - 1557603759, // * UNIX timestamp of last known number of transactions (Block 96717) - 968552, // * total number of transactions between genesis and that timestamp + 1574164251, // * UNIX timestamp of last known number of transactions (Block 213054) + 1733259, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) 0.01 // * estimated number of transactions per second after that timestamp }; diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 6ec5da6d03..d64a14068d 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -23,7 +23,7 @@ static const uint64_t GB_BYTES = 1000000000LL; /* Minimum free space (in GB) needed for data directory */ -static const uint64_t BLOCK_CHAIN_SIZE = 10; +static const uint64_t BLOCK_CHAIN_SIZE = 15; /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */ static const uint64_t CHAIN_STATE_SIZE = 1; /* Total required space (in GB) depending on user choice (prune, not prune) */