@defisaver/positions-sdk 1.0.13-dev-2 → 1.0.13-dev-3

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 (7) hide show
  1. package/cjs/liquityV2/index.js +6 -3
  2. package/cjs/types/liquityV2.d.ts +1 -0
  3. package/esm/liquityV2/index.js +6 -3
  4. package/esm/types/liquityV2.d.ts +1 -0
  5. package/package.json +1 -1
  6. package/src/liquityV2/index.ts +6 -2
  7. package/src/types/liquityV2.ts +1 -0
package/cjs/liquityV2/index.js CHANGED
@@ -210,7 +210,7 @@ const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, n
210
210
  exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;
211
211
  const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, troveId, allMarketsData, }) => __awaiter(void 0, void 0, void 0, function* () {
212
212
  const viewContract = getLiquityV2ViewContract(web3, network, selectedMarket.isLegacy);
213
- const { minCollRatio } = allMarketsData[selectedMarket.value].marketData;
213
+ const { minCollRatio, batchCollRatio } = allMarketsData[selectedMarket.value].marketData;
214
214
  const { collateralToken, marketAddress, debtToken } = selectedMarket;
215
215
  const [_data, debtInFront] = yield Promise.all([
216
216
  viewContract.methods.getTroveInfo(marketAddress, troveId).call(),
@@ -245,13 +245,16 @@ const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, trov
245
245
  const interestRate = new decimal_js_1.default(data.annualInterestRate).div(1e16).toString();
246
246
  const interestBatchManager = data.interestBatchManager;
247
247
  const lastInterestRateAdjTime = data.lastInterestRateAdjTime;
248
+ const hasInterestBatchManager = !(0, utils_1.compareAddresses)(interestBatchManager, constants_1.ZERO_ADDRESS);
249
+ const liqRatio = hasInterestBatchManager ? new decimal_js_1.default(minCollRatio).add(batchCollRatio).toString() : minCollRatio;
248
250
  const payload = Object.assign(Object.assign({ usedAssets,
249
251
  troveId,
250
252
  interestRate,
251
253
  interestBatchManager,
252
254
  debtInFront,
253
- lastInterestRateAdjTime, troveStatus: types_1.LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
254
- usedAssets, assetsData, minCollRatio, interestRate,
255
+ lastInterestRateAdjTime,
256
+ liqRatio, troveStatus: types_1.LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
257
+ usedAssets, assetsData, minCollRatio: liqRatio, interestRate,
255
258
  })), { collRatio });
256
259
  return payload;
257
260
  });
package/cjs/types/liquityV2.d.ts CHANGED
@@ -99,6 +99,7 @@ export interface LiquityV2TroveData {
99
99
  troveId: string;
100
100
  ratio: string;
101
101
  collRatio: string;
102
+ liqRatio: string;
102
103
  interestRate: string;
103
104
  leftToBorrowUsd: string;
104
105
  borrowLimitUsd: string;
package/esm/liquityV2/index.js CHANGED
@@ -196,7 +196,7 @@ export const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket,
196
196
  });
197
197
  export const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, troveId, allMarketsData, }) => __awaiter(void 0, void 0, void 0, function* () {
198
198
  const viewContract = getLiquityV2ViewContract(web3, network, selectedMarket.isLegacy);
199
- const { minCollRatio } = allMarketsData[selectedMarket.value].marketData;
199
+ const { minCollRatio, batchCollRatio } = allMarketsData[selectedMarket.value].marketData;
200
200
  const { collateralToken, marketAddress, debtToken } = selectedMarket;
201
201
  const [_data, debtInFront] = yield Promise.all([
202
202
  viewContract.methods.getTroveInfo(marketAddress, troveId).call(),
@@ -231,13 +231,16 @@ export const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsDat
231
231
  const interestRate = new Dec(data.annualInterestRate).div(1e16).toString();
232
232
  const interestBatchManager = data.interestBatchManager;
233
233
  const lastInterestRateAdjTime = data.lastInterestRateAdjTime;
234
+ const hasInterestBatchManager = !compareAddresses(interestBatchManager, ZERO_ADDRESS);
235
+ const liqRatio = hasInterestBatchManager ? new Dec(minCollRatio).add(batchCollRatio).toString() : minCollRatio;
234
236
  const payload = Object.assign(Object.assign({ usedAssets,
235
237
  troveId,
236
238
  interestRate,
237
239
  interestBatchManager,
238
240
  debtInFront,
239
- lastInterestRateAdjTime, troveStatus: LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, getLiquityV2AggregatedPositionData({
240
- usedAssets, assetsData, minCollRatio, interestRate,
241
+ lastInterestRateAdjTime,
242
+ liqRatio, troveStatus: LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, getLiquityV2AggregatedPositionData({
243
+ usedAssets, assetsData, minCollRatio: liqRatio, interestRate,
241
244
  })), { collRatio });
242
245
  return payload;
243
246
  });
package/esm/types/liquityV2.d.ts CHANGED
@@ -99,6 +99,7 @@ export interface LiquityV2TroveData {
99
99
  troveId: string;
100
100
  ratio: string;
101
101
  collRatio: string;
102
+ liqRatio: string;
102
103
  interestRate: string;
103
104
  leftToBorrowUsd: string;
104
105
  borrowLimitUsd: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "1.0.13-dev-2",
3
+ "version": "1.0.13-dev-3",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/liquityV2/index.ts CHANGED
@@ -242,7 +242,7 @@ export const getLiquityV2TroveData = async (
242
242
  },
243
243
  ): Promise<LiquityV2TroveData> => {
244
244
  const viewContract = getLiquityV2ViewContract(web3, network, selectedMarket.isLegacy);
245
- const { minCollRatio } = allMarketsData[selectedMarket.value].marketData;
245
+ const { minCollRatio, batchCollRatio } = allMarketsData[selectedMarket.value].marketData;
246
246
  const { collateralToken, marketAddress, debtToken } = selectedMarket;
247
247
  const [_data, debtInFront] = await Promise.all([
248
248
  viewContract.methods.getTroveInfo(marketAddress, troveId).call(),
@@ -284,6 +284,9 @@ export const getLiquityV2TroveData = async (
284
284
  const interestBatchManager = data.interestBatchManager;
285
285
  const lastInterestRateAdjTime = data.lastInterestRateAdjTime;
286
286
 
287
+ const hasInterestBatchManager = !compareAddresses(interestBatchManager, ZERO_ADDRESS);
288
+ const liqRatio = hasInterestBatchManager ? new Dec(minCollRatio).add(batchCollRatio).toString() : minCollRatio;
289
+
287
290
  const payload: LiquityV2TroveData = {
288
291
  usedAssets,
289
292
  troveId,
@@ -291,9 +294,10 @@ export const getLiquityV2TroveData = async (
291
294
  interestBatchManager,
292
295
  debtInFront,
293
296
  lastInterestRateAdjTime,
297
+ liqRatio,
294
298
  troveStatus: LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)],
295
299
  ...getLiquityV2AggregatedPositionData({
296
- usedAssets, assetsData, minCollRatio, interestRate,
300
+ usedAssets, assetsData, minCollRatio: liqRatio, interestRate,
297
301
  }),
298
302
  collRatio,
299
303
  };
package/src/types/liquityV2.ts CHANGED
@@ -108,6 +108,7 @@ export interface LiquityV2TroveData {
108
108
  troveId: string,
109
109
  ratio: string,
110
110
  collRatio: string,
111
+ liqRatio: string,
111
112
  interestRate: string,
112
113
  leftToBorrowUsd: string,
113
114
  borrowLimitUsd: string,