@defisaver/positions-sdk 2.1.8 → 2.1.9-dev-spark-2

package/src/spark/index.ts

@@ -24,6 +24,7 @@ import {
   SparkPositionData,
   SparkUsedAsset,
   SparkUsedAssets,
+  EModeCategoriesData,
 } from '../types';
 import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
@@ -49,8 +50,6 @@ export const sparkEmodeCategoriesMapping = (extractedState: { assetsData: SparkA
       enteringTerms,
       canEnterCategory: !enteringTerms.includes(false),
       id: a.eModeCategory,
-      data: a.eModeCategoryData,
-      assets: a.eModeCategory === 0 ? [] : [...(categoriesMapping[a.eModeCategory]?.assets || []), a.symbol],
       enabledData: {
         ratio: afterEnteringCategory.ratio,
         liqRatio: afterEnteringCategory.liqRatio,
@@ -68,19 +67,19 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
   const loanInfoContract = SparkViewContractViem(provider, network);
   const sparkIncentivesContract = SparkIncentiveDataProviderContractViem(provider, network);
 
-  const [loanInfo, _rewardInfo] = await Promise.all([
+  // eslint-disable-next-line prefer-const
+  let [loanInfo, rewardInfo] = await Promise.all([
     loanInfoContract.read.getFullTokensInfo([marketAddress, selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address) as EthAddress[]]),
-    network === NetworkNumber.Opt ? sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]) : [],
+    sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]),
   ]);
 
