up wildcat and wallet core,move sharing logic to core (#572)

Author: zupzup

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.1
+
+* Add file and pub key to bill to share with external party and add accessors to extract data
+* Upgrade wildcat and wallet-core dependencies
+
 # 0.4.0
 
 * Switch to new chain transport leveraging public Nostr threads

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 license = "MIT"
 
@@ -60,4 +60,4 @@ bcr-ebill-core = { path = "./crates/bcr-ebill-core" }
 bcr-ebill-persistence = { path = "./crates/bcr-ebill-persistence" }
 bcr-ebill-transport = { path = "./crates/bcr-ebill-transport" }
 surrealdb = { version = "2.3", default-features = false }
-url = {version = "2.5"}
+url = { version = "2.5" }

crates/bcr-ebill-api/Cargo.toml

@@ -31,12 +31,12 @@ bcr-ebill-transport.workspace = true
 tokio.workspace = true
 tokio_with_wasm.workspace = true
 secp256k1.workspace = true
-bcr-wdc-webapi = { git = "https://github.com/BitcreditProtocol/wildcat", tag = "v0.2.0" }
-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 }
+bcr-wdc-webapi = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "15b9a36d7663a592ccc0287d87f8d72746fc2d99" }
+bcr-wdc-quote-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "15b9a36d7663a592ccc0287d87f8d72746fc2d99" }
+bcr-wdc-key-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "15b9a36d7663a592ccc0287d87f8d72746fc2d99" }
+bcr-wdc-swap-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "15b9a36d7663a592ccc0287d87f8d72746fc2d99" }
+bcr-wallet-lib = { git = "https://github.com/BitcreditProtocol/Wallet-Core", rev = "f5a1ed4f52f5852bab27ec67996c2f2c8d16c6dd" }
+cashu = { version = "0.11", default-features = false }
 rand = { version = "0.8" }
 hex = { version = "0.4" }
 url.workspace = true

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

