feat: mint builder to cdk

.pre-commit-config.yaml

@@ -1 +1 @@
-/nix/store/c904x2hnkcm7xn6bin3nf7jzsfaaylzw-pre-commit-config.json
+/nix/store/9p08fy8g4sijw8k1l9spf8npjbjk34xf-pre-commit-config.json

crates/cdk-mintd/src/lib.rs

@@ -4,7 +4,6 @@ use std::path::PathBuf;
 
 pub mod cli;
 pub mod config;
-pub mod mint;
 pub mod setup;
 
 fn expand_path(path: &str) -> Option<PathBuf> {

crates/cdk-mintd/src/main.rs

@@ -15,9 +15,9 @@ use cdk::cdk_database::{self, MintDatabase};
 use cdk::cdk_lightning;
 use cdk::cdk_lightning::MintLightning;
 use cdk::mint::{MeltQuote, Mint};
+use cdk::mint::{MintBuilder, MintMeltLimits};
 use cdk::nuts::{ContactInfo, CurrencyUnit, MeltQuoteState, MintVersion, PaymentMethod};
 use cdk::types::LnKey;
-use cdk_mintd::mint::{MintBuilder, MintMeltLimits};
 use cdk_mintd::setup::LnBackendSetup;
 use cdk_redb::MintRedbDatabase;
 use cdk_sqlite::MintSqliteDatabase;

crates/cdk-mintd/src/mint.rs → crates/cdk/src/mint/builder.rs

@@ -1,8 +1,10 @@
-use core::panic;
+//! Mint Builder
+
 use std::{collections::HashMap, sync::Arc};
 
 use anyhow::anyhow;
-use cdk::{
+
+use crate::{
     amount::Amount,
     cdk_database::{self, MintDatabase},
     cdk_lightning::{self, MintLightning},
@@ -31,6 +33,7 @@ pub struct MintBuilder {
 }
 
 impl MintBuilder {
+    /// New mint builder
     pub fn new() -> MintBuilder {
         MintBuilder::default()
     }
@@ -44,7 +47,7 @@ impl MintBuilder {
         self
     }
 
-    // Set mint url
+    /// Set mint url
     pub fn with_mint_url(mut self, mint_url: String) -> Self {
         self.mint_url = Some(mint_url);
         self
@@ -181,7 +184,6 @@ impl MintBuilder {
 
                 self.mint_info.nuts.nut19 = Some(nut19_settings);
             }
-            _ => panic!("Unsupported unit"),
         }
 
         ln.insert(ln_key.clone(), ln_backend);
@@ -206,12 +208,13 @@ impl MintBuilder {
     }
 
     /// Set pubkey
-    pub fn with_pubkey(mut self, pubkey: cdk::nuts::PublicKey) -> Self {
+    pub fn with_pubkey(mut self, pubkey: crate::nuts::PublicKey) -> Self {
         self.mint_info.pubkey = Some(pubkey);
 
         self
     }
 
+    /// Build mint
     pub async fn build(&self) -> anyhow::Result<Mint> {
         Ok(Mint::new(
             self.mint_url.as_ref().ok_or(anyhow!("Mint url not set"))?,
@@ -231,10 +234,15 @@ impl MintBuilder {
     }
 }
 
+/// Mint Melt Limits
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
 pub struct MintMeltLimits {
+    /// Min mint amount
     pub mint_min: Amount,
+    /// Max mint amount
     pub mint_max: Amount,
+    /// Min melt amount
     pub melt_min: Amount,
+    /// Max melt amount
     pub melt_max: Amount,
 }

crates/cdk/src/mint/mod.rs

@@ -25,6 +25,7 @@ use crate::types::{LnKey, QuoteTTL};
 use crate::util::unix_time;
 use crate::Amount;
 
+mod builder;
 mod check_spendable;
 mod info;
 mod keysets;
@@ -34,6 +35,7 @@ mod mint_nut04;
 mod swap;
 pub mod types;
 
+pub use builder::{MintBuilder, MintMeltLimits};
 pub use types::{MeltQuote, MintQuote};
 
 /// Cashu Mint

flake.nix

@@ -2,7 +2,7 @@
   description = "CDK Flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     rust-overlay = {
       url = "github:oxalica/rust-overlay";