v3.0.0 Cosmos

README.md

@@ -1,30 +1,30 @@
 ![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/zero%203d%20mountain.png?raw=true)
 
-[ZERO](https://zerocurrency.io) - [Ny-Alesund:2.0.4](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.4)
+[ZERO](https://zerocurrency.io) - [Cosmos:3.0.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0)
 
 ||FAST|| ||DECENTRALISED|| ||ANONYMOUS|| ||SECURE|| ||ASIC RESISTANT||  - LAUNCE DATE: 2017-02-19
 
 GENESIS BLOCK - 19th Feb 2017 11:26:40 - 068cbb5db6bc11be5b93479ea4df41fa7e012e92ca8603c315f9b1a2202205c6
 
-Download the latest version here - [ZERO - Latest Version - Ny-Alesund:2.0.4](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.4)
+Download the latest version here - [ZERO - Latest Version - Cosmos:3.0.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0)
 
 ------------------------------------------
 
 ❓ What is ZERO?
 --------------
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.4) is a revolutionary cryptocurrency and transaction platform based on Zcash.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0) is a revolutionary cryptocurrency and transaction platform based on Zcash.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.4) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.4) combines Bitcoin’s security with Zcash’s anonymity and privacy.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0) combines Bitcoin’s security with Zcash’s anonymity and privacy.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.4) stands out from the competition as a fully working product that has already
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0) 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/tag/v2.0.4) node. It downloads and stores the entire history of ZERO's transactions, about 1.2GB at this point.
+This software is the [ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.0) node. It downloads and stores the entire history of ZERO's transactions, about 1.2GB at this point.
 Depending on the speed of your computer and network connection, the synchronization process could take several hours.
 
 ------------------------------------------
@@ -122,7 +122,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 32 weeks (7/1/2019) from the release of v2.0.4.
+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 32 weeks (7/1/2019) from the release of v3.0.0.
 
 
 🔧 Building

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 2)
+define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 4)
+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)))

doc/man/zero-cli.1

@@ -3,7 +3,7 @@
 .SH NAME
 zero-cli \- manual page for zero-cli v2.0.1
 .SH DESCRIPTION
-Zcash RPC client version v2.0.4
+Zcash RPC client version v3.0.0
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

doc/man/zero-tx.1

@@ -3,7 +3,7 @@
 .SH NAME
 zero-tx \- manual page for zero-tx v2.0.1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v2.0.4
+Zcash zcash\-tx utility version v3.0.0
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

doc/man/zerod.1

@@ -3,7 +3,7 @@
 .SH NAME
 zerod \- manual page for zerod v2.0.1
 .SH DESCRIPTION
-Zcash Daemon version v2.0.4
+Zcash Daemon version v3.0.0
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

src/Makefile.am

@@ -121,6 +121,7 @@ LIBZCASH_H = \
 BITCOIN_CORE_H = \
 	addressindex.h \
 	spentindex.h \
+	zeronode/activezeronode.h \
   addrman.h \
   alert.h \
   amount.h \
@@ -166,6 +167,12 @@ BITCOIN_CORE_H = \
   dbwrapper.h \
   limitedmap.h \
   main.h \
+	zeronode/zeronode.h \
+  zeronode/payments.h \
+  zeronode/budget.h \
+  zeronode/zeronode-sync.h \
+  zeronode/zeronodeman.h \
+  zeronode/zeronodeconfig.h \
   memusage.h \
   merkleblock.h \
   metrics.h \
@@ -174,6 +181,7 @@ BITCOIN_CORE_H = \
   net.h \
   netbase.h \
   noui.h \
+	zeronode/obfuscation.h \
   policy/fees.h \
   pow.h \
   prevector.h \
@@ -195,12 +203,15 @@ BITCOIN_CORE_H = \
   script/sign.h \
   script/standard.h \
   serialize.h \
