phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fees: Pin required version to 149900

Browse source 
There is no need to compare the field to CLIENT_VERSION. Either the
format remains compatible and the value can be left unchanged, or it is
incompatible and the value needs to be increased to at least 289900+1.
This commit is contained in:
MarcoFalke 2024-03-22 10:03:42 +01:00
parent fa5126adcb
commit ddddbac9c1
No known key found for this signature in database
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/policy/fees.cpp
View file

@ -5,7 +5,6 @@
#include <policy/fees.h> #include <policy/fees.h>
#include <clientversion.h>
#include <common/system.h> #include <common/system.h>
#include <consensus/amount.h> #include <consensus/amount.h>
#include <kernel/mempool_entry.h> #include <kernel/mempool_entry.h>
@ -32,6 +31,10 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
// The current format written, and the version required to read. Must be
// increased to at least 289900+1 on the next breaking change.
constexpr int CURRENT_FEES_FILE_VERSION{149900};
static constexpr double INF_FEERATE = 1e99; static constexpr double INF_FEERATE = 1e99;
std::string StringForFeeEstimateHorizon(FeeEstimateHorizon horizon) std::string StringForFeeEstimateHorizon(FeeEstimateHorizon horizon)
@ -961,7 +964,7 @@ bool CBlockPolicyEstimator::Write(AutoFile& fileout) const
{ {
try { try {
LOCK(m_cs_fee_estimator); LOCK(m_cs_fee_estimator);
fileout << 149900; // version required to read: 0.14.99 or later fileout << CURRENT_FEES_FILE_VERSION;
fileout << int{0}; // Unused dummy field. Written files may contain any value in [0, 289900] fileout << int{0}; // Unused dummy field. Written files may contain any value in [0, 289900]
fileout << nBestSeenHeight; fileout << nBestSeenHeight;
if (BlockSpan() > HistoricalBlockSpan()/2) { if (BlockSpan() > HistoricalBlockSpan()/2) {
@ -988,7 +991,7 @@ bool CBlockPolicyEstimator::Read(AutoFile& filein)
LOCK(m_cs_fee_estimator); LOCK(m_cs_fee_estimator);
int nVersionRequired, dummy; int nVersionRequired, dummy;
filein >> nVersionRequired >> dummy; filein >> nVersionRequired >> dummy;
if (nVersionRequired > CLIENT_VERSION) { if (nVersionRequired > CURRENT_FEES_FILE_VERSION) {
throw std::runtime_error(strprintf("up-version (%d) fee estimate file", nVersionRequired)); throw std::runtime_error(strprintf("up-version (%d) fee estimate file", nVersionRequired));
} }
@ -997,9 +1000,9 @@ bool CBlockPolicyEstimator::Read(AutoFile& filein)
unsigned int nFileBestSeenHeight; unsigned int nFileBestSeenHeight;
filein >> nFileBestSeenHeight; filein >> nFileBestSeenHeight;
if (nVersionRequired < 149900) { if (nVersionRequired < CURRENT_FEES_FILE_VERSION) {
LogPrintf("%s: incompatible old fee estimation data (non-fatal). Version: %d\n", __func__, nVersionRequired); LogPrintf("%s: incompatible old fee estimation data (non-fatal). Version: %d\n", __func__, nVersionRequired);
} else { // New format introduced in 149900 } else { // nVersionRequired == CURRENT_FEES_FILE_VERSION
unsigned int nFileHistoricalFirst, nFileHistoricalBest; unsigned int nFileHistoricalFirst, nFileHistoricalBest;
filein >> nFileHistoricalFirst >> nFileHistoricalBest; filein >> nFileHistoricalFirst >> nFileHistoricalBest;
if (nFileHistoricalFirst > nFileHistoricalBest || nFileHistoricalBest > nFileBestSeenHeight) { if (nFileHistoricalFirst > nFileHistoricalBest || nFileHistoricalBest > nFileBestSeenHeight) {