@defisaver/positions-sdk 2.1.168 → 2.1.169-custom-fetching-2-dev

package/esm/services/viem.d.ts

@@ -4393,6 +4393,8 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         uid?: undefined;
     } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").Transport, undefined, undefined>, "getBlockNumber" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, import("viem").PublicActions<import("viem").Transport, undefined>>) => client) => import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, { [K in keyof client]: client[K]; } & import("viem").PublicActions<import("viem").Transport, undefined>>;
 };
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+export declare const pinProviderBlock: (provider: EthereumProvider, blockNumber: number | bigint) => EthereumProvider;
 export declare const setViemBlockNumber: (block: Blockish) => {
     blockNumber?: undefined;
 } | {

package/esm/services/viem.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { createPublicClient, custom, encodeFunctionData, } from 'viem';
 import { arbitrum, base, mainnet, optimism, linea, plasma, } from 'viem/chains';
 import { NetworkNumber } from '../types/common';
@@ -20,6 +29,22 @@ export const getViemChain = (network) => {
     }
 };
 export const getViemProvider = (provider, network, options) => createPublicClient(Object.assign({ transport: custom(provider), chain: getViemChain(network) }, options));
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+export const pinProviderBlock = (provider, blockNumber) => {
+    const block = `0x${BigInt(blockNumber).toString(16)}`;
+    return {
+        request: (args) => __awaiter(void 0, void 0, void 0, function* () {
+            const params = [...(args.params || [])];
+            if (args.method === 'eth_blockNumber')
+                return block;
+            if (['eth_call', 'eth_getCode', 'eth_getBalance', 'eth_getStorageAt'].includes(args.method) && (params[1] === undefined || params[1] === 'latest'))
+                params[1] = block;
+            if (args.method === 'eth_getBlockByNumber' && params[0] === 'latest')
+                params[0] = block;
+            return provider.request(Object.assign(Object.assign({}, args), { params }));
+        }),
+    };
+};
 export const setViemBlockNumber = (block) => {
     if (block === 'latest')
         return {};

package/esm/types/common.d.ts

@@ -22,6 +22,7 @@ export declare enum LeverageType {
     Short = "short",
     VolatilePair = "volatile-pair",
     VolatilePairReverse = "volatile-pair-reverse",
+    StablePair = "stable-pair",
     None = ""
 }
 export interface IncentiveData {

package/esm/types/common.js

@@ -27,6 +27,7 @@ export var LeverageType;
     LeverageType["Short"] = "short";
     LeverageType["VolatilePair"] = "volatile-pair";
     LeverageType["VolatilePairReverse"] = "volatile-pair-reverse";
+    LeverageType["StablePair"] = "stable-pair";
     LeverageType["None"] = "";
 })(LeverageType || (LeverageType = {}));
 export var NetworkNumber;

package/esm/types/morphoBlue.d.ts

@@ -110,6 +110,7 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeUSDC_915_Base = "morphoblueusdeusdc_915_base",// USDe/USDC 0.915
     MorphoBlueCbEthUSDC_770_Base = "morphobluecbethusdc_770_base",// cbETH/USDC 0.77
     MorphoBlueCbXRPUSDC_625_Base = "morphobluecbxrpusdc_625_base",// cbXRP/USDC 0.625
+    MorphoBlueCbHYPEUSDC_625_Base = "morphobluecbhypeusdc_625_base",// cbHYPE/USDC 0.625
     MorphoBlueSyrupUSDCUSDC_915_Arb = "morphobluesyrupusdcusdc_915_arb",// syrupUSDC/USDC
     MorphoBlueWBTCUSDC_860_Arb = "morphobluewbtcusdc_860_arb",// WBTC/USDC
     MorphoBlueWstEthUSDC_860_Arb = "morphobluewstethusdc_860_arb",// wstETH/USDC

package/esm/types/morphoBlue.js

@@ -117,6 +117,7 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeUSDC_915_Base"] = "morphoblueusdeusdc_915_base";
     MorphoBlueVersions["MorphoBlueCbEthUSDC_770_Base"] = "morphobluecbethusdc_770_base";
     MorphoBlueVersions["MorphoBlueCbXRPUSDC_625_Base"] = "morphobluecbxrpusdc_625_base";
