Merge remote-tracking branch 'upstream/master'

Groestlcoin · Oct 31, 2024 · afc96ba · afc96ba
2 parents 9aa3819 + b327bd3
commit afc96ba
Show file tree

Hide file tree

Showing 160 changed files with 2,850 additions and 912 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -2855,8 +2855,11 @@
         "RenepayResponse": {
             "RenePay.amount_msat": 5,
             "RenePay.amount_sent_msat": 6,
+            "RenePay.bolt11": 9,
+            "RenePay.bolt12": 10,
             "RenePay.created_at": 3,
             "RenePay.destination": 8,
+            "RenePay.groupid": 11,
             "RenePay.parts": 4,
             "RenePay.payment_hash": 2,
             "RenePay.payment_preimage": 1,
@@ -10101,6 +10104,14 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "RenePay.bolt11": {
+            "added": "v23.08",
+            "deprecated": null
+        },
+        "RenePay.bolt12": {
+            "added": "v23.08",
+            "deprecated": null
+        },
         "RenePay.created_at": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -10121,6 +10132,10 @@
             "added": "v24.08",
             "deprecated": null
         },
+        "RenePay.groupid": {
+            "added": "v23.08",
+            "deprecated": null
+        },
         "RenePay.invstring": {
             "added": "pre-v0.10.1",
             "deprecated": null

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/common/jsonrpc_errors.h b/common/jsonrpc_errors.h
@@ -51,6 +51,7 @@ enum jsonrpc_errcode {
 	PAY_INSUFFICIENT_FUNDS = 215,
 	PAY_UNREACHABLE = 216,
 	PAY_USER_ERROR = 217,
+	PAY_INJECTPAYMENTONION_FAILED = 218,
 
 	/* `fundchannel` or `withdraw` errors */
 	FUND_MAX_EXCEEDED = 300,