From cfca4e010f7d4c3d2c5cf02b1c13880a858a7194 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 11 Sep 2023 14:38:47 +0930 Subject: [PATCH] common: rename tlv_payload's "blinding_point" to "current_blinding_point" as per spec. Simple rename in a few internal places. Signed-off-by: Rusty Russell --- common/onion_decode.c | 16 ++++++++-------- common/onion_encode.c | 2 +- ...temporary-rename-current_blinding_point.patch | 15 --------------- wire/onion_wire.csv | 4 ++-- 4 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 wire/extracted_onion_04_temporary-rename-current_blinding_point.patch diff --git a/common/onion_decode.c b/common/onion_decode.c index 57e78df2b..fdf1025fa 100644 --- a/common/onion_decode.c +++ b/common/onion_decode.c @@ -21,7 +21,7 @@ static bool check_nonfinal_tlv(const struct tlv_payload *tlv, { for (size_t i = 0; i < tal_count(tlv->fields); i++) { switch (tlv->fields[i].numtype) { - case TLV_PAYLOAD_BLINDING_POINT: + case TLV_PAYLOAD_CURRENT_BLINDING_POINT: case TLV_PAYLOAD_ENCRYPTED_RECIPIENT_DATA: continue; } @@ -45,7 +45,7 @@ static bool check_final_tlv(const struct tlv_payload *tlv, for (size_t i = 0; i < tal_count(tlv->fields); i++) { switch (tlv->fields[i].numtype) { case TLV_PAYLOAD_ENCRYPTED_RECIPIENT_DATA: - case TLV_PAYLOAD_BLINDING_POINT: + case TLV_PAYLOAD_CURRENT_BLINDING_POINT: case TLV_PAYLOAD_AMT_TO_FORWARD: case TLV_PAYLOAD_OUTGOING_CLTV_VALUE: case TLV_PAYLOAD_TOTAL_AMOUNT_MSAT: @@ -230,18 +230,18 @@ struct onion_payload *onion_decode(const tal_t *ctx, * - MUST use that `current_blinding_point` as the blinding point for decryption. */ if (blinding) { - if (p->tlv->blinding_point) { - *failtlvtype = TLV_PAYLOAD_BLINDING_POINT; + if (p->tlv->current_blinding_point) { + *failtlvtype = TLV_PAYLOAD_CURRENT_BLINDING_POINT; goto field_bad; } p->blinding = tal_dup(p, struct pubkey, blinding); } else { - if (!p->tlv->blinding_point) { - *failtlvtype = TLV_PAYLOAD_BLINDING_POINT; + if (!p->tlv->current_blinding_point) { + *failtlvtype = TLV_PAYLOAD_CURRENT_BLINDING_POINT; goto field_bad; } p->blinding = tal_dup(p, struct pubkey, - p->tlv->blinding_point); + p->tlv->current_blinding_point); } /* BOLT #4: @@ -335,7 +335,7 @@ struct onion_payload *onion_decode(const tal_t *ctx, * incoming `update_add_htlc` or `current_blinding_point` * is present. */ - if (blinding || p->tlv->blinding_point) { + if (blinding || p->tlv->current_blinding_point) { *failtlvtype = TLV_PAYLOAD_ENCRYPTED_RECIPIENT_DATA; goto field_bad; } diff --git a/common/onion_encode.c b/common/onion_encode.c index 2a32c5ee5..8a9f0eb5b 100644 --- a/common/onion_encode.c +++ b/common/onion_encode.c @@ -120,7 +120,7 @@ u8 *onion_blinded_hop(const tal_t *ctx, } tlv->outgoing_cltv_value = cast_const(u32 *, outgoing_cltv_value); tlv->encrypted_recipient_data = cast_const(u8 *, enctlv); - tlv->blinding_point = cast_const(struct pubkey *, blinding); + tlv->current_blinding_point = cast_const(struct pubkey *, blinding); return make_tlv_hop(ctx, tlv); } diff --git a/wire/extracted_onion_04_temporary-rename-current_blinding_point.patch b/wire/extracted_onion_04_temporary-rename-current_blinding_point.patch deleted file mode 100644 index 74c3e3e43..000000000 --- a/wire/extracted_onion_04_temporary-rename-current_blinding_point.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv -index 3884c63dd..f5b3e9234 100644 ---- a/wire/onion_wire.csv -+++ b/wire/onion_wire.csv -@@ -10,8 +10,8 @@ tlvdata,payload,payment_data,payment_secret,byte,32 - tlvdata,payload,payment_data,total_msat,tu64, - tlvtype,payload,encrypted_recipient_data,10 - tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,... --tlvtype,payload,current_blinding_point,12 --tlvdata,payload,current_blinding_point,blinding,point, -+tlvtype,payload,blinding_point,12 -+tlvdata,payload,blinding_point,blinding,point, - tlvtype,payload,payment_metadata,16 - tlvdata,payload,payment_metadata,payment_metadata,byte,... - tlvtype,payload,total_amount_msat,18 diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv index f5b3e9234..3884c63dd 100644 --- a/wire/onion_wire.csv +++ b/wire/onion_wire.csv @@ -10,8 +10,8 @@ tlvdata,payload,payment_data,payment_secret,byte,32 tlvdata,payload,payment_data,total_msat,tu64, tlvtype,payload,encrypted_recipient_data,10 tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,... -tlvtype,payload,blinding_point,12 -tlvdata,payload,blinding_point,blinding,point, +tlvtype,payload,current_blinding_point,12 +tlvdata,payload,current_blinding_point,blinding,point, tlvtype,payload,payment_metadata,16 tlvdata,payload,payment_metadata,payment_metadata,byte,... tlvtype,payload,total_amount_msat,18