Skip to content

tests: xpay issue and fixes #8972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daywalker90 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

tests: xpay issue and fixes #8972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af5b1bc
tests: add an xpay test to reproduce a regression where we pay fees i…
daywalker90 Mar 23, 2026
abb9f74
decode: print htlc_minimum_msat / htlc_maximum_msat in blinded paths.
rustyrussell Apr 1, 2026
8faea72
pytest: demonstrate the weird 0 htlc_maximum_msat problem.
rustyrussell Apr 1, 2026
29e6e0a
createonion: add `force_paths` parameter.
rustyrussell Apr 1, 2026
bd4a626
offers: set `force_paths` on offer if fronting nodes are used.
rustyrussell Apr 1, 2026
8ecd0d5
offers: when creating an invoice for an offer, only reuse fronting pa…
rustyrussell Apr 1, 2026
fd11943
offers: use amount hints in find_best_peer for blinded paths.
rustyrussell Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .msggen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,7 @@
"DisableOffer.active": 2,
"DisableOffer.bolt12": 4,
"DisableOffer.description": 7,
"DisableOffer.force_paths": 8,
"DisableOffer.label": 6,
"DisableOffer.offer_id": 1,
"DisableOffer.single_use": 3,
Expand All @@ -1672,6 +1673,7 @@
"EnableOffer.active": 2,
"EnableOffer.bolt12": 4,
"EnableOffer.description": 7,
"EnableOffer.force_paths": 8,
"EnableOffer.label": 6,
"EnableOffer.offer_id": 1,
"EnableOffer.single_use": 3,
Expand Down Expand Up @@ -2925,6 +2927,7 @@
"ListOffers.offers[].active": 2,
"ListOffers.offers[].bolt12": 4,
"ListOffers.offers[].description": 7,
"ListOffers.offers[].force_paths": 8,
"ListOffers.offers[].label": 6,
"ListOffers.offers[].offer_id": 1,
"ListOffers.offers[].single_use": 3,
Expand Down Expand Up @@ -3406,6 +3409,7 @@
"Offer.active": 2,
"Offer.bolt12": 4,
"Offer.created": 6,
"Offer.force_paths": 8,
"Offer.label": 7,
"Offer.offer_id": 1,
"Offer.single_use": 3,
Expand Down Expand Up @@ -6293,6 +6297,14 @@
"added": "v23.05",
"deprecated": null
},
"Decode.invoice_paths[].payinfo.htlc_maximum_msat": {
"added": "v26.04",
"deprecated": null
},
"Decode.invoice_paths[].payinfo.htlc_minimum_msat": {
"added": "v26.04",
"deprecated": null
},
"Decode.invoice_payment_hash": {
"added": "v23.05",
"deprecated": null
Expand Down Expand Up @@ -7205,6 +7217,10 @@
"added": "v26.04",
"deprecated": null
},
"DisableOffer.force_paths": {
"added": "v26.04",
"deprecated": null
},
"DisableOffer.label": {
"added": "pre-v0.10.1",
"deprecated": null
Expand Down Expand Up @@ -7257,6 +7273,10 @@
"added": "v26.04",
"deprecated": null
},
"EnableOffer.force_paths": {
"added": "v26.04",
"deprecated": null
},
"EnableOffer.label": {
"added": "v24.08",
"deprecated": null
Expand Down Expand Up @@ -10813,6 +10833,10 @@
"added": "v26.04",
"deprecated": null
},
"ListOffers.offers[].force_paths": {
"added": "v26.04",
"deprecated": null
},
"ListOffers.offers[].label": {
"added": "pre-v0.10.1",
"deprecated": null
Expand Down Expand Up @@ -12173,6 +12197,10 @@
"added": "pre-v0.10.1",
"deprecated": null
},
"Offer.force_paths": {
"added": "v26.04",
"deprecated": null
},
"Offer.fronting_nodes[]": {
"added": "v26.04",
"deprecated": null
Expand Down
4 changes: 4 additions & 0 deletions cln-grpc/proto/node.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cln-grpc/src/convert.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions cln-rpc/src/model.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions contrib/msggen/msggen/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9422,6 +9422,8 @@
"fee_base_msat",
"fee_proportional_millionths",
"cltv_expiry_delta",
"htlc_minimum_msat",
"htlc_maximum_msat",
"features"
],
"additionalProperties": false,
Expand All @@ -9444,6 +9446,20 @@
"CLTV delta for path."
]
},
"htlc_minimum_msat": {
"type": "msat",
"added": "v26.04",
"description": [
"Minimum amount which can be sent via path."
]
},
"htlc_maximum_msat": {
"type": "msat",
"added": "v26.04",
"description": [
"Maximum amount which can be sent via path."
]
},
"features": {
"type": "hex",
"description": [
Expand Down Expand Up @@ -11930,6 +11946,7 @@
"offer_id",
"active",
"single_use",
"force_paths",
"bolt12",
"used"
],
Expand All @@ -11956,6 +11973,13 @@
"Whether the offer is disabled after first successful use."
]
},
"force_paths": {
"type": "boolean",
"added": "v26.04",
"description": [
"True if `fronting_nodes` (or the `payment-fronting-node` configuration entry) is set: implies any invoice issued for this offer must use a subset of the same blinded paths."
]
},
"bolt12": {
"type": "string",
"description": [
Expand Down Expand Up @@ -12186,6 +12210,7 @@
"offer_id",
"active",
"single_use",
"force_paths",
"bolt12",
"used"
],
Expand All @@ -12212,6 +12237,13 @@
"Whether the offer is disabled after first successful use."
]
},
"force_paths": {
"type": "boolean",
"added": "v26.04",
"description": [
"True if `fronting_nodes` (or the `payment-fronting-node` configuration entry) is set: implies any invoice issued for this offer must use a subset of the same blinded paths."
]
},
"bolt12": {
"type": "string",
"description": [
Expand Down Expand Up @@ -23496,6 +23528,7 @@
"offer_id",
"active",
"single_use",
"force_paths",
"bolt12",
"used"
],
Expand All @@ -23518,6 +23551,13 @@
"Whether this expires as soon as it's paid."
]
},
"force_paths": {
"type": "boolean",
"added": "v26.04",
"description": [
"Whether explicit blinded paths (i.e. fronting nodes) were adde when creating the offer (implying that they should be used when creating invoices)."
]
},
"bolt12": {
"type": "string",
"description": [
Expand Down Expand Up @@ -28220,6 +28260,13 @@
"True if an associated invoice has been paid."
]
},
"force_paths": {
"type": "boolean",
"added": "v26.04",
"description": [
"True if `fronting_nodes` (or the `payment-fronting-node` configuration entry) is set: implies any invoice issued for this offer must use a subset of the same blinded paths."
]
},
"created": {
"type": "boolean",
"description": [
Expand Down
1,568 changes: 784 additions & 784 deletions contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions contrib/pyln-testing/pyln/testing/grpc2py.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,8 @@ def decode_invoice_paths_payinfo2py(m):
"features": hexlify(m.features), # PrimitiveField in generate_composite
"fee_base_msat": amount2msat(m.fee_base_msat), # PrimitiveField in generate_composite
"fee_proportional_millionths": m.fee_proportional_millionths, # PrimitiveField in generate_composite
"htlc_maximum_msat": amount2msat(m.htlc_maximum_msat), # PrimitiveField in generate_composite
"htlc_minimum_msat": amount2msat(m.htlc_minimum_msat), # PrimitiveField in generate_composite
})


