Skip to content

Commit 663a45b

Browse files
t-bastniftynei
authored andcommitted
Clarify RBF funding requirements
1 parent be251b3 commit 663a45b

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

02-peer-protocol.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,14 @@ completed.
436436
The sender:
437437
- MUST set `feerate` greater than or equal to 25/24 times the `feerate`
438438
of the previously constructed transaction, rounded down.
439+
- If it contributes to the transaction's funding output:
440+
- MUST set `funding_output_contribution`
439441

440442
The recipient:
441443
- MUST respond either with `tx_abort` or with `tx_ack_rbf`
442444
- MUST respond with `tx_abort` if:
443-
- the `feerate` is not greater than 25/24 times `feerate` of the last
444-
successfully constructed transaction
445+
- the `feerate` is not greater than or equal to 25/24 times `feerate`
446+
of the last successfully constructed transaction
445447
- MAY send `tx_abort` for any reason
446448

447449
#### Rationale
@@ -459,7 +461,8 @@ the attempt MUST be abandoned.
459461
`funding_output_contribution` is the amount of satoshis that this peer
460462
will contribute to the funding output of the transaction, when there is
461463
such an output. Note that it may be different from the contribution
462-
made in the previously completed transaction.
464+
made in the previously completed transaction. If omitted, the sender is
465+
not contributing to the funding output.
463466

464467
### The `tx_ack_rbf` Message
465468

@@ -476,6 +479,10 @@ made in the previously completed transaction.
476479

477480
#### Requirements
478481

482+
The sender:
483+
- If it contributes to the transaction's funding output:
484+
- MUST set `funding_output_contribution`
485+
479486
The recipient:
480487
- MUST respond with `tx_abort` or with a `tx_add_input` message,
481488
restarting the interactive tx collaboration protocol.
@@ -485,12 +492,13 @@ The recipient:
485492
`funding_output_contribution` is the amount of satoshis that this peer
486493
will contribute to the funding output of the transaction, when there is
487494
such an output. Note that it may be different from the contribution
488-
made in the previously completed transaction.
495+
made in the previously completed transaction. If omitted, the sender is
496+
not contributing to the funding output.
489497

490498
It's recommended that a peer, rather than fail the RBF negotiation due to
491-
a large feerate change, instead sets their `funding_output_contribution` to
492-
zero, and decline to participate further in the transaction (by not
493-
contributing, they may obtain incoming liquidity at no cost).
499+
a large feerate change, instead stop contributing to the funding output,
500+
and decline to participate further in the transaction (by not contributing,
501+
they may obtain incoming liquidity at no cost).
494502

495503
### The `tx_abort` Message
496504

0 commit comments

Comments
 (0)