@defisaver/positions-sdk 2.1.9 → 2.1.11

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,64 +1,64 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/helpers/sparkHelpers/index.d.ts

@@ -7,19 +7,19 @@ export declare const sparkIsInIsolationMode: ({ usedAssets, assetsData }: {
 export declare const sparkGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: SparkUsedAssets;
 }) => import("../../types").SparkUsedAsset[];
-export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetEmodeMutableProps: ({ eModeCategory, assetsData, }: SparkHelperCommon, _asset: string) => {
+export declare const sparkGetEmodeMutableProps: ({ eModeCategory, eModeCategoriesData, assetsData, }: SparkHelperCommon, _asset: string) => {
     liquidationRatio: string;
     collateralFactor: string;
 };
-export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
+export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: SparkMarketData, actions: [{
     action: string;
     amount: string;

package/cjs/helpers/sparkHelpers/index.js

@@ -38,8 +38,8 @@ exports.sparkIsInIsolationMode = sparkIsInIsolationMode;
 const sparkGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
 exports.sparkGetCollSuppliedAssets = sparkGetCollSuppliedAssets;
 const sparkGetSuppliableAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = (0, exports.sparkGetCollSuppliedAssets)(data);
     const marketAssets = Object.values(assetsData);
     if ((0, exports.sparkIsInIsolationMode)(data)) {
@@ -50,27 +50,27 @@ const sparkGetSuppliableAssets = (_a) => {
 };
 exports.sparkGetSuppliableAssets = sparkGetSuppliableAssets;
 const sparkGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return (0, exports.sparkGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    return (0, exports.sparkGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
 exports.sparkGetSuppliableAsCollAssets = sparkGetSuppliableAsCollAssets;
-const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
-    var _a;
-    const asset = (0, utils_1.wethToEth)(_asset);
+const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
     const assetData = assetsData[asset];
+    const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
     if (eModeCategory === 0
-        || assetData.eModeCategory !== eModeCategory
-        || new decimal_js_1.default(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
+        || !eModeCategoryData.collateralAssets.includes(asset)
+        || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
-    const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+    const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
 exports.sparkGetEmodeMutableProps = sparkGetEmodeMutableProps;
 const sparkGetAggregatedPositionData = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategoriesData", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network }, rest);
     const payload = {};
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);

package/cjs/markets/aave/marketAssets.js

@@ -18,7 +18,7 @@ exports.aaveV3AssetsDefaultMarketOpt = [
 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.aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
-exports.aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt'];
+exports.aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.aaveV3AssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,

package/cjs/portfolio/index.js

@@ -452,7 +452,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
             }))).flat(),
             ...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
+                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData, eModeCategoriesData: sparkMarketsData[market.value].eModeCategoriesData });
                     if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
                 }

package/cjs/spark/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets } from '../types';
+import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets, EModeCategoriesData } from '../types';
 export declare const sparkEmodeCategoriesMapping: (extractedState: {
     assetsData: SparkAssetsData;
 }, usedAssets: SparkUsedAssets) => {
@@ -32,9 +32,11 @@ export declare const getSparkAccountBalances: (provider: EthereumProvider, netwo
 export declare const _getSparkAccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 }) => Promise<SparkPositionData>;
 export declare const getSparkAccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 }) => Promise<SparkPositionData>;
 export declare const getSparkFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: SparkMarketData) => Promise<SparkPositionData>;

package/cjs/spark/index.js

@@ -28,7 +28,6 @@ const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     const usedAssetsValues = Object.values(usedAssets);
     const categoriesMapping = {};
     Object.values(assetsData).forEach((a) => {
-        var _a;
         const borrowingOnlyFromCategory = a.eModeCategory === 0
             ? true
             : !usedAssetsValues.filter(u => u.isBorrowed && u.eModeCategory !== a.eModeCategory).length;
@@ -39,8 +38,6 @@ const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
             enteringTerms,
             canEnterCategory: !enteringTerms.includes(false),
             id: a.eModeCategory,
-            data: a.eModeCategoryData,
-            assets: a.eModeCategory === 0 ? [] : [...(((_a = categoriesMapping[a.eModeCategory]) === null || _a === void 0 ? void 0 : _a.assets) || []), a.symbol],
             enabledData: {
                 ratio: afterEnteringCategory.ratio,
                 liqRatio: afterEnteringCategory.liqRatio,
@@ -56,18 +53,17 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
     const marketAddress = selectedMarket.providerAddress;
     const loanInfoContract = (0, contracts_1.SparkViewContractViem)(provider, network);
     const sparkIncentivesContract = (0, contracts_1.SparkIncentiveDataProviderContractViem)(provider, network);
-    const [loanInfo, _rewardInfo] = yield Promise.all([
+    // eslint-disable-next-line prefer-const
+    let [loanInfo, rewardInfo] = yield Promise.all([
         loanInfoContract.read.getFullTokensInfo([marketAddress, selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address)]),
-        network === common_1.NetworkNumber.Opt ? sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]) : [],
+        sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]),
     ]);
