Add file urls and accessor methods for shared bill (#570)

Author: zupzup

Cargo.toml

@@ -60,3 +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"}

crates/bcr-ebill-api/Cargo.toml

@@ -39,7 +39,7 @@ bcr-wallet-lib = { git = "https://github.com/BitcreditProtocol/Wallet-Core", rev
 cashu = { version = "0.9", default-features = false }
 rand = { version = "0.8" }
 hex = { version = "0.4" }
-url = {version = "2.5"}
+url.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 reqwest = { workspace = true, features = ["json"] }

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

@@ -18,6 +18,7 @@ impl BillService {
         bill_id: &BillId,
         external_party_pub_key: &PublicKey,
         sharer_keys: &BcrKeys,
+        file_urls: &[url::Url],
     ) -> Result<BillToShareWithExternalParty> {
         let chain = self.blockchain_store.get_chain(bill_id).await?;
         let bill_keys = self.store.get_keys(bill_id).await?;
@@ -33,8 +34,10 @@ impl BillService {
         let result = BillToShareWithExternalParty {
             bill_id: bill_id.to_owned(),
             data: encoded,
+            file_urls: file_urls.to_owned(),
             hash,
             signature,
+            receiver: external_party_pub_key.to_owned(),
         };
         Ok(result)
     }
@@ -85,13 +88,14 @@ pub mod tests {
         let service = get_service(ctx);
 
         let result = service
-            .share_bill_with_external_party(&bill_id, &external_party_pub_key, &sharer_keys)
+            .share_bill_with_external_party(&bill_id, &external_party_pub_key, &sharer_keys, &[])
             .await;
         assert!(result.is_ok());
 
         // Receiver side
         let unwrapped = result.unwrap().clone();
         assert_eq!(unwrapped.bill_id, bill_id);
+        assert_eq!(unwrapped.receiver, external_party_pub_key);
         let data = unwrapped.data;
         let hash = unwrapped.hash;
         let signature = unwrapped.signature;

crates/bcr-ebill-core/Cargo.toml

@@ -24,6 +24,7 @@ nostr.workspace = true
 secp256k1 = { workspace = true, features = ["global-context"] }
 rust_decimal = { version = "1.36.0", default-features = false }
 once_cell = "1.21.3"
+url.workspace = true
 
 [dev-dependencies]
 rstest.workspace = true

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

@@ -1,5 +1,12 @@
 use std::str::FromStr;
 
+use super::{
+    File, PostalAddress,
+    contact::{
+        BillIdentParticipant, LightBillIdentParticipant, LightBillIdentParticipantWithAddress,
+    },
+    notification::Notification,
+};
 use crate::{
     ID_PREFIX, NETWORK_MAINNET, NETWORK_REGTEST, NETWORK_TESTNET, NETWORK_TESTNET4, NodeId,
     ValidationError,
@@ -8,14 +15,7 @@ use crate::{
     network_char,
     util::{self, BcrKeys},
 };
-
-use super::{
-    File, PostalAddress,
-    contact::{
-        BillIdentParticipant, LightBillIdentParticipant, LightBillIdentParticipantWithAddress,
-    },
-    notification::Notification,
-};
+use borsh::{BorshDeserialize, BorshSerialize};
 use secp256k1::{PublicKey, SecretKey};
 use serde::{Deserialize, Serialize};
 
@@ -110,7 +110,7 @@ impl<'de> serde::Deserialize<'de> for BillId {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(d)?;
+        let s = <std::string::String as serde::Deserialize>::deserialize(d)?;
         BillId::from_str(&s).map_err(serde::de::Error::custom)
     }
 }
@@ -611,14 +611,26 @@ pub struct PastPaymentDataRecourse {
     pub status: PastPaymentStatus,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[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,
 }