upload files for mint (#541)

Author: zupzup

crates/bcr-ebill-api/Cargo.toml

@@ -31,14 +31,14 @@ bcr-ebill-transport = { path = "../bcr-ebill-transport" }
 tokio.workspace = true
 tokio_with_wasm.workspace = true
 secp256k1.workspace = true
-bcr-wdc-webapi = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "4437c3b809105df69ed459a9698cac8deb8d9210" }
-bcr-wdc-quote-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "4437c3b809105df69ed459a9698cac8deb8d9210" }
-bcr-wdc-key-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "4437c3b809105df69ed459a9698cac8deb8d9210" }
-bcr-wdc-swap-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "4437c3b809105df69ed459a9698cac8deb8d9210" }
+bcr-wdc-webapi = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "210ee9fccfb93e00247c46dbfcd4cc55287" }
+bcr-wdc-quote-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "210ee9fccfb93e00247c46dbfcd4cc55287" }
+bcr-wdc-key-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "210ee9fccfb93e00247c46dbfcd4cc55287" }
+bcr-wdc-swap-client = { git = "https://github.com/BitcreditProtocol/wildcat", rev = "210ee9fccfb93e00247c46dbfcd4cc55287" }
 cashu = { version = "0.9", default-features = false }
 rand = { version = "0.8" }
 hex = { version = "0.4" }
-
+url = {version = "2.5"}
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 reqwest = { workspace = true, features = ["json"] }

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

@@ -61,7 +61,7 @@ impl FileStorageClient {
     }
 }
 
