diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-11-07 13:23:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-11-07 13:36:40 +0100 |
| commit | 3c03dc2cfc07077aabef4c0fdd31435842a26a77 (patch) | |
| tree | dd4e46404c6f43f1afce5cbeb04bee09bdf7fa17 /src/txmempool.cpp | |
| parent | Merge #8709: Allow filterclear messages for enabling TX relay only. (diff) | |
| parent | add release notes for removal of priority estimation (diff) | |
| download | discoin-3c03dc2cfc07077aabef4c0fdd31435842a26a77.tar.xz discoin-3c03dc2cfc07077aabef4c0fdd31435842a26a77.zip | |
Merge #7730: Remove priority estimation
0bd581a add release notes for removal of priority estimation (Alex Morcos)
b2322e0 Remove priority estimation (Alex Morcos)
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 313d33507..45135a5f7 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -895,7 +895,7 @@ CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const { try { LOCK(cs); - fileout << 109900; // version required to read: 0.10.99 or later + fileout << 139900; // version required to read: 0.13.99 or later fileout << CLIENT_VERSION; // version that wrote the file minerPolicyEstimator->Write(fileout); } @@ -914,9 +914,8 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein) filein >> nVersionRequired >> nVersionThatWrote; if (nVersionRequired > CLIENT_VERSION) return error("CTxMemPool::ReadFeeEstimates(): up-version (%d) fee estimate file", nVersionRequired); - LOCK(cs); - minerPolicyEstimator->Read(filein); + minerPolicyEstimator->Read(filein, nVersionThatWrote); } catch (const std::exception&) { LogPrintf("CTxMemPool::ReadFeeEstimates(): unable to read policy estimator data (non-fatal)\n"); |