handle negative amount

bindings-test/src/multitest.rs

@@ -21,7 +21,7 @@ use elys_bindings::{
     },
     query_resp::{
         AmmSwapEstimationByDenomResponse, AmmSwapEstimationResponse, AuthAddressesResponse,
-        BalanceBorrowed, Commitments, Entry, EstakingRewardsResponse,
+        BalanceBorrowed, CoinNeg, Commitments, Entry, EstakingRewardsResponse,
         LeveragelpIsWhitelistedResponse, LeveragelpParams, LeveragelpParamsResponse,
         LeveragelpStatusResponse, LeveragelpWhitelistResponse, MasterchefUserPendingRewardResponse,
         OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponse, PerpetualMtpResponse,
@@ -394,7 +394,10 @@ impl Module for ElysModule {
                     funding_rate: Some(Decimal::zero().to_string()),
                     price_impact: Some(Decimal::zero().to_string()),
                     borrow_fee: Some(Coin::new(0, "")),
-                    funding_fee: Some(Coin::new(0, "")),
+                    funding_fee: Some(CoinNeg {
+                        amount: Int128::zero(),
+                        denom: "".to_string(),
+                    }),
                 })?);
             }
             ElysQuery::AssetProfileEntryAll { .. } => {

bindings/src/query_resp.rs

@@ -101,6 +101,22 @@ pub struct AmmSwapEstimationByDenomResponse {
     pub price_impact: SignedDecimal,
     pub slippage: Decimal,
 }
+
+#[cw_serde]
+pub struct CoinNeg {
+    pub denom: String,
+    pub amount: Int128,
+}
+
+impl Default for CoinNeg {
+    fn default() -> Self {
+        Self {
+            denom: "".to_string(),
+            amount: Int128::zero(),
+        }
+    }
+}
+
 #[cw_serde]
 pub struct PerpetualOpenEstimationRawResponse {
     pub position: Option<i32>,
@@ -123,7 +139,7 @@ pub struct PerpetualOpenEstimationRawResponse {
     pub funding_rate: Option<String>,
     pub price_impact: Option<String>,
     pub borrow_fee: Option<Coin>,
-    pub funding_fee: Option<Coin>,
+    pub funding_fee: Option<CoinNeg>,
 }
 
 #[cw_serde]
@@ -148,7 +164,7 @@ pub struct PerpetualOpenEstimationResponse {
     pub funding_rate: SignedDecimal,
     pub price_impact: SignedDecimal,
     pub borrow_fee: Coin,
-    pub funding_fee: Coin,
+    pub funding_fee: CoinNeg,
 }
 
 impl Into<StdResult<PerpetualOpenEstimationResponse>> for PerpetualOpenEstimationRawResponse {
@@ -193,7 +209,10 @@ impl Into<StdResult<PerpetualOpenEstimationResponse>> for PerpetualOpenEstimatio
             price_impact: SignedDecimal::from_str(self.price_impact.unwrap_or_default().as_str())
                 .unwrap_or_default(),
             borrow_fee: self.borrow_fee.unwrap_or_default(),
-            funding_fee: self.funding_fee.unwrap_or_default(),
+            funding_fee: self.funding_fee.unwrap_or(CoinNeg {
+                denom: "".to_string(),
+                amount: Int128::zero(),
+            }),
         })
     }
 }

bindings/src/trade_shield/types/fees.rs

@@ -1,6 +1,8 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Coin;
 
+use crate::query_resp::CoinNeg;
+
 #[cw_serde]
 pub struct Fee {
     pub percent: String,
@@ -15,3 +17,18 @@ impl Default for Fee {
         }
     }
 }
+
+#[cw_serde]
+pub struct FeeNeg {
+    pub percent: String,
+    pub amount: CoinNeg,
+}
+
+impl Default for FeeNeg {
+    fn default() -> Self {
+        Self {
+            percent: "".to_string(),
+            amount: CoinNeg::default(),
+        }
+    }
+}

bindings/src/trade_shield/types/mod.rs

@@ -29,6 +29,7 @@ pub use coin_value::CoinValue;
 pub use date::Date;
 pub use denom::ElysDenom;
 pub use fees::Fee;
+pub use fees::FeeNeg;
 pub use perpetual_assets::{PerpetualAsset, PerpetualAssets};
 pub use perpetual_order::PerpetualOrder;
 pub use perpetual_order_plus::PerpetualOrderPlus;

bindings/src/trade_shield/types/perpetual_order_v2.rs