-fn to_url(relay_url: &str, to_join: &str) -> Result<Url> {
+pub fn to_url(relay_url: &str, to_join: &str) -> Result<Url> {
     let mut url = reqwest::Url::parse(relay_url)
         .and_then(|url| url.join(to_join))
         .map_err(|_| Error::InvalidRelayUrl)?;

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

@@ -13,6 +13,7 @@ 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 reqwest::Url;
 use thiserror::Error;
 
 /// Generic result type
@@ -100,6 +101,7 @@ pub trait MintClientApi: ServiceTraitBounds {
         requester_keys: &BcrKeys,
         bill: &BitcreditBill,
         endorsees: &[BillParticipant],
+        files: &[Url],
     ) -> Result<String>;
     /// Look up a quote for a mint
     async fn lookup_quote_for_mint(
@@ -257,6 +259,7 @@ impl MintClientApi for MintClient {
         requester_keys: &BcrKeys,
         bill: &BitcreditBill,
         endorsees: &[BillParticipant],
+        files: &[Url],
     ) -> Result<String> {
         let bill_info = BillInfo {
             id: bill.id.clone(),
@@ -270,6 +273,7 @@ impl MintClientApi for MintClient {
             sum: bill.sum,
             maturity_date: util::date::date_string_to_rfc3339(&bill.maturity_date)
                 .map_err(|_| Error::InvalidDate)?,
+            file_urls: files.to_owned(),
         };
         let public_key = cdk01::PublicKey::from_hex(requester_keys.get_public_key())
             .map_err(|_| Error::PubKey)?;
@@ -423,10 +427,10 @@ impl From<StatusReply> for QuoteStatusReply {
                 expiration_date,
                 discounted,
             },
-            StatusReply::Accepted { keyset_id } => QuoteStatusReply::Accepted { keyset_id },
-            StatusReply::Rejected { tstamp } => QuoteStatusReply::Rejected { tstamp },
+            StatusReply::Accepted { keyset_id, .. } => QuoteStatusReply::Accepted { keyset_id },
+            StatusReply::Rejected { tstamp, .. } => QuoteStatusReply::Rejected { tstamp },
             StatusReply::Canceled { tstamp } => QuoteStatusReply::Cancelled { tstamp },
-            StatusReply::OfferExpired { tstamp } => QuoteStatusReply::Expired { tstamp },
+            StatusReply::OfferExpired { tstamp, .. } => QuoteStatusReply::Expired { tstamp },
         }
     }
 }

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

@@ -17,16 +17,16 @@ use bcr_ebill_transport::BillChainEvent;
 use log::{debug, error, info};
 
 impl BillService {
-    async fn encrypt_and_save_uploaded_file(
+    pub(super) async fn encrypt_and_save_uploaded_file(
         &self,
         file_name: &str,
         file_bytes: &[u8],
         bill_id: &str,
-        bill_public_key: &str,
+        public_key: &str,
         relay_url: &str,
     ) -> Result<File> {
         let file_hash = util::sha256_hash(file_bytes);
-        let encrypted = util::crypto::encrypt_ecies(file_bytes, bill_public_key)?;
+        let encrypted = util::crypto::encrypt_ecies(file_bytes, public_key)?;
         let nostr_hash = self.file_upload_client.upload(relay_url, encrypted).await?;
         info!("Saved file {file_name} with hash {file_hash} for bill {bill_id}");
         Ok(File {

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

@@ -5811,7 +5811,7 @@ pub mod tests {
             .returning(|_, _, _| Ok(vec![]));
         ctx.mint_client
             .expect_enquire_mint_quote()
-            .returning(|_, _, _, _| Ok("quote_id".to_owned()));
+            .returning(|_, _, _, _, _| Ok("quote_id".to_owned()));
         ctx.mint_store
             .expect_add_request()
             .returning(|_, _, _, _, _| Ok(()));

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

@@ -14,7 +14,7 @@ use crate::data::{
     identity::Identity,
 };
 use crate::external::bitcoin::BitcoinClientApi;
-use crate::external::file_storage::FileStorageClientApi;
+use crate::external::file_storage::{self, FileStorageClientApi};
 use crate::external::mint::{MintClientApi, QuoteStatusReply, ResolveMintOffer};
 use crate::get_config;
 use crate::persistence::bill::BillChainStoreApi;
@@ -44,7 +44,7 @@ use bcr_ebill_core::util::currency;
 use bcr_ebill_core::{File, ServiceTraitBounds, Validate, ValidationError};
 use bcr_ebill_persistence::mint::MintStoreApi;
 use bcr_ebill_transport::NotificationServiceApi;
-use log::{debug, error, info};
+use log::{debug, error, info, warn};
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
@@ -622,6 +622,38 @@ impl BillService {
             nostr_relays: relays,
         })
     }
+
+    /// Download the files, decrypt them, encrypt and upload them for the given node id
+    /// and relay url and return a list of urls to the uploaded files
+    async fn upload_bill_files_for_node_id(
+        &self,
+        bill_id: &str,
+        bill_private_key: &str,
+        node_id: &str,
+        relay_url: &str,
+        files: &[File],
+    ) -> Result<Vec<url::Url>> {
+        if files.is_empty() {
+            return Ok(vec![]);
+        }
+        let mut result = Vec::with_capacity(files.len());
+        for file in files {
+            let decrypted_file = self
+                .open_and_decrypt_attached_file(bill_id, file, bill_private_key)
+                .await?;
+            let uploaded_file = self
+                .encrypt_and_save_uploaded_file(
+                    &file.name,
+                    &decrypted_file,
+                    bill_id,
+                    node_id,
+                    relay_url,
+                )
+                .await?;
+            result.push(file_storage::to_url(relay_url, &uploaded_file.nostr_hash)?);
+        }
+        Ok(result)
+    }
 }
 
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -1411,11 +1443,38 @@ impl BillServiceApi for BillService {
             ));
         }
 
+        // Upload existing files for the mint
+        let file_urls_for_mint = match mint_anon_participant.nostr_relays().first() {
+            Some(relay_url) => {
+                self.upload_bill_files_for_node_id(
+                    bill_id,
+                    &bill_keys.private_key,
+                    &mint_anon_participant.node_id(),
+                    relay_url,
+                    &bill.files,
+                )
+                .await?
+            }
+            None => {
+                warn!(
+                    "mint {} does not have a nostr relay",
+                    &mint_anon_participant.node_id()
+                );
+                vec![]
+            }
+        };
+
         // Send request to mint to mint
         let endorsees = blockchain.get_endorsees_for_bill(&bill_keys);
         let mint_request_id = self
             .mint_client
-            .enquire_mint_quote(&mint_cfg.default_mint_url, signer_keys, &bill, &endorsees)
+            .enquire_mint_quote(
+                &mint_cfg.default_mint_url,
+                signer_keys,
+                &bill,
+                &endorsees,
+                &file_urls_for_mint,
+            )
             .await?;
 
         // Store request to mint

crates/bcr-ebill-wasm/main.js

@@ -48,8 +48,8 @@ let config = {
   // esplora_base_url: "http://localhost:8094", // local reg test via docker-compose
   bitcoin_network: "testnet",
   esplora_base_url: "https://esplora.minibill.tech",
-  // nostr_relays: ["wss://bitcr-cloud-run-05-550030097098.europe-west1.run.app"],
-  nostr_relays: ["ws://localhost:8080"],
+  nostr_relays: ["wss://bitcr-cloud-run-05-550030097098.europe-west1.run.app"],
+  // nostr_relays: ["ws://localhost:8080"],
   // if set to true we will drop DMs from nostr that we don't have in contacts
   nostr_only_known_contacts: false,
   job_runner_initial_delay_seconds: 1,
@@ -183,6 +183,7 @@ let generalApi = apis.generalApi;
 let identityApi = apis.identityApi;
 let billApi = apis.billApi;
 window.billApi = billApi;
+window.identityApi = identityApi;
 window.generalApi = generalApi;
 let notificationTriggerApi = apis.notificationApi;