@defisaver/positions-sdk 0.0.185-dev-3 → 0.0.185-dev-4

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/compoundV3/index.js +3 -8
  2. package/cjs/markets/morphoBlue/index.js +1 -1
  3. package/esm/compoundV3/index.js +3 -8
  4. package/esm/markets/morphoBlue/index.js +1 -1
  5. package/package.json +1 -1
  6. package/src/compoundV3/index.ts +5 -9
  7. package/src/markets/morphoBlue/index.ts +1 -1
package/cjs/compoundV3/index.js CHANGED
@@ -188,14 +188,9 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
188
188
  if (loanData.borrowAmount.toString() !== '0') {
189
189
  usedAssets[baseAssetSymbol].isBorrowed = true;
190
190
  usedAssets[baseAssetSymbol].borrowed = (0, tokens_1.assetAmountInEth)(loanData.borrowAmount, baseAssetInfo.symbol);
191
- if (selectedMarket.value === (0, compound_1.COMPOUND_V3_ETH)(network).value) {
192
- usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
193
- .mul(assetsData[baseAssetSymbol].price)
194
- .toString();
195
- }
196
- else {
197
- usedAssets[baseAssetSymbol].borrowedUsd = (0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol);
198
- }
191
+ usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
192
+ .mul(assetsData[baseAssetSymbol].price)
193
+ .toString();
199
194
  }
200
195
  const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
201
196
  loanData.collAddr.forEach((coll, i) => {
package/cjs/markets/morphoBlue/index.js CHANGED
@@ -766,7 +766,7 @@ exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = MORPHO_BLUE_CBBTC_USDC_860_BASE;
766
766
  const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
767
767
  chainIds: [common_1.NetworkNumber.Base],
768
768
  label: 'Morpho',
769
- shortLabel: 'wsuperOETHb/WETH',
769
+ shortLabel: 'wsuperOETHb/ETH',
770
770
  value: types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
771
771
  url: 'wsuperoethbweth-144bf18d',
772
772
  loanToken: '0x4200000000000000000000000000000000000006',
package/esm/compoundV3/index.js CHANGED
@@ -180,14 +180,9 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
180
180
  if (loanData.borrowAmount.toString() !== '0') {
181
181
  usedAssets[baseAssetSymbol].isBorrowed = true;
182
182
  usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
183
- if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
184
- usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
185
- .mul(assetsData[baseAssetSymbol].price)
186
- .toString();
187
- }
188
- else {
189
- usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
190
- }
183
+ usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
184
+ .mul(assetsData[baseAssetSymbol].price)
185
+ .toString();
191
186
  }
192
187
  const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
193
188
  loanData.collAddr.forEach((coll, i) => {
package/esm/markets/morphoBlue/index.js CHANGED
@@ -715,7 +715,7 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId = NetworkNumber.Eth) =
715
715
  export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = NetworkNumber.Eth) => ({
716
716
  chainIds: [NetworkNumber.Base],
717
717
  label: 'Morpho',
718
- shortLabel: 'wsuperOETHb/WETH',
718
+ shortLabel: 'wsuperOETHb/ETH',
719
719
  value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
720
720
  url: 'wsuperoethbweth-144bf18d',
721
721
  loanToken: '0x4200000000000000000000000000000000000006',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.185-dev-3",
3
+ "version": "0.0.185-dev-4",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/compoundV3/index.ts CHANGED
@@ -234,15 +234,11 @@ export const getCompoundV3AccountData = async (
234
234
  if (loanData.borrowAmount.toString() !== '0') {
235
235
  usedAssets[baseAssetSymbol].isBorrowed = true;
236
236
  usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
237
- if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
238
- usedAssets[baseAssetSymbol].borrowedUsd = new Dec(
239
- assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol),
240
- )
241
- .mul(assetsData[baseAssetSymbol].price)
242
- .toString();
243
- } else {
244
- usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
245
- }
237
+ usedAssets[baseAssetSymbol].borrowedUsd = new Dec(
238
+ assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol),
239
+ )
240
+ .mul(assetsData[baseAssetSymbol].price)
241
+ .toString();
246
242
  }
247
243
  const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
248
244
 
package/src/markets/morphoBlue/index.ts CHANGED
@@ -723,7 +723,7 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId: NetworkNumber = Netwo
723
723
  export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
724
724
  chainIds: [NetworkNumber.Base],
725
725
  label: 'Morpho',
726
- shortLabel: 'wsuperOETHb/WETH',
726
+ shortLabel: 'wsuperOETHb/ETH',
727
727
  value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
728
728
  url: 'wsuperoethbweth-144bf18d',
729
729
  loanToken: '0x4200000000000000000000000000000000000006',