@defisaver/positions-sdk 0.0.166-dev5-liquity-v2 → 0.0.166-dev7-liquity-v2

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 (10) hide show
  1. package/cjs/helpers/liquityV2Helpers/index.js +1 -0
  2. package/cjs/liquityV2/index.js +4 -4
  3. package/cjs/types/liquityV2.d.ts +2 -0
  4. package/esm/helpers/liquityV2Helpers/index.js +1 -0
  5. package/esm/liquityV2/index.js +4 -4
  6. package/esm/types/liquityV2.d.ts +2 -0
  7. package/package.json +1 -1
  8. package/src/helpers/liquityV2Helpers/index.ts +1 -0
  9. package/src/liquityV2/index.ts +3 -2
  10. package/src/types/liquityV2.ts +2 -0
package/cjs/helpers/liquityV2Helpers/index.js CHANGED
@@ -45,6 +45,7 @@ const getLiquityV2AggregatedPositionData = ({ usedAssets, assetsData, minCollRat
45
45
  const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
46
46
  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
47
47
  payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
48
+ payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
48
49
  const { netApy, incentiveUsd, totalInterestUsd } = (0, exports.calculateNetApyLiquityV2)(usedAssets, assetsData, interestRate);
49
50
  payload.netApy = netApy;
50
51
  payload.incentiveUsd = incentiveUsd;
package/cjs/liquityV2/index.js CHANGED
@@ -24,6 +24,7 @@ const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb3) => _
24
24
  const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
25
25
  const { marketAddress, debtToken, collateralToken } = selectedMarket;
26
26
  const data = yield viewContract.methods.getMarketData(marketAddress).call();
27
+ const hintHelperAddress = data.hintHelpers;
27
28
  const assetsData = {};
28
29
  assetsData[debtToken] = {
29
30
  symbol: debtToken,
@@ -48,7 +49,7 @@ const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb3) => _
48
49
  assetsData[collateralToken].incentiveSupplyToken = collateralToken;
49
50
  }
50
51
  const minCollRatio = new decimal_js_1.default(data.MCR).div(1e16).toString();
51
- return { assetsData, marketData: { minCollRatio } };
52
+ return { assetsData, marketData: { minCollRatio, hintHelperAddress } };
52
53
  });
53
54
  exports.getLiquityV2MarketData = getLiquityV2MarketData;
54
55
  const _getDebtInFront = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call(); });
@@ -94,14 +95,13 @@ const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, mark
94
95
  const collRatio = new decimal_js_1.default(data.TCRatio).div(1e16).toString();
95
96
  const interestRate = new decimal_js_1.default(data.annualInterestRate).div(1e16).toString();
96
97
  const interestBatchManager = data.interestBatchManager;
97
- const payload = Object.assign({ usedAssets,
98
+ const payload = Object.assign(Object.assign({ usedAssets,
98
99
  troveId,
99
- collRatio,
100
100
  interestRate,
101
101
  interestBatchManager,
102
102
  debtInFront, troveStatus: types_1.LIQUITY_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
103
103
  usedAssets, assetsData, minCollRatio, interestRate,
104
- }));
104
+ })), { collRatio });
105
105
  return payload;
106
106
  });
107
107
  exports.getLiquityV2TroveData = getLiquityV2TroveData;
package/cjs/types/liquityV2.d.ts CHANGED
@@ -30,6 +30,7 @@ export type LiquityV2AssetsData = {
30
30
  };
31
31
  export interface InnerLiquityV2MarketData {
32
32
  minCollRatio: string;
33
+ hintHelperAddress: EthAddress;
33
34
  }
34
35
  export interface LiquityV2MarketData {
35
36
  assetsData: LiquityV2AssetsData;
@@ -60,6 +61,7 @@ export interface LiquityV2AggregatedTroveData {
60
61
  leveragedAsset: string;
61
62
  liquidationPrice: string;
62
63
  ratio: string;
64
+ collRatio: string;
63
65
  }
64
66
  export interface LiquityV2TroveData {
65
67
  usedAssets: LiquityV2UsedAssets;
package/esm/helpers/liquityV2Helpers/index.js CHANGED
@@ -38,6 +38,7 @@ export const getLiquityV2AggregatedPositionData = ({ usedAssets, assetsData, min
38
38
  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
39
39
  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
40
40
  payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
41
+ payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
41
42
  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
42
43
  payload.netApy = netApy;
43
44
  payload.incentiveUsd = incentiveUsd;
package/esm/liquityV2/index.js CHANGED
@@ -18,6 +18,7 @@ export const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb
18
18
  const viewContract = LiquityV2ViewContract(web3, network);
19
19
  const { marketAddress, debtToken, collateralToken } = selectedMarket;
20
20
  const data = yield viewContract.methods.getMarketData(marketAddress).call();
21
+ const hintHelperAddress = data.hintHelpers;
21
22
  const assetsData = {};
22
23
  assetsData[debtToken] = {
23
24
  symbol: debtToken,
@@ -42,7 +43,7 @@ export const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb
42
43
  assetsData[collateralToken].incentiveSupplyToken = collateralToken;
43
44
  }
44
45
  const minCollRatio = new Dec(data.MCR).div(1e16).toString();
45
- return { assetsData, marketData: { minCollRatio } };
46
+ return { assetsData, marketData: { minCollRatio, hintHelperAddress } };
46
47
  });
47
48
  const _getDebtInFront = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call(); });
