diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-09-29 15:07:48 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-09-29 15:07:57 +0200 |
| commit | 93d20a734d2ee873832bed8ca5c05cf8e539c53c (patch) | |
| tree | 1e1fd330de591b6564e82dadf3c2c82625fb3e04 /src/wallet | |
| parent | bbc901d3a683c92438a6b28dca50b956decc4433 (diff) | |
| parent | bf64c3cb34571cfcd2ec4cce29bbf9c49ec3700c (diff) | |
Merge #11309: Minor cleanups for AcceptToMemoryPool
bf64c3cb3 Ignore transactions added to mempool during a reorg for fee estimation purposes. (Alex Morcos)
04f78ab5b Do not reject based on mempool min fee when bypass_limits is set. (Alex Morcos)
fd849e1b0 Change AcceptToMemoryPool function signature (Alex Morcos)
Pull request description:
First commit just removes default arguments from `AcceptToMemoryPool` and consolidates two arguments, it does not change behavior.
Second commit finally fixes the fact that we're not meant to reject based on mempool min fee when adding a transaction from a disconnected block during a reorg as mentioned [here](https://github.com/bitcoin/bitcoin/pull/9602#issue-202197849)
Third commit makes fee estimation ignore transactions added from a disconnected block during a reorg. I think this was another source of fee estimates returning estimates below 1000 sat/kB as in #11303.
Tree-SHA512: 30925ca8b341915bb214f1d2590b36b7931f2e125b7660150e38ae70338f00db5aa7f1608546dddb181446924177eb7cf62ea8bd2583068acc074d6c3f86bc0c
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 6760d6ff84..b774305a34 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4047,5 +4047,6 @@ int CMerkleTx::GetBlocksToMaturity() const bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state) { - return ::AcceptToMemoryPool(mempool, state, tx, true, nullptr, nullptr, false, nAbsurdFee); + return ::AcceptToMemoryPool(mempool, state, tx, nullptr /* pfMissingInputs */, + nullptr /* plTxnReplaced */, false /* bypass_limits */, nAbsurdFee); } |