@@ -3,12 +3,11 @@ use std::str::FromStr;
 use crate::util;
 use async_trait::async_trait;
 use bcr_ebill_core::{
-    PostalAddress, SecretKey, ServiceTraitBounds,
-    bill::BitcreditBill,
+    NodeId, PostalAddress, SecretKey, ServiceTraitBounds,
+    bill::{BillId, 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;
@@ -81,7 +80,12 @@ use mockall::automock;
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait MintClientApi: ServiceTraitBounds {
     /// Check if the given proofs were already spent
-    async fn check_if_proofs_are_spent(&self, mint_url: &str, proofs: &str) -> Result<bool>;
+    async fn check_if_proofs_are_spent(
+        &self,
+        mint_url: &str,
+        proofs: &str,
+        keyset_id: &str,
+    ) -> Result<bool>;
     /// Mint and return encoded token
     async fn mint(
         &self,
@@ -159,7 +163,12 @@ impl MintClient {
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl MintClientApi for MintClient {
-    async fn check_if_proofs_are_spent(&self, mint_url: &str, proofs: &str) -> Result<bool> {
+    async fn check_if_proofs_are_spent(
+        &self,
+        mint_url: &str,
+        proofs: &str,
+        keyset_id: &str,
+    ) -> Result<bool> {
         let token_mint_url =
             cashu::MintUrl::from_str(mint_url).map_err(|_| Error::InvalidMintUrl)?;
         let token =
@@ -169,7 +178,25 @@ impl MintClientApi for MintClient {
             return Err(Error::InvalidToken.into());
         }
 
-        let ys = token.proofs().ys().map_err(|_| Error::PubKey)?;
+        let keyset_id_parsed = cdk02::Id::from_str(keyset_id).map_err(|e| {
+            log::error!("Error parsing keyset id {keyset_id} for {mint_url}: {e}");
+            Error::InvalidKeySetId
+        })?;
+
+        let keyset_info = self
+            .key_client(mint_url)?
+            .keyset_info(keyset_id_parsed)
+            .await
+            .map_err(|e| {
+                log::error!("Error getting keyset info from {mint_url}: {e}");
+                Error::KeyClient
+            })?;
+
+        let ys = token
+            .proofs(&[keyset_info])
+            .map_err(|_| Error::InvalidToken)?
+            .ys()
+            .map_err(|_| Error::PubKey)?;
 
         let proof_states = self
             .swap_client(mint_url)?
@@ -230,7 +257,7 @@ impl MintClientApi for MintClient {
 
         // generate token from proofs
         let token =
-            bcr_wallet_lib::wallet::Token::new_credit(token_mint_url, currency, None, proofs);
+            bcr_wallet_lib::wallet::Token::new_bitcr(token_mint_url, proofs, None, currency);
 
         Ok(token.to_string())
     }
@@ -263,7 +290,7 @@ impl MintClientApi for MintClient {
         files: &[Url],
     ) -> Result<String> {
         let bill_info = BillInfo {
-            id: bill.id.clone().to_string(),
+            id: map_bill_id(bill.id.clone()),
             drawee: map_bill_ident_participant(bill.drawee.to_owned()),
             drawer: map_bill_ident_participant(bill.drawer.to_owned()),
             payee: map_bill_participant(bill.payee.to_owned()),
@@ -454,7 +481,7 @@ fn map_bill_anon_participant(
     ident: BillAnonParticipant,
 ) -> bcr_wdc_webapi::bill::BillAnonParticipant {
     bcr_wdc_webapi::bill::BillAnonParticipant {
-        node_id: ident.node_id.to_string(),
+        node_id: map_node_id(ident.node_id),
         email: ident.email,
         nostr_relays: ident.nostr_relays,
     }
@@ -465,7 +492,7 @@ fn map_bill_ident_participant(
 ) -> bcr_wdc_webapi::bill::BillIdentParticipant {
     bcr_wdc_webapi::bill::BillIdentParticipant {
         t: map_contact_type(ident.t),
-        node_id: ident.node_id.to_string(),
+        node_id: map_node_id(ident.node_id),
         name: ident.name,
         postal_address: map_postal_address(ident.postal_address),
         email: ident.email,
@@ -489,3 +516,11 @@ fn map_postal_address(pa: PostalAddress) -> bcr_wdc_webapi::identity::PostalAddr
         address: pa.address,
     }
 }
+
+fn map_bill_id(bill_id: BillId) -> bcr_wdc_webapi::bill::BillId {
+    bcr_wdc_webapi::bill::BillId::from_str(&bill_id.to_string()).expect("is a bill id")
+}
+
+fn map_node_id(node_id: NodeId) -> bcr_wdc_webapi::bill::NodeId {
+    bcr_wdc_webapi::bill::NodeId::from_str(&node_id.to_string()).expect("is a node id")
+}

crates/bcr-ebill-api/src/service/bill_service/mod.rs

@@ -29,7 +29,6 @@ mod issue;
 mod payment;
 mod propagation;
 mod service;
-mod sharing;
 #[cfg(test)]
 pub mod test_utils;
 
@@ -6364,6 +6363,7 @@ pub mod tests {
                 id: cdk02::Id::try_from("00c7b45973e5f0fc".to_owned()).unwrap(),
                 unit: cashu::CurrencyUnit::Sat,
                 keys: cashu::Keys::new(std::collections::BTreeMap::default()),
+                final_expiry: None,
             })
         });
         ctx.mint_client
@@ -6421,11 +6421,12 @@ pub mod tests {
                 id: cdk02::Id::try_from("00c7b45973e5f0fc".to_owned()).unwrap(),
                 unit: cashu::CurrencyUnit::Sat,
                 keys: cashu::Keys::new(std::collections::BTreeMap::default()),
+                final_expiry: None,
             })
         });
         ctx.mint_client
             .expect_check_if_proofs_are_spent()
-            .returning(|_, _| Ok(true));
+            .returning(|_, _, _| Ok(true));
         ctx.mint_store
             .expect_set_proofs_to_spent_for_offer()
             .returning(|_| Ok(()));

crates/bcr-ebill-api/src/service/bill_service/service.rs

@@ -409,7 +409,11 @@ impl BillService {
                         if let Some(proofs) = offer.proofs {
                             match self
                                 .mint_client
-                                .check_if_proofs_are_spent(&mint_cfg.default_mint_url, &proofs)
+                                .check_if_proofs_are_spent(
+                                    &mint_cfg.default_mint_url,
+                                    &proofs,
+                                    &offer.keyset_id,
+                                )
                                 .await
                             {
                                 Ok(spent) => {

crates/bcr-ebill-api/src/service/bill_service/sharing.rs

@@ -15,7 +15,6 @@ use crate::{
     network_char,
     util::{self, BcrKeys},
 };
-use borsh::{BorshDeserialize, BorshSerialize};
 use secp256k1::{PublicKey, SecretKey};
 use serde::{Deserialize, Serialize};
 
@@ -610,27 +609,3 @@ pub struct PastPaymentDataRecourse {
     pub mempool_link_for_address_to_pay: String,
     pub status: PastPaymentStatus,
 }
-
-#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone)]
-pub struct BillToShareWithExternalParty {
-    /// The bill id
-    pub bill_id: BillId,
-    /// The base58 encoded, encrypted BillBlockPlaintextWrapper of the bill
-    pub data: String,
-    #[borsh(
-        serialize_with = "crate::util::borsh::serialize_vec_url",
-        deserialize_with = "crate::util::borsh::deserialize_vec_url"
-    )]
-    /// The file urls of bill files, encrypted with the receiver's key, uploaded to Nostr
-    pub file_urls: Vec<url::Url>,
-    /// The hash over the unencrypted data
-    pub hash: String,
-    /// The signature over the hash by the sharer of the bill
-    pub signature: String,
-    #[borsh(
-        serialize_with = "crate::util::borsh::serialize_pubkey",
-        deserialize_with = "crate::util::borsh::deserialize_pubkey"
-    )]
-    /// The receiver's pub key
-    pub receiver: PublicKey,
-}