Deprecate pay, keysend, renepay and getroute

.msggen.json

@@ -2157,10 +2157,16 @@
             "GetRoutes.routes[].probability_ppm": 1
         },
         "GetroutesRoutesPath": {
+            "GetRoutes.routes[].path[].amount_in_msat": 7,
             "GetRoutes.routes[].path[].amount_msat": 3,
+            "GetRoutes.routes[].path[].amount_out_msat": 8,
+            "GetRoutes.routes[].path[].cltv_in": 11,
+            "GetRoutes.routes[].path[].cltv_out": 12,
             "GetRoutes.routes[].path[].delay": 5,
             "GetRoutes.routes[].path[].direction": 2,
             "GetRoutes.routes[].path[].next_node_id": 4,
+            "GetRoutes.routes[].path[].node_id_in": 9,
+            "GetRoutes.routes[].path[].node_id_out": 10,
             "GetRoutes.routes[].path[].short_channel_id": 1,
             "GetRoutes.routes[].path[].short_channel_id_dir": 6
         },
@@ -2184,6 +2190,7 @@
         "InjectpaymentonionRequest": {
             "InjectPaymentOnion.amount_msat": 3,
             "InjectPaymentOnion.cltv_expiry": 4,
+            "InjectPaymentOnion.destination": 11,
             "InjectPaymentOnion.destination_msat": 10,
             "InjectPaymentOnion.groupid": 6,
             "InjectPaymentOnion.invstring": 8,
@@ -3990,10 +3997,14 @@
         },
         "SendpayRoute": {
             "SendPay.route[].amount_msat": 5,
+            "SendPay.route[].amount_out_msat": 8,
             "SendPay.route[].channel": 4,
+            "SendPay.route[].cltv_out": 9,
             "SendPay.route[].delay": 3,
             "SendPay.route[].id": 2,
-            "SendPay.route[].msatoshi": 1
+            "SendPay.route[].msatoshi": 1,
+            "SendPay.route[].node_id_out": 7,
+            "SendPay.route[].short_channel_id_dir": 6
         },
         "SendpsbtRequest": {
             "SendPsbt.psbt": 1,
@@ -4422,8 +4433,11 @@
         },
         "XpayRequest": {
             "Xpay.amount_msat": 2,
+            "Xpay.dev_use_shadow": 11,
             "Xpay.invstring": 1,
+            "Xpay.label": 9,
             "Xpay.layers[]": 4,
+            "Xpay.localinvreqid": 10,
             "Xpay.maxdelay": 7,
             "Xpay.maxfee": 3,
             "Xpay.partial_msat": 6,
@@ -8455,20 +8469,44 @@
             "added": "v24.08",
             "deprecated": null
         },
