@defisaver/positions-sdk 2.1.166 → 2.1.168

package/src/spark/index.ts

@@ -1,11 +1,12 @@
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import { Client } from 'viem';
+import { getAaveLikeBalances } from '../helpers/aaveBalances';
 import {
   Blockish, EthAddress, EthereumProvider, IncentiveKind, NetworkNumber, PositionBalances,
 } from '../types/common';
 import {
-  ethToWeth, wethToEth, wethToEthByAddress,
+  ethToWeth, wethToEth,
 } from '../services/utils';
 import {
   calculateNetApy, getStakingApy, STAKING_ASSETS,
@@ -269,54 +270,7 @@ export const EMPTY_SPARK_DATA = {
 };
 
 export const _getSparkAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!address) {
-    return balances;
-  }
-
-  const loanInfoContract = SparkViewContractViem(provider, network, block);
-
-  const market = SPARK_V1(network);
-  const marketAddress = market.providerAddress;
-  // @ts-ignore
-  const protocolDataProviderContract = createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress)(provider, network);
-
-  // @ts-ignore
-  const reserveTokens = await protocolDataProviderContract.read.getAllReservesTokens(setViemBlockNumber(block)) as { symbol: string, tokenAddress: EthAddress }[];
-  const symbols = reserveTokens.map(({ symbol }: { symbol: string }) => symbol);
-  const _addresses = reserveTokens.map(({ tokenAddress }: { tokenAddress: EthAddress }) => tokenAddress);
-
-
-  // split addresses in half to avoid gas limit by multicall
-  const middleAddressIndex = Math.floor(_addresses.length / 2);
-
-  const [tokenBalances1, tokenBalances2] = await Promise.all([
-    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)], setViemBlockNumber(block)),
-    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], setViemBlockNumber(block)),
-  ]);
-
-  const loanInfo = [...tokenBalances1, ...tokenBalances2];
-
-  loanInfo.forEach((tokenInfo: any, i: number) => {
-    const asset = wethToEth(symbols[i]);
-    const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
-
-    balances = {
-      collateral: {
-        ...balances.collateral,
-        [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString(),
-      },
-      debt: {
-        ...balances.debt,
-        [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
-      },
-    };
-  });
-
+  const balances = await getAaveLikeBalances(provider, network, block, addressMapping, address, SPARK_V1(network), 'SparkView');
   return balances;
 };
 

package/src/types/index.ts

@@ -14,4 +14,5 @@ export * from './merit';
 export * from './merkl';
 export * from './savings';
 export * from './common';
-export * from './aaveV4';
+export * from './aaveV4';
+export * from './lendingSummary';

package/src/types/lendingSummary.ts

@@ -0,0 +1,41 @@
+import { EthAddress, NetworkNumber } from './common';
+
+export type LendingSummaryPosition = {
+  id: string;
+  protocol: string;
+  /** Estimated decimal USD values; null means unavailable, never a verified zero. */
+  suppliedUsd: string | null;
+  debtUsd: string | null;
+};
+
+export type WalletLendingSummary = {
+  status: 'complete' | 'partial' | 'failed';
+  positions: LendingSummaryPosition[];
+  protocols: string[];
+  /** Sum of known supply values; check valuationComplete before ranking by value. */
+  suppliedUsd: string;
+  valuationComplete: boolean;
+  errors: string[];
+};
+
+/** Resolve distinct token addresses to USD prices keyed by lowercase address.
+ * Native tokens use their wrapped address. Missing/invalid prices remain unavailable.
+ * Prices are current market estimates; balances may come from a historical/fork snapshot.
+ */
+export type LendingSummaryPriceResolver = (
+  network: NetworkNumber, tokens: EthAddress[], signal?: AbortSignal,
+) => Promise<Record<string, string>>;
+
+export type LendingSummaryOptions = {
+  resolvePrices: LendingSummaryPriceResolver;
+  signal?: AbortSignal;
+  /** Defaults to a snapshot of the provider's latest block. */
+  blockNumber?: bigint;
+  /** Use the smaller 2 KB calldata limit required by simulation providers. */
+  isSim?: boolean;
+};
+
+export type WalletLendingSummaries = {
+  summaries: Record<string, WalletLendingSummary>;
+  rateLimited: boolean;
+};

package/src/types/morphoBlue.ts

@@ -6,7 +6,6 @@ export enum MorphoBlueVersions {
   // MAINNET
   MorphoBlueMKRDAI_777 = 'morphobluemkrdai_777', // MKR/DAI
   MorphoBlueWoEthEth_860 = 'morphobluewoetheth_860', // woETH/ETH
-  MorphoBlueOsEthEth_860 = 'morphoblueosetheth_860', // osETH/ETH
   MorphoBlueWeEthEth_860 = 'morphoblueweetheth_860', // weETH/ETH
   MorphoBlueWstEthUSDC = 'morphobluewstethusdc', // wstETH/USDC
   MorphoBlueSDAIUSDC = 'morphobluesdaiusdc', // sDAI/USDC