wallet: create htable to store scriptpubkeys for issued indexes.

For now we don't actually update it; that's next patch.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

tests/test_closing.py

@@ -4254,7 +4254,6 @@ def censoring_sendrawtx(r):
 
 
 @pytest.mark.slow_test
-@pytest.mark.xfail(strict=True)
 def test_slow_startup_many_addresses(node_factory, bitcoind):
     l1, l2 = node_factory.get_nodes(2)
 

wallet/test/run-db.c

@@ -299,6 +299,9 @@ const char *rune_is_ours(struct lightningd *ld UNNEEDED, const struct rune *rune
 /* Generated stub for rune_unique_id */
 u64 rune_unique_id(const struct rune *rune UNNEEDED)
 { fprintf(stderr, "rune_unique_id called!\n"); abort(); }
+/* Generated stub for scriptpubkey_hash */
+size_t scriptpubkey_hash(const u8 *out UNNEEDED)
+{ fprintf(stderr, "scriptpubkey_hash called!\n"); abort(); }
 /* Generated stub for sendpay_index_created */
 u64 sendpay_index_created(struct lightningd *ld UNNEEDED,
 			  const struct sha256 *payment_hash UNNEEDED,

wallet/test/run-wallet.c

@@ -956,6 +956,9 @@ const char *rune_is_ours(struct lightningd *ld UNNEEDED, const struct rune *rune
 /* Generated stub for rune_unique_id */
 u64 rune_unique_id(const struct rune *rune UNNEEDED)
 { fprintf(stderr, "rune_unique_id called!\n"); abort(); }
+/* Generated stub for scriptpubkey_hash */
+size_t scriptpubkey_hash(const u8 *out UNNEEDED)
+{ fprintf(stderr, "scriptpubkey_hash called!\n"); abort(); }
 /* Generated stub for serialize_onionpacket */
 u8 *serialize_onionpacket(
 	const tal_t *ctx UNNEEDED,

wallet/txfilter.c

@@ -7,7 +7,7 @@
 #include <wallet/txfilter.h>
 #include <wallet/wallet.h>
 
-static size_t scriptpubkey_hash(const u8 *out)
+size_t scriptpubkey_hash(const u8 *out)
 {
 	struct siphash24_ctx ctx;
 	siphash24_init(&ctx, siphash_seed());

wallet/txfilter.h

@@ -66,4 +66,8 @@ void outpointfilter_remove(struct outpointfilter *of,
 
 void memleak_scan_outpointfilter(struct htable *memtable,
 				 const struct outpointfilter *opf);
+
+/* Useful for other callers */
+size_t scriptpubkey_hash(const u8 *out);
+
 #endif /* LIGHTNING_WALLET_TXFILTER_H */

wallet/wallet.c

@@ -7,6 +7,7 @@
 #include <channeld/channeld_wiregen.h>
 #include <common/blockheight_states.h>
 #include <common/fee_states.h>
+#include <common/memleak.h>
 #include <common/onionreply.h>
 #include <common/trace.h>
 #include <db/bindings.h>
@@ -64,6 +65,111 @@ static enum state_change state_change_in_db(enum state_change s)
 	fatal("%s: %u is invalid", __func__, s);
 }
 
+/* We keep a hash of these, for fast lookup */
+struct wallet_address {
+	u32 index;
+	enum addrtype addrtype;
+	const u8 *scriptpubkey;
+};
+
+static const u8 *wallet_address_keyof(const struct wallet_address *waddr)
+{
+	return waddr->scriptpubkey;
+}
+
+static bool wallet_address_eq_scriptpubkey(const struct wallet_address *waddr,
+					   const u8 *scriptpubkey)
+{
+	return tal_arr_eq(waddr->scriptpubkey, scriptpubkey);
+}
+
+HTABLE_DEFINE_NODUPS_TYPE(struct wallet_address,
+			  wallet_address_keyof,
+			  scriptpubkey_hash,
+			  wallet_address_eq_scriptpubkey,
+			  wallet_address_htable);
+
+static void our_addresses_add(struct wallet_address_htable *our_addresses,
+			      u32 index,
+			      const u8 *scriptpubkey TAKES,
+			      enum addrtype addrtype)
+{
+	struct wallet_address *waddr = tal(our_addresses, struct wallet_address);
+
+	waddr->index = index;
+	waddr->addrtype = addrtype;
+	waddr->scriptpubkey = tal_dup_talarr(waddr, u8, scriptpubkey);
+	wallet_address_htable_add(our_addresses, waddr);
+}
+
+static void our_addresses_add_for_index(struct wallet *w, u32 i)
+{
+	struct ext_key ext;
+	enum addrtype addrtype;
+	const u8 *scriptpubkey;
+	const u32 flags = BIP32_FLAG_KEY_PUBLIC | BIP32_FLAG_SKIP_HASH;
+
+	if (bip32_key_from_parent(w->ld->bip32_base, i,
+				  flags, &ext) != WALLY_OK) {
+		abort();
+	}
+
+	/* If we don't know (prior to 24.11), just add all
+	 * possibilities. */
+	/* FIXME: We could deprecate P2SH once we don't see
+	 * any, since we stopped publishing them in 24.02 */
+	if (!wallet_get_addrtype(w, i, &addrtype)) {
+		scriptpubkey = scriptpubkey_p2wpkh_derkey(NULL, ext.pub_key);
+		our_addresses_add(w->our_addresses,
+				  i,
+				  take(scriptpubkey_p2sh(NULL, scriptpubkey)),
+				  ADDR_P2SH_SEGWIT);
+		our_addresses_add(w->our_addresses,
+				  i,
+				  take(scriptpubkey),
+				  ADDR_BECH32);
+		scriptpubkey = scriptpubkey_p2tr_derkey(NULL, ext.pub_key);
+		our_addresses_add(w->our_addresses,
+				  i,
+				  take(scriptpubkey),
+				  ADDR_P2TR);
+		return;
+	}
+
+	switch (addrtype) {
+		/* This doesn't happen */
+	case ADDR_P2SH_SEGWIT:
+		abort();
+	case ADDR_BECH32:
+	case ADDR_ALL:
+		scriptpubkey = scriptpubkey_p2wpkh_derkey(NULL, ext.pub_key);
+		our_addresses_add(w->our_addresses,
+				  i,
+				  take(scriptpubkey),
+				  ADDR_BECH32);
+		if (addrtype != ADDR_ALL)
+			return;
+	/* Fall thru */
+	case ADDR_P2TR:
+		scriptpubkey = scriptpubkey_p2tr_derkey(NULL, ext.pub_key);
+		our_addresses_add(w->our_addresses,
+				  i,
+				  take(scriptpubkey),
+				  ADDR_P2TR);
+		return;
+	}
+	abort();
+}
+
+static void our_addresses_init(struct wallet *w)
+{
+	w->our_addresses_maxindex = 0;
+	w->our_addresses = tal(w, struct wallet_address_htable);
+	wallet_address_htable_init(w->our_addresses);
+
+	our_addresses_add_for_index(w, w->our_addresses_maxindex);
+}
+
 static void outpointfilters_init(struct wallet *w)
 {
 	struct db_stmt *stmt;
@@ -114,6 +220,10 @@ struct wallet *wallet_new(struct lightningd *ld, struct timers *timers)
 	outpointfilters_init(wallet);
 	trace_span_end(wallet);
 
+	trace_span_start("our_addresses_init", wallet);
+	our_addresses_init(wallet);
+	trace_span_end(wallet);
+
 	db_commit_transaction(wallet->db);
 	return wallet;
 }
@@ -6420,6 +6530,7 @@ void wallet_memleak_scan(struct htable *memtable, const struct wallet *w)
 {
 	memleak_scan_outpointfilter(memtable, w->utxoset_outpoints);
 	memleak_scan_outpointfilter(memtable, w->owned_outpoints);
+	memleak_scan_htable(memtable, &w->our_addresses->raw);
 }
 
 struct issued_address_type *wallet_list_addresses(const tal_t *ctx, struct wallet *wallet,

wallet/wallet.h

@@ -48,6 +48,10 @@ struct wallet {
 	 * the blockchain. This is currently all P2WSH outputs */
 	struct outpointfilter *utxoset_outpoints;
 
+	/* Our issued wallet addresses.  We update on lookup. */
+	u32 our_addresses_maxindex;
+	struct wallet_address_htable *our_addresses;
+
 	/* How many keys should we look ahead at most? */
 	u64 keyscan_gap;
 };