+        "GetRoutes.routes[].path[].amount_in_msat": {
+            "added": "v26.06",
+            "deprecated": null
+        },
         "GetRoutes.routes[].path[].amount_msat": {
             "added": "v24.08",
+            "deprecated": "v26.06"
+        },
+        "GetRoutes.routes[].path[].amount_out_msat": {
+            "added": "v26.06",
+            "deprecated": null
+        },
+        "GetRoutes.routes[].path[].cltv_in": {
+            "added": "v26.06",
+            "deprecated": null
+        },
+        "GetRoutes.routes[].path[].cltv_out": {
+            "added": "v26.06",
             "deprecated": null
         },
         "GetRoutes.routes[].path[].delay": {
             "added": "v24.08",
-            "deprecated": null
+            "deprecated": "v26.06"
         },
         "GetRoutes.routes[].path[].direction": {
             "added": "v24.08",
             "deprecated": null
         },
         "GetRoutes.routes[].path[].next_node_id": {
             "added": "v24.08",
+            "deprecated": "v26.06"
+        },
+        "GetRoutes.routes[].path[].node_id_in": {
+            "added": "v26.06",
+            "deprecated": null
+        },
+        "GetRoutes.routes[].path[].node_id_out": {
+            "added": "v26.06",
             "deprecated": null
         },
         "GetRoutes.routes[].path[].short_channel_id": {
@@ -8675,6 +8713,10 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "InjectPaymentOnion.destination": {
+            "added": "v26.06",
+            "deprecated": null
+        },
         "InjectPaymentOnion.destination_msat": {
             "added": "v24.11.1",
             "deprecated": null
@@ -13483,10 +13525,18 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "SendPay.route[].amount_out_msat": {
+            "added": "v26.06",
+            "deprecated": null
+        },
         "SendPay.route[].channel": {
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "SendPay.route[].cltv_out": {
+            "added": "v26.06",
+            "deprecated": null
+        },
         "SendPay.route[].delay": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -13495,6 +13545,14 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "SendPay.route[].node_id_out": {
+            "added": "v26.06",
+            "deprecated": null
+        },
+        "SendPay.route[].short_channel_id_dir": {
+            "added": "v26.06",
+            "deprecated": null
+        },
         "SendPay.status": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -14675,6 +14733,10 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "Xpay.dev_use_shadow": {
+            "added": "v26.06",
+            "deprecated": null
+        },
         "Xpay.failed_parts": {
             "added": "v24.11",
             "deprecated": null
@@ -14683,10 +14745,18 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "Xpay.label": {
+            "added": "v24.11",
+            "deprecated": null
+        },
         "Xpay.layers[]": {
             "added": "v24.11",
             "deprecated": null
         },
+        "Xpay.localinvreqid": {
+            "added": "v24.11",
+            "deprecated": null
+        },
         "Xpay.maxdelay": {
             "added": "v25.02",
             "deprecated": null

bitcoin/psbt.c

@@ -673,9 +673,7 @@ size_t psbt_output_get_weight(const struct wally_psbt *psbt,
 
 static void add(u8 **key, const void *mem, size_t len)
 {
-	size_t oldlen = tal_count(*key);
-	tal_resize(key, oldlen + len);
-	memcpy(*key + oldlen, memcheck(mem, len), len);
+	tal_arr_appendn(key, mem, len);
 }
 
 static void add_type(u8 **key, const u8 num)

bitcoin/script.c

@@ -37,9 +37,7 @@ static void hash160(struct ripemd160 *redeemhash, const void *mem, size_t len)
 
 static void add(u8 **scriptp, const void *mem, size_t len)
 {
-	size_t oldlen = tal_count(*scriptp);
-	tal_resize(scriptp, oldlen + len);
-	memcpy(*scriptp + oldlen, mem, len);
+	tal_arr_appendn(scriptp, mem, len);
 }
 
 static void add_op(u8 **scriptp, u8 op)

ccan/README

@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2611-g050dc66d
+CCAN version: init-2612-ge242779f

ccan/ccan/json_escape/json_escape.c

@@ -20,6 +20,14 @@ bool json_escape_eq(const struct json_escape *a, const struct json_escape *b)
 	return streq(a->s, b->s);
 }
 
+struct json_escape *json_escape_dup(const tal_t *ctx, const struct json_escape *esc TAKES)
+{
+	if (taken(esc))
+		return (struct json_escape *)tal_steal(ctx, esc);
+
+	return json_escape_string_(ctx, esc->s, strlen(esc->s));
+}
+
 bool json_escape_needed(const char *str, size_t len)
 {
 	size_t i;

ccan/ccan/json_escape/json_escape.h

@@ -27,6 +27,9 @@ struct json_escape *json_escape_len(const tal_t *ctx,
 struct json_escape *json_partial_escape(const tal_t *ctx,
 					 const char *str TAKES);
 
+/* Copy a json_escape */
+struct json_escape *json_escape_dup(const tal_t *ctx, const struct json_escape *esc TAKES);
+
 /* Do we need to escape this str? */
 bool json_escape_needed(const char *str, size_t len);
 

ccan/ccan/json_escape/test/run.c

@@ -9,7 +9,7 @@ int main(void)
 	struct json_escape *e;
 
 	/* This is how many tests you plan to run */
-	plan_tests(6);
+	plan_tests(8);
 
 	e = json_escape(ctx, "Hello");
 	ok1(!strcmp(e->s, "Hello"));
@@ -25,6 +25,7 @@ int main(void)
 	ok1(!strcmp(json_escape_unescape(ctx, e),
 		    "\\\b\f\n\r\t\""
 		    "\\\\\\b\\f\\n\\r\\t\\\""));
+	ok1(json_escape_eq(e, json_escape_dup(ctx, e)));
 
 	/* This one doesn't escape the already-escaped chars */
 	e = json_partial_escape(ctx,
@@ -36,6 +37,7 @@ int main(void)
 	ok1(!strcmp(json_escape_unescape(ctx, e),
 		    "\\\b\f\n\r\t\""
 		    "\\\b\f\n\r\t\""));
+	ok1(json_escape_eq(e, json_escape_dup(ctx, e)));
 
 	tal_free(ctx);