foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

Remove SER_GETHASH, hard-code client version in CKeyPool serialize

Browse source 
It was never set, so it can be removed along with any code reading it.
This commit is contained in:
MarcoFalke 2023-09-11 16:12:34 +00:00
parent fa72f09d6f
commit fac29a0ab1
No known key found for this signature in database
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/serialize.h
View file

@ -131,7 +131,6 @@ enum
// primary actions // primary actions
SER_NETWORK = (1 << 0), SER_NETWORK = (1 << 0),
SER_DISK = (1 << 1), SER_DISK = (1 << 1),
SER_GETHASH = (1 << 2),
}; };
/** /**

10
src/wallet/scriptpubkeyman.h
View file

@ -123,20 +123,14 @@ public:
template<typename Stream> template<typename Stream>
void Serialize(Stream& s) const void Serialize(Stream& s) const
{ {
int nVersion = s.GetVersion(); s << int{259900}; // Unused field, writes the highest client version ever written
if (!(s.GetType() & SER_GETHASH)) {
s << nVersion;
}
s << nTime << vchPubKey << fInternal << m_pre_split; s << nTime << vchPubKey << fInternal << m_pre_split;
} }
template<typename Stream> template<typename Stream>
void Unserialize(Stream& s) void Unserialize(Stream& s)
{ {
int nVersion = s.GetVersion(); s >> int{}; // Discard unused field
if (!(s.GetType() & SER_GETHASH)) {
s >> nVersion;
}
s >> nTime >> vchPubKey; s >> nTime >> vchPubKey;
try { try {
s >> fInternal; s >> fInternal;