Merge pull request #49 from lightning-signer/2021-12-wallet-metadata-optional

Cleanup to match 2021-12-wallet-index branch

Author: ksedgwic

channeld/Makefile

@@ -74,7 +74,7 @@ CHANNELD_COMMON_OBJS :=				\
 	common/per_peer_state.o			\
 	common/permute_tx.o			\
 	common/ping.o				\
-	common/psbt_internal.o		\
+	common/psbt_keypath.o		\
 	common/psbt_open.o			\
 	common/private_channel_announcement.o	\
 	common/pseudorand.o			\

channeld/channeld.c

@@ -139,8 +139,8 @@ struct peer {
 	u32 fee_per_satoshi;
 
 	/* The scriptpubkey to use for shutting down. */
-	u32 final_index;
-	struct ext_key final_ext_key;
+	u32 *final_index;
+	struct ext_key *final_ext_key;
 	u8 *final_scriptpubkey;
 
 	/* If master told us to shut down */
@@ -1848,7 +1848,7 @@ static u8 *got_revoke_msg(struct peer *peer, u64 revoke_num,
 	if (pbase) {
 		ptx = penalty_tx_create(
 		    NULL, peer->channel, peer->feerate_penalty,
-		    peer->final_index, &peer->final_ext_key,
+		    peer->final_index, peer->final_ext_key,
 		    peer->final_scriptpubkey, per_commitment_secret,
 		    &pbase->txid, pbase->outnum, pbase->amount,
 		    HSM_FD);
@@ -3655,15 +3655,23 @@ static void handle_fail(struct peer *peer, const u8 *inmsg)
 
 static void handle_shutdown_cmd(struct peer *peer, const u8 *inmsg)
 {
+	u32 *final_index;
+	struct ext_key *final_ext_key;
 	u8 *local_shutdown_script;
 
 	if (!fromwire_channeld_send_shutdown(peer, inmsg,
-					     &peer->final_index,
-					     &peer->final_ext_key,
+					     &final_index,
+					     &final_ext_key,
 					     &local_shutdown_script,
 					     &peer->shutdown_wrong_funding))
 		master_badmsg(WIRE_CHANNELD_SEND_SHUTDOWN, inmsg);
 
+	tal_free(peer->final_index);
+	peer->final_index = final_index;
+
+	tal_free(peer->final_ext_key);
+	peer->final_ext_key = final_ext_key;
+
 	tal_free(peer->final_scriptpubkey);
 	peer->final_scriptpubkey = local_shutdown_script;
 
@@ -3902,6 +3910,8 @@ static void init_channel(struct peer *peer)
 	enum side opener;
 	struct existing_htlc **htlcs;
 	bool reconnected;
+	u32 final_index;
+	struct ext_key final_ext_key;
 	u8 *fwd_msg;
 	const u8 *msg;
 	struct fee_states *fee_states;
@@ -3964,8 +3974,8 @@ static void init_channel(struct peer *peer)
 				   &reconnected,
 				   &peer->send_shutdown,
 				   &peer->shutdown_sent[REMOTE],
-				   &peer->final_index,
-				   &peer->final_ext_key,
+				   &final_index,
+				   &final_ext_key,
 				   &peer->final_scriptpubkey,
 				   &peer->channel_flags,
 				   &fwd_msg,
@@ -3983,6 +3993,9 @@ static void init_channel(struct peer *peer)
 		master_badmsg(WIRE_CHANNELD_INIT, msg);
 	}
 
+	peer->final_index = tal_dup(peer, u32, &final_index);
+	peer->final_ext_key = tal_dup(peer, struct ext_key, &final_ext_key);
+
 	status_debug("option_static_remotekey = %u, option_anchor_outputs = %u",
 		     channel_type_has(channel_type, OPT_STATIC_REMOTEKEY),
 		     channel_type_has(channel_type, OPT_ANCHOR_OUTPUTS));

channeld/channeld_wire.csv

@@ -175,10 +175,11 @@ msgdata,channeld_got_revoke,penalty_tx,?bitcoin_tx,
 # (eg. if we sent another commitment_signed, that would implicitly ack).
 msgtype,channeld_got_revoke_reply,1122
 
+#include <wally_bip32.h>
 # Tell peer to shut down channel.
 msgtype,channeld_send_shutdown,1023
-msgdata,channeld_send_shutdown,final_index,u32,
-msgdata,channeld_send_shutdown,final_ext_key,ext_key,
+msgdata,channeld_send_shutdown,final_index,?u32,
+msgdata,channeld_send_shutdown,final_ext_key,?ext_key,
 msgdata,channeld_send_shutdown,shutdown_len,u16,
 msgdata,channeld_send_shutdown,shutdown_scriptpubkey,u8,shutdown_len
 msgdata,channeld_send_shutdown,wrong_funding,?bitcoin_outpoint,

channeld/commit_tx.c

@@ -285,7 +285,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 	 *    `dust_limit_satoshis`, add a [`to_remote`
 	 *    output](#to_remote-output).
 	 */
-	const u8 *redeem = NULL;
+	u8 *redeem = NULL;
 	if (amount_msat_greater_eq_sat(other_pay, dust_limit)) {
 		struct amount_sat amount = amount_msat_to_sat_round_down(other_pay);
 		u8 *scriptpubkey;
@@ -325,7 +325,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 			scriptpubkey = scriptpubkey_p2wpkh(tmpctx,
 							   &keyset->other_payment_key);
 		}
-		pos = bitcoin_tx_add_output(tx, scriptpubkey, (u8 *) redeem, amount);
+		pos = bitcoin_tx_add_output(tx, scriptpubkey, redeem, amount);
 		assert(pos == n);
 		(*htlcmap)[n] = direct_outputs ? dummy_to_remote : NULL;
 		/* We don't assign cltvs[n]: if we use it, order doesn't matter.

channeld/watchtower.c

@@ -5,7 +5,7 @@
 #include <common/features.h>
 #include <common/htlc_tx.h>
 #include <common/keyset.h>
-#include <common/psbt_internal.h>
+#include <common/psbt_keypath.h>
 #include <common/status.h>
 #include <common/type_to_string.h>
 #include <hsmd/hsmd_wiregen.h>
@@ -17,7 +17,7 @@ const struct bitcoin_tx *
 penalty_tx_create(const tal_t *ctx,
 		  const struct channel *channel,
 		  u32 penalty_feerate,
-		  u32 final_index,
+		  u32 *final_index,
 		  struct ext_key *final_ext_key,
 		  u8 *final_scriptpubkey,
 		  const struct secret *revocation_preimage,
@@ -78,7 +78,9 @@ penalty_tx_create(const tal_t *ctx,
 			     NULL, to_them_sats, NULL, wscript);
 
 	bitcoin_tx_add_output(tx, final_scriptpubkey, NULL, to_them_sats);
-	psbt_add_keypath_to_last_output(tx, final_index, final_ext_key);
+	assert((final_index == NULL) == (final_ext_key == NULL));
+	if (final_index)
+		psbt_add_keypath_to_last_output(tx, *final_index, final_ext_key);
 
 	/* Worst-case sig is 73 bytes */
 	weight = bitcoin_tx_weight(tx) + 1 + 3 + 73 + 0 + tal_count(wscript);

channeld/watchtower.h

@@ -9,7 +9,7 @@ const struct bitcoin_tx *
 penalty_tx_create(const tal_t *ctx,
 		  const struct channel *channel,
 		  u32 penalty_feerate,
-		  u32 final_index,
+		  u32 *final_index,
 		  struct ext_key *final_ext_key,
 		  u8 *final_scriptpubkey,
 		  const struct secret *revocation_preimage,

closingd/Makefile

@@ -48,7 +48,7 @@ CLOSINGD_COMMON_OBJS :=				\
 	common/per_peer_state.o			\
 	common/permute_tx.o			\
 	common/ping.o				\
-	common/psbt_internal.o			\
+	common/psbt_keypath.o			\
 	common/psbt_open.o			\
 	common/pseudorand.o			\
 	common/read_peer_msg.o			\

closingd/closingd.c

@@ -54,7 +54,7 @@ static struct bitcoin_tx *close_tx(const tal_t *ctx,
 				   const struct chainparams *chainparams,
 				   struct per_peer_state *pps,
 				   const struct channel_id *channel_id,
-				   u32 local_wallet_index,
+				   u32 *local_wallet_index,
 				   const struct ext_key *local_wallet_ext_key,
 				   u8 *scriptpubkey[NUM_SIDES],
 				   const struct bitcoin_outpoint *funding,
@@ -150,7 +150,7 @@ static void send_offer(struct per_peer_state *pps,
 		       const struct channel_id *channel_id,
 		       const struct pubkey funding_pubkey[NUM_SIDES],
 		       const u8 *funding_wscript,
-		       u32 local_wallet_index,
+		       u32 *local_wallet_index,
 		       const struct ext_key *local_wallet_ext_key,
 		       u8 *scriptpubkey[NUM_SIDES],
 		       const struct bitcoin_outpoint *funding,
@@ -249,7 +249,7 @@ receive_offer(struct per_peer_state *pps,
 	      const struct channel_id *channel_id,
 	      const struct pubkey funding_pubkey[NUM_SIDES],
 	      const u8 *funding_wscript,
-	      u32 local_wallet_index,
+	      u32 *local_wallet_index,
 	      const struct ext_key *local_wallet_ext_key,
 	      u8 *scriptpubkey[NUM_SIDES],
 	      const struct bitcoin_outpoint *funding,
@@ -590,7 +590,7 @@ static size_t closing_tx_weight_estimate(u8 *scriptpubkey[NUM_SIDES],
 					 const struct amount_sat *out,
 					 struct amount_sat funding_sats,
 					 struct amount_sat dust_limit,
-					 u32 local_wallet_index,
+					 u32 *local_wallet_index,
 					 const struct ext_key *local_wallet_ext_key)
 {
 	/* We create a dummy close */
@@ -717,7 +717,7 @@ static void do_quickclose(struct amount_sat offer[NUM_SIDES],
 			  const struct channel_id *channel_id,
 			  const struct pubkey funding_pubkey[NUM_SIDES],
 			  const u8 *funding_wscript,
-			  u32 local_wallet_index,
+			  u32 *local_wallet_index,
 			  const struct ext_key *local_wallet_ext_key,
 			  u8 *scriptpubkey[NUM_SIDES],
 			  const struct bitcoin_outpoint *funding,
@@ -902,8 +902,8 @@ int main(int argc, char *argv[])
 	u32 min_feerate, initial_feerate, *max_feerate;
 	struct feerange feerange;
 	enum side opener;
-	u32 local_wallet_index;
-	struct ext_key local_wallet_ext_key;
+	u32 *local_wallet_index;
+	struct ext_key *local_wallet_ext_key;
 	u8 *scriptpubkey[NUM_SIDES], *funding_wscript;
 	u64 fee_negotiation_step;
 	u8 fee_negotiation_step_unit;
@@ -957,7 +957,7 @@ int main(int argc, char *argv[])
 						   out, funding_sats,
 						   our_dust_limit,
 						   local_wallet_index,
-						   &local_wallet_ext_key),
+						   local_wallet_ext_key),
 			min_feerate, initial_feerate, max_feerate,
 			commitment_fee, funding_sats, opener,
 			&min_fee_to_accept, &offer[LOCAL], &max_fee_to_accept);
@@ -1015,7 +1015,7 @@ int main(int argc, char *argv[])
 		if (whose_turn == LOCAL) {
 			send_offer(pps, chainparams,
 				   &channel_id, funding_pubkey, funding_wscript,
-				   local_wallet_index, &local_wallet_ext_key,
+				   local_wallet_index, local_wallet_ext_key,
 				   scriptpubkey, &funding,
 				   funding_sats, out, opener,
 				   our_dust_limit,
@@ -1038,7 +1038,7 @@ int main(int argc, char *argv[])
 						&channel_id, funding_pubkey,
 						funding_wscript,
 						local_wallet_index,
-						&local_wallet_ext_key,
+						local_wallet_ext_key,
 						scriptpubkey, &funding,
 						funding_sats,
 						out, opener,
@@ -1052,7 +1052,7 @@ int main(int argc, char *argv[])
 				do_quickclose(offer,
 					      pps, &channel_id, funding_pubkey,
 					      funding_wscript,
-					      local_wallet_index, &local_wallet_ext_key,
+					      local_wallet_index, local_wallet_ext_key,
 					      scriptpubkey,
 					      &funding,
 					      funding_sats, out, opener,
@@ -1087,7 +1087,7 @@ int main(int argc, char *argv[])
 			send_offer(pps, chainparams, &channel_id,
 				   funding_pubkey, funding_wscript,
 				   local_wallet_index,
-				   &local_wallet_ext_key,
+				   local_wallet_ext_key,
 				   scriptpubkey, &funding,
 				   funding_sats, out, opener,
 				   our_dust_limit,
@@ -1105,7 +1105,7 @@ int main(int argc, char *argv[])
 						funding_pubkey,
 						funding_wscript,
 						local_wallet_index,
-						&local_wallet_ext_key,
+						local_wallet_ext_key,
 						scriptpubkey, &funding,
 						funding_sats,
 						out, opener,

closingd/closingd_wire.csv

@@ -5,6 +5,7 @@
 #include <common/htlc_wire.h>
 #include <common/per_peer_state.h>
 #include <common/status_wire.h>
+#include <wally_bip32.h>
 # Begin!  (passes peer fd, gossipd-client fd)
 msgtype,closingd_init,2001
 msgdata,closingd_init,chainparams,chainparams,
@@ -22,8 +23,8 @@ msgdata,closingd_init,min_feerate_perksipa,u32,
 msgdata,closingd_init,preferred_feerate_perksipa,u32,
 msgdata,closingd_init,max_feerate_perksipa,?u32,
 msgdata,closingd_init,fee_limit_satoshi,amount_sat,
-msgdata,closingd_init,local_wallet_index,u32,
-msgdata,closingd_init,local_wallet_ext_key,ext_key,
+msgdata,closingd_init,local_wallet_index,?u32,
+msgdata,closingd_init,local_wallet_ext_key,?ext_key,
 msgdata,closingd_init,local_scriptpubkey_len,u16,
 msgdata,closingd_init,local_scriptpubkey,u8,local_scriptpubkey_len
 msgdata,closingd_init,remote_scriptpubkey_len,u16,

common/Makefile

@@ -68,7 +68,7 @@ COMMON_SRC_NOGEN :=				\
 	common/peer_failed.c			\
 	common/permute_tx.c			\
 	common/ping.c				\
-	common/psbt_internal.c			\
+	common/psbt_keypath.c			\
 	common/psbt_open.c			\
 	common/private_channel_announcement.c	\
 	common/pseudorand.c			\