BOLT: catch up now Dual-funding is included.

Mainly we don't need to patch the spec anywhere near as much.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Makefile

@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := 8a64c6a1cef979b3f0cecb00ba7a48c2d28b3588
+DEFAULT_BOLTVERSION := 0bdaa8b9f65fc82a178d0d8722d352f2320b02f4
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 

channeld/test/run-commit_tx.c

@@ -564,7 +564,7 @@ int main(int argc, const char *argv[])
 	 * In the following:
 	 *  - *local* transactions are considered, which implies that all
 	 *    payments to *local* are delayed.
-	 *  - It's assumed that *local* is the funder.
+	 *  - It's assumed that *local* is the opener.
 	 *  - Private keys are displayed as 32 bytes plus a trailing 1
 	 *    (Bitcoin's convention for "compressed" private keys, i.e. keys for
 	 *    which the public key is compressed).

channeld/test/run-full_channel.c

@@ -381,7 +381,7 @@ int main(int argc, const char *argv[])
 	 * In the following:
 	 *  - *local* transactions are considered, which implies that all
 	 *    payments to *local* are delayed.
-	 *  - It's assumed that *local* is the funder.
+	 *  - It's assumed that *local* is the opener.
 	 *  - Private keys are displayed as 32 bytes plus a trailing 1
 	 *    (Bitcoin's convention for "compressed" private keys, i.e. keys for
 	 *    which the public key is compressed).

wire/extracted_peer_03_dual-funding.patch

@@ -1,111 +0,0 @@
---- wire/peer_wire.csv.raw	2023-09-11 13:32:30.677617251 +0930
-+++ wire/peer_wire.csv.openchannel2	2023-09-11 13:31:47.906308397 +0930
-@@ -37,6 +37,53 @@
- tlvdata,n2,tlv1,amount_msat,tu64,
- tlvtype,n2,tlv2,11
- tlvdata,n2,tlv2,cltv_expiry,tu32,
-+msgtype,tx_add_input,66
-+msgdata,tx_add_input,channel_id,channel_id,
-+msgdata,tx_add_input,serial_id,u64,
-+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,
-+msgtype,tx_add_output,67
-+msgdata,tx_add_output,channel_id,channel_id,
-+msgdata,tx_add_output,serial_id,u64,
-+msgdata,tx_add_output,sats,u64,
-+msgdata,tx_add_output,scriptlen,u16,
-+msgdata,tx_add_output,script,byte,scriptlen
-+msgtype,tx_remove_input,68
-+msgdata,tx_remove_input,channel_id,channel_id,
-+msgdata,tx_remove_input,serial_id,u64,
-+msgtype,tx_remove_output,69
-+msgdata,tx_remove_output,channel_id,channel_id,
-+msgdata,tx_remove_output,serial_id,u64,
-+msgtype,tx_complete,70
-+msgdata,tx_complete,channel_id,channel_id,
-+msgtype,tx_signatures,71
-+msgdata,tx_signatures,channel_id,channel_id,
-+msgdata,tx_signatures,txid,sha256,
-+msgdata,tx_signatures,num_witnesses,u16,
-+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,s64,
-+tlvtype,tx_init_rbf_tlvs,require_confirmed_inputs,2
-+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,s64,
-+tlvtype,tx_ack_rbf_tlvs,require_confirmed_inputs,2
-+msgtype,tx_abort,74
-+msgdata,tx_abort,channel_id,channel_id,
-+msgdata,tx_abort,len,u16,
-+msgdata,tx_abort,data,byte,len
- msgtype,open_channel,32
- msgdata,open_channel,chain_hash,chain_hash,
- msgdata,open_channel,temporary_channel_id,byte,32
-@@ -95,6 +140,54 @@
- msgdata,channel_ready,tlvs,channel_ready_tlvs,
- tlvtype,channel_ready_tlvs,short_channel_id,1
- tlvdata,channel_ready_tlvs,short_channel_id,alias,short_channel_id,
-+msgtype,open_channel2,64
-+msgdata,open_channel2,chain_hash,chain_hash,
-+msgdata,open_channel2,temporary_channel_id,channel_id,
-+msgdata,open_channel2,funding_feerate_perkw,u32,
-+msgdata,open_channel2,commitment_feerate_perkw,u32,
-+msgdata,open_channel2,funding_satoshis,u64,
-+msgdata,open_channel2,dust_limit_satoshis,u64,
-+msgdata,open_channel2,max_htlc_value_in_flight_msat,u64,
-+msgdata,open_channel2,htlc_minimum_msat,u64,
-+msgdata,open_channel2,to_self_delay,u16,
-+msgdata,open_channel2,max_accepted_htlcs,u16,
-+msgdata,open_channel2,locktime,u32,
-+msgdata,open_channel2,funding_pubkey,point,
-+msgdata,open_channel2,revocation_basepoint,point,
-+msgdata,open_channel2,payment_basepoint,point,
-+msgdata,open_channel2,delayed_payment_basepoint,point,
-+msgdata,open_channel2,htlc_basepoint,point,
-+msgdata,open_channel2,first_per_commitment_point,point,
-+msgdata,open_channel2,second_per_commitment_point,point,
-+msgdata,open_channel2,channel_flags,byte,
-+msgdata,open_channel2,tlvs,opening_tlvs,
-+tlvtype,opening_tlvs,upfront_shutdown_script,0
-+tlvdata,opening_tlvs,upfront_shutdown_script,shutdown_scriptpubkey,byte,...
-+tlvtype,opening_tlvs,channel_type,1
-+tlvdata,opening_tlvs,channel_type,type,byte,...
-+tlvtype,opening_tlvs,require_confirmed_inputs,2
-+msgtype,accept_channel2,65
-+msgdata,accept_channel2,temporary_channel_id,channel_id,
-+msgdata,accept_channel2,funding_satoshis,u64,
-+msgdata,accept_channel2,dust_limit_satoshis,u64,
-+msgdata,accept_channel2,max_htlc_value_in_flight_msat,u64,
-+msgdata,accept_channel2,htlc_minimum_msat,u64,
-+msgdata,accept_channel2,minimum_depth,u32,
-+msgdata,accept_channel2,to_self_delay,u16,
-+msgdata,accept_channel2,max_accepted_htlcs,u16,
-+msgdata,accept_channel2,funding_pubkey,point,
-+msgdata,accept_channel2,revocation_basepoint,point,
-+msgdata,accept_channel2,payment_basepoint,point,
-+msgdata,accept_channel2,delayed_payment_basepoint,point,
-+msgdata,accept_channel2,htlc_basepoint,point,
-+msgdata,accept_channel2,first_per_commitment_point,point,
-+msgdata,accept_channel2,second_per_commitment_point,point,
-+msgdata,accept_channel2,tlvs,accept_tlvs,
-+tlvtype,accept_tlvs,upfront_shutdown_script,0
-+tlvdata,accept_tlvs,upfront_shutdown_script,shutdown_scriptpubkey,byte,...
-+tlvtype,accept_tlvs,channel_type,1
-+tlvdata,accept_tlvs,channel_type,type,byte,...
-+tlvtype,accept_tlvs,require_confirmed_inputs,2
- msgtype,shutdown,38
- msgdata,shutdown,channel_id,channel_id,
- msgdata,shutdown,len,u16,

