msggen: Add two missing fields to the listpays schema

The fields were missing because they weren't annotated with a type and a description. Adding those fixes them. Changelog-Fixed: msggen: `listpays` now includes the missing `amount_msat` and `amount_sent_msat` fields No-schema-diff-check: fields were always there, just undocumented!
ElementsProject · Jul 27, 2023 · 7b8ea7f · 7b8ea7f
1 parent 7915a9d
commit 7b8ea7f
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 51 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -3810,6 +3810,14 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "ListPays.amount_msat": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "ListPays.amount_sent_msat": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
         "ListPays.bolt11": {
             "added": "pre-v0.10.1",
             "deprecated": false
@@ -3822,6 +3830,14 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "ListPays.pays[].amount_msat": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "ListPays.pays[].amount_sent_msat": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
         "ListPays.pays[].bolt11": {
             "added": "pre-v0.10.1",
             "deprecated": false

diff --git a/cln-grpc/proto/node.proto b/cln-grpc/proto/node.proto
diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs
diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py b/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -1277,6 +1277,8 @@ def listpays_pays2py(m):
         "bolt11": m.bolt11,  # PrimitiveField in generate_composite
         "description": m.description,  # PrimitiveField in generate_composite
         "bolt12": m.bolt12,  # PrimitiveField in generate_composite
+        "amount_msat": amount2msat(m.amount_msat),  # PrimitiveField in generate_composite
+        "amount_sent_msat": amount2msat(m.amount_sent_msat),  # PrimitiveField in generate_composite
         "preimage": hexlify(m.preimage),  # PrimitiveField in generate_composite
         "number_of_parts": m.number_of_parts,  # PrimitiveField in generate_composite
         "erroronion": hexlify(m.erroronion),  # PrimitiveField in generate_composite

diff --git a/doc/lightning-listpays.7.md b/doc/lightning-listpays.7.md
@@ -31,7 +31,9 @@ On success, an object containing **pays** is returned.  It is an array of object
 
 If **status** is "complete":
 
+  - **amount\_sent\_msat** (msat): The amount of millisatoshi we sent in order to pay (may include fees and not match amount\_msat)
   - **preimage** (secret): proof of payment
+  - **amount\_msat** (msat, optional): The amount of millisatoshi we intended to send to the destination
   - **number\_of\_parts** (u64, optional): the number of parts for a successful payment (only if more than one).
 
 If **status** is "failed":
@@ -57,4 +59,4 @@ RESOURCES
 
 Main web site: <https://github.com/ElementsProject/lightning>
 
-[comment]: # ( SHA256STAMP:716bcbf01d946c6e4da0bd2f6817c34e6471a1fcd2f0f388ce47984271285c72)
+[comment]: # ( SHA256STAMP:1485c07b6a62b67169675ecd1e6e42f34fb371c2eb687adf7451ad1bec5dcc50)
diff --git a/doc/schemas/listpays.schema.json b/doc/schemas/listpays.schema.json
@@ -87,8 +87,14 @@
                 "bolt11": {},
                 "description": {},
                 "bolt12": {},
-                "amount_msat": {},
-                "amount_sent_msat": {},
+                "amount_msat": {
+                  "type": "msat",
+                  "description": "The amount of millisatoshi we intended to send to the destination"
+                },
+                "amount_sent_msat": {
+                  "type": "msat",
+                  "description": "The amount of millisatoshi we sent in order to pay (may include fees and not match amount_msat)"
+                },
                 "preimage": {
                   "type": "secret",
                   "description": "proof of payment"