renepay: fix CLTV value for the first hop

Changelog-Fixed: renepay: fix the computation of the CLTV for the first hop, it was double counting the current blockheight leading to too 900k blocks into the future.

Signed-off-by: Lagrang3 <lagrang3@protonmail.com>

Author: Lagrang3

contrib/msggen/msggen/schema.json

@@ -24597,7 +24597,7 @@
                 "updated_index": 113,
                 "short_channel_id": "116x1x1",
                 "id": 11,
-                "expiry": 281,
+                "expiry": 143,
                 "direction": "out",
                 "amount_msat": 400000,
                 "payment_hash": "3fe5289854b8924b4ebb3f61cd8f5a29f8f509cc781919230f7ee95ec2fa7c46",

doc/schemas/listhtlcs.json

@@ -314,7 +314,7 @@
             "updated_index": 113,
             "short_channel_id": "116x1x1",
             "id": 11,
-            "expiry": 281,
+            "expiry": 143,
             "direction": "out",
             "amount_msat": 400000,
             "payment_hash": "3fe5289854b8924b4ebb3f61cd8f5a29f8f509cc781919230f7ee95ec2fa7c46",

plugins/renepay/routetracker.c

@@ -449,8 +449,7 @@ struct command_result *route_sendpay_request(struct command *cmd,
 		json_add_amount_msat(req->js, "amount_msat", hop->amount);
 		json_add_node_id(req->js, "id", &hop->node_id);
 		json_add_short_channel_id(req->js, "channel", hop->scid);
-		json_add_num(req->js, "delay",
-			     hop->delay + payment->blockheight);
+		json_add_num(req->js, "delay", hop->delay);
 		json_object_end(req->js);
 
 		// FIXME: No localinvreqid is provided

tests/test_renepay.py

@@ -876,7 +876,6 @@ def test_unannounced(node_factory):
     assert ret["status"] == "complete"
 
 
-@pytest.mark.xfail(strict=True)
 def test_cltv_value(node_factory, bitcoind):
     cltv_delta = 5
     l1, l2, l3 = node_factory.line_graph(