@defisaver/positions-sdk 2.0.14-dev-portfolio1 → 2.0.14-dev-portfolio2

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 (4) hide show
  1. package/cjs/morphoBlue/index.js +4 -3
  2. package/esm/morphoBlue/index.js +4 -3
  3. package/package.json +1 -1
  4. package/src/morphoBlue/index.ts +4 -3
package/cjs/morphoBlue/index.js CHANGED
@@ -168,15 +168,16 @@ function _getMorphoBlueAccountData(provider, network, account, selectedMarket, m
168
168
  ]));
169
169
  const usedAssets = {};
170
170
  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
171
+ const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
171
172
  const loanTokenBorrowed = (0, tokens_1.assetAmountInEth)(loanInfo.borrowedInAssets.toString(), marketInfo.loanToken);
172
173
  usedAssets[marketInfo.loanToken] = {
173
174
  symbol: loanTokenInfo.symbol,
174
- supplied: '0',
175
+ supplied: loanTokenSupplied,
175
176
  borrowed: loanTokenBorrowed,
176
- isSupplied: false,
177
+ isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
177
178
  isBorrowed: new decimal_js_1.default(loanInfo.borrowedInAssets.toString()).gt(0),
178
179
  collateral: false,
179
- suppliedUsd: '0',
180
+ suppliedUsd: new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
180
181
  borrowedUsd: new decimal_js_1.default(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
181
182
  };
182
183
  const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
package/esm/morphoBlue/index.js CHANGED
@@ -155,15 +155,16 @@ export function _getMorphoBlueAccountData(provider, network, account, selectedMa
155
155
  ]));
156
156
  const usedAssets = {};
157
157
  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
158
+ const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
158
159
  const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets.toString(), marketInfo.loanToken);
159
160
  usedAssets[marketInfo.loanToken] = {
160
161
  symbol: loanTokenInfo.symbol,
161
- supplied: '0',
162
+ supplied: loanTokenSupplied,
162
163
  borrowed: loanTokenBorrowed,
163
- isSupplied: false,
164
+ isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
164
165
  isBorrowed: new Dec(loanInfo.borrowedInAssets.toString()).gt(0),
165
166
  collateral: false,
166
- suppliedUsd: '0',
167
+ suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
167
168
  borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
168
169
  };
169
170
  const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.0.14-dev-portfolio1",
3
+ "version": "2.0.14-dev-portfolio2",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/morphoBlue/index.ts CHANGED
@@ -184,15 +184,16 @@ export async function _getMorphoBlueAccountData(provider: Client, network: Netwo
184
184
  const usedAssets: MMUsedAssets = {};
185
185
 
186
186
  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
187
+ const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
187
188
  const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets.toString(), marketInfo.loanToken);
188
189
  usedAssets[marketInfo.loanToken] = {
189
190
  symbol: loanTokenInfo.symbol,
190
- supplied: '0',
191
+ supplied: loanTokenSupplied,
191
192
  borrowed: loanTokenBorrowed,
192
- isSupplied: false,
193
+ isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
193
194
  isBorrowed: new Dec(loanInfo.borrowedInAssets.toString()).gt(0),
194
195
  collateral: false,
195
- suppliedUsd: '0',
196
+ suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
196
197
  borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
197
198
  };
198
199