all checked

ComposableFi · Nov 22, 2023 · 1bc2c14 · 1bc2c14
1 parent ba00814
commit 1bc2c14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/contracts/cosmwasm/order/src/lib.rs b/contracts/cosmwasm/order/src/lib.rs
@@ -32,7 +32,7 @@ pub struct OrderContract<'a> {
     pub orders: Map<'a, u128, OrderItem>,
     /// (a,b,solver)
     pub solutions:
-        IndexedMap<'a, &'a (Denom, Denom, SolverAddress), SolutionItem, SolutionIndexes<'a>>,
+        IndexedMap<'a, &'a (Denom, Denom, SolverAddress), SolutionItem, SolutionIndexes<'a>> ,
     pub next_order_id: Item<'a, u128>,
     /// address for CVM contact to send routes to
     pub cvm_address: Item<'a, String>,
@@ -320,7 +320,7 @@ impl OrderContract<'_> {
                     return Err(err);
                 }
             } else if let Ok(alternative_transfers) = alternative_transfers {
-                if a_total_in * b_total_in > a_in * b_in {
+                if a_total_in.saturating_mul(b_total_in) >= a_in.saturating_mul(b_in) {
                     a_in = a_total_in;
                     b_in = b_total_in;
                     all_orders = alternative_all_orders;

diff --git a/contracts/cosmwasm/order/src/types.rs b/contracts/cosmwasm/order/src/types.rs
@@ -33,7 +33,7 @@ pub struct OrderItem {
 impl OrderItem {
     pub fn fill(&mut self, wanted_transfer: Uint128) {
         // was given more or exact wanted - user happy
-        if wanted_transfer >= self.msg.wants.amount {
+        if wanted_transfer >= self.msg.wants.amount || self.msg.wants.amount == 0 {
             self.given.amount = <_>::default();
             self.msg.wants.amount = <_>::default();
         } else {