lightningd: add created_index and updated_index to listhtlcs.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Added: JSON-RPC: `listhtlcs` has `created_index` and `updated_index` fields.

Author: rustyrussell

doc/schemas/lightning-listhtlcs.json

@@ -33,6 +33,7 @@
           "type": "object",
           "additionalProperties": false,
           "required": [
+            "created_index",
             "short_channel_id",
             "id",
             "expiry",
@@ -48,6 +49,20 @@
                 "The channel that contains/contained the HTLC."
               ]
             },
+            "created_index": {
+              "added": "v25.05",
+              "type": "u64",
+              "description": [
+                "1-based index indicating order this htlc was created in."
+              ]
+            },
+            "updated_index": {
+              "added": "v25.05",
+              "type": "u64",
+              "description": [
+                "1-based index indicating order this htlc was changed (only present if it has changed since creation)."
+              ]
+            },
             "id": {
               "type": "u64",
               "description": [

lightningd/peer_htlcs.c

@@ -3142,7 +3142,7 @@ static struct command_result *json_listhtlcs(struct command *cmd,
 	struct channel *chan;
 	struct wallet_htlc_iter *i;
 	struct short_channel_id scid;
-	u64 htlc_id;
+	u64 htlc_id, created_index, updated_index;
 	int cltv_expiry;
 	enum side owner;
 	struct amount_msat msat;
@@ -3158,12 +3158,17 @@ static struct command_result *json_listhtlcs(struct command *cmd,
 	json_array_start(response, "htlcs");
 	for (i = wallet_htlcs_first(cmd, cmd->ld->wallet, chan,
 				    &scid, &htlc_id, &cltv_expiry, &owner, &msat,
-				    &payment_hash, &hstate);
+				    &payment_hash, &hstate,
+				    &created_index, &updated_index);
 	     i;
 	     i = wallet_htlcs_next(cmd->ld->wallet, i,
 				   &scid, &htlc_id, &cltv_expiry, &owner, &msat,
-				   &payment_hash, &hstate)) {
+				   &payment_hash, &hstate,
+				   &created_index, &updated_index)) {
 		json_object_start(response, NULL);
+		json_add_u64(response, "created_index", created_index);
+		if (updated_index != 0)
+			json_add_u64(response, "updated_index", updated_index);
 		json_add_short_channel_id(response, "short_channel_id", scid);
 		json_add_u64(response, "id", htlc_id);
 		json_add_u32(response, "expiry", cltv_expiry);

tests/test_connection.py

@@ -4342,27 +4342,35 @@ def test_multichan(node_factory, executor, bitcoind):
     assert l1htlcs == l1.rpc.listhtlcs(scid12)['htlcs']
     assert l1htlcs == [{"short_channel_id": scid12,
                         "id": 0,
+                        "created_index": 1,
+                        "updated_index": 9,
                         "expiry": 117,
                         "direction": "out",
                         "amount_msat": Millisatoshi(100001001),
                         "payment_hash": inv1['payment_hash'],
                         "state": "RCVD_REMOVE_ACK_REVOCATION"},
                        {"short_channel_id": scid12,
                         "id": 1,
+                        "created_index": 2,
+                        "updated_index": 18,
                         "expiry": 117,
                         "direction": "out",
                         "amount_msat": Millisatoshi(100001001),
                         "payment_hash": inv2['payment_hash'],
                         "state": "RCVD_REMOVE_ACK_REVOCATION"},
                        {"short_channel_id": scid12,
                         "id": 2,
+                        "created_index": 3,
+                        "updated_index": 27,
                         "expiry": 135,
                         "direction": "out",
                         "amount_msat": Millisatoshi(100001001),
                         "payment_hash": inv3['payment_hash'],
                         "state": "RCVD_REMOVE_ACK_REVOCATION"},
                        {"short_channel_id": scid12,
                         "id": 3,
+                        "created_index": 4,
+                        "updated_index": 36,
                         "expiry": 135,
                         "direction": "out",
                         "amount_msat": Millisatoshi(100001001),
@@ -4373,7 +4381,16 @@ def test_multichan(node_factory, executor, bitcoind):
     for h in l1htlcs:
         h['direction'] = 'in'
         h['state'] = 'SENT_REMOVE_ACK_REVOCATION'
-    assert l2.rpc.listhtlcs(scid12)['htlcs'] == l1htlcs
+        # These won't match!
+        del h['created_index']
+        del h['updated_index']
+
+    l2htlcs = l2.rpc.listhtlcs(scid12)['htlcs']
+    for h in l2htlcs:
+        del h['created_index']
+        del h['updated_index']
+
+    assert l2htlcs == l1htlcs
 
 
 def test_mutual_reconnect_race(node_factory, executor, bitcoind):

tests/test_misc.py

@@ -3291,13 +3291,18 @@ def test_listforwards_and_listhtlcs(node_factory, bitcoind):
     assert [h['direction'] for h in c1htlcs] == ['out'] * 3
     assert [h['state'] for h in c1htlcs] == ['RCVD_REMOVE_ACK_REVOCATION'] * 3
 
-    # These should be a mirror!
+    # These should be a mirror! (Except indexes)
     c2c1htlcs = l2.rpc.listhtlcs(c12)['htlcs']
     for h in c2c1htlcs:
         assert h['state'] == 'SENT_REMOVE_ACK_REVOCATION'
         assert h['direction'] == 'in'
         h['state'] = 'RCVD_REMOVE_ACK_REVOCATION'
         h['direction'] = 'out'
+        del h['created_index']
+        del h['updated_index']
+    for h in c1htlcs:
+        del h['created_index']
+        del h['updated_index']
     assert c2c1htlcs == c1htlcs
 
     # One channel at a time should result in all htlcs.
@@ -3309,11 +3314,29 @@ def test_listforwards_and_listhtlcs(node_factory, bitcoind):
     for h in allhtlcs:
         assert h in parthtlcs
 
-    # Now, close and forget.
+    # Now, close and forget (first mine c23 close)
+    bitcoind.generate_block(1, wait_for_mempool=1)
     l2.rpc.close(c24)
+    bitcoind.generate_block(1, wait_for_mempool=1)
     l2.rpc.close(c12)
+    # Not actually deleted yet.
+    assert l2.rpc.wait('htlcs', 'deleted', 0)['deleted'] == 0
+
+    # 99 blocks is not enough for them to be deleted.
+    bitcoind.generate_block(97)
+    assert l2.rpc.wait('htlcs', 'deleted', 0)['deleted'] == 0
+
+    # This will forget c23
+    bitcoind.generate_block(1)
+    assert l2.rpc.wait('htlcs', 'deleted', 1)['deleted'] == 1
+
+    # This will forget c24
+    bitcoind.generate_block(1)
+    assert l2.rpc.wait('htlcs', 'deleted', 2)['deleted'] == 2
 
-    bitcoind.generate_block(100, wait_for_mempool=3)
+    # This will forget c12
+    bitcoind.generate_block(1)
+    assert l2.rpc.wait('htlcs', 'deleted', 3)['deleted'] == 5
 
     # Once channels are gone, htlcs are gone.
     for n in (l1, l2, l3, l4):

wallet/wallet.c

@@ -6180,7 +6180,9 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 					    enum side *owner,
 					    struct amount_msat *msat,
 					    struct sha256 *payment_hash,
-					    enum htlc_state *hstate)
+					    enum htlc_state *hstate,
+					    u64 *created_index,
+					    u64 *updated_index)
 {
 	struct wallet_htlc_iter *i = tal(ctx, struct wallet_htlc_iter);
 
@@ -6196,6 +6198,8 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 					    ", h.msatoshi"
 					    ", h.payment_hash"
 					    ", h.hstate"
+					    ", h.id"
+					    ", h.updated_index"
 					    " FROM channel_htlcs h"
 					    " WHERE channel_id = ?"
 					    " ORDER BY id ASC"));
@@ -6211,6 +6215,8 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 					    ", h.msatoshi"
 					    ", h.payment_hash"
 					    ", h.hstate"
+					    ", h.id"
+					    ", h.updated_index"
 					    " FROM channel_htlcs h"
 					    " JOIN channels ON channels.id = h.channel_id"
 					    " ORDER BY h.id ASC"));
