@defisaver/positions-sdk 2.0.12 → 2.0.14-dev-portfolio

package/esm/contracts.js

@@ -80,3 +80,12 @@ export const LiquityActivePoolContractViem = createViemContractFromConfigFunc('L
 export const LiquityV2ViewContractViem = createViemContractFromConfigFunc('LiquityV2View');
 export const LiquityV2LegacyViewContractViem = createViemContractFromConfigFunc('LiquityV2LegacyView');
 export const FluidViewContractViem = createViemContractFromConfigFunc('FluidView');
+export const AaveIncentivesControllerViem = createViemContractFromConfigFunc('AaveIncentivesController');
+export const AaveUmbrellaViewViem = createViemContractFromConfigFunc('AaveUmbrellaView');
+export const LiquityLQTYStakingViem = createViemContractFromConfigFunc('LiquityLQTYStaking');
+export const LiquityStabilityPoolViem = createViemContractFromConfigFunc('LiquityStabilityPool');
+export const UUPSViem = createViemContractFromConfigFunc('UUPS');
+export const SparkRewardsControllerViem = createViemContractFromConfigFunc('SparkRewardsController');
+export const AaveRewardsControllerViem = createViemContractFromConfigFunc('AaveRewardsController');
+export const LiquityV2sBoldVaultViem = createViemContractFromConfigFunc('LiquityV2sBoldVault');
+export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');

package/esm/helpers/morphoBlueHelpers/index.js

@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     return { borrowRate, supplyRate };
 });
 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/esm/index.d.ts

@@ -18,5 +18,6 @@ import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
+import * as claiming from './claiming';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, };

package/esm/index.js

@@ -18,5 +18,6 @@ import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
+import * as claiming from './claiming';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, };

package/esm/liquity/index.d.ts

@@ -8,3 +8,14 @@ export declare const getLiquityAccountBalances: (provider: EthereumProvider, net
 export declare const getDebtInFront: (provider: EthereumProvider, address: EthAddress) => Promise<string>;
 export declare const _getLiquityTroveInfo: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
 export declare const getLiquityTroveInfo: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
+export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+    totalLUSDDeposited: string;
+    totalLQTYStaked: string;
+    stakedLQTY: string;
+    stakedLUSDBalance: string;
+    rewardETH: string;
+    rewardLUSD: string;
+    stabilityRewardETH: string;
+    stabilityRewardLQTY: string;
+    showStakingBalances: boolean;
+}>;

package/esm/liquity/index.js

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { NetworkNumber, } from '../types/common';
-import { LiquityActivePoolContractViem, LiquityCollSurplusPoolContractViem, LiquityPriceFeedContractViem, LiquityTroveManagerContractViem, LiquityViewContractViem, } from '../contracts';
+import { LiquityActivePoolContractViem, LiquityCollSurplusPoolContractViem, LiquityLQTYStakingViem, LiquityPriceFeedContractViem, LiquityStabilityPoolViem, LiquityTroveManagerContractViem, LiquityViewContractViem, } from '../contracts';
 import { LIQUITY_TROVE_STATUS_ENUM } from '../types';
 import { ZERO_ADDRESS } from '../constants';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getEthAmountForDecimals } from '../services/utils';
 export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
 export const _getLiquityAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
@@ -85,3 +86,39 @@ export const _getLiquityTroveInfo = (provider, network, address) => __awaiter(vo
     return payload;
 });
 export const getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () { return _getLiquityTroveInfo(getViemProvider(provider, network, { batch: { multicall: true } }), network, address); });
