Skip to content

Commit 535f647

Browse files
committed
doc: update BOLT quotes (to include same-transmission-order rule).
We implement this, but now we have an appropriate quote! Signed-off-by: Rusty Russell <[email protected]>
1 parent c83f426 commit 535f647

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CCANDIR := ccan
2424

2525
# Where we keep the BOLT RFCs
2626
BOLTDIR := ../lightning-rfc/
27-
BOLTVERSION := dcf6b0f359c230ef140e336011890c96eea576fa
27+
BOLTVERSION := 920e51986d654b78d1ec2afc18152c9986f52a9d
2828

2929
-include config.vars
3030

channeld/channeld.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2409,6 +2409,10 @@ static void peer_reconnect(struct peer *peer,
24092409
* number of the last `revoke_and_ack` the receiving node sent, AND
24102410
* the receiving node hasn't already received a `closing_signed`:
24112411
* - MUST re-send the `revoke_and_ack`.
2412+
* - if it has previously sent a `commitment_signed` that needs to be
2413+
* retransmitted:
2414+
* - MUST retransmit `revoke_and_ack` and `commitment_signed` in the
2415+
* same relative order as initially transmitted.
24122416
* - otherwise:
24132417
* - if `next_revocation_number` is not equal to 1 greater
24142418
* than the commitment number of the last `revoke_and_ack` the
@@ -2504,8 +2508,12 @@ static void peer_reconnect(struct peer *peer,
25042508
? NULL
25052509
: &remote_current_per_commitment_point);
25062510

2507-
/* We have to re-send in the same order we sent originally:
2508-
* revoke_and_ack (usually) alters our next commitment. */
2511+
/* BOLT #2:
2512+
* - if it has previously sent a `commitment_signed` that needs to be
2513+
* retransmitted:
2514+
* - MUST retransmit `revoke_and_ack` and `commitment_signed` in the
2515+
* same relative order as initially transmitted.
2516+
*/
25092517
if (retransmit_revoke_and_ack && !peer->last_was_revoke)
25102518
resend_revoke(peer);
25112519

0 commit comments

Comments
 (0)