Merge pull request #9 from CryptoForge/v2.0.1

V2.0.1 Commit to master

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--- Remove text and sections that do not apply -->
 
-This issue tracker is only for technical issues related to zcashd.
+This issue tracker is only for technical issues related to zerod.
 
 General ZERO questions and/or support requests and are best directed to the https://github.com/zerocurrency/zero
 
@@ -22,7 +22,7 @@ Tell us what should happen
 Tell us what happens instead including any noticable error output (any messages displayed on-screen when e.g. a crash occurred)
 
 ### The version of Zcash you were using:
-Run `zcashd --version` to find out
+Run `zerod --version` to find out
 
 ### Machine specs:
 - OS name + version:

.gitignore

@@ -2,16 +2,12 @@
 *.deb
 *.exe
 src/bitcoin
-src/zcashd
-src/zcash-cli
-src/zcash-gtest
-src/zcash-tx
+src/zerod
+src/zero-cli
+src/zero-gtest
+src/zero-tx
 src/test/test_bitcoin
 
-# Zcash utilities
-src/zcash/GenerateParams
-src/zcash/CreateJoinSplit
-
 *zcashTest.pk
 *zcashTest.vk
 
@@ -92,7 +88,7 @@ build
 *.gcda
 /*.info
 test_bitcoin.coverage/
-zcash-gtest.coverage/
+zero-gtest.coverage/
 total.coverage/
 coverage_percent.txt
 

COPYING

@@ -1,5 +1,6 @@
-Copyright (c) 2016-2017 The Zcash developers
-Copyright (c) 2009-2017 The Bitcoin Core developers
+Copyright (c) 2016-2018 The Zcash developers
+Copyright (c) 2009-2018 The Bitcoin Core developers
+Copyright (c) 2009-2018 Bitcoin Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

INSTALL

@@ -1,5 +1,5 @@
 Building Zcash
 
-See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zcashd,
+See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zerod,
 the intended-for-services, no-graphical-interface, reference
 implementation of Zcash.

Makefile.am

@@ -24,7 +24,7 @@ COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
   leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
   baseline_filtered.info \
   leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
-  zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
+  zero-gtest.info zero-gtest_filtered.info zero-gtest_coverage.info
 
 dist-hook:
 	-$(MAKE) -C $(top_distdir)/src/leveldb clean
@@ -101,13 +101,13 @@ test_bitcoin_filtered.info: test_bitcoin.info
                       "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
-zcash-gtest.info: baseline_filtered_combined.info
-	$(MAKE) -C src/ zcash-gtest_check
-	$(LCOV) -c -d $(abs_builddir)/src -t zcash-gtest -o $@
+zero-gtest.info: baseline_filtered_combined.info
+	$(MAKE) -C src/ zero-gtest_check
+	$(LCOV) -c -d $(abs_builddir)/src -t zero-gtest -o $@
 	$(LCOV) -z -d $(abs_builddir)/src
 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
 
-zcash-gtest_filtered.info: zcash-gtest.info
+zero-gtest_filtered.info: zero-gtest.info
 	$(LCOV) -r $< "/usr/include/*" \
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
@@ -122,21 +122,21 @@ zcash-gtest_filtered.info: zcash-gtest.info
 test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
 	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
 
-zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
+zero-gtest_coverage.info: baseline_filtered_combined.info zero-gtest_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zero-gtest_filtered.info -o $@
 
-total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zero-gtest_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zero-gtest_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
 test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-zcash-gtest.coverage/.dirstamp:  zcash-gtest_coverage.info
+zero-gtest.coverage/.dirstamp:  zero-gtest_coverage.info
 	$(GENHTML) -s $< -o $(@D)
 	@touch $@
 
-cov-zcash: zcash-gtest.coverage/.dirstamp
+cov-zcash: zero-gtest.coverage/.dirstamp
 
 total.coverage/.dirstamp: total_coverage.info
 	$(GENHTML) -s $< -o $(@D)
@@ -159,4 +159,4 @@ install-exec-hook:
 DISTCHECK_CONFIGURE_FLAGS = --enable-man
 
 clean-local:
-	rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/
+	rm -rf test_bitcoin.coverage/ zero-gtest.coverage/ total.coverage/

README.md

@@ -1,36 +1,34 @@
-[ZERO](https://zerocurrency.io) - [Uummannaq:1.0.14](https://github.com/zerocurrencycoin/Zero/releases/tag/v1.0.14-2)
-=======
-![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/ZERO%20MAIN%20BANNER.jpg)
+[ZERO](https://zerocurrency.io) - [Isfjorden:2.0.1](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.1)
 
 ||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- Uummannaq:1.0.14](https://github.com/zerocurrencycoin/Zero/releases/tag/v1.0.14-2)
+Download the latest version here - [ZERO - Latest Version - Isfjorden:2.0.1](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.1)
 
 ------------------------------------------
 
-What is ZERO?
+❓ What is ZERO?
 --------------
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v1.0.14-2) is a revolutionary cryptocurrency and transaction platform based on Zcash.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.1) is a revolutionary cryptocurrency and transaction platform based on Zcash.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v1.0.14-2) combines Bitcoin’s security with Zcash’s anonymity and privacy.
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.1) combines Bitcoin’s security with Zcash’s anonymity and privacy.
 
-[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v1.0.14-2) stands out from the competition as a fully working product that has already
+[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v2.0.1) 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. 
+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/v1.0.14-2) 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/v2.0.1) 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.
 
 ------------------------------------------
 
 ![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/zero-logo-shade-black_256x256.png)
 
 
-ZERO CORE FEATURES
+💫 ZERO CORE FEATURES
 -------------------
 
 ||ZERO COST||
@@ -82,7 +80,7 @@ Zero has a small inflation that degrades over time. With a stable supply of 7200
 ------------------------------------------
 
 
-Development Fund Breakdown (Per Block)
+🔢 Development Fund Breakdown (Per Block)
 ------------------------------------------
 Development Fund Details 0.81 ZER / Block (~7.5%)
 
@@ -99,31 +97,31 @@ Development Fund Total - 0.81 ZER / Block
 Total ZER per day = 583.2
 
 
-White Paper - Extended 
+📄 White Paper - Extended
 -----------------------
 
 http://docdro.id/n9j4sJr
 
 
-Announcements
+📣 Announcements
 -----------------
 https://bitcointalk.org/index.php?topic=1796036.0
 
 https://bitcointalk.org/index.php?topic=3310714.0
 
 
-Security Warnings
+🔒 Security Warnings
 -----------------
 See important security warnings on the
 [Security Information page](https://z.cash/support/security/).
 
 
-Deprecation Policy
+📒 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 every 13 weeks.
+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.1.
 
 
-Building
+🔧 Building
 --------
 Currently only Linux build is officially supported.  8GB RAM is recommended.
 
@@ -135,18 +133,18 @@ sudo apt-get install \
       zlib1g-dev wget bsdmainutils automake cmake curl
 ```
 
-### Download cryptographic keys (needs to be done only once)
-```
-./zcutil/fetch-params.sh
-```
-
 ### Obtain the ZERO software from GitHub
 ```
 git clone https://github.com/zerocurrencycoin/zero.git
 cd zero
 git checkout master
 ```
 
+### Download cryptographic keys (needs to be done only once)
+```
+./zcutil/fetch-params.sh
+```
+
 ### Build the source code to produce binary executables:
 ```
 ./zcutil/build.sh --disable-rust -j$(nproc)
@@ -173,7 +171,6 @@ addnode=86.31.59.86
 addnode=zseed1.cryptonode.cloud
 addnode=zseed2.cryptonode.cloud
 addnode=zeroseed.cryptoforge.cc
-addnode=zerocurrency.prophetalgorithms.com
 ```
 
 ### Enable CPU mining (optional)
@@ -192,15 +189,15 @@ A sample demonstrating a large number of command line options
 ./contrib/debian/examples/zero.conf
 ```
 
-Running & Using ZERO
+🔩 Running & Using ZERO
 --------------------
-After successfully building, the ZERO binaries are stored in `./src`. The two important binaries are `zcashd` and `zcash-cli`.
+After successfully building, the ZERO binaries are stored in `./src`. The two important binaries are `zerod` and `zero-cli`.
 
-Your wallet will be created (on first zcashd run) in: ~/.zero/wallet.zero
+Your wallet will be created (on first zerod run) in: ~/.zero/wallet.zero
 Please backup your wallet often and keep it safe.
 
 The usage is currently the same as ZCash. For more information see the [ZCash User Guide](https://github.com/zcash/zcash/wiki/1.0-User-Guide#running-zcash).
 
-License
+📜 License
 -------
 For license information see the file [COPYING](COPYING).

code_of_conduct.md

@@ -24,7 +24,9 @@ Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
 that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+threatening, offensive, or harmful. Note that contributors may be volunteers
+who do not represent Zcash Company. They are free to express their own
+opinions so long as they adhere to these guidelines.
 
 By adopting this Code of Conduct, project maintainers commit themselves to
 fairly and consistently applying these principles to every aspect of managing
@@ -52,8 +54,8 @@ themselves available for conduct issues:
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+[https://www.contributor-covenant.org/version/1/3/0/][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[homepage]: https://www.contributor-covenant.org
+[version]: https://www.contributor-covenant.org/version/1/3/0/