diff options
| author | glozow <gloriajzhao@gmail.com> | 2022-07-12 15:57:17 +0100 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2022-07-12 15:58:39 +0100 |
| commit | 39d111aee769cefee1fc7fedda8973b2e3b3b678 (patch) | |
| tree | afe765a3645b3ddb1e4e302dc996691dd8587b08 /doc | |
| parent | 316afb1eca47fe179584bd2d8ae400f9aff474d4 (diff) | |
| parent | 1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc (diff) | |
Merge bitcoin/bitcoin#25575: Address comments remaining from #25353
1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc Address comments remaining from #25353 (Antoine Riard)
Pull request description:
This PR should address the remaining comments from #25353.
ACKs for top commit:
MarcoFalke:
cr ACK 1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc
glozow:
ACK 1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc
w0xlt:
cr ACK https://github.com/bitcoin/bitcoin/pull/25575/commits/1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc
Tree-SHA512: 194524193b1f087742c04d3cbe221e2ccf62e1f9303dc6668d62b73bd2dc0c039b7d68b33658dbee7809bd14bb8a5479f8e7928180b18c3180fdfbe3876c3ca1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/policy/mempool-replacements.md | 4 | ||||
| -rw-r--r-- | doc/release-notes.md | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/policy/mempool-replacements.md b/doc/policy/mempool-replacements.md index fea0143757..430a96f228 100644 --- a/doc/policy/mempool-replacements.md +++ b/doc/policy/mempool-replacements.md @@ -15,8 +15,8 @@ other consensus and policy rules, each of the following conditions are met: *Rationale*: See [BIP125 explanation](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki#motivation). - The Bitcoin Core implementation offers a node setting (`mempoolfullrbf`) to allow transaction - replacement without enforcement of the opt-in signaling rule. + Use the (`-mempoolfullrbf`) configuration option to allow transaction replacement without enforcement of the + opt-in signaling rule. 2. The replacement transaction only include an unconfirmed input if that input was included in one of the directly conflicting transactions. An unconfirmed input spends an output from a diff --git a/doc/release-notes.md b/doc/release-notes.md index 2c3bb27935..444926087b 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -87,8 +87,8 @@ New settings ------------ - A new `mempoolfullrbf` option has been added, which enables the mempool to - accept transaction replacement without enforcing the opt-in replaceability - signal. (#25353) + accept transaction replacement without enforcing BIP125 replaceability + signaling. (#25353) Tools and Utilities ------------------- |