|
@@ -4,13 +4,11 @@ use std::collections::HashMap;
|
|
|
use std::sync::Arc;
|
|
|
|
|
|
use arc_swap::ArcSwap;
|
|
|
-use bitcoin::bip32::{DerivationPath, Xpriv};
|
|
|
-use bitcoin::secp256k1;
|
|
|
use cdk_common::common::{PaymentProcessorKey, QuoteTTL};
|
|
|
#[cfg(feature = "auth")]
|
|
|
use cdk_common::database::MintAuthDatabase;
|
|
|
use cdk_common::database::{self, MintDatabase};
|
|
|
-use cdk_common::nuts::{self, BlindSignature, BlindedMessage, CurrencyUnit, Id, Kind, MintKeySet};
|
|
|
+use cdk_common::nuts::{self, BlindSignature, BlindedMessage, CurrencyUnit, Id, Kind};
|
|
|
use cdk_common::secret;
|
|
|
use cdk_signatory::signatory::{Signatory, SignatoryKeySet};
|
|
|
use futures::StreamExt;
|
|
@@ -26,7 +24,6 @@ use crate::cdk_payment::{self, MintPayment};
|
|
|
use crate::error::Error;
|
|
|
use crate::fees::calculate_fee;
|
|
|
use crate::nuts::*;
|
|
|
-use crate::util::unix_time;
|
|
|
use crate::Amount;
|
|
|
#[cfg(feature = "auth")]
|
|
|
use crate::OidcClient;
|
|
@@ -537,39 +534,6 @@ impl Mint {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-/// Generate new [`MintKeySetInfo`] from path
|
|
|
-#[instrument(skip_all)]
|
|
|
-fn create_new_keyset<C: secp256k1::Signing>(
|
|
|
- secp: &secp256k1::Secp256k1<C>,
|
|
|
- xpriv: Xpriv,
|
|
|
- derivation_path: DerivationPath,
|
|
|
- derivation_path_index: Option<u32>,
|
|
|
- unit: CurrencyUnit,
|
|
|
- max_order: u8,
|
|
|
- input_fee_ppk: u64,
|
|
|
-) -> (MintKeySet, MintKeySetInfo) {
|
|
|
- let keyset = MintKeySet::generate(
|
|
|
- secp,
|
|
|
- xpriv
|
|
|
- .derive_priv(secp, &derivation_path)
|
|
|
- .expect("RNG busted"),
|
|
|
- unit,
|
|
|
- max_order,
|
|
|
- );
|
|
|
- let keyset_info = MintKeySetInfo {
|
|
|
- id: keyset.id,
|
|
|
- unit: keyset.unit.clone(),
|
|
|
- active: true,
|
|
|
- valid_from: unix_time(),
|
|
|
- valid_to: None,
|
|
|
- derivation_path,
|
|
|
- derivation_path_index,
|
|
|
- max_order,
|
|
|
- input_fee_ppk,
|
|
|
- };
|
|
|
- (keyset, keyset_info)
|
|
|
-}
|
|
|
-
|
|
|
#[cfg(test)]
|
|
|
mod tests {
|
|
|
use std::str::FromStr;
|