FIXED: removed wrong stake modifier checkpiont and added a valid one …

…at height 10661
ywzqhl · Jun 7, 2014 · ae0c876 · ae0c876
1 parent 5a0726c
commit ae0c876
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -20,7 +20,7 @@ unsigned int nModifierInterval = MODIFIER_INTERVAL;
 static std::map<int, unsigned int> mapStakeModifierCheckpoints =
     boost::assign::map_list_of
     ( 0, 0x0e00670bu )
-	( 95004, 0x01c6784au )
+	( 10661, 0xabe9915du )
     ;
 
 // Get the last stake modifier and its generation time from a given block
@@ -380,8 +380,14 @@ unsigned int GetStakeModifierChecksum(const CBlockIndex* pindex)
 // Check stake modifier hard checkpoints
 bool CheckStakeModifierCheckpoints(int nHeight, unsigned int nStakeModifierChecksum)
 {
-    if (fTestNet) return true; // Testnet has no checkpoints
-    if (mapStakeModifierCheckpoints.count(nHeight))
-        return nStakeModifierChecksum == mapStakeModifierCheckpoints[nHeight];
+    if (fTestNet)
+    	return true; // Testnet has no checkpoints
+    if (mapStakeModifierCheckpoints.count(nHeight)) {
+    	if (fDebug)
+    		printf("CheckStakeModifierCheckpoint: height %d modifier checksum %08x -> %s\n",
+    			nHeight, nStakeModifierChecksum,
+    			nStakeModifierChecksum == mapStakeModifierCheckpoints[nHeight] ? "true" : "false");
+    	return nStakeModifierChecksum == mapStakeModifierCheckpoints[nHeight];
+    }
     return true;
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -2640,29 +2640,30 @@ void PrintBlockTree()
         {
             for (int i = 0; i < nCol-1; i++)
                 printf("| ");
-            printf("|\\\n");
+            puts("|\\\n");
         }
         else if (nCol < nPrevCol)
         {
             for (int i = 0; i < nCol; i++)
                 printf("| ");
-            printf("|\n");
+            puts("|\n");
        }
         nPrevCol = nCol;
 
         // print columns
         for (int i = 0; i < nCol; i++)
-            printf("| ");
+        	puts("| ");
 
         // print item
         CBlock block;
         block.ReadFromDisk(pindex);
-        printf("BLOCK: %d (%u,%u) %s  %08x  %s  mint %7s  tx %"PRIszu"",
+        printf("\nBLOCK: %d (%u,%u) %s %08x %08x %s mint %7s tx %"PRIszu"",
             pindex->nHeight,
             pindex->nFile,
             pindex->nBlockPos,
             block.GetHash().ToString().c_str(),
             block.nBits,
+            pindex->nStakeModifierChecksum,
             DateTimeStrFormat("%x %H:%M:%S", block.GetBlockTime()).c_str(),
             FormatMoney(pindex->nMint).c_str(),
             block.vtx.size());
@@ -2684,6 +2685,8 @@ void PrintBlockTree()
         for (unsigned int i = 0; i < vNext.size(); i++)
             vStack.push_back(make_pair(nCol+i, vNext[i]));
     }
+
+    puts("\n");
 }
 
 bool LoadExternalBlockFile(FILE* fileIn)