@defisaver/positions-sdk 2.1.54 → 2.1.56

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 (14) hide show
  1. package/cjs/aaveV3/index.js +4 -2
  2. package/cjs/markets/morphoBlue/index.d.ts +4 -0
  3. package/cjs/markets/morphoBlue/index.js +36 -2
  4. package/cjs/types/morphoBlue.d.ts +2 -0
  5. package/cjs/types/morphoBlue.js +2 -0
  6. package/esm/aaveV3/index.js +4 -2
  7. package/esm/markets/morphoBlue/index.d.ts +4 -0
  8. package/esm/markets/morphoBlue/index.js +32 -0
  9. package/esm/types/morphoBlue.d.ts +2 -0
  10. package/esm/types/morphoBlue.js +2 -0
  11. package/package.json +1 -1
  12. package/src/aaveV3/index.ts +4 -2
  13. package/src/markets/morphoBlue/index.ts +32 -0
  14. package/src/types/morphoBlue.ts +2 -0
package/cjs/aaveV3/index.js CHANGED
@@ -371,7 +371,7 @@ exports._getAaveV3AccountBalances = _getAaveV3AccountBalances;
371
371
  const getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV3AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address); });
372
372
  exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
373
373
  const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') {
374
- const { selectedMarket: market, assetsData, } = extractedState;
374
+ const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
375
375
  let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
