diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-03 10:29:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-03 10:30:10 +0100 |
| commit | c76bfff11e381282fdaaf4ec4ded4c2dc001097f (patch) | |
| tree | a315faa649afb8127ca76471fd5653a524c5544c /doc/release-notes.md | |
| parent | 86755bc85a869e7da4c9112604db5132e6dc6823 (diff) | |
| parent | af9f564267b1ef7e523834675fb8bc447fc435e6 (diff) | |
| download | bitcoin-c76bfff11e381282fdaaf4ec4ded4c2dc001097f.tar.xz | |
Merge #7440: [0.12] Rename permitrbf to mempoolreplacement and provide minimal string-list forward compatibility
af9f564 release-notes: Update for replacebyfee->mempoolreplacement rename (Luke Dashjr)
4ad418b Rename replacebyfee=opt-in to mempoolreplacement=fee (Luke Dashjr)
b2287a7 release-notes: Update for permitrbf->replacebyfee rename (Luke Dashjr)
5f456a6 Simplify check for replacebyfee=opt-in (Luke Dashjr)
e8d19ab Accept replacebyfee=opt-in for turning on opt-in RBF (Luke Dashjr)
1205f87 Rename permitrbf to replacebyfee (Luke Dashjr)
Diffstat (limited to 'doc/release-notes.md')
| -rw-r--r-- | doc/release-notes.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index 661f943d76..2b0ee886bb 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -144,14 +144,14 @@ accepted when it pays sufficient fee, as described in [BIP 125] (https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki). Transaction replacement can be disabled with a new command line option, -`-permitrbf=false`. Transactions signaling replacement under BIP125 will still -be allowed into the mempool in this configuration, but replacements will be -rejected. This option is intended for miners who want to continue the +`-mempoolreplacement=0`. Transactions signaling replacement under BIP125 will +still be allowed into the mempool in this configuration, but replacements will +be rejected. This option is intended for miners who want to continue the transaction selection behavior of previous releases. -The `-permitrbf` option is *not recommended* for wallet users seeking to avoid -receipt of unconfirmed opt-in transactions, because this option does not -prevent transactions which are replaceable under BIP 125 from being accepted +The `-mempoolreplacement` option is *not recommended* for wallet users seeking +to avoid receipt of unconfirmed opt-in transactions, because this option does +not prevent transactions which are replaceable under BIP 125 from being accepted (only subsequent replacements, which other nodes on the network that implement BIP 125 are likely to relay and mine). Wallet users wishing to detect whether a transaction is subject to replacement under BIP 125 should instead use the |