From d4f9ab71a6a7228fdd4acd4a23eb4f324998edb7 Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:16:45 +0000 Subject: [PATCH 01/13] Revert "Change testnet default p2p port to 21033" This reverts commit 9478da79a3810fc892d0b3ef53295e83c46641f0. --- doc/man/zend.1 | 2 +- doc/tor.md | 2 +- src/chainparams.cpp | 2 +- src/init.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/man/zend.1 b/doc/man/zend.1 index a3c6dde8a..94b7130c5 100644 --- a/doc/man/zend.1 +++ b/doc/man/zend.1 @@ -192,7 +192,7 @@ Relay non\-P2SH multisig (default: 1) .HP \fB\-port=\fR .IP -Listen for connections on (default: 9033 or testnet: 21033) +Listen for connections on (default: 9033 or testnet: 20033) .HP \fB\-proxy=\fR .IP diff --git a/doc/tor.md b/doc/tor.md index 75f7b6f0d..fae8424c9 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -109,7 +109,7 @@ config file): HiddenServiceDir /var/lib/tor/zen-service/ HiddenServicePort 9033 127.0.0.1:9033 - HiddenServicePort 21033 127.0.0.1:21033 + HiddenServicePort 20033 127.0.0.1:20033 The directory can be different of course, but (both) port numbers should be equal to your Zend's P2P listen port (9033 by default). diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 92fe2cbd3..12d4ba308 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -189,7 +189,7 @@ class CTestNetParams : public CMainParams { pchMessageStart[2] = 0xcd; pchMessageStart[3] = 0xe6; vAlertPubKey = ParseHex("048679fb891b15d0cada9692047fd0ae26ad8bfb83fabddbb50334ee5bc0683294deb410be20513c5af6e7b9cec717ade82b27080ee6ef9a245c36a795ab044bb3"); - nDefaultPort = 21033; + nDefaultPort = 20033; // nMinerThreads = 0; nPruneAfterHeight = 1000; diff --git a/src/init.cpp b/src/init.cpp index 2ad44dd49..36fe10eb2 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -396,7 +396,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-onion=", strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)"), "-proxy")); strUsage += HelpMessageOpt("-onlynet=", _("Only connect to nodes in network (ipv4, ipv6 or onion)")); strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), 1)); - strUsage += HelpMessageOpt("-port=", strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 9033, 21033)); + strUsage += HelpMessageOpt("-port=", strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 9033, 20033)); strUsage += HelpMessageOpt("-proxy=", _("Connect through SOCKS5 proxy")); strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), 1)); strUsage += HelpMessageOpt("-seednode=", _("Connect to a node to retrieve peer addresses, and disconnect")); From 569a6ce573cad966057124bcfb6409f01f3584dd Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:16:56 +0000 Subject: [PATCH 02/13] Revert "Change testnet default port to 20033" This reverts commit db372060dc7a7b5d7adb9b63800388bc2089a9ec. --- doc/man/zend.1 | 2 +- doc/tor.md | 2 +- src/chainparams.cpp | 2 +- src/init.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/man/zend.1 b/doc/man/zend.1 index 94b7130c5..5804ace4d 100644 --- a/doc/man/zend.1 +++ b/doc/man/zend.1 @@ -192,7 +192,7 @@ Relay non\-P2SH multisig (default: 1) .HP \fB\-port=\fR .IP -Listen for connections on (default: 9033 or testnet: 20033) +Listen for connections on (default: 9033 or testnet: 19033) .HP \fB\-proxy=\fR .IP diff --git a/doc/tor.md b/doc/tor.md index fae8424c9..d0c4fe738 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -109,7 +109,7 @@ config file): HiddenServiceDir /var/lib/tor/zen-service/ HiddenServicePort 9033 127.0.0.1:9033 - HiddenServicePort 20033 127.0.0.1:20033 + HiddenServicePort 19033 127.0.0.1:19033 The directory can be different of course, but (both) port numbers should be equal to your Zend's P2P listen port (9033 by default). diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 12d4ba308..d617c17d8 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -189,7 +189,7 @@ class CTestNetParams : public CMainParams { pchMessageStart[2] = 0xcd; pchMessageStart[3] = 0xe6; vAlertPubKey = ParseHex("048679fb891b15d0cada9692047fd0ae26ad8bfb83fabddbb50334ee5bc0683294deb410be20513c5af6e7b9cec717ade82b27080ee6ef9a245c36a795ab044bb3"); - nDefaultPort = 20033; + nDefaultPort = 19033; // nMinerThreads = 0; nPruneAfterHeight = 1000; diff --git a/src/init.cpp b/src/init.cpp index 36fe10eb2..fe484abb4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -396,7 +396,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-onion=", strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)"), "-proxy")); strUsage += HelpMessageOpt("-onlynet=", _("Only connect to nodes in network (ipv4, ipv6 or onion)")); strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), 1)); - strUsage += HelpMessageOpt("-port=", strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 9033, 20033)); + strUsage += HelpMessageOpt("-port=", strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 9033, 19033)); strUsage += HelpMessageOpt("-proxy=", _("Connect through SOCKS5 proxy")); strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), 1)); strUsage += HelpMessageOpt("-seednode=", _("Connect to a node to retrieve peer addresses, and disconnect")); From 25ee1f4e9f2764b70ffe369bf0569f9b511966d3 Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:17:05 +0000 Subject: [PATCH 03/13] Revert "Change PROTOCOL_VERSION, MIN_PEER_PROTO_VERSION to 170004" This reverts commit 663d07a27ffb38a61d55eac960c48c2c297ff9e6. --- doc/tor.md | 2 +- qa/rpc-tests/test_framework/mininode.py | 2 +- src/sendalert.cpp | 6 +++--- src/version.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/tor.md b/doc/tor.md index d0c4fe738..de7435752 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -202,7 +202,7 @@ Now use Zen-cli to verify there is only a single peer connection. "id" : 1, "addr" : "d2y2vsq5rxkcpk6f.onion:18233", ... - "version" : 170004, + "version" : 170003, "subver" : "/zen:1.0.0/", ... } diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 36b370120..b46d8770f 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -42,7 +42,7 @@ from util import hex_str_to_bytes, bytes_to_hex_str BIP0031_VERSION = 60000 -MY_VERSION = 170004 # past bip-31 for ping/pong +MY_VERSION = 170003 # past bip-31 for ping/pong MY_SUBVERSION = "/python-mininode-tester:0.0.1/" MAX_INV_SZ = 50000 diff --git a/src/sendalert.cpp b/src/sendalert.cpp index 4cdf22496..b18ae8ba6 100644 --- a/src/sendalert.cpp +++ b/src/sendalert.cpp @@ -76,9 +76,9 @@ void ThreadSendAlert() alert.nCancel = 1001; // cancels previous messages up to this ID number // These versions are protocol versions - // 170004 : 1.0.0 - alert.nMinVer = 170004; - alert.nMaxVer = 170004; + // 170003 : 1.0.0 + alert.nMinVer = 170003; + alert.nMaxVer = 170003; // // main.cpp: diff --git a/src/version.h b/src/version.h index b20a2432a..e7501a137 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 170004; +static const int PROTOCOL_VERSION = 170003; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -18,7 +18,7 @@ static const int INIT_PROTO_VERSION = 209; static const int GETHEADERS_VERSION = 31800; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 170004; +static const int MIN_PEER_PROTO_VERSION = 170003; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this From fb44baca4e8ac3901a359d05e0e2194895043a9f Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:18:17 +0000 Subject: [PATCH 04/13] Revert "Change PROTOCOL_VERSION, MIN_PEER_PROTO_VERSION to 170003" This reverts commit e18c69c2d8436e5b2f009e9d1ebce384acc8640f. --- doc/tor.md | 2 +- qa/rpc-tests/test_framework/mininode.py | 2 +- src/sendalert.cpp | 6 +++--- src/version.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/tor.md b/doc/tor.md index de7435752..07ad072f8 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -202,7 +202,7 @@ Now use Zen-cli to verify there is only a single peer connection. "id" : 1, "addr" : "d2y2vsq5rxkcpk6f.onion:18233", ... - "version" : 170003, + "version" : 170002, "subver" : "/zen:1.0.0/", ... } diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index b46d8770f..e26411cee 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -42,7 +42,7 @@ from util import hex_str_to_bytes, bytes_to_hex_str BIP0031_VERSION = 60000 -MY_VERSION = 170003 # past bip-31 for ping/pong +MY_VERSION = 170002 # past bip-31 for ping/pong MY_SUBVERSION = "/python-mininode-tester:0.0.1/" MAX_INV_SZ = 50000 diff --git a/src/sendalert.cpp b/src/sendalert.cpp index b18ae8ba6..249298ba7 100644 --- a/src/sendalert.cpp +++ b/src/sendalert.cpp @@ -76,9 +76,9 @@ void ThreadSendAlert() alert.nCancel = 1001; // cancels previous messages up to this ID number // These versions are protocol versions - // 170003 : 1.0.0 - alert.nMinVer = 170003; - alert.nMaxVer = 170003; + // 170002 : 1.0.0 + alert.nMinVer = 170002; + alert.nMaxVer = 170002; // // main.cpp: diff --git a/src/version.h b/src/version.h index e7501a137..91a464030 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 170003; +static const int PROTOCOL_VERSION = 170002; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -18,7 +18,7 @@ static const int INIT_PROTO_VERSION = 209; static const int GETHEADERS_VERSION = 31800; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 170003; +static const int MIN_PEER_PROTO_VERSION = 170002; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this From 9a68365a859c87354b28fb9ef15a54294b86add9 Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:19:17 +0000 Subject: [PATCH 05/13] Revert "Add sidechains-testnet2 seed nodes" This reverts commit 522ab9c8acbeb2992a0309b40e4b915f13578d9d. --- src/chainparams.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index d617c17d8..d2cbd2e91 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -203,8 +203,8 @@ class CTestNetParams : public CMainParams { vFixedSeeds.clear(); vSeeds.clear(); - vSeeds.push_back(CDNSSeedData("sidechains-testnet2.horizen.io", "dnsseed.sidechains-testnet2.horizen.io")); //dns seeder - vSeeds.push_back(CDNSSeedData("horizen.io", "sidechains-testnet2.horizen.io")); //fixed seeds, 4 nodes TODO hardcode IPs + vSeeds.push_back(CDNSSeedData("sidechains-testnet.horizen.global", "dnsseed.sidechains-testnet.horizen.global")); //dns seeder + vSeeds.push_back(CDNSSeedData("horizen.global", "sidechains-testnet.horizen.global")); //fixed seeds, 4 nodes // guarantees the first 2 characters, when base58 encoded, are "zt" // guarantees the first 2 characters, when base58 encoded, are "tm" From cfb0822026d0319f75f5378c98aff230f7764d0e Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:19:27 +0000 Subject: [PATCH 06/13] Revert "Add sidechains-testnet seed nodes" This reverts commit bf5e381bdead629205c9f7613c93f04b3cde402c. --- src/chainparams.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index d2cbd2e91..4654625e6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -202,9 +202,11 @@ class CTestNetParams : public CMainParams { vFixedSeeds.clear(); vSeeds.clear(); - - vSeeds.push_back(CDNSSeedData("sidechains-testnet.horizen.global", "dnsseed.sidechains-testnet.horizen.global")); //dns seeder - vSeeds.push_back(CDNSSeedData("horizen.global", "sidechains-testnet.horizen.global")); //fixed seeds, 4 nodes + vSeeds.push_back(CDNSSeedData("dnsseed.testnet.horizen.global", "dnsseed.testnet.horizen.global")); // dns seeder + vSeeds.push_back(CDNSSeedData("dnsseed.testnet.zensystem.io", "dnsseed.testnet.zensystem.io")); // dns seeder + vSeeds.push_back(CDNSSeedData("testnet.horizen.global", "testnet.horizen.global")); // fixed seed + vSeeds.push_back(CDNSSeedData("tesntet.zensytem.io", "tesntet.zensystem.io")); // fixed seed + vSeeds.push_back(CDNSSeedData("node1.zenchain.info", "node1.zenchain.info")); // fixed seed // guarantees the first 2 characters, when base58 encoded, are "zt" // guarantees the first 2 characters, when base58 encoded, are "tm" From 5cae3c98c1a536b2cda9266762f3100575501515 Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Sep 2021 10:21:35 +0000 Subject: [PATCH 07/13] Fix typo --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4654625e6..b98e9e2b0 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -205,7 +205,7 @@ class CTestNetParams : public CMainParams { vSeeds.push_back(CDNSSeedData("dnsseed.testnet.horizen.global", "dnsseed.testnet.horizen.global")); // dns seeder vSeeds.push_back(CDNSSeedData("dnsseed.testnet.zensystem.io", "dnsseed.testnet.zensystem.io")); // dns seeder vSeeds.push_back(CDNSSeedData("testnet.horizen.global", "testnet.horizen.global")); // fixed seed - vSeeds.push_back(CDNSSeedData("tesntet.zensytem.io", "tesntet.zensystem.io")); // fixed seed + vSeeds.push_back(CDNSSeedData("testnet.zensystem.io", "testnet.zensystem.io")); // fixed seed vSeeds.push_back(CDNSSeedData("node1.zenchain.info", "node1.zenchain.info")); // fixed seed // guarantees the first 2 characters, when base58 encoded, are "zt" From d83691597b09db67f9d994c00b6694d3e3aa98ca Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 27 Sep 2021 09:19:26 +0000 Subject: [PATCH 08/13] Set version 3.0.0-beta1 --- README.md | 2 +- configure.ac | 4 ++-- src/clientversion.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 54669f2dd..282561f13 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zen 2.1.0-beta4 +Zen 3.0.0-beta1 ================ What is Horizen? ---------------- diff --git a/configure.ac b/configure.ac index eb54cdf96..ffa03adf7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) -define(_CLIENT_VERSION_MAJOR, 2) -define(_CLIENT_VERSION_MINOR, 2) +define(_CLIENT_VERSION_MAJOR, 3) +define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) diff --git a/src/clientversion.h b/src/clientversion.h index d320cc24e..a63f06e80 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -32,8 +32,8 @@ // a previously released assembly. //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 2 -#define CLIENT_VERSION_MINOR 2 +#define CLIENT_VERSION_MAJOR 3 +#define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 0 From 6d163b5ea27888aa0a051b333ef7bbeb5b3e331f Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 27 Sep 2021 09:58:37 +0000 Subject: [PATCH 09/13] Update Debian package info --- contrib/debian/changelog | 6 +++--- contrib/debian/control | 4 ++-- contrib/debian/copyright | 2 +- zcutil/build-debian-package.sh | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index d59450f33..101aad1ba 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +1,5 @@ -zen (2.0.15) stable; urgency=medium +zen (3.0.0-beta1) stable; urgency=medium - * 2.0.15 release. + * new release - -- Zen Blockchain Foundation Thu, 27 Sep 2018 23:00:00 +0200 + -- Zen Blockchain Foundation Mon, 27 Sep 2021 16:03:57 +0000 diff --git a/contrib/debian/control b/contrib/debian/control index a102a3164..d2a3d50cb 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -7,8 +7,8 @@ Build-Depends: autoconf, automake, bsdmainutils, build-essential, git, g++-multilib, libc6-dev, libtool, m4, ncurses-dev, pkg-config, python, unzip, wget, zlib1g-dev -Vcs-Git: https://github.com/HorizenOfficial/zen.git -Vcs-Browser: https://github.com/HorizenOfficial/zen +Vcs-Git: https://github.com/HorizenOfficial/zend_oo.git +Vcs-Browser: https://github.com/HorizenOfficial/zend_oo Package: zen Architecture: any diff --git a/contrib/debian/copyright b/contrib/debian/copyright index ac7b1cb47..d673fd86b 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -1,7 +1,7 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174 Upstream-Name: Horizen Upstream-Contact: Horizen Team -Source: https://github.com/HorizenOfficial/zen +Source: https://github.com/HorizenOfficial/zend_oo Files: * Copyright: 2016-2018, The Zen Blockchain Foundation diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh index bfa972294..fd1ba4cd9 100755 --- a/zcutil/build-debian-package.sh +++ b/zcutil/build-debian-package.sh @@ -46,7 +46,8 @@ cp $SRC_PATH/src/zend $DEB_BIN cp $SRC_PATH/src/zen-cli $DEB_BIN cp $SRC_PATH/zcutil/fetch-params.sh $DEB_BIN/zen-fetch-params # Copy docs -cp $SRC_PATH/doc/release-notes/release-notes-1.0.0.md $DEB_DOC/changelog +cp $SRC_PATH/doc/release-notes/release-notes-$(cut -d "-" -f 1-2 <<<${PACKAGE_VERSION})* $DEB_DOC/changelog || +cp "$(ls -v $SRC_PATH/doc/release-notes/release-notes-* | tail -n1)" $DEB_DOC/changelog cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian cp $SRC_DEB/copyright $DEB_DOC cp -r $SRC_DEB/examples $DEB_DOC From 4f558cf3465fbf0475f194a35f75c6dcf8676341 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 27 Sep 2021 10:18:09 +0000 Subject: [PATCH 10/13] Update testnet checkpoint blocks --- src/chainparams.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b98e9e2b0..42d592988 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -256,11 +256,12 @@ class CTestNetParams : public CMainParams { (643000, uint256S("0x0000cabf39e3ac435d54b95c32e6173d6bb1b060066ecb7453d2146a0dd40947")) (729000, uint256S("0x00013f6d5315f29094287bf0981b177098c5d467422bc4ab7764f88f11333f5f")) (816500, uint256S("0x0004c69745c68058fb35b2a8e090887500f71f7e107f0fd6f3e57d21afa5fe76")) - (869828, uint256S("0x0009d4d6d27f523b76ef9ed76b4a4c5044d30b3a6248b0a7296bdc58a5524c05")), // TODO pre + post fork checkpoints after fork execution - 1624434824, // * UNIX timestamp of last checkpoint block - 1698638, // * total number of transactions between genesis and last checkpoint + (869828, uint256S("0x0009d4d6d27f523b76ef9ed76b4a4c5044d30b3a6248b0a7296bdc58a5524c05")) + (924840, uint256S("0x0007e7525b8958d387aedbfbc622feed4a82d7ecb1033a080af75dcb8933a453")), // TODO pre + post fork checkpoints after zendoo fork execution + 1632734842, // * UNIX timestamp of last checkpoint block + 1754342, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 1124 // total number of tx / (checkpoint block height / (24 * 24)) + 1093 // total number of tx / (checkpoint block height / (24 * 24)) }; // commented out - seems to make no sense but kept around for reference just in case From c78805a1620a69f3b84c4e7fc98c3836c1b307ba Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 27 Sep 2021 10:32:27 +0000 Subject: [PATCH 11/13] Update manpages --- doc/man/zen-cli.1 | 6 +++--- doc/man/zen-tx.1 | 6 +++--- doc/man/zend.1 | 55 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/doc/man/zen-cli.1 b/doc/man/zen-cli.1 index ba287db8c..3ec968d19 100644 --- a/doc/man/zen-cli.1 +++ b/doc/man/zen-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEN-CLI "1" "March 2021" "zen-cli v2.1.0-beta4" "User Commands" +.TH ZEN-CLI "1" "September 2021" "zen-cli v3.0.0-beta1" "User Commands" .SH NAME -zen-cli \- manual page for zen-cli v2.1.0-beta4 +zen-cli \- manual page for zen-cli v3.0.0-beta1 .SH DESCRIPTION -Horizen RPC client version v2.1.0\-beta4 +Horizen RPC client version v3.0.0\-beta1 .SS "Usage:" .TP zen\-cli [options] [params] diff --git a/doc/man/zen-tx.1 b/doc/man/zen-tx.1 index 1417e19c8..b31e4afa5 100644 --- a/doc/man/zen-tx.1 +++ b/doc/man/zen-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEN-TX "1" "July 2021" "zen-tx v2.1.0-beta4" "User Commands" +.TH ZEN-TX "1" "September 2021" "zen-tx v3.0.0-beta1" "User Commands" .SH NAME -zen-tx \- manual page for zen-tx v2.1.0-beta4 +zen-tx \- manual page for zen-tx v3.0.0-beta1 .SH DESCRIPTION -Zencash zen\-tx utility version v2.1.0\-beta4 +Zencash zen\-tx utility version v3.0.0\-beta1 .SS "Usage:" .TP zen\-tx [options] [commands] diff --git a/doc/man/zend.1 b/doc/man/zend.1 index 5804ace4d..f427564be 100644 --- a/doc/man/zend.1 +++ b/doc/man/zend.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEND "1" "March 2021" "zend v2.1.0-beta4" "User Commands" +.TH ZEND "1" "September 2021" "zend v3.0.0-beta1" "User Commands" .SH NAME -zend \- manual page for zend v2.1.0-beta4 +zend \- manual page for zend v3.0.0-beta1 .SH DESCRIPTION -Zen Daemon version v2.1.0\-beta4 +Zen Daemon version v3.0.0\-beta1 .SS "Usage:" .TP zend [options] @@ -51,7 +51,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,2\/\fR.1.0\-beta4) +\fB\-disabledeprecation\fR=\fI\,3\/\fR.0.0\-beta1) .HP \fB\-exportdir=\fR .IP @@ -421,12 +421,17 @@ Set minimum block size in bytes (default: 0) .HP \fB\-blockmaxsize=\fR .IP -Set maximum block size in bytes (default: 2000000) +Set maximum block size in bytes (default: 4000000) +.HP +\fB\-blocktxpartitionmaxsize=\fR (regtest only) +.IP +Set maximum partition block size for transcations in bytes (default: +2000000) .HP \fB\-blockprioritysize=\fR .IP -Set maximum size of high\-priority/low\-fee transactions in bytes -(default: 1000000) +Set maximum size of high\-priority/low\-fee transactions/certificates in +bytes (default: 1000000) .HP \fB\-blockmaxcomplexity=\fR .IP @@ -442,6 +447,16 @@ negative values means no limit is applied. (default: 0) Disable block complexity calculation and use the previous GetBlockTemplate implementation .HP +\fB\-scproofverificationdelay=\fR