fix : wrong check when creating new trade keys was working only on sell orders when order was with range

- update nostr-sdk to 0.41.0
- update mostro-core to 0.6.40
- introduce mostro_core::prelude

Author: arkanoider

Cargo.lock

@@ -22,7 +22,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1.0.68"
 clap = { version = "4.0", features = ["derive"] }
-nostr-sdk = { version = "0.40.0", features = ["nip06", "nip44", "nip59"] }
+nostr-sdk = { version = "0.41.0", features = ["nip06", "nip44", "nip59"] }
 serde = "1.0.215"
 serde_json = "1.0.91"
 tokio = { version = "1.23.0", features = ["full"] }
@@ -39,7 +39,7 @@ uuid = { version = "1.3.0", features = [
 dotenvy = "0.15.6"
 lightning-invoice = { version = "0.32.0", features = ["std"] }
 reqwest = { version = "0.12.4", features = ["json"] }
-mostro-core = "0.6.35"  
+mostro-core = "0.6.40"  
 lnurl-rs = "0.9.0"
 pretty_env_logger = "0.5.0"
 openssl = { version = "0.10.68", features = ["vendored"] }

Cargo.toml

@@ -3,8 +3,7 @@ use crate::util::send_message_sync;
 use crate::{db::Order, lightning::is_valid_invoice};
 use anyhow::Result;
 use lnurl::lightning_address::LightningAddress;
-use mostro_core::message::{Action, Message, Payload};
-use mostro_core::order::Status;
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use std::str::FromStr;
 use uuid::Uuid;

src/cli/add_invoice.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use chrono::DateTime;
-use mostro_core::message::{Action, Message, Payload};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 
 use crate::{

src/cli/get_dm.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use mostro_core::order::{Kind, Status};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use std::str::FromStr;
 
@@ -16,7 +16,7 @@ pub async fn execute_list_orders(
     // Used to get upper currency string to check against a list of tickers
     let mut upper_currency: Option<String> = None;
     let mut status_checked: Option<Status> = Some(Status::from_str("pending").unwrap());
-    let mut kind_checked: Option<Kind> = None;
+    let mut kind_checked: Option<mostro_core::order::Kind> = None;
 
     // New check against strings
     if let Some(s) = status {
@@ -29,7 +29,7 @@ pub async fn execute_list_orders(
     );
     // New check against strings
     if let Some(k) = kind {
-        kind_checked = Some(Kind::from_str(k).expect("Not valid order kind! Please check"));
+        kind_checked = Some(mostro_core::order::Kind::from_str(k).expect("Not valid order kind! Please check"));
         println!("You are searching {} orders", kind_checked.unwrap());
     }
 

src/cli/list_orders.rs

@@ -1,8 +1,5 @@
 use anyhow::Result;
-use mostro_core::error::CantDoReason;
-use mostro_core::message::{Action, Message, Payload};
-use mostro_core::order::SmallOrder;
-use mostro_core::order::{Kind, Status};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use std::collections::HashMap;
 use std::io::{stdin, stdout, BufRead, Write};
@@ -51,7 +48,7 @@ pub async fn execute_new_order(
     }
     let kind = uppercase_first(kind);
     // New check against strings
-    let kind_checked = Kind::from_str(&kind).unwrap();
+    let kind_checked = mostro_core::order::Kind::from_str(&kind).unwrap();
     let expires_at = match *expiration_days {
         0 => None,
         _ => {

src/cli/new_order.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use mostro_core::message::{Action, Message, Payload};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use uuid::Uuid;
 

src/cli/rate_user.rs

@@ -1,6 +1,6 @@
 use crate::{db::Order, util::send_message_sync};
 use anyhow::Result;
-use mostro_core::message::{Action, Message, Payload};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use uuid::Uuid;
 

src/cli/send_dm.rs

@@ -3,7 +3,7 @@ use crate::util::send_message_sync;
 use crate::{cli::Commands, db::connect};
 
 use anyhow::Result;
-use mostro_core::message::{Action, Message, Payload};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use sqlx::SqlitePool;
 use std::process;
@@ -92,7 +92,7 @@ async fn create_next_trade_payload(
         if let (Some(_), Some(min_amount), Some(max_amount)) =
             (order.is_mine, order.min_amount, order.max_amount)
         {
-            if max_amount - order.amount >= min_amount {
+            if max_amount - order.fiat_amount >= min_amount {
                 let (trade_keys, trade_index) = User::get_next_trade_keys(pool).await?;
                 return Ok(Some(Payload::NextTrade(
                     trade_keys.public_key().to_string(),

src/cli/send_msg.rs

@@ -1,6 +1,5 @@
 use anyhow::Result;
-use mostro_core::error::CantDoReason;
-use mostro_core::message::{Action, Message, Payload};
+use mostro_core::prelude::*;
 use nostr_sdk::prelude::*;
 use uuid::Uuid;