From dbadfc35b8a3035af2fc4fb3da5f562c57dadbf7 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Tue, 24 Jun 2025 13:34:28 +0100 Subject: [PATCH] Revert "fix: creating auth keyset when auth disabled" --- crates/cdk-cli/src/sub_commands/check_pending.rs | 2 +- crates/cdk-signatory/src/db_signatory.rs | 4 +++- crates/cdk/src/mint/builder.rs | 10 +--------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/crates/cdk-cli/src/sub_commands/check_pending.rs b/crates/cdk-cli/src/sub_commands/check_pending.rs index ad56a546..437bee94 100644 --- a/crates/cdk-cli/src/sub_commands/check_pending.rs +++ b/crates/cdk-cli/src/sub_commands/check_pending.rs @@ -26,7 +26,7 @@ pub async fn check_pending(multi_mint_wallet: &MultiMintWallet) -> Result<()> { // Try to reclaim any proofs that are no longer pending match wallet.reclaim_unspent(pending_proofs).await { Ok(()) => println!("Successfully reclaimed pending proofs"), - Err(e) => println!("Error reclaimed pending proofs: {e}"), + Err(e) => println!("Error reclaimed pending proofs: {}", e), } } Ok(()) diff --git a/crates/cdk-signatory/src/db_signatory.rs b/crates/cdk-signatory/src/db_signatory.rs index f692c5c9..834e2309 100644 --- a/crates/cdk-signatory/src/db_signatory.rs +++ b/crates/cdk-signatory/src/db_signatory.rs @@ -37,7 +37,7 @@ impl DbSignatory { pub async fn new( localstore: Arc + Send + Sync>, seed: &[u8], - supported_units: HashMap, + mut supported_units: HashMap, custom_paths: HashMap, ) -> Result { let secp_ctx = Secp256k1::new(); @@ -52,6 +52,8 @@ impl DbSignatory { ) .await?; + supported_units.entry(CurrencyUnit::Auth).or_insert((0, 1)); + // Create new keysets for supported units that aren't covered by the current keysets for (unit, (fee, max_order)) in supported_units { if !active_keyset_units.contains(&unit) { diff --git a/crates/cdk/src/mint/builder.rs b/crates/cdk/src/mint/builder.rs index c51094d6..4f85e057 100644 --- a/crates/cdk/src/mint/builder.rs +++ b/crates/cdk/src/mint/builder.rs @@ -340,14 +340,6 @@ impl MintBuilder { .ok_or(anyhow!("Localstore not set"))?; let ln = self.ln.clone().ok_or(anyhow!("Ln backends not set"))?; - #[allow(unused_mut)] - let mut supported_units = self.supported_units.clone(); - - #[cfg(feature = "auth")] - if self.openid_discovery.is_some() { - supported_units.entry(CurrencyUnit::Auth).or_insert((0, 1)); - } - let signatory = if let Some(signatory) = self.signatory.as_ref() { signatory.clone() } else { @@ -355,7 +347,7 @@ impl MintBuilder { let in_memory_signatory = cdk_signatory::db_signatory::DbSignatory::new( self.keystore.clone().ok_or(anyhow!("keystore not set"))?, seed, - supported_units, + self.supported_units.clone(), HashMap::new(), ) .await?;