Fix 1.5.1.1

Changed key to ignore bad checkpoint, Upped protocol version to 70001, Added correct checkpoint
bottlecaps-foundation · Sep 29, 2013 · 418ec73 · 418ec73
1 parent 68a2bed
commit 418ec73
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -26,7 +26,8 @@ namespace Checkpoints
         boost::assign::map_list_of
         ( 0, hashGenesisBlockOfficial )
         ( 48000, uint256("0x00000000118a5a2e08bdd44410dcd4ff9a89d70d8a080e5e502cc72840af5021"))
-        ( 132491, uint256("0x00000000d39d4f72c091639659a0927fbeae04d281edc460f6ff2ae72165ccb7"))
+        ( 136822, uint256("0x0000000013cee700df4937ad60f2de34ac48f95e36471f259f5b1e8a3421764b"))
+
 
 ;
 
@@ -366,7 +367,8 @@ namespace Checkpoints
 }
 
 // ppcoin: sync-checkpoint master key
-const std::string CSyncCheckpoint::strMasterPubKey = "0489cab128b9f39a3e514a12c07a7644fa1808662195edcf2d4671b1cce76868b7f2f588a9dfad5753be3cd6b8e9518be439c936e2bad93a25bb6d32300fab41c3";
+
+const std::string CSyncCheckpoint::strMasterPubKey = "049501d36f903cd52d600d327cba24480c2600f215fd94c58bb3b09c442fb9840f92d1168b4663f58b77d5586e94e2ceb7630303c4ca8f4aba745ae47088f7b2fb";
 
 std::string CSyncCheckpoint::strMasterPrivKey = "";
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -2950,7 +2950,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         }
         else
         {
-            if(pfrom->nVersion < 70000)
+            if(pfrom->nVersion < 70001)
                 badVersion = true;
         }
         if(badVersion)

diff --git a/src/version.h b/src/version.h
@@ -25,7 +25,7 @@ extern const std::string CLIENT_DATE;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 70000;
+static const int PROTOCOL_VERSION = 70001;
 
 // earlier versions not supported as of Feb 2012, and are disconnected
 static const int MIN_PROTO_VERSION = 60008;
@@ -46,7 +46,7 @@ static const int MEMPOOL_GD_VERSION = 60002;
 
 #define DISPLAY_VERSION_MAJOR       1
 #define DISPLAY_VERSION_MINOR       5
-#define DISPLAY_VERSION_REVISION    1
+#define DISPLAY_VERSION_REVISION    2
 #define DISPLAY_VERSION_BUILD       0
 
 #endif