| commit | 9bad8d64721768953cb9c18f30d48ec8c2757879 | |
| author | Wladimir J. van der Laan <laanwj@gmail.com> | |
| Sat, 23 Dec 2017 08:59:28 +0000 (23 09:59 +0100) | ||
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | |
| Sat, 23 Dec 2017 09:00:24 +0000 (23 10:00 +0100) | ||
| tree | e9933441ae9746a0f89fef12c4685ea439dcb622 | treesnapshot (tar.gz zip) |
| parent | 8f68fd281eecf7e3110033aa3956b2b40ce99d1a | commitdiff |
| parent | 149dffd3b2a137d575ad19b8c0b13345efe3ada1 | commitdiff |
Merge #11475: [rpc] mempoolinfo should take ::minRelayTxFee into account
149dffd [rpc] mempoolinfo should take ::minRelayTxFee into account (Cristian Mircea Messel)
Pull request description:
Fixes #6941 following https://github.com/bitcoin/bitcoin/pull/11410#issuecomment-332991078 's suggestion
This takes care of the mentioned ticket without changing the behavior of https://github.com/bitcoin/bitcoin/pull/11410/files#diff-24efdb00bfbe56b140fb006b562cc70bL629
By modifying https://github.com/bitcoin/bitcoin/blob/5a9da37fb3f4b53f556e1d46509b94dc3c661d75/src/txmempool.cpp#L984 the syncing mempools becomes problematic as per https://github.com/bitcoin/bitcoin/pull/11410#issuecomment-333868390
~~Same code causes different tests to fail: https://travis-ci.org/bitcoin/bitcoin/jobs/286128241 https://travis-ci.org/bitcoin/bitcoin/jobs/286128241 . I can't reproduce the problems locally, am I doing something wrong?~~ travis sometimes fails unexpectedly
Tree-SHA512: fd81628da6a3eff51bd09e5342d781bac0710f79d6b330b1df3662756ecaceb2e1682bf9768b5f8edbcba6479a3223dfa6604d37c9e9d37d00d077172da4f6ea
149dffd [rpc] mempoolinfo should take ::minRelayTxFee into account (Cristian Mircea Messel)
Pull request description:
Fixes #6941 following https://github.com/bitcoin/bitcoin/pull/11410#issuecomment-332991078 's suggestion
This takes care of the mentioned ticket without changing the behavior of https://github.com/bitcoin/bitcoin/pull/11410/files#diff-24efdb00bfbe56b140fb006b562cc70bL629
By modifying https://github.com/bitcoin/bitcoin/blob/5a9da37fb3f4b53f556e1d46509b94dc3c661d75/src/txmempool.cpp#L984 the syncing mempools becomes problematic as per https://github.com/bitcoin/bitcoin/pull/11410#issuecomment-333868390
~~Same code causes different tests to fail: https://travis-ci.org/bitcoin/bitcoin/jobs/286128241 https://travis-ci.org/bitcoin/bitcoin/jobs/286128241 . I can't reproduce the problems locally, am I doing something wrong?~~ travis sometimes fails unexpectedly
Tree-SHA512: fd81628da6a3eff51bd09e5342d781bac0710f79d6b330b1df3662756ecaceb2e1682bf9768b5f8edbcba6479a3223dfa6604d37c9e9d37d00d077172da4f6ea
| src/rpc/blockchain.cpp | diff1 | diff2 | blobhistory |
| test/functional/wallet.py | diff1 | diff2 | blobhistory |