Multi nostr consumer (#452)

* Multi consumer

* Multi consumer, some lib updates

* Send multi id, allow send local ids

* ignore data

* Ignore data

* Formatting

* Non allocating string

Author: tompro

.gitignore

@@ -1,6 +1,6 @@
 /target
 /contacts/*
-/data/*
+data/
 /frontend_build/*
 /identity/*
 /bills/*

Cargo.toml

@@ -1,6 +1,13 @@
 [workspace]
 resolver = "3"
-members = [ "crates/bcr-ebill-web", "crates/bcr-ebill-core", "crates/bcr-ebill-api", "crates/bcr-ebill-persistence" , "crates/bcr-ebill-transport", "crates/bcr-ebill-wasm"]
+members = [
+  "crates/bcr-ebill-web",
+  "crates/bcr-ebill-core",
+  "crates/bcr-ebill-api",
+  "crates/bcr-ebill-persistence",
+  "crates/bcr-ebill-transport",
+  "crates/bcr-ebill-wasm",
+]
 
 
 [workspace.dependencies]
@@ -9,8 +16,12 @@ borsh = "1.5"
 borsh-derive = "1.5"
 env_logger = { version = "0.11", default-features = false }
 log = { version = "0.4", features = ["serde"] }
-chrono = { version = "0.4", default-features = false, features = ["serde", "clock"] }
+chrono = { version = "0.4", default-features = false, features = [
+  "serde",
+  "clock",
+] }
 tokio = { version = "1.43", default-features = false, features = ["rt"] }
+tokio_with_wasm = { version = "0.8.2", features = ["rt"] }
 async-trait = "0.1"
 serde_json = "1"
 serde = { version = "1", default-features = false, features = ["derive"] }
@@ -20,10 +31,10 @@ anyhow = { version = "1", default-features = false }
 thiserror = { version = "2", default-features = false }
 lazy_static = "1.5"
 uuid = { version = "1", default-features = false, features = ["v4", "js"] }
-bitcoin = { version = "0.32",  default-features = false }
+bitcoin = { version = "0.32", default-features = false }
 bip39 = { version = "2.1", features = ["rand"] }
 ecies = { version = "0.2", default-features = false, features = ["pure"] }
-nostr-sdk = { version = "0.39", features = ["nip59"] }
+nostr-sdk = { version = "0.40", features = ["nip59"] }
 getrandom = { version = "0.3.1", features = ["wasm_js"] }
 reqwest = { version = "0.12", default-features = false, features = ["json"] }
 async-broadcast = "0.7.2"

crates/bcr-ebill-api/Cargo.toml

@@ -21,19 +21,20 @@ uuid.workspace = true
 bitcoin.workspace = true
 nostr-sdk.workspace = true
 futures.workspace = true
-reqwest.workspace = true 
+reqwest.workspace = true
 rust_decimal = { version = "1.36.0", default-features = false }
 infer = { version = "0.19.0", default-features = false }
 bcr-ebill-core = { path = "../bcr-ebill-core" }
 bcr-ebill-persistence = { path = "../bcr-ebill-persistence" }
 bcr-ebill-transport = { path = "../bcr-ebill-transport" }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio.workspace = true
 
+[target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown"))'.dependencies]
+tokio_with_wasm.workspace = true
+
 [dev-dependencies]
 mockall = "0.13.1"
-nostr-relay-builder = "0.39.0"
+nostr-relay-builder = "0.40"
 tokio.workspace = true
 async-broadcast.workspace = true
 

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

@@ -192,7 +192,13 @@ impl BillService {
         // send notification and blocks to all required recipients
         if let Err(e) = self
             .notification_service
-            .send_bill_is_signed_event(&BillChainEvent::new(&bill, &chain, &bill_keys, true)?)
+            .send_bill_is_signed_event(&BillChainEvent::new(
+                &bill,
+                &chain,
+                &bill_keys,
+                true,
+                &identity.identity.node_id,
+            )?)
             .await
         {
             error!("Error propagating bill via Nostr {e}");

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

@@ -2280,7 +2280,7 @@ pub mod tests {
         // Asset request to mint event is sent
         ctx.notification_service
             .expect_send_request_to_mint_event()
-            .returning(|_| Ok(()));
+            .returning(|_, _| Ok(()));
 
         let service = get_service(ctx);
 
@@ -2314,7 +2314,7 @@ pub mod tests {
         // Asset request to mint event is sent
         ctx.notification_service
             .expect_send_request_to_mint_event()
-            .returning(|_| Ok(()));
+            .returning(|_, _| Ok(()));
 
         let service = get_service(ctx);
 
@@ -2987,23 +2987,25 @@ pub mod tests {
         ctx.notification_service
             .expect_send_request_to_action_timed_out_event()
             .with(
+                always(),
                 eq("1234"),
                 always(),
                 eq(ActionType::AcceptBill),
                 recipient_check.clone(),
             )
-            .returning(|_, _, _, _| Ok(()));
+            .returning(|_, _, _, _, _| Ok(()));
 
         // send pay timeout notification
         ctx.notification_service
             .expect_send_request_to_action_timed_out_event()
             .with(
+                always(),
                 eq("4321"),
                 always(),
                 eq(ActionType::PayBill),
                 recipient_check,
             )
-            .returning(|_, _, _, _| Ok(()));
+            .returning(|_, _, _, _, _| Ok(()));
 
         // marks accept bill timeout as sent
         ctx.notification_service

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

@@ -23,7 +23,13 @@ impl BillService {
             .get_last_version_bill(blockchain, bill_keys, identity, contacts)
             .await?;
 
-        let chain_event = BillChainEvent::new(&last_version_bill, blockchain, bill_keys, true)?;
+        let chain_event = BillChainEvent::new(
+            &last_version_bill,
+            blockchain,
+            bill_keys,
+            true,
+            &identity.node_id,
+        )?;
 
         match bill_action {
             BillAction::Accept => {
@@ -57,7 +63,7 @@ impl BillService {
             }
             BillAction::Mint(_, _, _) => {
                 self.notification_service
-                    .send_request_to_mint_event(&last_version_bill)
+                    .send_request_to_mint_event(&identity.node_id, &last_version_bill)
                     .await?;
             }
             BillAction::OfferToSell(buyer, _, _) => {

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

@@ -198,6 +198,7 @@ impl BillService {
 
                 self.notification_service
                     .send_request_to_action_timed_out_event(
+                        &identity.node_id,
                         bill_id,
                         Some(bill.sum),
                         action.to_owned(),