dual funding -> API changes/breakage

channeld/channeld.c

@@ -2270,13 +2270,14 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_TX_ADD_OUTPUT:
 	case WIRE_TX_REMOVE_OUTPUT:
 	case WIRE_TX_COMPLETE:
+	case WIRE_TX_ABORT:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
 	case WIRE_TX_SIGNATURES:
 		handle_unexpected_tx_sigs(peer, msg);
 		return;
-	case WIRE_INIT_RBF:
-	case WIRE_ACK_RBF:
+	case WIRE_TX_INIT_RBF:
+	case WIRE_TX_ACK_RBF:
 		break;
 
 	case WIRE_CHANNEL_REESTABLISH:

common/channel_type.c

@@ -61,6 +61,10 @@ struct channel_type *default_channel_type(const tal_t *ctx,
 	if (feature_negotiated(our_features, their_features,
 			       OPT_ANCHOR_OUTPUTS))
 		return channel_type_anchor_outputs(ctx);
+	else if (feature_negotiated(our_features, their_features,
+				    OPT_DUAL_FUND))
+		/* OPT_DUAL_FUND implies static remotekey */
+		return channel_type_static_remotekey(ctx);
 	/* BOLT #2:
 	 * - otherwise, if `option_static_remotekey` was negotiated:
 	 *   - the `channel_type` is `option_static_remotekey` (bit 12)

common/features.c

@@ -171,9 +171,9 @@ static const struct dependency feature_deps[] = {
 	/* BOLT-f53ca2301232db780843e894f55d95d512f297f9 #9:
 	 * Name                | Description  | Context  | Dependencies  |
 	 * ...
-	 * `option_dual_fund`  | ...          | ...      | `option_anchor_outputs`
+	 * `option_dual_fund`  | ...          | ...      | `option_static_remotekey`
 	 */
-	{ OPT_DUAL_FUND, OPT_ANCHOR_OUTPUTS },
+	{ OPT_DUAL_FUND, OPT_STATIC_REMOTEKEY },
 	/* BOLT-route-blinding #9:
 	 * Name                | Description  | Context  | Dependencies  |
 	 * ...

connectd/connectd.c

@@ -47,6 +47,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <wire/wire_io.h>
 #include <wire/wire_sync.h>
 
 /*~ We are passed two file descriptors when exec'ed from `lightningd`: the
@@ -305,8 +306,8 @@ struct io_plan *peer_connected(struct io_conn *conn,
 		status_peer_unusual(id, "Unsupported feature %u", unsup);
 		msg = towire_warningfmt(NULL, NULL, "Unsupported feature %u",
 					unsup);
-		msg = cryptomsg_encrypt_msg(tmpctx, cs, take(msg));
-		return io_write(conn, msg, tal_count(msg), io_close_cb, NULL);
+		msg = cryptomsg_encrypt_msg(NULL, cs, take(msg));
+		return io_write_wire(conn, take(msg), io_close_cb, NULL);
 	}
 
 	if (!feature_check_depends(their_features, &depender, &missing)) {
@@ -315,8 +316,8 @@ struct io_plan *peer_connected(struct io_conn *conn,
 		msg = towire_warningfmt(NULL, NULL,
 				      "Feature %zu requires feature %zu",
 				      depender, missing);
-		msg = cryptomsg_encrypt_msg(tmpctx, cs, take(msg));
-		return io_write(conn, msg, tal_count(msg), io_close_cb, NULL);
+		msg = cryptomsg_encrypt_msg(NULL, cs, take(msg));
+		return io_write_wire(conn, take(msg), io_close_cb, NULL);
 	}
 
 	/* We've successfully connected. */

connectd/gossip_rcvd_filter.c

@@ -84,10 +84,11 @@ static bool is_msg_gossip_broadcast(const u8 *cursor)
 	case WIRE_TX_REMOVE_OUTPUT:
 	case WIRE_TX_COMPLETE:
 	case WIRE_TX_SIGNATURES:
+	case WIRE_TX_INIT_RBF:
+	case WIRE_TX_ACK_RBF:
+	case WIRE_TX_ABORT:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
-	case WIRE_INIT_RBF:
-	case WIRE_ACK_RBF:
 #if EXPERIMENTAL_FEATURES
 	case WIRE_STFU:
 #endif

connectd/gossip_store.c

@@ -71,8 +71,9 @@ static bool public_msg_type(enum peer_wire type)
 	case WIRE_CHANNEL_READY:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
-	case WIRE_INIT_RBF:
-	case WIRE_ACK_RBF:
+	case WIRE_TX_INIT_RBF:
+	case WIRE_TX_ACK_RBF:
+	case WIRE_TX_ABORT:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
 	case WIRE_UPDATE_ADD_HTLC:

connectd/multiplex.c

@@ -355,6 +355,7 @@ static bool is_urgent(enum peer_wire type)
 	case WIRE_TX_REMOVE_INPUT:
 	case WIRE_TX_REMOVE_OUTPUT:
 	case WIRE_TX_COMPLETE:
+	case WIRE_TX_ABORT:
 	case WIRE_TX_SIGNATURES:
 	case WIRE_OPEN_CHANNEL:
 	case WIRE_ACCEPT_CHANNEL:
@@ -363,8 +364,8 @@ static bool is_urgent(enum peer_wire type)
 	case WIRE_CHANNEL_READY:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
-	case WIRE_INIT_RBF:
-	case WIRE_ACK_RBF:
+	case WIRE_TX_INIT_RBF:
+	case WIRE_TX_ACK_RBF:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
 	case WIRE_UPDATE_ADD_HTLC:

doc/index.rst

@@ -125,6 +125,7 @@ Core Lightning Documentation
    lightning-txprepare <lightning-txprepare.7.md>
    lightning-txsend <lightning-txsend.7.md>
    lightning-unreserveinputs <lightning-unreserveinputs.7.md>
+   lightning-upgradewallet <lightning-upgradewallet.7.md>
    lightning-utxopsbt <lightning-utxopsbt.7.md>
    lightning-waitanyinvoice <lightning-waitanyinvoice.7.md>
    lightning-waitblockheight <lightning-waitblockheight.7.md>

doc/lightning-fundpsbt.7.md

@@ -47,6 +47,9 @@ the actual witness weight will be used.
 *excess\_as\_change* is an optional boolean to flag to add a change output
 for the excess sats.
 
+*nonwrapped* is an optional boolean to signal to filter out any p2sh-wrapped
+inputs from funding this PSBT.
+
 EXAMPLE USAGE
 -------------
 

doc/lightning-upgradewallet.7.md

@@ -0,0 +1,58 @@
+lightning-upgradewallet -- Command to spend all P2SH-wrapped inputs into a Native Segwit output
+================================================================
+
+SYNOPSIS
+--------
+
+**upgradewallet** [*feerate*] [*reservedok*]
+
+DESCRIPTION
+-----------
+
+`upgradewallet` is a convenience RPC which will spend all p2sh-wrapped
+Segwit deposits in a wallet into a single Native Segwit P2WPKH address.
+
+*feerate* can be one of the feerates listed in lightning-feerates(7),
+or one of the strings *urgent* (aim for next block), *normal* (next 4
+blocks or so) or *slow* (next 100 blocks or so) to use lightningd's
+internal estimates.  It can also be a *feerate* is a number, with an
+optional suffix: *perkw* means the number is interpreted as
+satoshi-per-kilosipa (weight), and *perkb* means it is interpreted
+bitcoind-style as satoshi-per-kilobyte. Omitting the suffix is
+equivalent to *perkb*.
+
+*reservedok* tells the wallet to include all P2SH-wrapped inputs, including
+reserved ones.
+
+EXAMPLE USAGE
+-------------
+
+The caller is trying to buy a liquidity ad but the command keeps failing.
+They have funds in their wallet, but they're all P2SH-wrapped outputs.
+
+The caller can call `upgradewallet` to convert their funds to native segwit
+outputs, which are valid for liquidity ad buys.
+
+RETURN VALUE
+------------
+
+[comment]: # (GENERATE-FROM-SCHEMA-START)
+[comment]: # (GENERATE-FROM-SCHEMA-END)
+
+
+AUTHOR
+------
+
+~niftynei~ <<[email protected]>> is mainly responsible.
+
+SEE ALSO
+--------
+
+lightning-utxopsbt(7), lightning-reserveinputs(7), lightning-unreserveinputs(7).
+
+RESOURCES
+---------
+
+Main web site: <https://github.com/ElementsProject/lightning>
+
+[comment]: # ( SHA256STAMP:0f290582f49c6103258b7f781a9e7fa4075ec6c05335a459a91da0b6fd58c68d)

doc/schemas/upgradewallet.request.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "required": [],
+  "additionalProperties": false,
+  "properties": {
+    "feerate": {
+      "type": "feerate",
+      "description": "Feerate for the upgrade transaction",
+      "added": "v23.02"
+    },
+    "reservedok": {
+      "type": "boolean",
+      "description": "Include already reserved funds or not",
+      "added": "v23.02"
+    }
+  }
+}

