aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: update bolts a0bbe47b0278b4f152dbaa4f5fab2562413a217c

Browse Source 
"BOLT 04: remove associated data from test vector"

(We actually use merge point).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-04-07 16:25:26 +09:30
parent dfa6c0ca52
commit f26b1166b7
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -23,7 +23,7 @@ CCANDIR := ccan
# Where we keep the BOLT RFCs # Where we keep the BOLT RFCs
BOLTDIR := ../bolts/ BOLTDIR := ../bolts/
DEFAULT_BOLTVERSION := b38156b9510c0562cf50f8758a64602cc0315c19 DEFAULT_BOLTVERSION := a0bbe47b0278b4f152dbaa4f5fab2562413a217c
# Can be overridden on cmdline. # Can be overridden on cmdline.
BOLTVERSION := $(DEFAULT_BOLTVERSION) BOLTVERSION := $(DEFAULT_BOLTVERSION)

9
common/sphinx.c
View File

@@ -694,10 +694,11 @@ struct onionreply *create_onionreply(const tal_t *ctx,
/* BOLT #4: /* BOLT #4:
* The _erring node_: * The _erring node_:
* - SHOULD set `pad` such that the `failure_len` plus `pad_len` * - MUST set `pad` such that the `failure_len` plus `pad_len`
* is equal to 256. * is at least 256.
* - Note: this value is 118 bytes longer than the longest * - SHOULD set `pad` such that the `failure_len` plus `pad_len` is equal
* currently-defined message. * to 256. Deviating from this may cause older nodes to be unable to parse
* the return message.
*/ */
const u16 onion_reply_size = IFDEV(dev_onion_reply_length, 256); const u16 onion_reply_size = IFDEV(dev_onion_reply_length, 256);

8
lightningd/htlc_set.c
View File

@@ -137,9 +137,9 @@ void htlc_set_add(struct lightningd *ld,
else { else {
/* BOLT #4: /* BOLT #4:
* *
* if it supports `basic_mpp`: * otherwise, if it supports `basic_mpp`:
* ... * ...
* - otherwise, if the total `amount_msat` of this HTLC set is * - otherwise, if the total `amt_to_forward` of this HTLC set is
* less than `total_msat`: * less than `total_msat`:
* ... * ...
* - MUST require `payment_secret` for all HTLCs in the set. * - MUST require `payment_secret` for all HTLCs in the set.
@@ -199,7 +199,7 @@ void htlc_set_add(struct lightningd *ld,
); );
/* BOLT #4: /* BOLT #4:
* - if the total `amount_msat` of this HTLC set is equal to or greater than * - if the total `amt_to_forward` of this HTLC set is equal to or greater than
* `total_msat`: * `total_msat`:
* - SHOULD fulfill all HTLCs in the HTLC set * - SHOULD fulfill all HTLCs in the HTLC set
*/ */
@@ -211,7 +211,7 @@ void htlc_set_add(struct lightningd *ld,
} }
/* BOLT #4: /* BOLT #4:
* - otherwise, if the total `amount_msat` of this HTLC set is less than * - otherwise, if the total `amt_to_forward` of this HTLC set is less than
* `total_msat`: * `total_msat`:
* - MUST NOT fulfill any HTLCs in the HTLC set * - MUST NOT fulfill any HTLCs in the HTLC set
*... *...

2
lightningd/pay.c
View File

@@ -1029,7 +1029,7 @@ send_payment_core(struct lightningd *ld,
/* BOLT #4: /* BOLT #4:
* *
* - MUST NOT send another HTLC if the total `amount_msat` of the HTLC * - MUST NOT send another HTLC if the total `amt_to_forward` of the HTLC
* set is already greater or equal to `total_msat`. * set is already greater or equal to `total_msat`.
*/ */
/* We don't do this for single 0-value payments (sendonion does this) */ /* We don't do this for single 0-value payments (sendonion does this) */