temp 2: peek addresses for any number of descriptors

Author: thunderbiscuit

Cargo.toml

@@ -2,7 +2,6 @@
 resolver = "2"
 members = [
     "wallet",
-    "examples/example_wallet_n_keychains"
 #    "examples/example_wallet_electrum",
 #    "examples/example_wallet_esplora_blocking",
 #    "examples/example_wallet_esplora_async",

wallet/examples/n_keychains.rs

@@ -1,23 +1,36 @@
+use bdk_chain::DescriptorId;
 use bdk_wallet::{KeyRing, Wallet};
 use bdk_wallet::bitcoin::Network;
 use bdk_wallet::KeychainKind;
 
 const EXTERNAL_DESC: &str = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)";
 const OTHER_DESC_21: &str = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/21/*)";
-const OTHER_DESC_33: &str = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/33/*)";
-const OTHER_DESC_44: &str = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/44/*)";
+const OTHER_DESC_31: &str = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/33/*)";
+const OTHER_DESC_41: &str = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/44/*)";
 
 fn main() -> Result<(), anyhow::Error> {
+    // Create a keyring with a single, default descriptor (aka the KeychainKind::External from the 1.2.0 API)
     let mut keyring = KeyRing::new(EXTERNAL_DESC, Network::Testnet4);
-    // keyring.add_other_descriptor(OTHER_DESC_21);
-    // let keychains = keyring.list_keychains();
-    // println!("{:?}", keychains);
 
+    // Add 3 new custom descriptors
+    keyring.add_other_descriptor(OTHER_DESC_21);
+    keyring.add_other_descriptor(OTHER_DESC_31);
+    keyring.add_other_descriptor(OTHER_DESC_41);
+
+    let keychain_ids: Vec<DescriptorId> = keyring.list_keychain_ids();
+    println!("{:?}", keychain_ids);
+
+    // Create the wallet and peek addresses on each of the descriptors
     let wallet: Wallet = Wallet::new(keyring).create_wallet_no_persist()?;
     let address_1 = wallet.peek_address(KeychainKind::Default, 0).unwrap();
-    // let address_2 = wallet.peek_address((KeychainKind::Other(), 0).unwrap();
+    let address_2 = wallet.peek_address(KeychainKind::Other(keychain_ids[1]), 0).unwrap();
+    let address_3 = wallet.peek_address(KeychainKind::Other(keychain_ids[2]), 0).unwrap();
+    let address_4 = wallet.peek_address(KeychainKind::Other(keychain_ids[3]), 0).unwrap();
 
-    println!("Address {:?} at index {:?} on keychain {:?}", address_1.address, address_1.index, address_1.keychain);
+    println!("Address 1 {:?} at index {:?} on keychain {:?}", address_1.address, address_1.index, address_1.keychain);
+    println!("Address 2 {:?} at index {:?} on keychain {:?}", address_2.address, address_2.index, address_2.keychain);
+    println!("Address 3 {:?} at index {:?} on keychain {:?}", address_3.address, address_3.index, address_3.keychain);
+    println!("Address 4 {:?} at index {:?} on keychain {:?}", address_4.address, address_4.index, address_4.keychain);
 
     Ok(())
 }

wallet/src/types.rs

@@ -131,6 +131,17 @@ impl KeyRing {
         &self.keychains
     }
 
+    pub fn list_keychain_ids(&self) -> Vec<DescriptorId> {
+        self.keychains
+            .iter()
+            .map(|keychain| match keychain.0 {
+                KeychainKind::Other(descriptor_id) => descriptor_id,
+                KeychainKind::Default => keychain.1.0.descriptor_id(),
+                KeychainKind::Change => keychain.1.0.descriptor_id(),
+            })
+            .collect()
+    }
+
     // pub fn add_change_keychain(&mut self, keychain: (DescriptorToExtract, KeyMap), keychain_identifier: KeychainIdentifier) {
     //
     // }

wallet/src/wallet/mod.rs

@@ -2544,7 +2544,7 @@ fn new_local_utxo(
 }
 
 fn create_indexer(
-    keychain_set: KeyRing,
+    keyring: KeyRing,
     // descriptor: ExtendedDescriptor,
     // change_descriptor: Option<ExtendedDescriptor>,
     lookahead: u32,
@@ -2553,10 +2553,17 @@ fn create_indexer(
 
     // let (descriptor, keymap) = descriptor;
     // let signers = Arc::new(SignersContainer::build(keymap, &descriptor, secp));
-    let default_keychain = keychain_set.get_default_keychain().clone();
-    assert!(indexer
-        .insert_descriptor(default_keychain.0, default_keychain.1.0)
-        .expect("first descriptor introduced must succeed"));
+    let default_keychain = keyring.get_default_keychain().clone();
+    // TODO: KeyRings always have at least one descriptor, so I think we don't need this assert
+    // assert!(indexer
+    //     .insert_descriptor(default_keychain.0, default_keychain.1.0)
+    //     .expect("first descriptor introduced must succeed"));
+
+    // TODO: I'm here, May 2
+    keyring.list_keychains().iter().for_each(|k| {
+        indexer.insert_descriptor(k.0, k.1.0.clone()).expect("This should work");
+        dbg!("Inserting descriptor into indexer");
+    });
 
     // let (descriptor, keymap) = change_descriptor;
     // let change_signers = Arc::new(SignersContainer::build(keymap, &descriptor, secp));