+export const getLiquityStakingData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+    const lqtyStakingView = LiquityLQTYStakingViem(provider, network);
+    const stabilityPoolView = LiquityStabilityPoolViem(provider, network);
+    const [stakes, pendingETHGain, pendingLUSDGain, totalLQTYStakes, stabilityPoolETHGain, stabilityPoolLQTYGain, compoundedLUSDDeposit, totalLUSDDeposits,] = yield Promise.all([
+        lqtyStakingView.read.stakes([address]),
+        lqtyStakingView.read.getPendingETHGain([address]),
+        lqtyStakingView.read.getPendingLUSDGain([address]),
+        lqtyStakingView.read.totalLQTYStaked(),
+        stabilityPoolView.read.getDepositorETHGain([address]),
+        stabilityPoolView.read.getDepositorLQTYGain([address]),
+        stabilityPoolView.read.getCompoundedLUSDDeposit([address]),
+        stabilityPoolView.read.getTotalLUSDDeposits(),
+    ]);
+    const totalLUSDDeposited = getEthAmountForDecimals(totalLUSDDeposits, 18);
+    const totalLQTYStaked = getEthAmountForDecimals(totalLQTYStakes, 18);
+    const stakedLQTY = getEthAmountForDecimals(stakes, 18);
+    const stakedLUSDBalance = getEthAmountForDecimals(compoundedLUSDDeposit, 18);
+    const rewardETH = getEthAmountForDecimals(pendingETHGain, 18);
+    const rewardLUSD = getEthAmountForDecimals(pendingLUSDGain, 18);
+    const stabilityRewardETH = getEthAmountForDecimals(stabilityPoolETHGain, 18);
+    const stabilityRewardLQTY = getEthAmountForDecimals(stabilityPoolLQTYGain, 18);
+    const showStakingBalances = !!(+stakedLQTY || +stakedLUSDBalance
+        || +rewardETH || +rewardLUSD
+        || +stabilityRewardETH || +stabilityRewardLQTY);
+    return {
+        totalLUSDDeposited,
+        totalLQTYStaked,
+        stakedLQTY,
+        stakedLUSDBalance,
+        rewardETH,
+        rewardLUSD,
+        stabilityRewardETH,
+        stabilityRewardLQTY,
+        showStakingBalances,
+    };
+});

package/esm/liquityV2/index.d.ts

@@ -1,6 +1,14 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
 import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2Versions } from '../types';
+export type SPYieldGainParameters = {
+    P: string;
+    aggWeightedDebtSum: string;
+    currentScale: string;
+    lastAggUpdateTime: string;
+    totalBoldDeposits: string;
+    yieldGainsPending: string;
+};
 export declare const _getLiquityV2MarketData: (provider: Client, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo) => Promise<LiquityV2MarketData>;
 export declare const getLiquityV2MarketData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo) => Promise<LiquityV2MarketData>;
 export declare const _getLiquityV2UserTroveIds: (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress) => Promise<{

package/esm/liquityV2/index.js

@@ -14,7 +14,7 @@ import { NetworkNumber } from '../types/common';
 import { LIQUITY_V2_TROVE_STATUS_ENUM, LiquityV2Versions, } from '../types';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getLiquityV2AggregatedPositionData } from '../helpers/liquityV2Helpers';
-import { compareAddresses, ethToWeth, MAXUINT } from '../services/utils';
+import { compareAddresses, ethToWeth, MAXUINT, } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 import { LiquityV2Markets } from '../markets';
 import { getViemProvider } from '../services/viem';
@@ -286,3 +286,164 @@ export const getLiquityV2ClaimableCollateral = (collSurplusPoolAddress, account,
     const claimableCollateral = yield collSurplusPoolContract.read.getCollateral([account]);
     return claimableCollateral.toString();
 });
