Skip to content

Commit 04a5dce

Browse files
committed
docs: remove requirement to signal bip125
Also remove stated support of BIP125 from bips file.
1 parent 111a23d commit 04a5dce

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

Diff for: doc/bips.md

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ BIPs that are implemented by Bitcoin Core:
3434
* [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
3535
* [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)), and has been *buried* since **v0.19.0** ([PR #16060](https://github.com/bitcoin/bitcoin/pull/16060)).
3636
* [`BIP 113`](https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki): Median time past lock-time calculations have been implemented since **v0.12.1** ([PR #6566](https://github.com/bitcoin/bitcoin/pull/6566)), and has been *buried* since **v0.19.0** ([PR #16060](https://github.com/bitcoin/bitcoin/pull/16060)).
37-
* [`BIP 125`](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki): Opt-in full replace-by-fee partially implemented: signaling is enforced if configured. For other replacement rules, see doc/policy/mempool-replacements.md.
3837
* [`BIP 130`](https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki): direct headers announcement is negotiated with peer versions `>=70012` as of **v0.12.0** ([PR 6494](https://github.com/bitcoin/bitcoin/pull/6494)).
3938
* [`BIP 133`](https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki): feefilter messages are respected and sent for peer versions `>=70013` as of **v0.13.0** ([PR 7542](https://github.com/bitcoin/bitcoin/pull/7542)).
4039
* [`BIP 141`](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki): Segregated Witness (Consensus Layer) as of **v0.13.0** ([PR 8149](https://github.com/bitcoin/bitcoin/pull/8149)), defined for mainnet as of **v0.13.1** ([PR 8937](https://github.com/bitcoin/bitcoin/pull/8937)), and *buried* since **v0.19.0** ([PR #16060](https://github.com/bitcoin/bitcoin/pull/16060)).

Diff for: doc/policy/mempool-replacements.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ A transaction ("replacement transaction") may replace its directly conflicting t
1010
their in-mempool descendants (together, "original transactions") if, in addition to passing all
1111
other consensus and policy rules, each of the following conditions are met:
1212

13-
1. If `-mempoolfullrbf=0` (the value is 1 by default), the directly conflicting transactions all signal replaceability explicitly. A transaction is
14-
signaling BIP125 replaceability if any of its inputs have an nSequence number less than (0xffffffff - 1).
15-
A transaction also signals replaceability if its version field is set to 3.
16-
17-
*Rationale*: See [BIP125
18-
explanation](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki#motivation).
13+
1. (Removed)
1914

2015
2. The replacement transaction only include an unconfirmed input if that input was included in
2116
one of the directly conflicting transactions. An unconfirmed input spends an output from a
@@ -80,3 +75,5 @@ This set of rules is similar but distinct from BIP125.
8075
#25353](https://github.com/bitcoin/bitcoin/pull/25353)).
8176

8277
* Full replace-by-fee is the default policy as of **v28.0** ([PR #30493](https://github.com/bitcoin/bitcoin/pull/30493)).
78+
79+
* Signaling for replace-by-fee is no longer required as of [PR 30592](https://github.com/bitcoin/bitcoin/pull/30592).

Diff for: doc/policy/packages.md

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ The following rules are enforced for all packages:
3838

3939
* Only limited package replacements are currently considered. (#28984)
4040

41-
- If `-mempoolfullrbf=0` (the value is 1 by default), all direct conflicts must signal replacement.
42-
4341
- Packages are 1-parent-1-child, with no in-mempool ancestors of the package.
4442

4543
- All conflicting clusters (connected components of mempool transactions) must be clusters of up to size 2.

0 commit comments

Comments
 (0)