[Backport] 5.3.1 backports

.gitignore

@@ -64,6 +64,7 @@ libtool
 src/config/pivx-config.h
 src/config/pivx-config.h.in
 src/config/stamp-h1
+src/obj
 share/setup.nsi
 share/qt/Info.plist
 contrib/devtools/split-debug.sh

build-aux/snap/local/patches/X003-fix-use-snap-instead-of-dirty.patch

@@ -1,25 +1,25 @@
-From ec230421e7107448ca9ac2421eb702924e12a879 Mon Sep 17 00:00:00 2001
-From: observerdev <dev@obsr.org>
-Date: Thu, 11 Apr 2019 00:12:00 +0200
-Subject: [PATCH] fix-use-snap-instead--of-dirty
+From 1110d61bd21b505fcea41bc3869c4dad1450b27e Mon Sep 17 00:00:00 2001
+From: Fuzzbawls <fuzzbawls@gmail.com>
+Date: Fri, 10 Sep 2021 01:46:16 -0700
+Subject: [Patch] Fix genbuild.sh for nightly snap builds
 
+Use "snap" suffix instead of "dirty"
 ---
  share/genbuild.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/share/genbuild.sh b/share/genbuild.sh
-index 519cc6e..de56b8d 100755
+index 38c9ba176c..4088168c0b 100755
 --- a/share/genbuild.sh
 +++ b/share/genbuild.sh
