diff --git a/README.md b/README.md index faa2549a9..9db3c2d90 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.0-rc2 +Zcash 1.0.0-rc3 =============== What is Zcash? diff --git a/configure.ac b/configure.ac index 085786323..8cfbe6aff 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 26) +define(_CLIENT_VERSION_BUILD, 27) 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, false) diff --git a/contrib/DEBIAN/changelog b/contrib/DEBIAN/changelog index 89d489066..9e8621465 100644 --- a/contrib/DEBIAN/changelog +++ b/contrib/DEBIAN/changelog @@ -1,3 +1,9 @@ +zcash (1.0.0-rc3) jessie; urgency=medium + + * 1.0.0-rc3 release. + + -- Zcash Company Wed, 26 Oct 2016 23:17:03 +0100 + zcash (1.0.0-rc2) jessie; urgency=medium * 1.0.0-rc2 release. diff --git a/contrib/DEBIAN/control b/contrib/DEBIAN/control index 6d3b8d129..05d9a43f7 100644 --- a/contrib/DEBIAN/control +++ b/contrib/DEBIAN/control @@ -10,7 +10,7 @@ Build-Depends: autoconf, automake, bsdmainutils, build-essential Vcs-Git: git@github.com:zcash/zcash.git Vcs-Browser: https://github.com/zcash/zcash Package: zcash -Version: 1.0.0-rc2 +Version: 1.0.0-rc3 Architecture: amd64 Depends: libgomp1 Description: Zcash is an implementation of the "Zerocash" protocol. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 69ffa33b1..d11f6322a 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.0-rc2" +name: "zcash-1.0.0-rc3" enable_cache: true distro: "debian" suites: diff --git a/doc/release-notes/release-notes-1.0.0-rc3.md b/doc/release-notes/release-notes-1.0.0-rc3.md new file mode 100644 index 000000000..863df2000 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.0-rc3.md @@ -0,0 +1,51 @@ +Chirag Davé (1): + fReopenDebugLog and fRequestShutdown should be type sig_atomic_t + +Daira Hopwood (9): + Refactor README docs to avoid duplication. + Fix licensing to comply with OpenSSL and Berkeley DB licenses. + Changes to upgrade bdb to 6.2.23 + util: Update tinyformat + Tweak descriptions of mining parameters for example zcash.conf. + Update dnsseeds for mainnet. closes #1369 + Minor update to release process. + Remove the override of nMaxTipAge that effectively disables it on testnet. + Update version numbers for rc3. + +Jack Grigg (2): + Disable metrics screen in performance-measurements.sh + Link to #826 in doc/security-warnings.md, link to new Security website page + +Joe Turgeon (2): + Fixing floating point exception caused by metrics. Using default column width unless in a TTY. + Adding handling for ioctl failure. Updates from code review in PR #1615. + +Kevin Gallagher (2): + Prefer sha256sum but fall back to shasum if not available + Adds libgomp1 to Debian package depends + +Louis Nyffenegger (1): + Fix typo in README.md + +Paige Peterson (3): + add zcash.config + fix per Jack's mod suggestions + fix per Daira's suggestions + +Pieter Wuille (3): + Include signal.h for sig_atomic_t in WIN32 + Revert "Include signal.h for sig_atomic_t in WIN32" + Use std::atomic for fRequestShutdown and fReopenDebugLog + +Sean Bowe (1): + Add manpages for zcashd and zcash-cli binaries for debian. + +Simon (4): + Fix incorrect error message in z_sendmany + Add z_sendmany rule that when sending coinbase utxos to a zaddr they must be consumed entirely, without any change, since there is currently no way to specify a change address in z_sendmany. + Add assert to AsyncRPCOperation_sendmany + Bump version number in sendalert.cpp + +bitcartel (1): + Update payment-api.md + diff --git a/doc/release-process.md b/doc/release-process.md index cff4444cc..c874e54f3 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -32,7 +32,7 @@ previous release: ## B. Create a new release branch / github PR ### B1. Update (commit) version in sources - doc/README.md + README.md src/clientversion.h configure.ac contrib/DEBIAN/control diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 18b19c108..47a6ac9d9 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -95,13 +95,9 @@ public: vFixedSeeds.clear(); vSeeds.clear(); - // TODO: set up bootstrapping for mainnet - //vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Pieter Wuille - //vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo - //vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr - //vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker - //vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik - //vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch")); // Jonas Schnelli + vSeeds.push_back(CDNSSeedData("z.cash", "dnsseed.z.cash")); // Zcash + vSeeds.push_back(CDNSSeedData("str4d.xyz", "dnsseed.str4d.xyz")); // @str4d + vSeeds.push_back(CDNSSeedData("znodes.org", "dnsseed.znodes.org")); // @bitcartel // guarantees the first 2 characters, when base58 encoded, are "t1" base58Prefixes[PUBKEY_ADDRESS] = {0x1C,0xB8}; @@ -175,7 +171,6 @@ public: vAlertPubKey = ParseHex("044e7a1553392325c871c5ace5d6ad73501c66f4c185d6b0453cf45dec5a1322e705c672ac1a27ef7cdaf588c10effdf50ed5f95f85f2f54a5f6159fca394ed0c6"); nDefaultPort = 18233; nMinerThreads = 0; - nMaxTipAge = 0x7fffffff; nPruneAfterHeight = 1000; //! Modify the testnet genesis block so the timestamp is valid for a later start. diff --git a/src/clientversion.h b/src/clientversion.h index 978271993..bcb587551 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 26 +#define CLIENT_VERSION_BUILD 27 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE false