Fixing syncing issue and adding a checkpoint.

Stealth-R-D-LLC · Jul 14, 2014 · df29e41 · df29e41
1 parent b8e870b
commit df29e41
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/contrib/macdeploy/Info.plist b/contrib/macdeploy/Info.plist
@@ -9,7 +9,7 @@
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleGetInfoString</key>
-        <string>STealthCoin Complete Anonymity 1.0.0.1</string>
+        <string>StealthCoin [XST] Complete Anonymity 1.0.0.1</string>
         <key>CFBundleExecutable</key>
         <string>Stealth Qt</string>
         <key>CFBundleIdentifier</key>

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -37,6 +37,7 @@ namespace Checkpoints
         (        4850, uint256("0x4fa8326b35cf85271c419f487fe530626044efd98be053ff1f84d2c585c24bcb"))
         (        4900, uint256("0x0000000000dd3d701b40d8485850c9adfd8a3408844b1caf3df79643f801bdde"))
         (        5112, uint256("0x00000000010655f2b03d26740e822f7307491e1997735a5d37e0ee88fedd21bb"))
+        (        6920, uint256("0x72129f1943af505f450e32e815e783870e33bd26b990222dcb91a837194b0a96"))
 		;
 
     static MapCheckpoints mapCheckpointsTestnet =

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    2
+#define CLIENT_VERSION_REVISION    3
 #define CLIENT_VERSION_BUILD       1
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/src/main.cpp b/src/main.cpp
@@ -2071,10 +2071,11 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot) const
     if (IsProofOfStake() && !CheckCoinStakeTimestamp(GetBlockTime(), (int64)vtx[1].nTime))
         return DoS(50, error("CheckBlock() : coinstake timestamp violation nTimeBlock=%"PRI64d" nTimeTx=%u", GetBlockTime(), vtx[1].nTime));
 
-    CBlockIndex* pindexPrev = pindexBest;
-    if ((pindexPrev->nHeight >= (int) CUTOFF_POW_BLOCK) && (IsProofOfWork()))
-         return DoS(100, error("CheckBlock() : Proof of work (%f XST) on or after block %d.\n",
-                               ((double) vtx[0].GetValueOut() / (double) COIN), (int) CUTOFF_POW_BLOCK));
+    if ((nTime >= CUTOFF_POW_TIME) && (IsProofOfWork()))
+         return DoS(100, error("CheckBlock() : Proof of work (%f XST) at t=%d on or after %d.\n",
+                               ((double) vtx[0].GetValueOut() / (double) COIN),
+                                (int) nTime,
+                                (int) CUTOFF_POW_TIME));
 
     // Check transactions
     BOOST_FOREACH(const CTransaction& tx, vtx)

diff --git a/src/main.h b/src/main.h
@@ -46,6 +46,7 @@ static const double TAX_PERCENTAGE = 0.00; //no tax
 static const int64 MAX_STEALTH_PROOF_OF_STAKE = 0.20 * COIN;	// 20% annual interest
 // static const int CUTOFF_POW_BLOCK = 20421;  // too many problems with PoW+PoS and big hashes
 static const int CUTOFF_POW_BLOCK = 5460;
+static const unsigned int CUTOFF_POW_TIME = 1405125188;
 
 static const int64 MIN_TXOUT_AMOUNT = MIN_TX_FEE;
 

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 = 61021;
+static const int PROTOCOL_VERSION = 61031;
 
 // earlier versions not supported as of Feb 2012, and are disconnected
 static const int MIN_PROTO_VERSION = 61001;
@@ -46,7 +46,7 @@ static const int MEMPOOL_GD_VERSION = 60002;
 
 #define DISPLAY_VERSION_MAJOR       1
 #define DISPLAY_VERSION_MINOR       0
-#define DISPLAY_VERSION_REVISION    2
+#define DISPLAY_VERSION_REVISION    3
 #define DISPLAY_VERSION_BUILD       1
 
 #endif