@defisaver/positions-sdk 2.1.53 → 2.1.55

package/cjs/aaveV3/index.js

@@ -371,7 +371,7 @@ exports._getAaveV3AccountBalances = _getAaveV3AccountBalances;
 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); });
 exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
 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') {
-    const { selectedMarket: market, assetsData, } = extractedState;
+    const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
         return payload;
@@ -397,7 +397,9 @@ const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_
         const supplied = (0, tokens_1.assetAmountInEth)(tokenInfo.balance.toString(), asset);
         const borrowedStable = (0, tokens_1.assetAmountInEth)(tokenInfo.borrowsStable.toString(), asset);
         const borrowedVariable = (0, tokens_1.assetAmountInEth)(tokenInfo.borrowsVariable.toString(), asset);
-        const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
+        const eModeCategoryData = eModeCategoriesData[+eModeCategory.toString()];
+        const usageAsCollateralIsEnabledInEmode = eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.collateralAssets.includes(asset);
+        const enabledAsCollateral = (assetsData[asset].usageAsCollateralEnabled || usageAsCollateralIsEnabledInEmode) ? tokenInfo.enabledAsCollateral : false;
         let interestMode;
         if (borrowedVariable === '0' && borrowedStable !== '0') {
             interestMode = '1';

package/cjs/markets/aave/marketAssets.js

@@ -16,7 +16,7 @@ exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];
 exports.aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
-exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
+exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC', 'syrupUSDC'];
 exports.aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC', 'mUSD'];
 exports.aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL', 'PT USDe Apr', 'PT sUSDe Apr'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/esm/aaveV3/index.js

@@ -358,7 +358,7 @@ export const _getAaveV3AccountBalances = (provider, network, block, addressMappi
 });
 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); });
 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') {
-    const { selectedMarket: market, assetsData, } = extractedState;
+    const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
     let payload = Object.assign(Object.assign({}, EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
         return payload;
@@ -384,7 +384,9 @@ export const _getAaveV3AccountData = (provider_1, network_1, address_1, extracte
         const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
         const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
         const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
-        const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
+        const eModeCategoryData = eModeCategoriesData[+eModeCategory.toString()];
+        const usageAsCollateralIsEnabledInEmode = eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.collateralAssets.includes(asset);
+        const enabledAsCollateral = (assetsData[asset].usageAsCollateralEnabled || usageAsCollateralIsEnabledInEmode) ? tokenInfo.enabledAsCollateral : false;
         let interestMode;
         if (borrowedVariable === '0' && borrowedStable !== '0') {
             interestMode = '1';

package/esm/markets/aave/marketAssets.js

@@ -13,7 +13,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];
 export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
-export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
+export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC', 'syrupUSDC'];
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC', 'mUSD'];
 export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'XPL', 'PT USDe Apr', 'PT sUSDe Apr'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.53",
+  "version": "2.1.55",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,14 +21,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.19",
+    "@defisaver/tokens": "^1.7.21",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",
+    "graphql-request": "^1.8.2",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.17",
-    "viem": "^2.37.9",
-    "graphql-request": "^1.8.2"
+    "viem": "^2.37.9"
   },
   "devDependencies": {
     "@defisaver/eslint-config": "^1.0.1",

package/src/aaveV3/index.ts

@@ -422,7 +422,7 @@ export const getAaveV3AccountBalances = async (provider: EthereumProvider, netwo
 
 export const _getAaveV3AccountData = async (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3PositionData> => {
   const {
-    selectedMarket: market, assetsData,
+    selectedMarket: market, assetsData, eModeCategoriesData,
   } = extractedState;
   let payload: AaveV3PositionData = {
     ...EMPTY_AAVE_DATA,
@@ -457,7 +457,9 @@ export const _getAaveV3AccountData = async (provider: Client, network: NetworkNu
     const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
     const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
     const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
-    const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
+    const eModeCategoryData = eModeCategoriesData[+(eModeCategory as BigInt).toString()];
+    const usageAsCollateralIsEnabledInEmode = eModeCategoryData?.collateralAssets.includes(asset);
+    const enabledAsCollateral = (assetsData[asset].usageAsCollateralEnabled || usageAsCollateralIsEnabledInEmode) ? tokenInfo.enabledAsCollateral : false;
 
     let interestMode;
     if (borrowedVariable === '0' && borrowedStable !== '0') {

package/src/markets/aave/marketAssets.ts

@@ -16,7 +16,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
   'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];
 export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
-export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
+export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC', 'syrupUSDC'];
 
 export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC', 'mUSD'];