Merge pull request HorizenOfficial#70 from ZencashOfficial/development

README.md

@@ -1,10 +1,28 @@
-Zen 2.0.14-rc1
+Zen 2.0.14
 ==============
 
 What is Zen?
 ----------------
 A globally accessible and anonymous blockchain for censorship-resistant communications and economic activity.
 
+Upgrading from 2.0.11 source
+----------------
+
+To upgrade from any version prior to 2.0.14 you will have to re-clone the repository, the [ZencashOfficial/zen](https://github.com/ZencashOfficial/zen) repository was replaced by a new repository based on Zcash upstream with a different commit history, merging/pulling is not possible without issues.
+Assuming your current repository is stored at `~/zen`, do the following to upgrade:
+```{r, engine='bash'}
+# if you don't want to keep the old src around
+rm -r ~/zen
+# or if you do want to keep it
+mv ~/zen ~/zen_archived
+git clone https://github.com/ZencashOfficial/zen.git
+cd ~/zen
+```
+Now continue with building from source.
+
+Installing from source
+----------------
+
 1. Get dependencies:
     1. Debian
     ```{r, engine='bash'}
@@ -32,7 +50,7 @@ A globally accessible and anonymous blockchain for censorship-resistant communic
     sudo apt-get install \
         build-essential pkg-config libc6-dev m4 g++-multilib-arm-linux-gnueabihf \
         autoconf libtool ncurses-dev unzip git python \
-        zlib1g-dev curl bsdmainutils automake cmake
+        zlib1g-dev curl bsdmainutils automake cmake cargo
     ```
 
 * Install for linux
@@ -73,7 +91,7 @@ ln -s /usr/bin/ranlib aarch64-unknown-linux-gnu-ranlib
 ln -s /usr/bin/strip aarch64-unknown-linux-gnu-strip
 PATH=$PATH:~/bin
 cd ~/zen/
-./zcutil/build-arm.sh --disable-rust -j$(nproc)
+./zcutil/build-arm.sh -j$(nproc)
 ```
 Instructions to redeem pre block 110,000 ZCL
 -------------

configure.ac

@@ -4,12 +4,12 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 14)
-define(_CLIENT_VERSION_BUILD, 25)
+define(_CLIENT_VERSION_BUILD, 50)
 # ZEN_MOD_END
 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, 2017)
+define(_COPYRIGHT_YEAR, 2018)
 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])
@@ -471,12 +471,9 @@ if test x$use_hardening != xno; then
   if test x$TARGET_OS != xwindows; then
     # All windows code is PIC, forcing it on just adds useless compile warnings
     AX_CHECK_COMPILE_FLAG([-fPIE],[PIE_FLAGS="-fPIE"],[AC_MSG_ERROR(Cannot enable -fPIE)])
-    # AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],[AC_MSG_ERROR(Cannot enable -pie)])
-    #if test x$BUILD_OS = xdarwin; then
-    #  AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],[AC_MSG_WARN(Cannot enable -pie)])
-    #else
-    #  AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],[AC_MSG_ERROR(Cannot enable -pie)])
-    #fi
+    if test x$BUILD_OS != xdarwin; then
+      AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],[AC_MSG_WARN(Cannot enable -pie)])
+    fi
 # ZEN_MOD_END
   else
     # These are only available on Windows.
@@ -724,6 +721,18 @@ AX_OPENMP(
    AC_DEFINE(HAVE_OPENMP, 0, [Define if OpenMP is enabled])
    AM_CONDITIONAL([HAVE_OPENMP], [false])])
 
+# ZEN_MOD_START
+dnl detect aarch64
+case $host in
+  aarch64*)
+     AM_CONDITIONAL([IS_ARM64],[true])
+     ;;
+  *)
+     AM_CONDITIONAL([IS_ARM64],[false])
+     ;;
+esac
+# ZEN_MOD_END
+
 # Gitian uses a config.site that sets depends_prefix, and then sets --prefix=/
 # build.sh just uses --prefix
 if test x$depends_prefix != x; then

contrib/debian/changelog

@@ -1,161 +1,5 @@
-zcash (1.0.14) stable; urgency=medium
+zen (2.0.14) stable; urgency=medium
 
-  * 1.0.14 release.
+  * 2.0.14 release.
 
- -- Zcash Company <team@z.cash>  Wed, 03 Jan 2018 23:54:16 +0100
-
-zcash (1.0.14~rc1) stable; urgency=medium
-
-  * 1.0.14-rc1 release.
-
- -- Zcash Company <team@z.cash>  Fri, 22 Dec 2017 10:12:41 +0000
-
-zcash (1.0.13) stable; urgency=medium
-
-  * 1.0.13 release.
-
- -- Zcash Company <team@z.cash>  Mon, 20 Nov 2017 12:31:53 +0000
-
-zcash (1.0.13~rc2) stable; urgency=medium
-
-  * 1.0.13-rc2 release.
-
- -- Zcash Company <team@z.cash>  Fri, 17 Nov 2017 18:01:08 +0000
-
-zcash (1.0.13~rc1) stable; urgency=medium
-
-  * 1.0.13-rc1 release.
-
- -- Zcash Company <team@z.cash>  Wed, 15 Nov 2017 00:02:21 +0000
-
-zcash (1.0.12) stable; urgency=medium
-
-  * 1.0.12 release.
-
- -- Zcash Company <team@z.cash>  Thu, 28 Sep 2017 01:26:44 +0100
-
-zcash (1.0.12~rc1) stable; urgency=medium
-
-  * 1.0.12-rc1 release.
-
- -- Zcash Company <team@z.cash>  Sat, 23 Sep 2017 10:51:36 +0100
-
-zcash (1.0.11) stable; urgency=medium
-
-  * 1.0.11 release.
-
- -- Zcash Company <team@z.cash>  Tue, 15 Aug 2017 10:06:25 +0100
-
-zcash (1.0.11~rc1) stable; urgency=medium
-
-  * 1.0.11-rc1 release.
-
- -- Zcash Company <team@z.cash>  Tue, 01 Aug 2017 17:12:52 +0200
-
-zcash (1.0.10+1) stable; urgency=medium
-
-  * 1.0.10-1 release.
-
- -- Zcash Company <team@z.cash>  Fri, 23 Jun 2017 19:50:41 -0700
-
-zcash (1.0.10) stable; urgency=medium
-
-  * 1.0.10 release.
-
- -- Zcash Company <team@z.cash>  Thu, 22 Jun 2017 15:13:04 +1200
-
-zcash (1.0.9) stable; urgency=medium
-
-  * 1.0.9 release.
-
- -- Zcash Company <team@z.cash>  Wed, 24 May 2017 12:51:06 -0700
-
-zcash (1.0.8+1) jessie; urgency=high
-
-  * 1.0.8-1 release.
-
- -- Zcash Company <team@z.cash>  Thu, 13 Apr 2017 20:20:37 -0700
-
-zcash (1.0.8) jessie; urgency=medium
-
-  * 1.0.8 release.
-
- -- Zcash Company <team@z.cash>  Mon, 27 Mar 2017 21:30:07 +0100
-
-zcash (1.0.7+1) jessie; urgency=medium
-
-  * 1.0.7-1 release.
-
- -- Zcash Company <team@z.cash>  Wed, 08 Mar 2017 13:51:11 -0800
-
-zcash (1.0.7) jessie; urgency=medium
-
-  * 1.0.7 release.
-
- -- Zcash Company <team@z.cash>  Fri, 03 Mar 2017 20:55:04 -0800
-
-zcash (1.0.6) jessie; urgency=medium
-
-  * 1.0.6 release.
-
- -- Zcash Company <team@z.cash>  Fri, 10 Feb 2017 10:23:00 -0800
-
-zcash (1.0.5) jessie; urgency=medium
-
-  * 1.0.5 release.
-
- -- Zcash Company <team@z.cash>  Thu, 19 Jan 2017 19:23:40 -0700
-
-zcash (1.0.4) jessie; urgency=medium
-
-  * 1.0.4 release.
-
- -- Zcash Company <team@z.cash>  Thu, 15 Dec 2016 16:46:14 +1300
-
-zcash (1.0.3) jessie; urgency=medium
-
-  * 1.0.3 release.
-
- -- Zcash Company <team@z.cash>  Wed, 17 Nov 2016 15:56:00 -0700
-
-zcash (1.0.2) jessie; urgency=medium
-
-  * 1.0.2 release.
-
- -- Zcash Company <team@z.cash>  Mon, 07 Nov 2016 19:01:35 -0600
-
-zcash (1.0.1) jessie; urgency=medium
-
-  * 1.0.1 release.
-
- -- Zcash Company <team@z.cash>  Thu, 03 Nov 2016 23:21:09 -0500
-
-zcash (1.0.0-sprout) jessie; urgency=medium
-
-  * 1.0.0 release.
-
- -- Zcash Company <team@z.cash>  Fri, 28 Oct 2016 03:00:50 -0700
-
-zcash (1.0.0-rc4) jessie; urgency=medium
-
-  * 1.0.0-rc4 release.
-
- -- Zcash Company <team@z.cash>  Thu, 27 Oct 2016 13:36:00 +0100
-
-zcash (1.0.0-rc3) jessie; urgency=medium
-
-  * 1.0.0-rc3 release.
-
- -- Zcash Company <team@z.cash>  Wed, 26 Oct 2016 23:17:03 +0100
-
-zcash (1.0.0-rc2) jessie; urgency=medium
-
-  * 1.0.0-rc2 release.
-
- -- Zcash Company <team@z.cash>  Sun, 23 Oct 2016 01:51:27 +0100
-
-zcash (1.0.0-rc1) jessie; urgency=medium
-
-  * Initial packaging for Debian.
-
- -- Zcash Company <team@z.cash>  Mon, 17 Oct 2016 11:47:02 -0700
+ -- Zen Blockchain Foundation <info@zencash.com>  Fri, 15 Jun 2018 04:00:00 +0200

contrib/debian/control

@@ -1,8 +1,8 @@
-Source: zcash
+Source: zen
 Section: utils
 Priority: optional
-Maintainer: Zen Blockchain Foundation <info@zensystem.io>
-Homepage: https://zensystem.io
+Maintainer: Zen Blockchain Foundation <info@zencash.com>
+Homepage: https://zencash.com
 Build-Depends: autoconf, automake, bsdmainutils, build-essential,
  git, g++-multilib, libc6-dev, libtool,
  m4, ncurses-dev, pkg-config, python,
@@ -11,6 +11,6 @@ Vcs-Git: https://github.com/ZencashOfficial/zen.git
 Vcs-Browser: https://github.com/ZencashOfficial/zen
 
 Package: zen
-Architecture: amd64
+Architecture: any
 Depends: ${shlibs:Depends}
-Description: Private and reliable transactions, communications, and publishing - zensystem.io
+Description: Private and reliable transactions, communications, and publishing - zencash.com

contrib/debian/copyright

@@ -1,10 +1,10 @@
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
 Upstream-Name: ZenCash
-Upstream-Contact: ZenCash Team <info@zensystem.io>
-Source: https://github.com/zencashofficial/zen
+Upstream-Contact: ZenCash Team <info@zencash.com>
+Source: https://github.com/ZencashOfficial/zen
 
 Files: *
-Copyright: 2016-2017, The Zen Blockchain Foundation
+Copyright: 2016-2018, The Zen Blockchain Foundation
  2016-2017, The Zcash developers
  2009-2017, Bitcoin Core developers
 License: Expat

contrib/debian/zen.examples

@@ -0,0 +1 @@
+DEBIAN/examples/zen.conf

contrib/debian/zen.install

@@ -0,0 +1,3 @@
+usr/bin/zend
+usr/bin/zen-cli
+usr/bin/zen-fetch-params

contrib/debian/zen.manpages

@@ -0,0 +1,2 @@
+DEBIAN/manpages/zen-cli.1
+DEBIAN/manpages/zend.1