X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=2748269343817b6825c78f326e937f9865be0ff2;hb=9795536e660254a25984d0fc81a548eaf0e91c92;hp=77d91991d331037d949389445f519b1bcc8c0933;hpb=8c8cd5f399c10e3670955dff8a7c22dd20934bb4;p=novacoin.git diff --git a/src/main.h b/src/main.h index 77d9199..2748269 100644 --- a/src/main.h +++ b/src/main.h @@ -1132,7 +1132,6 @@ public: unsigned int nBlockPos; uint64 nChainTrust;// ppcoin: trust score of chain, in the unit of coin-days int nHeight; - int nCheckpoint; // ppcoin: chain auto checkpoint height bool fProofOfStake; // ppcoin: is the block of proof-of-stake type COutPoint prevoutStake; unsigned int nStakeTime; @@ -1154,7 +1153,6 @@ public: nBlockPos = 0; nHeight = 0; nChainTrust = 0; - nCheckpoint = 0; fProofOfStake = true; prevoutStake.SetNull(); nStakeTime = 0; @@ -1175,7 +1173,6 @@ public: nBlockPos = nBlockPosIn; nHeight = 0; nChainTrust = 0; - nCheckpoint = 0; fProofOfStake = block.IsProofOfStake(); if (fProofOfStake) { @@ -1288,8 +1285,8 @@ public: std::string ToString() const { - return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nChainTrust=%"PRI64d" nHeight=%d, nCheckpoint=%d, fProofOfStake=%d prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", - pprev, pnext, nFile, nBlockPos, nChainTrust, nHeight, nCheckpoint, + return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nChainTrust=%"PRI64d" nHeight=%d, fProofOfStake=%d prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", + pprev, pnext, nFile, nBlockPos, nChainTrust, nHeight, fProofOfStake, prevoutStake.ToString().c_str(), nStakeTime, hashMerkleRoot.ToString().substr(0,10).c_str(), GetBlockHash().ToString().substr(0,20).c_str()); @@ -1334,7 +1331,6 @@ public: READWRITE(nBlockPos); READWRITE(nChainTrust); READWRITE(nHeight); - READWRITE(nCheckpoint); READWRITE(fProofOfStake); if (fProofOfStake) {