From 925f9fcce591ba9255cc9a8476ce1182cd6c540d Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 25 Jul 2023 12:44:38 +0930
Subject: [PATCH] lightningd: migrate (and delete) old commando blacklists.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 tests/data/commando_blacklist.sqlite3.xz | Bin 0 -> 4380 bytes
 tests/test_runes.py                      |  19 +++++++++++++++++++
 wallet/wallet.c                          |  21 +++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 tests/data/commando_blacklist.sqlite3.xz

diff --git a/tests/data/commando_blacklist.sqlite3.xz b/tests/data/commando_blacklist.sqlite3.xz
new file mode 100644
index 0000000000000000000000000000000000000000..7b4633aea1ff2d8860ac008bb8672389448e819a
GIT binary patch
literal 4380
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
Wzz+babz42L#Ao{g000001X)^=qJ^da

literal 0
HcmV?d00001

diff --git a/tests/test_runes.py b/tests/test_runes.py
index 785153c2f..70ce99f6b 100644
--- a/tests/test_runes.py
+++ b/tests/test_runes.py
@@ -449,3 +449,22 @@ def test_commando_rune_migration(node_factory):
                                              'geZmO6U7yqpHn-moaX93FVMVWrDRfSNY4AXx9ypLcqg9MQ==',
                                              'unique_id': '1', 'restrictions':
                                              [], 'restrictions_as_english': ''}]}
+
+
+@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Depends on canned sqlite3 db")
+@unittest.skipIf(TEST_NETWORK != 'regtest', 'canned sqlite3 db is regtest')
+def test_commando_blacklist_migration(node_factory):
+    """Test migration from commando's datastore using db from test_commando_blacklist"""
+    l1 = node_factory.get_node(dbfile='commando_blacklist.sqlite3.xz',
+                               options={'database-upgrade': True})
+
+    # This happens really early in logs!
+    l1.daemon.logsearch_start = 0
+    l1.daemon.wait_for_logs(['Transferring commando blacklist to db: '] * 2)
+
+    # datastore should be empty:
+    assert l1.rpc.listdatastore(['commando', 'blacklist']) == {'datastore': []}
+
+    # Should match commando results!
+    assert l1.rpc.blacklistrune() == {'blacklist': [{'start': 0, 'end': 6},
+                                                    {'start': 9, 'end': 9}]}
diff --git a/wallet/wallet.c b/wallet/wallet.c
index e729d6d9e..5e6f0226b 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -5672,6 +5672,7 @@ void migrate_datastore_commando_runes(struct lightningd *ld, struct db *db)
 	struct db_stmt *stmt;
 	const char **startkey, **k;
 	const u8 *data;
+	size_t max;
 
 	/* datastore routines expect a tal_arr */
 	startkey = tal_arr(tmpctx, const char *, 2);
@@ -5701,4 +5702,24 @@ void migrate_datastore_commando_runes(struct lightningd *ld, struct db *db)
 		}
 		db_datastore_remove(db, k);
 	}
+
+	/* Now convert blacklist */
+	startkey[0] = "commando";
+	startkey[1] = "blacklist";
+
+	data = db_datastore_get(tmpctx, db, startkey, NULL);
+	max = tal_bytelen(data);
+	while (max) {
+		struct rune_blacklist b;
+
+		b.start = fromwire_u64(&data, &max);
+		b.end = fromwire_u64(&data, &max);
+
+		if (!data)
+			db_fatal(db, "Invalid commando blacklist?");
+		log_debug(ld->log, "Transferring commando blacklist to db: %"PRIu64"-%"PRIu64,
+			  b.start, b.end);
+		db_insert_blacklist(db, &b);
+	}
+	db_datastore_remove(db, startkey);
 }