Merge pull request #42 from oraichain/hotfix/return-error-if-exceed-s…

…lippage

Hotfix/return error if exceed slippage

contracts/oraiswap_limit_order/src/order.rs

@@ -35,7 +35,7 @@ pub fn submit_order(
     assets[1].assert_if_asset_is_zero()?;
 
     let offer_amount = assets[0].amount;
-    let mut ask_amount = assets[1].amount;
+    let ask_amount = assets[1].amount;
 
     let (highest_buy_price, buy_found, _) =
         orderbook_pair.highest_price(deps.storage, OrderDirection::Buy);
@@ -49,26 +49,26 @@ pub fn submit_order(
         if buy_found && sell_found {
             match direction {
                 OrderDirection::Buy => {
-                    let mut price = Decimal::from_ratio(offer_amount, ask_amount);
+                    let price = Decimal::from_ratio(offer_amount, ask_amount);
                     let spread_price = lowest_sell_price * sell_spread_factor;
                     if price.ge(&(spread_price)) {
-                        price = spread_price;
-                        ask_amount = Uint128::from(offer_amount * Decimal::one().atomics())
-                            .checked_div(price.atomics())
-                            .unwrap_or_default();
+                        return Err(ContractError::PriceNotGreaterThan {
+                            price: spread_price,
+                        });
                     }
                 }
                 OrderDirection::Sell => {
-                    let mut price = Decimal::from_ratio(ask_amount, offer_amount);
+                    let price = Decimal::from_ratio(ask_amount, offer_amount);
                     let spread_price = highest_buy_price * buy_spread_factor;
                     if spread_price.is_zero() {
                         return Err(ContractError::PriceMustNotBeZero {
                             price: spread_price,
                         });
                     }
                     if spread_price.ge(&price) {
-                        price = spread_price;
-                        ask_amount = Uint128::from(offer_amount * price);
+                        return Err(ContractError::PriceNotLessThan {
+                            price: spread_price,
+                        });
                     }
                 }
             };
@@ -276,6 +276,8 @@ fn to_events(order: &OrderWithFee, human_bidder: String) -> Event {
         attr("filled_ask_amount", order.filled_ask_amount.to_string()),
         attr("reward_fee", order.reward_fee),
         attr("relayer_fee", order.relayer_fee),
+        attr("filled_offer_this_round", order.filled_offer_this_round),
+        attr("filled_ask_this_round", order.filled_ask_this_round),
     ]
     .to_vec();
     Event::new("matched_order").add_attributes(attrs)

contracts/oraiswap_limit_order/src/orderbook.rs

@@ -42,6 +42,8 @@ pub struct OrderWithFee {
     pub filled_ask_amount: Uint128,
     pub reward_fee: Uint128,
     pub relayer_fee: Uint128,
+    pub filled_offer_this_round: Uint128,
+    pub filled_ask_this_round: Uint128,
 }
 
 #[cw_serde]
@@ -144,6 +146,9 @@ impl OrderWithFee {
         self.filled_ask_amount += ask_amount;
         self.filled_offer_amount += offer_amount;
 
+        self.filled_ask_this_round = ask_amount;
+        self.filled_offer_this_round = offer_amount;
+
         if self.offer_amount.checked_sub(self.filled_offer_amount)? < MIN_VOLUME.into()
             || self.ask_amount.checked_sub(self.filled_ask_amount)? < MIN_VOLUME.into()
         {
@@ -550,6 +555,8 @@ impl BulkOrders {
                     filled_ask_amount: order.filled_ask_amount,
                     relayer_fee: Uint128::zero(),
                     reward_fee: Uint128::zero(),
+                    filled_ask_this_round: Uint128::zero(),
+                    filled_offer_this_round: Uint128::zero(),
                 })
                 .collect(),
             volume,