Merge pull request #196 from HorizenOfficial/cr/prepare_release_3.0.0…

…-beta1

cr/prepare release 3.0.0-beta1

README.md

@@ -1,4 +1,4 @@
-Zen 2.1.0-beta4 <!---TO BE BUMPED UP UPON RELEASE -->
+Zen 3.0.0-beta1
 ================
 What is Horizen?
 ----------------

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

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 <info@horizen.io>  Thu, 27 Sep 2018 23:00:00 +0200
+ -- Zen Blockchain Foundation <info@horizen.io>  Mon, 27 Sep 2021 16:03:57 +0000

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

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 <info@Horizen.global>
-Source: https://github.com/HorizenOfficial/zen
+Source: https://github.com/HorizenOfficial/zend_oo
 
 Files: *
 Copyright: 2016-2018, The Zen Blockchain Foundation

doc/authors.md

@@ -6,7 +6,7 @@ Simon Liu (338)
 FranckDG (219)
 Sean Bowe (204)
 Daira Hopwood (142)
-cronicc (122)
+cronicc (136)
 Wladimir J. van der Laan (122)
 Nathan Wilcox (106)
 Jay Graber (75)
@@ -25,7 +25,6 @@ nomnombtc (18)
 Paige Peterson (13)
 fanquake (12)
 Luke Dashjr (12)
-abi87 (11)
 MarcoFalke (11)
 Jake Tarren (11)
 hellcatz (10)

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] <command> [params]

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] <hex\-tx> [commands]

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<version>
 .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<dir>
 .IP
@@ -192,7 +192,7 @@ Relay non\-P2SH multisig (default: 1)
 .HP
 \fB\-port=\fR<port>
 .IP
-Listen for connections on <port> (default: 9033 or testnet: 21033)
+Listen for connections on <port> (default: 9033 or testnet: 19033)
 .HP
 \fB\-proxy=\fR<ip:port>
 .IP
@@ -421,12 +421,17 @@ Set minimum block size in bytes (default: 0)
 .HP
 \fB\-blockmaxsize=\fR<n>
 .IP
-Set maximum block size in bytes (default: 2000000)
+Set maximum block size in bytes (default: 4000000)
+.HP
+\fB\-blocktxpartitionmaxsize=\fR<n> (regtest only)
+.IP
+Set maximum partition block size for transcations in bytes (default:
+2000000)
 .HP
 \fB\-blockprioritysize=\fR<n>
 .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<n>
 .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<time>
+.IP
+The maximum delay in milliseconds between sc proof batch verification
+requests. (default: 5000)
+.HP
+\fB\-scproofqueuesize=\fR<size>
+.IP
+The threshold size of the sc proof queue that triggers a call to the
+batch verification. (default: 10)
+.HP
 \fB\-cbhsafedepth=\fR<n>
 .IP
 regtest only \- Set safe depth for skipping checkblockatheight in txout
@@ -458,11 +473,33 @@ params)
 regtest/testnet only \- allow non\-standard tx (default depends on
 regtest/testnet params)
 .HP
+\fB\-subsidyhalvinginterval=\fR<n>
+.IP
+regtest only \- Set halving interval for testing purposes (default=2000;
+must be > 100)
+.HP
 \fB\-sccoinsmaturity=\fR<n>
 .IP
 regtest only \- Set the maturity of sc funds as number of blocks to be
 mined before they are computed in the sc balance (default depends on
 regtest/testnet params)
+.HP
+\fB\-blocksforscfeecheck=\fR<n>
+.IP
+regtest only \- Set the number of blocks used for computing the number of
+epoch to go back for getting the active data cert sc fee value and check
+on it for removing a FT or mbtr tx from mempool (default depends on
+regtest params)
+.HP
+\fB\-skipscproof\fR
+.IP
+regtest only \- Skip the proof verification for sidechain certificates or
+CSW transactions (by default it is never skipped)
+.HP
+\fB\-forcelocalban\fR
+.IP
+regtest only \- Override the default behavior that prevents the ban of a
+misbehaving local node
 .PP
 Mining options:
 .HP
@@ -514,8 +551,8 @@ Password for JSON\-RPC connections
 .HP
 \fB\-rpcport=\fR<port>
 .IP
-Listen for JSON\-RPC connections on <port> (default: 8232 or testnet:
-18232)
+Listen for JSON\-RPC connections on <port> (default: 8231 or testnet:
+18231)
 .HP
 \fB\-rpcallowip=\fR<ip>
 .IP