wire/extracted_peer_07_peer_storage.patch

@@ -1,9 +1,9 @@
 --- wire/peer_wire.csv	2022-07-18 13:49:29.079542016 +0530
 +++ -	2022-07-18 13:58:17.706696582 +0530
 @@ -249,6 +249,12 @@
- msgdata,channel_reestablish,next_revocation_number,u64,
- msgdata,channel_reestablish,your_last_per_commitment_secret,byte,32
  msgdata,channel_reestablish,my_current_per_commitment_point,point,
+ tlvtype,channel_reestablish_tlvs,next_funding,0
+ tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
 +msgtype,peer_storage,7
 +msgdata,peer_storage,len,u16,
 +msgdata,peer_storage,blob,byte,len

wire/extracted_peer_10_upgradable.patch

@@ -1,10 +1,11 @@
 --- wire/peer_wire.csv	2021-05-09 15:44:59.166135652 +0930
 +++ wire/peer_wire.csv.raw	2021-05-11 09:59:31.695459756 +0930
-@@ -244,6 +140,17 @@
+@@ -244,8 +140,18 @@
  msgdata,channel_reestablish,next_revocation_number,u64,
  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_funding,0
 +tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
 +tlvtype,channel_reestablish_tlvs,next_to_send,1

wire/peer_wire.csv

@@ -285,7 +285,8 @@ msgdata,channel_reestablish,next_commitment_number,u64,
 msgdata,channel_reestablish,next_revocation_number,u64,
 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_funding,0
 tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
 tlvtype,channel_reestablish_tlvs,next_to_send,1