Use Wallet TransactionDatabase; Create WalletBuilder

crates/cdk-cli/src/main.rs

@@ -6,10 +6,10 @@ use std::sync::Arc;
 use anyhow::{bail, Result};
 use bip39::rand::{thread_rng, Rng};
 use bip39::Mnemonic;
-use cdk::cdk_database;
-use cdk::cdk_database::WalletDatabase;
+use cdk::cdk_database::WalletProofDatabase;
+use cdk::nuts::CurrencyUnit;
 use cdk::wallet::client::HttpClient;
-use cdk::wallet::{MultiMintWallet, Wallet};
+use cdk::wallet::{MultiMintWallet, Wallet, WalletBuilder};
 use cdk_redb::WalletRedbDatabase;
 use cdk_sqlite::WalletSqliteDatabase;
 use clap::{Parser, Subcommand};
@@ -102,24 +102,6 @@ async fn main() -> Result<()> {
 
     fs::create_dir_all(&work_dir)?;
 
-    let localstore: Arc<dyn WalletDatabase<Err = cdk_database::Error> + Send + Sync> =
-        match args.engine.as_str() {
-            "sqlite" => {
-                let sql_path = work_dir.join("cdk-cli.sqlite");
-                let sql = WalletSqliteDatabase::new(&sql_path).await?;
-
-                sql.migrate().await;
-
-                Arc::new(sql)
-            }
-            "redb" => {
-                let redb_path = work_dir.join("cdk-cli.redb");
-
-                Arc::new(WalletRedbDatabase::new(&redb_path)?)
-            }
-            _ => bail!("Unknown DB engine"),
-        };
-
     let seed_path = work_dir.join("seed");
 
     let mnemonic = match fs::metadata(seed_path.clone()) {
@@ -140,24 +122,40 @@ async fn main() -> Result<()> {
         }
     };
 
-    let mut wallets: Vec<Wallet> = Vec::new();
+    let mut builder = WalletBuilder::new(mnemonic.to_seed_normalized("").to_vec());
+
+    let mints = match args.engine.as_str() {
+        "sqlite" => {
+            let sql_path = work_dir.join("cdk-cli.sqlite");
+            let sql = WalletSqliteDatabase::new(&sql_path).await?;
 
-    let mints = localstore.get_mints().await?;
+            sql.migrate().await;
+
+            let db = Arc::new(sql);
+            builder = builder.proof_db(db.clone()).transaction_db(db.clone());
+            db.get_mints().await?
+        }
+        "redb" => {
+            let redb_path = work_dir.join("cdk-cli.redb");
+
+            let db = Arc::new(WalletRedbDatabase::new(&redb_path)?);
+            builder = builder.proof_db(db.clone()).transaction_db(db.clone());
+            db.get_mints().await?
+        }
+        _ => bail!("Unknown DB engine"),
+    };
+
+    let mut wallets: Vec<Wallet> = Vec::new();
 
     for (mint_url, _) in mints {
-        let mut wallet = Wallet::new(
-            &mint_url.to_string(),
-            cdk::nuts::CurrencyUnit::Sat,
-            localstore.clone(),
-            &mnemonic.to_seed_normalized(""),
-            None,
-        )?;
+        let mut builder = builder.clone();
+
         if let Some(proxy_url) = args.proxy.as_ref() {
-            let http_client = HttpClient::with_proxy(mint_url, proxy_url.clone(), None, true)?;
-            wallet.set_client(http_client);
+            let http_client =
+                HttpClient::with_proxy(mint_url.clone(), proxy_url.clone(), None, true)?;
+            builder = builder.client(Arc::new(http_client));
         }
-
-        wallets.push(wallet);
+        wallets.push(builder.build(mint_url, CurrencyUnit::Sat)?);
     }
 
     let multi_mint_wallet = MultiMintWallet::new(wallets);
@@ -171,13 +169,7 @@ async fn main() -> Result<()> {
             sub_commands::melt::pay(&multi_mint_wallet, sub_command_args).await
         }
         Commands::Receive(sub_command_args) => {
-            sub_commands::receive::receive(
-                &multi_mint_wallet,
-                localstore,
-                &mnemonic.to_seed_normalized(""),
-                sub_command_args,
-            )
-            .await
+            sub_commands::receive::receive(&multi_mint_wallet, builder, sub_command_args).await
         }
         Commands::Send(sub_command_args) => {
             sub_commands::send::send(&multi_mint_wallet, sub_command_args).await
@@ -189,13 +181,7 @@ async fn main() -> Result<()> {
             sub_commands::mint_info::mint_info(args.proxy, sub_command_args).await
         }
         Commands::Mint(sub_command_args) => {
-            sub_commands::mint::mint(
-                &multi_mint_wallet,
-                &mnemonic.to_seed_normalized(""),
-                localstore,
-                sub_command_args,
-            )
-            .await
+            sub_commands::mint::mint(&multi_mint_wallet, builder, sub_command_args).await
         }
         Commands::MintPending => {
             sub_commands::pending_mints::mint_pending(&multi_mint_wallet).await
@@ -204,13 +190,7 @@ async fn main() -> Result<()> {
             sub_commands::burn::burn(&multi_mint_wallet, sub_command_args).await
         }
         Commands::Restore(sub_command_args) => {
-            sub_commands::restore::restore(
-                &multi_mint_wallet,
-                &mnemonic.to_seed_normalized(""),
-                localstore,
-                sub_command_args,
-            )
-            .await
+            sub_commands::restore::restore(&multi_mint_wallet, builder, sub_command_args).await
         }
         Commands::UpdateMintUrl(sub_command_args) => {
             sub_commands::update_mint_url::update_mint_url(&multi_mint_wallet, sub_command_args)

crates/cdk-cli/src/sub_commands/mint.rs

@@ -1,14 +1,12 @@
 use std::str::FromStr;
-use std::sync::Arc;
 
 use anyhow::Result;
 use cdk::amount::SplitTarget;
-use cdk::cdk_database::{Error, WalletDatabase};
 use cdk::mint_url::MintUrl;
 use cdk::nuts::nut00::ProofsMethods;
 use cdk::nuts::{CurrencyUnit, MintQuoteState, NotificationPayload};
 use cdk::wallet::types::WalletKey;
-use cdk::wallet::{MultiMintWallet, Wallet, WalletSubscription};
+use cdk::wallet::{MultiMintWallet, WalletBuilder, WalletSubscription};
 use cdk::Amount;
 use clap::Args;
 use serde::{Deserialize, Serialize};
@@ -29,8 +27,7 @@ pub struct MintSubCommand {
 
 pub async fn mint(
     multi_mint_wallet: &MultiMintWallet,
-    seed: &[u8],
-    localstore: Arc<dyn WalletDatabase<Err = Error> + Sync + Send>,
+    builder: WalletBuilder,
     sub_command_args: &MintSubCommand,
 ) -> Result<()> {
     let mint_url = sub_command_args.mint_url.clone();
@@ -43,7 +40,7 @@ pub async fn mint(
     {
         Some(wallet) => wallet.clone(),
         None => {
-            let wallet = Wallet::new(&mint_url.to_string(), unit, localstore, seed, None)?;
+            let wallet = builder.build(mint_url.clone(), CurrencyUnit::Sat)?;
 
             multi_mint_wallet.add_wallet(wallet.clone()).await;
             wallet

crates/cdk-cli/src/sub_commands/receive.rs

@@ -1,14 +1,12 @@
 use std::collections::HashSet;
 use std::str::FromStr;
-use std::sync::Arc;
 
 use anyhow::{anyhow, Result};
-use cdk::cdk_database::{self, WalletDatabase};
 use cdk::nuts::{SecretKey, Token};
 use cdk::util::unix_time;
 use cdk::wallet::multi_mint_wallet::MultiMintWallet;
 use cdk::wallet::types::WalletKey;
-use cdk::wallet::Wallet;
+use cdk::wallet::WalletBuilder;
 use cdk::Amount;
 use clap::Args;
 use nostr_sdk::nips::nip04;
@@ -37,8 +35,7 @@ pub struct ReceiveSubCommand {
 
 pub async fn receive(
     multi_mint_wallet: &MultiMintWallet,
-    localstore: Arc<dyn WalletDatabase<Err = cdk_database::Error> + Send + Sync>,
-    seed: &[u8],
+    builder: WalletBuilder,
     sub_command_args: &ReceiveSubCommand,
 ) -> Result<()> {
     let mut signing_keys = Vec::new();
@@ -64,15 +61,18 @@ pub async fn receive(
         Some(token_str) => {
             receive_token(
                 multi_mint_wallet,
-                localstore,
-                seed,
+                builder,
                 token_str,
                 &signing_keys,
                 &sub_command_args.preimage,
             )
             .await?
         }
         None => {
+            let proof_db = builder
+                .proof_db
+                .clone()
+                .ok_or(anyhow!("Proof db required"))?;
             //wallet.add_p2pk_signing_key(nostr_signing_key).await;
             let nostr_key = match sub_command_args.nostr_key.as_ref() {
                 Some(nostr_key) => {
@@ -89,7 +89,7 @@ pub async fn receive(
             signing_keys.push(nostr_key.clone());
 
             let relays = sub_command_args.relay.clone();
-            let since = localstore
+            let since = proof_db
                 .get_nostr_last_checked(&nostr_key.public_key())
                 .await?;
 
@@ -99,8 +99,7 @@ pub async fn receive(
             for token_str in &tokens {
                 match receive_token(
                     multi_mint_wallet,
-                    localstore.clone(),
-                    seed,
+                    builder.clone(),
                     token_str,
                     &signing_keys,
                     &sub_command_args.preimage,
@@ -116,7 +115,7 @@ pub async fn receive(
                 }
             }
 
-            localstore
+            proof_db
                 .add_nostr_last_checked(nostr_key.public_key(), unix_time() as u32)
                 .await?;
             total_amount
@@ -130,8 +129,7 @@ pub async fn receive(
 
 async fn receive_token(
     multi_mint_wallet: &MultiMintWallet,
-    localstore: Arc<dyn WalletDatabase<Err = cdk_database::Error> + Send + Sync>,
-    seed: &[u8],
+    builder: WalletBuilder,
     token_str: &str,
     signing_keys: &[SecretKey],
     preimage: &[String],
@@ -143,13 +141,7 @@ async fn receive_token(
     let wallet_key = WalletKey::new(mint_url.clone(), token.unit().unwrap_or_default());
 
     if multi_mint_wallet.get_wallet(&wallet_key).await.is_none() {
-        let wallet = Wallet::new(
-            &mint_url.to_string(),
-            token.unit().unwrap_or_default(),
-            localstore,
-            seed,
-            None,
-        )?;
+        let wallet = builder.build(mint_url.clone(), token.unit().unwrap_or_default())?;
         multi_mint_wallet.add_wallet(wallet).await;
     }
 

crates/cdk-cli/src/sub_commands/restore.rs

@@ -1,12 +1,10 @@
 use std::str::FromStr;
-use std::sync::Arc;
 
 use anyhow::Result;
-use cdk::cdk_database::{Error, WalletDatabase};
 use cdk::mint_url::MintUrl;
 use cdk::nuts::CurrencyUnit;
 use cdk::wallet::types::WalletKey;
-use cdk::wallet::{MultiMintWallet, Wallet};
+use cdk::wallet::{MultiMintWallet, WalletBuilder};
 use clap::Args;
 
 #[derive(Args)]
@@ -20,8 +18,7 @@ pub struct RestoreSubCommand {
 
 pub async fn restore(
     multi_mint_wallet: &MultiMintWallet,
-    seed: &[u8],
-    localstore: Arc<dyn WalletDatabase<Err = Error> + Sync + Send>,
+    builder: WalletBuilder,
     sub_command_args: &RestoreSubCommand,
 ) -> Result<()> {
     let unit = CurrencyUnit::from_str(&sub_command_args.unit)?;
@@ -33,7 +30,7 @@ pub async fn restore(
     {
         Some(wallet) => wallet.clone(),
         None => {
-            let wallet = Wallet::new(&mint_url.to_string(), unit, localstore, seed, None)?;
+            let wallet = builder.build(mint_url, CurrencyUnit::Sat)?;
 
             multi_mint_wallet.add_wallet(wallet.clone()).await;
             wallet

crates/cdk-common/src/database/mod.rs

@@ -5,10 +5,14 @@ mod mint;
 #[cfg(feature = "wallet")]
 mod wallet;
 
+use cashu::util::hex;
 #[cfg(feature = "mint")]
 pub use mint::Database as MintDatabase;
 #[cfg(feature = "wallet")]
-pub use wallet::Database as WalletDatabase;
+pub use wallet::{
+    Database as WalletDatabase, ProofDatabase as WalletProofDatabase, Transaction,
+    TransactionDatabase as WalletTransactionDatabase, TransactionDirection, TransactionId,
+};
 
 /// CDK_database error
 #[derive(Debug, thiserror::Error)]
@@ -31,4 +35,7 @@ pub enum Error {
     /// Unknown Quote
     #[error("Unknown Quote")]
     UnknownQuote,
+    /// Hex error
+    #[error(transparent)]
+    HexError(#[from] hex::Error),
 }