@@ -7,7 +7,7 @@ use cosmwasm_std::{
     Storage,
 };
 
-use super::{Fee, OrderPrice, PerpetualOrderType, Status};
+use super::{fees::FeeNeg, Fee, OrderPrice, PerpetualOrderType, Status};
 
 #[cw_serde]
 pub struct PerpetualOrderV2 {
@@ -25,7 +25,7 @@ pub struct PerpetualOrderV2 {
     pub size: Option<DecCoin>,
     pub liquidation: Option<SignedDecimal>,
     pub borrow_fee: Option<Fee>,
-    pub funding_fee: Option<Fee>,
+    pub funding_fee: Option<FeeNeg>,
 }
 
 impl PerpetualOrderV2 {
@@ -42,7 +42,7 @@ impl PerpetualOrderV2 {
         size: DecCoin,
         liquidation: SignedDecimal,
         borrow_fee: Fee,
-        funding_fee: Fee,
+        funding_fee: FeeNeg,
     ) -> StdResult<Self> {
         let status = if order_type == &PerpetualOrderType::MarketOpen {
             Status::Executed
@@ -109,7 +109,7 @@ impl PerpetualOrderV2 {
             size: Some(DecCoin::new(Decimal256::zero(), "")),
             liquidation: Some(SignedDecimal::zero()),
             borrow_fee: Some(Fee::default()),
-            funding_fee: Some(Fee::default()),
+            funding_fee: Some(FeeNeg::default()),
         };
 
         Ok(order)

contracts/trade-shield-contract/src/action/execute/create_perpetual_order.rs

@@ -189,7 +189,7 @@ fn create_perpetual_open_order(
             percent: open_estimation.borrow_interest_rate.to_string(),
             amount: open_estimation.borrow_fee,
         },
-        Fee {
+        FeeNeg {
             percent: open_estimation.funding_rate.to_string(),
             amount: open_estimation.funding_fee,
         },

contracts/trade-shield-contract/src/tests/cancel_perpetual_order/succesful_cancel_an_order.rs

@@ -28,7 +28,7 @@ fn succesful_cancel_an_order() {
             DecCoin::new(Decimal256::zero(), ""),
             SignedDecimal::zero(),
             Fee::default(),
-            Fee::default(),
+            FeeNeg::default(),
         )
         .unwrap()],
     };

contracts/trade-shield-contract/src/tests/cancel_perpetual_order/unauthorize.rs

@@ -27,7 +27,7 @@ fn unauthorize() {
             DecCoin::new(Decimal256::zero(), ""),
             SignedDecimal::zero(),
             Fee::default(),
-            Fee::default(),
+            FeeNeg::default(),
         )
         .unwrap()],
     };

contracts/trade-shield-contract/src/tests/create_perpetual_order/reproduce_testnet_issue_create_perpetual_market_open_order.rs

@@ -6,7 +6,7 @@ use cosmwasm_std::{
 use cw_multi_test::{AppResponse, BasicAppBuilder, Module};
 use elys_bindings::{
     msg_resp::PerpetualOpenResponse,
-    query_resp::{Entry, PerpetualOpenEstimationRawResponse, QueryGetEntryResponse},
+    query_resp::{CoinNeg, Entry, PerpetualOpenEstimationRawResponse, QueryGetEntryResponse},
     ElysMsg, ElysQuery,
 };
 
@@ -165,7 +165,7 @@ impl Module for ElysModule {
                     ),
                     slippage: Some(Decimal::zero().to_string()),
                     borrow_fee: Some(Coin::default()),
-                    funding_fee: Some(Coin::default()),
+                    funding_fee: Some(CoinNeg::default()),
                 };
 
                 return Ok(to_json_binary(&resp)?);

contracts/trade-shield-contract/src/tests/get_perpetual_order/successful_query_message.rs

@@ -25,7 +25,7 @@ fn successful_query_message() {
         DecCoin::new(Decimal256::zero(), ""),
         SignedDecimal::zero(),
         Fee::default(),
-        Fee::default(),
+        FeeNeg::default(),
     )
     .unwrap();
 

contracts/trade-shield-contract/src/tests/process_perpetual_order/pending_limit_open_long_with_price_met.rs

@@ -10,7 +10,7 @@ use cosmwasm_std::{
 use cw_multi_test::{AppResponse, BasicAppBuilder, ContractWrapper, Executor, Module};
 use elys_bindings::msg_resp::PerpetualOpenResponse;
 use elys_bindings::query_resp::{
-    OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
+    CoinNeg, OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
     PerpetualOpenEstimationRawResponse, PerpetualParamsRaw, PerpetualParamsResponseRaw,
     QueryGetEntryResponseRaw, QueryGetPriceResponse, RawEntry, TierCalculateDiscountResponse,
 };
@@ -137,7 +137,7 @@ impl Module for ElysModuleWrapper {
                 funding_rate: Some(Decimal::zero().to_string()),
                 price_impact: Some(Decimal::zero().to_string()),
                 borrow_fee: Some(Coin::new(0, "")),
-                funding_fee: Some(Coin::new(0, "")),
+                funding_fee: Some(CoinNeg::default()),
             })?),
             //ignoring address here since we only use one user
             ElysQuery::PerpetualGetPositionsForAddress { .. } => {

contracts/trade-shield-contract/src/tests/process_perpetual_order/pending_limit_open_long_with_price_not_met.rs

@@ -10,7 +10,7 @@ use cosmwasm_std::{
 use cw_multi_test::{AppResponse, BasicAppBuilder, ContractWrapper, Executor, Module};
 use elys_bindings::msg_resp::PerpetualOpenResponse;
 use elys_bindings::query_resp::{
-    OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
+    CoinNeg, OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
     PerpetualOpenEstimationRawResponse, PerpetualParamsRaw, PerpetualParamsResponseRaw,
     QueryGetEntryResponseRaw, QueryGetPriceResponse, RawEntry, TierCalculateDiscountResponse,
 };
@@ -137,7 +137,7 @@ impl Module for ElysModuleWrapper {
                 funding_rate: Some(Decimal::zero().to_string()),
                 price_impact: Some(Decimal::zero().to_string()),
                 borrow_fee: Some(Coin::new(0, "")),
-                funding_fee: Some(Coin::new(0, "")),
+                funding_fee: Some(CoinNeg::default()),
             })?),
             //ignoring address here since we only use one user
             ElysQuery::PerpetualGetPositionsForAddress { .. } => {

contracts/trade-shield-contract/src/tests/process_perpetual_order/pending_limit_open_short_with_price_met.rs

@@ -10,7 +10,7 @@ use cosmwasm_std::{
 use cw_multi_test::{AppResponse, BasicAppBuilder, ContractWrapper, Executor, Module};
 use elys_bindings::msg_resp::PerpetualOpenResponse;
 use elys_bindings::query_resp::{
-    OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
+    CoinNeg, OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
     PerpetualOpenEstimationRawResponse, PerpetualParamsRaw, PerpetualParamsResponseRaw,
     QueryGetEntryResponseRaw, QueryGetPriceResponse, RawEntry, TierCalculateDiscountResponse,
 };
@@ -137,7 +137,7 @@ impl Module for ElysModuleWrapper {
                 funding_rate: Some(Decimal::zero().to_string()),
                 price_impact: Some(Decimal::zero().to_string()),
                 borrow_fee: Some(Coin::new(0, "")),
-                funding_fee: Some(Coin::new(0, "")),
+                funding_fee: Some(CoinNeg::default()),
             })?),
             //ignoring address here since we only use one user
             ElysQuery::PerpetualGetPositionsForAddress { .. } => {

contracts/trade-shield-contract/src/tests/process_perpetual_order/pending_limit_open_short_with_price_not_met.rs

@@ -10,7 +10,7 @@ use cosmwasm_std::{
 use cw_multi_test::{AppResponse, BasicAppBuilder, ContractWrapper, Executor, Module};
 use elys_bindings::msg_resp::PerpetualOpenResponse;
 use elys_bindings::query_resp::{
-    OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
+    CoinNeg, OracleAssetInfoResponse, PerpetualGetPositionsForAddressResponseRaw,
     PerpetualOpenEstimationRawResponse, PerpetualParamsRaw, PerpetualParamsResponseRaw,
     QueryGetEntryResponseRaw, QueryGetPriceResponse, RawEntry, TierCalculateDiscountResponse,
 };
@@ -137,7 +137,7 @@ impl Module for ElysModuleWrapper {
                 funding_rate: Some(Decimal::zero().to_string()),
                 price_impact: Some(Decimal::zero().to_string()),
                 borrow_fee: Some(Coin::new(0, "")),
-                funding_fee: Some(Coin::new(0, "")),
+                funding_fee: Some(CoinNeg::default()),
             })?),
             //ignoring address here since we only use one user
             ElysQuery::PerpetualGetPositionsForAddress { .. } => {