Skip to content

Commit

Permalink
Merge pull request #57 from zerocurrencycoin/v3.1.0
Browse files Browse the repository at this point in the history
V3.1.0
  • Loading branch information
CryptoForge authored Mar 11, 2020
2 parents fcb29ba + 09fd4ed commit 63af2bd
Show file tree
Hide file tree
Showing 674 changed files with 11,789 additions and 42,286 deletions.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ Run `zerod --version` to find out
- Disk size:
- Disk Type (HD/SDD):
- Linux kernel version (uname -a):
- Compiler version (gcc -version):
- Compiler version (gcc --version):
- Linker version (ld -v):
- Assembler version (as --version):

### Any extra information that might be useful in the debugging process.
This includes the relevant contents of `~/.zero/debug.log`. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
Expand Down
5 changes: 5 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Please ensure this checklist is followed for any pull requests for this repo. This checklist must be checked by both the PR creator and by anyone who reviews the PR.
* [ ] Relevant documentation for this PR has to be completed and reviewed by the documentation team (@ioptio, @mdr0id, or @Eirik0) before the PR can be merged
* [ ] A test plan for the PR must be documented in the PR notes and included in the test plan for the next regular release

As a note, all buildbot tests need to be passing and all appropriate code reviews need to be done before this PR can be merged
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Please read [our Development Guidelines](https://zcash.readthedocs.io/en/latest/rtd_pages/development_guidelines.html).
19 changes: 15 additions & 4 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


The MIT software license (http://www.opensource.org/licenses/mit-license.php)
above applies to the code directly included in this source distribution.
Dependencies downloaded as part of the build process may be covered by other
open-source licenses. For further details see 'contrib/debian/copyright'.
The MIT software license (https://www.opensource.org/licenses/mit-license.php)
above applies to the code directly included in this source distribution, with
the exception of certain Autoconf macros. Dependencies downloaded as part of
the build process may be covered by other open-source licenses. The MIT-licensed
source code is not considered a derived work of these Autoconf macros or of the
dependencies. For further details see 'contrib/debian/copyright'.


This product includes software developed by the OpenSSL Project for use in the
Expand All @@ -36,3 +38,12 @@ Although almost all of the Zcash code is licensed under "permissive" open source
licenses, users and distributors should note that when built using the default
build options, Zcash depends on Oracle Berkeley DB 6.2.x, which is licensed
under the GNU Affero General Public License.


Contributors should understand licensing implications before modifying the
following files in build-aux/m4 (see https://github.com/zcash/zcash/issues/2827):

* ax_check_compile_flag.m4
* ax_check_link_flag.m4
* ax_check_preproc_flag.m4
* ax_pthread.m4
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Building Zcash

See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zerod,
See the Zcash documentation wiki (https://zcash.readthedocs.io/en/latest/rtd_pages/user_guide.html) for instructions on building zcashd,
the intended-for-services, no-graphical-interface, reference
implementation of Zcash.
6 changes: 6 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Copyright (c) 2016-2019 The Zcash developers
# Copyright (c) 2013-2019 The Bitcoin Core developers
# Copyright (c) 2013-2019 Bitcoin Developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://www.opensource.org/licenses/mit-license.php .

ACLOCAL_AMFLAGS = -I build-aux/m4
SUBDIRS = src
if ENABLE_MAN
Expand Down
22 changes: 14 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/zero%203d%20mountain.png?raw=true)

[ZERO](https://zerocurrency.io) - [Pavo:3.0.2](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.2)
[ZERO](https://zerocurrency.io) - [Pegasus:3.1.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.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 - Pavo:3.0.2](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.2)
Download the latest version here - [ZERO - Latest Version - Pegasus:3.1.0](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.0)

------------------------------------------

❓ What is ZERO?
--------------

[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.2) is a revolutionary cryptocurrency and transaction platform based on Zcash.
[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.0) is a revolutionary cryptocurrency and transaction platform based on Zcash.

[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.2) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.
[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.0) offers total payment confidentiality, while still maintaining a decentralised network using a public blockchain.

[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.2) combines Bitcoin’s security with Zcash’s anonymity and privacy.
[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.0) combines Bitcoin’s security with Zcash’s anonymity and privacy.

[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.2) stands out from the competition as a fully working product that has already
[ZERO](https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.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/v3.0.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/v3.1.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.

------------------------------------------
Expand Down Expand Up @@ -78,6 +78,11 @@ Zero has a small inflation that degrades over time. With a stable supply of 7776

![alt text](https://github.com/zerocurrencycoin/Zero/blob/master/art/tech%20improv%20zero.jfif)

[Zero](https://z.cash/) 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 metadata. More technical details are available
in our [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)

Expand Down Expand Up @@ -119,10 +124,11 @@ https://bitcointalk.org/index.php?topic=3310714.0
See important security warnings on the
[Security Information page](https://z.cash/support/security/).

**Zero is experimental and a work in progress.** Use it at your own risk.

📒 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/27/2020) from the release of v3.0.2.
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/27/2020) from the release of v3.1.0.


🔧 Building
Expand Down
6 changes: 6 additions & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#!/bin/sh
# Copyright (c) 2016-2019 The Zcash developers
# Copyright (c) 2013-2019 The Bitcoin Core developers
# Copyright (c) 2013-2019 Bitcoin Developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://www.opensource.org/licenses/mit-license.php .

set -e
srcdir="$(dirname $0)"
cd "$srcdir"
Expand Down
123 changes: 0 additions & 123 deletions build-aux/m4/ax_openmp.m4

This file was deleted.

6 changes: 6 additions & 0 deletions build-aux/m4/bitcoin_find_bdb.m4
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dnl Copyright (c) 2016-2019 The Zcash developers
dnl Copyright (c) 2013-2019 The Bitcoin Core developers
dnl Copyright (c) 2013-2019 Bitcoin Developers
dnl Distributed under the MIT software license, see the accompanying
dnl file COPYING or https://www.opensource.org/licenses/mit-license.php .

AC_DEFUN([BITCOIN_FIND_BDB62],[
AC_MSG_CHECKING([for Berkeley DB C++ headers])
BDB_CPPFLAGS=
Expand Down
6 changes: 6 additions & 0 deletions build-aux/m4/bitcoin_subdir_to_include.m4
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dnl Copyright (c) 2016-2019 The Zcash developers
dnl Copyright (c) 2013-2019 The Bitcoin Core developers
dnl Copyright (c) 2013-2019 Bitcoin Developers
dnl Distributed under the MIT software license, see the accompanying
dnl file COPYING or https://www.opensource.org/licenses/mit-license.php .

dnl BITCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE])
dnl SUBDIRECTORY-NAME must end with a path separator
AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
Expand Down
8 changes: 7 additions & 1 deletion build-aux/m4/l_atomic.m4
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dnl Copyright (c) 2015 Tim Kosse <[email protected]>
dnl Copying and distribution of this file, with or without modification, are
dnl permitted in any medium without royalty provided the copyright notice
dnl and this notice are preserved. This file is offered as-is, without any
dnl warranty.

# Some versions of gcc/libstdc++ require linking with -latomic if
# using the C++ atomic library.
#
Expand Down Expand Up @@ -32,7 +38,7 @@ AC_DEFUN([CHECK_ATOMIC], [
AC_MSG_RESULT([yes])
],[
AC_MSG_RESULT([no])
AC_MSG_FAILURE([cannot figure our how to use std::atomic])
AC_MSG_FAILURE([cannot figure out how to use std::atomic])
])
])
Expand Down
2 changes: 1 addition & 1 deletion code_of_conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ 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. Note that contributors may be volunteers
who do not represent Zcash Company. They are free to express their own
who do not represent Electric Coin 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
Expand Down
Loading

0 comments on commit 63af2bd

Please sign in to comment.