Skip to content

Commit

Permalink
Merge pull request #224 from ZencashOfficial/cr/prepare_release_2.0.20
Browse files Browse the repository at this point in the history
  • Loading branch information
cronicc committed Feb 10, 2020
2 parents f6a4b32 + 9a96535 commit 7e2da33
Show file tree
Hide file tree
Showing 11 changed files with 250 additions and 154 deletions.
34 changes: 31 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Zen 2.0.19-1
Zen 2.0.20
==============

What is Horizen?
Expand Down Expand Up @@ -86,7 +86,8 @@ https://github.com/ZencashOfficial/zencash-apple
* Install for Windows (Cross-Compiled, building on Windows is not supported yet)

```
./zcutil/build-win.sh -j$(nproc)
export HOST=x86_64-w64-mingw32
./zcutil/build.sh -j$(nproc)
```

* Install for aarch64(ARM64)
Expand All @@ -102,8 +103,35 @@ ln -s /usr/bin/ranlib aarch64-unknown-linux-gnu-ranlib
ln -s /usr/bin/strip aarch64-unknown-linux-gnu-strip
PATH=$PATH:~/bin
cd ~/zen/
./zcutil/build-arm.sh -j$(nproc)
export HOST=aarch64-unknown-linux
./zcutil/build.sh -j$(nproc)
```
Running Regression Tests
----------------
1. Get dependencies:
1. Debian
```{r, engine='bash'}
sudo apt-get install \
python python-dev python-pip python-setuptools \
python-wheel python-wheel-common python-zmq
sudo pip install --upgrade pyblake2
```
2. MacOS
```{r, engine='bash'}
brew install python@2
sudo pip install --upgrade pyblake2 pyzmq
```
2. Start test suite
```{r, engine='bash'}
if [[ "$OSTYPE" == "darwin"* ]]; then
TEST_ARGS="btest gtest sec-hard no-dot-so util-test secp256k1 libsnark univalue rpc --rpc-extended --rpc-exclude=rpcbind_test.py"
else
TEST_ARGS="--rpc-extended"
fi
export HOST=$(gcc -dumpmachine)
./zcutil/fetch-params.sh
./qa/zcash/full_test_suite.py ${TEST_ARGS}
```
Instructions to redeem pre-block 110,000 ZCL
-------------
1. Linux:
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 19)
define(_CLIENT_VERSION_BUILD, 51)
define(_CLIENT_VERSION_REVISION, 20)
define(_CLIENT_VERSION_BUILD, 50)
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)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
define(_CLIENT_VERSION_IS_RELEASE, true)
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/libsodium.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package=libsodium
$(package)_version=1.0.15
$(package)_download_path=https://download.libsodium.org/libsodium/releases/old/
$(package)_download_path=https://download.libsodium.org/libsodium/releases/old/unsupported/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
$(package)_dependencies=
Expand Down
259 changes: 132 additions & 127 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -1,140 +1,145 @@
Zcash Contributors
==================

Jack Grigg (976)
FranckDG (438)
Simon Liu (390)
cronicc (285)
Sean Bowe (213)
Daira Hopwood (184)
Wladimir J. van der Laan (173)
Nathan Wilcox (156)
Alberto Sala (140)
Taylor Hornby (113)
Jonas Schnelli (99)
Jay Graber (97)
pierstab (67)
Cory Fields (62)
syd (43)
joshuayabut (40)
Kevin Gallagher (38)
Jake Tarren (37)
Jack Grigg (1006)
Simon Liu (287)
Sean Bowe (241)
FranckDG (219)
Daira Hopwood (199)
Wladimir J. van der Laan (141)
cronicc (114)
Jay Graber (110)
Nathan Wilcox (106)
Jonas Schnelli (98)
Kevin Gallagher (76)
Taylor Hornby (73)
Cory Fields (56)
MarcoOl94 (50)
Pieter Wuille (32)
hellcatz (29)
nomnombtc (27)
PeaStew (21)
tarrenj (18)
Luke Dashjr (18)
zebambam (17)
Paige Peterson (17)
pierstab (29)
Alberto Sala (29)
syd (28)
joshuayabut (20)
nomnombtc (18)
Paige Peterson (18)
fanquake (16)
Code Particle (16)
MarcoFalke (15)
Ariel Gabizon (15)
kozyilmaz (12)
Reza Barazesh (12)
Peter Todd (12)
Matt Corallo (12)
Karl-Johan Alm (12)
Gregory Maxwell (11)
g666 (10)
Philip Kaufmann (10)
Pavel Janík (9)
Jonathan "Duke" Leto (8)
str4d (6)
pstab (6)
kpcyrd (6)
Smrtz (6)
Per Grön (6)
MarcoFalke (14)
Luke Dashjr (12)
Jake Tarren (11)
hellcatz (10)
abi87 (10)
Johnathan Corgan (10)
Gregory Maxwell (10)
Ariel Gabizon (10)
tarrenj (8)
kozyilmaz (8)
Peter Todd (8)
Matt Corallo (8)
Karl-Johan Alm (8)
Jeff Garzik (8)
David Mercer (8)
Daniel Cousens (8)
Code Particle (8)
Philip Kaufmann (7)
PeaStew (7)
lpescher (6)
Pavel Janík (6)
Patrick Strateman (6)
Larry Ruane (6)
Jason Davies (6)
Jack Gavigan (6)
Gavin Andresen (6)
Daniel Cousens (6)
Boris P (6)
Bjorn Hjortsberg (6)
Amgad Abdelhafez (6)
nickolay (5)
fgius (5)
ca333 (5)
Stefano (5)
Oleksandr Iozhytsia (5)
João Barbosa (5)
Johnathan Corgan (5)
Homu (5)
João Barbosa (6)
Alfie John (5)
str4d (4)
paveljanik (4)
codeparticle (4)
Kent (4)
Joshua Yabut (4)
Jeff Garzik (4)
David Mercer (4)
zathras-crypto (3)
unsystemizer (3)
practicalswift (3)
mruddy (3)
lpescher (3)
instagibbs (3)
emilrus (3)
dexX7 (3)
daniel (3)
calebogden (3)
Stephen (3)
Ross Nicoll (3)
René Nyffenegger (3)
Pavel Vasin (3)
Paul Georgiou (3)
Nathaniel Mahieu (3)
Murilo Santana (3)
Matt Quinn (3)
Leo Arias (3)
Kevin Pan (3)
Jorge Timón (3)
Ian Kelling (3)
Forrest Voight (3)
Florian Schmaus (3)
Duke Leto (3)
Daniel Kraft (3)
Casey Rodarmor (3)
Bruno Arueira (3)
Boris Hajduk (3)
Bob McElrath (3)
Ariel (3)
Anthony Towns (3)
Allan Niemerg (3)
Alfie John (3)
Alex van der Peet (3)
Alberto Garoffolo (3)
Adam Weiss (3)
Adam Brown (3)
pier (2)
koljenovic (2)
kpcyrd (4)
Scott (4)
Reza Barazesh (4)
Per Grön (4)
Joe Turgeon (4)
Jason Davies (4)
Jack Gavigan (4)
ITH4Coinomia (4)
Gavin Andresen (4)
Bjorn Hjortsberg (4)
Amgad Abdelhafez (4)
zebambam (3)
Smrtz (3)
Robert C. Seacord (3)
Jonathan "Duke" Leto (3)
zathras-crypto (2)
unsystemizer (2)
pstab (2)
practicalswift (2)
mruddy (2)
mrbandrews (2)
kazcw (2)
isle2983 (2)
instagibbs (2)
g666 (2)
emilrus (2)
dexX7 (2)
daniel (2)
codeparticle (2)
calebogden (2)
ayleph (2)
aniemerg (2)
Scott (2)
Robert C. Seacord (2)
Marius Kjærstad (2)
Joe Turgeon (2)
JOSEPH NICHOLAS R. ALCANTARA (2)
Igor Mikheiko (2)
ITH4Coinomia (2)
Franck De Girolami (2)
mrbandrews (1)
kazcw (1)
isle2983 (1)
ayleph (1)
Stephen (2)
S. Matthew English (2)
Ross Nicoll (2)
René Nyffenegger (2)
Pavel Vasin (2)
Paul Georgiou (2)
Paragon Initiative Enterprises, LLC (2)
Nathaniel Mahieu (2)
Murilo Santana (2)
Miles Manley (2)
Matt Quinn (2)
Louis Nyffenegger (2)
Leo Arias (2)
Kevin Pan (2)
Joshua Yabut (2)
Jorge Timón (2)
Jeffrey Walton (2)
Ian Kelling (2)
Forrest Voight (2)
Florian Schmaus (2)
Eran Tromer (2)
Duke Leto (2)
Daniel Kraft (2)
Christian von Roques (2)
Chirag Davé (2)
Casey Rodarmor (2)
Cameron Boehmer (2)
Bryan Stitt (2)
Bruno Arueira (2)
Boris Hajduk (2)
Bob McElrath (2)
Bitcoin Error Log (2)
Ariel (2)
Anthony Towns (2)
Allan Niemerg (2)
Alex van der Peet (2)
Adam Weiss (2)
Adam Brown (2)
4ZEC (2)
(2)
pier (1)
nickolay (1)
koljenovic (1)
fgius (1)
ca333 (1)
Zcash Company (1)
Tom Ritter (1)
S. Matthew English (1)
Paragon Initiative Enterprises, LLC (1)
Louis Nyffenegger (1)
Stefano (1)
Oleksandr Iozhytsia (1)
Marius Kjærstad (1)
Lars-Magnus Skog (1)
Jeffrey Walton (1)
Larry Ruane (1)
Kent (1)
JOSEPH NICHOLAS R. ALCANTARA (1)
Igor Mikheiko (1)
Homu (1)
Gaurav Rana (1)
Franck De Girolami (1)
Ethan Heilman (1)
Eran Tromer (1)
Christian von Roques (1)
Chirag Davé (1)
Cameron Boehmer (1)
Bryan Stitt (1)
Bitcoin Error Log (1)
Boris P (1)
Alex (1)
4ZEC (1)
Alberto Garoffolo (1)
6 changes: 3 additions & 3 deletions doc/man/zen-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZEN-CLI "1" "November 2019" "zen-cli v2.0.19-1" "User Commands"
.TH ZEN-CLI "1" "February 2020" "zen-cli v2.0.20" "User Commands"
.SH NAME
zen-cli \- manual page for zen-cli v2.0.19-1
zen-cli \- manual page for zen-cli v2.0.20
.SH DESCRIPTION
Horizen RPC client version v2.0.19-1
Horizen RPC client version v2.0.20
.SS "Usage:"
.TP
zen\-cli [options] <command> [params]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zen-tx.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZEN-TX "1" "November 2019" "zen-tx v2.0.19-1" "User Commands"
.TH ZEN-TX "1" "February 2020" "zen-tx v2.0.20" "User Commands"
.SH NAME
zen-tx \- manual page for zen-tx v2.0.19-1
zen-tx \- manual page for zen-tx v2.0.20
.SH DESCRIPTION
Zencash zen\-tx utility version v2.0.19-1
Zencash zen\-tx utility version v2.0.20
.SS "Usage:"
.TP
zen\-tx [options] <hex\-tx> [commands]
Expand Down
8 changes: 4 additions & 4 deletions doc/man/zend.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZEND "1" "November 2019" "zend v2.0.19-1" "User Commands"
.TH ZEND "1" "February 2020" "zend v2.0.20" "User Commands"
.SH NAME
zend \- manual page for zend v2.0.19-1
zend \- manual page for zend v2.0.20
.SH DESCRIPTION
Zen Daemon version v2.0.19-1
Zen Daemon version v2.0.20
.SS "Usage:"
.TP
zend [options]
Expand Down Expand Up @@ -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.0.19-1)
\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.20)
.HP
\fB\-exportdir=\fR<dir>
.IP
Expand Down
Loading

0 comments on commit 7e2da33

Please sign in to comment.