@defisaver/positions-sdk 1.0.4 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/cjs/helpers/aaveHelpers/index.js +2 -4
  2. package/cjs/helpers/sparkHelpers/index.js +2 -0
  3. package/cjs/types/aave.d.ts +1 -1
  4. package/cjs/types/spark.d.ts +2 -0
  5. package/esm/helpers/aaveHelpers/index.js +2 -4
  6. package/esm/helpers/sparkHelpers/index.js +2 -0
  7. package/esm/types/aave.d.ts +1 -1
  8. package/esm/types/spark.d.ts +2 -0
  9. package/package.json +1 -1
  10. package/src/helpers/aaveHelpers/index.ts +3 -5
  11. package/src/helpers/sparkHelpers/index.ts +4 -3
  12. package/src/types/aave.ts +1 -1
  13. package/src/types/spark.ts +2 -0
package/cjs/helpers/aaveHelpers/index.js CHANGED
@@ -136,10 +136,8 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
136
136
  }
137
137
  payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
138
138
  payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
139
- payload.healthRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
140
- .toString();
141
- payload.healthLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
142
- .toString();
139
+ payload.healthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
140
+ payload.minHealthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
143
141
  return payload;
144
142
  };
145
143
  exports.aaveAnyGetAggregatedPositionData = aaveAnyGetAggregatedPositionData;
package/cjs/helpers/sparkHelpers/index.js CHANGED
@@ -100,6 +100,8 @@ const sparkGetAggregatedPositionData = (_a) => {
100
100
  }
101
101
  payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
102
102
  payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
103
+ payload.healthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
104
+ payload.minHealthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
103
105
  return payload;
104
106
  };
105
107
  exports.sparkGetAggregatedPositionData = sparkGetAggregatedPositionData;
package/cjs/types/aave.d.ts CHANGED
@@ -232,7 +232,7 @@ export interface AaveV3AggregatedPositionData {
232
232
  minCollRatio?: string;
233
233
  collLiquidationRatio?: string;
234
234
  healthRatio?: string;
235
- healthLiquidationRatio?: string;
235
+ minHealthRatio?: string;
236
236
  }
237
237
  export interface AaveHelperCommon {
238
238
  usedAssets: any;
package/cjs/types/spark.d.ts CHANGED
@@ -99,6 +99,8 @@ export interface SparkAggregatedPositionData {
99
99
  liquidationPrice?: string;
100
100
  minCollRatio: string;
101
101
  collLiquidationRatio: string;
102
+ healthRatio: string;
103
+ minHealthRatio: string;
102
104
  }
103
105
  export interface SparkPositionData extends MMPositionData {
104
106
  ratio: string;
package/esm/helpers/aaveHelpers/index.js CHANGED
@@ -119,10 +119,8 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
119
119
  }
120
120
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
121
121
  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
122
- payload.healthRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
123
- .toString();
124
- payload.healthLiquidationRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
125
- .toString();
122
+ payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
123
+ payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
126
124
  return payload;
127
125
  };
128
126
  const getApyAfterValuesEstimationInner = (selectedMarket, actions, viewContract, network) => __awaiter(void 0, void 0, void 0, function* () {
package/esm/helpers/sparkHelpers/index.js CHANGED
@@ -89,6 +89,8 @@ export const sparkGetAggregatedPositionData = (_a) => {
89
89
  }
90
90
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
91
91
  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
92
+ payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
93
+ payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
92
94
  return payload;
93
95
  };
94
96
  export const getApyAfterValuesEstimation = (selectedMarket, actions, web3) => __awaiter(void 0, void 0, void 0, function* () {
package/esm/types/aave.d.ts CHANGED
@@ -232,7 +232,7 @@ export interface AaveV3AggregatedPositionData {
232
232
  minCollRatio?: string;
233
233
  collLiquidationRatio?: string;
234
234
  healthRatio?: string;
235
- healthLiquidationRatio?: string;
235
+ minHealthRatio?: string;
236
236
  }
237
237
  export interface AaveHelperCommon {
238
238
  usedAssets: any;
package/esm/types/spark.d.ts CHANGED
@@ -99,6 +99,8 @@ export interface SparkAggregatedPositionData {
99
99
  liquidationPrice?: string;
100
100
  minCollRatio: string;
101
101
  collLiquidationRatio: string;
102
+ healthRatio: string;
103
+ minHealthRatio: string;
102
104
  }
103
105
  export interface SparkPositionData extends MMPositionData {
104
106
  ratio: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "1.0.4",
3
+ "version": "1.0.6",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/helpers/aaveHelpers/index.ts CHANGED
@@ -150,10 +150,8 @@ export const aaveAnyGetAggregatedPositionData = ({
150
150
  }
151
151
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
152
152
  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
153
- payload.healthRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
154
- .toString();
155
- payload.healthLiquidationRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
156
- .toString();
153
+ payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
154
+ payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
157
155
  return payload;
158
156
  };
159
157
 
@@ -202,4 +200,4 @@ export const getApyAfterValuesEstimation = async (selectedMarket: AaveMarketInfo
202
200
  }
203
201
 
204
202
  return {};
205
- };
203
+ };
package/src/helpers/sparkHelpers/index.ts CHANGED
@@ -45,8 +45,7 @@ export const sparkGetSuppliableAsCollAssets = ({
45
45
  export const sparkGetEmodeMutableProps = ({
46
46
  eModeCategory,
47
47
  assetsData,
48
- }: SparkHelperCommon,
49
- _asset: string) => {
48
+ }: SparkHelperCommon, _asset: string) => {
50
49
  const asset = wethToEth(_asset);
51
50
 
52
51
  const assetData = assetsData[asset];
@@ -112,6 +111,8 @@ export const sparkGetAggregatedPositionData = ({
112
111
  }
113
112
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
114
113
  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
114
+ payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
115
+ payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
115
116
  return payload;
116
117
  };
117
118
 
@@ -150,4 +151,4 @@ export const getApyAfterValuesEstimation = async (selectedMarket: SparkMarketDat
150
151
  };
151
152
  });
152
153
  return rates;
153
- };
154
+ };
package/src/types/aave.ts CHANGED
@@ -255,7 +255,7 @@ export interface AaveV3AggregatedPositionData {
255
255
  minCollRatio?: string,
256
256
  collLiquidationRatio?: string,
257
257
  healthRatio?: string,
258
- healthLiquidationRatio?: string,
258
+ minHealthRatio?: string,
259
259
  }
260
260
 
261
261
  export interface AaveHelperCommon {
package/src/types/spark.ts CHANGED
@@ -111,6 +111,8 @@ export interface SparkAggregatedPositionData {
111
111
  liquidationPrice?: string,
112
112
  minCollRatio: string,
113
113
  collLiquidationRatio: string,
114
+ healthRatio: string;
115
+ minHealthRatio: string;
114
116
  }
115
117
 
116
118
  export interface SparkPositionData extends MMPositionData {