Dev 1969 v4 bindings fix (#453)

* fix: remove options

* feat: remove min collateral

* feat: update interfaces

* fix: replace mtp wth mtpAndPrice

* fix: add mtp and price

* update

* open est fix

* handle negative amount

Author: CryptoKage2306

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,
@@ -33,8 +33,8 @@ use elys_bindings::{
         StableStakeParamsData, StableStakeParamsResp, TierCalculateDiscountResponse,
     },
     types::{
-        BalanceAvailable, Mtp, OracleAssetInfo, PageResponse, Price, SwapAmountInRoute,
-        SwapAmountOutRoute,
+        BalanceAvailable, Mtp, MtpAndPrice, OracleAssetInfo, PageResponse, Price,
+        SwapAmountInRoute, SwapAmountOutRoute,
     },
     ElysMsg, ElysQuery,
 };
@@ -330,7 +330,12 @@ impl Module for ElysModule {
                     .find(|mtp| mtp.id == id && mtp.address == address)
                     .cloned()
                 {
-                    Ok(to_json_binary(&PerpetualMtpResponse { mtp: Some(mtp) })?)
+                    Ok(to_json_binary(&PerpetualMtpResponse {
+                        mtp: Some(MtpAndPrice {
+                            mtp: mtp,
+                            trading_asset_price: Decimal::zero(),
+                        }),
+                    })?)
                 } else {
                     return Err(Error::new(StdError::not_found(
                         "perpetual trading position",
@@ -341,7 +346,14 @@ impl Module for ElysModule {
                 let mtps = PERPETUAL_OPENED_POSITION.load(storage)?;
                 let (mtps, page_resp) = pagination.filter(mtps)?;
                 Ok(to_json_binary(&PerpetualQueryPositionsResponse {
-                    mtps: Some(mtps),
+                    mtps: Some(
+                        mtps.iter()
+                            .map(|mtp| MtpAndPrice {
+                                mtp: mtp.clone(),
+                                trading_asset_price: Decimal::default(),
+                            })
+                            .collect(),
+                    ),
                     pagination: page_resp,
                 })?)
             }
@@ -382,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 { .. } => {
@@ -503,7 +518,13 @@ impl Module for ElysModule {
                     .collect();
 
                 Ok(to_json_binary(&PerpetualGetPositionsForAddressResponse {
-                    mtps: user_mtps,
+                    mtps: user_mtps
+                        .iter()
+                        .map(|v| MtpAndPrice {
+                            trading_asset_price: Decimal::zero(),
+                            mtp: v.clone(),
+                        })
+                        .collect::<Vec<_>>(),
                     pagination: PageResponse::empty(false),
                 })?)
             }

bindings-test/src/tests.rs

@@ -170,7 +170,14 @@ fn query_positions() {
 
     let mtps_found: PerpetualQueryPositionsResponse = app.wrap().query(&req).unwrap();
 
-    assert_eq!(mtps_found.mtps.unwrap(), mtps);
+    let u_mtps = mtps_found
+        .mtps
+        .unwrap()
+        .iter()
+        .map(|v| v.get_mtp())
+        .collect::<Vec<_>>();
+
+    assert_eq!(u_mtps, mtps);
 }
 
 #[test]
@@ -218,7 +225,7 @@ fn query_single_mtp() {
 
     let mtp_found: PerpetualMtpResponse = app.wrap().query(&req).unwrap();
 
-    assert_eq!(mtps[0], mtp_found.mtp.unwrap());
+    assert_eq!(mtps[0], mtp_found.mtp.unwrap().mtp);
 }
 
 #[test]

bindings/src/query.rs

@@ -153,7 +153,7 @@ pub enum ElysQuery {
     PerpetualQueryPositions { pagination: PageRequest },
     #[returns(PerpetualMtpResponse)]
     PerpetualMtp { address: String, id: u64 },
-    #[returns(PerpetualOpenEstimationResponse)]
+    #[returns(PerpetualOpenEstimationRawResponse)]
     PerpetualOpenEstimation {
         position: i32,
         leverage: SignedDecimal,

bindings/src/query_resp.rs

@@ -11,8 +11,9 @@ use crate::{
         AmmPool, AmmPoolRaw, CoinValue, PerpetualPosition, PoolExtraInfo, StakedPositionRaw,
     },
     types::{
-        BalanceAvailable, Mtp, OracleAssetInfo, PageResponse, PoolAsset, Price, StakedPosition,
-        SwapAmountInRoute, SwapAmountOutRoute, UnstakedPosition, ValidatorDetail, VestingDetail,
+        BalanceAvailable, Mtp, MtpAndPrice, OracleAssetInfo, PageResponse, PoolAsset, Price,
+        StakedPosition, SwapAmountInRoute, SwapAmountOutRoute, UnstakedPosition, ValidatorDetail,
+        VestingDetail,
     },
     ElysQuerier,
 };
@@ -67,13 +68,13 @@ pub struct OracleAssetInfoResponse {
 
 #[cw_serde]
 pub struct PerpetualQueryPositionsResponse {
-    pub mtps: Option<Vec<Mtp>>,
+    pub mtps: Option<Vec<MtpAndPrice>>,
     pub pagination: PageResponse,
 }
 
 #[cw_serde]
 pub struct PerpetualMtpResponse {
-    pub mtp: Option<Mtp>,
+    pub mtp: Option<MtpAndPrice>,
 }
 
 #[cw_serde]
@@ -100,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>,
@@ -122,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]
@@ -147,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 {
@@ -192,23 +209,35 @@ 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(),
+            }),
         })
     }
 }
 
 #[cw_serde]
 pub struct PerpetualGetPositionsForAddressResponseRaw {
-    pub mtps: Option<Vec<Mtp>>,
+    pub mtps: Option<Vec<MtpAndPrice>>,
     pub pagination: PageResponse,
 }
 
 #[cw_serde]
 pub struct PerpetualGetPositionsForAddressResponse {
-    pub mtps: Vec<Mtp>,
+    pub mtps: Vec<MtpAndPrice>,
     pub pagination: PageResponse,
 }
 
+impl PerpetualGetPositionsForAddressResponse {
+    pub fn get_mtp_vec(&self) -> Vec<Mtp> {
+        self.mtps
+            .iter()
+            .map(|mtp_and_price| mtp_and_price.get_mtp())
+            .collect()
+    }
+}
+
 #[cw_serde]
 pub struct TierCalculateDiscountResponse {
     pub discount: String,

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)

bindings/src/types.rs

@@ -257,6 +257,17 @@ impl FromStr for PerpetualPosition {
     }
 }
 #[cw_serde]
+pub struct MtpAndPrice {
+    pub trading_asset_price: Decimal,
+    pub mtp: Mtp,
+}
+
+impl MtpAndPrice {
+    pub fn get_mtp(&self) -> Mtp {
+        self.mtp.clone()
+    }
+}
+#[cw_serde]
 pub struct Mtp {
     pub address: String,
     pub collateral_asset: String,

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,
         },
@@ -326,7 +326,7 @@ fn create_perpetual_close_order(
             .into());
         }
 