+	zeronode/spork.h \
+  zeronode/sporkdb.h \
   streams.h \
   support/allocators/secure.h \
   support/allocators/zeroafterfree.h \
   support/cleanse.h \
   support/events.h \
   support/pagelocker.h \
+	zeronode/swifttx.h \
   sync.h \
   threadsafety.h \
   timedata.h \
@@ -276,7 +287,11 @@ libbitcoin_server_a_SOURCES = \
   rpc/net.cpp \
   rpc/rawtransaction.cpp \
   rpc/server.cpp \
+	rpc/zeronode.cpp \
+  rpc/zeronode-budget.cpp \
+	rpc/spork.cpp \
   script/sigcache.cpp \
+	zeronode/sporkdb.cpp \
   timedata.cpp \
   torcontrol.cpp \
   txdb.cpp \
@@ -307,6 +322,10 @@ endif
 libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_wallet_a_SOURCES = \
+	zeronode/activezeronode.cpp \
+	zeronode/obfuscation.cpp \
+  utiltest.cpp \
+  utiltest.h \
   zcbenchmarks.cpp \
   zcbenchmarks.h \
   wallet/asyncrpcoperation_mergetoaddress.cpp \
@@ -315,6 +334,13 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/crypter.cpp \
   wallet/db.cpp \
   wallet/paymentdisclosure.cpp \
+	zeronode/swifttx.cpp \
+  zeronode/zeronode.cpp \
+  zeronode/budget.cpp \
+  zeronode/payments.cpp \
+  zeronode/zeronode-sync.cpp \
+  zeronode/zeronodeconfig.cpp \
+  zeronode/zeronodeman.cpp \
   wallet/paymentdisclosuredb.cpp \
   wallet/rpcdisclosure.cpp \
   wallet/rpcdump.cpp \
@@ -387,6 +413,8 @@ libbitcoin_common_a_SOURCES = \
   script/script_error.cpp \
   script/sign.cpp \
   script/standard.cpp \
+	zeronode/spork.cpp \
+	zeronode/sporkdb.cpp \
   transaction_builder.cpp \
   utiltest.cpp \
   $(BITCOIN_CORE_H) \

src/bitcoin-cli-res.rc

@@ -16,8 +16,8 @@ BEGIN
     BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
-            VALUE "CompanyName",        "Zcash"
-            VALUE "FileDescription",    "zero-cli (JSON-RPC client for Zcash)"
+            VALUE "CompanyName",        "Zero"
+            VALUE "FileDescription",    "zero-cli (JSON-RPC client for Zero)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
             VALUE "InternalName",       "zero-cli"
             VALUE "LegalCopyright",     COPYRIGHT_STR

src/bitcoin-cli.cpp

@@ -77,10 +77,10 @@ static int AppInitRPC(int argc, char* argv[])
     //
     ParseParameters(argc, argv);
     if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
