Merge pull request HorizenOfficial#69 from ZencashOfficial/cronic/rel…

…ease_2.0.14

Update version, deprecation

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'}

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])

src/clientversion.h

@@ -36,7 +36,7 @@
 #define CLIENT_VERSION_MINOR 0
 // ZEN_MOD_START
 #define CLIENT_VERSION_REVISION 14
-#define CLIENT_VERSION_BUILD 25
+#define CLIENT_VERSION_BUILD 50
 // ZEN_MOD_END
 
 //! Set to true for release, false for prerelease or test build

src/deprecation.h

@@ -6,8 +6,8 @@
 #define ZCASH_DEPRECATION_H
 
 // ZEN_MOD_START
-static const int APPROX_RELEASE_HEIGHT = 260000;
-static const int WEEKS_UNTIL_DEPRECATION = 18;
+static const int APPROX_RELEASE_HEIGHT = 328000;
+static const int WEEKS_UNTIL_DEPRECATION = 16;
 // ZEN_MOD_END
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);