doc/schemas/upgradewallet.schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "upgraded_outs"
+  ],
+  "properties": {
+    "upgraded_outs": {
+      "type": "u64",
+      "description": "Count of spent/upgraded UTXOs",
+      "added": "v23.02"
+    },
+    "psbt": {
+      "type": "string",
+      "description": "The PSBT that was finalized and sent",
+      "added": "v23.02"
+    },
+    "tx": {
+      "type": "hex",
+      "description": "The raw transaction which was sent",
+      "added": "v23.02"
+    },
+    "txid": {
+      "type": "txid",
+      "description": "The txid of the **tx**",
+      "added": "v23.02"
+    }
+  }
+}

gossipd/gossipd.c

@@ -562,11 +562,12 @@ static void handle_recv_gossip(struct daemon *daemon, const u8 *outermsg)
 	case WIRE_TX_ADD_OUTPUT:
 	case WIRE_TX_REMOVE_OUTPUT:
 	case WIRE_TX_COMPLETE:
+	case WIRE_TX_ABORT:
 	case WIRE_TX_SIGNATURES:
+	case WIRE_TX_INIT_RBF:
+	case WIRE_TX_ACK_RBF:
 	case WIRE_OPEN_CHANNEL2:
 	case WIRE_ACCEPT_CHANNEL2:
