--- wire/peer_wire.csv	2023-06-29 14:36:10.986268579 -0500
+++ -	2023-06-29 14:37:45.737004393 -0500
@@ -62,25 +62,22 @@
 msgdata,tx_signatures,channel_id,channel_id,
 msgdata,tx_signatures,txid,sha256,
 msgdata,tx_signatures,num_witnesses,u16,
-msgdata,tx_signatures,witnesses,witness_stack,num_witnesses
-subtype,witness_stack
-subtypedata,witness_stack,num_witness_elements,u16,
-subtypedata,witness_stack,witness_elements,witness_element,num_witness_elements
-subtype,witness_element
-subtypedata,witness_element,len,u16,
-subtypedata,witness_element,witness_data,byte,len
+msgdata,tx_signatures,witnesses,witness,num_witnesses
+subtype,witness
+subtypedata,witness,len,u16,
+subtypedata,witness,witness_data,byte,len
 msgtype,tx_init_rbf,72
 msgdata,tx_init_rbf,channel_id,channel_id,
 msgdata,tx_init_rbf,locktime,u32,
 msgdata,tx_init_rbf,feerate,u32,
 msgdata,tx_init_rbf,tlvs,tx_init_rbf_tlvs,
 tlvtype,tx_init_rbf_tlvs,funding_output_contribution,0
-tlvdata,tx_init_rbf_tlvs,funding_output_contribution,satoshis,tu64,
+tlvdata,tx_init_rbf_tlvs,funding_output_contribution,satoshis,s64,
 msgtype,tx_ack_rbf,73
 msgdata,tx_ack_rbf,channel_id,channel_id,
 msgdata,tx_ack_rbf,tlvs,tx_ack_rbf_tlvs,
 tlvtype,tx_ack_rbf_tlvs,funding_output_contribution,0
-tlvdata,tx_ack_rbf_tlvs,funding_output_contribution,satoshis,tu64,
+tlvdata,tx_ack_rbf_tlvs,funding_output_contribution,satoshis,s64,
 msgtype,tx_abort,74
 msgdata,tx_abort,channel_id,channel_id,
 msgdata,tx_abort,len,u16,
@@ -257,6 +235,8 @@
 msgdata,channel_reestablish,your_last_per_commitment_secret,byte,32
 msgdata,channel_reestablish,my_current_per_commitment_point,point,
 msgdata,channel_reestablish,tlvs,channel_reestablish_tlvs,
+tlvtype,channel_reestablish_tlvs,next_funding,0
+tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
 tlvtype,channel_reestablish_tlvs,next_to_send,1
 tlvdata,channel_reestablish_tlvs,next_to_send,commitment_number,tu64,
 tlvtype,channel_reestablish_tlvs,desired_channel_type,3