From: svost Date: Tue, 4 Oct 2016 14:32:37 +0000 (+0300) Subject: Move definition to cpp file X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=41b2d07b7a3cb02dd8c1faffc7737f6c54f5b4c0 Move definition to cpp file --- diff --git a/src/main.cpp b/src/main.cpp index 08f089a..a70c75a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -253,6 +253,78 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) // CTransaction and CTxIndex // +bool CTransaction::IsFinal(int nBlockHeight, int64_t nBlockTime) const +{ + // Time based nLockTime implemented in 0.1.6 + if (nLockTime == 0) + return true; + if (nBlockHeight == 0) + nBlockHeight = nBestHeight; + if (nBlockTime == 0) + nBlockTime = GetAdjustedTime(); + if ((int64_t)nLockTime < ((int64_t)nLockTime < LOCKTIME_THRESHOLD ? (int64_t)nBlockHeight : nBlockTime)) + return true; + for(const CTxIn& txin : vin) + if (!txin.IsFinal()) + return false; + return true; +} + +bool CTransaction::IsNewerThan(const CTransaction& old) const +{ + if (vin.size() != old.vin.size()) + return false; + for (unsigned int i = 0; i < vin.size(); i++) + if (vin[i].prevout != old.vin[i].prevout) + return false; + bool fNewer = false; + unsigned int nLowest = numeric_limits::max(); + for (unsigned int i = 0; i < vin.size(); i++) + { + if (vin[i].nSequence != old.vin[i].nSequence) + { + if (vin[i].nSequence <= nLowest) + { + fNewer = false; + nLowest = vin[i].nSequence; + } + if (old.vin[i].nSequence < nLowest) + { + fNewer = true; + nLowest = old.vin[i].nSequence; + } + } + } + return fNewer; +} + +bool CTransaction::ReadFromDisk(CDiskTxPos pos, FILE** pfileRet) +{ + auto filein = CAutoFile(OpenBlockFile(pos.nFile, 0, pfileRet ? "rb+" : "rb"), SER_DISK, CLIENT_VERSION); + if (!filein) + return error("CTransaction::ReadFromDisk() : OpenBlockFile failed"); + + // Read transaction + if (fseek(filein, pos.nTxPos, SEEK_SET) != 0) + return error("CTransaction::ReadFromDisk() : fseek failed"); + + try { + filein >> *this; + } + catch (const std::exception&) { + return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION); + } + + // Return file pointer + if (pfileRet) + { + if (fseek(filein, pos.nTxPos, SEEK_SET) != 0) + return error("CTransaction::ReadFromDisk() : second fseek failed"); + *pfileRet = filein.release(); + } + return true; +} + bool CTransaction::ReadFromDisk(CTxDB& txdb, COutPoint prevout, CTxIndex& txindexRet) { SetNull(); @@ -408,8 +480,7 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const return true; } -unsigned int -CTransaction::GetLegacySigOpCount() const +unsigned int CTransaction::GetLegacySigOpCount() const { unsigned int nSigOps = 0; if (!IsCoinBase()) @@ -585,6 +656,30 @@ int64_t CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, enum G return nMinFee; } +string CTransaction::ToStringShort() const +{ + string str; + str += strprintf("%s %s", GetHash().ToString().c_str(), IsCoinBase()? "base" : (IsCoinStake()? "stake" : "user")); + return str; +} + +string CTransaction::ToString() const +{ + string str; + str += IsCoinBase()? "Coinbase" : (IsCoinStake()? "Coinstake" : "CTransaction"); + str += strprintf("(hash=%s, nTime=%d, ver=%d, vin.size=%" PRIszu ", vout.size=%" PRIszu ", nLockTime=%d)\n", + GetHash().ToString().substr(0,10).c_str(), + nTime, + nVersion, + vin.size(), + vout.size(), + nLockTime); + for (unsigned int i = 0; i < vin.size(); i++) + str += " " + vin[i].ToString() + "\n"; + for (unsigned int i = 0; i < vout.size(); i++) + str += " " + vout[i].ToString() + "\n"; + return str; +} bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, bool* pfMissingInputs) @@ -770,6 +865,20 @@ void CTxMemPool::queryHashes(std::vector& vtxid) } +string CTxIn::ToString() const +{ + string str; + str += "CTxIn("; + str += CTxIn::prevout.ToString(); + if (CTxIn::prevout.IsNull()) + str += strprintf(", coinbase %s", HexStr(CTxIn::scriptSig).c_str()); + else + str += strprintf(", scriptSig=%s", CTxIn::scriptSig.ToString().substr(0,24).c_str()); + if (CTxIn::nSequence != numeric_limits::max()) + str += strprintf(", nSequence=%" PRIu32, CTxIn::nSequence); + str += ")"; + return str; +} int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const @@ -1251,21 +1360,32 @@ void static InvalidChainFound(CBlockIndex* pindexNew) DateTimeStrFormat("%x %H:%M:%S", pindexBest->GetBlockTime()).c_str()); } - void CBlock::UpdateTime(const CBlockIndex* pindexPrev) { nTime = max(GetBlockTime(), GetAdjustedTime()); } +unsigned int CBlock::GetStakeEntropyBit(unsigned int nHeight) const +{ + // Protocol switch to support p2pool at novacoin block #9689 + if (nHeight >= 9689 || fTestNet) + { + // Take last bit of block hash as entropy bit + auto nEntropyBit = (GetHash().Get32()) & (uint32_t)1; + if (fDebug && GetBoolArg("-printstakemodifier")) + printf("GetStakeEntropyBit: nTime=%" PRIu32 " hashBlock=%s nEntropyBit=%" PRIu32 "\n", nTime, GetHash().ToString().c_str(), nEntropyBit); + return nEntropyBit; + } + // Before novacoin block #9689 - get from pregenerated table + int nBitNum = nHeight & 0xFF; + int nItemNum = nHeight / 0xFF; - - - - - - - + auto nEntropyBit = ((entropyStore[nItemNum] & (uint256(1) << nBitNum)) >> nBitNum).Get32(); + if (fDebug && GetBoolArg("-printstakemodifier")) + printf("GetStakeEntropyBit: from pregenerated table, nHeight=%" PRIu32 " nEntropyBit=%" PRIu32 "\n", nHeight, nEntropyBit); + return nEntropyBit; +} bool CTransaction::DisconnectInputs(CTxDB& txdb) { @@ -1391,6 +1511,18 @@ const CTxOut& CTransaction::GetOutputFor(const CTxIn& input, const MapPrevTx& in return txPrev.vout[input.prevout.n]; } +int64_t CTransaction::GetValueOut() const +{ + CBigNum nValueOut = 0; + for(const auto& txout : vout) + { + nValueOut += txout.nValue; + if (!MoneyRange(txout.nValue) || !MoneyRange(nValueOut)) + throw runtime_error("CTransaction::GetValueOut() : value out of range"); + } + return nValueOut.getint64(); +} + int64_t CTransaction::GetValueIn(const MapPrevTx& inputs) const { if (IsCoinBase()) @@ -1610,8 +1742,136 @@ bool CTransaction::ClientConnectInputs() return true; } +int64_t CBlock::GetMaxTransactionTime() const +{ + int64_t maxTransactionTime = 0; + for(const auto& tx : vtx) + maxTransactionTime = max(maxTransactionTime, (int64_t)tx.nTime); + return maxTransactionTime; +} + +uint256 CBlock::BuildMerkleTree() const +{ + vMerkleTree.clear(); + for(const auto& tx : vtx) + vMerkleTree.push_back(tx.GetHash()); + int j = 0; + for (int nSize = (int)vtx.size(); nSize > 1; nSize = (nSize + 1) / 2) + { + for (int i = 0; i < nSize; i += 2) + { + int i2 = min(i+1, nSize-1); + vMerkleTree.push_back(Hash(vMerkleTree[j+i].begin(), vMerkleTree[j+i].end(), + vMerkleTree[j+i2].begin(), vMerkleTree[j+i2].end())); + } + j += nSize; + } + return (vMerkleTree.empty() ? 0 : vMerkleTree.back()); +} + +vector CBlock::GetMerkleBranch(int nIndex) const +{ + if (vMerkleTree.empty()) + BuildMerkleTree(); + vector vMerkleBranch; + int j = 0; + for (int nSize = (int)vtx.size(); nSize > 1; nSize = (nSize + 1) / 2) + { + int i = min(nIndex^1, nSize-1); + vMerkleBranch.push_back(vMerkleTree[j+i]); + nIndex >>= 1; + j += nSize; + } + return vMerkleBranch; +} + +uint256 CBlock::CheckMerkleBranch(uint256 hash, const vector& vMerkleBranch, int nIndex) +{ + if (nIndex == -1) + return 0; + for(const uint256& otherside : vMerkleBranch) + { + if (nIndex & 1) + hash = Hash(otherside.begin(), otherside.end(), hash.begin(), hash.end()); + else + hash = Hash(hash.begin(), hash.end(), otherside.begin(), otherside.end()); + nIndex >>= 1; + } + return hash; +} + +bool CBlock::WriteToDisk(unsigned int& nFileRet, unsigned int& nBlockPosRet) +{ + // Open history file to append + auto fileout = CAutoFile(AppendBlockFile(nFileRet), SER_DISK, CLIENT_VERSION); + if (!fileout) + return error("CBlock::WriteToDisk() : AppendBlockFile failed"); + + // Write index header + unsigned int nSize = fileout.GetSerializeSize(*this); + fileout << nNetworkID << nSize; + + // Write block + long fileOutPos = ftell(fileout); + if (fileOutPos < 0) + return error("CBlock::WriteToDisk() : ftell failed"); + nBlockPosRet = fileOutPos; + fileout << *this; + + // Flush stdio buffers and commit to disk before returning + fflush(fileout); + if (!IsInitialBlockDownload() || (nBestHeight+1) % 500 == 0) + FileCommit(fileout); + return true; +} +bool CBlock::ReadFromDisk(unsigned int nFile, unsigned int nBlockPos, bool fReadTransactions) +{ + SetNull(); + + // Open history file to read + auto filein = CAutoFile(OpenBlockFile(nFile, nBlockPos, "rb"), SER_DISK, CLIENT_VERSION); + if (!filein) + return error("CBlock::ReadFromDisk() : OpenBlockFile failed"); + if (!fReadTransactions) + filein.nType |= SER_BLOCKHEADERONLY; + + // Read block + try { + filein >> *this; + } + catch (const std::exception&) { + return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION); + } + + // Check the header + if (fReadTransactions && IsProofOfWork() && !CheckProofOfWork(GetHash(), nBits)) + return error("CBlock::ReadFromDisk() : errors in block header"); + + return true; +} + +void CBlock::print() const +{ + printf("CBlock(hash=%s, ver=%" PRId32 ", hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%" PRIu32 ", nBits=%08x, nNonce=%" PRIu32 ", vtx=%" PRIszu ", vchBlockSig=%s)\n", + GetHash().ToString().c_str(), + nVersion, + hashPrevBlock.ToString().c_str(), + hashMerkleRoot.ToString().c_str(), + nTime, nBits, nNonce, + vtx.size(), + HexStr(vchBlockSig.begin(), vchBlockSig.end()).c_str()); + for (unsigned int i = 0; i < vtx.size(); i++) + { + printf(" "); + vtx[i].print(); + } + printf(" vMerkleTree: "); + for (unsigned int i = 0; i < vMerkleTree.size(); i++) + printf("%s ", vMerkleTree[i].ToString().substr(0,10).c_str()); + printf("\n"); +} bool CBlock::DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex) { @@ -2461,6 +2721,45 @@ uint256 CBlockIndex::GetBlockTrust() const } } +CBlock CBlockIndex::GetBlockHeader() const +{ + CBlock block; + block.nVersion = nVersion; + if (pprev) + block.hashPrevBlock = pprev->GetBlockHash(); + block.hashMerkleRoot = hashMerkleRoot; + block.nTime = nTime; + block.nBits = nBits; + block.nNonce = nNonce; + return block; +} + +enum { nMedianTimeSpan=11 }; + +int64_t CBlockIndex::GetMedianTimePast() const +{ + int64_t pmedian[nMedianTimeSpan]; + int64_t* pbegin = &pmedian[nMedianTimeSpan]; + int64_t* pend = &pmedian[nMedianTimeSpan]; + const CBlockIndex* pindex = this; + for (int i = 0; i < nMedianTimeSpan && pindex; i++, pindex = pindex->pprev) + *(--pbegin) = pindex->GetBlockTime(); + sort(pbegin, pend); + return pbegin[(pend - pbegin)/2]; +} + +int64_t CBlockIndex::GetMedianTime() const +{ + const CBlockIndex* pindex = this; + for (int i = 0; i < nMedianTimeSpan/2; i++) + { + if (!pindex->pnext) + return GetBlockTime(); + pindex = pindex->pnext; + } + return pindex->GetMedianTimePast(); +} + bool CBlockIndex::IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned int nRequired, unsigned int nToCheck) { unsigned int nFound = 0; @@ -2473,6 +2772,34 @@ bool CBlockIndex::IsSuperMajority(int minVersion, const CBlockIndex* pstart, uns return (nFound >= nRequired); } +bool CBlockIndex::SetStakeEntropyBit(unsigned int nEntropyBit) +{ + if (nEntropyBit > 1) + return false; + nFlags |= (nEntropyBit? BLOCK_STAKE_ENTROPY : 0); + return true; +} + +void CBlockIndex::SetStakeModifier(uint64_t nModifier, bool fGeneratedStakeModifier) +{ + nStakeModifier = nModifier; + if (fGeneratedStakeModifier) + nFlags |= BLOCK_STAKE_MODIFIER; +} + +string CBlockIndex::ToString() const +{ + return strprintf("CBlockIndex(nprev=%p, pnext=%p, nFile=%u, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, nFlags=(%s)(%d)(%s), nStakeModifier=%016" PRIx64 ", nStakeModifierChecksum=%08x, hashProofOfStake=%s, prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", + (const void*)pprev, (const void*)pnext, nFile, nBlockPos, nHeight, + FormatMoney(nMint).c_str(), FormatMoney(nMoneySupply).c_str(), + GeneratedStakeModifier() ? "MOD" : "-", GetStakeEntropyBit(), IsProofOfStake()? "PoS" : "PoW", + nStakeModifier, nStakeModifierChecksum, + hashProofOfStake.ToString().c_str(), + prevoutStake.ToString().c_str(), nStakeTime, + hashMerkleRoot.ToString().c_str(), + GetBlockHash().ToString().c_str()); +} + bool static ReserealizeBlockSignature(CBlock* pblock) { if (pblock->IsProofOfWork()) @@ -2649,6 +2976,122 @@ bool CBlock::CheckBlockSignature() const return false; } + + +// +// CDiskBlockIndex +// + +uint256 CDiskBlockIndex::GetBlockHash() const +{ + if (fUseFastIndex && blockHash != 0) + return blockHash; + + CBlock block; + block.nVersion = nVersion; + block.hashPrevBlock = hashPrev; + block.hashMerkleRoot = hashMerkleRoot; + block.nTime = nTime; + block.nBits = nBits; + block.nNonce = nNonce; + + const_cast(this)->blockHash = block.GetHash(); + + return blockHash; +} + +string CDiskBlockIndex::ToString() const +{ + string str = "CDiskBlockIndex("; + str += CBlockIndex::ToString(); + str += strprintf("\n hashBlock=%s, hashPrev=%s, hashNext=%s)", + GetBlockHash().ToString().c_str(), + hashPrev.ToString().c_str(), + hashNext.ToString().c_str()); + return str; +} + +// +//CBlockLocator +// + +void CBlockLocator::Set(const CBlockIndex* pindex) +{ + vHave.clear(); + int nStep = 1; + while (pindex) + { + vHave.push_back(pindex->GetBlockHash()); + // Exponentially larger steps back + for (int i = 0; pindex && i < nStep; i++) + pindex = pindex->pprev; + if (vHave.size() > 10) + nStep *= 2; + } + vHave.push_back((!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet)); +} + +int CBlockLocator::GetDistanceBack() +{ + // Retrace how far back it was in the sender's branch + int nDistance = 0; + int nStep = 1; + for(const auto& hash : vHave) + { + auto mi = mapBlockIndex.find(hash); + if (mi != mapBlockIndex.end()) + { + auto pindex = (*mi).second; + if (pindex->IsInMainChain()) + return nDistance; + } + nDistance += nStep; + if (nDistance > 10) + nStep *= 2; + } + return nDistance; +} + +CBlockIndex* CBlockLocator::GetBlockIndex() +{ + // Find the first block the caller has in the main chain + for(const auto& hash : vHave) + { + auto mi = mapBlockIndex.find(hash); + if (mi != mapBlockIndex.end()) + { + auto pindex = (*mi).second; + if (pindex->IsInMainChain()) + return pindex; + } + } + return pindexGenesisBlock; +} + +uint256 CBlockLocator::GetBlockHash() +{ + // Find the first block the caller has in the main chain + for(const uint256& hash : vHave) + { + auto mi = mapBlockIndex.find(hash); + if (mi != mapBlockIndex.end()) + { + auto pindex = (*mi).second; + if (pindex->IsInMainChain()) + return hash; + } + } + return (!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet); +} + +int CBlockLocator::GetHeight() +{ + CBlockIndex* pindex = GetBlockIndex(); + if (!pindex) + return 0; + return pindex->nHeight; +} + bool CheckDiskSpace(uint64_t nAdditionalBytes) { uint64_t nFreeBytesAvailable = filesystem::space(GetDataDir()).available; diff --git a/src/main.h b/src/main.h index 2247fa6..594bdbd 100644 --- a/src/main.h +++ b/src/main.h @@ -144,12 +144,9 @@ bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, uint3 - - - bool GetWalletFile(CWallet* pwallet, string &strWalletFileOut); -/** Position on disk for a particular transaction. */ +// Position on disk for a particular transaction. class CDiskTxPos { public: @@ -157,17 +154,8 @@ public: uint32_t nBlockPos; uint32_t nTxPos; - CDiskTxPos() - { - SetNull(); - } - - CDiskTxPos(unsigned int nFileIn, unsigned int nBlockPosIn, unsigned int nTxPosIn) - { - nFile = nFileIn; - nBlockPos = nBlockPosIn; - nTxPos = nTxPosIn; - } + CDiskTxPos() { SetNull(); } + CDiskTxPos(unsigned int nFileIn, unsigned int nBlockPosIn, unsigned int nTxPosIn) : nFile(nFileIn), nBlockPos(nBlockPosIn), nTxPos(nTxPosIn) {} IMPLEMENT_SERIALIZE( READWRITE(FLATDATA(*this)); ) void SetNull() { nFile = numeric_limits::max(); nBlockPos = 0; nTxPos = 0; } @@ -202,7 +190,7 @@ public: -/** An inpoint - a combination of a transaction and an index n into its vin */ +// An inpoint - a combination of a transaction and an index n into its vin class CInPoint { public: @@ -210,14 +198,14 @@ public: uint32_t n; CInPoint() { SetNull(); } - CInPoint(CTransaction* ptxIn, uint32_t nIn) { ptx = ptxIn; n = nIn; } + CInPoint(CTransaction* ptxIn, uint32_t nIn) : ptx(ptxIn), n(nIn) {} void SetNull() { ptx = NULL; n = numeric_limits::max(); } bool IsNull() const { return (ptx == NULL && n == numeric_limits::max()); } }; -/** An outpoint - a combination of a transaction hash and an index n into its vout */ +// An outpoint - a combination of a transaction hash and an index n into its vout class COutPoint { public: @@ -225,7 +213,7 @@ public: uint32_t n; COutPoint() { SetNull(); } - COutPoint(uint256 hashIn, uint32_t nIn) { hash = hashIn; n = nIn; } + COutPoint(uint256 hashIn, uint32_t nIn) : hash(hashIn), n(nIn) {} IMPLEMENT_SERIALIZE( READWRITE(FLATDATA(*this)); ) void SetNull() { hash = 0; n = numeric_limits::max(); } bool IsNull() const { return (hash == 0 && n == numeric_limits::max()); } @@ -258,11 +246,10 @@ public: - -/** An input of a transaction. It contains the location of the previous - * transaction's output that it claims and a signature that matches the - * output's public key. - */ +// An input of a transaction. It contains the location of the previous +// transaction's output that it claims and a signature that matches the +// output's public key. +// class CTxIn { public: @@ -270,24 +257,11 @@ public: CScript scriptSig; uint32_t nSequence; - CTxIn() - { - nSequence = numeric_limits::max(); - } - + CTxIn() : nSequence(numeric_limits::max()) {} explicit CTxIn(COutPoint prevoutIn, CScript scriptSigIn=CScript(), unsigned int nSequenceIn=numeric_limits::max()) - { - prevout = prevoutIn; - scriptSig = scriptSigIn; - nSequence = nSequenceIn; - } - + : prevout(prevoutIn), scriptSig(scriptSigIn), nSequence(nSequenceIn) {} CTxIn(uint256 hashPrevTx, unsigned int nOut, CScript scriptSigIn=CScript(), unsigned int nSequenceIn=numeric_limits::max()) - { - prevout = COutPoint(hashPrevTx, nOut); - scriptSig = scriptSigIn; - nSequence = nSequenceIn; - } + : prevout(COutPoint(hashPrevTx, nOut)), scriptSig(scriptSigIn), nSequence(nSequenceIn) {} IMPLEMENT_SERIALIZE ( @@ -318,20 +292,7 @@ public: return strprintf(" %s %d", prevout.hash.ToString().c_str(), prevout.n); } - string ToString() const - { - string str; - str += "CTxIn("; - str += prevout.ToString(); - if (prevout.IsNull()) - str += strprintf(", coinbase %s", HexStr(scriptSig).c_str()); - else - str += strprintf(", scriptSig=%s", scriptSig.ToString().substr(0,24).c_str()); - if (nSequence != numeric_limits::max()) - str += strprintf(", nSequence=%" PRIu32, nSequence); - str += ")"; - return str; - } + string ToString() const; void print() const { @@ -341,26 +302,17 @@ public: - -/** An output of a transaction. It contains the public key that the next input - * must be able to sign with to claim it. - */ +// An output of a transaction. It contains the public key that the next input +// must be able to sign with to claim it. +// class CTxOut { public: int64_t nValue; CScript scriptPubKey; - CTxOut() - { - SetNull(); - } - - CTxOut(int64_t nValueIn, CScript scriptPubKeyIn) - { - nValue = nValueIn; - scriptPubKey = scriptPubKeyIn; - } + CTxOut() { SetNull(); } + CTxOut(int64_t nValueIn, CScript scriptPubKeyIn) : nValue(nValueIn), scriptPubKey(scriptPubKeyIn) {} IMPLEMENT_SERIALIZE ( @@ -489,51 +441,8 @@ public: return SerializeHash(*this); } - bool IsFinal(int nBlockHeight=0, int64_t nBlockTime=0) const - { - // Time based nLockTime implemented in 0.1.6 - if (nLockTime == 0) - return true; - if (nBlockHeight == 0) - nBlockHeight = nBestHeight; - if (nBlockTime == 0) - nBlockTime = GetAdjustedTime(); - if ((int64_t)nLockTime < ((int64_t)nLockTime < LOCKTIME_THRESHOLD ? (int64_t)nBlockHeight : nBlockTime)) - return true; - for(const CTxIn& txin : vin) - if (!txin.IsFinal()) - return false; - return true; - } - - bool IsNewerThan(const CTransaction& old) const - { - if (vin.size() != old.vin.size()) - return false; - for (unsigned int i = 0; i < vin.size(); i++) - if (vin[i].prevout != old.vin[i].prevout) - return false; - - bool fNewer = false; - unsigned int nLowest = numeric_limits::max(); - for (unsigned int i = 0; i < vin.size(); i++) - { - if (vin[i].nSequence != old.vin[i].nSequence) - { - if (vin[i].nSequence <= nLowest) - { - fNewer = false; - nLowest = vin[i].nSequence; - } - if (old.vin[i].nSequence < nLowest) - { - fNewer = true; - nLowest = old.vin[i].nSequence; - } - } - } - return fNewer; - } + bool IsFinal(int nBlockHeight=0, int64_t nBlockTime=0) const; + bool IsNewerThan(const CTransaction& old) const; bool IsCoinBase() const { @@ -580,17 +489,7 @@ public: /** Amount of bitcoins spent by this transaction. @return sum of all outputs (note: does not include fees) */ - int64_t GetValueOut() const - { - CBigNum nValueOut = 0; - for(const auto& txout : vout) - { - nValueOut += txout.nValue; - if (!MoneyRange(txout.nValue) || !MoneyRange(nValueOut)) - throw runtime_error("CTransaction::GetValueOut() : value out of range"); - } - return nValueOut.getint64(); - } + int64_t GetValueOut() const; /** Amount of bitcoins coming in to this transaction Note that lightweight clients may not know anything besides the hash of previous transactions, @@ -611,33 +510,6 @@ public: int64_t GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=false, enum GetMinFee_mode mode=GMF_BLOCK, unsigned int nBytes = 0) const; - bool ReadFromDisk(CDiskTxPos pos, FILE** pfileRet=NULL) - { - auto filein = CAutoFile(OpenBlockFile(pos.nFile, 0, pfileRet ? "rb+" : "rb"), SER_DISK, CLIENT_VERSION); - if (!filein) - return error("CTransaction::ReadFromDisk() : OpenBlockFile failed"); - - // Read transaction - if (fseek(filein, pos.nTxPos, SEEK_SET) != 0) - return error("CTransaction::ReadFromDisk() : fseek failed"); - - try { - filein >> *this; - } - catch (const exception&) { - return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION); - } - - // Return file pointer - if (pfileRet) - { - if (fseek(filein, pos.nTxPos, SEEK_SET) != 0) - return error("CTransaction::ReadFromDisk() : second fseek failed"); - *pfileRet = filein.release(); - } - return true; - } - friend bool operator==(const CTransaction& a, const CTransaction& b) { return (a.nVersion == b.nVersion && @@ -652,37 +524,15 @@ public: return !(a == b); } - string ToStringShort() const - { - string str; - str += strprintf("%s %s", GetHash().ToString().c_str(), IsCoinBase()? "base" : (IsCoinStake()? "stake" : "user")); - return str; - } - - string ToString() const - { - string str; - str += IsCoinBase()? "Coinbase" : (IsCoinStake()? "Coinstake" : "CTransaction"); - str += strprintf("(hash=%s, nTime=%d, ver=%d, vin.size=%" PRIszu ", vout.size=%" PRIszu ", nLockTime=%d)\n", - GetHash().ToString().substr(0,10).c_str(), - nTime, - nVersion, - vin.size(), - vout.size(), - nLockTime); - for (unsigned int i = 0; i < vin.size(); i++) - str += " " + vin[i].ToString() + "\n"; - for (unsigned int i = 0; i < vout.size(); i++) - str += " " + vout[i].ToString() + "\n"; - return str; - } + string ToStringShort() const; + string ToString() const; void print() const { printf("%s", ToString().c_str()); } - + bool ReadFromDisk(CDiskTxPos pos, FILE** pfileRet=NULL); bool ReadFromDisk(CTxDB& txdb, COutPoint prevout, CTxIndex& txindexRet); bool ReadFromDisk(CTxDB& txdb, COutPoint prevout); bool ReadFromDisk(COutPoint prevout); @@ -932,27 +782,7 @@ public: void UpdateTime(const CBlockIndex* pindexPrev); // ppcoin: entropy bit for stake modifier if chosen by modifier - unsigned int GetStakeEntropyBit(unsigned int nHeight) const - { - // Protocol switch to support p2pool at novacoin block #9689 - if (nHeight >= 9689 || fTestNet) - { - // Take last bit of block hash as entropy bit - auto nEntropyBit = (GetHash().Get32()) & (uint32_t)1; - if (fDebug && GetBoolArg("-printstakemodifier")) - printf("GetStakeEntropyBit: nTime=%" PRIu32 " hashBlock=%s nEntropyBit=%" PRIu32 "\n", nTime, GetHash().ToString().c_str(), nEntropyBit); - return nEntropyBit; - } - - // Before novacoin block #9689 - get from pregenerated table - int nBitNum = nHeight & 0xFF; - int nItemNum = nHeight / 0xFF; - - auto nEntropyBit = ((entropyStore[nItemNum] & (uint256(1) << nBitNum)) >> nBitNum).Get32(); - if (fDebug && GetBoolArg("-printstakemodifier")) - printf("GetStakeEntropyBit: from pregenerated table, nHeight=%" PRIu32 " nEntropyBit=%" PRIu32 "\n", nHeight, nEntropyBit); - return nEntropyBit; - } + unsigned int GetStakeEntropyBit(unsigned int nHeight) const; // ppcoin: two types of block: proof-of-work or proof-of-stake bool IsProofOfStake() const @@ -973,141 +803,13 @@ public: } // ppcoin: get max transaction timestamp - int64_t GetMaxTransactionTime() const - { - int64_t maxTransactionTime = 0; - for(const auto& tx : vtx) - maxTransactionTime = max(maxTransactionTime, (int64_t)tx.nTime); - return maxTransactionTime; - } - - uint256 BuildMerkleTree() const - { - vMerkleTree.clear(); - for(const auto& tx : vtx) - vMerkleTree.push_back(tx.GetHash()); - int j = 0; - for (int nSize = (int)vtx.size(); nSize > 1; nSize = (nSize + 1) / 2) - { - for (int i = 0; i < nSize; i += 2) - { - int i2 = min(i+1, nSize-1); - vMerkleTree.push_back(Hash(vMerkleTree[j+i].begin(), vMerkleTree[j+i].end(), - vMerkleTree[j+i2].begin(), vMerkleTree[j+i2].end())); - } - j += nSize; - } - return (vMerkleTree.empty() ? 0 : vMerkleTree.back()); - } - - vector GetMerkleBranch(int nIndex) const - { - if (vMerkleTree.empty()) - BuildMerkleTree(); - vector vMerkleBranch; - int j = 0; - for (int nSize = (int)vtx.size(); nSize > 1; nSize = (nSize + 1) / 2) - { - int i = min(nIndex^1, nSize-1); - vMerkleBranch.push_back(vMerkleTree[j+i]); - nIndex >>= 1; - j += nSize; - } - return vMerkleBranch; - } - - static uint256 CheckMerkleBranch(uint256 hash, const vector& vMerkleBranch, int nIndex) - { - if (nIndex == -1) - return 0; - for(const uint256& otherside : vMerkleBranch) - { - if (nIndex & 1) - hash = Hash(otherside.begin(), otherside.end(), hash.begin(), hash.end()); - else - hash = Hash(hash.begin(), hash.end(), otherside.begin(), otherside.end()); - nIndex >>= 1; - } - return hash; - } - - - bool WriteToDisk(unsigned int& nFileRet, unsigned int& nBlockPosRet) - { - // Open history file to append - auto fileout = CAutoFile(AppendBlockFile(nFileRet), SER_DISK, CLIENT_VERSION); - if (!fileout) - return error("CBlock::WriteToDisk() : AppendBlockFile failed"); - - // Write index header - unsigned int nSize = fileout.GetSerializeSize(*this); - fileout << nNetworkID << nSize; - - // Write block - long fileOutPos = ftell(fileout); - if (fileOutPos < 0) - return error("CBlock::WriteToDisk() : ftell failed"); - nBlockPosRet = fileOutPos; - fileout << *this; - - // Flush stdio buffers and commit to disk before returning - fflush(fileout); - if (!IsInitialBlockDownload() || (nBestHeight+1) % 500 == 0) - FileCommit(fileout); - - return true; - } - - bool ReadFromDisk(unsigned int nFile, unsigned int nBlockPos, bool fReadTransactions=true) - { - SetNull(); - - // Open history file to read - auto filein = CAutoFile(OpenBlockFile(nFile, nBlockPos, "rb"), SER_DISK, CLIENT_VERSION); - if (!filein) - return error("CBlock::ReadFromDisk() : OpenBlockFile failed"); - if (!fReadTransactions) - filein.nType |= SER_BLOCKHEADERONLY; - - // Read block - try { - filein >> *this; - } - catch (const exception&) { - return error("%s() : deserialize or I/O error", BOOST_CURRENT_FUNCTION); - } - - // Check the header - if (fReadTransactions && IsProofOfWork() && !CheckProofOfWork(GetHash(), nBits)) - return error("CBlock::ReadFromDisk() : errors in block header"); - - return true; - } - - - - void print() const - { - printf("CBlock(hash=%s, ver=%" PRId32 ", hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%" PRIu32 ", nBits=%08x, nNonce=%" PRIu32 ", vtx=%" PRIszu ", vchBlockSig=%s)\n", - GetHash().ToString().c_str(), - nVersion, - hashPrevBlock.ToString().c_str(), - hashMerkleRoot.ToString().c_str(), - nTime, nBits, nNonce, - vtx.size(), - HexStr(vchBlockSig.begin(), vchBlockSig.end()).c_str()); - for (unsigned int i = 0; i < vtx.size(); i++) - { - printf(" "); - vtx[i].print(); - } - printf(" vMerkleTree: "); - for (unsigned int i = 0; i < vMerkleTree.size(); i++) - printf("%s ", vMerkleTree[i].ToString().substr(0,10).c_str()); - printf("\n"); - } - - + int64_t GetMaxTransactionTime() const; + uint256 BuildMerkleTree() const; + vector GetMerkleBranch(int nIndex) const; + static uint256 CheckMerkleBranch(uint256 hash, const vector& vMerkleBranch, int nIndex); + bool WriteToDisk(unsigned int& nFileRet, unsigned int& nBlockPosRet); + bool ReadFromDisk(unsigned int nFile, unsigned int nBlockPos, bool fReadTransactions=true); + void print() const; bool DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex); bool ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck=false); bool ReadFromDisk(const CBlockIndex* pindex, bool fReadTransactions=true); @@ -1230,18 +932,7 @@ public: nNonce = block.nNonce; } - CBlock GetBlockHeader() const - { - CBlock block; - block.nVersion = nVersion; - if (pprev) - block.hashPrevBlock = pprev->GetBlockHash(); - block.hashMerkleRoot = hashMerkleRoot; - block.nTime = nTime; - block.nBits = nBits; - block.nNonce = nNonce; - return block; - } + CBlock GetBlockHeader() const; uint256 GetBlockHash() const { @@ -1265,33 +956,8 @@ public: return true; } - enum { nMedianTimeSpan=11 }; - - int64_t GetMedianTimePast() const - { - int64_t pmedian[nMedianTimeSpan]; - int64_t* pbegin = &pmedian[nMedianTimeSpan]; - int64_t* pend = &pmedian[nMedianTimeSpan]; - - const CBlockIndex* pindex = this; - for (int i = 0; i < nMedianTimeSpan && pindex; i++, pindex = pindex->pprev) - *(--pbegin) = pindex->GetBlockTime(); - - sort(pbegin, pend); - return pbegin[(pend - pbegin)/2]; - } - - int64_t GetMedianTime() const - { - const CBlockIndex* pindex = this; - for (int i = 0; i < nMedianTimeSpan/2; i++) - { - if (!pindex->pnext) - return GetBlockTime(); - pindex = pindex->pnext; - } - return pindex->GetMedianTimePast(); - } + int64_t GetMedianTimePast() const; + int64_t GetMedianTime() const; /** * Returns true if there are nRequired or more blocks of minVersion or above @@ -1321,38 +987,15 @@ public: return ((nFlags & BLOCK_STAKE_ENTROPY) >> 1); } - bool SetStakeEntropyBit(unsigned int nEntropyBit) - { - if (nEntropyBit > 1) - return false; - nFlags |= (nEntropyBit? BLOCK_STAKE_ENTROPY : 0); - return true; - } + bool SetStakeEntropyBit(unsigned int nEntropyBit); bool GeneratedStakeModifier() const { return (nFlags & BLOCK_STAKE_MODIFIER) != 0; } - void SetStakeModifier(uint64_t nModifier, bool fGeneratedStakeModifier) - { - nStakeModifier = nModifier; - if (fGeneratedStakeModifier) - nFlags |= BLOCK_STAKE_MODIFIER; - } - - string ToString() const - { - return strprintf("CBlockIndex(nprev=%p, pnext=%p, nFile=%u, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, nFlags=(%s)(%d)(%s), nStakeModifier=%016" PRIx64 ", nStakeModifierChecksum=%08x, hashProofOfStake=%s, prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", - (const void*)pprev, (const void*)pnext, nFile, nBlockPos, nHeight, - FormatMoney(nMint).c_str(), FormatMoney(nMoneySupply).c_str(), - GeneratedStakeModifier() ? "MOD" : "-", GetStakeEntropyBit(), IsProofOfStake()? "PoS" : "PoW", - nStakeModifier, nStakeModifierChecksum, - hashProofOfStake.ToString().c_str(), - prevoutStake.ToString().c_str(), nStakeTime, - hashMerkleRoot.ToString().c_str(), - GetBlockHash().ToString().c_str()); - } + void SetStakeModifier(uint64_t nModifier, bool fGeneratedStakeModifier); + string ToString() const; void print() const { @@ -1362,7 +1005,7 @@ public: -/** Used to marshal pointers into hashes for db storage. */ +// Used to marshal pointers into hashes for db storage. class CDiskBlockIndex : public CBlockIndex { private: @@ -1372,13 +1015,7 @@ public: uint256 hashPrev; uint256 hashNext; - CDiskBlockIndex() - { - hashPrev = 0; - hashNext = 0; - blockHash = 0; - } - + CDiskBlockIndex() : blockHash(0), hashPrev(0), hashNext(0) {} explicit CDiskBlockIndex(CBlockIndex* pindex) : CBlockIndex(*pindex) { hashPrev = (pprev ? pprev->GetBlockHash() : 0); @@ -1421,34 +1058,8 @@ public: READWRITE(blockHash); ) - uint256 GetBlockHash() const - { - if (fUseFastIndex && blockHash != 0) - return blockHash; - - CBlock block; - block.nVersion = nVersion; - block.hashPrevBlock = hashPrev; - block.hashMerkleRoot = hashMerkleRoot; - block.nTime = nTime; - block.nBits = nBits; - block.nNonce = nNonce; - - const_cast(this)->blockHash = block.GetHash(); - - return blockHash; - } - - string ToString() const - { - string str = "CDiskBlockIndex("; - str += CBlockIndex::ToString(); - str += strprintf("\n hashBlock=%s, hashPrev=%s, hashNext=%s)", - GetBlockHash().ToString().c_str(), - hashPrev.ToString().c_str(), - hashNext.ToString().c_str()); - return str; - } + uint256 GetBlockHash() const; + string ToString() const; void print() const { @@ -1458,24 +1069,18 @@ public: - - - - - -/** Describes a place in the block chain to another node such that if the - * other node doesn't have the same branch, it can find a recent common trunk. - * The further back it is, the further before the fork it may be. - */ +// Describes a place in the block chain to another node such that if the +// other node doesn't have the same branch, it can find a recent common trunk. +// The further back it is, the further before the fork it may be. +// class CBlockLocator { protected: vector vHave; public: - CBlockLocator() - { - } + CBlockLocator() { } + CBlockLocator(const vector& vHaveIn) : vHave(vHaveIn) { } explicit CBlockLocator(const CBlockIndex* pindex) { @@ -1489,11 +1094,6 @@ public: Set((*mi).second); } - CBlockLocator(const vector& vHaveIn) - { - vHave = vHaveIn; - } - IMPLEMENT_SERIALIZE ( if (!(nType & SER_GETHASH)) @@ -1511,92 +1111,15 @@ public: return vHave.empty(); } - void Set(const CBlockIndex* pindex) - { - vHave.clear(); - int nStep = 1; - while (pindex) - { - vHave.push_back(pindex->GetBlockHash()); - - // Exponentially larger steps back - for (int i = 0; pindex && i < nStep; i++) - pindex = pindex->pprev; - if (vHave.size() > 10) - nStep *= 2; - } - vHave.push_back((!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet)); - } - - int GetDistanceBack() - { - // Retrace how far back it was in the sender's branch - int nDistance = 0; - int nStep = 1; - for(const auto& hash : vHave) - { - auto mi = mapBlockIndex.find(hash); - if (mi != mapBlockIndex.end()) - { - auto pindex = (*mi).second; - if (pindex->IsInMainChain()) - return nDistance; - } - nDistance += nStep; - if (nDistance > 10) - nStep *= 2; - } - return nDistance; - } - - CBlockIndex* GetBlockIndex() - { - // Find the first block the caller has in the main chain - for(const auto& hash : vHave) - { - auto mi = mapBlockIndex.find(hash); - if (mi != mapBlockIndex.end()) - { - auto pindex = (*mi).second; - if (pindex->IsInMainChain()) - return pindex; - } - } - return pindexGenesisBlock; - } - - uint256 GetBlockHash() - { - // Find the first block the caller has in the main chain - for(const uint256& hash : vHave) - { - auto mi = mapBlockIndex.find(hash); - if (mi != mapBlockIndex.end()) - { - auto pindex = (*mi).second; - if (pindex->IsInMainChain()) - return hash; - } - } - return (!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet); - } - - int GetHeight() - { - CBlockIndex* pindex = GetBlockIndex(); - if (!pindex) - return 0; - return pindex->nHeight; - } + void Set(const CBlockIndex* pindex); + int GetDistanceBack(); + CBlockIndex* GetBlockIndex(); + uint256 GetBlockHash(); + int GetHeight(); }; - - - - - class CTxMemPool { public: