Skip to content

Commit 727e068

Browse files
committed
common: update bolt to neaten pubkey descriptions.
Signed-off-by: Rusty Russell <[email protected]>
1 parent 7fb79b0 commit 727e068

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

Makefile

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

2727
# Where we keep the BOLT RFCs
2828
BOLTDIR := ../bolts/
29-
DEFAULT_BOLTVERSION := 5dec5eb84957d70c9fedf27173e78f1b0b6b0217
29+
DEFAULT_BOLTVERSION := fd83d7cee0369eb1d9068eb9864bff8b1f940938
3030
# Can be overridden on cmdline.
3131
BOLTVERSION := $(DEFAULT_BOLTVERSION)
3232

common/key_derive.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
*
1414
* pubkey = basepoint + SHA256(per_commitment_point || basepoint) * G
1515
*
16-
* The `localpubkey` uses the local node's `payment_basepoint`;
17-
* The `remotepubkey` uses the remote node's `payment_basepoint`;
18-
* the `local_htlcpubkey` uses the local node's `htlc_basepoint`;
19-
* the `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
20-
* the `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
21-
* and the `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
16+
* - The `localpubkey` uses the local node's `payment_basepoint`;
17+
* - The `local_htlcpubkey` uses the local node's `htlc_basepoint`;
18+
* - The `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
19+
* - The `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
20+
* - The `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
2221
*...
2322
* The `remotepubkey` is simply the remote node's `payment_basepoint`.
2423
*/

common/keyset.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ bool derive_keyset(const struct pubkey *per_commitment_point,
1717
*
1818
* pubkey = basepoint + SHA256(per_commitment_point || basepoint) * G
1919
*
20-
* The `localpubkey` uses the local node's `payment_basepoint`;
21-
* The `remotepubkey` uses the remote node's `payment_basepoint`;
22-
* the `local_htlcpubkey` uses the local node's `htlc_basepoint`;
23-
* the `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
24-
* the `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
25-
* and the `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
20+
* - The `localpubkey` uses the local node's `payment_basepoint`;
21+
* - The `local_htlcpubkey` uses the local node's `htlc_basepoint`;
22+
* - The `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
23+
* - The `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
24+
* - The `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
2625
*/
2726
if (!derive_simple_key(&self->payment,
2827
per_commitment_point,

0 commit comments

Comments
 (0)