Skip to content

Commit

Permalink
Merge pull request #193 from ZencashOfficial/cr/next_release_prep
Browse files Browse the repository at this point in the history
Cr/next release prep
  • Loading branch information
cronicc authored Oct 9, 2019
2 parents 9067cd8 + a9a4835 commit 997fe97
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 126 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Zen 2.0.18
Zen 2.0.19
==============

What is Horizen?
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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, 18)
define(_CLIENT_VERSION_REVISION, 19)
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)))
Expand Down
4 changes: 2 additions & 2 deletions depends/packages/openssl.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=openssl
$(package)_version=1.1.1c
$(package)_version=1.1.1d
$(package)_download_path=https://www.openssl.org/source
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90
$(package)_sha256_hash=1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2

define $(package)_set_vars
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
Expand Down
180 changes: 106 additions & 74 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -1,108 +1,140 @@
Zcash Contributors
==================

Jack Grigg (558)
Simon Liu (286)
Sean Bowe (193)
Daira Hopwood (102)
Wladimir J. van der Laan (71)
Taylor Hornby (65)
Nathan Wilcox (56)
Jay Graber (53)
Jonas Schnelli (49)
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)
Cory Fields (28)
Pieter Wuille (16)
syd (13)
nomnombtc (9)
Paige Peterson (9)
fanquake (8)
MarcoFalke (7)
Luke Dashjr (6)
Jake Tarren (37)
Pieter Wuille (32)
hellcatz (29)
nomnombtc (27)
PeaStew (21)
tarrenj (18)
Luke Dashjr (18)
zebambam (17)
Paige Peterson (17)
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)
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)
Gregory Maxwell (5)
Ariel Gabizon (5)
kozyilmaz (4)
Zclassic Team (4)
Philip Kaufmann (4)
Peter Todd (4)
Patrick Strateman (4)
Matt Corallo (4)
Karl-Johan Alm (4)
Homu (5)
paveljanik (4)
codeparticle (4)
Kent (4)
Joshua Yabut (4)
Jeff Garzik (4)
David Mercer (4)
Daniel Cousens (4)
zathras-crypto (3)
unsystemizer (3)
practicalswift (3)
mruddy (3)
lpescher (3)
Pavel Janík (3)
João Barbosa (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)
str4d (2)
paveljanik (2)
kpcyrd (2)
Alex van der Peet (3)
Alberto Garoffolo (3)
Adam Weiss (3)
Adam Brown (3)
pier (2)
koljenovic (2)
aniemerg (2)
Scott (2)
Robert C. Seacord (2)
Per Grön (2)
Marius Kjærstad (2)
Joe Turgeon (2)
Jason Davies (2)
Jack Gavigan (2)
JOSEPH NICHOLAS R. ALCANTARA (2)
Igor Mikheiko (2)
ITH4Coinomia (2)
Gavin Andresen (2)
Bjorn Hjortsberg (2)
Amgad Abdelhafez (2)
zathras-crypto (1)
unsystemizer (1)
practicalswift (1)
mruddy (1)
Franck De Girolami (2)
mrbandrews (1)
kazcw (1)
isle2983 (1)
instagibbs (1)
emilrus (1)
dexX7 (1)
daniel (1)
calebogden (1)
ayleph (1)
Tom Ritter (1)
Stephen (1)
S. Matthew English (1)
Ross Nicoll (1)
René Nyffenegger (1)
Pavel Vasin (1)
Paul Georgiou (1)
Paragon Initiative Enterprises, LLC (1)
Nathaniel Mahieu (1)
Murilo Santana (1)
Matt Quinn (1)
Louis Nyffenegger (1)
Leo Arias (1)
Lars-Magnus Skog (1)
Kevin Pan (1)
Jorge Timón (1)
Jonathan "Duke" Leto (1)
Jeffrey Walton (1)
Ian Kelling (1)
Gaurav Rana (1)
Forrest Voight (1)
Florian Schmaus (1)
Ethan Heilman (1)
Eran Tromer (1)
Duke Leto (1)
Daniel Kraft (1)
Christian von Roques (1)
Chirag Davé (1)
Casey Rodarmor (1)
Cameron Boehmer (1)
Bryan Stitt (1)
Bruno Arueira (1)
Boris Hajduk (1)
Bob McElrath (1)
Bitcoin Error Log (1)
Ariel (1)
Anthony Towns (1)
Allan Niemerg (1)
Alex van der Peet (1)
Alex (1)
Adam Weiss (1)
Adam Brown (1)
4ZEC (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" "July 2019" "zen-cli v2.0.18" "User Commands"
.TH ZEN-CLI "1" "October 2019" "zen-cli v2.0.19" "User Commands"
.SH NAME
zen-cli \- manual page for zen-cli v2.0.18
zen-cli \- manual page for zen-cli v2.0.19
.SH DESCRIPTION
Horizen RPC client version v2.0.18
Horizen RPC client version v2.0.19
.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" "July 2019" "zen-tx v2.0.18" "User Commands"
.TH ZEN-TX "1" "October 2019" "zen-tx v2.0.19" "User Commands"
.SH NAME
zen-tx \- manual page for zen-tx v2.0.18
zen-tx \- manual page for zen-tx v2.0.19
.SH DESCRIPTION
Zencash zen\-tx utility version v2.0.18
Zencash zen\-tx utility version v2.0.19
.SS "Usage:"
.TP
zen\-tx [options] <hex\-tx> [commands]
Expand Down
26 changes: 4 additions & 22 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" "July 2019" "zend v2.0.18" "User Commands"
.TH ZEND "1" "October 2019" "zend v2.0.19" "User Commands"
.SH NAME
zend \- manual page for zend v2.0.18
zend \- manual page for zend v2.0.19
.SH DESCRIPTION
Zen Daemon version v2.0.18
Zen Daemon version v2.0.19
.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.18)
\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.19)
.HP
\fB\-exportdir=\fR<dir>
.IP
Expand Down Expand Up @@ -328,24 +328,6 @@ Enable publish raw block in <address>
.IP
Enable publish raw transaction in <address>
.PP
AMQP 1.0 notification options:
.HP
\fB\-amqppubhashblock=\fR<address>
.IP
Enable publish hash block in <address>
.HP
\fB\-amqppubhashtx=\fR<address>
.IP
Enable publish hash transaction in <address>
.HP
\fB\-amqppubrawblock=\fR<address>
.IP
Enable publish raw block in <address>
.HP
\fB\-amqppubrawtx=\fR<address>
.IP
Enable publish raw transaction in <address>
.PP
Debugging/Testing options:
.HP
\fB\-debug=\fR<category>
Expand Down
11 changes: 11 additions & 0 deletions doc/release-notes/release-notes-v2.0.19.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Changelog
=========

