fix graviex scam dump

KRAITcoin · Nov 1, 2018 · 1821848 · 1821848
1 parent c94a423
commit 1821848
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -47,8 +47,9 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
     boost::assign::map_list_of
 	(0, uint256("0x000008f98da9a790d44ff144e24262fe56d9f7ce7000b7c30c84c45da5c895a9"))
 	(2, uint256("0x000002ad7099c49f639bcf82c5d8c390897624326579100511dcfa88ab6684f4"))
-    (246325, uint256("0x000000001102e9a145f2e2cae79c28eb8b202bcefc74a2dd54e211efd1984581")) // last block old blockchain
-	(248318, uint256("000000056d91d8cf163ccfefdef912649d97c66aa37422adedad8b7d0bfd76ce"));
+    (246325, uint256("0x000000001102e9a145f2e2cae79c28eb8b202bcefc74a2dd54e211efd1984581"))	// last block old blockchain
+	(246326, uint256("0x000000000dbfa11fcedaefcf34ef84b029903789b20bfb51b95e9d56f84d24d8")) //rollback chain fix graviex scam
+	(248318, uint256("000000056d91d8cf163ccfefdef912649d97c66aa37422adedad8b7d0bfd76ce"));  //stable block
 
 
 static const Checkpoints::CCheckpointData data = {
@@ -105,15 +106,15 @@ class CMainParams : public CChainParams
         nMinerThreads = 0;
         nTargetTimespan = 1 * 60; // Krait: 1 minute
         nTargetSpacing = 1 * 60;  // Krait: 1 minute
-        nMaturity = 102;
+        nMaturity = 6;
 		nMaxMoneyOut = 10000000000 * COIN;
         /** Height or Time Based Activations **/
-        nLastPOWBlock = 248300;
+        nLastPOWBlock = 259200;
         nModifierUpdateBlock = 1;
 
         nBlockEnforceSerialRange = 1; //Enforce serial range starting this block
-        nZerocoinStartHeight = 248400; // need for tests pos phase
-        nZerocoinStartTime = 1546221600; 
+        nZerocoinStartHeight = 259300; 
+        nZerocoinStartTime = 1542672001;  // Tuesday, 20-Nov-18 00:00:01 UTC
 
 		const char* pszTimestamp = "KRAIT 18-02-2018";
 

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -407,18 +407,22 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
         LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize);
 
         // Compute final coinbase transaction.
-		pblock->vtx[0].vin[0].scriptSig = CScript() << nHeight << OP_0;
+		if (nHeight > Params().LAST_POW_BLOCK())
+		{
+			pblock->vtx[0].vin[0].scriptSig = CScript() << nHeight << OP_0;
+		} else {
+			txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
+		}
 
         if (!fProofOfStake) {
-			txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
             pblock->vtx[0] = txNew;
             pblocktemplate->vTxFees[0] = -nFees;
         }
 
 
         // Fill in header
         pblock->hashPrevBlock = pindexPrev->GetBlockHash();
-        if (!fProofOfStake)
+           if (!fProofOfStake)
             UpdateTime(pblock, pindexPrev);
         pblock->nBits = GetNextWorkRequired(pindexPrev, pblock);
         pblock->nNonce = 0;