Fix network in order event

src/app/release.rs

@@ -1,6 +1,7 @@
 use crate::cli::settings::Settings;
 use crate::db::{self};
 use crate::lightning::LndConnector;
+use crate::lightning::get_ln_status;
 use crate::lnurl::resolv_ln_address;
 use crate::util::{
     enqueue_order_msg, get_keys, get_nostr_client, get_order, settle_seller_hold_invoice,
@@ -406,9 +407,13 @@ async fn create_order_event(new_order: &mut Order, my_keys: &Keys) -> Result<Eve
         .await
         .map_err(|e| MostroInternalErr(ServiceError::DbAccessError(e.to_string())))?;
 
+    // Get node status
+    let ln_status = get_ln_status().await?;
+
     let tags = crate::nip33::order_to_tags(
         new_order,
         Some((user.total_rating, user.total_reviews, user.created_at)),
+        &ln_status,
     );
     let event = crate::nip33::new_event(my_keys, "", new_order.id.to_string(), tags)
         .map_err(|e| MostroInternalErr(ServiceError::NostrError(e.to_string())))?;

src/lightning/mod.rs

@@ -271,6 +271,13 @@ impl LndConnector {
     }
 }
 
+pub async fn get_ln_status() -> Result<LnStatus, MostroError> {
+    let mut ln_client = LndConnector::new().await?;
+    let ln_status = ln_client.get_node_info().await?;
+    let ln_status = LnStatus::from_get_info_response(ln_status);
+    Ok(ln_status)
+}
+
 #[derive(Debug)]
 pub struct LnStatus {
     pub version: String,

src/main.rs

@@ -18,6 +18,7 @@ use crate::lightning::LnStatus;
 use anyhow::Result;
 use db::find_held_invoices;
 use lightning::LndConnector;
+use crate::lightning::get_ln_status;
 use mostro_core::message::Message;
 use nostr_sdk::prelude::*;
 use scheduler::start_scheduler;
@@ -93,9 +94,11 @@ async fn main() -> Result<()> {
     // Client subscription
     client.subscribe(vec![subscription], None).await?;
 
+
+
     let mut ln_client = LndConnector::new().await?;
-    let ln_status = ln_client.get_node_info().await?;
-    let ln_status = LnStatus::from_get_info_response(ln_status);
+    let ln_status = get_ln_status().await?;
+
     if LN_STATUS.set(ln_status).is_err() {
         panic!("No connection to LND node - shutting down Mostro!");
     };

src/nip33.rs

@@ -76,7 +76,7 @@ fn create_fiat_amt_array(order: &Order) -> Vec<String> {
 ///
 /// * `order` - The order to transform
 ///
-pub fn order_to_tags(order: &Order, reputation_data: Option<(f64, i64, i64)>) -> Tags {
+pub fn order_to_tags(order: &Order, reputation_data: Option<(f64, i64, i64)>, ln_status: &LnStatus) -> Tags {
     let mut tags: Vec<Tag> = vec![
         Tag::custom(
             TagKind::Custom(Cow::Borrowed("k")),
@@ -108,7 +108,7 @@ pub fn order_to_tags(order: &Order, reputation_data: Option<(f64, i64, i64)>) ->
         ),
         Tag::custom(
             TagKind::Custom(Cow::Borrowed("network")),
-            vec!["mainnet".to_string()],
+            vec![ln_status.networks.join(",")],
         ),
         Tag::custom(
             TagKind::Custom(Cow::Borrowed("layer")),

src/util.rs

@@ -6,6 +6,7 @@ use crate::flow;
 use crate::lightning;
 use crate::lightning::invoice::is_valid_invoice;
 use crate::lightning::LndConnector;
+use crate::lightning::get_ln_status;
 use crate::messages;
 use crate::models::Yadio;
 use crate::nip33::{new_event, order_to_tags};
@@ -203,10 +204,15 @@ pub async fn publish_order(
     let user = is_user_present(pool, identity_pubkey.to_string())
         .await
         .map_err(|e| MostroInternalErr(ServiceError::DbAccessError(e.to_string())))?;
+
+    // Get node status
+    let ln_status = get_ln_status().await?;
+
     // We transform the order fields to tags to use in the event
     let tags = order_to_tags(
         &new_order_db,
         Some((user.total_rating, user.total_reviews, user.created_at)),
+        &ln_status,
     );
     // nip33 kind with order fields as tags and order id as identifier
     let event = new_event(keys, "", order_id.to_string(), tags)
@@ -402,8 +408,12 @@ pub async fn update_order_event(
     let mut order_updated = order.clone();
     // update order.status with new status
     order_updated.status = status.to_string();
+
+    // Get node status
+    let ln_status = get_ln_status().await?;
+
     // We transform the order fields to tags to use in the event
-    let tags = order_to_tags(&order_updated, None);
+    let tags = order_to_tags(&order_updated, None, &ln_status);
     // nip33 kind with order id as identifier and order fields as tags
     let event = new_event(keys, "", order.id.to_string(), tags)
         .map_err(|e| MostroInternalErr(ServiceError::NostrError(e.to_string())))?;