Chain events part 1 (#435)

* Move mod, start chain event builder

* Retry queue

* Move transport

* Allow resolving nodes with block height from chain

* Moved push and event handlers

* Move email

* Moved notification_service

* Issue Bill rework

* Review fixes

* More fixes

* Typo

* Errors, keys

Author: tompro

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = [ "crates/bcr-ebill-web", "crates/bcr-ebill-core", "crates/bcr-ebill-api", "crates/bcr-ebill-persistence" ]
+members = [ "crates/bcr-ebill-web", "crates/bcr-ebill-core", "crates/bcr-ebill-api", "crates/bcr-ebill-persistence" , "crates/bcr-ebill-transport"]
 
 
 [workspace.dependencies]

crates/bcr-ebill-api/Cargo.toml

@@ -22,11 +22,15 @@ uuid.workspace = true
 bitcoin.workspace = true
 nostr-sdk.workspace = true
 futures.workspace = true
-reqwest = { version = "0.12.12", default-features = false, features = ["rustls-tls", "json"] }
+reqwest = { version = "0.12.12", default-features = false, features = [
+  "rustls-tls",
+  "json",
+] }
 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-core = { path = "../bcr-ebill-core" }
+bcr-ebill-persistence = { path = "../bcr-ebill-persistence" }
+bcr-ebill-transport = { path = "../bcr-ebill-transport" }
 
 [dev-dependencies]
 mockall = "0.13.1"

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

@@ -1,4 +1,4 @@
-use crate::{blockchain, external, persistence, service::notification_service, util};
+use crate::{blockchain, external, persistence, util};
 use thiserror::Error;
 
 /// Generic error type
@@ -141,7 +141,7 @@ pub enum Error {
     Cryptography(#[from] util::crypto::Error),
 
     #[error("Notification error: {0}")]
-    Notification(#[from] notification_service::Error),
+    Notification(#[from] bcr_ebill_transport::Error),
 
     #[error("io error {0}")]
     Io(#[from] std::io::Error),

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

@@ -10,6 +10,7 @@ use bcr_ebill_core::{
     contact::IdentityPublicData,
     util::BcrKeys,
 };
+use bcr_ebill_transport::BillChainEvent;
 use log::error;
 
 impl BillService {
@@ -37,16 +38,12 @@ impl BillService {
         let public_key = keys.get_public_key();
 
         let bill_id = util::sha256_hash(public_key.as_bytes());
+        let bill_keys = BillKeys {
+            private_key: keys.get_private_key_string(),
+            public_key: keys.get_public_key(),
+        };
 
-        self.store
-            .save_keys(
-                &bill_id,
-                &BillKeys {
-                    private_key: keys.get_private_key_string(),
-                    public_key: keys.get_public_key(),
-                },
-            )
-            .await?;
+        self.store.save_keys(&bill_id, &bill_keys).await?;
 
         let mut bill_files: Vec<File> = vec![];
         if let Some(ref upload_id) = file_upload_id {
@@ -121,7 +118,7 @@ impl BillService {
 
         // send notification to all required recipients
         self.notification_service
-            .send_bill_is_signed_event(&bill)
+            .send_bill_is_signed_event(&BillChainEvent::new(&bill, &chain, &bill_keys)?)
             .await?;
 
         // propagate the bill

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

@@ -1,4 +1,3 @@
-use super::super::notification_service::NotificationServiceApi;
 use super::error::Error;
 use super::{BillAction, BillServiceApi, Result};
 use crate::blockchain::Blockchain;
@@ -29,6 +28,7 @@ use bcr_ebill_core::constants::{
     ACCEPT_DEADLINE_SECONDS, PAYMENT_DEADLINE_SECONDS, RECOURSE_DEADLINE_SECONDS,
 };
 use bcr_ebill_core::notification::ActionType;
+use bcr_ebill_transport::NotificationServiceApi;
 use futures::future::try_join_all;
 use log::{error, info};
 use std::collections::HashSet;

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

@@ -5,14 +5,13 @@ use crate::{
     service::{
         company_service::tests::get_valid_company_block,
         contact_service::tests::get_baseline_contact,
-        notification_service::MockNotificationServiceApi,
     },
     tests::tests::{
         MockBillChainStoreApiMock, MockBillStoreApiMock, MockCompanyChainStoreApiMock,
         MockCompanyStoreApiMock, MockContactStoreApiMock, MockFileUploadStoreApiMock,
-        MockIdentityChainStoreApiMock, MockIdentityStoreApiMock, TEST_PRIVATE_KEY_SECP,
-        TEST_PUB_KEY_SECP, empty_address, empty_bitcredit_bill, empty_identity,
-        empty_identity_public_data, identity_public_data_only_node_id,
+        MockIdentityChainStoreApiMock, MockIdentityStoreApiMock, MockNotificationService,
+        TEST_PRIVATE_KEY_SECP, TEST_PUB_KEY_SECP, empty_address, empty_bitcredit_bill,
+        empty_identity, empty_identity_public_data, identity_public_data_only_node_id,
     },
     util,
 };
@@ -42,7 +41,7 @@ pub struct MockBillContext {
     pub company_chain_store: MockCompanyChainStoreApiMock,
     pub company_store: MockCompanyStoreApiMock,
     pub file_upload_store: MockFileUploadStoreApiMock,
-    pub notification_service: MockNotificationServiceApi,
+    pub notification_service: MockNotificationService,
 }
 
 pub fn get_baseline_identity() -> IdentityWithAll {
@@ -165,7 +164,7 @@ pub fn get_ctx() -> MockBillContext {
         company_chain_store: MockCompanyChainStoreApiMock::new(),
         contact_store: MockContactStoreApiMock::new(),
         company_store: MockCompanyStoreApiMock::new(),
-        notification_service: MockNotificationServiceApi::new(),
+        notification_service: MockNotificationService::new(),
     }
 }
 

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

@@ -14,16 +14,15 @@ use crate::util;
 use crate::{blockchain, external};
 use backup_service::{BackupService, BackupServiceApi};
 use bcr_ebill_persistence::db::SurrealDbConfig;
+use bcr_ebill_transport::{NotificationServiceApi, PushApi, PushService};
 use bill_service::{BillServiceApi, service::BillService};
 use company_service::{CompanyService, CompanyServiceApi};
 use contact_service::{ContactService, ContactServiceApi};
 use file_upload_service::{FileUploadService, FileUploadServiceApi};
 use identity_service::{IdentityService, IdentityServiceApi};
 use log::error;
-use notification_service::push_notification::{PushApi, PushService};
 use notification_service::{
-    NostrConsumer, NotificationServiceApi, create_nostr_client, create_nostr_consumer,
-    create_notification_service,
+    NostrConsumer, create_nostr_client, create_nostr_consumer, create_notification_service,
 };
 use search_service::{SearchService, SearchServiceApi};
 use std::sync::Arc;
@@ -50,7 +49,7 @@ pub enum Error {
 
     /// errors stemming from sending or receiving notifications
     #[error("Notification service error: {0}")]
-    NotificationService(#[from] notification_service::Error),
+    NotificationService(#[from] bcr_ebill_transport::Error),
 
     /// errors stemming from handling bills
     #[error("Bill service error: {0}")]
@@ -147,8 +146,12 @@ pub async fn create_service_context(
     let bitcoin_client = Arc::new(BitcoinClient::new());
 
     let nostr_client = create_nostr_client(&config, db.identity_store.clone()).await?;
-    let notification_service =
-        create_notification_service(nostr_client.clone(), db.notification_store.clone()).await?;
+    let notification_service = create_notification_service(
+        nostr_client.clone(),
+        db.notification_store.clone(),
+        contact_service.clone(),
+    )
+    .await?;
 
     let bill_service = Arc::new(BillService::new(
         db.bill_store,