-    let rewardInfo = [];
-    if (network === common_1.NetworkNumber.Opt) {
-        rewardInfo = rewardInfo.reduce((all, market) => {
-            // eslint-disable-next-line no-param-reassign
-            all[market.underlyingAsset] = market;
-            return all;
-        }, {});
-    }
+    rewardInfo = rewardInfo.reduce((all, market) => {
+        // eslint-disable-next-line no-param-reassign
+        all[market.underlyingAsset] = market;
+        return all;
+    }, {});
+    const eModeCategoriesData = {};
     const assetsData = yield Promise.all(loanInfo
         .map((market, i) => __awaiter(void 0, void 0, void 0, function* () {
         const symbol = selectedMarket.assets[i];
@@ -82,6 +78,15 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         if (new decimal_js_1.default(marketLiquidity).lt(0)) {
             marketLiquidity = '0';
         }
+        eModeCategoriesData[+market.emodeCategory.toString()] = {
+            id: +market.emodeCategory.toString(),
+            label: market.label,
+            liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),
+            liquidationRatio: new decimal_js_1.default(market.liquidationThreshold).div(10000).toString(),
+            collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
+            collateralAssets: eModeCategoriesData[+market.emodeCategory.toString()] ? [...eModeCategoriesData[+market.emodeCategory.toString()].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
+            borrowAssets: eModeCategoriesData[+market.emodeCategory.toString()] ? [...eModeCategoriesData[+market.emodeCategory.toString()].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
+        };
         return ({
             symbol: selectedMarket.assets[i],
             isIsolated: new decimal_js_1.default(market.debtCeilingForIsolationMode.toString()).gt(0),
@@ -116,13 +121,6 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
             isFlashLoanEnabled: market.isFlashLoanEnabled,
             aTokenAddress: market.aTokenAddress,
-            eModeCategoryData: {
-                label: market.label,
-                liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),
-                liquidationRatio: new decimal_js_1.default(market.liquidationThreshold).div(10000).toString(),
-                collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
-                priceSource: market.priceSource,
-            },
             supplyIncentives: [],
             borrowIncentives: [],
         });
@@ -154,7 +152,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             return;
         rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
             if (supplyRewardData) {
-                if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
+                if (+(supplyRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now())
                     return;
                 const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
                 const supplyRewardPrice = new decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals))
@@ -175,7 +173,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         });
         rewardForMarket.vIncentiveData.rewardsTokenInformation.forEach(borrowRewardData => {
             if (borrowRewardData) {
-                if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
+                if (+(borrowRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now())
                     return;
                 const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
                 const supplyRewardPrice = new decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals))
@@ -196,7 +194,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         });
         /* eslint-enable no-param-reassign */
     })));
-    const payload = {};
+    const filteredAssetsData = {};
     // Sort by market size
     assetsData
         .sort((a, b) => {
@@ -205,9 +203,11 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         return new decimal_js_1.default(bMarket).minus(aMarket).toNumber();
     })
         .forEach((assetData, i) => {
-        payload[assetData.symbol] = Object.assign(Object.assign({}, assetData), { sortIndex: i });
+        filteredAssetsData[assetData.symbol] = Object.assign(Object.assign({}, assetData), { sortIndex: i });
     });
-    return { assetsData: payload };
+    eModeCategoriesData[0].collateralAssets = Object.values(filteredAssetsData).map(a => a.symbol);
+    eModeCategoriesData[0].borrowAssets = Object.values(filteredAssetsData).map(a => a.symbol);
+    return { assetsData: filteredAssetsData, eModeCategoriesData };
 });
 exports._getSparkMarketsData = _getSparkMarketsData;
 const getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getSparkMarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
@@ -349,7 +349,7 @@ const getSparkAccountData = (provider, network, address, extractedState) => __aw
 exports.getSparkAccountData = getSparkAccountData;
 const getSparkFullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getSparkMarketsData)(provider, network, market);
-    const positionData = yield (0, exports.getSparkAccountData)(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
+    const positionData = yield (0, exports.getSparkAccountData)(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });
     return positionData;
 });
 exports.getSparkFullPositionData = getSparkFullPositionData;

package/cjs/staking/staking.js

@@ -67,7 +67,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
         return '0';
     }
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH'];
 exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -116,6 +116,10 @@ exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, voi
             return yield getApyFromDfsApi('PT sUSDe Nov');
         if (asset === 'PT USDe Nov')
             return yield getApyFromDfsApi('PT USDe Nov');
+        if (asset === 'PT USDe Jan')
+            return yield getApyFromDfsApi('PT USDe Jan');
+        if (asset === 'PT sUSDe Jan')
+            return yield getApyFromDfsApi('PT sUSDe Jan');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/cjs/types/spark.d.ts

@@ -1,3 +1,4 @@
+import { EModeCategoriesData } from './aave';
 import { EthAddress, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum SparkVersions {
     SparkV1 = "v1default"
@@ -13,8 +14,6 @@ export interface SparkEModeCategoryDataMapping {
     enteringTerms: boolean[];
     canEnterCategory: boolean;
     id: number;
-    data: SparkEModeCategoryData;
-    assets: string[];
     enabledData: {
         ratio: string;
         liqRatio: string;
@@ -45,7 +44,6 @@ export interface SparkAssetData extends MMAssetData {
     usageAsCollateralEnabled: boolean;
     isIsolated: boolean;
     eModeCategory: number;
-    eModeCategoryData: SparkEModeCategoryData;
     liquidationRatio: string;
 }
 export interface SparkAssetsData {
@@ -53,6 +51,7 @@ export interface SparkAssetsData {
 }
 export type SparkMarketsData = {
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 };
 export interface SparkUsedAsset extends MMUsedAsset {
     stableBorrowRate: string;
@@ -71,7 +70,7 @@ export interface SparkUsedAssets {
 export interface SparkHelperCommon {
     usedAssets: SparkUsedAssets;
     eModeCategory: number;
-    eModeCategories?: object;
+    eModeCategoriesData?: EModeCategoriesData;
     assetsData: SparkAssetsData;
     selectedMarket?: SparkMarketData;
     network?: NetworkNumber;