cronicc (6):
Add new dns seeders
Update OpenSSL to 1.1.1d
Set mainnet/testnet checkpoint blocks
Set version to 2.0.19
Set deprecation block 680000
Generate manpages

38 changes: 20 additions & 18 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ class CMainParams : public CChainParams {

vFixedSeeds.clear();
vSeeds.clear();
vSeeds.push_back(CDNSSeedData("horizen.global", "dnsseed.horizen.global"));
vSeeds.push_back(CDNSSeedData("zenseed.network", "dnsseed.zenseed.network"));
vSeeds.push_back(CDNSSeedData("zenchain.info", "node1.zenchain.info"));
vSeeds.push_back(CDNSSeedData("zenseed.network", "mainnet.zenseed.network"));
vSeeds.push_back(CDNSSeedData("horizen.global", "mainnet.horizen.global"));
vSeeds.push_back(CDNSSeedData("dnsseed.horizen.global", "dnsseed.horizen.global")); // dns seeder
vSeeds.push_back(CDNSSeedData("dnsseed.zensystem.io", "dnsseed.zensystem.io")); // dns seeder
vSeeds.push_back(CDNSSeedData("mainnet.horizen.global", "mainnet.horizen.global")); // fixed seed
vSeeds.push_back(CDNSSeedData("mainnet.zensytem.io", "mainnet.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 "zn"
// guarantees the first 2 characters, when base58 encoded, are "t1"
Expand Down Expand Up @@ -146,11 +146,12 @@ class CMainParams : public CChainParams {
( 294072, uint256S("0x000000005f9ceecc87d9e5eaab2cf548c787231829ad6f609975fadd10fff5be"))
( 429014, uint256S("0x000000000dc4f58375d9fa6dc4cb1bfc4b0afefbf4f7e1ee2cc755d6ca3b40b0"))
( 491000, uint256S("0x0000000018d0b189de58bcd8ff5048d2e4d1c652b98912ff002c8f07c6f81b8c"))
( 543000, uint256S("0x00000000111469e247ecb152e57c371147775b56173260950075dcb471614fed")),
1561970026, // * UNIX timestamp of last checkpoint block
8879326, // * total number of transactions between genesis and last checkpoint
( 543000, uint256S("0x00000000111469e247ecb152e57c371147775b56173260950075dcb471614fed"))
( 596000, uint256S("0x000000000656846513b2d3faf3a70f59dc22fffcb8e14401ec5a17eec8994410")),
1569977374, // * UNIX timestamp of last checkpoint block
10471870, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
9418 // * estimated number of transactions per day after checkpoint
10120 // * estimated number of transactions per day after checkpoint
// total number of tx / (checkpoint block height / (24 * 24))
};

Expand Down Expand Up @@ -196,11 +197,11 @@ class CTestNetParams : public CMainParams {

vFixedSeeds.clear();
vSeeds.clear();

vSeeds.push_back(CDNSSeedData("horizen.global", "dnsseed.testnet.horizen.global"));
vSeeds.push_back(CDNSSeedData("blockoperations.com", "zpool2.blockoperations.com"));
vSeeds.push_back(CDNSSeedData("scottrockcafe.com", "node.scottrockcafe.com"));
vSeeds.push_back(CDNSSeedData("horizen.global", "testnet.horizen.global"));
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"
Expand Down Expand Up @@ -239,11 +240,12 @@ class CTestNetParams : public CMainParams {
(38000, uint256S("0x001e9a2d2e2892b88e9998cf7b079b41d59dd085423a921fe8386cecc42287b8"))
(362210, uint256S("0x00023d5c074a7c2ccf130dac34b2b6f77e3c4466cfed0b72c3f3715157c92949"))
(423000, uint256S("0x000d04b28067fe99445961f795ee7436f1dbbffc3a045f6890868e605209d170"))
(467550, uint256S("0x0007f73f339ea99e920e83da38d7537ce7d0028d48e709c88b1b89adf521b4f9")),
1561953209, // * UNIX timestamp of last checkpoint block
981759, // * total number of transactions between genesis and last checkpoint
(467550, uint256S("0x0007f73f339ea99e920e83da38d7537ce7d0028d48e709c88b1b89adf521b4f9"))
(520000, uint256S("0x00052e65426a0ffbb90893208a6c89a82816abbed328fa2be5a647828609e61a")),
1569935276, // * UNIX timestamp of last checkpoint block
1090788, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
1209 // total number of tx / (checkpoint block height / (24 * 24))
1208 // total number of tx / (checkpoint block height / (24 * 24))
};

// commented out - seems to make no sense but kept around for reference just in case
Expand Down
Loading

0 comments on commit 997fe97

Please sign in to comment.