Merge branch 'z21'

zerocurrencycoin · Jun 14, 2021 · ecb81ef · ecb81ef
2 parents dbb0dfe + d95f624
commit ecb81ef
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,20 +1,28 @@
 ![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/Zero%20Twitter.jpg?raw=true)
 
-[ZERO](https://zero.directory/) - [Draco:3.2.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0)
+[ZERO](https://zerocurrency.io) - [Latest Release](https://github.com/zerocurrencycoin/Zero/releases/)
 
 ### •LAUNCH DATE: 2017-02-19
 
-### •GENESIS BLOCK - 19th Feb 2017 11:26:40 - 068cbb5db6bc11be5b93479ea4df41fa7e012e92ca8603c315f9b1a2202205c6
+GENESIS BLOCK - 19th Feb 2017 11:26:40 - 068cbb5db6bc11be5b93479ea4df41fa7e012e92ca8603c315f9b1a2202205c6
 
 ------------------------------------------
 
 ❓ What is ZERO?
 --------------
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) offers total payment confidentiality, while still maintaining a decentralized network using a public blockchain. Zero combines Bitcoin’s security with Zcash’s anonymity and privacy. Zero stands out from the competition as a fully working product that has already implemented a set of special features not found in any other cryptocurrency.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/) is a revolutionary cryptocurrency and transaction platform based on Zcash.
 
-This software is the [ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.2.0) node. It downloads and stores the entire history of ZERO's transactions, about 1.2GB at this point.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.
 
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/) combines Bitcoin’s security with Zcash’s anonymity and privacy.
+
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/) stands out from the competition as a fully working product that has already
+implemented a set of special features not found in any other cryptocurrency.
+
+Our main focus as a team and community is to remain as transparent as we can possibly be and to maintain an interactive relationship with everyone involved. We are fully open about the project, listening to all suggestions from investors, miners and supporters.
+
+This software is the [ZERO](https://github.com/zerocurrencycoin/Zero/releases/) node. It downloads and stores the entire history of ZERO's transactions, about 2GB at this point.
 Depending on the speed of your computer and network connection, the synchronization process could take several hours.
 
 ------------------------------------------
@@ -39,7 +47,9 @@ Depending on the speed of your computer and network connection, the synchronizat
 
 ### •DECENTRALIZED PAYMENTS
 
-### •LOW INFLATION
+||VERY HIGH MINING PROFITABILITY||
+------------------------------------------
+Zero uses an alternative set of parameters for the Equihash algorithm, which require a GPU with 8GB of RAM. Zero is often one of the most profitable cryptocurrencies to mine.
 
 
 ❓ Is Zero Legal?
@@ -50,32 +60,32 @@ Zero is legal in most jurisdictions in the world but there are a small number of
 -------------------
 Zero is a network operating by the three fundamental principles of technological freedom: Decentralization, Open Source code and true Peer-to-Peer technology. With Privacy being a fundamental human right. Zero’s trust is based on the subjective valuations of human faith in mathematical algorithms, encryption and numbers. With the three pillars of technological principles Zero’s Blockchain is a peer-reviewed system of integrity.
 
+--------------
+Zero has a low emission and the inflation degrades over time quickly. Stable supply is 3888 ZER, after first halfing.
 
 ------------------------------------------
 
 [Zero](https://zero.directory/) is an implementation of the "Zerocash" protocol.
 Based on Bitcoin's code, Zero intends to offer a far higher standard of privacy
-through a sophisticated Zero Knowledge proving scheme that preserves
-confidentiality of transaction data - source, destination and amount.
-Key technical concepts are in the 2014 paper describing [the protocol](https://www.docdroid.net/KqvAhAj/zero-paper-z-paper-final-version-extended-zerocash-protocol-pdf).
-
-![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/tech%20improv%20zero.jfif)
+through a sophisticated zero-knowledge proving scheme that preserves
+confidentiality of transaction metadata. More technical details are available
+in the [Protocol Specification](https://github.com/zcash/zips/raw/master/protocol/protocol.pdf).
 
 ![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/algo%20zer%20improv.jfif)
 
 ------------------------------------------
 
 
-🔢 Development Fund Breakdown
+🔢 Development Fund Breakdown (Per Block Pre-Halfing)
 ------------------------------------------
 0.405 ZER / Block, 291.6 ZER / Day (~7.5%)
 
 
+
 📄 White Paper
 -----------------------
 
-Being Updated!
-
+**** Under Construction
 
 📣 Announcements
 -----------------
@@ -93,7 +103,7 @@ See important security warnings on the
 
 📒 Deprecation Policy
 ------------------
-'disabledeprecation' flag has been removed. Old nodes will automatically be shut down and must be upgraded upon reaching the deprecation block height, which will occur approximately 26 weeks (6/26/2021) from the release of v3.2.0.
+Disabledeprecation flag has been removed. Old nodes will automatically be shut down and must be upgraded upon reaching the deprecation block height, which will occur approximately 52 weeks (6/23/2022) from the release of v3.3.0.
 
 
 🔧 Building
@@ -172,4 +182,3 @@ The usage is currently very similar to Zcash. For more information see the [Zcas
 
 📜 License
 -------
-For license information see the file [COPYING](COPYING).
diff --git a/configure.ac b/configure.ac
@@ -1,13 +1,13 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 2)
+define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_REVISION, 0)
 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)
-define(_COPYRIGHT_YEAR, 2019)
+define(_COPYRIGHT_YEAR, 2021)
 AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])