48
49
  export const getDebtInFrontLiquityV2 = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
@@ -86,13 +87,12 @@ export const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsDat
86
87
  const collRatio = new Dec(data.TCRatio).div(1e16).toString();
87
88
  const interestRate = new Dec(data.annualInterestRate).div(1e16).toString();
88
89
  const interestBatchManager = data.interestBatchManager;
89
- const payload = Object.assign({ usedAssets,
90
+ const payload = Object.assign(Object.assign({ usedAssets,
90
91
  troveId,
91
- collRatio,
92
92
  interestRate,
93
93
  interestBatchManager,
94
94
  debtInFront, troveStatus: LIQUITY_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, getLiquityV2AggregatedPositionData({
95
95
  usedAssets, assetsData, minCollRatio, interestRate,
96
- }));
96
+ })), { collRatio });
97
97
  return payload;
98
98
  });
package/esm/types/liquityV2.d.ts CHANGED
@@ -30,6 +30,7 @@ export type LiquityV2AssetsData = {
30
30
  };
31
31
  export interface InnerLiquityV2MarketData {
32
32
  minCollRatio: string;
33
+ hintHelperAddress: EthAddress;
33
34
  }
34
35
  export interface LiquityV2MarketData {
35
36
  assetsData: LiquityV2AssetsData;
@@ -60,6 +61,7 @@ export interface LiquityV2AggregatedTroveData {
60
61
  leveragedAsset: string;
61
62
  liquidationPrice: string;
62
63
  ratio: string;
64
+ collRatio: string;
63
65
  }
64
66
  export interface LiquityV2TroveData {
65
67
  usedAssets: LiquityV2UsedAssets;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.166-dev5-liquity-v2",
3
+ "version": "0.0.166-dev7-liquity-v2",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/helpers/liquityV2Helpers/index.ts CHANGED
@@ -61,6 +61,7 @@ export const getLiquityV2AggregatedPositionData = ({
61
61
  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
62
62
  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
63
63
  payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
64
+ payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
64
65
  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
65
66
  payload.netApy = netApy;
66
67
  payload.incentiveUsd = incentiveUsd;
package/src/liquityV2/index.ts CHANGED
@@ -18,6 +18,7 @@ export const getLiquityV2MarketData = async (web3: Web3, network: NetworkNumber,
18
18
  const viewContract = LiquityV2ViewContract(web3, network);
19
19
  const { marketAddress, debtToken, collateralToken } = selectedMarket;
20
20
  const data = await viewContract.methods.getMarketData(marketAddress).call();
21
+ const hintHelperAddress = data.hintHelpers;
21
22
  const assetsData: LiquityV2AssetsData = {};
22
23
  assetsData[debtToken] = {
23
24
  symbol: debtToken,
@@ -43,7 +44,7 @@ export const getLiquityV2MarketData = async (web3: Web3, network: NetworkNumber,
43
44
  }
44
45
 
45
46
  const minCollRatio = new Dec(data.MCR).div(1e16).toString();
46
- return { assetsData, marketData: { minCollRatio } };
47
+ return { assetsData, marketData: { minCollRatio, hintHelperAddress } };
47
48
  };
48
49
 
49
50
  const _getDebtInFront = async (viewContract: any, marketAddress: EthAddress, troveId: string, accumulatedSum = '0', iterations = 2000) => viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call();
@@ -111,7 +112,6 @@ export const getLiquityV2TroveData = async (
111
112
  const payload: LiquityV2TroveData = {
112
113
  usedAssets,
113
114
  troveId,
114
- collRatio,
115
115
  interestRate,
116
116
  interestBatchManager,
117
117
  debtInFront,
@@ -119,6 +119,7 @@ export const getLiquityV2TroveData = async (
119
119
  ...getLiquityV2AggregatedPositionData({
120
120
  usedAssets, assetsData, minCollRatio, interestRate,
121
121
  }),
122
+ collRatio,
122
123
  };
123
124
 
124
125
  return payload;
package/src/types/liquityV2.ts CHANGED
@@ -33,6 +33,7 @@ export type LiquityV2AssetsData = { [key: string]: LiquityV2AssetData };
33
33
 
34
34
  export interface InnerLiquityV2MarketData {
35
35
  minCollRatio: string,
36
+ hintHelperAddress: EthAddress,
36
37
  }
37
38
 
38
39
  export interface LiquityV2MarketData {
@@ -65,6 +66,7 @@ export interface LiquityV2AggregatedTroveData {
65
66
  leveragedAsset: string,
66
67
  liquidationPrice: string,
67
68
  ratio: string,
69
+ collRatio: string,
68
70
  }
69
71
 
70
72
  export interface LiquityV2TroveData {