Merge pull request #113 from gertjaap/verthash-0.16.98-0.20.1-rebase

Bitcoin 0.20.1 rebase

.cirrus.yml

@@ -1,33 +1,3 @@
-task:
-  name: "FreeBsd 12.0 amd64  [GOAL: install]  [no depends, only system libs]"
-  freebsd_instance:
-    image: freebsd-12-0-release-amd64
-    cpu: 8
-    memory: 8G
-  timeout_in: 60m
-  env:
-    MAKEJOBS: "-j9"
-    CONFIGURE_OPTS: "--disable-dependency-tracking"
-    GOAL: "install"
-    TEST_RUNNER_PORT_MIN: "14000"  # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
-    CCACHE_SIZE: "200M"
-    CCACHE_COMPRESS: 1
-    CCACHE_DIR: "/tmp/ccache_dir"
-  ccache_cache:
-    folder: "/tmp/ccache_dir"
-  install_script:
-    - pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
-    - ./contrib/install_db4.sh $(pwd)
-    - ccache --max-size=${CCACHE_SIZE}
-  configure_script:
-    - ./autogen.sh
-    - ./configure ${CONFIGURE_OPTS} BDB_LIBS="-L$(pwd)/db4/lib -ldb_cxx-4.8" BDB_CFLAGS="-I$(pwd)/db4/include" || ( cat config.log && false)
-  make_script:
-    - gmake ${MAKEJOBS} ${GOAL} || ( echo "Build failure. Verbose build follows." && gmake ${GOAL} V=1 ; false )
-  check_script:
-    - gmake check ${MAKEJOBS} VERBOSE=1
-  functional_test_script:
-    - ./test/functional/test_runner.py --jobs 9 --ci --extended --exclude feature_dbcrash --combinedlogslen=1000 --quiet --failfast
 task:
   name: "x86_64 Linux  [GOAL: install]  [bionic]  [Using ./ci/ system]"
   container:

Makefile.am

@@ -41,7 +41,7 @@ OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
 OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/vertcoin.icns
 OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
-OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
+OSX_QT_TRANSLATIONS = ar,bg,ca,cs,da,de,es,fa,fi,fr,gd,gl,he,hu,it,ja,ko,lt,lv,pl,pt,ru,sk,sl,sv,uk,zh_CN,zh_TW
 
 DIST_CONTRIB = \
 	       $(top_srcdir)/contrib/linearize/linearize-data.py \

ci/lint/04_install.sh

@@ -11,5 +11,5 @@ travis_retry pip3 install flake8==3.7.8
 travis_retry pip3 install yq
 
 SHELLCHECK_VERSION=v0.6.0
-curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
+curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
 export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"

configure.ac

@@ -1693,7 +1693,7 @@ echo "  gprof enabled = $enable_gprof"
 echo "  werror        = $enable_werror"
 echo
 echo "  target os     = $TARGET_OS"
-echo "  build os      = $BUILD_OS"
+echo "  build os      = $build_os"
 echo
 echo "  CC            = $CC"
 echo "  CFLAGS        = $CFLAGS"

depends/packages/qt.mk

@@ -10,6 +10,7 @@ $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch fix_android_qmake_conf.patch fix_android_jni_static.patch
 
+# Update OSX_QT_TRANSLATIONS when this is updated
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=fb5a47799754af73d3bf501fe513342cfe2fc37f64e80df5533f6110e804220c
 
@@ -79,7 +80,6 @@ $(package)_config_opts += -no-feature-colordialog
 $(package)_config_opts += -no-feature-commandlineparser
 $(package)_config_opts += -no-feature-concurrent
 $(package)_config_opts += -no-feature-dial
-$(package)_config_opts += -no-feature-filesystemwatcher
 $(package)_config_opts += -no-feature-fontcombobox
 $(package)_config_opts += -no-feature-ftp
 $(package)_config_opts += -no-feature-http

doc/man/bitcoin-cli.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH BITCOIN-CLI "1" "June 2020" "bitcoin-cli v0.20.0.0" "User Commands"
+.TH BITCOIN-CLI "1" "July 2020" "bitcoin-cli v0.20.1.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v0.20.0.0
+bitcoin-cli \- manual page for bitcoin-cli v0.20.1.0
 .SH SYNOPSIS
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Bitcoin Core\/\fR
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v0.20.0.0
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v0.20.0.0
+Bitcoin Core RPC client version v0.20.1.0
 .SH OPTIONS
 .HP
 \-?

doc/man/bitcoin-qt.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH BITCOIN-QT "1" "June 2020" "bitcoin-qt v0.20.0.0" "User Commands"
+.TH BITCOIN-QT "1" "July 2020" "bitcoin-qt v0.20.1.0" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v0.20.0.0
+bitcoin-qt \- manual page for bitcoin-qt v0.20.1.0
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v0.20.0.0
+Bitcoin Core version v0.20.1.0
 .SH OPTIONS
 .HP
 \-?
@@ -174,11 +174,12 @@ datadir location.
 .HP
 \fB\-banscore=\fR<n>
 .IP
-Threshold for disconnecting misbehaving peers (default: 100)
+Threshold for disconnecting and discouraging misbehaving peers (default:
+100)
 .HP
 \fB\-bantime=\fR<n>
 .IP
-Number of seconds to keep misbehaving peers from reconnecting (default:
+Default duration (in seconds) of manually configured bans (default:
 86400)
 .HP
 \fB\-bind=\fR<addr>

doc/man/bitcoin-tx.1

@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH BITCOIN-TX "1" "June 2020" "bitcoin-tx v0.20.0.0" "User Commands"
+.TH BITCOIN-TX "1" "July 2020" "bitcoin-tx v0.20.1.0" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v0.20.0.0
+bitcoin-tx \- manual page for bitcoin-tx v0.20.1.0
 .SH SYNOPSIS
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
 .br
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v0.20.0.0
+Bitcoin Core bitcoin\-tx utility version v0.20.1.0
 .SH OPTIONS
 .HP
 \-?

doc/man/bitcoin-wallet.1

@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH BITCOIN-WALLET "1" "June 2020" "bitcoin-wallet v0.20.0.0" "User Commands"
+.TH BITCOIN-WALLET "1" "July 2020" "bitcoin-wallet v0.20.1.0" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v0.20.0.0
+bitcoin-wallet \- manual page for bitcoin-wallet v0.20.1.0
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v0.20.0.0
+Bitcoin Core bitcoin\-wallet version v0.20.1.0
 .PP
 bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
 By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

doc/man/bitcoind.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH BITCOIND "1" "June 2020" "bitcoind v0.20.0.0" "User Commands"
+.TH BITCOIND "1" "July 2020" "bitcoind v0.20.1.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v0.20.0.0
+bitcoind \- manual page for bitcoind v0.20.1.0
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]                     \fI\,Start Bitcoin Core\/\fR
 .SH DESCRIPTION
-Bitcoin Core version v0.20.0.0
+Bitcoin Core version v0.20.1.0
 .SH OPTIONS
 .HP
 \-?
@@ -174,11 +174,12 @@ datadir location.
 .HP
 \fB\-banscore=\fR<n>
 .IP
-Threshold for disconnecting misbehaving peers (default: 100)
+Threshold for disconnecting and discouraging misbehaving peers (default:
+100)
 .HP
 \fB\-bantime=\fR<n>
 .IP
-Number of seconds to keep misbehaving peers from reconnecting (default:
+Default duration (in seconds) of manually configured bans (default:
 86400)
 .HP
 \fB\-bind=\fR<addr>