-	case WIRE_INIT_RBF:
-	case WIRE_ACK_RBF:
 	case WIRE_ONION_MESSAGE:
 #if EXPERIMENTAL_FEATURES
 	case WIRE_STFU:

lightningd/channel.c

@@ -135,7 +135,8 @@ new_inflight(struct channel *channel,
 	     const secp256k1_ecdsa_signature *lease_commit_sig,
 	     const u32 lease_chan_max_msat, const u16 lease_chan_max_ppt,
 	     const u32 lease_blockheight_start,
-	     const struct amount_msat lease_fee)
+	     const struct amount_msat lease_fee,
+	     const struct amount_sat lease_amt)
 {
 	struct wally_psbt *last_tx_psbt_clone;
 	struct channel_inflight *inflight
@@ -169,6 +170,7 @@ new_inflight(struct channel *channel,
 	inflight->lease_chan_max_msat = lease_chan_max_msat;
 	inflight->lease_chan_max_ppt = lease_chan_max_ppt;
 	inflight->lease_fee = lease_fee;
+	inflight->lease_amt = lease_amt;
 
 	list_add_tail(&channel->inflights, &inflight->list);
 	tal_add_destructor(inflight, destroy_inflight);
@@ -250,11 +252,10 @@ struct channel *new_unsaved_channel(struct peer *peer,
 	/* BOLT-7b04b1461739c5036add61782d58ac490842d98b #9
 	 * | 222/223 | `option_dual_fund`
 	 * | Use v2 of channel open, enables dual funding
-	 * | IN9
-	 * | `option_anchor_outputs`    */
+	 * | IN9 */
 	channel->static_remotekey_start[LOCAL]
 		= channel->static_remotekey_start[REMOTE] = 0;
-	channel->type = channel_type_anchor_outputs(channel);
+
 	channel->future_per_commitment_point = NULL;
 
 	channel->lease_commit_sig = NULL;

lightningd/channel.h

@@ -54,6 +54,9 @@ struct channel_inflight {
 	/* We save this data so we can do nice accounting;
 	 * on the channel we slot it into the 'push' field */
 	struct amount_msat lease_fee;
+
+	/* Amount requested to lease for this open */
+	struct amount_sat lease_amt;
 };
 
 struct open_attempt {
@@ -351,7 +354,8 @@ new_inflight(struct channel *channel,
 	     const u32 lease_chan_max_msat,
 	     const u16 lease_chan_max_ppt,
 	     const u32 lease_blockheight_start,
-	     const struct amount_msat lease_fee);
+	     const struct amount_msat lease_fee,
+	     const struct amount_sat lease_amt);
 
 /* Given a txid, find an inflight channel stub. Returns NULL if none found */
 struct channel_inflight *channel_inflight_find(struct channel *channel,