-@@ -37,7 +37,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(
- 
+@@ -36,7 +36,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(
+
      # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
      SUFFIX=$(git rev-parse --short HEAD)
 -    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
 +    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-snap"
-
-     # get a string like "2012-04-10 16:27:19 +0200"
-     LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
--- 
-2.17.1
+ fi
 
+ if [ -n "$DESC" ]; then
+--
+2.17.1

contrib/gitian-descriptors/gitian-linux.yml

@@ -140,6 +140,7 @@ script: |
   export PATH=${WRAP_DIR}:${PATH}
 
   # Create the release tarball using (arbitrarily) the first host
+  git update-index --assume-unchanged src/chiabls/contrib/relic/include/relic_conf.h.in
   ./autogen.sh
   CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
   make dist

contrib/gitian-descriptors/gitian-osx.yml

@@ -103,6 +103,7 @@ script: |
   export PATH=${WRAP_DIR}:${PATH}
 
   # Create the release tarball using (arbitrarily) the first host
+  git update-index --assume-unchanged src/chiabls/contrib/relic/include/relic_conf.h.in
   ./autogen.sh
   CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
   make dist

contrib/gitian-descriptors/gitian-win.yml

@@ -110,6 +110,7 @@ script: |
   export PATH=${WRAP_DIR}:${PATH}
 
   # Create the release tarball using (arbitrarily) the first host
+  git update-index --assume-unchanged src/chiabls/contrib/relic/include/relic_conf.h.in
   ./autogen.sh
   CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
   make dist

doc/man/pivx-cli.1

@@ -1,17 +1,21 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH PIVX-CLI "1" "August 2021" "pivx-cli v5.3.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH PIVX-CLI "1" "August 2021" "pivx-cli v5.2.99.0" "User Commands"
 .SH NAME
-pivx-cli \- manual page for pivx-cli v5.3.0.0
+pivx-cli \- manual page for pivx-cli v5.2.99.0
+.SH SYNOPSIS
+.B pivx-cli
+[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to PIVX Core\/\fR
+.br
+.B pivx-cli
+[\fI\,options\/\fR] \fI\,-named <command> \/\fR[\fI\,name=value\/\fR]... \fI\,Send command to PIVX Core (with named arguments)\/\fR
+.br
+.B pivx-cli
+[\fI\,options\/\fR] \fI\,help                List commands\/\fR
+.br
+.B pivx-cli
+[\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-PIVX Core RPC client version v5.3.0.0\-436e2793b\-dirty
-.SS "Usage:"
-.TP
-pivx\-cli [options] <command> [params]
-Send command to PIVX Core
-.IP
-pivx\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to PIVX Core (with named arguments)
-pivx\-cli [options] help                List commands
-pivx\-cli [options] help <command>      Get help for a command
+PIVX Core RPC client version v5.2.99.0\-dirty
 .SH OPTIONS
 .HP
 \-?

doc/man/pivx-qt.1

@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH PIVX-QT "1" "August 2021" "pivx-qt v5.3.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH PIVX-QT "1" "August 2021" "pivx-qt v5.2.99.0" "User Commands"
 .SH NAME
-pivx-qt \- manual page for pivx-qt v5.3.0.0
+pivx-qt \- manual page for pivx-qt v5.2.99.0
+.SH SYNOPSIS
+.B pivx-qt
+[\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-PIVX Core version v5.3.0.0\-436e2793b\-dirty (64\-bit)
-Usage:
-.IP
-pivx\-qt [command\-line options]
+PIVX Core version v5.2.99.0\-dirty (64\-bit)
 .SH OPTIONS
 .HP
 \-?
@@ -50,8 +50,7 @@ Specify data directory
 .HP
 \fB\-paramsdir=\fR<dir>
 .IP
-Specify zk params directory (default: \fI\,/Users/furszy/Library/Application\/\fP
-Support/PIVXParams)
+Specify zk params directory (default: /home/fuzzbawls/.pivx\-params)
 .HP
 \fB\-debuglogfile=\fR<file>
 .IP
@@ -93,7 +92,7 @@ Whether to save the mempool on shutdown and load on restart (default: 1)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -251,6 +250,10 @@ Tor control port password (default: empty)
 .IP
 Use UPnP to map the listening port (default: 0)
 .HP
+\fB\-natpmp\fR
+.IP
+Use NAT\-PMP to map the listening port (default: 0)
+.HP
 \fB\-whitebind=\fR<addr>
 .IP
 Bind to given address and whitelist peers connecting to it. Use
@@ -337,8 +340,8 @@ by TxID)
 \fB\-zapwallettxes=\fR<mode>
 .IP
 Delete all wallet transactions and only recover those parts of the
-blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
-payment request information, 2 = drop tx meta data)
+blockchain through \fB\-rescan\fR on startup(1 = keep tx meta data e.g. payment
+request information, 2 = drop tx meta data)
 .PP
 Mining/Staking options:
 .HP
@@ -397,7 +400,7 @@ Append comment to the user agent string
 .IP
 Output debugging information (default: 0, supplying <category> is
 optional). If <category> is not supplied, output all debugging
-information.<category> can be: net, tor, mempool, http, bench, zmq, db,
+information. <category> can be: net, tor, mempool, http, bench, zmq, db,
 rpc, estimatefee, addrman, selectcoins, reindex, cmpctblock, rand,
 prune, proxy, mempoolrej, libevent, coindb, qt, leveldb, staking,
 masternode, mnbudget, zero, mnping, sapling, sporks.

doc/man/pivx-tx.1

@@ -1,16 +1,15 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH PIVX-TX "1" "August 2021" "pivx-tx v5.3.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH PIVX-TX "1" "August 2021" "pivx-tx v5.2.99.0" "User Commands"
 .SH NAME
-pivx-tx \- manual page for pivx-tx v5.3.0.0
+pivx-tx \- manual page for pivx-tx v5.2.99.0
+.SH SYNOPSIS
+.B pivx-tx
+[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded pivx transaction\/\fR
+.br
+.B pivx-tx
+[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded pivx transaction\/\fR
 .SH DESCRIPTION
-Pivx Core pivx\-tx utility version v5.3.0.0\-436e2793b\-dirty
-.SS "Usage:"
-.TP
-pivx\-tx [options] <hex\-tx> [commands]
-Update hex\-encoded pivx transaction
-.TP
-pivx\-tx [options] \fB\-create\fR [commands]
-Create hex\-encoded pivx transaction
+PIVX Core pivx\-tx utility version v5.2.99.0\-dirty
 .SH OPTIONS
 .HP
 \-?

doc/man/pivxd.1

@@ -1,13 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH PIVXD "1" "August 2021" "pivxd v5.3.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
+.TH PIVXD "1" "August 2021" "pivxd v5.2.99.0" "User Commands"
 .SH NAME
-pivxd \- manual page for pivxd v5.3.0.0
+pivxd \- manual page for pivxd v5.2.99.0
+.SH SYNOPSIS
+.B pivxd
+[\fI\,options\/\fR]                     \fI\,Start PIVX Core Daemon\/\fR
 .SH DESCRIPTION
-Pivx Core Daemon version v5.3.0.0\-436e2793b\-dirty
-.SS "Usage:"
-.TP
-pivxd [options]
-Start Pivx Core Daemon
+PIVX Core Daemon version v5.2.99.0\-dirty
 .SH OPTIONS
 .HP
 \-?
@@ -55,8 +54,7 @@ Specify data directory
 .HP
 \fB\-paramsdir=\fR<dir>
 .IP
-Specify zk params directory (default: \fI\,/Users/furszy/Library/Application\/\fP
-Support/PIVXParams)
+Specify zk params directory (default: /home/fuzzbawls/.pivx\-params)
 .HP
 \fB\-debuglogfile=\fR<file>
 .IP
@@ -98,7 +96,7 @@ Whether to save the mempool on shutdown and load on restart (default: 1)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -256,6 +254,10 @@ Tor control port password (default: empty)
 .IP
 Use UPnP to map the listening port (default: 0)
 .HP
+\fB\-natpmp\fR
+.IP
+Use NAT\-PMP to map the listening port (default: 0)
+.HP
 \fB\-whitebind=\fR<addr>
 .IP
 Bind to given address and whitelist peers connecting to it. Use
@@ -342,8 +344,8 @@ by TxID)
 \fB\-zapwallettxes=\fR<mode>
 .IP
 Delete all wallet transactions and only recover those parts of the
-blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g.
-payment request information, 2 = drop tx meta data)
+blockchain through \fB\-rescan\fR on startup(1 = keep tx meta data e.g. payment
+request information, 2 = drop tx meta data)
 .PP
 Mining/Staking options:
 .HP
@@ -398,7 +400,7 @@ Append comment to the user agent string
 .IP
 Output debugging information (default: 0, supplying <category> is
 optional). If <category> is not supplied, output all debugging
-information.<category> can be: net, tor, mempool, http, bench, zmq, db,
+information. <category> can be: net, tor, mempool, http, bench, zmq, db,
 rpc, estimatefee, addrman, selectcoins, reindex, cmpctblock, rand,
 prune, proxy, mempoolrej, libevent, coindb, qt, leveldb, staking,
 masternode, mnbudget, zero, mnping, sapling, sporks.

share/genbuild.sh

@@ -24,7 +24,6 @@ git_check_in_repo() {
 
 DESC=""
 SUFFIX=""
-LAST_COMMIT_DATE=""
 if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null 
@@ -38,9 +37,6 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(
     # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
     SUFFIX=$(git rev-parse --short HEAD)
     git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
-
-    # get a string like "2012-04-10 16:27:19 +0200"
-    LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
 fi
 
 if [ -n "$DESC" ]; then
@@ -54,7 +50,4 @@ fi
 # only update build.h if necessary
 if [ "$INFO" != "$NEWINFO" ]; then
     echo "$NEWINFO" >"$FILE"
-    if [ -n "$LAST_COMMIT_DATE" ]; then
-        echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE"
-    fi
 fi

share/qt/Info.plist.in

@@ -17,7 +17,7 @@
   <string>APPL</string>
 
   <key>CFBundleGetInfoString</key>
-  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Dash Core developers, 2015-@COPYRIGHT_YEAR@ The PIVX Core developers</string>
+  <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers, 2014-@COPYRIGHT_YEAR@ The Dash Core developers, 2015-@COPYRIGHT_YEAR@ The @PACKAGE_NAME@ developers</string>
 
   <key>CFBundleShortVersionString</key>
   <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>

src/Makefile.qt.include

@@ -659,7 +659,7 @@ SECONDARY: $(QT_QM)
 
 $(srcdir)/qt/pivxstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_util_a_SOURCES)
 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
-	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
+	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
 translate: $(srcdir)/qt/pivxstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/pivx.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"

src/chainparams.cpp

@@ -93,6 +93,8 @@ static Checkpoints::MapCheckpoints mapCheckpoints = {
     {2356049, uint256S("62e80d8e193bca84655fb78893b20f54a79f2d71124c4ea37b7ef51a0d5451c4")}, //!< Network split here
     {2365700, uint256S("b5d0beead57735539abc2db2b0b08cd65db3e5928efd3c3bf3182d5bf013f36c")}, //!< PIVX v4.1.1 enforced
     {2678402, uint256S("580a26ff0a45177a7a6f387f009c5b26140ea48b4790a857d9a796f8b3c25899")}, //!< Network split here
+    {3014000, uint256S("78ad99b7225f73c42238bd7ca841ff700542b92bba75a0ef2ed351caa560f87f")}, //!< PIVX v5.3.0 enforced
+    {3024000, uint256S("be4bc75afcfb9136924810f7483b2695089a366cc4ee27fd6dc3ecd5396e1f0f")}, //!< Superblock
 };
 
 static const Checkpoints::CCheckpointData data = {

src/chainparamsbase.cpp

@@ -17,8 +17,8 @@ const std::string CBaseChainParams::REGTEST = "regtest";
 
 void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)
 {
-    strUsage += HelpMessageGroup(_("Chain selection options:"));
-    strUsage += HelpMessageOpt("-testnet", _("Use the test chain"));
+    strUsage += HelpMessageGroup("Chain selection options:");
+    strUsage += HelpMessageOpt("-testnet", "Use the test chain");
     if (debugHelp) {
         strUsage += HelpMessageOpt("-regtest", "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.");

src/clientversion.cpp

@@ -13,7 +13,7 @@
  * for both pivxd and pivx-qt, to make it harder for attackers to
  * target servers or GUI users specifically.
  */
-const std::string CLIENT_NAME("PIVX Core");
+const std::string CLIENT_NAME(PACKAGE_NAME);
 
 /**
  * Client version number
@@ -67,16 +67,7 @@ const std::string CLIENT_NAME("PIVX Core");
 #endif
 #endif
 
-#ifndef BUILD_DATE
-#ifdef GIT_COMMIT_DATE
-#define BUILD_DATE GIT_COMMIT_DATE
-#else
-#define BUILD_DATE __DATE__ ", " __TIME__
-#endif
-#endif
-
 const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX);
-const std::string CLIENT_DATE(BUILD_DATE);
 
 static std::string FormatVersion(int nVersion)
 {

src/clientversion.h

@@ -23,7 +23,7 @@
 #define DO_STRINGIZE(X) #X
 
 //! Copyright string used in Windows .rc files
-#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The Dash Core Developers, 2015-" STRINGIZE(COPYRIGHT_YEAR) " The PIVX Core Developers"
+#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The Dash Core Developers, 2015-" STRINGIZE(COPYRIGHT_YEAR) " The " PACKAGE_NAME " Developers"
 
 /**
  * pivxd-res.rc includes this file, but it cannot cope with real c++ code.
@@ -44,7 +44,6 @@ static const int CLIENT_VERSION =
 
 extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
-extern const std::string CLIENT_DATE;
 
 
 std::string FormatFullVersion();