switch to bitcrb token, use keyset info (#559)

Author: zupzup

CHANGELOG.md

@@ -1,5 +1,6 @@
 # 0.3.17
 
+* Changed minted proofs token format from cashu Token v3 to BitcrB (v4)
 * Use NodeId, PublicKey, SecretKey and BillId types internally instead of strings (fully breaking)
     * This breaks all existing databases, since the node ids and bill ids now have the format `prefix|network|pubkey`- example: `bitcrt03f9f94d1fdc2090d46f3524807e3f58618c36988e69577d70d5d4d1e9e9645a4f`
     * The `prefix` is `bitcr`

crates/bcr-ebill-api/Cargo.toml

@@ -35,6 +35,7 @@ bcr-wdc-webapi = { git = "https://github.com/BitcreditProtocol/wildcat", tag = "
 bcr-wdc-quote-client = { git = "https://github.com/BitcreditProtocol/wildcat", tag = "v0.2.0" }
 bcr-wdc-key-client = { git = "https://github.com/BitcreditProtocol/wildcat", tag = "v0.2.0" }
 bcr-wdc-swap-client = { git = "https://github.com/BitcreditProtocol/wildcat", tag = "v0.2.0" }
+bcr-wallet-lib = { git = "https://github.com/BitcreditProtocol/Wallet-Core", rev = "0a974e79d25fd7018a8165d8575cd06a8da9be59"}
 cashu = { version = "0.9", default-features = false }
 rand = { version = "0.8" }
 hex = { version = "0.4" }

crates/bcr-ebill-api/src/constants.rs

@@ -5,5 +5,4 @@ pub const VALID_FILE_MIME_TYPES: [&str; 3] = ["image/jpeg", "image/png", "applic
 
 // When subscribing events we subtract this from the last received event time
 pub const NOSTR_EVENT_TIME_SLACK: u64 = 3600; // 1 hour
-pub const CURRENCY_CRSAT: &str = "crsat";
 pub const CURRENCY_SAT: &str = "sat";

crates/bcr-ebill-api/src/external/mint.rs

@@ -1,18 +1,19 @@
 use std::str::FromStr;
 
-use crate::{constants::CURRENCY_CRSAT, util};
+use crate::util;
 use async_trait::async_trait;
 use bcr_ebill_core::{
     PostalAddress, SecretKey, ServiceTraitBounds,
     bill::BitcreditBill,
     contact::{BillAnonParticipant, BillIdentParticipant, BillParticipant, ContactType},
     util::{BcrKeys, date::DateTimeUtc},
 };
+use bcr_wallet_lib::wallet::TokenOperations;
 use bcr_wdc_key_client::KeyClient;
 use bcr_wdc_quote_client::QuoteClient;
 use bcr_wdc_swap_client::SwapClient;
 use bcr_wdc_webapi::quotes::{BillInfo, ResolveOffer, StatusReply};
-use cashu::{ProofsMethods, State, nut00 as cdk00, nut01 as cdk01, nut02 as cdk02};
+use cashu::{ProofsMethods, State, nut01 as cdk01, nut02 as cdk02};
 use reqwest::Url;
 use thiserror::Error;
 
@@ -161,34 +162,28 @@ impl MintClientApi for MintClient {
     async fn check_if_proofs_are_spent(&self, mint_url: &str, proofs: &str) -> Result<bool> {
         let token_mint_url =
             cashu::MintUrl::from_str(mint_url).map_err(|_| Error::InvalidMintUrl)?;
-        let token = cashu::Token::from_str(proofs).map_err(|_| Error::InvalidToken)?;
-
-        if let cashu::Token::TokenV3(token_v3) = token {
-            if let Some(token_for_mint) = token_v3
-                .token
-                .into_iter()
-                .find(|t| t.mint == token_mint_url)
-            {
-                let ys = token_for_mint.proofs.ys().map_err(|_| Error::PubKey)?;
-                let proof_states =
-                    self.swap_client(mint_url)?
-                        .check_state(ys)
-                        .await
-                        .map_err(|e| {
-                            log::error!("Error checking if proofs are spent at {mint_url}: {e}");
-                            Error::SwapClient
-                        })?;
-                // all proofs have to be spent
-                let proofs_spent = proof_states
-                    .iter()
-                    .all(|ps| matches!(ps.state, State::Spent));
-                Ok(proofs_spent)
-            } else {
-                Err(Error::InvalidToken.into())
-            }
-        } else {
-            Err(Error::InvalidToken.into())
+        let token =
+            bcr_wallet_lib::wallet::Token::from_str(proofs).map_err(|_| Error::InvalidToken)?;
+
+        if token_mint_url != token.mint_url() {
+            return Err(Error::InvalidToken.into());
         }
+
+        let ys = token.proofs().ys().map_err(|_| Error::PubKey)?;
+
+        let proof_states = self
+            .swap_client(mint_url)?
+            .check_state(ys)
+            .await
+            .map_err(|e| {
+                log::error!("Error checking if proofs are spent at {mint_url}: {e}");
+                Error::SwapClient
+            })?;
+        // all proofs have to be spent
+        let proofs_spent = proof_states
+            .iter()
+            .all(|ps| matches!(ps.state, State::Spent));
+        Ok(proofs_spent)
     }
 
     async fn mint(
@@ -206,6 +201,15 @@ impl MintClientApi for MintClient {
         let secret_key = cdk01::SecretKey::from_hex(private_key.display_secret().to_string())
             .map_err(|_| Error::PrivateKey)?;
         let qid = uuid::Uuid::from_str(quote_id).map_err(|_| Error::InvalidMintRequestId)?;
+        let currency = self
+            .key_client(mint_url)?
+            .keyset_info(keyset.id)
+            .await
+            .map_err(|e| {
+                log::error!("Error getting keyset info from {mint_url}: {e}");
+                Error::Minting
+            })?
+            .unit;
 
         // mint
         let blinded_signatures = self
@@ -225,14 +229,10 @@ impl MintClientApi for MintClient {
         })?;
 
         // generate token from proofs
-        let token = cdk00::Token::new(
-            token_mint_url,
-            proofs,
-            None,
-            cashu::CurrencyUnit::Custom(CURRENCY_CRSAT.into()),
-        );
+        let token =
+            bcr_wallet_lib::wallet::Token::new_credit(token_mint_url, currency, None, proofs);
 
-        Ok(token.to_v3_string())
+        Ok(token.to_string())
     }
 
     async fn get_keyset_info(&self, mint_url: &str, keyset_id: &str) -> Result<cdk02::KeySet> {

crates/bcr-ebill-core/src/mint/mod.rs

@@ -46,7 +46,7 @@ pub struct MintOffer {
     pub expiration_timestamp: u64,
     /// The discounted sum the mint offers us
     pub discounted_sum: u64,
-    /// The proofs, encoded as a custom Tokenv3
+    /// The proofs, encoded as a bitcrB token
     pub proofs: Option<String>,
     /// Whether the proofs were spent according to the mint
     pub proofs_spent: bool,

crates/bcr-ebill-wasm/main.js

@@ -56,7 +56,7 @@ let config = {
   job_runner_check_interval_seconds: 600,
   // default_mint_url: "http://localhost:4343",
   default_mint_url: "https://wildcat-dev-docker.minibill.tech",
-  default_mint_node_id: "bitcrt02b7102bd5a4a572298f2aa485e86e490881e9ad7906fcae741db141b8ba1e8acc",
+  default_mint_node_id: "bitcrt0323591791ad4c25eb45a707b10aebe0486eb9ec9485985ab5de12a527810bc42b",
   // default_mint_node_id: "bitcrt0372422bfa5c9b60ef2f10ced26e764983b2e675cd7fac374f5f223616530ce3fb", // dev mint
 };