v1.2.1.0 (#28)

* Start to zero fix * Revert 597bc2d * Rework Invalidate Code DogeCash Reworked the original code to prevent wallet crash on launch. * New Rewards Voted by community * Correction of Invalidation * Protocol Bump / Client Bump
CryptoCashBack-Hub · Apr 12, 2019 · 03fc1bc · 03fc1bc
1 parent 7d1cda2
commit 03fc1bc
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -163,3 +163,5 @@ config.status
 .vs/CCBC/v15/ipch/AutoPCH/4c8aca488cd61cc9/KERNEL.ipch
 .vs/CCBC/v15/ipch/AutoPCH/9a0c471bdb4f68f4/BITCOINGUI.ipch
 .vs/CCBC/v15/ipch/AutoPCH/68292eaeca98818a/RPCCLIENT.ipch
+.vs/CCBC/v15/ipch/AutoPCH/f7f6e32379ea43b4/PROTOCOL\.ipch
+.vs/CCBC/v15/ipch/AutoPCH/acd16f0a47c35869/CLIENTVERSION\.ipch
diff --git a/configure.ac b/configure.ac
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_BUILD, 0)
 
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -19,8 +19,8 @@
 //! These need to be macros, as clientversion.cpp's and ccbc*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 2
-#define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 1
+#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/main.cpp b/src/main.cpp
@@ -2201,27 +2201,27 @@ int64_t GetBlockValue(int nHeight)
             nSubsidy = 25 * COIN;
         } else if (nHeight <= 340800 && nHeight > 297600) { //New rewards start here
             nSubsidy = 22.5 * COIN;
-		}else if (nHeight <= 384000 && nHeight > 340800) {
+		} else if (nHeight <= 384000 && nHeight > 340800) {
 			nSubsidy = 20 * COIN;
-		}else if (nHeight <= 427200 && nHeight > 384000) {
+		} else if (nHeight <= 427200 && nHeight > 384000) {
 			nSubsidy = 17.5 * COIN;
-		}else if (nHeight <= 556800 && nHeight > 427200) {
+		} else if (nHeight <= 556800 && nHeight > 427200) {
 			nSubsidy = 15 * COIN;
-		}else if (nHeight <= 686400 && nHeight > 556800) {
+		} else if (nHeight <= 686400 && nHeight > 556800) {
 			nSubsidy = 12.5 * COIN;
-		}else if (nHeight <= 816000 && nHeight > 686400) {
+		} else if (nHeight <= 816000 && nHeight > 686400) {
 			nSubsidy = 10 * COIN;
-		}else if (nHeight <= 1075200 && nHeight > 816000) {
+		} else if (nHeight <= 1075200 && nHeight > 816000) {
 			nSubsidy = 9 * COIN;
-		}else if (nHeight <= 1334400 && nHeight > 1075200) {
+		} else if (nHeight <= 1334400 && nHeight > 1075200) {
 			nSubsidy = 8 * COIN;
-		}else if (nHeight <= 1593600 && nHeight > 1334400) {
+		} else if (nHeight <= 1593600 && nHeight > 1334400) {
 			nSubsidy = 7 * COIN;
-		}else if (nHeight <= 1852800 && nHeight > 1593600) {
+		} else if (nHeight <= 1852800 && nHeight > 1593600) {
 			nSubsidy = 6 * COIN;
-		}else if (nHeight <= 2889600 && nHeight > 1852800) {
+		} else if (nHeight <= 2889600 && nHeight > 1852800) {
 			nSubsidy = 5 * COIN;
-        } else if (nHeight >= 2889600) {
+    } else if (nHeight >= 2889600) {
             nSubsidy = 5 * COIN;
         }
 

diff --git a/src/version.h b/src/version.h
@@ -15,7 +15,8 @@
 //static const int PROTOCOL_VERSION = 70002; // v1.0.0.1
 //static const int PROTOCOL_VERSION = 70005; // v1.0.0.5
 //static const int PROTOCOL_VERSION = 70007; // v1.1.0.1
-static const int PROTOCOL_VERSION = 70008; // v1.2.0.0
+//static const int PROTOCOL_VERSION = 70008; // v1.2.0.0
+static const int PROTOCOL_VERSION = 70009; // v1.2.1.0
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -26,12 +27,14 @@ static const int GETHEADERS_VERSION = 70000;
 // Protocol before enforcement
 //static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70001; // v1.0.0.0
 //static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70005; // v1.0.0.1
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70007; // v1.1.0.1
+//static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70007; // v1.1.0.1
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70008; // v1.2.0.0
 
 // Add a new protocol enforcement for each update
-//static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_15 = 70005; // v1.0.0.5
-//static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT_19 = 70007; // v1.1.0.1
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70008;
+//static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70005; // v1.0.0.5
+//static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70007; // v1.1.0.1
+//static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70008; // v1.2.0.0
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70009; // v1.2.1.0
 
 
 //Testing purpose