+    MorphoBlueVersions["MorphoBlueCbHYPEUSDC_625_Base"] = "morphobluecbhypeusdc_625_base";
     // ARBITRUM
     MorphoBlueVersions["MorphoBlueSyrupUSDCUSDC_915_Arb"] = "morphobluesyrupusdcusdc_915_arb";
     MorphoBlueVersions["MorphoBlueWBTCUSDC_860_Arb"] = "morphobluewbtcusdc_860_arb";

package/esm/types/portfolio.d.ts

@@ -60,6 +60,42 @@ export interface PortfolioPositionsDataForAddress {
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
+export declare enum PortfolioProtocol {
+    AaveV2 = "aaveV2",
+    AaveV3 = "aaveV3",
+    AaveV4 = "aaveV4",
+    CompoundV2 = "compoundV2",
+    CompoundV3 = "compoundV3",
+    Spark = "spark",
+    MorphoBlue = "morphoBlue",
+    MorphoMidnight = "morphoMidnight",
+    CrvUsd = "crvUsd",
+    LlamaLend = "llamaLend",
+    Maker = "maker",
+    Liquity = "liquity",
+    LiquityV2 = "liquityV2",
+    Fluid = "fluid"
+}
+export interface CustomDeFiDataOptions {
+    /** Defaults to every protocol. */
+    protocols?: PortfolioProtocol[];
+    fetchStaking?: boolean;
+    fetchRewards?: boolean;
+    /** Keep Aave V3 / Spark positions with no supply so the eMode category is available. */
+    returnEmptyEModePositions?: boolean;
+    fetchFluidMarkets?: boolean;
+    isSim?: boolean;
+    /** viem multicall calldata cap in bytes; defaults to 250k (2k when isSim). */
+    batchSize?: number;
+    /** Pins every read to this block; defaults to latest. */
+    blockNumber?: number;
+}
+export interface CustomDeFiData {
+    positions: PortfolioPositionsData;
+    stakingPositions: Record<string, any>;
+    rewardsData: Record<string, any>;
+    markets: PortfolioMarketsData;
+}
 export interface PortfolioMarketsData {
     morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
     morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;

package/esm/types/portfolio.js

@@ -1 +1,17 @@
-export {};
+export var PortfolioProtocol;
+(function (PortfolioProtocol) {
+    PortfolioProtocol["AaveV2"] = "aaveV2";
+    PortfolioProtocol["AaveV3"] = "aaveV3";
+    PortfolioProtocol["AaveV4"] = "aaveV4";
+    PortfolioProtocol["CompoundV2"] = "compoundV2";
+    PortfolioProtocol["CompoundV3"] = "compoundV3";
+    PortfolioProtocol["Spark"] = "spark";
+    PortfolioProtocol["MorphoBlue"] = "morphoBlue";
+    PortfolioProtocol["MorphoMidnight"] = "morphoMidnight";
+    PortfolioProtocol["CrvUsd"] = "crvUsd";
+    PortfolioProtocol["LlamaLend"] = "llamaLend";
+    PortfolioProtocol["Maker"] = "maker";
+    PortfolioProtocol["Liquity"] = "liquity";
+    PortfolioProtocol["LiquityV2"] = "liquityV2";
+    PortfolioProtocol["Fluid"] = "fluid";
+})(PortfolioProtocol || (PortfolioProtocol = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.168",
+  "version": "2.1.169-custom-fetching-2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -22,7 +22,7 @@
   "repository": "https://github.com/defisaver/defisaver-positions-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.45",
+    "@defisaver/tokens": "^1.7.50",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/helpers/aaveV4Helpers/index.ts

@@ -198,13 +198,17 @@ export const isLeveragedPosAaveV4 = (usedAssets: AaveV4UsedReserveAssets, dustLi
   let supplyUnstable = 0;
   let longAsset = '';
   let shortAsset = '';
+  let stableCollAsset = '';
   Object.values(usedAssets).forEach(({
     symbol, suppliedUsd, borrowedUsd, collateral, reserveId,
   }) => {
     const spokeAsset = `${symbol}-${reserveId}`;
     const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
     const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
+    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) {
+      supplyStable += 1;
+      stableCollAsset = spokeAsset;
+    }
     if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
     if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
       borrowUnstable += 1;
@@ -218,6 +222,7 @@ export const isLeveragedPosAaveV4 = (usedAssets: AaveV4UsedReserveAssets, dustLi
   const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
   const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
   const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+  const isStablePair = supplyStable === 1 && borrowStable === 1 && supplyUnstable === 0 && borrowUnstable === 0;
   if (isLong) {
     return {
       leveragedType: LeverageType.Long,
@@ -236,6 +241,12 @@ export const isLeveragedPosAaveV4 = (usedAssets: AaveV4UsedReserveAssets, dustLi
       leveragedAsset: longAsset,
     };
   }
+  if (isStablePair) {
+    return {
+      leveragedType: LeverageType.StablePair,
+      leveragedAsset: stableCollAsset,
+    };
+  }
   return {
     leveragedType: LeverageType.None,
     leveragedAsset: '',

package/src/markets/morphoBlue/index.ts

@@ -1659,6 +1659,21 @@ export const MORPHO_BLUE_CBXRP_USDC_625_BASE = (networkId: NetworkNumber = Netwo
   marketId: '0xd4a903dc6d949519060c7707f9604fdc9772c046e05c2e3a8fce0bd7196e4109',
   protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_CBHYPE_USDC_625_BASE = (networkId: NetworkNumber = NetworkNumber.Base): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'cbHYPE/USDC',
+  value: MorphoBlueVersions.MorphoBlueCbHYPEUSDC_625_Base,
+  url: 'cbhypeusdc-76629002',
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+  collateralToken: '0xB200000000000000000000451d033a5000cb479e',
+  oracle: '0x7FaD8B8De2DDb7b4B415e1Aa3613e45EeF9E4bFf',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.625,
+  marketId: '0x76629002c9fdb20fb2092053a4f22c5c65e04a81887218b9546f2a2d82b4c0a8',
+  protocolName: 'morpho-blue',
+});
 
 // ARBITRUM
 export const MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
@@ -1935,6 +1950,7 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueUSDeUSDC_915_Base]: MORPHO_BLUE_USDE_USDC_915_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbEthUSDC_770_Base]: MORPHO_BLUE_CBETH_USDC_770_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbXRPUSDC_625_Base]: MORPHO_BLUE_CBXRP_USDC_625_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueCbHYPEUSDC_625_Base]: MORPHO_BLUE_CBHYPE_USDC_625_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: MORPHO_BLUE_CBETH_ETH_945_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),

package/src/moneymarket/moneymarketCommonService.ts

@@ -13,7 +13,7 @@ export const calcShortLiqPrice = (assetPrice: string, borrowedUsd: string, borro
 
 export const calcLeverageLiqPrice = (leverageType: LeverageType, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
   if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse) return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-  if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair) return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+  if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair || leverageType === LeverageType.StablePair) return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
   console.error('invalid leverageType', leverageType);
   return '0';
 };
@@ -37,12 +37,16 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   let supplyUnstable = 0;
   let longAsset = '';
   let shortAsset = '';
+  let stableCollAsset = '';
   Object.values(usedAssets).forEach(({
     symbol, suppliedUsd, borrowedUsd, collateral,
   }) => {
     const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
     const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
+    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) {
+      supplyStable += 1;
+      stableCollAsset = symbol;
+    }
     if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
     if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
       borrowUnstable += 1;
@@ -56,6 +60,7 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
   const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
   const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+  const isStablePair = supplyStable === 1 && borrowStable === 1 && supplyUnstable === 0 && borrowUnstable === 0;
   if (isLong) {
     return {
       leveragedType: LeverageType.Long,
@@ -74,6 +79,12 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
       leveragedAsset: longAsset,
     };
   }
+  if (isStablePair) {
+    return {
+      leveragedType: LeverageType.StablePair,
+      leveragedAsset: stableCollAsset,
+    };
+  }
   return {
     leveragedType: LeverageType.None,
     leveragedAsset: '',