Merge bitcoin/bitcoin#23769: Disallow copies of CChain

faf2614f60 style: Use 4 spaces for indendation, not 5 (MarcoFalke)
fada66fc2c Disallow copies of CChain (MarcoFalke)

Pull request description:

  Creating a copy of the chain is not a valid use case in normal operation. Also, it massively degrades performance.

  However, it seems to be a mistake that no one looks out for during review:

  * https://github.com/bitcoin/bitcoin/pull/22677#discussion_r760400537

  Fix this by disallowing it.

ACKs for top commit:
  jamesob:
    ACK faf2614f60 ([`jamesob/ackr/23769.1.MarcoFalke.disallow_copies_of_cchai`](https://github.com/jamesob/bitcoin/tree/ackr/23769.1.MarcoFalke.disallow_copies_of_cchai))
  glozow:
    utACK faf2614f60, nice.
  prusnak:
    utACK faf2614

Tree-SHA512: 27b908c78842e4700e118adb876c09c3d1ec04662310e983309e2cd6fa8ad38c9359ff45f36a804359b9f117e351c4739e651b3e6754c14e6c6fcd7ae5e68342
This commit is contained in:
MarcoFalke
2021-12-15 16:10:17 +01:00

View File

@@ -59,7 +59,8 @@ public:
READWRITE(VARINT(obj.nTimeLast)); READWRITE(VARINT(obj.nTimeLast));
} }
void SetNull() { void SetNull()
{
nBlocks = 0; nBlocks = 0;
nSize = 0; nSize = 0;
nUndoSize = 0; nUndoSize = 0;
@@ -69,17 +70,19 @@ public:
nTimeLast = 0; nTimeLast = 0;
} }
CBlockFileInfo() { CBlockFileInfo()
{
SetNull(); SetNull();
} }
std::string ToString() const; std::string ToString() const;
/** update statistics (does not update nSize) */ /** update statistics (does not update nSize) */
void AddBlock(unsigned int nHeightIn, uint64_t nTimeIn) { void AddBlock(unsigned int nHeightIn, uint64_t nTimeIn)
if (nBlocks==0 || nHeightFirst > nHeightIn) {
if (nBlocks == 0 || nHeightFirst > nHeightIn)
nHeightFirst = nHeightIn; nHeightFirst = nHeightIn;
if (nBlocks==0 || nTimeFirst > nTimeIn) if (nBlocks == 0 || nTimeFirst > nTimeIn)
nTimeFirst = nTimeIn; nTimeFirst = nTimeIn;
nBlocks++; nBlocks++;
if (nHeightIn > nHeightLast) if (nHeightIn > nHeightLast)
@@ -89,7 +92,7 @@ public:
} }
}; };
enum BlockStatus: uint32_t { enum BlockStatus : uint32_t {
//! Unused. //! Unused.
BLOCK_VALID_UNKNOWN = 0, BLOCK_VALID_UNKNOWN = 0,
@@ -220,7 +223,8 @@ public:
{ {
} }
FlatFilePos GetBlockPos() const { FlatFilePos GetBlockPos() const
{
FlatFilePos ret; FlatFilePos ret;
if (nStatus & BLOCK_HAVE_DATA) { if (nStatus & BLOCK_HAVE_DATA) {
ret.nFile = nFile; ret.nFile = nFile;
@@ -229,7 +233,8 @@ public:
return ret; return ret;
} }
FlatFilePos GetUndoPos() const { FlatFilePos GetUndoPos() const
{
FlatFilePos ret; FlatFilePos ret;
if (nStatus & BLOCK_HAVE_UNDO) { if (nStatus & BLOCK_HAVE_UNDO) {
ret.nFile = nFile; ret.nFile = nFile;
@@ -288,7 +293,7 @@ public:
*(--pbegin) = pindex->GetBlockTime(); *(--pbegin) = pindex->GetBlockTime();
std::sort(pbegin, pend); std::sort(pbegin, pend);
return pbegin[(pend - pbegin)/2]; return pbegin[(pend - pbegin) / 2];
} }
std::string ToString() const std::string ToString() const
@@ -353,11 +358,13 @@ class CDiskBlockIndex : public CBlockIndex
public: public:
uint256 hashPrev; uint256 hashPrev;
CDiskBlockIndex() { CDiskBlockIndex()
{
hashPrev = uint256(); hashPrev = uint256();
} }
explicit CDiskBlockIndex(const CBlockIndex* pindex) : CBlockIndex(*pindex) { explicit CDiskBlockIndex(const CBlockIndex* pindex) : CBlockIndex(*pindex)
{
hashPrev = (pprev ? pprev->GetBlockHash() : uint256()); hashPrev = (pprev ? pprev->GetBlockHash() : uint256());
} }
@@ -407,35 +414,45 @@ public:
}; };
/** An in-memory indexed chain of blocks. */ /** An in-memory indexed chain of blocks. */
class CChain { class CChain
{
private: private:
std::vector<CBlockIndex*> vChain; std::vector<CBlockIndex*> vChain;
public: public:
CChain() = default;
CChain(const CChain&) = delete;
CChain& operator=(const CChain&) = delete;
/** Returns the index entry for the genesis block of this chain, or nullptr if none. */ /** Returns the index entry for the genesis block of this chain, or nullptr if none. */
CBlockIndex *Genesis() const { CBlockIndex* Genesis() const
{
return vChain.size() > 0 ? vChain[0] : nullptr; return vChain.size() > 0 ? vChain[0] : nullptr;
} }
/** Returns the index entry for the tip of this chain, or nullptr if none. */ /** Returns the index entry for the tip of this chain, or nullptr if none. */
CBlockIndex *Tip() const { CBlockIndex* Tip() const
{
return vChain.size() > 0 ? vChain[vChain.size() - 1] : nullptr; return vChain.size() > 0 ? vChain[vChain.size() - 1] : nullptr;
} }
/** Returns the index entry at a particular height in this chain, or nullptr if no such height exists. */ /** Returns the index entry at a particular height in this chain, or nullptr if no such height exists. */
CBlockIndex *operator[](int nHeight) const { CBlockIndex* operator[](int nHeight) const
{
if (nHeight < 0 || nHeight >= (int)vChain.size()) if (nHeight < 0 || nHeight >= (int)vChain.size())
return nullptr; return nullptr;
return vChain[nHeight]; return vChain[nHeight];
} }
/** Efficiently check whether a block is present in this chain. */ /** Efficiently check whether a block is present in this chain. */
bool Contains(const CBlockIndex *pindex) const { bool Contains(const CBlockIndex* pindex) const
{
return (*this)[pindex->nHeight] == pindex; return (*this)[pindex->nHeight] == pindex;
} }
/** Find the successor of a block in this chain, or nullptr if the given index is not found or is the tip. */ /** Find the successor of a block in this chain, or nullptr if the given index is not found or is the tip. */
CBlockIndex *Next(const CBlockIndex *pindex) const { CBlockIndex* Next(const CBlockIndex* pindex) const
{
if (Contains(pindex)) if (Contains(pindex))
return (*this)[pindex->nHeight + 1]; return (*this)[pindex->nHeight + 1];
else else
@@ -443,18 +460,19 @@ public:
} }
/** Return the maximal height in the chain. Is equal to chain.Tip() ? chain.Tip()->nHeight : -1. */ /** Return the maximal height in the chain. Is equal to chain.Tip() ? chain.Tip()->nHeight : -1. */
int Height() const { int Height() const
{
return vChain.size() - 1; return vChain.size() - 1;
} }
/** Set/initialize a chain with a given tip. */ /** Set/initialize a chain with a given tip. */
void SetTip(CBlockIndex *pindex); void SetTip(CBlockIndex* pindex);
/** Return a CBlockLocator that refers to a block in this chain (by default the tip). */ /** Return a CBlockLocator that refers to a block in this chain (by default the tip). */
CBlockLocator GetLocator(const CBlockIndex *pindex = nullptr) const; CBlockLocator GetLocator(const CBlockIndex* pindex = nullptr) const;
/** Find the last common block between this chain and a block index entry. */ /** Find the last common block between this chain and a block index entry. */
const CBlockIndex *FindFork(const CBlockIndex *pindex) const; const CBlockIndex* FindFork(const CBlockIndex* pindex) const;
/** Find the earliest block with timestamp equal or greater than the given time and height equal or greater than the given height. */ /** Find the earliest block with timestamp equal or greater than the given time and height equal or greater than the given height. */
CBlockIndex* FindEarliestAtLeast(int64_t nTime, int height) const; CBlockIndex* FindEarliestAtLeast(int64_t nTime, int height) const;