diff --git a/doc/man/zero-cli.1 b/doc/man/zero-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZERO-CLI "1" "December 2019" "zero-cli v3.2.0-79779934a" "User Commands"
+.TH ZERO-CLI "1" "May 2021" "zero-cli v3.3" "User Commands"
 .SH NAME
-zero-cli \- manual page for zero-cli v3.2.0-79779934a
+zero-cli \- manual page for zero-cli v3.3
 .SH DESCRIPTION
-Zero RPC client version v3.2.0\-79779934a
+Zero RPC client version v3.3
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

diff --git a/doc/man/zero-tx.1 b/doc/man/zero-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZERO-TX "1" "December 2019" "zero-tx v3.2.0-79779934a" "User Commands"
+.TH ZERO-TX "1" "May 2021" "zero-tx v3.3" "User Commands"
 .SH NAME
-zero-tx \- manual page for zero-tx v3.2.0-79779934a
+zero-tx \- manual page for zero-tx v3.3
 .SH DESCRIPTION
-Zero zero\-tx utility version v3.2.0\-79779934a
+Zero zero\-tx utility version v3.3
 .SS "Usage:"
 .TP
 zero\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/zerod.1 b/doc/man/zerod.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZEROD "1" "December 2019" "zerod v3.2.0-79779934a" "User Commands"
+.TH ZEROD "1" "May 2021" "zerod v3.3" "User Commands"
 .SH NAME
-zerod \- manual page for zerod v3.2.0-79779934a
+zerod \- manual page for zerod v3.3
 .SH DESCRIPTION
-Zero Daemon version v3.2.0\-79779934a
+Zero Daemon version v3.3
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

diff --git a/src/clientversion.cpp b/src/clientversion.cpp
@@ -19,7 +19,7 @@
  * for both bitcoind and bitcoin-core, to make it harder for attackers to
  * target servers or GUI users specifically.
  */
-const std::string CLIENT_NAME("Draco");
+const std::string CLIENT_NAME("Ambae"); // Ambrym Maewo
 
 /**
  * Client version number

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -15,19 +15,20 @@
  */
 
 //! 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 1
-#define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 51
+// Actually set in configure.ac; set here unlikely and easy to notice values
+#define CLIENT_VERSION_MAJOR 9
+#define CLIENT_VERSION_MINOR 8
+#define CLIENT_VERSION_REVISION 7
+#define CLIENT_VERSION_BUILD 6
 
 //! Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE true
+#define CLIENT_VERSION_IS_RELEASE false
 
 /**
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2019
+#define COPYRIGHT_YEAR 2021
 
 #endif //HAVE_CONFIG_H
 

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -27,6 +27,7 @@ enum UpgradeIndex : uint32_t {
     UPGRADE_OVERWINTER,
     UPGRADE_SAPLING,
     UPGRADE_COSMOS,
+//WWW    UPGRADE_INSULA,
     UPGRADE_BLOSSOM,
     // NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp
     MAX_NETWORK_UPGRADES

diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp
@@ -34,6 +34,11 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
         /*.strName =*/ "Cosmos",
         /*.strInfo =*/ "Cosmos Upgrade.",
     },
+//WWW    {
+//        /*.nBranchId =*/ 0x7361707a, //???
+//        /*.strName =*/ "Insula",
+//        /*.strInfo =*/ "Insula Upgrade.",
+//    },
     {
         /*.nBranchId =*/ 0x2bb40e60,
         /*.strName =*/ "Blossom",

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -6,15 +6,14 @@
 #define ZCASH_DEPRECATION_H
 
 // Deprecation policy:
-// * Shut down 26 weeks' worth of blocks after the estimated release block height.
+// * Shut down 52 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 4 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 1012601;
-static const int WEEKS_UNTIL_DEPRECATION = 26;
+static const int APPROX_RELEASE_HEIGHT = 1130000;
+static const int WEEKS_UNTIL_DEPRECATION = 52;
 //Fixing zero day size
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);
 
 // Number of blocks before deprecation to warn users
-//Fixing zero day size
 static const int DEPRECATION_WARN_LIMIT = 28 * 24 * 30; // 4 weeks
 
 /**