Skip to content

Commit 3a8c6a9

Browse files
erdoganisheShahanaFarooqui
authored andcommitted
gRPC: lightningd: Fix empty description field in listpays & listsendpays
Changelog-Added: Fix empty `description` field for gRPC `listpays` and `listsendpays`. No schema change required; the field already existed but was not populated.
1 parent aab6e69 commit 3a8c6a9

10 files changed

Lines changed: 1223 additions & 1150 deletions

File tree

.msggen.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,6 +1563,7 @@
15631563
"DelPay.payments[].completed_at": 11,
15641564
"DelPay.payments[].created_at": 9,
15651565
"DelPay.payments[].created_index": 1,
1566+
"DelPay.payments[].description": 18,
15661567
"DelPay.payments[].destination": 7,
15671568
"DelPay.payments[].erroronion": 17,
15681569
"DelPay.payments[].groupid": 12,
@@ -3611,6 +3612,7 @@
36113612
"SendOnion.bolt12": 10,
36123613
"SendOnion.created_at": 6,
36133614
"SendOnion.created_index": 14,
3615+
"SendOnion.description": 16,
36143616
"SendOnion.destination": 5,
36153617
"SendOnion.id": 1,
36163618
"SendOnion.label": 8,
@@ -3653,6 +3655,7 @@
36533655
"SendPay.completed_at": 15,
36543656
"SendPay.created_at": 7,
36553657
"SendPay.created_index": 16,
3658+
"SendPay.description": 18,
36563659
"SendPay.destination": 6,
36573660
"SendPay.groupid": 2,
36583661
"SendPay.id": 1,
@@ -4047,6 +4050,7 @@
40474050
"WaitSendPay.completed_at": 14,
40484051
"WaitSendPay.created_at": 7,
40494052
"WaitSendPay.created_index": 15,
4053+
"WaitSendPay.description": 17,
40504054
"WaitSendPay.destination": 6,
40514055
"WaitSendPay.groupid": 2,
40524056
"WaitSendPay.id": 1,
@@ -6904,6 +6908,10 @@
69046908
"added": "v23.11",
69056909
"deprecated": null
69066910
},
6911+
"DelPay.payments[].description": {
6912+
"added": "v26.04",
6913+
"deprecated": null
6914+
},
69076915
"DelPay.payments[].destination": {
69086916
"added": "pre-v0.10.1",
69096917
"deprecated": null
@@ -13948,6 +13956,10 @@
1394813956
"added": "v23.11",
1394913957
"deprecated": null
1395013958
},
13959+
"WaitSendPay.description": {
13960+
"added": "v26.04",
13961+
"deprecated": null
13962+
},
1395113963
"WaitSendPay.destination": {
1395213964
"added": "pre-v0.10.1",
1395313965
"deprecated": null

cln-grpc/proto/node.proto

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cln-grpc/src/convert.rs

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cln-rpc/src/model.rs

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contrib/msggen/msggen/schema.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11000,6 +11000,13 @@
1100011000
"The bolt12 string (if supplied for pay)."
1100111001
]
1100211002
},
11003+
"description": {
11004+
"added": "v26.04",
11005+
"type": "string",
11006+
"description": [
11007+
"The decription decoded from bolt11 || bolt12 string (if supplied)."
11008+
]
11009+
},
1100311010
"erroronion": {
1100411011
"type": "hex",
1100511012
"description": [
@@ -32033,6 +32040,12 @@
3203332040
"The bolt12 string (if supplied)."
3203432041
]
3203532042
},
32043+
"description": {
32044+
"type": "string",
32045+
"description": [
32046+
"The decription decoded from bolt11 || bolt12 string (if supplied)."
32047+
]
32048+
},
3203632049
"message": {},
3203732050
"payment_preimage": {}
3203832051
},
@@ -32072,6 +32085,7 @@
3207232085
"partid": {},
3207332086
"bolt11": {},
3207432087
"bolt12": {},
32088+
"description": {},
3207532089
"payment_preimage": {
3207632090
"type": "secret",
3207732091
"description": [
@@ -32116,6 +32130,7 @@
3211632130
"partid": {},
3211732131
"bolt11": {},
3211832132
"bolt12": {},
32133+
"description": {},
3211932134
"message": {
3212032135
"type": "string",
3212132136
"description": [
@@ -37027,6 +37042,13 @@
3702737042
"The bolt12 string (if supplied for pay)."
3702837043
]
3702937044
},
37045+
"description": {
37046+
"added": "v26.04",
37047+
"type": "string",
37048+
"description": [
37049+
"The decription decoded from bolt11 || bolt12 string (if supplied)."
37050+
]
37051+
},
3703037052
"message": {},
3703137053
"payment_preimage": {}
3703237054
},
@@ -37066,6 +37088,7 @@
3706637088
"partid": {},
3706737089
"bolt11": {},
3706837090
"bolt12": {},
37091+
"description": {},
3706937092
"payment_preimage": {
3707037093
"type": "secret",
3707137094
"description": [

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

Lines changed: 1150 additions & 1150 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ def sendpay2py(m):
146146
"completed_at": m.completed_at, # PrimitiveField in generate_composite
147147
"created_at": m.created_at, # PrimitiveField in generate_composite
148148
"created_index": m.created_index, # PrimitiveField in generate_composite
149+
"description": m.description, # PrimitiveField in generate_composite
149150
"destination": hexlify(m.destination), # PrimitiveField in generate_composite
150151
"groupid": m.groupid, # PrimitiveField in generate_composite
151152
"id": m.id, # PrimitiveField in generate_composite
@@ -787,6 +788,7 @@ def waitsendpay2py(m):
787788
"completed_at": m.completed_at, # PrimitiveField in generate_composite
788789
"created_at": m.created_at, # PrimitiveField in generate_composite
789790
"created_index": m.created_index, # PrimitiveField in generate_composite
791+
"description": m.description, # PrimitiveField in generate_composite
790792
"destination": hexlify(m.destination), # PrimitiveField in generate_composite
791793
"groupid": m.groupid, # PrimitiveField in generate_composite
792794
"id": m.id, # PrimitiveField in generate_composite
@@ -1396,6 +1398,7 @@ def delpay_payments2py(m):
13961398
"completed_at": m.completed_at, # PrimitiveField in generate_composite
13971399
"created_at": m.created_at, # PrimitiveField in generate_composite
13981400
"created_index": m.created_index, # PrimitiveField in generate_composite
1401+
"description": m.description, # PrimitiveField in generate_composite
13991402
"destination": hexlify(m.destination), # PrimitiveField in generate_composite
14001403
"erroronion": hexlify(m.erroronion), # PrimitiveField in generate_composite
14011404
"groupid": m.groupid, # PrimitiveField in generate_composite

doc/schemas/delpay.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,13 @@
172172
"The bolt12 string (if supplied for pay)."
173173
]
174174
},
175+
"description": {
176+
"added": "v26.04",
177+
"type": "string",
178+
"description": [
179+
"The decription decoded from bolt11 || bolt12 string (if supplied)."
180+
]
181+
},
175182
"erroronion": {
176183
"type": "hex",
177184
"description": [

doc/schemas/sendpay.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,12 @@
233233
"The bolt12 string (if supplied)."
234234
]
235235
},
236+
"description": {
237+
"type": "string",
238+
"description": [
239+
"The decription decoded from bolt11 || bolt12 string (if supplied)."
240+
]
241+
},
236242
"message": {},
237243
"payment_preimage": {}
238244
},
@@ -272,6 +278,7 @@
272278
"partid": {},
273279
"bolt11": {},
274280
"bolt12": {},
281+
"description": {},
275282
"payment_preimage": {
276283
"type": "secret",
277284
"description": [
@@ -316,6 +323,7 @@
316323
"partid": {},
317324
"bolt11": {},
318325
"bolt12": {},
326+
"description": {},
319327
"message": {
320328
"type": "string",
321329
"description": [

doc/schemas/waitsendpay.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@
152152
"The bolt12 string (if supplied for pay)."
153153
]
154154
},
155+
"description": {
156+
"added": "v26.04",
157+
"type": "string",
158+
"description": [
159+
"The decription decoded from bolt11 || bolt12 string (if supplied)."
160+
]
161+
},
155162
"message": {},
156163
"payment_preimage": {}
157164
},
@@ -191,6 +198,7 @@
191198
"partid": {},
192199
"bolt11": {},
193200
"bolt12": {},
201+
"description": {},
194202
"payment_preimage": {
195203
"type": "secret",
196204
"description": [

0 commit comments

Comments
 (0)