-        if price.quote_denom != mtp.trading_asset {
+        if price.quote_denom != mtp.mtp.trading_asset {
             return Err(StdError::generic_err(
                 "trigger_price: The quote denom should be the trading asset denom",
             )
@@ -371,14 +371,14 @@ fn create_perpetual_close_order(
 
     let order = PerpetualOrderV2::new_close(
         &info.sender,
-        mtp.position,
+        mtp.mtp.position,
         &order_type,
-        &coin(mtp.collateral.i128() as u128, &mtp.collateral_asset),
-        &mtp.trading_asset,
-        &mtp.leverage,
+        &coin(mtp.mtp.collateral.i128() as u128, &mtp.mtp.collateral_asset),
+        &mtp.mtp.trading_asset,
+        &mtp.mtp.leverage,
         position_id,
         &trigger_price,
-        &Some(mtp.take_profit_price),
+        &Some(mtp.mtp.take_profit_price),
         &orders,
     )?;
 
@@ -409,8 +409,12 @@ fn create_perpetual_close_order(
     let number_of_executed_order = NUMBER_OF_EXECUTED_ORDER.load(deps.storage)? + 1;
     NUMBER_OF_EXECUTED_ORDER.save(deps.storage, &number_of_executed_order)?;
 
-    let msg =
-        ElysMsg::perpetual_close_position(creator, position_id, mtp.custody.i128(), &info.sender);
+    let msg = ElysMsg::perpetual_close_position(
+        creator,
+        position_id,
+        mtp.mtp.custody.i128(),
+        &info.sender,
+    );
 
     let reply_info_max_id = MAX_REPLY_ID.load(deps.storage)?;
 

contracts/trade-shield-contract/src/action/query/get_perpetual_asset.rs

@@ -1,6 +1,5 @@
 use cosmwasm_std::{DecCoin, Decimal256, Deps, Env, StdResult};
 use elys_bindings::{
-    query_resp::PerpetualGetPositionsForAddressResponse,
     trade_shield::types::{ElysDenom, PerpetualAsset, PerpetualAssets, PerpetualPositionPlus},
     ElysQuerier, ElysQuery,
 };
@@ -12,9 +11,11 @@ pub fn get_perpetuals_assets(
 ) -> StdResult<PerpetualAssets> {
     let querier = ElysQuerier::new(&deps.querier);
 
-    let PerpetualGetPositionsForAddressResponse { mtps, .. } =
+    let perpetual_get_position_for_address_result =
         querier.perpetual_get_position_for_address(address, None)?;
 
+    let mtps = perpetual_get_position_for_address_result.get_mtp_vec();
+
     let mtps = PerpetualPositionPlus::news(mtps, deps.storage, &querier)?;
     let mut perpetual_vec: Vec<PerpetualAsset> = vec![];