fix(key-wallet): resolve semantic conflicts from merging #672 and #674

PR #674 dropped the add_to_state/bool second arg from
next_unused, next_unused_with_info, next_receive_address, and
next_change_address. PR #672's new IdentityAuthenticationBls arms
and an asset_lock_builder caller still passed the old signatures.

PR #672 added AccountType::IdentityAuthenticationEcdsa/Bls variants.
Three match statements in ManagedAccountCollection
(contains_account_type, get_by_account_type, get_by_account_type_mut)
predated those variants and needed arms routing to the existing
identity_authentication_ecdsa / _bls BTreeMaps by identity_index.

Also update two FFI mark_address_used callsites to destructure the
(bool, WalletChangeSet) tuple that #674 returns.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: QuantumExplorer

key-wallet-ffi/src/address_pool.rs

@@ -799,15 +799,15 @@ pub unsafe extern "C" fn managed_wallet_mark_address_used(
         }
         if !found {
             for account in collection.identity_authentication_ecdsa.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }
             }
         }
         if !found {
             for account in collection.identity_authentication_bls.values_mut() {
-                if account.mark_address_used(&address) {
+                if account.mark_address_used(&address).0 {
                     found = true;
                     break;
                 }

key-wallet/src/managed_account/managed_account_collection.rs

@@ -1027,6 +1027,12 @@ impl ManagedAccountCollection {
                 account,
                 key_class,
             }),
+            AccountType::IdentityAuthenticationEcdsa {
+                identity_index,
+            } => self.identity_authentication_ecdsa.contains_key(&identity_index),
+            AccountType::IdentityAuthenticationBls {
+                identity_index,
+            } => self.identity_authentication_bls.contains_key(&identity_index),
         }
     }
 
@@ -1086,6 +1092,12 @@ impl ManagedAccountCollection {
             AccountType::PlatformPayment {
                 ..
             } => None,
+            AccountType::IdentityAuthenticationEcdsa {
+                identity_index,
+            } => self.identity_authentication_ecdsa.get(&identity_index),
+            AccountType::IdentityAuthenticationBls {
+                identity_index,
+            } => self.identity_authentication_bls.get(&identity_index),
         }
     }
 
@@ -1148,6 +1160,12 @@ impl ManagedAccountCollection {
             AccountType::PlatformPayment {
                 ..
             } => None,
+            AccountType::IdentityAuthenticationEcdsa {
+                identity_index,
+            } => self.identity_authentication_ecdsa.get_mut(&identity_index),
+            AccountType::IdentityAuthenticationBls {
+                identity_index,
+            } => self.identity_authentication_bls.get_mut(&identity_index),
         }
     }
 

key-wallet/src/managed_account/mod.rs

@@ -1051,14 +1051,14 @@ impl ManagedCoreAccount {
                 // (similar to `next_bls_operator_key` for ProviderOperatorKeys).
                 // Here we only allow progression when the pool already has a
                 // pre-derived address cached (NoKeySource).
-                addresses.next_unused(&address_pool::KeySource::NoKeySource, add_to_state).map_err(
-                    |e| match e {
+                addresses.next_unused(&address_pool::KeySource::NoKeySource).map_err(|e| {
+                    match e {
                         crate::error::Error::NoKeySource => {
                             "No unused addresses available and no key source provided"
                         }
                         _ => "Failed to generate address",
-                    },
-                )
+                    }
+                })
             }
             ManagedAccountType::IdentityTopUp {
                 addresses,
@@ -1174,10 +1174,7 @@ impl ManagedCoreAccount {
                 // Here we only allow progression when the pool already has a
                 // pre-derived address cached (NoKeySource).
                 addresses
-                    .next_unused_with_info(
-                        &address_pool::KeySource::NoKeySource,
-                        add_to_state,
-                    )
+                    .next_unused_with_info(&address_pool::KeySource::NoKeySource)
                     .map_err(|e| match e {
                         crate::error::Error::NoKeySource => {
                             "No unused addresses available and no key source provided"
@@ -1343,7 +1340,7 @@ impl ManagedCoreAccount {
         let pool = pools.first_mut().ok_or("Account has no address pool")?;
 
         let info = pool
-            .next_unused_with_info(&address_pool::KeySource::NoKeySource, false)
+            .next_unused_with_info(&address_pool::KeySource::NoKeySource)
             .map_err(|_| "No unused address available")?;
 
         Ok((info.path, info.index))

key-wallet/src/wallet/managed_wallet_info/asset_lock_builder.rs

@@ -370,7 +370,7 @@ impl ManagedWalletInfo {
             .accounts
             .standard_bip44_accounts
             .get_mut(&account_index)
-            .and_then(|account| account.next_change_address(xpub.as_ref(), true).ok())
+            .and_then(|account| account.next_change_address(xpub.as_ref()).ok())
             .ok_or(AssetLockError::NoChangeAddress)?;
 
         let synced_height = self.synced_height();
@@ -764,7 +764,7 @@ mod tests {
             .standard_bip44_accounts
             .get_mut(&0)
             .unwrap()
-            .next_receive_address(Some(&account_xpub), true)
+            .next_receive_address(Some(&account_xpub))
             .unwrap();
 
         let utxo = Utxo {