fixup! fixup! channeld: Code to implement splicing

# Conflicts:
#	cln-grpc/src/convert.rs
#	doc/lightning-listpeerchannels.7.md

Author: niftynei

.msggen.json

@@ -1179,6 +1179,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": {
@@ -4228,6 +4229,10 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "ListPeers.peers[].channels[].inflight[].splice_amount": {
+            "added": "v23.05",
+            "deprecated": false
+        },
         "ListPeers.peers[].channels[].inflight[].total_funding_msat": {
             "added": "pre-v0.10.1",
             "deprecated": false

cln-grpc/proto/node.proto

@@ -22,7 +22,6 @@
     'u8': 'uint32',  # Yep, this is the smallest integer type in grpc...
     'u32': 'uint32',
     'u64': 'uint64',
-    's64': 'int64',
     'u16': 'uint32',  # Yeah, I know...
     'f32': 'float',
     'integer': 'sint64',

cln-grpc/src/convert.rs

@@ -40,7 +40,7 @@ def __init__(self, dest: TextIO):
             'u16': "m.{name}",
             'u32': "m.{name}",
             'u64': "m.{name}",
-            's64': "m.{name}",
+            'integer': "m.{name}",
             'boolean': "m.{name}",
             'short_channel_id': "m.{name}",
             'msat': "amount2msat(m.{name})",

cln-rpc/src/model.rs

@@ -35,6 +35,7 @@
     'outputdesc': 'OutputDesc',
     'hash': 'Sha256',
     'secret': 'Secret',
+    'integer': 'i64',
 }
 
 header = f"""#![allow(non_camel_case_types)]

contrib/msggen/msggen/gen/grpc.py

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

contrib/msggen/msggen/gen/grpc2py.py

@@ -53,6 +53,7 @@ On success, an object containing **channels** is returned.  It is an array of ob
   - **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
   - **total\_funding\_msat** (msat): total amount in the channel
+  - **splice\_amount** (integer): The amouont of sats we're splicing in or out
   - **our\_funding\_msat** (msat): amount we have in the channel
   - **scratch\_txid** (txid): The commitment transaction txid we would use if we went onchain now
 - **close\_to** (hex, optional): scriptPubkey which we have to close to if we mutual close
@@ -194,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:005c109a25f91eabf18e2003a4c83e305ca6b4a604999ceeef6ca3f0ee4b0006)
+[comment]: # ( SHA256STAMP:78229c9896b65ad304ec8ed928a38ac54df9d8adb00d11a26169d9f9f2957798)

contrib/msggen/msggen/gen/rust.py

@@ -89,6 +89,7 @@ On success, an object containing **peers** is returned.  It is an array of objec
     - **feerate** (string): The feerate for this funding transaction in per-1000-weight, with "kpw" appended
     - **total\_funding\_msat** (msat): total amount in the channel
     - **our\_funding\_msat** (msat): amount we have in the channel
+    - **splice\_amount** (integer): The amouont of sats we're splicing in or out
     - **scratch\_txid** (txid): The commitment transaction txid we would use if we went onchain now
   - **close\_to** (hex, optional): scriptPubkey which we have to close to if we mutual close
   - **private** (boolean, optional): if False, we will not announce this channel
@@ -398,4 +399,4 @@ Main web site: <https://github.com/ElementsProject/lightning> Lightning
 RFC site (BOLT \#9):
 <https://github.com/lightning/bolts/blob/master/09-features.md>
 
-[comment]: # ( SHA256STAMP:c0d0cc8f083168fd76caa2430a7c7d27d72a5273c55fb14b0efcbcb7a87274f4)
+[comment]: # ( SHA256STAMP:0b0ac0a62d7e1afcfda6ba1e09af45160c6991d6546da44d1b2a3c3c97a9c51e)

contrib/pyln-testing/pyln/testing/grpc2py.py

@@ -268,6 +268,7 @@ The following tables are currently supported:
     - `funding_outnum` (type `u32`, sqltype `INTEGER`)
     - `feerate` (type `string`, sqltype `TEXT`)
     - `total_funding_msat` (type `msat`, sqltype `INTEGER`)
+    - `splice_amount` (type `integer`, sqltype `INTEGER`)
     - `our_funding_msat` (type `msat`, sqltype `INTEGER`)
     - `scratch_txid` (type `txid`, sqltype `BLOB`)
   - `close_to` (type `hex`, sqltype `BLOB`)
@@ -514,4 +515,4 @@ RESOURCES
 ---------
 
 Main web site: <https://github.com/ElementsProject/lightning>
-[comment]: # ( SHA256STAMP:3eb4e024a1e1a4b40460b48b835354514456558797b8f8ce3c76dcbb9ca79dab)
+[comment]: # ( SHA256STAMP:9d73854671c715117777702f7f13912ac31ca2ddcde46ffa80f79def1de7475d)

doc/lightning-listpeerchannels.7.md

@@ -151,6 +151,7 @@
                 "feerate",
                 "total_funding_msat",
                 "our_funding_msat",
+		"splice_amount",
                 "scratch_txid"
               ],
               "properties": {
@@ -170,6 +171,10 @@
                   "type": "msat",
                   "description": "total amount in the channel"
                 },
+                "splice_amount": {
+                  "type": "integer",
+                  "description": "The amouont of sats we're splicing in or out"
+                },
                 "our_funding_msat": {
                   "type": "msat",
                   "description": "amount we have in the channel"

doc/lightning-listpeers.7.md

@@ -273,6 +273,7 @@
                       "feerate",
                       "total_funding_msat",
                       "our_funding_msat",
+                      "splice_amount",
                       "scratch_txid"
                     ],
                     "properties": {
@@ -296,6 +297,10 @@
                         "type": "msat",
                         "description": "amount we have in the channel"
                       },
+                      "splice_amount": {
+                        "type": "integer",
+                        "description": "The amouont of sats we're splicing in or out"
+                      },
                       "scratch_txid": {
                         "type": "txid",
                         "description": "The commitment transaction txid we would use if we went onchain now"