Skip to content

Commit

Permalink
Address comments remaining from bitcoin#25353
Browse files Browse the repository at this point in the history
  • Loading branch information
ariard committed Jul 8, 2022
1 parent 4385231 commit 3139f90
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions doc/policy/mempool-replacements.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`) setting 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
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ New settings
------------

- A new `mempoolfullrbf` option has been added, which enables the mempool to
accept transaction replacement without enforcing the opt-in replaceability
accept transaction replacement without enforcing BIP125 replaceability
signal. (#25353)

Tools and Utilities
Expand Down
8 changes: 4 additions & 4 deletions test/functional/feature_rbf.py
Original file line number Diff line number Diff line change
Expand Up @@ -703,17 +703,16 @@ def test_replacement_relay_fee(self):
assert_raises_rpc_error(-26, "insufficient fee", self.nodes[0].sendrawtransaction, tx.serialize().hex())

def test_fullrbf(self):
txid = self.wallet.send_self_transfer(from_node=self.nodes[0])['txid']
self.generate(self.nodes[0], 1)
confirmed_utxo = self.wallet.get_utxo(txid=txid)

confirmed_utxo = self.make_utxo(self.nodes[0], int(2 * COIN))
self.restart_node(0, extra_args=["-mempoolfullrbf=1"])
assert self.nodes[0].getmempoolinfo()["fullrbf"]

# Create an explicitly opt-out transaction
optout_tx = self.wallet.send_self_transfer(
from_node=self.nodes[0],
utxo_to_spend=confirmed_utxo,
sequence=SEQUENCE_FINAL,
sequence=BIP125_SEQUENCE_NUMBER + 1,
fee_rate=Decimal('0.01'),
)
assert_equal(False, self.nodes[0].getmempoolentry(optout_tx['txid'])['bip125-replaceable'])
Expand All @@ -729,6 +728,7 @@ def test_fullrbf(self):

# Optout_tx is not anymore in the mempool.
assert optout_tx['txid'] not in self.nodes[0].getrawmempool()
assert conflicting_tx['txid'] in self.nodes[0].getrawmempool()

if __name__ == '__main__':
ReplaceByFeeTest().main()

0 comments on commit 3139f90

Please sign in to comment.