@defisaver/positions-sdk 2.1.148-comp-dev → 2.1.148

package/src/markets/compound/index.ts

@@ -16,7 +16,6 @@ import {
   v3USDSCollAssets,
   v3USDTCollAssets,
   v3wstETHCollAssets,
-  v3InstitutionalUSDCCollAssets,
 } from './marketsAssets';
 
 export {
@@ -42,7 +41,6 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV3USDT]: STANDARD_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3wstETH]: STANDARD_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDS]: STANDARD_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3InstitutionalUSDC]: STANDARD_BULKER_OPTIONS,
 
     // Non-existing markets, keeping it because of typescript
     [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
@@ -60,7 +58,6 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3InstitutionalUSDC]: EMPTY_BULKER_OPTIONS,
   },
   [NetworkNumber.Base]: {
     [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
@@ -73,7 +70,6 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDT]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3InstitutionalUSDC]: EMPTY_BULKER_OPTIONS,
   },
   [NetworkNumber.Opt]: {
     [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
@@ -85,7 +81,6 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3InstitutionalUSDC]: EMPTY_BULKER_OPTIONS,
   },
   [NetworkNumber.Linea]: {
     // Non-existing markets, keeping it because of typescript
@@ -97,7 +92,6 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3InstitutionalUSDC]: EMPTY_BULKER_OPTIONS,
   },
   [NetworkNumber.Plasma]: {
     // Non-existing markets, keeping it because of typescript
@@ -109,7 +103,6 @@ const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBul
     [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
     [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3InstitutionalUSDC]: EMPTY_BULKER_OPTIONS,
   },
 };
 
@@ -117,7 +110,6 @@ export const COMPOUND_V2: CompoundMarketData = {
   chainIds: [NetworkNumber.Eth],
   label: 'Compound V2',
   shortLabel: CompoundVersionType.V2,
-  url: '',
   value: CompoundVersions.CompoundV2,
   baseAsset: '',
   collAssets: compoundV2CollateralAssets.map(a => a.underlyingAsset),
@@ -134,7 +126,6 @@ export const COMPOUND_V3_USDC = (networkId: NetworkNumber): CompoundMarketData =
   chainIds: [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Opt],
   label: 'Compound V3 - USDC',
   shortLabel: CompoundVersionType.V3,
-  url: 'cusdcv3',
   value: CompoundVersions.CompoundV3USDC,
   baseAsset: 'USDC',
   collAssets: networkId ? v3USDCCollAssets[networkId] : [],
@@ -151,7 +142,6 @@ export const COMPOUND_V3_USDCe = (networkId: NetworkNumber): CompoundMarketData
   chainIds: [NetworkNumber.Arb],
   label: 'Compound V3 - USDC.e',
   shortLabel: CompoundVersionType.V3,
-  url: 'cusdcev3',
   value: CompoundVersions.CompoundV3USDCe,
   baseAsset: 'USDC.e',
   collAssets: networkId ? v3USDCeCollAssets[networkId] : [],
@@ -168,7 +158,6 @@ export const COMPOUND_V3_ETH = (networkId: NetworkNumber): CompoundMarketData =>
   chainIds: [NetworkNumber.Eth, NetworkNumber.Base, NetworkNumber.Arb, NetworkNumber.Opt],
   label: 'Compound V3 - ETH',
   shortLabel: CompoundVersionType.V3,
-  url: 'cethv3',
   value: CompoundVersions.CompoundV3ETH,
   baseAsset: 'ETH',
   collAssets: networkId ? v3ETHCollAssets[networkId] : [],
@@ -185,7 +174,6 @@ export const COMPOUND_V3_USDBC = (networkId: NetworkNumber): CompoundMarketData
   chainIds: [NetworkNumber.Base],
   label: 'Compound V3 - USDbC',
   shortLabel: CompoundVersionType.V3,
-  url: 'cusdbcv3',
   value: CompoundVersions.CompoundV3USDbC,
   baseAsset: 'USDbC',
   collAssets: networkId ? v3USDbCCollAssets[networkId] : [],
@@ -202,7 +190,6 @@ export const COMPOUND_V3_USDT = (networkId: NetworkNumber): CompoundMarketData =
   chainIds: [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt],
   label: 'Compound V3 - USDT',
   shortLabel: CompoundVersionType.V3,
-  url: 'cusdtv3',
   value: CompoundVersions.CompoundV3USDT,
   baseAsset: 'USDT',
   collAssets: networkId ? v3USDTCollAssets[networkId] : [],
@@ -219,7 +206,6 @@ export const COMPOUND_V3_WSTETH = (networkId: NetworkNumber): CompoundMarketData
   chainIds: [NetworkNumber.Eth],
   label: 'Compound V3 - wstETH',
   shortLabel: CompoundVersionType.V3,
-  url: 'cwstethv3',
   value: CompoundVersions.CompoundV3wstETH,
   baseAsset: 'wstETH',
   collAssets: networkId ? v3wstETHCollAssets[networkId] : [],
@@ -235,7 +221,6 @@ export const COMPOUND_V3_USDS = (networkId: NetworkNumber): CompoundMarketData =
   chainIds: [NetworkNumber.Eth, NetworkNumber.Base],
   label: 'Compound V3 - USDS',
   shortLabel: CompoundVersionType.V3,
-  url: 'cusdsv3',
   value: CompoundVersions.CompoundV3USDS,
   baseAsset: 'USDS',
   collAssets: networkId ? v3USDSCollAssets[networkId] : [],
@@ -247,22 +232,6 @@ export const COMPOUND_V3_USDS = (networkId: NetworkNumber): CompoundMarketData =
   bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDS],
 });
 
