Merge pull request #2362 from get10101/fix/order-max-quantity-validation

fix: Subscribe to the websocket after the node has started

mobile/lib/features/trade/domain/trade_values.dart

@@ -163,6 +163,9 @@ class TradeValues {
   }
 
   _recalculateMaxQuantity() {
-    maxQuantity = tradeValuesService.calculateMaxQuantity(price: price, leverage: leverage);
+    final quantity = tradeValuesService.calculateMaxQuantity(price: price, leverage: leverage);
+    if (quantity != null) {
+      maxQuantity = quantity;
+    }
   }
 }

mobile/native/src/api.rs

@@ -20,7 +20,6 @@ use crate::ln_dlc;
 use crate::ln_dlc::get_storage;
 use crate::logger;
 use crate::max_quantity::max_quantity;
-use crate::orderbook;
 use crate::polls;
 use crate::trade::order;
 use crate::trade::order::api::NewOrder;
@@ -522,15 +521,7 @@ fn run_internal(
 
     let (_health, tx) = health::Health::new(runtime);
 
-    orderbook::subscribe(
-        ln_dlc::get_node_key(),
-        runtime,
-        tx.orderbook,
-        fcm_token,
-        tx_websocket,
-    )?;
-
-    ln_dlc::run(runtime)
+    ln_dlc::run(runtime, tx, fcm_token, tx_websocket)
 }
 
 pub fn get_new_address() -> Result<String> {

mobile/native/src/ln_dlc/mod.rs

@@ -12,9 +12,11 @@ use crate::dlc::dlc_handler;
 use crate::dlc::dlc_handler::DlcHandler;
 use crate::event;
 use crate::event::EventInternal;
+use crate::health::Tx;
 use crate::ln_dlc::node::Node;
 use crate::ln_dlc::node::NodeStorage;
 use crate::ln_dlc::node::WalletHistory;
+use crate::orderbook;
 use crate::position::ForceCloseDlcChannelSubscriber;
 use crate::state;
 use crate::storage::TenTenOneNodeStorage;
@@ -42,6 +44,7 @@ use bitcoin::Address;
 use bitcoin::Amount;
 use bitcoin::Txid;
 use commons::CollaborativeRevertTraderResponse;
+use commons::OrderbookRequest;
 use dlc::PartyParams;
 use dlc_manager::channel::Channel as DlcChannel;
 use itertools::chain;
@@ -86,6 +89,7 @@ use std::time::SystemTime;
 use time::OffsetDateTime;
 use tokio::runtime;
 use tokio::runtime::Runtime;
+use tokio::sync::broadcast;
 use tokio::sync::watch;
 use tokio::task::spawn_blocking;
 use uuid::Uuid;
@@ -262,7 +266,12 @@ pub fn get_storage() -> TenTenOneNodeStorage {
 /// Start the node
 ///
 /// Assumes that the seed has already been initialized
-pub fn run(runtime: &Runtime) -> Result<()> {
+pub fn run(
+    runtime: &Runtime,
+    tx: Tx,
+    fcm_token: String,
+    tx_websocket: broadcast::Sender<OrderbookRequest>,
+) -> Result<()> {
     runtime.block_on(async move {
         event::publish(&EventInternal::Init("Starting full ldk node".to_string()));
 
@@ -318,6 +327,14 @@ pub fn run(runtime: &Runtime) -> Result<()> {
         let node = Arc::new(Node::new(node, _running));
         state::set_node(node.clone());
 
+        orderbook::subscribe(
+            node.inner.node_key(),
+            runtime,
+            tx.orderbook,
+            fcm_token,
+            tx_websocket,
+        )?;
+
         if let Err(e) = spawn_blocking({
             let node = node.clone();
             move || keep_wallet_balance_and_history_up_to_date(&node)