Expand Down Expand Up @@ -1386,6 +1388,7 @@ def disableoffer2py(m):
"active": m.active, # PrimitiveField in generate_composite
"bolt12": m.bolt12, # PrimitiveField in generate_composite
"description": m.description, # PrimitiveField in generate_composite
"force_paths": m.force_paths, # PrimitiveField in generate_composite
"label": m.label, # PrimitiveField in generate_composite
"offer_id": hexlify(m.offer_id), # PrimitiveField in generate_composite
"single_use": m.single_use, # PrimitiveField in generate_composite
Expand All @@ -1398,6 +1401,7 @@ def enableoffer2py(m):
"active": m.active, # PrimitiveField in generate_composite
"bolt12": m.bolt12, # PrimitiveField in generate_composite
"description": m.description, # PrimitiveField in generate_composite
"force_paths": m.force_paths, # PrimitiveField in generate_composite
"label": m.label, # PrimitiveField in generate_composite
"offer_id": hexlify(m.offer_id), # PrimitiveField in generate_composite
"single_use": m.single_use, # PrimitiveField in generate_composite
Expand Down Expand Up @@ -1679,6 +1683,7 @@ def listoffers_offers2py(m):
"active": m.active, # PrimitiveField in generate_composite
"bolt12": m.bolt12, # PrimitiveField in generate_composite
"description": m.description, # PrimitiveField in generate_composite
"force_paths": m.force_paths, # PrimitiveField in generate_composite
"label": m.label, # PrimitiveField in generate_composite
"offer_id": hexlify(m.offer_id), # PrimitiveField in generate_composite
"single_use": m.single_use, # PrimitiveField in generate_composite
Expand Down Expand Up @@ -1790,6 +1795,7 @@ def offer2py(m):
"active": m.active, # PrimitiveField in generate_composite
"bolt12": m.bolt12, # PrimitiveField in generate_composite
"created": m.created, # PrimitiveField in generate_composite
"force_paths": m.force_paths, # PrimitiveField in generate_composite
"label": m.label, # PrimitiveField in generate_composite
"offer_id": hexlify(m.offer_id), # PrimitiveField in generate_composite
"single_use": m.single_use, # PrimitiveField in generate_composite
Expand Down
4 changes: 3 additions & 1 deletion devtools/bolt12-cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,12 @@ static bool print_blindedpaths(const char *fieldname,
tal_hex(tmpctx, p[j]->encrypted_recipient_data));
}
if (i < tal_count(blindedpay)) {
printf(" blindedpay: fee=%u/%u,cltv=%u,features=%s",
printf(" blindedpay: fee=%u/%u,cltv=%u,min/max=%s/%s,features=%s",
blindedpay[i]->fee_base_msat,
blindedpay[i]->fee_proportional_millionths,
blindedpay[i]->cltv_expiry_delta,
fmt_amount_msat(tmpctx, blindedpay[i]->htlc_minimum_msat),
fmt_amount_msat(tmpctx, blindedpay[i]->htlc_maximum_msat),
tal_hex(tmpctx, blindedpay[i]->features));
}
printf("\n");
Expand Down
16 changes: 16 additions & 0 deletions doc/schemas/decode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1624,6 +1624,8 @@
"fee_base_msat",
"fee_proportional_millionths",
"cltv_expiry_delta",
"htlc_minimum_msat",
"htlc_maximum_msat",
"features"
],
"additionalProperties": false,
Expand All @@ -1646,6 +1648,20 @@
"CLTV delta for path."
]
},
"htlc_minimum_msat": {
"type": "msat",
"added": "v26.04",
"description": [
"Minimum amount which can be sent via path."
]
},
"htlc_maximum_msat": {
"type": "msat",
"added": "v26.04",
"description": [
"Maximum amount which can be sent via path."
]
},
"features": {
"type": "hex",
"description": [
Expand Down
Loading
Loading