-  let rewardInfo: any[] = [];
-  if (network === NetworkNumber.Opt) {
-    rewardInfo = rewardInfo.reduce((all, market) => {
-      // eslint-disable-next-line no-param-reassign
-      all[market.underlyingAsset] = market;
-      return all;
-    }, {});
-  }
+  rewardInfo = rewardInfo.reduce((all: any, market: any) => {
+    // eslint-disable-next-line no-param-reassign
+    all[market.underlyingAsset] = market;
+    return all;
+  }, {});
+
+  const eModeCategoriesData: EModeCategoriesData = {};
 
   const assetsData: SparkAssetData[] = await Promise.all(loanInfo
     .map(async (market, i) => {
@@ -98,6 +97,17 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
       if (new Dec(marketLiquidity).lt(0)) {
         marketLiquidity = '0';
       }
+
+      eModeCategoriesData[+market.emodeCategory.toString()] = {
+        id: +market.emodeCategory.toString(),
+        label: market.label,
+        liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
+        liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
+        collateralFactor: new Dec(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 Dec(market.debtCeilingForIsolationMode.toString()).gt(0),
@@ -132,13 +142,6 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
         isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
         isFlashLoanEnabled: market.isFlashLoanEnabled,
         aTokenAddress: market.aTokenAddress,
-        eModeCategoryData: {
-          label: market.label,
-          liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
-          liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
-          collateralFactor: new Dec(market.ltv).div(10000).toString(),
-          priceSource: market.priceSource,
-        },
         supplyIncentives: [],
         borrowIncentives: [],
       });
@@ -173,7 +176,7 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
     if (!rewardForMarket) return;
     (rewardForMarket.aIncentiveData.rewardsTokenInformation as any[]).forEach(supplyRewardData => {
       if (supplyRewardData) {
-        if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
+        if (+(supplyRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now()) return;
         const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
         const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(10 ** supplyRewardData.priceFeedDecimals)
           .toString();
@@ -194,7 +197,7 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
     });
     (rewardForMarket.vIncentiveData.rewardsTokenInformation as any[]).forEach(borrowRewardData => {
       if (borrowRewardData) {
-        if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
+        if (+(borrowRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now()) return;
         const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
         const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** borrowRewardData.priceFeedDecimals)
           .toString();
@@ -228,7 +231,10 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
       payload[assetData.symbol] = { ...assetData, sortIndex: i };
     });
 
-  return { assetsData: payload };
+  eModeCategoriesData[0].collateralAssets = Object.values(payload).map(a => a.symbol);
+  eModeCategoriesData[0].borrowAssets = Object.values(payload).map(a => a.symbol);
+
+  return { assetsData: payload, eModeCategoriesData };
 };
 
 export const getSparkMarketsData = async (
@@ -317,7 +323,12 @@ export const getSparkAccountBalances = async (
   address: EthAddress,
 ): Promise<PositionBalances> => _getSparkAccountBalances(getViemProvider(provider, network, { batch: { multicall: true } }), network, block, addressMapping, address);
 
-export const _getSparkAccountData = async (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: { selectedMarket: SparkMarketData, assetsData: SparkAssetsData }) => {
+export const _getSparkAccountData = async (
+  provider: Client,
+  network: NetworkNumber,
+  address: EthAddress,
+  extractedState: { selectedMarket: SparkMarketData, assetsData: SparkAssetsData, eModeCategoriesData: EModeCategoriesData },
+) => {
   const {
     selectedMarket: market, assetsData,
   } = extractedState;
@@ -435,11 +446,11 @@ export const getSparkAccountData = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   address: EthAddress,
-  extractedState: { selectedMarket: SparkMarketData, assetsData: SparkAssetsData },
+  extractedState: { selectedMarket: SparkMarketData, assetsData: SparkAssetsData, eModeCategoriesData: EModeCategoriesData },
 ) => _getSparkAccountData(getViemProvider(provider, network), network, address, extractedState);
 
 export const getSparkFullPositionData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: SparkMarketData): Promise<SparkPositionData> => {
   const marketData = await getSparkMarketsData(provider, network, market);
-  const positionData = await getSparkAccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
+  const positionData = await getSparkAccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });
   return positionData;
 };

package/src/types/fluid.ts

@@ -157,6 +157,7 @@ export enum FluidMainnetDepositToken {
   USDT = 'USDT',
   GHO = 'GHO',
   sUSDS = 'sUSDS',
+  USDtb = 'USDtb',
 }
 
 export enum FluidArbitrumDepositToken {
@@ -165,6 +166,8 @@ export enum FluidArbitrumDepositToken {
   USDC = 'USDC',
   USDT = 'USDT',
   ARB = 'ARB',
+  GHO = 'GHO',
+  sUSDS = 'sUSDS',
 }
 
 export enum FluidBaseDepositToken {
@@ -173,6 +176,7 @@ export enum FluidBaseDepositToken {
   wstETH = 'wstETH',
   EURC = 'EURC',
   sUSDS = 'sUSDS',
+  GHO = 'GHO',
 }
 
 export type FluidDepositTokenByNetwork = {

package/src/types/spark.ts

@@ -1,3 +1,4 @@
+import { EModeCategoriesData } from './aave';
 import {
   EthAddress,
   IncentiveData,
@@ -20,8 +21,6 @@ export interface SparkEModeCategoryDataMapping {
   enteringTerms: boolean[],
   canEnterCategory: boolean,
   id: number,
-  data: SparkEModeCategoryData,
-  assets: string[],
   enabledData: {
     ratio: string,
     liqRatio: string,
@@ -55,7 +54,6 @@ export interface SparkAssetData extends MMAssetData {
   usageAsCollateralEnabled: boolean,
   isIsolated: boolean,
   eModeCategory: number,
-  eModeCategoryData: SparkEModeCategoryData,
   liquidationRatio: string,
 }
 
@@ -63,7 +61,7 @@ export interface SparkAssetsData {
   [token: string]: SparkAssetData,
 }
 
-export type SparkMarketsData = { assetsData: SparkAssetsData };
+export type SparkMarketsData = { assetsData: SparkAssetsData, eModeCategoriesData: EModeCategoriesData };
 
 export interface SparkUsedAsset extends MMUsedAsset {
   stableBorrowRate: string,
@@ -84,7 +82,7 @@ export interface SparkUsedAssets {
 export interface SparkHelperCommon {
   usedAssets: SparkUsedAssets,
   eModeCategory: number,
-  eModeCategories?: object,
+  eModeCategoriesData?: EModeCategoriesData,
   assetsData: SparkAssetsData,
   selectedMarket?: SparkMarketData,
   network?: NetworkNumber,