Merge #13780: 0.17: Pre-branch maintenance

3fc2063 qt: Set BLOCK_CHAIN_SIZE = 220 (DrahtBot) 2b6a2f4 Regenerate manpages (DrahtBot) eb7daf4 Update copyright headers to 2018 (DrahtBot) Pull request description: Some trivial maintenance to avoid having to do it again after the 0.17 branch off. (The scripts to do this are in `./contrib/`) Tree-SHA512: 16b2af45e0351b1c691c5311d48025dc6828079e98c2aa2e600dc5910ee8aa01858ca6c356538150dc46fe14c8819ed8ec8e4ec9a0f682b9950dd41bc50518fa
BTCGPU · Aug 8, 2018 · 78dae8c · 78dae8c
2 parents 9d86aad 3fc2063
commit 78dae8c
Show file tree

Hide file tree

Showing 518 changed files with 843 additions and 778 deletions.
diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2017 The Bitcoin Core developers
 # Copyright (c) 2016-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.
 

diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2017 The Bitcoin Core developers
 # Copyright (c) 2014-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.
 '''

diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2017 The Bitcoin Core developers
 # Copyright (c) 2015-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.
 '''

diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2017 The Bitcoin Core developers
 # Copyright (c) 2015-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.
 '''

diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
@@ -2,7 2,7 @@
 #
 # linearize-data.py: Construct a linear, no-fork version of the chain.
 #
-# Copyright (c) 2013-2017 The Bitcoin Core developers
 # Copyright (c) 2013-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.
 #

diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
@@ -2,7 2,7 @@
 #
 # linearize-hashes.py: List blocks in a linear, no-fork version of the chain.
 #
-# Copyright (c) 2013-2017 The Bitcoin Core developers
 # Copyright (c) 2013-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.
 #

diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2013-2016 The Bitcoin Core developers
 # Copyright (c) 2013-2017 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 biplist

diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2013-2017 The Bitcoin Core developers
 # Copyright (c) 2013-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.
 #

diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py
@@ -1,4 1,4 @@
-# Copyright (c) 2012-2017 The Bitcoin Core developers
 # Copyright (c) 2012-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.
 '''

diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2012-2017 The Bitcoin Core developers
 # Copyright (c) 2012-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.
 '''

diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2017 The Bitcoin Core developers
 # Copyright (c) 2014-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.
 

diff --git a/contrib/zmq/zmq_sub3.4.py b/contrib/zmq/zmq_sub3.4.py
@@ -1,5 1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2017 The Bitcoin Core developers
 # Copyright (c) 2014-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.
 

diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
@@ -1,5 1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
-.TH BITCOIN-CLI "1" "January 2018" "bitcoin-cli v0.16.99.0" "User Commands"
 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
 .TH BITCOIN-CLI "1" "July 2018" "bitcoin-cli v0.16.99.0" "User Commands"
 .SH NAME
 bitcoin-cli \- manual page for bitcoin-cli v0.16.99.0
 .SH DESCRIPTION
@@ -20,7 20,8 @@ This help message
 .HP
 \fB\-conf=\fR<file>
 .IP
-Specify configuration file (default: bitcoin.conf)
 Specify configuration file. Relative paths will be prefixed by datadir
 location. (default: bitcoin.conf)
 .HP
 \fB\-datadir=\fR<dir>
 .IP
@@ -33,47 34,52 @@ server\-side RPC calls, the results of \fB\-getinfo\fR is the result of
 multiple non\-atomic requests. Some entries in the result may
 represent results from different states (e.g. wallet balance may
 be as of a different block from the chain state reported)
-.PP
-Chain selection options:
-.HP
-\fB\-testnet\fR
-.IP
-Use the test chain
-.HP
-\fB\-regtest\fR
-.IP
-Enter regression test mode, which uses a special chain in which blocks
-can be solved instantly. This is intended for regression testing
-tools and app development.
 .HP
 \fB\-named\fR
 .IP
 Pass named instead of positional arguments (default: false)
 .HP
 \fB\-rpcclienttimeout=\fR<n>
 .IP
 Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
 900)
 .HP
 \fB\-rpcconnect=\fR<ip>
 .IP
 Send commands to node running on <ip> (default: 127.0.0.1)
 .HP
-\fB\-rpcport=\fR<port>
 \fB\-rpccookiefile=\fR<loc>
 .IP
-Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332)
 Location of the auth cookie. Relative paths will be prefixed by a
 net\-specific datadir location. (default: data dir)
 .HP
-\fB\-rpcwait\fR
 \fB\-rpcpassword=\fR<pw>
 .IP
-Wait for RPC server to start
 Password for JSON\-RPC connections
 .HP
 \fB\-rpcport=\fR<port>
 .IP
 Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332)
 .HP
 \fB\-rpcuser=\fR<user>
 .IP
 Username for JSON\-RPC connections
 .HP
-\fB\-rpcpassword=\fR<pw>
 \fB\-rpcwait\fR
 .IP
-Password for JSON\-RPC connections
 Wait for RPC server to start
 .HP
-\fB\-rpcclienttimeout=\fR<n>
 \fB\-rpcwallet=\fR<walletname>
 .IP
-Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
-900)
 Send RPC for non\-default wallet on RPC server (needs to exactly match
 corresponding \fB\-wallet\fR option passed to bitcoind)
 .HP
 \fB\-stdin\fR
 .IP
 Read extra arguments from standard input, one per line until EOF/Ctrl\-D
 (recommended for sensitive information such as passphrases).
 When combined with \fB\-stdinrpcpass\fR, the first line from standard
 input is used for the RPC password.
 .HP
 \fB\-stdinrpcpass\fR
 .TP
@@ -83,18 89,15 @@ When combined
 with \fB\-stdin\fR, the first line from standard input is used for the
 RPC password.
 .HP
-\fB\-stdin\fR
 \fB\-version\fR
 .IP
-Read extra arguments from standard input, one per line until EOF/Ctrl\-D
-(recommended for sensitive information such as passphrases).
-When combined with \fB\-stdinrpcpass\fR, the first line from standard
-input is used for the RPC password.
 Print version and exit
 .PP
 Chain selection options:
 .HP
-\fB\-rpcwallet=\fR<walletname>
 \fB\-testnet\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)
 Use the test chain
 .SH COPYRIGHT
 Copyright (C) 2009-2018 The Bitcoin Core developers