lightningd: add withheld flag to listpeerchannels and listclosedchannels.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: JSON-RPC: `listpeerchannels` `funding` object `withheld` flag, and `listclosedchannels` `funding_withheld` flags, indicating fundchannel_complete was called with the `withheld` parameter true.

Author: rustyrussell

.msggen.json

@@ -2057,6 +2057,7 @@
             "ListClosedChannels.closedchannels[].funding_psbt": 26,
             "ListClosedChannels.closedchannels[].funding_pushed_msat": 17,
             "ListClosedChannels.closedchannels[].funding_txid": 12,
+            "ListClosedChannels.closedchannels[].funding_withheld": 27,
             "ListClosedChannels.closedchannels[].last_commitment_fee_msat": 23,
             "ListClosedChannels.closedchannels[].last_commitment_txid": 22,
             "ListClosedChannels.closedchannels[].last_stable_connection": 25,
@@ -2826,7 +2827,8 @@
             "ListPeerChannels.channels[].funding.local_funds_msat": 2,
             "ListPeerChannels.channels[].funding.psbt": 6,
             "ListPeerChannels.channels[].funding.pushed_msat": 1,
-            "ListPeerChannels.channels[].funding.remote_funds_msat": 3
+            "ListPeerChannels.channels[].funding.remote_funds_msat": 3,
+            "ListPeerChannels.channels[].funding.withheld": 7
         },
         "ListpeerchannelsChannelsHtlcs": {
             "ListPeerChannels.channels[].htlcs[].amount_msat": 3,
@@ -8275,6 +8277,10 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "ListClosedChannels.closedchannels[].funding_withheld": {
+            "added": "v25.12",
+            "deprecated": null
+        },
         "ListClosedChannels.closedchannels[].last_commitment_fee_msat": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -10271,6 +10277,10 @@
             "added": "v23.02",
             "deprecated": null
         },
+        "ListPeerChannels.channels[].funding.withheld": {
+            "added": "v25.12",
+            "deprecated": null
+        },
         "ListPeerChannels.channels[].funding_outnum": {
             "added": "v23.02",
             "deprecated": null

cln-grpc/proto/node.proto

@@ -18097,6 +18097,7 @@
                 "total_htlcs_sent",
                 "funding_txid",
                 "funding_outnum",
+                "funding_withheld",
                 "leased",
                 "final_to_us_msat",
                 "min_to_us_msat",
@@ -18249,6 +18250,13 @@
                     "The PSBT (may be non-final or unsigned) we should use to open the channel, if any"
                   ]
                 },
+                "funding_withheld": {
+                  "type": "boolean",
+                  "added": "v25.12",
+                  "description": [
+                    "True if we have not broadcast the funding transaction (see fundchannel_complete)."
+                  ]
+                },
                 "leased": {
                   "type": "boolean",
                   "description": [
@@ -23999,6 +24007,13 @@
                       "description": [
                         "The PSBT (may be non-final or unsigned) we should use to open the channel, if any.  This is initially from `fundchannel_complete`, but will be updated with if `sendpsbt` is called with an updated PSBT."
                       ]
+                    },
+                    "withheld": {
+                      "type": "boolean",
+                      "added": "v25.12",
+                      "description": [
+                        "True if `fundchannel_complete` told us it will not broadcast the funding transaction (so we know not to bother with any other onchain transactions in the case of this channel).  This is set to false if `sendpsbt` is send on the above PSBT."
+                      ]
                     }
                   }
                 },

cln-grpc/src/convert.rs

@@ -934,6 +934,7 @@ def listpeerchannels_channels_funding2py(m):
         "psbt": m.psbt,  # PrimitiveField in generate_composite
         "pushed_msat": amount2msat(m.pushed_msat),  # PrimitiveField in generate_composite
         "remote_funds_msat": amount2msat(m.remote_funds_msat),  # PrimitiveField in generate_composite
+        "withheld": m.withheld,  # PrimitiveField in generate_composite
     })
 
 
@@ -1092,6 +1093,7 @@ def listclosedchannels_closedchannels2py(m):
         "funding_psbt": m.funding_psbt,  # PrimitiveField in generate_composite
         "funding_pushed_msat": amount2msat(m.funding_pushed_msat),  # PrimitiveField in generate_composite
         "funding_txid": hexlify(m.funding_txid),  # PrimitiveField in generate_composite
+        "funding_withheld": m.funding_withheld,  # PrimitiveField in generate_composite
         "last_commitment_fee_msat": amount2msat(m.last_commitment_fee_msat),  # PrimitiveField in generate_composite
         "last_commitment_txid": hexlify(m.last_commitment_txid),  # PrimitiveField in generate_composite
         "last_stable_connection": m.last_stable_connection,  # PrimitiveField in generate_composite

cln-rpc/src/model.rs

@@ -43,6 +43,7 @@
             "total_htlcs_sent",
             "funding_txid",
             "funding_outnum",
+            "funding_withheld",
             "leased",
             "final_to_us_msat",
             "min_to_us_msat",
@@ -195,6 +196,13 @@
                 "The PSBT (may be non-final or unsigned) we should use to open the channel, if any"
               ]
             },
+            "funding_withheld": {
+              "type": "boolean",
+              "added": "v25.12",
+              "description": [
+                "True if we have not broadcast the funding transaction (see fundchannel_complete)."
+              ]
+            },
             "leased": {
               "type": "boolean",
               "description": [

contrib/msggen/msggen/schema.json

@@ -509,6 +509,13 @@
                   "description": [
                     "The PSBT (may be non-final or unsigned) we should use to open the channel, if any.  This is initially from `fundchannel_complete`, but will be updated with if `sendpsbt` is called with an updated PSBT."
                   ]
+                },
+                "withheld": {
+                  "type": "boolean",
+                  "added": "v25.12",
+                  "description": [
+                    "True if `fundchannel_complete` told us it will not broadcast the funding transaction (so we know not to bother with any other onchain transactions in the case of this channel).  This is set to false if `sendpsbt` is send on the above PSBT."
+                  ]
                 }
               }
             },

contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py

@@ -61,6 +61,7 @@ static void json_add_closed_channel(struct json_stream *response,
 				     channel->push);
 	if (channel->funding_psbt)
 		json_add_psbt(response, "funding_psbt", channel->funding_psbt);
+	json_add_bool(response, "funding_withheld", channel->withheld);
 
 	json_add_amount_sat_msat(response, "total_msat", channel->funding_sats);
 	json_add_amount_msat(response, "final_to_us_msat", channel->our_msat);