Skip to content

No more legacy onion support #8772

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

Open
rustyrussell wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −53
Open

No more legacy onion support #8772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c04aaa1
common: remove unused type field.
rustyrussell Dec 9, 2025
e74861a
common: remove legacy onion translation.
rustyrussell Dec 9, 2025
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
6 changes: 0 additions & 6 deletions common/onion_encode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@
struct route_step;
struct tlv_encrypted_data_tlv_payment_relay;

enum onion_payload_type {
ONION_V0_PAYLOAD = 0,
ONION_TLV_PAYLOAD = 1,
};

struct onion_payload {
enum onion_payload_type type;
/* Is this the final hop? */
bool final;

Expand Down
53 changes: 6 additions & 47 deletions common/sphinx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,54 +677,13 @@ struct route_step *process_onionpacket(
/* Any of these could fail, falling thru with cursor == NULL */
payload_size = fromwire_bigsize(&cursor, &max);

/* Legacy! 0 length payload means fixed 32 byte structure */
if (payload_size == 0 && max >= 32) {
struct tlv_payload *legacy = tlv_payload_new(tmpctx);
const u8 *legacy_cursor = cursor;
size_t legacy_max = 32;
u8 *onwire_tlv;

legacy->amt_to_forward = tal(legacy, u64);
legacy->outgoing_cltv_value = tal(legacy, u32);
legacy->short_channel_id = tal(legacy, struct short_channel_id);

/* BOLT-obsolete #4:
* ## Legacy `hop_data` payload format
*
* The `hop_data` format is identified by a single `0x00`-byte
* length, for backward compatibility. Its payload is defined
* as:
*
* 1. type: `hop_data` (for `realm` 0)
* 2. data:
* * [`short_channel_id`:`short_channel_id`]
* * [`u64`:`amt_to_forward`]
* * [`u32`:`outgoing_cltv_value`]
* * [`12*byte`:`padding`]
*/
*legacy->short_channel_id = fromwire_short_channel_id(&legacy_cursor, &legacy_max);
*legacy->amt_to_forward = fromwire_u64(&legacy_cursor, &legacy_max);
*legacy->outgoing_cltv_value = fromwire_u32(&legacy_cursor, &legacy_max);

/* Re-linearize it as a modern TLV! */
onwire_tlv = tal_arr(tmpctx, u8, 0);
towire_tlv_payload(&onwire_tlv, legacy);

/* Length, then tlv */
step->raw_payload = tal_arr(step, u8, 0);
towire_bigsize(&step->raw_payload, tal_bytelen(onwire_tlv));
towire_u8_array(&step->raw_payload, onwire_tlv, tal_bytelen(onwire_tlv));
/* FIXME: raw_payload *includes* the length, which is redundant and
* means we can't just ust fromwire_tal_arrn. */
fromwire_pad(&cursor, &max, payload_size);
if (cursor != NULL)
step->raw_payload = tal_dup_arr(step, u8, paddedheader,
cursor - paddedheader, 0);

payload_size = 32;
fromwire_pad(&cursor, &max, payload_size);
} else {
/* FIXME: raw_payload *includes* the length, which is redundant and
* means we can't just ust fromwire_tal_arrn. */
fromwire_pad(&cursor, &max, payload_size);
if (cursor != NULL)
step->raw_payload = tal_dup_arr(step, u8, paddedheader,
cursor - paddedheader, 0);
}
fromwire_hmac(&cursor, &max, &step->next->hmac);

/* BOLT #4:
Expand Down
Loading