From 60fddf6a3e9d1ae063db1b62eb0b9053ad547a41 Mon Sep 17 00:00:00 2001
From: dzmitry-lahoda <dzmitry@lahoda.pro>
Date: Fri, 19 Apr 2024 22:42:25 +0100
Subject: [PATCH] less fails

---
 mantis/node/src/bin/mantis.rs          |  4 ++--
 mantis/node/src/mantis/blackbox/mod.rs | 28 +++++++++++++++-----------
 mantis/node/src/mantis/solve.rs        |  9 ++++++---
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/mantis/node/src/bin/mantis.rs b/mantis/node/src/bin/mantis.rs
index 96adf96..69f3b5c 100644
--- a/mantis/node/src/bin/mantis.rs
+++ b/mantis/node/src/bin/mantis.rs
@@ -188,7 +188,7 @@ async fn get_data_and_solve(
     rpc: &CosmosChainInfo,
     tip: &Tip,
     gas: Gas,
-    all_orders: Vec<OrderItem>,
+    all_active_orders: Vec<OrderItem>,
     router_api: &String,
 ) {
     log::info!(target: "mantis::solver", "Solving orders");
@@ -198,7 +198,7 @@ async fn get_data_and_solve(
     };
 
     let msgs = mantis_node::mantis::blackbox::solve::<CoinToss>(
-        all_orders,
+        all_active_orders,
         signing_key,
         tip,
         cvm_glt,
diff --git a/mantis/node/src/mantis/blackbox/mod.rs b/mantis/node/src/mantis/blackbox/mod.rs
index ce2d9f9..15bce0f 100644
--- a/mantis/node/src/mantis/blackbox/mod.rs
+++ b/mantis/node/src/mantis/blackbox/mod.rs
@@ -139,30 +139,30 @@ fn build_instructions(
         }
         NextItem::SpawnStrStr(spawn) => {
             if let Some(next) = spawn.next.get(0) {
-                let mut next = build_instructions(final_instructions, next, cvm_glt, salt);   
+                let mut next = build_instructions(final_instructions, next, cvm_glt, salt);
                 let program = CvmProgram {
                     tag: salt.to_vec(),
                     instructions: next,
                 };
                 let to_asset_id = spawn.out_asset_id.parse().expect("out");
-                let spawn = CvmInstruction::Spawn { 
-                    network_id: cvm_glt.get_network_for_asset(to_asset_id), 
-                    salt: salt.to_vec(), 
-                    assets: CvmFundsFilter::all_of(spawn.in_asset_id.parse().expect("in")), 
-                    program, 
+                let spawn = CvmInstruction::Spawn {
+                    network_id: cvm_glt.get_network_for_asset(to_asset_id),
+                    salt: salt.to_vec(),
+                    assets: CvmFundsFilter::all_of(spawn.in_asset_id.parse().expect("in")),
+                    program,
                 };
-                vec![spawn]             
+                vec![spawn]
             } else {
                 let program = CvmProgram {
                     tag: salt.to_vec(),
                     instructions: final_instructions,
                 };
                 let to_asset_id = spawn.out_asset_id.parse().expect("out");
-                let spawn = CvmInstruction::Spawn { 
-                    network_id: cvm_glt.get_network_for_asset(to_asset_id), 
-                    salt: salt.to_vec(), 
-                    assets: CvmFundsFilter::all_of(spawn.in_asset_id.parse().expect("in")), 
-                    program, 
+                let spawn = CvmInstruction::Spawn {
+                    network_id: cvm_glt.get_network_for_asset(to_asset_id),
+                    salt: salt.to_vec(),
+                    assets: CvmFundsFilter::all_of(spawn.in_asset_id.parse().expect("in")),
+                    program,
                 };
                 vec![spawn]
             }
@@ -179,6 +179,10 @@ pub async fn solve<Decider: Get<bool>>(
 ) -> Vec<cw_mantis_order::ExecMsg> {
     let cows_per_pair = find_cows(&active_orders);
     let mut msgs = vec![];
+
+    // this we do just to avoid one pair to fail all others, really need to handle all errors gracefully or run solver(thread/process) per pair (i am for second)
+    let cows_per_pair = cows_per_pair.into_iter().take(1).collect::<Vec<_>>();
+
     for pair_solution in cows_per_pair {
         let salt = super::cosmos::cvm::calculate_salt(signing_key, tip, pair_solution.ab.clone());
         let cvm_program = if let Some(ref cvm_glt) = cvm_glt {
diff --git a/mantis/node/src/mantis/solve.rs b/mantis/node/src/mantis/solve.rs
index 24f7eff..226c8b0 100644
--- a/mantis/node/src/mantis/solve.rs
+++ b/mantis/node/src/mantis/solve.rs
@@ -139,8 +139,8 @@ pub fn find_cows(all_orders: &[OrderItem]) -> Vec<PairSolution> {
             value: orders.collect(),
         };
         let optimal_price = orders.compute_optimal_price(1000);
-        println!("mantis::solver::cows::optimal_price: {:?}", optimal_price);
-        println!("mantis::solver::cows::orders: {:?}", orders);
+        log::info!("mantis::solver::cows::optimal_price: {:?}", optimal_price);
+        log::info!("mantis::solver::cows::orders: {:?}", orders);
         let mut solution = Solution::new(orders.value.clone());
         solution = solution.match_orders(optimal_price);
         let cows = solution
@@ -158,7 +158,7 @@ pub fn find_cows(all_orders: &[OrderItem]) -> Vec<PairSolution> {
             })
             .collect::<Vec<_>>();
         let optimal_price = decimal_to_fraction(optimal_price.0);
-        println!("cows: {:?}", cows);
+        log::info!("cows: {:?}", cows);
         if !cows.is_empty() {
             let pair_solution = PairSolution {
                 ab,
@@ -168,6 +168,9 @@ pub fn find_cows(all_orders: &[OrderItem]) -> Vec<PairSolution> {
             cows_per_pair.push(pair_solution);
         }
     }
+    use rand::prelude::SliceRandom;
+    cows_per_pair.shuffle(&mut rand::thread_rng());
+
     cows_per_pair
 }