diff options
| author | Alex Morcos <morcos@chaincode.com> | 2016-03-21 13:04:40 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-07 13:22:34 +0100 |
| commit | b2322e0fc6def0baf8581bbd2f4135e61c47d142 (patch) | |
| tree | 1c423d301092b8e94e23d65bce508a0f181b9ac5 /src/txmempool.cpp | |
| parent | ed64bcec2dde1f4255f3bd5b0c2f01e4dfe260d3 (diff) | |
| download | bitcoin-b2322e0fc6def0baf8581bbd2f4135e61c47d142.tar.xz | |
Remove priority estimation
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 313d33507f..45135a5f73 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"); |