aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-05 23:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

spec: update to experimental BOLTs with secret/total_amount.

Browse Source 
Also pulls in a new onion error (mpp_timeout).  We change our
route_step_decode_end() to always return the total_msat and optional
secret.

We check total_amount (to prohibit mpp), but we do nothing with
secret for now other than hand it to the htlc_accepted hook.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-11-23 10:49:23 +10:30
parent 50d6941e89
commit ebac3d2a85
9 changed files with 128 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lightningd/pay.c
View File

@@ -681,10 +681,17 @@ send_payment(struct lightningd *ld,
ret = pubkey_from_node_id(&pubkey, &ids[i]);
assert(ret);
sphinx_add_final_hop(path, &pubkey,
should_use_tlv(route[i].style),
route[i].amount,
base_expiry + route[i].delay);
/* FIXME: This can't fail if payment_secret total_msat == amount, and
* payment_secret is NULL, but it will later when we modify code. */
if (!sphinx_add_final_hop(path, &pubkey,
should_use_tlv(route[i].style),
route[i].amount,
base_expiry + route[i].delay,
route[i].amount, NULL)) {
return command_fail(cmd, PAY_DESTINATION_PERM_FAIL,
"Destination does not support"
" payment_secret");
}
/* Now, do we already have a payment? */
payment = wallet_payment_by_hash(tmpctx, ld->wallet, rhash);

29
lightningd/peer_htlcs.c
View File

@@ -280,7 +280,9 @@ static void handle_localpay(struct htlc_in *hin,
u32 cltv_expiry,
const struct sha256 *payment_hash,
struct amount_msat amt_to_forward,
u32 outgoing_cltv_value)
u32 outgoing_cltv_value,
struct amount_msat total_msat,
const struct secret *payment_secret)
{
enum onion_type failcode;
struct lightningd *ld = hin->key.channel->peer->ld;
@@ -298,6 +300,18 @@ static void handle_localpay(struct htlc_in *hin,
goto fail;
}
/* BOLT- #4:
* - if it does not support `basic_mpp`:
* - MUST fail the HTLC if `total_msat` is not exactly equal to
* `amt_to_forward`.
*/
if (!amount_msat_eq(amt_to_forward, total_msat)) {
/* FIXME: Ideally, we use WIRE_INVALID_ONION_PAYLOAD and
* point at the total_msat field */
failcode = WIRE_FINAL_INCORRECT_HTLC_AMOUNT;
goto fail;
}
/* BOLT #4:
*
* 1. type: 18 (`final_incorrect_cltv_expiry`)
@@ -598,6 +612,9 @@ fail:
struct gossip_resolve {
struct short_channel_id next_channel;
struct amount_msat amt_to_forward;
struct amount_msat total_msat;
/* Only set if TLV specifies it */
const struct secret *payment_secret;
u32 outgoing_cltv_value;
u8 *next_onion;
struct htlc_in *hin;
@@ -752,6 +769,12 @@ static void htlc_accepted_hook_serialize(struct htlc_accepted_hook_payload *p,
*rs->amt_to_forward);
if (rs->outgoing_cltv)
json_add_u32(s, "outgoing_cltv_value", *rs->outgoing_cltv);
/* These are specified together in TLV, so only print total_msat if
* payment_secret set (ie. modern, and final hop) */
if (rs->payment_secret) {
json_add_amount_msat_only(s, "total_msat", *rs->total_msat);
json_add_secret(s, "payment_secret", rs->payment_secret);
}
json_add_hex_talarr(s, "next_onion", p->next_onion);
json_add_secret(s, "shared_secret", hin->shared_secret);
json_object_end(s);
@@ -844,7 +867,9 @@ htlc_accepted_hook_callback(struct htlc_accepted_hook_payload *request,
} else
handle_localpay(hin, hin->cltv_expiry, &hin->payment_hash,
*rs->amt_to_forward,
*rs->outgoing_cltv);
*rs->outgoing_cltv,
*rs->total_msat,
rs->payment_secret);
break;
case htlc_accepted_fail:
log_debug(channel->log,