+// const stabilityPoolAddrForMarket: Record<LiquityV2Versions, EthAddress> = {
+//   [LiquityV2Versions.LiquityV2Eth]: '0x5721cbbd64fc7Ae3Ef44A0A3F9a790A9264Cf9BF',
+//   [LiquityV2Versions.LiquityV2WstEth]: '0x9502b7c397e9aa22fe9db7ef7daf21cd2aebe56b',
+//   [LiquityV2Versions.LiquityV2REth]: '0xd442e41019b7f5c4dd78f50dc03726c446148695',
+//   [LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+//   [LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+//   [LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+// };
+// const activePoolAddrForMarket: Record<LiquityV2Versions, EthAddress> = {
+//   [LiquityV2Versions.LiquityV2Eth]: '0xeB5A8C825582965f1d84606E078620a84ab16AfE',
+//   [LiquityV2Versions.LiquityV2WstEth]: '0x531a8f99c70d6a56a7cee02d6b4281650d7919a0',
+//   [LiquityV2Versions.LiquityV2REth]: '0x9074d72cc82dad1e13e454755aa8f144c479532f',
+//   [LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+//   [LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+//   [LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+// };
+//
+// function ceilDiv(a: string, b: string) {
+//   return new Dec(a).add(new Dec(b).sub(1)).div(b).toString();
+// }
+// const SP_YIELD_SPLIT = new Dec(75).mul(10 ** 16).toString(); // 75%
+//
+// const calcPendingSPYield = (
+//   aggWeightedDebtSum: string,
+//   lastAggUpdateTime: string,
+//   currentTime: string,
+// ) => {
+//   const a = new Dec(aggWeightedDebtSum).mul(
+//     new Dec(currentTime).sub(new Dec(lastAggUpdateTime)),
+//   ).toString();
+//   const b = new Dec(SECONDS_PER_YEAR).mul(1000).mul(1e18).toString();
+//   return new Dec(ceilDiv(a, b)).mul(SP_YIELD_SPLIT).div(1e18).toString();
+// };
+//
+//
+// const calculateStabilityPoolApy = (
+//   spYieldGainParams: SPYieldGainParameters,
+// ) => {
+//   const {
+//     aggWeightedDebtSum, totalBoldDeposits, lastAggUpdateTime, yieldGainsPending,
+//   } = spYieldGainParams;
+//
+//   if (new Dec(totalBoldDeposits).eq(0)) {
+//     return '0';
+//   }
+//
+//   const now = Date.now().toString();
+//   const lastAggUpdateTimeScaled = new Dec(lastAggUpdateTime).mul(1000).toString();
+//
+//   const pendingSPYield = new Dec(calcPendingSPYield(
+//     aggWeightedDebtSum,
+//     lastAggUpdateTimeScaled,
+//     now,
+//   )).add(yieldGainsPending).toString();
+//
+//   const annualizedYield = new Dec(pendingSPYield).mul(SECONDS_PER_YEAR).mul(1000).div(new Dec(now).minus(lastAggUpdateTimeScaled))
+//     .toString();
+//   return new Dec(annualizedYield).div(totalBoldDeposits).mul(100).toString();
+// };
+//
+// const getYBoldApyApi = async () => {
+//   const url = 'https://ydaemon.yearn.fi/1/vaults/0x23346B04a7f55b8760E5860AA5A77383D63491cD?strategiesDetails=withDetails&strategiesCondition=inQueue';
+//
+//   const yBoldData = await fetch(url)
+//     .then(res => res.json())
+//     .catch(console.error);
+//
+//   return new Dec(yBoldData.apr.netAPR).mul(100).toString();
+// };
+//
+// export const getLiquityV2Staking = async (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => {
+//   const stabilityPoolView = createViemContractFromConfigFunc('LiquityV2StabilityPool', stabilityPoolAddrForMarket[market])(provider, network);
+//   const activePoolView = createViemContractFromConfigFunc('LiquityV2ActivePool', activePoolAddrForMarket[market])(provider, network);
+//
+//   const sBold = LiquityV2sBoldVaultViem(provider, network);
+//   const yBold = createViemContractFromConfigFunc('Erc4626', '0x9F4330700a36B29952869fac9b33f45EEdd8A3d8')(provider, network);
+//   const stYBold = createViemContractFromConfigFunc('Erc4626', '0x23346B04a7f55b8760E5860AA5A77383D63491cD')(provider, network);
+//
+//   const debtTokenInfo = getAssetInfo(LiquityV2Markets(network)[market].debtToken);
+//   const debtTokenContract = createViemContractFromConfigFunc('Erc20', debtTokenInfo.address)(provider, network);
+//
+//   const [
+//     stabilityRewardColl,
+//     stabilityRewardYield,
+//     compoundedBoldDeposit,
+//     totalBoldDeposits,
+//     P,
+//     currentScale,
+//     yieldGainsPending,
+//     debtTokenBalance,
+//
+//     aggWeightedDebtSum,
+//     lastAggUpdateTime,
+//
+//     sBoldTotalAssets,
+//     sBoldConvertToShares,
+//     sBoldMaxWithdraw,
+//
+//     wethApy,
+//     wsETHApy,
+//     rETHApy,
+//
+//     yBoldTotalAssets,
+//     yBoldMaxWithdraw,
+//     stYBoldConvertToShares,
+//   ] = await Promise.all([
+//     stabilityPoolView.read.getDepositorCollGain([user]),
+//     stabilityPoolView.read.getDepositorYieldGain([user]),
+//     stabilityPoolView.read.getCompoundedBoldDeposit([user]),
+//     stabilityPoolView.read.getTotalBoldDeposits(),
+//     stabilityPoolView.read.P(),
+//     stabilityPoolView.read.currentScale(),
+//     stabilityPoolView.read.getYieldGainsPending(),
+//     debtTokenContract.read.balanceOf([user]),
+//
+//     activePoolView.read.aggWeightedDebtSum(),
+//     activePoolView.read.lastAggUpdateTime(),
+//
+//     sBold.read.totalAssets(),
+//     sBold.read.convertToShares([BigInt(1e18)]),
+//     sBold.read.maxWithdraw([user]),
+//
+//     sBold.read.sps([BigInt(0)]),
+//     sBold.read.sps([BigInt(1)]),
+//     sBold.read.sps([BigInt(2)]),
+//
+//     yBold.read.totalAssets(),
+//     yBold.read.maxWithdraw([user]),
+//     stYBold.read.convertToShares([BigInt(1e18)]),
+//   ]);
+//
+//
+//   const stabilityPoolYieldParams: SPYieldGainParameters = {
+//     aggWeightedDebtSum: aggWeightedDebtSum.toString(),
+//     lastAggUpdateTime: lastAggUpdateTime.toString(),
+//     P: P.toString(),
+//     currentScale: currentScale.toString(),
+//     yieldGainsPending: yieldGainsPending.toString(),
+//     totalBoldDeposits: totalBoldDeposits.toString(),
+//   };
+//
+//   const stabilityPoolApy = calculateStabilityPoolApy(stabilityPoolYieldParams);
+//
+//   const stakedBOLDBalanceForUser = getEthAmountForDecimals(compoundedBoldDeposit.toString(), 18);
+//   const stabilityRewardCollForUser = getEthAmountForDecimals(stabilityRewardColl.toString(), 18);
+//   const stabilityRewardYieldForUser = getEthAmountForDecimals(stabilityRewardYield.toString(), 18);
+//
+//   const accountData = {
+//     totalBOLDDeposited: getEthAmountForDecimals(totalBoldDeposits.toString(), 18),
+//     stakedBOLDBalance: stakedBOLDBalanceForUser,
+//     stabilityRewardColl: stabilityRewardCollForUser,
+//     stabilityRewardYield: stabilityRewardYieldForUser,
+//     showStakingBalances: !!(+stakedBOLDBalanceForUser || +stabilityRewardCollForUser || +stabilityRewardYieldForUser),
+//     debtTokenBalance: getEthAmountForDecimals(debtTokenBalance.toString(), debtTokenInfo.decimals),
+//   };
+//
+//
+//   const yBoldApy = await getYBoldApyApi();
+//
+//   return yBoldApy;
+// };

