X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a70c75a7a5b1e4df558fd70d2cf21794fb9e3576;hb=41b2d07b7a3cb02dd8c1faffc7737f6c54f5b4c0;hp=65001a3c2b6ad0efb766ab0dc3457ba689dd2b07;hpb=9e58e0a8ca28b15a4bfa677f5b23891972db40fd;p=novacoin.git diff --git a/src/main.cpp b/src/main.cpp index 65001a3..a70c75a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -80,7 +80,6 @@ int64_t nMinimumInputValue = MIN_TXOUT_AMOUNT; // Ping and address broadcast intervals int64_t nPingInterval = 30 * 60; -int64_t nBroadcastInterval = nOneDay; extern enum Checkpoints::CPMode CheckpointsMode; @@ -111,28 +110,12 @@ void UnregisterWallet(CWallet* pwalletIn) // check whether the passed transaction is from us bool static IsFromMe(CTransaction& tx) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) if (pwallet->IsFromMe(tx)) return true; return false; } -// get the wallet transaction with the given hash (if it exists) -bool static GetTransaction(const uint256& hashTx, CWalletTx& wtx) -{ - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) - if (pwallet->GetTransaction(hashTx,wtx)) - return true; - return false; -} - -// erases transaction with the given hash from all wallets -void static EraseFromWallets(uint256 hash) -{ - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) - pwallet->EraseFromWallet(hash); -} - // make sure all wallets know about the given transaction, in the given block void SyncWithWallets(const CTransaction& tx, const CBlock* pblock, bool fUpdate, bool fConnect) { @@ -141,49 +124,49 @@ void SyncWithWallets(const CTransaction& tx, const CBlock* pblock, bool fUpdate, // wallets need to refund inputs when disconnecting coinstake if (tx.IsCoinStake()) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) if (pwallet->IsFromMe(tx)) pwallet->DisableTransaction(tx); } return; } - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) pwallet->AddToWalletIfInvolvingMe(tx, pblock, fUpdate); } // notify wallets about a new best chain void static SetBestChain(const CBlockLocator& loc) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) pwallet->SetBestChain(loc); } // notify wallets about an updated transaction void static UpdatedTransaction(const uint256& hashTx) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) pwallet->UpdatedTransaction(hashTx); } // dump all wallets void static PrintWallets(const CBlock& block) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) pwallet->PrintWallet(block); } // notify wallets about an incoming inventory (for request counts) void static Inventory(const uint256& hash) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) pwallet->Inventory(hash); } // ask wallets to resend their transactions void ResendWalletTransactions(bool fForceResend) { - BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered) + for(CWallet* pwallet : setpwalletRegistered) pwallet->ResendWalletTransactions(fForceResend); } @@ -200,7 +183,7 @@ void ResendWalletTransactions(bool fForceResend) bool AddOrphanTx(const CTransaction& tx) { - uint256 hash = tx.GetHash(); + auto hash = tx.GetHash(); if (mapOrphanTransactions.count(hash)) return false; @@ -221,7 +204,7 @@ bool AddOrphanTx(const CTransaction& tx) } mapOrphanTransactions[hash] = tx; - BOOST_FOREACH(const CTxIn& txin, tx.vin) + for(const CTxIn& txin : tx.vin) mapOrphanTransactionsByPrev[txin.prevout.hash].insert(hash); printf("stored orphan tx %s (mapsz %" PRIszu ")\n", hash.ToString().substr(0,10).c_str(), @@ -233,8 +216,8 @@ void static EraseOrphanTx(uint256 hash) { if (!mapOrphanTransactions.count(hash)) return; - const CTransaction& tx = mapOrphanTransactions[hash]; - BOOST_FOREACH(const CTxIn& txin, tx.vin) + const auto& tx = mapOrphanTransactions[hash]; + for(const auto& txin : tx.vin) { mapOrphanTransactionsByPrev[txin.prevout.hash].erase(hash); if (mapOrphanTransactionsByPrev[txin.prevout.hash].empty()) @@ -249,8 +232,8 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) while (mapOrphanTransactions.size() > nMaxOrphans) { // Evict a random orphan: - uint256 randomhash = GetRandHash(); - map::iterator it = mapOrphanTransactions.lower_bound(randomhash); + auto randomhash = GetRandHash(); + auto it = mapOrphanTransactions.lower_bound(randomhash); if (it == mapOrphanTransactions.end()) it = mapOrphanTransactions.begin(); EraseOrphanTx(it->first); @@ -270,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(); @@ -308,7 +363,7 @@ bool CTransaction::IsStandard(string& strReason) const unsigned int nDataOut = 0; txnouttype whichType; - BOOST_FOREACH(const CTxIn& txin, vin) + for(const CTxIn& txin : vin) { // Biggest 'standard' txin is a 15-of-15 P2SH multisig with compressed // keys. (remember the 520 byte limit on redeemScript size) That works @@ -332,7 +387,7 @@ bool CTransaction::IsStandard(string& strReason) const return false; } } - BOOST_FOREACH(const CTxOut& txout, vout) { + for(const CTxOut& txout : vout) { if (!::IsStandard(txout.scriptPubKey, whichType)) { strReason = "scriptpubkey"; return false; @@ -376,7 +431,7 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const if (IsCoinBase()) return true; // Coinbases don't use vin normally - for (unsigned int i = 0; i < vin.size(); i++) + for (uint32_t i = 0; i < vin.size(); i++) { const CTxOut& prev = GetOutputFor(vin[i], mapInputs); @@ -425,27 +480,25 @@ 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()) { // Coinbase scriptsigs are never executed, so there is // no sense in calculation of sigops. - BOOST_FOREACH(const CTxIn& txin, vin) + for(const CTxIn& txin : vin) { nSigOps += txin.scriptSig.GetSigOpCount(false); } } - BOOST_FOREACH(const CTxOut& txout, vout) + for(const CTxOut& txout : vout) { nSigOps += txout.scriptPubKey.GetSigOpCount(false); } return nSigOps; } - int CMerkleTx::SetMerkleBranch(const CBlock* pblock) { if (fClient) @@ -456,6 +509,7 @@ int CMerkleTx::SetMerkleBranch(const CBlock* pblock) else { CBlock blockTmp; + if (pblock == NULL) { // Load the block this tx is in @@ -487,22 +541,16 @@ int CMerkleTx::SetMerkleBranch(const CBlock* pblock) } // Is the tx in a block that's in the main chain - map::iterator mi = mapBlockIndex.find(hashBlock); + auto mi = mapBlockIndex.find(hashBlock); if (mi == mapBlockIndex.end()) return 0; - CBlockIndex* pindex = (*mi).second; + const CBlockIndex* pindex = (*mi).second; if (!pindex || !pindex->IsInMainChain()) return 0; return pindexBest->nHeight - pindex->nHeight + 1; } - - - - - - bool CTransaction::CheckTransaction() const { // Basic checks that don't depend on any context @@ -515,17 +563,14 @@ bool CTransaction::CheckTransaction() const return DoS(100, error("CTransaction::CheckTransaction() : size limits failed")); // Check for negative or overflow output values - int64_t nValueOut = 0; - for (unsigned int i = 0; i < vout.size(); i++) + CBigNum nValueOut = 0; + for (uint32_t i = 0; i < vout.size(); i++) { - const CTxOut& txout = vout[i]; + const auto& txout = vout[i]; if (txout.IsEmpty() && !IsCoinBase() && !IsCoinStake()) return DoS(100, error("CTransaction::CheckTransaction() : txout empty for user transaction")); - - if (txout.nValue < 0) - return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue is negative")); - if (txout.nValue > MAX_MONEY) - return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue too high")); + if (!MoneyRange(txout.nValue)) + return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue is out of range")); nValueOut += txout.nValue; if (!MoneyRange(nValueOut)) return DoS(100, error("CTransaction::CheckTransaction() : txout total out of range")); @@ -533,7 +578,7 @@ bool CTransaction::CheckTransaction() const // Check for duplicate inputs set vInOutPoints; - BOOST_FOREACH(const CTxIn& txin, vin) + for(const CTxIn& txin : vin) { if (vInOutPoints.count(txin.prevout)) return false; @@ -547,7 +592,7 @@ bool CTransaction::CheckTransaction() const } else { - BOOST_FOREACH(const CTxIn& txin, vin) + for(const CTxIn& txin : vin) if (txin.prevout.IsNull()) return DoS(10, error("CTransaction::CheckTransaction() : prevout is null")); } @@ -567,7 +612,7 @@ int64_t CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, enum G } // Base fee is either nMinTxFee or nMinRelayTxFee - int64_t nBaseFee = (mode == GMF_RELAY) ? nMinRelayTxFee : nMinTxFee; + auto nBaseFee = (mode == GMF_RELAY) ? nMinRelayTxFee : nMinTxFee; unsigned int nNewBlockSize = nBlockSize + nBytes; int64_t nMinFee = (1 + (int64_t)nBytes / 1000) * nBaseFee; @@ -593,7 +638,7 @@ int64_t CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, enum G // // It's safe to ignore empty outputs here, because these inputs are allowed // only for coinbase and coinstake transactions. - BOOST_FOREACH(const CTxOut& txout, vout) + for(const CTxOut& txout : vout) if (txout.nValue < CENT && !txout.IsEmpty()) nMinFee += nBaseFee; @@ -611,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) @@ -643,7 +712,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, return error("CTxMemPool::accept() : nonstandard transaction (%s)", strNonStd.c_str()); // Do we already have it? - uint256 hash = tx.GetHash(); + auto hash = tx.GetHash(); { LOCK(cs); if (mapTx.count(hash)) @@ -654,30 +723,13 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, return false; // Check for conflicts with in-memory transactions - CTransaction* ptxOld = NULL; for (unsigned int i = 0; i < tx.vin.size(); i++) { - COutPoint outpoint = tx.vin[i].prevout; + auto outpoint = tx.vin[i].prevout; if (mapNextTx.count(outpoint)) { - // Disable replacement feature for now + // Replacement feature isn't supported by Novacoin. return false; - - // Allow replacing with a newer version of the same transaction - if (i != 0) - return false; - ptxOld = mapNextTx[outpoint].ptx; - if (ptxOld->IsFinal()) - return false; - if (!tx.IsNewerThan(*ptxOld)) - return false; - for (unsigned int i = 0; i < tx.vin.size(); i++) - { - COutPoint outpoint = tx.vin[i].prevout; - if (!mapNextTx.count(outpoint) || mapNextTx[outpoint].ptx != ptxOld) - return false; - } - break; } } @@ -703,11 +755,11 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, // you should add code here to check that the transaction does a // reasonable number of ECDSA signature verifications. - int64_t nFees = tx.GetValueIn(mapInputs)-tx.GetValueOut(); + auto nFees = tx.GetValueIn(mapInputs)-tx.GetValueOut(); unsigned int nSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); // Don't accept it if it can't get into a block - int64_t txMinFee = tx.GetMinFee(1000, true, GMF_RELAY, nSize); + auto txMinFee = tx.GetMinFee(1000, true, GMF_RELAY, nSize); if (nFees < txMinFee) return error("CTxMemPool::accept() : not enough fees %s, %" PRId64 " < %" PRId64, hash.ToString().c_str(), @@ -721,7 +773,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, static CCriticalSection cs; static double dFreeCount; static int64_t nLastTime; - int64_t nNow = GetTime(); + auto nNow = GetTime(); { LOCK(cs); @@ -749,19 +801,9 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, // Store transaction in memory { LOCK(cs); - if (ptxOld) - { - printf("CTxMemPool::accept() : replacing tx %s with new version\n", ptxOld->GetHash().ToString().c_str()); - remove(*ptxOld); - } addUnchecked(hash, tx); } - ///// are we sure this is ok when loading transactions or restoring block txes - // If updated, erase old tx from wallet - if (ptxOld) - EraseFromWallets(ptxOld->GetHash()); - printf("CTxMemPool::accept() : accepted %s (poolsz %" PRIszu ")\n", hash.ToString().substr(0,10).c_str(), mapTx.size()); @@ -792,10 +834,10 @@ bool CTxMemPool::remove(CTransaction &tx) // Remove transaction from memory pool { LOCK(cs); - uint256 hash = tx.GetHash(); + auto hash = tx.GetHash(); if (mapTx.count(hash)) { - BOOST_FOREACH(const CTxIn& txin, tx.vin) + for(const CTxIn& txin : tx.vin) mapNextTx.erase(txin.prevout); mapTx.erase(hash); nTransactionsUpdated++; @@ -818,11 +860,25 @@ void CTxMemPool::queryHashes(std::vector& vtxid) LOCK(cs); vtxid.reserve(mapTx.size()); - for (map::iterator mi = mapTx.begin(); mi != mapTx.end(); ++mi) + for (auto mi = mapTx.begin(); mi != mapTx.end(); ++mi) vtxid.push_back((*mi).first); } +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 @@ -831,7 +887,7 @@ int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const return 0; // Find the block it claims to be in - map::iterator mi = mapBlockIndex.find(hashBlock); + auto mi = mapBlockIndex.find(hashBlock); if (mi == mapBlockIndex.end()) return 0; CBlockIndex* pindex = (*mi).second; @@ -887,11 +943,11 @@ bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs) { LOCK(mempool.cs); // Add previous supporting transactions first - BOOST_FOREACH(CMerkleTx& tx, vtxPrev) + for(CMerkleTx& tx : vtxPrev) { if (!(tx.IsCoinBase() || tx.IsCoinStake())) { - uint256 hash = tx.GetHash(); + auto hash = tx.GetHash(); if (!mempool.exists(hash) && !txdb.ContainsTx(hash)) tx.AcceptToMemoryPool(txdb, fCheckInputs); } @@ -914,10 +970,10 @@ int CTxIndex::GetDepthInMainChain() const if (!block.ReadFromDisk(pos.nFile, pos.nBlockPos, false)) return 0; // Find the block in the index - map::iterator mi = mapBlockIndex.find(block.GetHash()); + auto mi = mapBlockIndex.find(block.GetHash()); if (mi == mapBlockIndex.end()) return 0; - CBlockIndex* pindex = (*mi).second; + auto pindex = (*mi).second; if (!pindex || !pindex->IsInMainChain()) return 0; return 1 + nBestHeight - pindex->nHeight; @@ -950,8 +1006,33 @@ bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock) } +// Closure representing one script verification +// Note that this stores references to the spending transaction +class CScriptCheck +{ +private: + CScript scriptPubKey; + const CTransaction *ptxTo = nullptr; + uint32_t nIn = 0; + unsigned int nFlags = 0; + int nHashType = 0; - +public: + CScriptCheck() {} + CScriptCheck(const CTransaction& txFromIn, const CTransaction& txToIn, uint32_t nInIn, unsigned int nFlagsIn, int nHashTypeIn) : + scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), + ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), nHashType(nHashTypeIn) { } + + bool operator()() const; + + void swap(CScriptCheck &check) { + scriptPubKey.swap(check.scriptPubKey); + std::swap(ptxTo, check.ptxTo); + std::swap(nIn, check.nIn); + std::swap(nFlags, check.nFlags); + std::swap(nHashType, check.nHashType); + } +}; @@ -1085,7 +1166,7 @@ int64_t GetProofOfStakeReward(int64_t nCoinAge, unsigned int nBits, int64_t nTim while (bnLowerBound + CENT <= bnUpperBound) { - CBigNum bnMidValue = (bnLowerBound + bnUpperBound) / 2; + auto bnMidValue = (bnLowerBound + bnUpperBound) / 2; // // Reward for coin-year is cut in half every 8x multiply of PoS difficulty @@ -1246,7 +1327,7 @@ bool IsInitialBlockDownload() return true; static int64_t nLastUpdate; static CBlockIndex* pindexLastBest; - int64_t nCurrentTime = GetTime(); + auto nCurrentTime = GetTime(); if (pindexBest != pindexLastBest) { pindexLastBest = pindexBest; @@ -1265,8 +1346,8 @@ void static InvalidChainFound(CBlockIndex* pindexNew) uiInterface.NotifyBlocksChanged(); } - uint256 nBestInvalidBlockTrust = pindexNew->nChainTrust - pindexNew->pprev->nChainTrust; - uint256 nBestBlockTrust = pindexBest->nHeight != 0 ? (pindexBest->nChainTrust - pindexBest->pprev->nChainTrust) : pindexBest->nChainTrust; + auto nBestInvalidBlockTrust = pindexNew->nChainTrust - pindexNew->pprev->nChainTrust; + auto nBestBlockTrust = pindexBest->nHeight != 0 ? (pindexBest->nChainTrust - pindexBest->pprev->nChainTrust) : pindexBest->nChainTrust; printf("InvalidChainFound: invalid block=%s height=%d trust=%s blocktrust=%" PRId64 " date=%s\n", pindexNew->GetBlockHash().ToString().substr(0,20).c_str(), pindexNew->nHeight, @@ -1279,30 +1360,41 @@ 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) { // Relinquish previous transactions' spent pointers if (!IsCoinBase()) { - BOOST_FOREACH(const CTxIn& txin, vin) + for(const CTxIn& txin : vin) { - COutPoint prevout = txin.prevout; + auto prevout = txin.prevout; // Get prev txindex from disk CTxIndex txindex; @@ -1345,7 +1437,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map& mapTes for (unsigned int i = 0; i < vin.size(); i++) { - COutPoint prevout = vin[i].prevout; + auto prevout = vin[i].prevout; if (inputsRet.count(prevout.hash)) continue; // Got it already @@ -1408,28 +1500,43 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map& mapTes const CTxOut& CTransaction::GetOutputFor(const CTxIn& input, const MapPrevTx& inputs) const { - MapPrevTx::const_iterator mi = inputs.find(input.prevout.hash); + auto mi = inputs.find(input.prevout.hash); if (mi == inputs.end()) throw std::runtime_error("CTransaction::GetOutputFor() : prevout.hash not found"); - const CTransaction& txPrev = (mi->second).second; + const auto& txPrev = (mi->second).second; if (input.prevout.n >= txPrev.vout.size()) throw std::runtime_error("CTransaction::GetOutputFor() : prevout.n out of range"); 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()) return 0; - int64_t nResult = 0; - for (unsigned int i = 0; i < vin.size(); i++) + CBigNum nResult = 0; + for (uint32_t i = 0; i < vin.size(); i++) { - nResult += GetOutputFor(vin[i], inputs).nValue; + const auto& txOut = GetOutputFor(vin[i], inputs); + nResult += txOut.nValue; + if (!MoneyRange(txOut.nValue) || !MoneyRange(nResult)) + throw runtime_error("CTransaction::GetValueIn() : value out of range"); } - return nResult; + return nResult.getint64(); } @@ -1455,7 +1562,7 @@ bool CScriptCheck::operator()() const { return true; } -bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType) +bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, uint32_t nIn, unsigned int flags, int nHashType) { return CScriptCheck(txFrom, txTo, nIn, flags, nHashType)(); } @@ -1471,32 +1578,34 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, map 0); - CTxIndex& txindex = inputs[prevout.hash].first; - CTransaction& txPrev = inputs[prevout.hash].second; - - if (prevout.n >= txPrev.vout.size() || prevout.n >= txindex.vSpent.size()) - return DoS(100, error("ConnectInputs() : %s prevout.n out of range %d %" PRIszu " %" PRIszu " prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str())); - - // If prev is coinbase or coinstake, check that it's matured - if (txPrev.IsCoinBase() || txPrev.IsCoinStake()) - for (const CBlockIndex* pindex = pindexBlock; pindex && pindexBlock->nHeight - pindex->nHeight < nCoinbaseMaturity; pindex = pindex->pprev) - if (pindex->nBlockPos == txindex.pos.nBlockPos && pindex->nFile == txindex.pos.nFile) - return error("ConnectInputs() : tried to spend %s at depth %d", txPrev.IsCoinBase() ? "coinbase" : "coinstake", pindexBlock->nHeight - pindex->nHeight); - - // ppcoin: check transaction timestamp - if (txPrev.nTime > nTime) - return DoS(100, error("ConnectInputs() : transaction timestamp earlier than input transaction")); - - // Check for negative or overflow input values - nValueIn += txPrev.vout[prevout.n].nValue; - if (!MoneyRange(txPrev.vout[prevout.n].nValue) || !MoneyRange(nValueIn)) - return DoS(100, error("ConnectInputs() : txin values out of range")); - + CBigNum bnValueIn = 0; + for (uint32_t i = 0; i < vin.size(); i++) + { + auto prevout = vin[i].prevout; + assert(inputs.count(prevout.hash) > 0); + CTxIndex& txindex = inputs[prevout.hash].first; + CTransaction& txPrev = inputs[prevout.hash].second; + + if (prevout.n >= txPrev.vout.size() || prevout.n >= txindex.vSpent.size()) + return DoS(100, error("ConnectInputs() : %s prevout.n out of range %d %" PRIszu " %" PRIszu " prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str())); + + // If prev is coinbase or coinstake, check that it's matured + if (txPrev.IsCoinBase() || txPrev.IsCoinStake()) + for (const CBlockIndex* pindex = pindexBlock; pindex && pindexBlock->nHeight - pindex->nHeight < nCoinbaseMaturity; pindex = pindex->pprev) + if (pindex->nBlockPos == txindex.pos.nBlockPos && pindex->nFile == txindex.pos.nFile) + return error("ConnectInputs() : tried to spend %s at depth %d", txPrev.IsCoinBase() ? "coinbase" : "coinstake", pindexBlock->nHeight - pindex->nHeight); + + // ppcoin: check transaction timestamp + if (txPrev.nTime > nTime) + return DoS(100, error("ConnectInputs() : transaction timestamp earlier than input transaction")); + + // Check for negative or overflow input values + bnValueIn += txPrev.vout[prevout.n].nValue; + if (!MoneyRange(txPrev.vout[prevout.n].nValue) || !MoneyRange(bnValueIn)) + return DoS(100, error("ConnectInputs() : txin values out of range")); + } + nValueIn = bnValueIn.getint64(); } if (pvChecks) @@ -1507,7 +1616,7 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, map 0); CTxIndex& txindex = inputs[prevout.hash].first; CTransaction& txPrev = inputs[prevout.hash].second; @@ -1564,8 +1673,8 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, mapnBits, nTime) - GetMinFee(1, false, GMF_BLOCK, nTxSize) + CENT; + auto nReward = GetValueOut() - nValueIn; + auto nCalculatedReward = GetProofOfStakeReward(nCoinAge, pindexBlock->nBits, nTime) - GetMinFee(1, false, GMF_BLOCK, nTxSize) + CENT; if (nReward > nCalculatedReward) return DoS(100, error("ConnectInputs() : coinstake pays too much(actual=%" PRId64 " vs calculated=%" PRId64 ")", nReward, nCalculatedReward)); @@ -1577,12 +1686,8 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, map nValueIn) + if (GetValueOut() > bnValueIn.getint64()) return false; } 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) { @@ -1658,7 +1891,7 @@ bool CBlock::DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex) } // ppcoin: clean up wallet after disconnecting coinstake - BOOST_FOREACH(CTransaction& tx, vtx) + for(CTransaction& tx : vtx) SyncWithWallets(tx, this, false, false); return true; @@ -1714,14 +1947,14 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) int64_t nValueIn = 0; int64_t nValueOut = 0; unsigned int nSigOps = 0; - BOOST_FOREACH(CTransaction& tx, vtx) + for(auto& tx : vtx) { - uint256 hashTx = tx.GetHash(); + auto hashTx = tx.GetHash(); if (fEnforceBIP30) { CTxIndex txindexOld; if (txdb.ReadTxIndex(hashTx, txindexOld)) { - BOOST_FOREACH(CDiskTxPos &pos, txindexOld.vSpent) + for(CDiskTxPos &pos : txindexOld.vSpent) if (pos.IsNull()) return false; } @@ -1751,8 +1984,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) if (nSigOps > MAX_BLOCK_SIGOPS) return DoS(100, error("ConnectBlock() : too many sigops")); - int64_t nTxValueIn = tx.GetValueIn(mapInputs); - int64_t nTxValueOut = tx.GetValueOut(); + auto nTxValueIn = tx.GetValueIn(mapInputs); + auto nTxValueOut = tx.GetValueOut(); nValueIn += nTxValueIn; nValueOut += nTxValueOut; if (!tx.IsCoinStake()) @@ -1780,7 +2013,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) if (IsProofOfWork()) { - int64_t nBlockReward = GetProofOfWorkReward(nBits, nFees); + auto nBlockReward = GetProofOfWorkReward(nBits, nFees); // Check coinbase reward if (vtx[0].GetValueOut() > nBlockReward) @@ -1804,7 +2037,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) return true; // Write queued txindex changes - for (map::iterator mi = mapQueuedChanges.begin(); mi != mapQueuedChanges.end(); ++mi) + for (auto mi = mapQueuedChanges.begin(); mi != mapQueuedChanges.end(); ++mi) { if (!txdb.UpdateTxIndex((*mi).first, (*mi).second)) return error("ConnectBlock() : UpdateTxIndex failed"); @@ -1821,7 +2054,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) } // Watch for transactions paying to me - BOOST_FOREACH(CTransaction& tx, vtx) + for(CTransaction& tx : vtx) SyncWithWallets(tx, this, true); @@ -1862,7 +2095,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) // Disconnect shorter branch vector vResurrect; - BOOST_FOREACH(CBlockIndex* pindex, vDisconnect) + for(CBlockIndex* pindex : vDisconnect) { CBlock block; if (!block.ReadFromDisk(pindex)) @@ -1871,7 +2104,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) return error("Reorganize() : DisconnectBlock %s failed", pindex->GetBlockHash().ToString().substr(0,20).c_str()); // Queue memory transactions to resurrect - BOOST_FOREACH(const CTransaction& tx, block.vtx) + for(const CTransaction& tx : block.vtx) if (!(tx.IsCoinBase() || tx.IsCoinStake())) vResurrect.push_back(tx); } @@ -1891,7 +2124,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) } // Queue memory transactions to delete - BOOST_FOREACH(const CTransaction& tx, block.vtx) + for(const CTransaction& tx : block.vtx) vDelete.push_back(tx); } if (!txdb.WriteHashBestChain(pindexNew->GetBlockHash())) @@ -1902,21 +2135,21 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) return error("Reorganize() : TxnCommit failed"); // Disconnect shorter branch - BOOST_FOREACH(CBlockIndex* pindex, vDisconnect) + for(CBlockIndex* pindex : vDisconnect) if (pindex->pprev) pindex->pprev->pnext = NULL; // Connect longer branch - BOOST_FOREACH(CBlockIndex* pindex, vConnect) + for(CBlockIndex* pindex : vConnect) if (pindex->pprev) pindex->pprev->pnext = pindex; // Resurrect memory transactions that were in the disconnected branch - BOOST_FOREACH(CTransaction& tx, vResurrect) + for(CTransaction& tx : vResurrect) tx.AcceptToMemoryPool(txdb, false); // Delete redundant memory transactions that are in the connected branch - BOOST_FOREACH(CTransaction& tx, vDelete) + for(CTransaction& tx : vDelete) mempool.remove(tx); printf("REORGANIZE: done\n"); @@ -1928,7 +2161,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) // Called from inside SetBestChain: attaches a block to the new best chain being built bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew) { - uint256 hash = GetHash(); + auto hash = GetHash(); // Adding to current best branch if (!ConnectBlock(txdb, pindexNew) || !txdb.WriteHashBestChain(hash)) @@ -1944,7 +2177,7 @@ bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew) pindexNew->pprev->pnext = pindexNew; // Delete redundant memory transactions - BOOST_FOREACH(CTransaction& tx, vtx) + for(CTransaction& tx : vtx) mempool.remove(tx); return true; @@ -1952,7 +2185,7 @@ bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew) bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew) { - uint256 hash = GetHash(); + auto hash = GetHash(); if (!txdb.TxnBegin()) return error("SetBestChain() : TxnBegin failed"); @@ -1997,10 +2230,10 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew) } // Connect further blocks - BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vpindexSecondary) + for (std::vector::reverse_iterator rit = vpindexSecondary.rbegin(); rit != vpindexSecondary.rend(); ++rit) { CBlock block; - if (!block.ReadFromDisk(pindex)) + if (!block.ReadFromDisk(*rit)) { printf("SetBestChain() : ReadFromDisk failed\n"); break; @@ -2010,7 +2243,7 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew) break; } // errors now are not fatal, we still did a reorganisation to a new chain in a valid way - if (!block.SetBestChainInner(txdb, pindex)) + if (!block.SetBestChainInner(txdb, *rit)) break; } } @@ -2058,7 +2291,7 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew) strMiscWarning = _("Warning: This version is obsolete, upgrade required!"); } - std::string strCmd = GetArg("-blocknotify", ""); + auto strCmd = GetArg("-blocknotify", ""); if (!fIsInitialDownload && !strCmd.empty()) { @@ -2084,7 +2317,7 @@ bool CTransaction::GetCoinAge(CTxDB& txdb, uint64_t& nCoinAge) const if (IsCoinBase()) return true; - BOOST_FOREACH(const CTxIn& txin, vin) + for(const CTxIn& txin : vin) { // First try finding the previous transaction in database CTransaction txPrev; @@ -2101,14 +2334,14 @@ bool CTransaction::GetCoinAge(CTxDB& txdb, uint64_t& nCoinAge) const if (block.GetBlockTime() + nStakeMinAge > nTime) continue; // only count coins meeting min age requirement - int64_t nValueIn = txPrev.vout[txin.prevout.n].nValue; + auto nValueIn = txPrev.vout[txin.prevout.n].nValue; bnCentSecond += CBigNum(nValueIn) * (nTime-txPrev.nTime) / CENT; if (fDebug && GetBoolArg("-printcoinage")) printf("coin age nValueIn=%" PRId64 " nTimeDiff=%d bnCentSecond=%s\n", nValueIn, nTime - txPrev.nTime, bnCentSecond.ToString().c_str()); } - CBigNum bnCoinDay = bnCentSecond * CENT / COIN / nOneDay; + auto bnCoinDay = bnCentSecond * CENT / COIN / nOneDay; if (fDebug && GetBoolArg("-printcoinage")) printf("coin age bnCoinDay=%s\n", bnCoinDay.ToString().c_str()); nCoinAge = bnCoinDay.getuint64(); @@ -2121,7 +2354,7 @@ bool CBlock::GetCoinAge(uint64_t& nCoinAge) const nCoinAge = 0; CTxDB txdb("r"); - BOOST_FOREACH(const CTransaction& tx, vtx) + for(const CTransaction& tx : vtx) { uint64_t nTxCoinAge; if (tx.GetCoinAge(txdb, nTxCoinAge)) @@ -2140,7 +2373,7 @@ bool CBlock::GetCoinAge(uint64_t& nCoinAge) const bool CBlock::AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos) { // Check for duplicate - uint256 hash = GetHash(); + auto hash = GetHash(); if (mapBlockIndex.count(hash)) return error("AddToBlockIndex() : %s already exists", hash.ToString().substr(0,20).c_str()); @@ -2149,7 +2382,7 @@ bool CBlock::AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos) if (!pindexNew) return error("AddToBlockIndex() : new CBlockIndex failed"); pindexNew->phashBlock = &hash; - map::iterator miPrev = mapBlockIndex.find(hashPrevBlock); + auto miPrev = mapBlockIndex.find(hashPrevBlock); if (miPrev != mapBlockIndex.end()) { pindexNew->pprev = (*miPrev).second; @@ -2182,7 +2415,7 @@ bool CBlock::AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos) return error("AddToBlockIndex() : Rejected by stake modifier checkpoint height=%d, modifier=0x%016" PRIx64, pindexNew->nHeight, nStakeModifier); // Add to mapBlockIndex - map::iterator mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first; + auto mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first; if (pindexNew->IsProofOfStake()) setStakeSeen.insert(make_pair(pindexNew->prevoutStake, pindexNew->nStakeTime)); pindexNew->phashBlock = &((*mi).first); @@ -2331,12 +2564,12 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c bool CBlock::AcceptBlock() { // Check for duplicate - uint256 hash = GetHash(); + auto hash = GetHash(); if (mapBlockIndex.count(hash)) return error("AcceptBlock() : block already in mapBlockIndex"); // Get prev block index - map::iterator mi = mapBlockIndex.find(hashPrevBlock); + auto mi = mapBlockIndex.find(hashPrevBlock); if (mi == mapBlockIndex.end()) return DoS(10, error("AcceptBlock() : prev block not found")); CBlockIndex* pindexPrev = (*mi).second; @@ -2360,7 +2593,7 @@ bool CBlock::AcceptBlock() return error("AcceptBlock() : block's timestamp is too far in the future"); // Check that all transactions are finalized - BOOST_FOREACH(const CTransaction& tx, vtx) + for(const CTransaction& tx : vtx) if (!tx.IsFinal(nHeight, GetBlockTime())) return DoS(10, error("AcceptBlock() : contains a non-final transaction")); @@ -2371,14 +2604,14 @@ bool CBlock::AcceptBlock() bool cpSatisfies = Checkpoints::CheckSync(hash, pindexPrev); // Check that the block satisfies synchronized checkpoint - if (CheckpointsMode == Checkpoints::STRICT && !cpSatisfies) + if (CheckpointsMode == Checkpoints::CP_STRICT && !cpSatisfies) return error("AcceptBlock() : rejected by synchronized checkpoint"); - if (CheckpointsMode == Checkpoints::ADVISORY && !cpSatisfies) + if (CheckpointsMode == Checkpoints::CP_ADVISORY && !cpSatisfies) strMiscWarning = _("WARNING: syncronized checkpoint violation detected, but skipped!"); // Enforce rule that the coinbase starts with serialized block height - CScript expect = CScript() << nHeight; + auto expect = CScript() << nHeight; if (vtx[0].vin[0].scriptSig.size() < expect.size() || !std::equal(expect.begin(), expect.end(), vtx[0].vin[0].scriptSig.begin())) return DoS(100, error("AcceptBlock() : block height mismatch in coinbase")); @@ -2398,7 +2631,7 @@ bool CBlock::AcceptBlock() if (hashBestChain == hash) { LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) + for(CNode* pnode : vNodes) if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) pnode->PushInventory(CInv(MSG_BLOCK, hash)); } @@ -2488,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; @@ -2500,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()) @@ -2522,7 +2822,7 @@ bool static IsCanonicalBlockSignature(CBlock* pblock) bool ProcessBlock(CNode* pfrom, CBlock* pblock) { // Check for duplicate - uint256 hash = pblock->GetHash(); + auto hash = pblock->GetHash(); if (mapBlockIndex.count(hash)) return error("ProcessBlock() : already have block %d %s", mapBlockIndex[hash]->nHeight, hash.ToString().substr(0,20).c_str()); if (mapOrphanBlocks.count(hash)) @@ -2568,7 +2868,7 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock) if (pcheckpoint && pblock->hashPrevBlock != hashBestChain && !Checkpoints::WantedByPendingSyncCheckpoint(hash)) { // Extra checks to prevent "fill up memory by spamming with bogus blocks" - int64_t deltaTime = pblock->GetBlockTime() - pcheckpoint->nTime; + auto deltaTime = pblock->GetBlockTime() - pcheckpoint->nTime; CBigNum bnNewBlock; bnNewBlock.SetCompact(pblock->nBits); CBigNum bnRequired; @@ -2629,8 +2929,8 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock) vWorkQueue.push_back(hash); for (unsigned int i = 0; i < vWorkQueue.size(); i++) { - uint256 hashPrev = vWorkQueue[i]; - for (multimap::iterator mi = mapOrphanBlocksByPrev.lower_bound(hashPrev); + auto hashPrev = vWorkQueue[i]; + for (auto mi = mapOrphanBlocksByPrev.lower_bound(hashPrev); mi != mapOrphanBlocksByPrev.upper_bound(hashPrev); ++mi) { @@ -2666,7 +2966,7 @@ bool CBlock::CheckBlockSignature() const if (whichType == TX_PUBKEY) { - valtype& vchPubKey = vSolutions[0]; + auto& vchPubKey = vSolutions[0]; CPubKey key(vchPubKey); if (!key.IsValid()) return false; @@ -2676,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; @@ -2729,7 +3145,10 @@ FILE* AppendBlockFile(unsigned int& nFileRet) if (!file) return NULL; if (fseek(file, 0, SEEK_END) != 0) + { + fclose(file); return NULL; + } // FAT32 file size max 4GB, fseek and ftell max 2GB, so we must stay under 2GB if (ftell(file) < (long)(0x7F000000 - MAX_SIZE)) { @@ -2757,10 +3176,7 @@ bool LoadBlockIndex(bool fAllowNew) { if (fTestNet) { - pchMessageStart[0] = 0xcd; - pchMessageStart[1] = 0xf2; - pchMessageStart[2] = 0xc0; - pchMessageStart[3] = 0xef; + nNetworkID = 0xefc0f2cd; bnProofOfWorkLimit = bnProofOfWorkLimitTestNet; // 16 bits PoW target limit for testnet nStakeMinAge = 2 * nOneHour; // test net min age is 2 hours @@ -2802,12 +3218,12 @@ bool LoadBlockIndex(bool fAllowNew) // CTxOut(empty) // vMerkleTree: 4cb33b3b6a - const char* pszTimestamp = "https://bitcointalk.org/index.php?topic=134179.msg1502196#msg1502196"; + const string strTimestamp = "https://bitcointalk.org/index.php?topic=134179.msg1502196#msg1502196"; CTransaction txNew; txNew.nTime = 1360105017; txNew.vin.resize(1); txNew.vout.resize(1); - txNew.vin[0].scriptSig = CScript() << 486604799 << CBigNum(9999) << vector((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp)); + txNew.vin[0].scriptSig = CScript() << 486604799 << CBigNum(9999) << vector(strTimestamp.begin(), strTimestamp.end()); txNew.vout[0].SetEmpty(); CBlock block; block.vtx.push_back(txNew); @@ -2889,7 +3305,7 @@ void PrintBlockTree() { // pre-compute tree structure map > mapNext; - for (map::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi) + for (auto mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi) { CBlockIndex* pindex = (*mi).second; mapNext[pindex->pprev].push_back(pindex); @@ -2959,59 +3375,84 @@ void PrintBlockTree() } } -bool LoadExternalBlockFile(FILE* fileIn) +bool LoadExternalBlockFile(FILE* fileIn, CClientUIInterface& uiInterface) { - int64_t nStart = GetTimeMillis(); - - int nLoaded = 0; + auto nStart = GetTimeMillis(); + vector pchData(10 * (8+MAX_BLOCK_SIZE)); + int32_t nLoaded = 0; { LOCK(cs_main); try { CAutoFile blkdat(fileIn, SER_DISK, CLIENT_VERSION); - unsigned int nPos = 0; + uint32_t nPos = 0; while (nPos != std::numeric_limits::max() && blkdat.good() && !fRequestShutdown) { - unsigned char pchData[65536]; - do { + do + { fseek(blkdat, nPos, SEEK_SET); - size_t nRead = fread(pchData, 1, sizeof(pchData), blkdat); + auto nRead = fread(&pchData[0], 1, pchData.size(), blkdat); if (nRead <= 8) { - nPos = std::numeric_limits::max(); + nPos = numeric_limits::max(); break; } - void* nFind = memchr(pchData, pchMessageStart[0], nRead+1-sizeof(pchMessageStart)); - if (nFind) + auto it = pchData.begin(); + while(it != pchData.end() && !fRequestShutdown) { - if (memcmp(nFind, pchMessageStart, sizeof(pchMessageStart))==0) + auto nBlockLength = *reinterpret_cast(&(*(it+4))); + auto SeekToNext = [&pchData, &it, &nPos, &nBlockLength]() { + auto previt = it; + it = search(it+8, pchData.end(), BEGIN(nNetworkID), END(nNetworkID)); + if (it != pchData.end()) + nPos += (it - previt); + }; + if (nBlockLength > 0) { - nPos += ((unsigned char*)nFind - pchData) + sizeof(pchMessageStart); - break; + if (nBlockLength > (uint32_t)distance(it, pchData.end())) + { + SeekToNext(); + break; // We've reached the end of buffer + } + else + { + CBlock block; + try + { + vector vchBlockBytes(it+8, it+8+nBlockLength); + CDataStream blockData(vchBlockBytes, SER_NETWORK, PROTOCOL_VERSION); + blockData >> block; + } + catch (const std::exception&) + { + printf("LoadExternalBlockFile() : Deserialize error caught at the position %" PRIu32 ", this block may be truncated.", nPos); + SeekToNext(); + break; + } + if (ProcessBlock(NULL, &block)) + nLoaded++; + advance(it, 8 + nBlockLength); + nPos += (8 + nBlockLength); + { + static int64_t nLastUpdate = 0; + if (GetTimeMillis() - nLastUpdate > 1000) + { + uiInterface.InitMessage(strprintf(_("%" PRId32 " blocks were read."), nLoaded)); + nLastUpdate = GetTimeMillis(); + } + } + } + } + else + { + SeekToNext(); } - nPos += ((unsigned char*)nFind - pchData) + 1; - } - else - nPos += sizeof(pchData) - sizeof(pchMessageStart) + 1; - } while(!fRequestShutdown); - if (nPos == std::numeric_limits::max()) - break; - fseek(blkdat, nPos, SEEK_SET); - unsigned int nSize; - blkdat >> nSize; - if (nSize > 0 && nSize <= MAX_BLOCK_SIZE) - { - CBlock block; - blkdat >> block; - if (ProcessBlock(NULL,&block)) - { - nLoaded++; - nPos += 4 + nSize; } } + while(!fRequestShutdown); } } catch (const std::exception&) { - printf("%s() : Deserialize or I/O error caught during load\n", + printf("%s() : I/O error caught during load\n", BOOST_CURRENT_FUNCTION); } } @@ -3037,7 +3478,7 @@ string GetWarnings(string strFor) strRPC = "test"; // Misc warnings like out of disk space and clock is wrong - if (strMiscWarning != "") + if (!strMiscWarning.empty()) { nPriority = 1000; strStatusBar = strMiscWarning; @@ -3061,7 +3502,7 @@ string GetWarnings(string strFor) // Alerts { LOCK(cs_mapAlerts); - BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts) + for(auto& item : mapAlerts) { const CAlert& alert = item.second; if (alert.AppliesToMe() && alert.nPriority > nPriority) @@ -3097,36 +3538,31 @@ string GetWarnings(string strFor) bool static AlreadyHave(CTxDB& txdb, const CInv& inv) { - switch (inv.type) + int nType = inv.GetType(); + auto nHash = inv.GetHash(); + + switch (nType) { case MSG_TX: { bool txInMap = false; { LOCK(mempool.cs); - txInMap = (mempool.exists(inv.hash)); + txInMap = (mempool.exists(nHash)); } return txInMap || - mapOrphanTransactions.count(inv.hash) || - txdb.ContainsTx(inv.hash); + mapOrphanTransactions.count(nHash) || + txdb.ContainsTx(nHash); } case MSG_BLOCK: - return mapBlockIndex.count(inv.hash) || - mapOrphanBlocks.count(inv.hash); + return mapBlockIndex.count(nHash) || + mapOrphanBlocks.count(nHash); } // Don't know what it is, just say we already got one return true; } - - - -// The message start string is designed to be unlikely to occur in normal data. -// The characters are rarely used upper ASCII, not valid as UTF-8, and produce -// a large 4-byte int at any alignment. -unsigned char pchMessageStart[4] = { 0xe4, 0xe8, 0xe9, 0xe5 }; - bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { static map mapReuseKey; @@ -3213,7 +3649,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Advertise our address if (!fNoListen && !IsInitialBlockDownload()) { - CAddress addr = GetLocalAddress(&pfrom->addr); + auto addr = GetLocalAddress(&pfrom->addr); if (addr.IsRoutable()) pfrom->PushAddress(addr); } @@ -3248,7 +3684,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Relay alerts { LOCK(cs_mapAlerts); - BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts) + for(auto& item : mapAlerts) item.second.RelayTo(pfrom); } @@ -3301,9 +3737,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Store the new addresses vector vAddrOk; - int64_t nNow = GetAdjustedTime(); - int64_t nSince = nNow - 10 * 60; - BOOST_FOREACH(CAddress& addr, vAddr) + auto nNow = GetAdjustedTime(); + auto nSince = nNow - 10 * 60; + for(CAddress& addr : vAddr) { if (fShutdown) return true; @@ -3323,20 +3759,20 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) hashSalt = GetRandHash(); uint64_t hashAddr = addr.GetHash(); uint256 hashRand = hashSalt ^ (hashAddr<<32) ^ ((GetTime()+hashAddr)/nOneDay); - hashRand = Hash(BEGIN(hashRand), END(hashRand)); + hashRand = Hash(hashRand.begin(), hashRand.end()); multimap mapMix; - BOOST_FOREACH(CNode* pnode, vNodes) + for(CNode* pnode : vNodes) { if (pnode->nVersion < CADDR_TIME_VERSION) continue; unsigned int nPointer; memcpy(&nPointer, &pnode, sizeof(nPointer)); uint256 hashKey = hashRand ^ nPointer; - hashKey = Hash(BEGIN(hashKey), END(hashKey)); + hashKey = Hash(hashKey.begin(), hashKey.end()); mapMix.insert(make_pair(hashKey, pnode)); } int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s) - for (multimap::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi) + for (auto mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi) ((*mi).second)->PushAddress(addr); } } @@ -3362,10 +3798,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // find last block in inv vector - size_t nLastBlock = std::numeric_limits::max(); + int nLastBlock = -1; for (size_t nInv = 0; nInv < vInv.size(); nInv++) { - if (vInv[vInv.size() - 1 - nInv].type == MSG_BLOCK) { - nLastBlock = vInv.size() - 1 - nInv; + if (vInv[vInv.size() - 1 - nInv].GetType() == MSG_BLOCK) { + nLastBlock = (int) (vInv.size() - 1 - nInv); break; } } @@ -3373,6 +3809,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) for (size_t nInv = 0; nInv < vInv.size(); nInv++) { const CInv &inv = vInv[nInv]; + int nType = inv.GetType(); + auto nHash = inv.GetHash(); if (fShutdown) return true; @@ -3384,19 +3822,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (!fAlreadyHave) pfrom->AskFor(inv); - else if (inv.type == MSG_BLOCK && mapOrphanBlocks.count(inv.hash)) { - pfrom->PushGetBlocks(pindexBest, GetOrphanRoot(mapOrphanBlocks[inv.hash])); - } else if (nInv == nLastBlock) { + else if (nType == MSG_BLOCK && mapOrphanBlocks.count(nHash)) { + pfrom->PushGetBlocks(pindexBest, GetOrphanRoot(mapOrphanBlocks[nHash])); + } else if (nType == nLastBlock) { // In case we are on a very long side-chain, it is possible that we already have // the last block in an inv bundle sent in response to getblocks. Try to detect // this situation and push another getblocks to continue. - pfrom->PushGetBlocks(mapBlockIndex[inv.hash], uint256(0)); + pfrom->PushGetBlocks(mapBlockIndex[nHash], uint256(0)); if (fDebug) printf("force request: %s\n", inv.ToString().c_str()); } // Track requests for our stuff - Inventory(inv.hash); + Inventory(nHash); } } @@ -3414,17 +3852,20 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (fDebugNet || (vInv.size() != 1)) printf("received getdata (%" PRIszu " invsz)\n", vInv.size()); - BOOST_FOREACH(const CInv& inv, vInv) + for(const CInv& inv : vInv) { if (fShutdown) return true; if (fDebugNet || (vInv.size() == 1)) printf("received getdata for: %s\n", inv.ToString().c_str()); - if (inv.type == MSG_BLOCK) + int nType = inv.GetType(); + auto nHash = inv.GetHash(); + + if (nType == MSG_BLOCK) { // Send block from disk - map::iterator mi = mapBlockIndex.find(inv.hash); + auto mi = mapBlockIndex.find(nHash); if (mi != mapBlockIndex.end()) { CBlock block; @@ -3432,7 +3873,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) pfrom->PushMessage("block", block); // Trigger them to send a getblocks request for the next batch of inventory - if (inv.hash == pfrom->hashContinue) + if (nHash == pfrom->hashContinue) { // ppcoin: send latest proof-of-work block to allow the // download node to accept as orphan (proof-of-stake @@ -3450,16 +3891,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) bool pushed = false; { LOCK(cs_mapRelay); - map::iterator mi = mapRelay.find(inv); + auto mi = mapRelay.find(inv); if (mi != mapRelay.end()) { pfrom->PushMessage(inv.GetCommand(), (*mi).second); pushed = true; } } - if (!pushed && inv.type == MSG_TX) { + if (!pushed && nType == MSG_TX) { LOCK(mempool.cs); - if (mempool.exists(inv.hash)) { - CTransaction tx = mempool.lookup(inv.hash); + if (mempool.exists(nHash)) { + CTransaction tx = mempool.lookup(nHash); CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); ss.reserve(1000); ss << tx; @@ -3469,7 +3910,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // Track requests for our stuff - Inventory(inv.hash); + Inventory(nHash); } } @@ -3520,7 +3961,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Relay pfrom->hashCheckpointKnown = checkpoint.hashCheckpoint; LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) + for(CNode* pnode : vNodes) checkpoint.RelayTo(pnode); } } @@ -3535,7 +3976,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (locator.IsNull()) { // If locator is null, return the hashStop block - map::iterator mi = mapBlockIndex.find(hashStop); + auto mi = mapBlockIndex.find(hashStop); if (mi == mapBlockIndex.end()) return true; pindex = (*mi).second; @@ -3576,22 +4017,24 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) bool fMissingInputs = false; if (tx.AcceptToMemoryPool(txdb, true, &fMissingInputs)) { + auto nHash = inv.GetHash(); + SyncWithWallets(tx, NULL, true); - RelayTransaction(tx, inv.hash); + RelayTransaction(tx, nHash); mapAlreadyAskedFor.erase(inv); - vWorkQueue.push_back(inv.hash); - vEraseQueue.push_back(inv.hash); + vWorkQueue.push_back(nHash); + vEraseQueue.push_back(nHash); // Recursively process any orphan transactions that depended on this one for (unsigned int i = 0; i < vWorkQueue.size(); i++) { - uint256 hashPrev = vWorkQueue[i]; - for (set::iterator mi = mapOrphanTransactionsByPrev[hashPrev].begin(); + auto hashPrev = vWorkQueue[i]; + for (auto mi = mapOrphanTransactionsByPrev[hashPrev].begin(); mi != mapOrphanTransactionsByPrev[hashPrev].end(); ++mi) { const uint256& orphanTxHash = *mi; - CTransaction& orphanTx = mapOrphanTransactions[orphanTxHash]; + auto& orphanTx = mapOrphanTransactions[orphanTxHash]; bool fMissingInputs2 = false; if (orphanTx.AcceptToMemoryPool(txdb, true, &fMissingInputs2)) @@ -3612,7 +4055,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } } - BOOST_FOREACH(uint256 hash, vEraseQueue) + for(uint256 hash : vEraseQueue) EraseOrphanTx(hash); } else if (fMissingInputs) @@ -3632,7 +4075,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { CBlock block; vRecv >> block; - uint256 hashBlock = block.GetHash(); + auto hashBlock = block.GetHash(); printf("received block %s\n", hashBlock.ToString().substr(0,20).c_str()); // block.print(); @@ -3657,7 +4100,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) int64_t nCutOff = GetTime() - (nNodeLifespan * nOneDay); pfrom->vAddrToSend.clear(); vector vAddr = addrman.GetAddr(); - BOOST_FOREACH(const CAddress &addr, vAddr) + for(const CAddress &addr : vAddr) if(addr.nTime > nCutOff) pfrom->PushAddress(addr); } @@ -3714,7 +4157,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) CRequestTracker tracker; { LOCK(pfrom->cs_mapRequests); - map::iterator mi = pfrom->mapRequests.find(hashReply); + auto mi = pfrom->mapRequests.find(hashReply); if (mi != pfrom->mapRequests.end()) { tracker = (*mi).second; @@ -3750,7 +4193,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) CAlert alert; vRecv >> alert; - uint256 alertHash = alert.GetHash(); + auto alertHash = alert.GetHash(); if (pfrom->setKnown.count(alertHash) == 0) { if (alert.ProcessAlert()) @@ -3759,7 +4202,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) pfrom->setKnown.insert(alertHash); { LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) + for(CNode* pnode : vNodes) alert.RelayTo(pnode); } } @@ -3815,7 +4258,7 @@ bool ProcessMessages(CNode* pfrom) break; // Scan for message start - CDataStream::iterator pstart = search(vRecv.begin(), vRecv.end(), BEGIN(pchMessageStart), END(pchMessageStart)); + CDataStream::iterator pstart = search(vRecv.begin(), vRecv.end(), BEGIN(nNetworkID), END(nNetworkID)); int nHeaderSize = vRecv.GetSerializeSize(CMessageHeader()); if (vRecv.end() - pstart < nHeaderSize) { @@ -3856,7 +4299,7 @@ bool ProcessMessages(CNode* pfrom) } // Checksum - uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize); + auto hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize); unsigned int nChecksum = 0; memcpy(&nChecksum, &hash, sizeof(nChecksum)); if (nChecksum != hdr.nChecksum) @@ -3913,10 +4356,13 @@ bool ProcessMessages(CNode* pfrom) } -bool SendMessages(CNode* pto, bool fSendTrickle) +bool SendMessages(CNode* pto) { TRY_LOCK(cs_main, lockMain); if (lockMain) { + // Current time in microseconds + auto nNow = GetTimeMicros(); + // Don't send anything until we get their version message if (pto->nVersion == 0) return true; @@ -3938,39 +4384,20 @@ bool SendMessages(CNode* pto, bool fSendTrickle) ResendWalletTransactions(); // Address refresh broadcast - static int64_t nLastRebroadcast; - if (!IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > nBroadcastInterval)) - { - { - LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) - { - // Periodically clear setAddrKnown to allow refresh broadcasts - if (nLastRebroadcast) - pnode->setAddrKnown.clear(); - - // Rebroadcast our address - if (!fNoListen) - { - CAddress addr = GetLocalAddress(&pnode->addr); - if (addr.IsRoutable()) - pnode->PushAddress(addr); - } - } - } - nLastRebroadcast = GetTime(); + if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) { + AdvertiseLocal(pto); + pto->nNextLocalAddrSend = PoissonNextSend(nNow, nOneDay); } // // Message: addr // - if (fSendTrickle) - { + if (pto->nNextAddrSend < nNow) { + pto->nNextAddrSend = PoissonNextSend(nNow, 30); vector vAddr; vAddr.reserve(pto->vAddrToSend.size()); - BOOST_FOREACH(const CAddress& addr, pto->vAddrToSend) + for(const CAddress& addr : pto->vAddrToSend) { - // returns true if wasn't already contained in the set if (pto->setAddrKnown.insert(addr).second) { vAddr.push_back(addr); @@ -3987,41 +4414,36 @@ bool SendMessages(CNode* pto, bool fSendTrickle) pto->PushMessage("addr", vAddr); } - // // Message: inventory // vector vInv; vector vInvWait; { + bool fSendTrickle = false; + if (pto->nNextInvSend < nNow) { + fSendTrickle = true; + pto->nNextInvSend = PoissonNextSend(nNow, 5); + } LOCK(pto->cs_inventory); vInv.reserve(pto->vInventoryToSend.size()); vInvWait.reserve(pto->vInventoryToSend.size()); - BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend) + for(const CInv& inv : pto->vInventoryToSend) { if (pto->setInventoryKnown.count(inv)) continue; // trickle out tx inv to protect privacy - if (inv.type == MSG_TX && !fSendTrickle) + if (inv.GetType() == MSG_TX && !fSendTrickle) { // 1/4 of tx invs blast to all immediately static uint256 hashSalt; if (hashSalt == 0) hashSalt = GetRandHash(); - uint256 hashRand = inv.hash ^ hashSalt; - hashRand = Hash(BEGIN(hashRand), END(hashRand)); + uint256 hashRand = inv.GetHash() ^ hashSalt; + hashRand = Hash(hashRand.begin(), hashRand.end()); bool fTrickleWait = ((hashRand & 3) != 0); - // always trickle our own transactions - if (!fTrickleWait) - { - CWalletTx wtx; - if (GetTransaction(inv.hash, wtx)) - if (wtx.fFromMe) - fTrickleWait = true; - } - if (fTrickleWait) { vInvWait.push_back(inv); @@ -4050,7 +4472,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle) // Message: getdata // vector vGetData; - int64_t nNow = GetTime() * 1000000; CTxDB txdb("r"); while (!pto->mapAskFor.empty() && (*pto->mapAskFor.begin()).first <= nNow) { @@ -4083,13 +4504,13 @@ public: CMainCleanup() {} ~CMainCleanup() { // block headers - std::map::iterator it1 = mapBlockIndex.begin(); + auto it1 = mapBlockIndex.begin(); for (; it1 != mapBlockIndex.end(); it1++) delete (*it1).second; mapBlockIndex.clear(); // orphan blocks - std::map::iterator it2 = mapOrphanBlocks.begin(); + auto it2 = mapOrphanBlocks.begin(); for (; it2 != mapOrphanBlocks.end(); it2++) delete (*it2).second; mapOrphanBlocks.clear();