@@ -6221,7 +6227,8 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 
 	return wallet_htlcs_next(w, i,
 				 scid, htlc_id, cltv_expiry, owner, msat,
-				 payment_hash, hstate);
+				 payment_hash, hstate,
+				 created_index, updated_index);
 }
 
 struct wallet_htlc_iter *wallet_htlcs_next(struct wallet *w,
@@ -6232,7 +6239,9 @@ struct wallet_htlc_iter *wallet_htlcs_next(struct wallet *w,
 					   enum side *owner,
 					   struct amount_msat *msat,
 					   struct sha256 *payment_hash,
-					   enum htlc_state *hstate)
+					   enum htlc_state *hstate,
+					   u64 *created_index,
+					   u64 *updated_index)
 {
 	if (!db_step(iter->stmt))
 		return tal_free(iter);
@@ -6256,6 +6265,8 @@ struct wallet_htlc_iter *wallet_htlcs_next(struct wallet *w,
 	db_col_sha256(iter->stmt, "h.payment_hash", payment_hash);
 	*cltv_expiry = db_col_int(iter->stmt, "h.cltv_expiry");
 	*hstate = db_col_int(iter->stmt, "h.hstate");
+	*created_index = db_col_u64(iter->stmt, "h.id");
+	*updated_index = db_col_u64(iter->stmt, "h.updated_index");
 	return iter;
 }
 

wallet/wallet.h

@@ -1690,7 +1690,9 @@ struct wallet_htlc_iter *wallet_htlcs_first(const tal_t *ctx,
 					    enum side *owner,
 					    struct amount_msat *msat,
 					    struct sha256 *payment_hash,
-					    enum htlc_state *hstate);
+					    enum htlc_state *hstate,
+					    u64 *created_index,
+					    u64 *updated_index);
 
 /**
  * Iterate through the htlcs table.
@@ -1708,7 +1710,9 @@ struct wallet_htlc_iter *wallet_htlcs_next(struct wallet *w,
 					   enum side *owner,
 					   struct amount_msat *msat,
 					   struct sha256 *payment_hash,
-					   enum htlc_state *hstate);
+					   enum htlc_state *hstate,
+					   u64 *created_index,
+					   u64 *updated_index);
 
 /* Make a PSBT from these utxos, or enhance @base if non-NULL. */
 struct wally_psbt *psbt_using_utxos(const tal_t *ctx,