Ongoing BP wallet improvements

Cargo.toml

@@ -57,7 +57,7 @@ toml = { workspace = true, optional = true }
 cfg_eval = { workspace = true, optional = true }
 
 [features]
-default = ["esplora"]
+default = []
 all = ["esplora", "fs"]
 esplora = ["bp-esplora"]
 fs = ["serde"]

cli/Cargo.toml

@@ -21,7 +21,7 @@ path = "src/bin/bp.rs"
 [dependencies]
 amplify = { workspace = true, features = ["serde"] }
 strict_encoding = { workspace = true }
-bp-wallet = { version = "0.11.0-beta.2", path = "..", features = ["serde", "fs"] }
+bp-wallet = { version = "0.11.0-beta.2", path = "..", features = ["serde", "fs", "esplora"] }
 bp-std = { workspace = true, features = ["serde"] }
 descriptors = { workspace = true, features = ["serde"] }
 psbt = { workspace = true, features = ["serde"] }

cli/src/command.rs

@@ -212,7 +212,8 @@ impl<O: DescriptorOpts> Exec for Args<Command, O> {
                     );
                     exit(1);
                 }
-                let index = index.unwrap_or_else(|| runtime.next_index(keychain, !*no_shift));
+                let index =
+                    index.unwrap_or_else(|| runtime.next_derivation_index(keychain, !*no_shift));
                 println!("\nTerm.\tAddress");
                 for derived_addr in
                     runtime.addresses(keychain).skip(index.index() as usize).take(*no as usize)

src/payments.rs

@@ -258,7 +258,8 @@
         let (change_vout, change_terminal) = if remaining_value
             > self.descr.generator.class().dust_limit()
         {
-            let change_index = self.next_index(params.change_keychain, params.change_shift);
+            let change_index =
+                self.next_derivation_index(params.change_keychain, params.change_shift);
             let change_terminal = Terminal::new(params.change_keychain, change_index);
             let change_vout = psbt
                 .construct_change_expect(&self.descr.generator, change_terminal, remaining_value)

src/wallet.rs

@@ -326,17 +326,39 @@
         WalletCache::with::<_, K, _, L2>(&self.descr, blockchain).map(|cache| self.cache = cache)
     }
 
-    pub fn next_index(&mut self, keychain: impl Into<Keychain>, shift: bool) -> NormalIndex {
+    pub fn to_deriver(&self) -> D
+    where
+        D: Clone,
+        K: Clone,
+    {
+        self.descr.clone()
+    }
+
+    fn last_published_derivation_index(&self, keychain: impl Into<Keychain>) -> NormalIndex {
         let keychain = keychain.into();
-        let mut idx = self
-            .address_coins()
+        self.address_coins()
             .keys()
             .filter(|ad| ad.terminal.keychain == keychain)
             .map(|ad| ad.terminal.index)
             .max()
             .as_ref()
             .map(NormalIndex::saturating_inc)
-            .unwrap_or_default();
+            .unwrap_or_default()
+    }
+
+    pub fn last_derivation_index(&self, keychain: impl Into<Keychain>) -> NormalIndex {
+        let keychain = keychain.into();
+        let last_index = self.data.last_used.get(&keychain).copied().unwrap_or_default();
+        cmp::max(last_index, self.last_published_derivation_index(keychain))
+    }
+
+    pub fn next_derivation_index(
+        &mut self,
+        keychain: impl Into<Keychain>,
+        shift: bool,
+    ) -> NormalIndex {
+        let keychain = keychain.into();
+        let mut idx = self.last_published_derivation_index(keychain);
         let last_index = self.data.last_used.entry(keychain).or_default();
         idx = cmp::max(*last_index, idx);
         if shift {
@@ -347,7 +369,7 @@
 
     pub fn next_address(&mut self, keychain: impl Into<Keychain>, shift: bool) -> Address {
         let keychain = keychain.into();
-        let index = self.next_index(keychain, shift);
+        let index = self.next_derivation_index(keychain, shift);
         self.addresses(keychain)
             .skip(index.index() as usize)
             .next()