lightningd: add withhold option to fundchannel_complete.

This is just a polite way of telling us that if we close, don't bother broadcasting
since we didn't broadcast the funding tx.

Changelog-Added: JSON-RPC: `fundchannel_complete` new parameter `withhold` (default false).
Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

.msggen.json

@@ -1698,7 +1698,8 @@
         },
         "FundchannelCompleteRequest": {
             "FundChannel_Complete.id": 1,
-            "FundChannel_Complete.psbt": 2
+            "FundChannel_Complete.psbt": 2,
+            "FundChannel_Complete.withhold": 3
         },
         "FundchannelCompleteResponse": {
             "FundChannel_Complete.channel_id": 1,
@@ -7322,6 +7323,10 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "FundChannel_Complete.withhold": {
+            "added": "v25.12",
+            "deprecated": null
+        },
         "FundChannel_Start": {
             "added": "pre-v0.10.1",
             "deprecated": null

cln-grpc/proto/node.proto

@@ -13594,6 +13594,13 @@
             "description": [
               "Transaction to use for funding (does not need to be signed but must be otherwise complete)."
             ]
+          },
+          "withhold": {
+            "type": "boolean",
+            "added": "v25.12",
+            "description": [
+              "Mark this channel 'withheld' so we know we haven't broadcast the funding transaction.  If the channel is closed before we call `sendpsbt` on this psbt, it will simply be closed immediately."
+            ]
           }
         }
       },

cln-grpc/src/convert.rs

@@ -26,6 +26,13 @@
         "description": [
           "Transaction to use for funding (does not need to be signed but must be otherwise complete)."
         ]
+      },
+      "withhold": {
+        "type": "boolean",
+        "added": "v25.12",
+        "description": [
+          "Mark this channel 'withheld' so we know we haven't broadcast the funding transaction.  If the channel is closed before we call `sendpsbt` on this psbt, it will simply be closed immediately."
+        ]
       }
     }
   },

cln-rpc/src/model.rs

@@ -1023,10 +1023,12 @@ static struct command_result *json_fundchannel_complete(struct command *cmd,
 	struct wally_psbt *funding_psbt;
 	u32 *funding_txout_num = NULL;
 	struct funding_channel *fc;
+	bool *withhold;
 
 	if (!param_check(cmd, buffer, params,
 			 p_req("id", param_node_id, &id),
 			 p_req("psbt", param_psbt, &funding_psbt),
+			 p_opt_def("withhold", param_bool, &withhold, false),
 			 NULL))
 		return command_param_failed();
 
@@ -1099,9 +1101,7 @@ static struct command_result *json_fundchannel_complete(struct command *cmd,
 		return command_check_done(cmd);
 
 	fc->funding_psbt = tal_steal(fc, funding_psbt);
-
-	/* FIXME: Set by option */
-	fc->withheld = false;
+	fc->withheld = *withhold;
 
 	/* Set the cmd to this new cmd */
 	peer->uncommitted_channel->fc->cmd = cmd;