376
376
  if (!address) {
377
377
  return payload;
@@ -397,7 +397,9 @@ const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_
397
397
  const supplied = (0, tokens_1.assetAmountInEth)(tokenInfo.balance.toString(), asset);
398
398
  const borrowedStable = (0, tokens_1.assetAmountInEth)(tokenInfo.borrowsStable.toString(), asset);
399
399
  const borrowedVariable = (0, tokens_1.assetAmountInEth)(tokenInfo.borrowsVariable.toString(), asset);
400
- const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
400
+ const eModeCategoryData = eModeCategoriesData[+eModeCategory.toString()];
401
+ const usageAsCollateralIsEnabledInEmode = eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.collateralAssets.includes(asset);
402
+ const enabledAsCollateral = (assetsData[asset].usageAsCollateralEnabled || usageAsCollateralIsEnabledInEmode) ? tokenInfo.enabledAsCollateral : false;
401
403
  let interestMode;
402
404
  if (borrowedVariable === '0' && borrowedStable !== '0') {
403
405
  interestMode = '1';
package/cjs/markets/morphoBlue/index.d.ts CHANGED
@@ -17,6 +17,8 @@ export declare const MORPHO_BLUE_TBTC_USDC: (networkId?: NetworkNumber) => Morph
17
17
  export declare const MORPHO_BLUE_CBBTC_ETH_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
18
18
  export declare const MORPHO_BLUE_CBBTC_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
19
19
  export declare const MORPHO_BLUE_SUSDE_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
20
+ export declare const MORPHO_BLUE_SUSDE_USDTB_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
21
+ export declare const MORPHO_BLUE_USDE_USDTB_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
20
22
  export declare const MORPHO_BLUE_EZETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
21
23
  export declare const MORPHO_BLUE_EZETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
22
24
  export declare const MORPHO_BLUE_WEETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -86,6 +88,8 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
86
88
  readonly morphobluelbtccbbtc_945: MorphoBlueMarketData;
87
89
  readonly morphobluesusdsusdt_965: MorphoBlueMarketData;
88
90
  readonly morphobluemorphousdc_625: MorphoBlueMarketData;
91
+ readonly morphobluesusdeusdtb_915: MorphoBlueMarketData;
92
+ readonly morphoblueusdeusdtb_915: MorphoBlueMarketData;
89
93
  readonly morphobluewstetheth_945: MorphoBlueMarketData;
90
94
  readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
91
95
  readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
package/cjs/markets/morphoBlue/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MORPHO_BLUE_LBTC_CBBTC_945_BASE = exports.MORPHO_BLUE_LBTC_WBTC_945 = exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE_13c42741 = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_MORPHO_USDC_625 = exports.MORPHO_BLUE_SUSDS_USDT_965 = exports.MORPHO_BLUE_LBTC_CBBTC_945 = exports.MORPHO_BLUE_LBTC_USDC_860 = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915 = exports.MORPHO_BLUE_USR_USDC_915 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_860 = exports.MORPHO_BLUE_SUSDE_USDC_915 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
4
- exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_SUSDS_USDC_945_ARB = exports.MORPHO_BLUE_ETH_USDC_860_ARB = exports.MORPHO_BLUE_WSTETH_USDC_860_ARB = exports.MorphoBlueWBTCUSDC_860_Arb = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = exports.MORPHO_BLUE_WETH_EURC_860_BASE = exports.MORPHO_BLUE_CBBTC_EURC_860_BASE = exports.MORPHO_BLUE_WSTETH_EURC_860_BASE = void 0;
3
+ exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE_13c42741 = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_MORPHO_USDC_625 = exports.MORPHO_BLUE_SUSDS_USDT_965 = exports.MORPHO_BLUE_LBTC_CBBTC_945 = exports.MORPHO_BLUE_LBTC_USDC_860 = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915 = exports.MORPHO_BLUE_USR_USDC_915 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_860 = exports.MORPHO_BLUE_USDE_USDTB_915 = exports.MORPHO_BLUE_SUSDE_USDTB_915 = exports.MORPHO_BLUE_SUSDE_USDC_915 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
4
+ exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_SUSDS_USDC_945_ARB = exports.MORPHO_BLUE_ETH_USDC_860_ARB = exports.MORPHO_BLUE_WSTETH_USDC_860_ARB = exports.MorphoBlueWBTCUSDC_860_Arb = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = exports.MORPHO_BLUE_WETH_EURC_860_BASE = exports.MORPHO_BLUE_CBBTC_EURC_860_BASE = exports.MORPHO_BLUE_WSTETH_EURC_860_BASE = exports.MORPHO_BLUE_LBTC_CBBTC_945_BASE = exports.MORPHO_BLUE_LBTC_WBTC_945 = void 0;
5
5
  const utils_1 = require("../../services/utils");
6
6
  const types_1 = require("../../types");
7
7
  const common_1 = require("../../types/common");
@@ -277,6 +277,38 @@ const MORPHO_BLUE_SUSDE_USDC_915 = (networkId = common_1.NetworkNumber.Eth) => (
277
277
  protocolName: 'morpho-blue',
278
278
  });
279
279
  exports.MORPHO_BLUE_SUSDE_USDC_915 = MORPHO_BLUE_SUSDE_USDC_915;
280
+ const MORPHO_BLUE_SUSDE_USDTB_915 = (networkId = common_1.NetworkNumber.Eth) => ({
281
+ chainIds: [1],
282
+ label: 'Morpho',
283
+ shortLabel: 'sUSDe/USDTb',
284
+ value: types_1.MorphoBlueVersions.MorphoBlueSUSDeUSDtb_915,
285
+ url: 'susdeusdtb-88a18b2f',
286
+ loanToken: '0xC139190F447e929f090Edeb554D95AbB8b18aC1C',
287
+ collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
288
+ oracle: '0x67BcC03438D7d71c39343d7AD21cb73Dc19aDB89',
289
+ oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
290
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
291
+ lltv: 0.915,
292
+ marketId: '0x88a18b2f4d94e7ad27a381b15531c06abf05a7c99dd5d3c3679875fed6f7e742',
293
+ protocolName: 'morpho-blue',
294
+ });
295
+ exports.MORPHO_BLUE_SUSDE_USDTB_915 = MORPHO_BLUE_SUSDE_USDTB_915;
296
+ const MORPHO_BLUE_USDE_USDTB_915 = (networkId = common_1.NetworkNumber.Eth) => ({
297
+ chainIds: [1],
298
+ label: 'Morpho',
299
+ shortLabel: 'USDe/USDTb',
300
+ value: types_1.MorphoBlueVersions.MorphoBlueUSDeUSDtb_915,
301
+ url: 'usdeusdtb-ba5bb3cc',
302
+ loanToken: '0xC139190F447e929f090Edeb554D95AbB8b18aC1C',
303
+ collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
304
+ oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
305
+ oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
306
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
307
+ lltv: 0.915,
308
+ marketId: '0xba5bb3ccec8df00a56ac1f4d97ae0fd1461f262b6d4f29631bdec717fa6017fd',
309
+ protocolName: 'morpho-blue',
310
+ });
311
+ exports.MORPHO_BLUE_USDE_USDTB_915 = MORPHO_BLUE_USDE_USDTB_915;
280
312
  // ezETH/ETH
281
313
  const MORPHO_BLUE_EZETH_ETH_860 = (networkId = common_1.NetworkNumber.Eth) => ({
282
314
  chainIds: [1],
@@ -968,6 +1000,8 @@ const MorphoBlueMarkets = (networkId) => ({
968
1000
  [types_1.MorphoBlueVersions.MorphoBlueLBTCCbBTC_945]: (0, exports.MORPHO_BLUE_LBTC_CBBTC_945)(networkId),
969
1001
  [types_1.MorphoBlueVersions.MorphoBluesUSDSUSDT_965]: (0, exports.MORPHO_BLUE_SUSDS_USDT_965)(networkId),
970
1002
  [types_1.MorphoBlueVersions.MorphoBlueMORPHOUSDC_625]: (0, exports.MORPHO_BLUE_MORPHO_USDC_625)(networkId),
1003
+ [types_1.MorphoBlueVersions.MorphoBlueSUSDeUSDtb_915]: (0, exports.MORPHO_BLUE_SUSDE_USDTB_915)(networkId),
1004
+ [types_1.MorphoBlueVersions.MorphoBlueUSDeUSDtb_915]: (0, exports.MORPHO_BLUE_USDE_USDTB_915)(networkId),
971
1005
  // wstETH/WETH
972
1006
  [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945)(networkId),
973
1007
  [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE)(networkId),
package/cjs/types/morphoBlue.d.ts CHANGED
@@ -23,6 +23,8 @@ export declare enum MorphoBlueVersions {
23
23
  MorphoBlueUSRUSDC_915 = "morphoblueusrusdc_915",// USR/USDC
24
24
  MorphoBlueSyrupUSDCUSDC_915 = "morphobluesyrupusdcusdc_915",// syrupUSDC/USDC
25
25
  MorphoBluesUSDSUSDT_965 = "morphobluesusdsusdt_965",// sUSDS/USDT
26
+ MorphoBlueSUSDeUSDtb_915 = "morphobluesusdeusdtb_915",// sUSDe/USDTb
27
+ MorphoBlueUSDeUSDtb_915 = "morphoblueusdeusdtb_915",// USDe/USDTb
26
28
  MorphoBlueEzEthEth_860 = "morphoblueezetheth_860",
27
29
  MorphoBlueEzEthEth_945 = "morphoblueezetheth_945",
28
30
  MorphoBlueWeEthEth_945 = "morphoblueweetheth_945",
package/cjs/types/morphoBlue.js CHANGED
@@ -27,6 +27,8 @@ var MorphoBlueVersions;
27
27
  MorphoBlueVersions["MorphoBlueUSRUSDC_915"] = "morphoblueusrusdc_915";
28
28
  MorphoBlueVersions["MorphoBlueSyrupUSDCUSDC_915"] = "morphobluesyrupusdcusdc_915";
29
29
  MorphoBlueVersions["MorphoBluesUSDSUSDT_965"] = "morphobluesusdsusdt_965";
30
+ MorphoBlueVersions["MorphoBlueSUSDeUSDtb_915"] = "morphobluesusdeusdtb_915";
31
+ MorphoBlueVersions["MorphoBlueUSDeUSDtb_915"] = "morphoblueusdeusdtb_915";
30
32
  // ezETH/ETH
31
33
  MorphoBlueVersions["MorphoBlueEzEthEth_860"] = "morphoblueezetheth_860";
32
34
  MorphoBlueVersions["MorphoBlueEzEthEth_945"] = "morphoblueezetheth_945";
package/esm/aaveV3/index.js CHANGED
@@ -358,7 +358,7 @@ export const _getAaveV3AccountBalances = (provider, network, block, addressMappi
358
358
  });
359
359
  export const getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return _getAaveV3AccountBalances(getViemProvider(provider, network), network, block, addressMapping, address); });
360
360
  export const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') {
361
- const { selectedMarket: market, assetsData, } = extractedState;
361
+ const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
362
362
  let payload = Object.assign(Object.assign({}, EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
363
363
  if (!address) {
364
364
  return payload;
@@ -384,7 +384,9 @@ export const _getAaveV3AccountData = (provider_1, network_1, address_1, extracte
384
384
  const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
385
385
  const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
386
386
  const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
387
- const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
387
+ const eModeCategoryData = eModeCategoriesData[+eModeCategory.toString()];
388
+ const usageAsCollateralIsEnabledInEmode = eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.collateralAssets.includes(asset);
389
+ const enabledAsCollateral = (assetsData[asset].usageAsCollateralEnabled || usageAsCollateralIsEnabledInEmode) ? tokenInfo.enabledAsCollateral : false;
388
390
  let interestMode;
389
391
  if (borrowedVariable === '0' && borrowedStable !== '0') {
390
392
  interestMode = '1';
package/esm/markets/morphoBlue/index.d.ts CHANGED
@@ -17,6 +17,8 @@ export declare const MORPHO_BLUE_TBTC_USDC: (networkId?: NetworkNumber) => Morph
17
17
  export declare const MORPHO_BLUE_CBBTC_ETH_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
18
18
  export declare const MORPHO_BLUE_CBBTC_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
19
19
  export declare const MORPHO_BLUE_SUSDE_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
20
+ export declare const MORPHO_BLUE_SUSDE_USDTB_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
21
+ export declare const MORPHO_BLUE_USDE_USDTB_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
20
22
  export declare const MORPHO_BLUE_EZETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
21
23
  export declare const MORPHO_BLUE_EZETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
22
24
  export declare const MORPHO_BLUE_WEETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -86,6 +88,8 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
86
88
  readonly morphobluelbtccbbtc_945: MorphoBlueMarketData;
87
89
  readonly morphobluesusdsusdt_965: MorphoBlueMarketData;
88
90
  readonly morphobluemorphousdc_625: MorphoBlueMarketData;
91
+ readonly morphobluesusdeusdtb_915: MorphoBlueMarketData;
92
+ readonly morphoblueusdeusdtb_915: MorphoBlueMarketData;
89
93
  readonly morphobluewstetheth_945: MorphoBlueMarketData;
90
94
  readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
91
95
  readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
package/esm/markets/morphoBlue/index.js CHANGED
@@ -256,6 +256,36 @@ export const MORPHO_BLUE_SUSDE_USDC_915 = (networkId = NetworkNumber.Eth) => ({
256
256
  marketId: '0x85c7f4374f3a403b36d54cc284983b2b02bbd8581ee0f3c36494447b87d9fcab',
257
257
  protocolName: 'morpho-blue',
258
258
  });
259
+ export const MORPHO_BLUE_SUSDE_USDTB_915 = (networkId = NetworkNumber.Eth) => ({
260
+ chainIds: [1],
261
+ label: 'Morpho',
262
+ shortLabel: 'sUSDe/USDTb',
263
+ value: MorphoBlueVersions.MorphoBlueSUSDeUSDtb_915,
264
+ url: 'susdeusdtb-88a18b2f',
265
+ loanToken: '0xC139190F447e929f090Edeb554D95AbB8b18aC1C',
266
+ collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
267
+ oracle: '0x67BcC03438D7d71c39343d7AD21cb73Dc19aDB89',
268
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
269
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
270
+ lltv: 0.915,
271
+ marketId: '0x88a18b2f4d94e7ad27a381b15531c06abf05a7c99dd5d3c3679875fed6f7e742',
272
+ protocolName: 'morpho-blue',
273
+ });
274
+ export const MORPHO_BLUE_USDE_USDTB_915 = (networkId = NetworkNumber.Eth) => ({
275
+ chainIds: [1],
276
+ label: 'Morpho',
277
+ shortLabel: 'USDe/USDTb',
278
+ value: MorphoBlueVersions.MorphoBlueUSDeUSDtb_915,
279
+ url: 'usdeusdtb-ba5bb3cc',
280
+ loanToken: '0xC139190F447e929f090Edeb554D95AbB8b18aC1C',
281
+ collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
282
+ oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
283
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
284
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
285
+ lltv: 0.915,
286
+ marketId: '0xba5bb3ccec8df00a56ac1f4d97ae0fd1461f262b6d4f29631bdec717fa6017fd',
287
+ protocolName: 'morpho-blue',
288
+ });
259
289
  // ezETH/ETH
260
290
  export const MORPHO_BLUE_EZETH_ETH_860 = (networkId = NetworkNumber.Eth) => ({
261
291
  chainIds: [1],
@@ -906,6 +936,8 @@ export const MorphoBlueMarkets = (networkId) => ({
906
936
  [MorphoBlueVersions.MorphoBlueLBTCCbBTC_945]: MORPHO_BLUE_LBTC_CBBTC_945(networkId),
907
937
  [MorphoBlueVersions.MorphoBluesUSDSUSDT_965]: MORPHO_BLUE_SUSDS_USDT_965(networkId),
908
938
  [MorphoBlueVersions.MorphoBlueMORPHOUSDC_625]: MORPHO_BLUE_MORPHO_USDC_625(networkId),
939
+ [MorphoBlueVersions.MorphoBlueSUSDeUSDtb_915]: MORPHO_BLUE_SUSDE_USDTB_915(networkId),
940
+ [MorphoBlueVersions.MorphoBlueUSDeUSDtb_915]: MORPHO_BLUE_USDE_USDTB_915(networkId),
909
941
  // wstETH/WETH
910
942
  [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
911
943
  [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
package/esm/types/morphoBlue.d.ts CHANGED
@@ -23,6 +23,8 @@ export declare enum MorphoBlueVersions {
23
23
  MorphoBlueUSRUSDC_915 = "morphoblueusrusdc_915",// USR/USDC
24
24
  MorphoBlueSyrupUSDCUSDC_915 = "morphobluesyrupusdcusdc_915",// syrupUSDC/USDC
25
25
  MorphoBluesUSDSUSDT_965 = "morphobluesusdsusdt_965",// sUSDS/USDT
26
+ MorphoBlueSUSDeUSDtb_915 = "morphobluesusdeusdtb_915",// sUSDe/USDTb
27
+ MorphoBlueUSDeUSDtb_915 = "morphoblueusdeusdtb_915",// USDe/USDTb
26
28
  MorphoBlueEzEthEth_860 = "morphoblueezetheth_860",
27
29
  MorphoBlueEzEthEth_945 = "morphoblueezetheth_945",
28
30
  MorphoBlueWeEthEth_945 = "morphoblueweetheth_945",
package/esm/types/morphoBlue.js CHANGED
@@ -24,6 +24,8 @@ export var MorphoBlueVersions;
24
24
  MorphoBlueVersions["MorphoBlueUSRUSDC_915"] = "morphoblueusrusdc_915";
25
25
  MorphoBlueVersions["MorphoBlueSyrupUSDCUSDC_915"] = "morphobluesyrupusdcusdc_915";
26
26
  MorphoBlueVersions["MorphoBluesUSDSUSDT_965"] = "morphobluesusdsusdt_965";
27
+ MorphoBlueVersions["MorphoBlueSUSDeUSDtb_915"] = "morphobluesusdeusdtb_915";
28
+ MorphoBlueVersions["MorphoBlueUSDeUSDtb_915"] = "morphoblueusdeusdtb_915";
27
29
  // ezETH/ETH
28
30
  MorphoBlueVersions["MorphoBlueEzEthEth_860"] = "morphoblueezetheth_860";
29
31
  MorphoBlueVersions["MorphoBlueEzEthEth_945"] = "morphoblueezetheth_945";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.1.54",
3
+ "version": "2.1.56",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/aaveV3/index.ts CHANGED
@@ -422,7 +422,7 @@ export const getAaveV3AccountBalances = async (provider: EthereumProvider, netwo
422
422
 
423
423
  export const _getAaveV3AccountData = async (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3PositionData> => {
424
424
  const {
425
- selectedMarket: market, assetsData,
425
+ selectedMarket: market, assetsData, eModeCategoriesData,
426
426
  } = extractedState;
427
427
  let payload: AaveV3PositionData = {
428
428
  ...EMPTY_AAVE_DATA,
@@ -457,7 +457,9 @@ export const _getAaveV3AccountData = async (provider: Client, network: NetworkNu
457
457
  const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
458
458
  const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
459
459
  const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
460
- const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
460
+ const eModeCategoryData = eModeCategoriesData[+(eModeCategory as BigInt).toString()];
461
+ const usageAsCollateralIsEnabledInEmode = eModeCategoryData?.collateralAssets.includes(asset);
462
+ const enabledAsCollateral = (assetsData[asset].usageAsCollateralEnabled || usageAsCollateralIsEnabledInEmode) ? tokenInfo.enabledAsCollateral : false;
461
463
 
462
464
  let interestMode;
463
465
  if (borrowedVariable === '0' && borrowedStable !== '0') {
package/src/markets/morphoBlue/index.ts CHANGED
@@ -260,6 +260,36 @@ export const MORPHO_BLUE_SUSDE_USDC_915 = (networkId: NetworkNumber = NetworkNum
260
260
  marketId: '0x85c7f4374f3a403b36d54cc284983b2b02bbd8581ee0f3c36494447b87d9fcab',
261
261
  protocolName: 'morpho-blue',
262
262
  });
263
+ export const MORPHO_BLUE_SUSDE_USDTB_915 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
264
+ chainIds: [1],
265
+ label: 'Morpho',
266
+ shortLabel: 'sUSDe/USDTb',
267
+ value: MorphoBlueVersions.MorphoBlueSUSDeUSDtb_915,
268
+ url: 'susdeusdtb-88a18b2f',
269
+ loanToken: '0xC139190F447e929f090Edeb554D95AbB8b18aC1C',
270
+ collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
271
+ oracle: '0x67BcC03438D7d71c39343d7AD21cb73Dc19aDB89',
272
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
273
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
274
+ lltv: 0.915,
275
+ marketId: '0x88a18b2f4d94e7ad27a381b15531c06abf05a7c99dd5d3c3679875fed6f7e742',
276
+ protocolName: 'morpho-blue',
277
+ });
278
+ export const MORPHO_BLUE_USDE_USDTB_915 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
279
+ chainIds: [1],
280
+ label: 'Morpho',
281
+ shortLabel: 'USDe/USDTb',
282
+ value: MorphoBlueVersions.MorphoBlueUSDeUSDtb_915,
283
+ url: 'usdeusdtb-ba5bb3cc',
284
+ loanToken: '0xC139190F447e929f090Edeb554D95AbB8b18aC1C',
285
+ collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
286
+ oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
287
+ oracleType: MorphoBlueOracleType.MARKET_RATE,
288
+ irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
289
+ lltv: 0.915,
290
+ marketId: '0xba5bb3ccec8df00a56ac1f4d97ae0fd1461f262b6d4f29631bdec717fa6017fd',
291
+ protocolName: 'morpho-blue',
292
+ });
263
293
  // ezETH/ETH
264
294
  export const MORPHO_BLUE_EZETH_ETH_860 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
265
295
  chainIds: [1],
@@ -930,6 +960,8 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
930
960
  [MorphoBlueVersions.MorphoBlueLBTCCbBTC_945]: MORPHO_BLUE_LBTC_CBBTC_945(networkId),
931
961
  [MorphoBlueVersions.MorphoBluesUSDSUSDT_965]: MORPHO_BLUE_SUSDS_USDT_965(networkId),
932
962
  [MorphoBlueVersions.MorphoBlueMORPHOUSDC_625]: MORPHO_BLUE_MORPHO_USDC_625(networkId),
963
+ [MorphoBlueVersions.MorphoBlueSUSDeUSDtb_915]: MORPHO_BLUE_SUSDE_USDTB_915(networkId),
964
+ [MorphoBlueVersions.MorphoBlueUSDeUSDtb_915]: MORPHO_BLUE_USDE_USDTB_915(networkId),
933
965
 
934
966
  // wstETH/WETH
935
967
  [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
package/src/types/morphoBlue.ts CHANGED
@@ -27,6 +27,8 @@ export enum MorphoBlueVersions {
27
27
  MorphoBlueUSRUSDC_915 = 'morphoblueusrusdc_915', // USR/USDC
28
28
  MorphoBlueSyrupUSDCUSDC_915 = 'morphobluesyrupusdcusdc_915', // syrupUSDC/USDC
29
29
  MorphoBluesUSDSUSDT_965 = 'morphobluesusdsusdt_965', // sUSDS/USDT
30
+ MorphoBlueSUSDeUSDtb_915 = 'morphobluesusdeusdtb_915', // sUSDe/USDTb
31
+ MorphoBlueUSDeUSDtb_915 = 'morphoblueusdeusdtb_915', // USDe/USDTb
30
32
  // ezETH/ETH
31
33
  MorphoBlueEzEthEth_860 = 'morphoblueezetheth_860',
32
34
  MorphoBlueEzEthEth_945 = 'morphoblueezetheth_945',