Prepare testnet for upgrade

dashpay · Aug 2, 2015 · ef1dc84 · ef1dc84
1 parent c0af8b1
commit ef1dc84
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -53,6 +53,7 @@ static void convertSeed6(std::vector<CAddress> &vSeedsOut, const SeedSpec6 *data
  *    timestamp before)
  * + Contains no strange transactions
  */
+
 static Checkpoints::MapCheckpoints mapCheckpoints =
         boost::assign::map_list_of
         (  1500, uint256("0x000000aaf0300f59f49bc3e970bad15c11f961fe2347accffff19d96ec9778e3"))
@@ -71,7 +72,7 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
         ( 137993, uint256("0x00000000000cf69ce152b1bffdeddc59188d7a80879210d6e5c9503011929c3c"))
         ( 167996, uint256("0x000000000009486020a80f7f2cc065342b0c2fb59af5e090cd813dba68ab0fed"))
         ( 207992, uint256("0x00000000000d85c22be098f74576ef00b7aa00c05777e966aff68a270f1e01a5"))
-        ( 217752, uint256("0x00000000000a7baeb2148272a7e14edf5af99a64af456c0afc23d15a0918b704"))
+        ( 312645, uint256("0x0000000000059dcb71ad35a9e40526c44e7aae6c99169a9e7017b7d84b1c2daf"))
         ;
 static const Checkpoints::CCheckpointData data = {
         &mapCheckpoints,
@@ -85,6 +86,7 @@ static Checkpoints::MapCheckpoints mapCheckpointsTestnet =
         boost::assign::map_list_of
         ( 261, uint256("00000c26026d0815a7e2ce4fa270775f61403c040647ff2c3091f99e894a4618"))
         ( 77100, uint256("00000133e07bae4d3553fd8d86cb5a961d638cae72d179ede8ca436c60a2c3c0"))
+        ( 77900, uint256("00000007e5ec67e2a626c07b7d66673c3dd8df0aed5018ca984b99fba2b71024"))
         ;
 static const Checkpoints::CCheckpointData dataTestnet = {
         &mapCheckpointsTestnet,

diff --git a/src/main.cpp b/src/main.cpp
@@ -1564,9 +1564,9 @@ int64_t GetBlockValue(int nBits, int nHeight, const CAmount& nFees)
     */
 
     if(Params().NetworkID() == CBaseChainParams::TESTNET){
-        if(nHeight > 91758) nSubsidy -= nSubsidy/10;
+        if(nHeight > 77900+576) nSubsidy -= nSubsidy/10;
     } else {
-        if(nHeight > 309759+(553*33)) nSubsidy -= nSubsidy/10; // 328008 - 10.0% - August 30, 2015
+        if(nHeight > 309759+(553*33)) nSubsidy -= nSubsidy/10; // 328008 - 10.0% - September 6, 2015
     }
 
     return nSubsidy + nFees;

diff --git a/src/spork.h b/src/spork.h
@@ -41,12 +41,12 @@ using namespace boost;
 #define SPORK_3_INSTANTX_BLOCK_FILTERING_DEFAULT              1424217600  //2015-2-18
 #define SPORK_5_MAX_VALUE_DEFAULT                             1000        //1000 DASH
 #define SPORK_7_MASTERNODE_SCANNING_DEFAULT                   978307200   //2001-1-1
-#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT        1444217600   //OFF
-#define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT         1444217600   //OFF
-#define SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT         1444217600   //OFF
+#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT        1438611701   //OFF
+#define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT         1438611701   //OFF
+#define SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT         1438611701   //OFF
 #define SPORK_11_RESET_BUDGET_DEFAULT                         0
 #define SPORK_12_RECONSIDER_BLOCKS_DEFAULT                    0
-#define SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT                   0 //1439510400   //8/13/2015, 5:00:00 PM
+#define SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT                   1438611701 //1439510400   //8/13/2015, 5:00:00 PM
 
 class CSporkMessage;
 class CSporkManager;