foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

Remove version/hashing options from CBlockLocator/CDiskBlockIndex

Browse source
This commit is contained in:
Cory Fields 2023-09-07 15:20:24 +00:00
parent 8e0d9796da
commit f15f790618
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/chain.h
View file

@ -388,6 +388,14 @@ const CBlockIndex* LastCommonAncestor(const CBlockIndex* pa, const CBlockIndex*
/** Used to marshal pointers into hashes for db storage. */ /** Used to marshal pointers into hashes for db storage. */
class CDiskBlockIndex : public CBlockIndex class CDiskBlockIndex : public CBlockIndex
{ {
/** Historically CBlockLocator's version field has been written to disk
* streams as the client version, but the value has never been used.
*
* Hard-code to the highest client version ever written.
* SerParams can be used if the field requires any meaning in the future.
**/
static constexpr int DUMMY_VERSION = 259900;
public: public:
uint256 hashPrev; uint256 hashPrev;
@ -404,8 +412,8 @@ public:
SERIALIZE_METHODS(CDiskBlockIndex, obj) SERIALIZE_METHODS(CDiskBlockIndex, obj)
{ {
LOCK(::cs_main); LOCK(::cs_main);
int _nVersion = s.GetVersion(); int _nVersion = DUMMY_VERSION;
if (!(s.GetType() & SER_GETHASH)) READWRITE(VARINT_MODE(_nVersion, VarIntMode::NONNEGATIVE_SIGNED)); READWRITE(VARINT_MODE(_nVersion, VarIntMode::NONNEGATIVE_SIGNED));
READWRITE(VARINT_MODE(obj.nHeight, VarIntMode::NONNEGATIVE_SIGNED)); READWRITE(VARINT_MODE(obj.nHeight, VarIntMode::NONNEGATIVE_SIGNED));
READWRITE(VARINT(obj.nStatus)); READWRITE(VARINT(obj.nStatus));

14
src/primitives/block.h
View file

@ -118,6 +118,15 @@ public:
*/ */
struct CBlockLocator struct CBlockLocator
{ {
/** Historically CBlockLocator's version field has been written to network
* streams as the negotiated protocol version and to disk streams as the
* client version, but the value has never been used.
*
* Hard-code to the highest protocol version ever written to a network stream.
* SerParams can be used if the field requires any meaning in the future,
**/
static constexpr int DUMMY_VERSION = 70016;
std::vector<uint256> vHave; std::vector<uint256> vHave;
CBlockLocator() {} CBlockLocator() {}
@ -126,9 +135,8 @@ struct CBlockLocator
SERIALIZE_METHODS(CBlockLocator, obj) SERIALIZE_METHODS(CBlockLocator, obj)
{ {
int nVersion = s.GetVersion(); int nVersion = DUMMY_VERSION;
if (!(s.GetType() & SER_GETHASH)) READWRITE(nVersion);
READWRITE(nVersion);
READWRITE(obj.vHave); READWRITE(obj.vHave);
} }