-        std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
+        std::string strUsage = _("Zero RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
         if (!mapArgs.count("-version")) {
             strUsage += "\n" + _("Usage:") + "\n" +
-                  "  zero-cli [options] <command> [params]  " + _("Send command to Zcash") + "\n" +
+                  "  zero-cli [options] <command> [params]  " + _("Send command to Zero") + "\n" +
                   "  zero-cli [options] help                " + _("List commands") + "\n" +
                   "  zero-cli [options] help <command>      " + _("Get help for a command") + "\n";
 

src/bitcoin-tx-res.rc

@@ -16,8 +16,8 @@ BEGIN
     BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
-            VALUE "CompanyName",        "Zcash"
-            VALUE "FileDescription",    "zero-tx (CLI Zcash transaction editor utility)"
+            VALUE "CompanyName",        "Zero"
+            VALUE "FileDescription",    "zero-tx (CLI Zero transaction editor utility)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
             VALUE "InternalName",       "zero-tx"
             VALUE "LegalCopyright",     COPYRIGHT_STR

src/bitcoin-tx.cpp

@@ -48,10 +48,10 @@ static int AppInitRawTx(int argc, char* argv[])
     if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help"))
     {
         // First part of help message is specific to this utility
-        std::string strUsage = _("Zcash zero-tx utility version") + " " + FormatFullVersion() + "\n\n" +
+        std::string strUsage = _("Zero zero-tx utility version") + " " + FormatFullVersion() + "\n\n" +
             _("Usage:") + "\n" +
-              "  zero-tx [options] <hex-tx> [commands]  " + _("Update hex-encoded zcash transaction") + "\n" +
-              "  zero-tx [options] -create [commands]   " + _("Create hex-encoded zcash transaction") + "\n" +
+              "  zero-tx [options] <hex-tx> [commands]  " + _("Update hex-encoded zero transaction") + "\n" +
+              "  zero-tx [options] -create [commands]   " + _("Create hex-encoded zero transaction") + "\n" +
               "\n";
 
         fprintf(stdout, "%s", strUsage.c_str());

src/bitcoind-res.rc

@@ -16,8 +16,8 @@ BEGIN
     BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
-            VALUE "CompanyName",        "Zcash"
-            VALUE "FileDescription",    "zerod (Zcash node with a JSON-RPC server)"
+            VALUE "CompanyName",        "Zero"
+            VALUE "FileDescription",    "zerod (Zero node with a JSON-RPC server)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
             VALUE "InternalName",       "zerod"
             VALUE "LegalCopyright",     COPYRIGHT_STR

src/bitcoind.cpp

@@ -7,6 +7,7 @@
 #include "rpc/server.h"
 #include "init.h"
 #include "main.h"
+#include "zeronode/zeronodeconfig.h"
 #include "noui.h"
 #include "scheduler.h"
 #include "util.h"
@@ -72,7 +73,7 @@ bool AppInit(int argc, char* argv[])
     // Process help and version before taking care about datadir
     if (mapArgs.count("-?") || mapArgs.count("-h") ||  mapArgs.count("-help") || mapArgs.count("-version"))
     {
-        std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
+        std::string strUsage = _("Zero Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
 
         if (mapArgs.count("-version"))
         {
@@ -81,7 +82,7 @@ bool AppInit(int argc, char* argv[])
         else
         {
             strUsage += "\n" + _("Usage:") + "\n" +
-                  "  zerod [options]                     " + _("Start Zcash Daemon") + "\n";
+                  "  zerod [options]                     " + _("Start Zero Daemon") + "\n";
 
             strUsage += "\n" + HelpMessage(HMM_BITCOIND);
         }
@@ -111,7 +112,7 @@ bool AppInit(int argc, char* argv[])
                    "\n"
                    "You can look at the example configuration file for suggestions of default\n"
                    "options that you may want to change. It should be in one of these locations,\n"
-                   "depending on how you installed Zcash:\n") +
+                   "depending on how you installed Zero:\n") +
                  _("- Source code:  %s\n"
                    "- .deb package: %s\n")).c_str(),
                 GetConfigFile().string().c_str(),
@@ -128,10 +129,19 @@ bool AppInit(int argc, char* argv[])
             return false;
         }
 
+        //Start Zeronode
+        // parse zeronode.conf
+        std::string strErr;
+        if (!zeronodeConfig.read(strErr)) {
+            fprintf(stderr, "Error reading zeronode configuration file: %s\n", strErr.c_str());
+            return false;
+        }
+        //End Zeronode
+
         // Command-line RPC
         bool fCommandLine = false;
         for (int i = 1; i < argc; i++)
-            if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "zcash:"))
+            if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "zero:"))
                 fCommandLine = true;
 
         if (fCommandLine)
@@ -143,7 +153,7 @@ bool AppInit(int argc, char* argv[])
         fDaemon = GetBoolArg("-daemon", false);
         if (fDaemon)
         {
-            fprintf(stdout, "Zcash server starting\n");
+            fprintf(stdout, "Zero server starting\n");
 
             // Daemonize
             pid_t pid = fork();