fixup! channeld: Code to implement splicing

Update RPC docs

Author: ddustin

.msggen.json

@@ -152,6 +152,7 @@
         "ListpeerchannelsChannelsState": {
             "AWAITING_UNILATERAL": 6,
             "CHANNELD_AWAITING_LOCKIN": 1,
+            "CHANNELD_AWAITING_SPLICE": 11,
             "CHANNELD_NORMAL": 2,
             "CHANNELD_SHUTTING_DOWN": 3,
             "CLOSINGD_COMPLETE": 5,
@@ -1070,6 +1071,7 @@
             "ListPeerChannels.channels[].inflight[].funding_txid": 1,
             "ListPeerChannels.channels[].inflight[].our_funding_msat": 5,
             "ListPeerChannels.channels[].inflight[].scratch_txid": 6,
+            "ListPeerChannels.channels[].inflight[].splice_amount": 7,
             "ListPeerChannels.channels[].inflight[].total_funding_msat": 4
         },
         "ListpeerchannelsChannelsState_changes": {
@@ -1180,6 +1182,7 @@
             "ListPeers.peers[].channels[].inflight[].funding_txid": 1,
             "ListPeers.peers[].channels[].inflight[].our_funding_msat": 5,
             "ListPeers.peers[].channels[].inflight[].scratch_txid": 6,
+            "ListPeers.peers[].channels[].inflight[].splice_amount": 7,
             "ListPeers.peers[].channels[].inflight[].total_funding_msat": 4
         },
         "ListpeersPeersLog": {
@@ -3893,6 +3896,10 @@
             "added": "v23.02",
             "deprecated": false
         },
+        "ListPeerChannels.channels[].inflight[].splice_amount": {
+            "added": "v23.08",
+            "deprecated": false
+        },
         "ListPeerChannels.channels[].inflight[].total_funding_msat": {
             "added": "v23.02",
             "deprecated": false
@@ -4237,6 +4244,10 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "ListPeers.peers[].channels[].inflight[].splice_amount": {
+            "added": "v23.08",
+            "deprecated": false
+        },
         "ListPeers.peers[].channels[].inflight[].total_funding_msat": {
             "added": "pre-v0.10.1",
             "deprecated": false

cln-grpc/proto/node.proto

@@ -739,6 +739,7 @@ def listpeerchannels_channels_inflight2py(m):
         "funding_outnum": m.funding_outnum,  # PrimitiveField in generate_composite
         "feerate": m.feerate,  # PrimitiveField in generate_composite
         "total_funding_msat": amount2msat(m.total_funding_msat),  # PrimitiveField in generate_composite
+        "splice_amount": m.splice_amount,  # PrimitiveField in generate_composite
         "our_funding_msat": amount2msat(m.our_funding_msat),  # PrimitiveField in generate_composite
         "scratch_txid": hexlify(m.scratch_txid),  # PrimitiveField in generate_composite
     })

cln-grpc/src/convert.rs

@@ -26,7 +26,7 @@ On success, an object containing **channels** is returned.  It is an array of ob
 
 - **peer\_id** (pubkey): Node Public key
 - **peer\_connected** (boolean): A boolean flag that is set to true if the peer is online
-- **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN")
+- **state** (string): the channel state, in particular "CHANNELD\_NORMAL" means the channel can be used normally (one of "OPENINGD", "CHANNELD\_AWAITING\_LOCKIN", "CHANNELD\_NORMAL", "CHANNELD\_SHUTTING\_DOWN", "CLOSINGD\_SIGEXCHANGE", "CLOSINGD\_COMPLETE", "AWAITING\_UNILATERAL", "FUNDING\_SPEND\_SEEN", "ONCHAIN", "DUALOPEND\_OPEN\_INIT", "DUALOPEND\_AWAITING\_LOCKIN", "CHANNELD\_AWAITING\_SPLICE")
 - **opener** (string): Who initiated the channel (one of "local", "remote")
 - **features** (array of strings):
   - BOLT #9 features which apply to this channel (one of "option\_static\_remotekey", "option\_anchor\_outputs", "option\_scid\_alias", "option\_zeroconf")
@@ -48,7 +48,7 @@ On success, an object containing **channels** is returned.  It is an array of ob
 - **last\_feerate** (string, optional): For inflight opens, the most recent feerate used on the channel open
 - **next\_feerate** (string, optional): For inflight opens, the next feerate we'll use for the channel open
 - **next\_fee\_step** (u32, optional): For inflight opens, the next feerate step we'll use for the channel open
-- **inflight** (array of objects, optional): Current candidate funding transactions (only for dual-funding):
+- **inflight** (array of objects, optional): Current candidate funding transactions:
   - **funding\_txid** (txid): ID of the funding transaction
   - **funding\_outnum** (u32): The 0-based output number of the funding transaction which opens the channel
   - **feerate** (string): The feerate for this funding transaction in per-1000-weight, with "kpw" appended
@@ -195,4 +195,4 @@ Main web site: <https://github.com/ElementsProject/lightning> Lightning
 RFC site (BOLT \#9):
 <https://github.com/lightningnetwork/lightning-rfc/blob/master/09-features.md>
 
-[comment]: # ( SHA256STAMP:37101a5410f47b0c5e23005ed9bd634de864c9b0871ffa71d4ca76c1b86f5737)
+[comment]: # ( SHA256STAMP:c748f9471cadc6d890f8989e193491e0cc8033e354b4fc988d1811c7f676f0a2)

cln-rpc/src/model.rs

@@ -41,7 +41,8 @@
               "FUNDING_SPEND_SEEN",
               "ONCHAIN",
               "DUALOPEND_OPEN_INIT",
-              "DUALOPEND_AWAITING_LOCKIN"
+              "DUALOPEND_AWAITING_LOCKIN",
+              "CHANNELD_AWAITING_SPLICE"
             ],
             "description": "the channel state, in particular \"CHANNELD_NORMAL\" means the channel can be used normally"
           },
@@ -141,7 +142,7 @@
           },
           "inflight": {
             "type": "array",
-            "description": "Current candidate funding transactions (only for dual-funding)",
+            "description": "Current candidate funding transactions",
             "items": {
               "type": "object",
               "additionalProperties": false,
@@ -150,8 +151,8 @@
                 "funding_outnum",
                 "feerate",
                 "total_funding_msat",
+                "splice_amount",
                 "our_funding_msat",
-		"splice_amount",
                 "scratch_txid"
               ],
               "properties": {