Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore legacy onion (damn you lnd!) #7352

Merged
merged 4 commits into from
May 29, 2024
Merged

Restore legacy onion (damn you lnd!) #7352

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63adad9
common: re-add legacy v0 hop generation to Sphinx for testing.
rustyrussell May 29, 2024
c520405
lightningd: `pay` dev_legacy_hop arg to make second-last onion a v0.
rustyrussell May 29, 2024
8ec4383
pytest: test for forwarding legacy onion.
rustyrussell May 29, 2024
e0d8735
common: translate legacy onion payloads.
rustyrussell May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions lightningd/pay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,8 @@ send_payment(struct lightningd *ld,
const char *description TAKES,
const struct sha256 *local_invreq_id,
const struct secret *payment_secret,
const u8 *payment_metadata)
const u8 *payment_metadata,
bool dev_legacy_hop)
{
unsigned int base_expiry;
struct onionpacket *packet;
Expand All @@ -1177,6 +1178,14 @@ send_payment(struct lightningd *ld,
ret = pubkey_from_node_id(&pubkey, &ids[i]);
assert(ret);

if (dev_legacy_hop && i == n_hops - 2) {
sphinx_add_v0_hop(path, &pubkey,
&route[i + 1].scid,
route[i + 1].amount,
base_expiry + route[i + 1].delay);
continue;
cdecker marked this conversation as resolved.
Show resolved Hide resolved
}

sphinx_add_hop_has_length(path, &pubkey,
take(onion_nonfinal_hop(NULL,
&route[i + 1].scid,
Expand Down Expand Up @@ -1506,6 +1515,7 @@ static struct command_result *json_sendpay(struct command *cmd,
struct secret *payment_secret;
struct sha256 *local_invreq_id;
u8 *payment_metadata;
bool *dev_legacy_hop;

if (!param_check(cmd, buffer, params,
p_req("route", param_route_hops, &route),
Expand All @@ -1520,6 +1530,7 @@ static struct command_result *json_sendpay(struct command *cmd,
p_opt("groupid", param_u64, &group),
p_opt("payment_metadata", param_bin_from_hex, &payment_metadata),
p_opt("description", param_string, &description),
p_opt_dev("dev_legacy_hop", param_bool, &dev_legacy_hop, false),
NULL))
return command_param_failed();

Expand Down Expand Up @@ -1582,7 +1593,7 @@ static struct command_result *json_sendpay(struct command *cmd,
final_amount,
msat ? *msat : final_amount,
label, invstring, description, local_invreq_id,
payment_secret, payment_metadata);
payment_secret, payment_metadata, *dev_legacy_hop);
}

static const struct json_command sendpay_command = {
Expand Down