package/esm/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
 export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 export const aaveV3AssetsDefaultMarketEth = [
     'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/esm/markets/compound/marketsAssets.js

@@ -4,7 +4,7 @@ export const compoundV2CollateralAssets = [
     'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
     'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => getAssetInfo(symbol));
-export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'weETH', 'deUSD', 'sdeUSD'];
+export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'weETH', 'deUSD', 'sdeUSD', 'rsETH'];
 export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH', 'wUSDM'];
 export const v3USDCCollAssetsBase = ['cbETH', 'ETH', 'wstETH', 'cbBTC', 'tBTC'];
 export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -46,7 +46,7 @@ export const v3USDbCCollAssets = {
     [NetworkNumber.Base]: v3USDbCCollAssetsBase,
     [NetworkNumber.Linea]: [],
 };
-export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
+export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
 export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`

package/esm/markets/spark/marketAssets.js

@@ -1,5 +1,5 @@
 import { NetworkNumber } from '../../types/common';
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH'];
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH', 'PYUSD'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const sparkAssetsDefaultMarket = {
     [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,

package/esm/morphoBlue/index.d.ts

@@ -7,3 +7,8 @@ export declare const _getMorphoBlueAccountBalances: (provider: Client, network:
 export declare const getMorphoBlueAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
 export declare function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
+export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{
+    apy: string;
+    amount: string;
+    amountUsd: string;
+}>;

package/esm/morphoBlue/index.js

@@ -12,7 +12,7 @@ import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber, } from '../types/common';
 import { DFSFeedRegistryContractViem, FeedRegistryContractViem, MorphoBlueViewContractViem, } from '../contracts';
 import { USD_QUOTE, WAD } from '../constants';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
 import { isMainnetNetwork, wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate, } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
@@ -155,16 +155,15 @@ export function _getMorphoBlueAccountData(provider, network, account, selectedMa
         ]));
         const usedAssets = {};
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-        const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets.toString(), marketInfo.loanToken);
         usedAssets[marketInfo.loanToken] = {
             symbol: loanTokenInfo.symbol,
-            supplied: loanTokenSupplied,
+            supplied: '0',
             borrowed: loanTokenBorrowed,
-            isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
+            isSupplied: false,
             isBorrowed: new Dec(loanInfo.borrowedInAssets.toString()).gt(0),
             collateral: false,
-            suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
+            suppliedUsd: '0',
             borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
         };
         const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
@@ -187,3 +186,37 @@ export function getMorphoBlueAccountData(provider, network, account, selectedMar
         return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
     });
 }
+export function getMorphoEarn(provider, network, account, selectedMarket, marketInfo) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
+        const lltvInWei = new Dec(lltv).mul(WAD).toString();
+        const viewContract = MorphoBlueViewContractViem(provider, network);
+        const loanInfo = (yield viewContract.read.getUserInfo([
+            {
+                loanToken, collateralToken, oracle, irm, lltv: BigInt(lltvInWei),
+            },
+            account
+        ]));
+        const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+        const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
+        const loanTokenSuppliedUsd = new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString();
+        const usedAssets = {
+            [marketInfo.loanToken]: {
+                symbol: loanTokenInfo.symbol,
+                supplied: loanTokenSupplied,
+                borrowed: '0',
+                isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
+                isBorrowed: false,
+                collateral: false,
+                suppliedUsd: loanTokenSuppliedUsd,
+                borrowedUsd: '0',
+            },
+        };
+        const { netApy } = calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData });
+        return {
+            apy: netApy,
+            amount: loanTokenSupplied,
+            amountUsd: loanTokenSuppliedUsd,
+        };
+    });
+}

package/esm/portfolio/index.d.ts

@@ -1,3 +1,8 @@
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
 import { PortfolioPositionsData } from '../types';
-export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], summerFiAddresses: EthAddress[]): Promise<PortfolioPositionsData>;
+export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], summerFiAddresses: EthAddress[]): Promise<{
+    positions: PortfolioPositionsData;
+    stakingPositions: any;
+    rewardsData: any;
+    markets: any;
+}>;