Schema / gen updates for listpeerchannels

voltagecloud · Apr 26, 2023 · 8f78834 · 8f78834
1 parent 15795c9
commit 8f78834
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 10 deletions.
diff --git a/contrib/msggen/msggen/gen/grpc.py b/contrib/msggen/msggen/gen/grpc.py
@@ -42,6 +42,12 @@
     'ListPeers.peers[].channels[].opener': "ChannelSide",
     'ListPeers.peers[].channels[].closer': "ChannelSide",
     'ListPeers.peers[].channels[].features[]': "string",
+    'ListPeerChannels.channels[].state_changes[]': None,
+    'ListPeerChannels.channels[].htlcs[].state': None,
+    'ListPeerChannels.channels[].opener': "ChannelSide",
+    'ListPeerChannels.channels[].closer': "ChannelSide",
+    'ListPeerChannels.channels[].features[]': "string",
+    'ListPeerChannels.channels[].channel_type.names[]': "string",
     'ListFunds.channels[].state': 'ChannelState',
     'ListTransactions.transactions[].type[]': None,
 }
@@ -454,6 +460,8 @@ def generate_composite(self, prefix, field: CompositeField) -> None:
             elif isinstance(f, EnumField):
                 if f.path == 'ListPeers.peers[].channels[].htlcs[].state':
                     continue
+                if f.path == 'ListPeerChannels.channels[].htlcs[].state':
+                    continue
                 if not f.optional:
                     self.write(f"{name}: c.{name}.try_into().unwrap(),\n", numindent=3)
                 else:

diff --git a/contrib/msggen/msggen/gen/rust.py b/contrib/msggen/msggen/gen/rust.py
@@ -25,6 +25,14 @@
     'ListPeers.peers[].channels[].opener': "ChannelSide",
     'ListPeers.peers[].channels[].closer': "ChannelSide",
     'ListPeers.peers[].channels[].features[]': "string",
+    'ListPeerChannels.channels[].state_changes[].old_state': "ChannelState",
+    'ListPeerChannels.channels[].state_changes[].new_state': "ChannelState",
+    'ListPeerChannels.channels[].state_changes[].cause': "ChannelStateChangeCause",
+    'ListPeerChannels.channels[].htlcs[].state': None,
+    'ListPeerChannels.channels[].opener': "ChannelSide",
+    'ListPeerChannels.channels[].closer': "ChannelSide",
+    'ListPeerChannels.channels[].features[]': "string",
+    'ListPeerChannels.channels[].channel_type.names[]': "string",
     'ListFunds.channels[].state': 'ChannelState',
     'ListTransactions.transactions[].type[]': None,
     'Invoice.exposeprivatechannels': None,

diff --git a/contrib/msggen/msggen/utils/utils.py b/contrib/msggen/msggen/utils/utils.py
@@ -29,6 +29,7 @@ def load_jsonrpc_service(schema_dir: str):
     method_names = [
         "Getinfo",
         "ListPeers",
+        "ListPeerChannels",
         "ListFunds",
         "SendPay",
         "ListChannels",

diff --git a/doc/schemas/listclosedchannels.schema.json b/doc/schemas/listclosedchannels.schema.json
@@ -98,11 +98,11 @@
                 "items": {
                   "type": "string",
                   "enum": [
-                    "static_remotekey/even",
-                    "anchor_outputs/even",
-                    "anchors_zero_fee_htlc_tx/even",
-                    "scid_alias/even",
-                    "zeroconf/even"
+                    "static_remotekey_even",
+                    "anchor_outputs_even",
+                    "anchors_zero_fee_htlc_tx_even",
+                    "scid_alias_even",
+                    "zeroconf_even"
                   ],
                   "description": "Name of feature bit"
                 }

diff --git a/doc/schemas/listpeerchannels.request.json b/doc/schemas/listpeerchannels.request.json
@@ -1,10 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
+  "added": "v23.05",
   "required": [],
   "additionalProperties": false,
   "properties": {
     "id": {
+      "added": "v23.05",
       "type": "pubkey",
       "description": "If supplied, limits the channels to just the peer with the given ID, if it exists."
     }