X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=42d375939830857543fa69969520bf4889690d24;hb=167517ffee2ac1111d2a492fd0c68a011e9f0c97;hp=ea73a0f6b263034c15b048cf04df2053e7fe503d;hpb=94ced84524166a535de3f2de2c2103b7d7612f1c;p=novacoin.git diff --git a/src/main.h b/src/main.h index ea73a0f..42d3759 100644 --- a/src/main.h +++ b/src/main.h @@ -53,6 +53,7 @@ static const int fHaveUPnP = false; extern CCriticalSection cs_main; extern std::map mapBlockIndex; +extern std::set > setStakeSeen; extern uint256 hashGenesisBlock; extern CBlockIndex* pindexGenesisBlock; extern int nBestHeight; @@ -66,6 +67,7 @@ extern int64 nHPSTimerStart; extern int64 nTimeBestReceived; extern CCriticalSection cs_setpwalletRegistered; extern std::set setpwalletRegistered; +extern std::map mapOrphanBlocks; // Settings extern int fGenerateBitcoins; @@ -106,7 +108,9 @@ unsigned int ComputeMinWork(unsigned int nBase, int64 nTime); int GetNumBlocksOfPeers(); bool IsInitialBlockDownload(); std::string GetWarnings(std::string strFor); - +bool Reorganize(CTxDB& txdb, CBlockIndex* pindexNew); +uint256 WantedByOrphan(const CBlock* pblockOrphan); +const CBlockIndex* GetLastBlockIndex(const CBlockIndex* pindex, bool fProofOfStake); @@ -360,7 +364,13 @@ public: return (nValue == -1); } - bool IsCoinStake() const + bool SetEmpty() + { + nValue = 0; + scriptPubKey.clear(); + } + + bool IsEmpty() const { return (nValue == 0 && scriptPubKey.empty()); } @@ -383,7 +393,7 @@ public: std::string ToString() const { - if (IsCoinStake()) return "CTxOut(coinstake)"; + if (IsEmpty()) return "CTxOut(empty)"; if (scriptPubKey.size() < 6) return "CTxOut(error)"; return strprintf("CTxOut(nValue=%s, scriptPubKey=%s)", FormatMoney(nValue).c_str(), scriptPubKey.ToString().substr(0,30).c_str()); @@ -504,7 +514,7 @@ public: bool IsCoinStake() const { // ppcoin: the coin stake transaction is marked with the first output empty - return (vout.size() == 2 && vout[0].IsCoinStake()); + return (vin.size() > 0 && vout.size() == 2 && vout[0].IsEmpty()); } int GetSigOpCount() const @@ -632,7 +642,8 @@ public: std::string ToString() const { std::string str; - str += strprintf("CTransaction(hash=%s, nTime=%d, ver=%d, vin.size=%d, vout.size=%d, nLockTime=%d)\n", + str += IsCoinBase()? "Coinbase" : (IsCoinStake()? "Coinstake" : "CTransaction"); + str += strprintf("(hash=%s, nTime=%d, ver=%d, vin.size=%d, vout.size=%d, nLockTime=%d)\n", GetHash().ToString().substr(0,10).c_str(), nTime, nVersion, @@ -667,7 +678,7 @@ protected: public: bool RemoveFromMemoryPool(); bool GetCoinAge(CTxDB& txdb, uint64& nCoinAge) const; // ppcoin: get transaction coin age - bool CheckProofOfStake(CTxDB& txdb, unsigned int nBits) const; + bool CheckProofOfStake(unsigned int nBits) const; }; @@ -889,6 +900,11 @@ public: return !IsProofOfStake(); } + std::pair GetProofOfStake() const + { + return IsProofOfStake()? std::make_pair(vtx[1].vin[0].prevout, vtx[1].nTime) : std::make_pair(COutPoint(), (unsigned int)0); + } + // ppcoin: get max transaction timestamp int64 GetMaxTransactionTime() const { @@ -1004,7 +1020,7 @@ public: filein >> *this; // Check the header - if (!CheckProofOfWork(GetHash(), nBits)) + if (fReadTransactions && IsProofOfWork() && !CheckProofOfWork(GetHash(), nBits)) return error("CBlock::ReadFromDisk() : errors in block header"); return true; @@ -1037,8 +1053,9 @@ public: bool SignBlock(const CKeyStore& keystore) { std::vector > vSolution; + const CTxOut& txout = IsProofOfStake()? vtx[1].vout[1] : vtx[0].vout[0]; - if (!Solver(vtx[0].vout[0].scriptPubKey, vSolution)) + if (!Solver(txout.scriptPubKey, vSolution)) return false; BOOST_FOREACH(PAIRTYPE(opcodetype, valtype)& item, vSolution) { @@ -1063,8 +1080,9 @@ public: return vchBlockSig.empty(); std::vector > vSolution; + const CTxOut& txout = IsProofOfStake()? vtx[1].vout[1] : vtx[0].vout[0]; - if (!Solver(vtx[0].vout[0].scriptPubKey, vSolution)) + if (!Solver(txout.scriptPubKey, vSolution)) return false; BOOST_FOREACH(PAIRTYPE(opcodetype, valtype)& item, vSolution) { @@ -1115,7 +1133,9 @@ 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; // block header int nVersion; @@ -1134,7 +1154,9 @@ public: nBlockPos = 0; nHeight = 0; nChainTrust = 0; - nCheckpoint = 0; + fProofOfStake = true; + prevoutStake.SetNull(); + nStakeTime = 0; nVersion = 0; hashMerkleRoot = 0; @@ -1152,7 +1174,17 @@ public: nBlockPos = nBlockPosIn; nHeight = 0; nChainTrust = 0; - nCheckpoint = 0; + fProofOfStake = block.IsProofOfStake(); + if (fProofOfStake) + { + prevoutStake = block.vtx[1].vin[0].prevout; + nStakeTime = block.vtx[1].nTime; + } + else + { + prevoutStake.SetNull(); + nStakeTime = 0; + } nVersion = block.nVersion; hashMerkleRoot = block.hashMerkleRoot; @@ -1196,7 +1228,7 @@ public: bool CheckIndex() const { - return CheckProofOfWork(GetBlockHash(), nBits); + return IsProofOfWork() ? CheckProofOfWork(GetBlockHash(), nBits) : true; } bool EraseBlockFromDisk() @@ -1242,12 +1274,21 @@ public: return pindex->GetMedianTimePast(); } + bool IsProofOfWork() const + { + return !fProofOfStake; + } + bool IsProofOfStake() const + { + return fProofOfStake; + } std::string ToString() const { - return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nChainTrust=%"PRI64d" nHeight=%d, nCheckpoint=%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()); } @@ -1291,7 +1332,17 @@ public: READWRITE(nBlockPos); READWRITE(nChainTrust); READWRITE(nHeight); - READWRITE(nCheckpoint); + READWRITE(fProofOfStake); + if (fProofOfStake) + { + READWRITE(prevoutStake); + READWRITE(nStakeTime); + } + else if (fRead) + { + const_cast(this)->prevoutStake.SetNull(); + const_cast(this)->nStakeTime = 0; + } // block header READWRITE(this->nVersion); @@ -1655,7 +1706,7 @@ public: bool CheckSignature() { CKey key; - if (!key.SetPubKey(ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284"))) + if (!key.SetPubKey(ParseHex("0487ca85b6ae9d311f996c7616d20d0c88a5b4f07d25e78f419019f35cce6522acf978b2d99f0e7a58db1f120439e5c1889266927854aa57c93956c2569188a539"))) return error("CAlert::CheckSignature() : SetPubKey failed"); if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) return error("CAlert::CheckSignature() : verify signature failed");