neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump version to 0.15 and update few const-s/chainparams (#3204)

Browse Source 
* Bump const-s

* Bump version to 0.15

* Run gen-manpages.sh
This commit is contained in:
UdjinM6 2019-11-21 23:52:35 +03:00 committed by GitHub
parent 9de994988b
commit 37f96f5a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 99 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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) `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)

4
configure.ac
View File

@ -1,8 +1,8 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60]) AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 14) define(_CLIENT_VERSION_MINOR, 15)
define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, false) define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_YEAR, 2019)

2
contrib/gitian-descriptors/gitian-linux.yml
View File

@ -1,5 +1,5 @@
--- ---
name: "dash-linux-0.14" name: "dash-linux-0.15"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"

2
contrib/gitian-descriptors/gitian-osx.yml
View File

@ -1,5 +1,5 @@
--- ---
name: "dash-osx-0.14" name: "dash-osx-0.15"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"

2
contrib/gitian-descriptors/gitian-win.yml
View File

@ -1,5 +1,5 @@
--- ---
name: "dash-win-0.14" name: "dash-win-0.15"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"

14
doc/man/dash-cli.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
.TH DASH-CLI "1" "June 2019" "dash-cli v0.14.1.0" "User Commands" .TH DASH-CLI "1" "November 2019" "dash-cli v0.15.0.0" "User Commands"
.SH NAME .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 .SH DESCRIPTION
Dash Core RPC client version v0.14.1.0 Dash Core RPC client version v0.15.0.0
.SS "Usage:" .SS "Usage:"
.TP .TP
dash\-cli [options] <command> [params] dash\-cli [options] <command> [params]
@ -75,6 +75,12 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
.IP .IP
Read extra arguments from standard input, one per line until EOF/Ctrl\-D Read extra arguments from standard input, one per line until EOF/Ctrl\-D
(recommended for sensitive information such as passphrases) (recommended for sensitive information such as passphrases)
.HP
\fB\-rpcwallet=\fR<walletname>
.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 .SH COPYRIGHT
Copyright (C) 2014-2019 The Dash Core developers Copyright (C) 2014-2019 The Dash Core developers
Copyright (C) 2009-2019 The Bitcoin Core developers Copyright (C) 2009-2019 The Bitcoin Core developers

66
doc/man/dash-qt.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
.TH DASH-QT "1" "June 2019" "dash-qt v0.14.1.0" "User Commands" .TH DASH-QT "1" "November 2019" "dash-qt v0.15.0.0" "User Commands"
.SH NAME .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 .SH DESCRIPTION
Dash Core version v0.14.1.0 (64\-bit) Dash Core version v0.15.0.0 (64\-bit)
Usage: Usage:
.IP .IP
dash\-qt [command\-line options] dash\-qt [command\-line options]
@ -17,10 +17,6 @@ Print this help message and exit
.IP .IP
Print version and exit Print version and exit
.HP .HP
\fB\-alerts\fR
.IP
Receive and display P2P network alerts (default: 1)
.HP
\fB\-alertnotify=\fR<cmd> \fB\-alertnotify=\fR<cmd>
.IP .IP
Execute command when a relevant alert is received or we see a really 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 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, and potentially skip their script verification (0 to verify all,
default: default:
000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70, 000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661,
testnet: testnet:
0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843) 000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029)
.HP .HP
\fB\-conf=\fR<file> \fB\-conf=\fR<file>
.IP .IP
@ -56,9 +52,9 @@ Set database cache size in megabytes (4 to 16384, default: 300)
.IP .IP
Imports blocks from external blk000??.dat file on startup Imports blocks from external blk000??.dat file on startup
.HP .HP
\fB\-maxorphantx=\fR<n> \fB\-maxorphantxsize=\fR<n>
.IP .IP
Keep at most <n> unconnectable transactions in memory (default: 100) Maximum total size of all orphan transactions in megabytes (default: 10)
.HP .HP
\fB\-maxmempool=\fR<n> \fB\-maxmempool=\fR<n>
.IP .IP
@ -69,6 +65,10 @@ Keep the transaction memory pool below <n> megabytes (default: 300)
Do not keep transactions in the mempool longer than <n> hours (default: Do not keep transactions in the mempool longer than <n> hours (default:
336) 336)
.HP .HP
\fB\-persistmempool\fR
.IP
Whether to save the mempool on shutdown and load on restart (default: 1)
.HP
\fB\-blockreconstructionextratxn=\fR<n> \fB\-blockreconstructionextratxn=\fR<n>
.IP .IP
Extra transactions to keep in memory for compact block reconstructions Extra transactions to keep in memory for compact block reconstructions
@ -132,7 +132,8 @@ Connection options:
.HP .HP
\fB\-addnode=\fR<ip> \fB\-addnode=\fR<ip>
.IP .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 .HP
\fB\-allowprivatenet\fR \fB\-allowprivatenet\fR
.IP .IP
@ -155,7 +156,8 @@ for IPv6
\fB\-connect=\fR<ip> \fB\-connect=\fR<ip>
.IP .IP
Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic 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 .HP
\fB\-discover\fR \fB\-discover\fR
.IP .IP
@ -291,6 +293,14 @@ Set key pool size to <n> (default: 1000)
A fee rate (in DASH/kB) that will be used when fee estimation has A fee rate (in DASH/kB) that will be used when fee estimation has
insufficient data (default: 0.00001) insufficient data (default: 0.00001)
.HP .HP
\fB\-discardfee=\fR<amt>
.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<amt> \fB\-mintxfee=\fR<amt>
.IP .IP
Fees (in DASH/kB) smaller than this are considered zero fee for 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, selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej,
libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend, libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend,
keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync, keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync,
privatesend, spork, alert. privatesend, spork.
.HP .HP
\fB\-debugexclude=\fR<category> \fB\-debugexclude=\fR<category>
.IP .IP
@ -519,20 +529,21 @@ you.
.PP .PP
Masternode options: Masternode options:
.HP .HP
\fB\-masternode\fR
.IP
Enable the client to act as a masternode (0\-1, default: 0)
.HP
\fB\-masternodeblsprivkey=\fR<hex> \fB\-masternodeblsprivkey=\fR<hex>
.IP .IP
Set the masternode BLS private key Set the masternode BLS private key and enable the client to act as a
masternode
.PP .PP
PrivateSend options: PrivateSend options:
.HP .HP
\fB\-enableprivatesend\fR \fB\-enableprivatesend\fR
.IP .IP
Enable use of automated PrivateSend for funds stored in this wallet Enable use of PrivateSend for funds stored in this wallet (0\-1, default:
(0\-1, default: 0) 0)
.HP
\fB\-privatesendautostart\fR
.IP
Start PrivateSend automatically (0\-1, default: 0)
.HP .HP
\fB\-privatesendmultisession\fR \fB\-privatesendmultisession\fR
.IP .IP
@ -556,20 +567,9 @@ Keep N DASH mixed (2\-21000000, default: 1000)
.IP .IP
Create up to N inputs of each denominated amount (10\-100000, default: Create up to N inputs of each denominated amount (10\-100000, default:
300) 300)
.HP
\fB\-liquidityprovider=\fR<n>
.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 .PP
InstantSend options: InstantSend options:
.HP .HP
\fB\-enableinstantsend\fR
.IP
Enable InstantSend, show confirmations for locked transactions (0\-1,
default: 1)
.HP
\fB\-instantsendnotify=\fR<cmd> \fB\-instantsendnotify=\fR<cmd>
.IP .IP
Execute command when a wallet InstantSend transaction is successfully Execute command when a wallet InstantSend transaction is successfully

8
doc/man/dash-tx.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
.TH DASH-TX "1" "June 2019" "dash-tx v0.14.1.0" "User Commands" .TH DASH-TX "1" "November 2019" "dash-tx v0.15.0.0" "User Commands"
.SH NAME .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 .SH DESCRIPTION
Dash Core dash\-tx utility version v0.14.1.0 Dash Core dash\-tx utility version v0.15.0.0
.SS "Usage:" .SS "Usage:"
.TP .TP
dash\-tx [options] <hex\-tx> [commands] dash\-tx [options] <hex\-tx> [commands]

66
doc/man/dashd.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
.TH DASHD "1" "June 2019" "dashd v0.14.1.0" "User Commands" .TH DASHD "1" "November 2019" "dashd v0.15.0.0" "User Commands"
.SH NAME .SH NAME
dashd \- manual page for dashd v0.14.1.0 dashd \- manual page for dashd v0.15.0.0
.SH DESCRIPTION .SH DESCRIPTION
Dash Core Daemon version v0.14.1.0 Dash Core Daemon version v0.15.0.0
.SS "Usage:" .SS "Usage:"
.TP .TP
dashd [options] dashd [options]
@ -18,10 +18,6 @@ Print this help message and exit
.IP .IP
Print version and exit Print version and exit
.HP .HP
\fB\-alerts\fR
.IP
Receive and display P2P network alerts (default: 1)
.HP
\fB\-alertnotify=\fR<cmd> \fB\-alertnotify=\fR<cmd>
.IP .IP
Execute command when a relevant alert is received or we see a really 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 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, and potentially skip their script verification (0 to verify all,
default: default:
000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70, 000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661,
testnet: testnet:
0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843) 000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029)
.HP .HP
\fB\-conf=\fR<file> \fB\-conf=\fR<file>
.IP .IP
@ -61,9 +57,9 @@ Set database cache size in megabytes (4 to 16384, default: 300)
.IP .IP
Imports blocks from external blk000??.dat file on startup Imports blocks from external blk000??.dat file on startup
.HP .HP
\fB\-maxorphantx=\fR<n> \fB\-maxorphantxsize=\fR<n>
.IP .IP
Keep at most <n> unconnectable transactions in memory (default: 100) Maximum total size of all orphan transactions in megabytes (default: 10)
.HP .HP
\fB\-maxmempool=\fR<n> \fB\-maxmempool=\fR<n>
.IP .IP
@ -74,6 +70,10 @@ Keep the transaction memory pool below <n> megabytes (default: 300)
Do not keep transactions in the mempool longer than <n> hours (default: Do not keep transactions in the mempool longer than <n> hours (default:
336) 336)
.HP .HP
\fB\-persistmempool\fR
.IP
Whether to save the mempool on shutdown and load on restart (default: 1)
.HP
\fB\-blockreconstructionextratxn=\fR<n> \fB\-blockreconstructionextratxn=\fR<n>
.IP .IP
Extra transactions to keep in memory for compact block reconstructions Extra transactions to keep in memory for compact block reconstructions
@ -137,7 +137,8 @@ Connection options:
.HP .HP
\fB\-addnode=\fR<ip> \fB\-addnode=\fR<ip>
.IP .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 .HP
\fB\-allowprivatenet\fR \fB\-allowprivatenet\fR
.IP .IP
@ -160,7 +161,8 @@ for IPv6
\fB\-connect=\fR<ip> \fB\-connect=\fR<ip>
.IP .IP
Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic 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 .HP
\fB\-discover\fR \fB\-discover\fR
.IP .IP
@ -296,6 +298,14 @@ Set key pool size to <n> (default: 1000)
A fee rate (in DASH/kB) that will be used when fee estimation has A fee rate (in DASH/kB) that will be used when fee estimation has
insufficient data (default: 0.00001) insufficient data (default: 0.00001)
.HP .HP
\fB\-discardfee=\fR<amt>
.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<amt> \fB\-mintxfee=\fR<amt>
.IP .IP
Fees (in DASH/kB) smaller than this are considered zero fee for 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, selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej,
libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend, libevent, coindb, qt, leveldb, chainlocks, gobject, instantsend,
keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync, keepass, llmq, llmq\-dkg, llmq\-sigs, mnpayments, mnsync,
privatesend, spork, alert. privatesend, spork.
.HP .HP
\fB\-debugexclude=\fR<category> \fB\-debugexclude=\fR<category>
.IP .IP
@ -520,20 +530,21 @@ you.
.PP .PP
Masternode options: Masternode options:
.HP .HP
\fB\-masternode\fR
.IP
Enable the client to act as a masternode (0\-1, default: 0)
.HP
\fB\-masternodeblsprivkey=\fR<hex> \fB\-masternodeblsprivkey=\fR<hex>
.IP .IP
Set the masternode BLS private key Set the masternode BLS private key and enable the client to act as a
masternode
.PP .PP
PrivateSend options: PrivateSend options:
.HP .HP
\fB\-enableprivatesend\fR \fB\-enableprivatesend\fR
.IP .IP
Enable use of automated PrivateSend for funds stored in this wallet Enable use of PrivateSend for funds stored in this wallet (0\-1, default:
(0\-1, default: 0) 0)
.HP
\fB\-privatesendautostart\fR
.IP
Start PrivateSend automatically (0\-1, default: 0)
.HP .HP
\fB\-privatesendmultisession\fR \fB\-privatesendmultisession\fR
.IP .IP
@ -557,20 +568,9 @@ Keep N DASH mixed (2\-21000000, default: 1000)
.IP .IP
Create up to N inputs of each denominated amount (10\-100000, default: Create up to N inputs of each denominated amount (10\-100000, default:
300) 300)
.HP
\fB\-liquidityprovider=\fR<n>
.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 .PP
InstantSend options: InstantSend options:
.HP .HP
\fB\-enableinstantsend\fR
.IP
Enable InstantSend, show confirmations for locked transactions (0\-1,
default: 1)
.HP
\fB\-instantsendnotify=\fR<cmd> \fB\-instantsendnotify=\fR<cmd>
.IP .IP
Execute command when a wallet InstantSend transaction is successfully Execute command when a wallet InstantSend transaction is successfully

20
src/chainparams.cpp
View File

@ -302,10 +302,10 @@ public:
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 3226; // 80% of 4032 consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 3226; // 80% of 4032
// The best chain should have at least this much work. // 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. // 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. * The message start string is designed to be unlikely to occur in normal data.
@ -392,14 +392,15 @@ public:
{888900, uint256S("0x0000000000000026c29d576073ab51ebd1d3c938de02e9a44c7ee9e16f82db28")}, {888900, uint256S("0x0000000000000026c29d576073ab51ebd1d3c938de02e9a44c7ee9e16f82db28")},
{967800, uint256S("0x0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4")}, {967800, uint256S("0x0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4")},
{1067570, uint256S("0x000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70")}, {1067570, uint256S("0x000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70")},
{1167570, uint256S("0x000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661")},
} }
}; };
chainTxData = ChainTxData{ chainTxData = ChainTxData{
1557610432, // * UNIX timestamp of last known number of transactions (Block 1068571) 1574164758, // * UNIX timestamp of last known number of transactions (Block 1173619)
14380723, // * total number of transactions between genesis and that timestamp 19444536, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the SetBestChain debug.log lines) // (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 consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 50% of 100
// The best chain should have at least this much work. // 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. // 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[0] = 0xce;
pchMessageStart[1] = 0xe2; pchMessageStart[1] = 0xe2;
@ -548,12 +549,13 @@ public:
{1999, uint256S("0x00000052e538d27fa53693efe6fb6892a0c1d26c0235f599171c48a3cce553b1")}, {1999, uint256S("0x00000052e538d27fa53693efe6fb6892a0c1d26c0235f599171c48a3cce553b1")},
{2999, uint256S("0x0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5")}, {2999, uint256S("0x0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5")},
{96090, uint256S("0x00000000033df4b94d17ab43e999caaf6c4735095cc77703685da81254d09bba")}, {96090, uint256S("0x00000000033df4b94d17ab43e999caaf6c4735095cc77703685da81254d09bba")},
{200000, uint256S("0x000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029")},
} }
}; };
chainTxData = ChainTxData{ chainTxData = ChainTxData{
1557603759, // * UNIX timestamp of last known number of transactions (Block 96717) 1574164251, // * UNIX timestamp of last known number of transactions (Block 213054)
968552, // * total number of transactions between genesis and that timestamp 1733259, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the SetBestChain debug.log lines) // (the tx=... number in the SetBestChain debug.log lines)
0.01 // * estimated number of transactions per second after that timestamp 0.01 // * estimated number of transactions per second after that timestamp
}; };

2
src/qt/intro.cpp
View File

@ -23,7 +23,7 @@
static const uint64_t GB_BYTES = 1000000000LL; static const uint64_t GB_BYTES = 1000000000LL;
/* Minimum free space (in GB) needed for data directory */ /* 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 */ /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */
static const uint64_t CHAIN_STATE_SIZE = 1; static const uint64_t CHAIN_STATE_SIZE = 1;
/* Total required space (in GB) depending on user choice (prune, not prune) */ /* Total required space (in GB) depending on user choice (prune, not prune) */