From f20bea605b36fcec96fb7586d8098a144ecce7d5 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 11 Feb 2025 08:37:36 +1030 Subject: [PATCH] wire: fix extracted files. Changes were made to the wire files manually, but we're supposed to edit the patches so they can be reproduced. --- wire/extracted_peer_06_funding_outpoint_sigs.patch | 4 ++-- wire/extracted_peer_08_add_input_tlvs.patch | 14 ++++++++++++++ wire/extracted_peer_11_splice.patch | 13 ++++++------- 3 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 wire/extracted_peer_08_add_input_tlvs.patch diff --git a/wire/extracted_peer_06_funding_outpoint_sigs.patch b/wire/extracted_peer_06_funding_outpoint_sigs.patch index d07a73573..3da5b65df 100644 --- a/wire/extracted_peer_06_funding_outpoint_sigs.patch +++ b/wire/extracted_peer_06_funding_outpoint_sigs.patch @@ -8,8 +8,8 @@ subtype,witness subtypedata,witness,len,u16, subtypedata,witness,witness_data,byte,len -+tlvtype,txsigs_tlvs,funding_outpoint_sig,0 -+tlvdata,txsigs_tlvs,funding_outpoint_sig,sig,byte,... ++tlvtype,txsigs_tlvs,shared_input_signature,0 ++tlvdata,txsigs_tlvs,shared_input_signature,signature,signature, msgtype,tx_init_rbf,72 msgdata,tx_init_rbf,channel_id,channel_id, msgdata,tx_init_rbf,locktime,u32, diff --git a/wire/extracted_peer_08_add_input_tlvs.patch b/wire/extracted_peer_08_add_input_tlvs.patch new file mode 100644 index 000000000..dbda248d2 --- /dev/null +++ b/wire/extracted_peer_08_add_input_tlvs.patch @@ -0,0 +1,14 @@ +diff --git b/wire/peer_wire.csv a/wire/peer_wire.csv +index 6543e34ee4..c36d90807b 100644 +--- b/wire/peer_wire.csv ++++ a/wire/peer_wire.csv +@@ -44,6 +44,9 @@ msgdata,tx_add_input,prevtx_len,u16, + msgdata,tx_add_input,prevtx,byte,prevtx_len + msgdata,tx_add_input,prevtx_vout,u32, + msgdata,tx_add_input,sequence,u32, ++msgdata,tx_add_input,tlvs,tx_add_input_tlvs, ++tlvtype,tx_add_input_tlvs,shared_input_txid,0 ++tlvdata,tx_add_input_tlvs,shared_input_txid,funding_txid,sha256, + msgtype,tx_add_output,67 + msgdata,tx_add_output,channel_id,channel_id, + msgdata,tx_add_output,serial_id,u64, diff --git a/wire/extracted_peer_11_splice.patch b/wire/extracted_peer_11_splice.patch index 400d8336c..0036a5cbd 100644 --- a/wire/extracted_peer_11_splice.patch +++ b/wire/extracted_peer_11_splice.patch @@ -2,20 +2,18 @@ diff --git a/wire/peer_wire.csv b/wire/peer_wire.csv index 5b5803afc..41b57e85b 100644 --- a/wire/peer_wire.csv +++ b/wire/peer_wire.csv -@@ -206,6 +206,20 @@ subtypedata,lease_rates,channel_fee_max_base_msat,tu32, +@@ -206,6 +206,18 @@ subtypedata,lease_rates,channel_fee_max_base_msat,tu32, msgtype,stfu,2 msgdata,stfu,channel_id,channel_id, msgdata,stfu,initiator,u8, -+msgtype,splice,75 ++msgtype,splice,80 +msgdata,splice,channel_id,channel_id, -+msgdata,splice,chain_hash,chain_hash, +msgdata,splice,relative_satoshis,s64, +msgdata,splice,funding_feerate_perkw,u32, +msgdata,splice,locktime,u32, +msgdata,splice,funding_pubkey,point, -+msgtype,splice_ack,76 ++msgtype,splice_ack,81 +msgdata,splice_ack,channel_id,channel_id, -+msgdata,splice_ack,chain_hash,chain_hash, +msgdata,splice_ack,relative_satoshis,s64, +msgdata,splice_ack,funding_pubkey,point, +msgtype,splice_locked,77, @@ -23,13 +21,14 @@ index 5b5803afc..41b57e85b 100644 msgtype,shutdown,38 msgdata,shutdown,channel_id,channel_id, msgdata,shutdown,len,u16, -@@ -264,6 +250,9 @@ msgdata,commitment_signed,channel_id,channel_id, +@@ -264,6 +250,10 @@ msgdata,commitment_signed,channel_id,channel_id, msgdata,commitment_signed,signature,signature, msgdata,commitment_signed,num_htlcs,u16, msgdata,commitment_signed,htlc_signature,signature,num_htlcs +msgdata,commitment_signed,splice_channel_id,commitment_signed_tlvs, +tlvtype,commitment_signed_tlvs,splice_info,0 -+tlvdata,commitment_signed_tlvs,splice_info,splice_channel_id,channel_id, ++tlvdata,commitment_signed_tlvs,splice_info,batch_size,u16, ++tlvdata,commitment_signed_tlvs,splice_info,funding_txid,channel_id, msgtype,revoke_and_ack,133 msgdata,revoke_and_ack,channel_id,channel_id, msgdata,revoke_and_ack,per_commitment_secret,byte,32