Skip to content

Commit c0b96c0

Browse files
committed
update to incorporate yy's feedback
1 parent 85cb386 commit c0b96c0

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

ext-dynamic-commitments.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ secure in all contexts.
369369
Since the `initiator` is the one that is responsible for paying the fees for the
370370
kickoff transaction if it is required (like for certain `channel_type` changes),
371371
it follows that the `responder` cannot change the `channel_type`. Since the
372-
`kickoff_feerate` paid by the `initiator`, it should be set only if the sender
373-
is the `initiator`.
372+
`kickoff_feerate` is paid by the `initiator`, it should be set only if the
373+
sender is the `initiator`.
374374

375375
The requirement for a node to remember what it last _sent_ and for it to
376376
remember what it _accepted_ is necessary to recover on reestablish. See the
@@ -389,13 +389,15 @@ accepted the proposal.
389389

390390
The sending node:
391391
- MUST set `channel_id` to a valid channel it has with the recipient.
392-
- MUST NOT send this message if it has not received a `dyn_propose`
392+
- MUST NOT send this message if it has not received a `dyn_propose` for this
393+
`channel_id`
393394
- MUST NOT send this message if it has already sent a `dyn_ack` for the
394395
current negotiation.
395396
- MUST NOT send this message if it has already sent a `dyn_reject` for the
396397
current negotiation.
397398
- MUST remember the parameters of `dyn_propose` message to which the `dyn_ack`
398-
is responding for the next `dyn_height`.
399+
is responding for the next `dyn_height`. (See `channel_reestablish`
400+
requirements)
399401
- MUST remember the local and remote commitment heights for the next
400402
`dyn_height`.
401403

@@ -443,8 +445,6 @@ The sending node:
443445
- Example: an objection to the `dust_limit` would be encoded as
444446
0b00000001, an objection to `max_value_in_flight` would be encoded as
445447
0b00000010, and an objection to both would be encoded as 0b00000011.
446-
- if it has sent a `dyn_propose` in the current negotiation
447-
- MUST forget its last sent `dyn_propose` parameters
448448
- MUST forget the parameters of the `dyn_propose` message to which the
449449
`dyn_reject` is responding.
450450

@@ -554,7 +554,9 @@ Change.
554554
- If either channel party changes `max_accepted_htlcs`: Rules Change
555555
- If either channel party changes `funding_pubkey`: Funding Output Update
556556
- If new `channel_type` requires different funding output script than the old
557-
`channel_type`: Funding Output Update
557+
`channel_type`: Funding Output Update
558+
- If new `channel_type` requires the same funding output script as the old
559+
`channel_type`: Commitment Update
558560

559561
### Rules Change
560562

@@ -578,9 +580,8 @@ normal channel operation is resumed.
578580

579581
### Funding Output Change: General Protocol
580582

581-
If a Funding Output Change is required, then once both channel parties have
582-
irrevocably committed to a state with no HTLC outputs, new commitment signatures
583-
AND kickoff signatures MUST be exchanged. To accomplish this the following steps
583+
If a Funding Output Change is required, then new commitment signatures AND
584+
kickoff signatures MUST be exchanged. To accomplish this, the following steps
584585
are taken:
585586

586587
1. Build kickoff transaction
@@ -639,7 +640,7 @@ signed.
639640
* txout count: 3
640641
* `txout[0]`: `anchor_output_1` or `anchor_output_2`
641642
* `txout[1]`: `anchor_output_1` or `anchor_output_2`
642-
* `txout[2]`: `p2tr_funding_output`
643+
* `txout[2]`: `kickoff_funding_output`
643644

644645
The anchor outputs have a value of 330 satoshis. They are encumbered by a
645646
version 1 witness script:
@@ -683,7 +684,7 @@ from `dyn_ack`:
683684
* locktime: upper 8 bits are 0x20, lower 24 bits are the lower 24 bits of the
684685
obscured commitment number
685686
* txin count: 1
686-
* `txin[0]` outpoint: the matching kickoff transaction's funding outpoint.
687+
* `txin[0]` outpoint: the `kickoff_funding_output`
687688
* `txin[0]` sequence: upper 8 bits are 0x80, lower 24 bits are upper 24 bits
688689
of the obscured commitment number
689690
* `txin[0]` script bytes: 0

0 commit comments

Comments
 (0)