-export const COMPOUND_V3_INSTITUTIONAL_USDC = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Eth],
-  label: 'Compound V3 - Institutional USDC',
-  shortLabel: CompoundVersionType.V3,
-  url: 'ciusdcv3',
-  value: CompoundVersions.CompoundV3InstitutionalUSDC,
-  baseAsset: 'USDC',
-  collAssets: networkId ? v3InstitutionalUSDCCollAssets[networkId] : [],
-  baseMarket: 'ciUSDCv3',
-  baseMarketAddress: getConfigContractAddress('ciUSDCv3', networkId),
-  secondLabel: 'Market',
-  bulkerName: networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2',
-  bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2', networkId),
-  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3InstitutionalUSDC],
-});
-
 export const CompoundMarkets = (networkId: NetworkNumber) => ({
   [CompoundVersions.CompoundV2]: COMPOUND_V2,
   [CompoundVersions.CompoundV3ETH]: COMPOUND_V3_ETH(networkId),
@@ -272,5 +241,4 @@ export const CompoundMarkets = (networkId: NetworkNumber) => ({
   [CompoundVersions.CompoundV3USDT]: COMPOUND_V3_USDT(networkId),
   [CompoundVersions.CompoundV3wstETH]: COMPOUND_V3_WSTETH(networkId),
   [CompoundVersions.CompoundV3USDS]: COMPOUND_V3_USDS(networkId),
-  [CompoundVersions.CompoundV3InstitutionalUSDC]: COMPOUND_V3_INSTITUTIONAL_USDC(networkId),
 }) as const;

package/src/markets/compound/marketsAssets.ts

@@ -95,15 +95,4 @@ export const v3wstETHCollAssets = {
   [NetworkNumber.Base]: [],
   [NetworkNumber.Linea]: [],
   [NetworkNumber.Plasma]: [],
-};
-
-export const v3InstitutionalUSDCCollAssetsEth = ['ETH', 'wstETH', 'cbBTC', 'WBTC'];
-
-export const v3InstitutionalUSDCCollAssets = {
-  [NetworkNumber.Eth]: v3InstitutionalUSDCCollAssetsEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: [],
-  [NetworkNumber.Linea]: [],
-  [NetworkNumber.Plasma]: [],
 };

package/src/portfolio/index.ts

@@ -12,7 +12,7 @@ import {
   SparkMarkets,
 } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
-import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
+import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData } from '../morphoMidnight';
 import {
   AaveV2MarketData,
   AaveV3MarketData,
@@ -137,7 +137,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     stakingPositions[address.toLowerCase() as EthAddress] = {
       aaveV3: {},
       morphoBlue: {},
-      morphoMidnight: {},
       compoundV3: {},
       spark: {},
       aaveV2: {},
@@ -487,31 +486,8 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     })).flat(),
     ...morphoMidnightMarkets.map((market) => addresses.map(async (address) => {
       try {
-        const [accDataPromise, earnDataPromise] = await Promise.allSettled([
-          _getMorphoMidnightAccountData(client, network, address, market, morphoMidnightMarketsData[market.value]),
-          getMorphoMidnightEarn(client, network, address, market, morphoMidnightMarketsData[market.value]),
-        ]);
-        if (accDataPromise.status === 'rejected') {
-          console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, accDataPromise.reason);
-          positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-        }
-        if (earnDataPromise.status === 'rejected') {
-          console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
-          positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-        }
-        if (accDataPromise.status !== 'rejected') {
-          const accData = accDataPromise.value;
-          if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: '', data: accData };
-        }
-        if (earnDataPromise.status !== 'rejected') {
-          const earnData = earnDataPromise.value;
-          if (earnData && new Dec(earnData.amount).gt(0)) {
-            stakingPositions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = {
-              error: '',
-              data: earnData,
-            };
-          }
-        }
+        const accData = await _getMorphoMidnightAccountData(client, network, address, market, morphoMidnightMarketsData[market.value]);
+        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: '', data: accData };
       } catch (error) {
         console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
         positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };

package/src/types/compound.ts

@@ -16,7 +16,6 @@ export enum CompoundVersions {
   'CompoundV3USDT' = 'v3-USDT',
   'CompoundV3USDS' = 'v3-USDS',
   'CompoundV3wstETH' = 'v3-wstETH',
-  'CompoundV3InstitutionalUSDC' = 'v3-institutional-USDC',
 }
 
 export enum CompoundVersionType {
@@ -33,7 +32,6 @@ export interface CompoundMarketData {
   chainIds: NetworkNumber[],
   label: string,
   shortLabel: string,
-  url: string,
   value: CompoundVersions,
   baseAsset: string,
   collAssets: readonly string[],