rebase fixes 2021-09-07

Author: ksedgwic

channeld/commit_tx.c

@@ -268,6 +268,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;
 	if (amount_msat_greater_eq_sat(other_pay, dust_limit)) {
 		struct amount_sat amount = amount_msat_to_sat_round_down(other_pay);
 		u8 *scriptpubkey;
@@ -286,11 +287,10 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 		 * Otherwise, this output is a simple P2WPKH to `remotepubkey`.
 		 */
 		if (option_anchor_outputs) {
-			const u8 *redeem
-				= anchor_to_remote_redeem(tmpctx,
-							  &keyset->other_payment_key,
-							  (!side) == lessor ?
-								csv_lock : 1);
+			redeem = anchor_to_remote_redeem(tmpctx,
+							 &keyset->other_payment_key,
+							 (!side) == lessor ?
+							 csv_lock : 1);
 			/* BOLT- #3:
 			 * ##### Leased channel (`option_will_fund`)
 			 *
@@ -308,7 +308,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, redeem, amount);
+		pos = bitcoin_tx_add_output(tx, scriptpubkey, (u8 *) 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.

closingd/closingd.c

@@ -588,7 +588,9 @@ static size_t closing_tx_weight_estimate(u8 *scriptpubkey[NUM_SIDES],
 					 const u8 *funding_wscript,
 					 const struct amount_sat *out,
 					 struct amount_sat funding_sats,
-					 struct amount_sat dust_limit)
+					 struct amount_sat dust_limit,
+					 u32 local_wallet_index,
+					 const struct ext_key *local_wallet_ext_key)
 {
 	/* We create a dummy close */
 	struct bitcoin_tx *tx;
@@ -600,6 +602,7 @@ static size_t closing_tx_weight_estimate(u8 *scriptpubkey[NUM_SIDES],
 
 	memset(&dummy_funding, 0, sizeof(dummy_funding));
 	tx = create_close_tx(tmpctx, chainparams,
+			     local_wallet_index, local_wallet_ext_key,
 			     scriptpubkey[LOCAL], scriptpubkey[REMOTE],
 			     funding_wscript,
 			     &dummy_funding,

closingd/closingd_wire.csv

@@ -22,7 +22,6 @@ 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,initial_fee_satoshi,amount_sat,
 msgdata,closingd_init,local_wallet_index,u32,
 msgdata,closingd_init,local_wallet_ext_key,ext_key,
 msgdata,closingd_init,local_scriptpubkey_len,u16,

common/initial_commit_tx.c

@@ -242,19 +242,19 @@ struct bitcoin_tx *initial_commit_tx(const tal_t *ctx,
 		 */
 		u8 *scriptpubkey;
 		int pos;
+		const u8 *redeem = NULL;
 
 		amount = amount_msat_to_sat_round_down(other_pay);
 		if (option_anchor_outputs) {
-			const u8 *redeem
-				= anchor_to_remote_redeem(tmpctx,
+			redeem = anchor_to_remote_redeem(tmpctx,
 						&keyset->other_payment_key,
 						(!side) == lessor ? csv_lock : 1);
 			scriptpubkey = scriptpubkey_p2wsh(tmpctx, redeem);
 		} else {
 			scriptpubkey = scriptpubkey_p2wpkh(tmpctx,
 							   &keyset->other_payment_key);
 		}
-		pos = bitcoin_tx_add_output(tx, scriptpubkey, redeem, amount);
+		pos = bitcoin_tx_add_output(tx, scriptpubkey, (u8 *) redeem, amount);
 		assert(pos == n);
 		output_order[n] = dummy_remote;
 		n++;

contrib/remote_hsmd/hsmd.c

@@ -1593,6 +1593,28 @@ static struct io_plan *handle_sign_message(struct io_conn *conn,
 			 take(towire_hsmd_sign_message_reply(NULL, &rsig)));
 }
 
+/*~ lightningd asks us to sign a liquidity ad offer */
+static struct io_plan *handle_sign_option_will_fund_offer(struct io_conn *conn,
+					      struct client *c,
+					      const u8 *msg_in)
+{
+	struct pubkey funding_pubkey;
+	u32 lease_expiry, channel_fee_base_max_msat;
+	u16 channel_fee_max_ppt;
+
+	if (!fromwire_hsmd_sign_option_will_fund_offer(msg_in,
+						       &funding_pubkey,
+						       &lease_expiry,
+						       &channel_fee_base_max_msat,
+						       &channel_fee_max_ppt))
+		return bad_req(conn, c, msg_in);
+
+	status_failed(STATUS_FAIL_INTERNAL_ERROR,
+		      "handle_sign_option_will_fund_offer unimplemented");
+	return bad_req_fmt(conn, c, msg_in,
+			   "handle_sign_option_will_fund_offer unimplemented");
+}
+
 /*~ lightningd asks us to sign a bolt12 (e.g. offer). */
 static struct io_plan *handle_sign_bolt12(struct io_conn *conn,
 					   struct client *c,
@@ -1688,6 +1710,9 @@ static bool check_client_capabilities(struct client *client,
 	case WIRE_HSMD_SIGN_MUTUAL_CLOSE_TX:
 		return (client->capabilities & HSM_CAP_SIGN_CLOSING_TX) != 0;
 
+	case WIRE_HSMD_SIGN_OPTION_WILL_FUND_OFFER:
+		return (client->capabilities & HSM_CAP_SIGN_WILL_FUND_OFFER) != 0;
+
 	case WIRE_HSMD_INIT:
 	case WIRE_HSMD_NEW_CHANNEL:
 	case WIRE_HSMD_CLIENT_HSMFD:
@@ -1719,6 +1744,7 @@ static bool check_client_capabilities(struct client *client,
 	case WIRE_HSMD_VALIDATE_COMMITMENT_TX_REPLY:
 	case WIRE_HSMD_VALIDATE_REVOCATION_REPLY:
 	case WIRE_HSMD_SIGN_TX_REPLY:
+	case WIRE_HSMD_SIGN_OPTION_WILL_FUND_OFFER_REPLY:
 	case WIRE_HSMD_GET_PER_COMMITMENT_POINT_REPLY:
 	case WIRE_HSMD_CHECK_FUTURE_SECRET_REPLY:
 	case WIRE_HSMD_GET_CHANNEL_BASEPOINTS_REPLY:
@@ -1830,6 +1856,9 @@ static struct io_plan *handle_client(struct io_conn *conn, struct client *c)
 	case WIRE_HSMD_SIGN_MESSAGE:
 		return handle_sign_message(conn, c, c->msg_in);
 
+	case WIRE_HSMD_SIGN_OPTION_WILL_FUND_OFFER:
+		return handle_sign_option_will_fund_offer(conn, c, c->msg_in);
+
 	case WIRE_HSMD_SIGN_BOLT12:
 		return handle_sign_bolt12(conn, c, c->msg_in);
 #if DEVELOPER
@@ -1853,6 +1882,7 @@ static struct io_plan *handle_client(struct io_conn *conn, struct client *c)
 	case WIRE_HSMD_VALIDATE_COMMITMENT_TX_REPLY:
 	case WIRE_HSMD_VALIDATE_REVOCATION_REPLY:
 	case WIRE_HSMD_SIGN_TX_REPLY:
+	case WIRE_HSMD_SIGN_OPTION_WILL_FUND_OFFER_REPLY:
 	case WIRE_HSMD_GET_PER_COMMITMENT_POINT_REPLY:
 	case WIRE_HSMD_CHECK_FUTURE_SECRET_REPLY:
 	case WIRE_HSMD_GET_CHANNEL_BASEPOINTS_REPLY: