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

package/cjs/contracts.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FluidViewContractViem = exports.LiquityV2LegacyViewContractViem = exports.LiquityV2ViewContractViem = exports.LiquityActivePoolContractViem = exports.LiquityPriceFeedContractViem = exports.LiquityTroveManagerContractViem = exports.LiquityCollSurplusPoolContractViem = exports.LiquityViewContractViem = exports.BTCPriceFeedContractViem = exports.WeETHPriceFeedContractViem = exports.ComptrollerContractViem = exports.CompoundLoanInfoContractViem = exports.McdJugContractViem = exports.McdDogContractViem = exports.McdSpotterContractViem = exports.McdVatContractViem = exports.McdViewContractViem = exports.McdGetCdpsContractViem = exports.LlamaLendViewContractViem = exports.CrvUSDFactoryContractViem = exports.CrvUSDViewContractViem = exports.EulerV2ViewContractViem = exports.SparkIncentiveDataProviderContractViem = exports.SparkViewContractViem = exports.CompV3ViewContractViem = exports.WstETHPriceFeedContractViem = exports.USDCPriceFeedContractViem = exports.ETHPriceFeedContractViem = exports.COMPPriceFeedContractViem = exports.DFSFeedRegistryContractViem = exports.FeedRegistryContractViem = exports.AaveIncentiveDataProviderV3ContractViem = exports.AaveV3ViewContractViem = exports.AaveLoanInfoV2ContractViem = exports.MorphoBlueViewContractViem = exports.createViemContractFromConfigFunc = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
+exports.StkAAVEViem = exports.LiquityV2sBoldVaultViem = exports.AaveRewardsControllerViem = exports.SparkRewardsControllerViem = exports.UUPSViem = exports.LiquityStabilityPoolViem = exports.LiquityLQTYStakingViem = exports.AaveUmbrellaViewViem = exports.AaveIncentivesControllerViem = exports.FluidViewContractViem = exports.LiquityV2LegacyViewContractViem = exports.LiquityV2ViewContractViem = exports.LiquityActivePoolContractViem = exports.LiquityPriceFeedContractViem = exports.LiquityTroveManagerContractViem = exports.LiquityCollSurplusPoolContractViem = exports.LiquityViewContractViem = exports.BTCPriceFeedContractViem = exports.WeETHPriceFeedContractViem = exports.ComptrollerContractViem = exports.CompoundLoanInfoContractViem = exports.McdJugContractViem = exports.McdDogContractViem = exports.McdSpotterContractViem = exports.McdVatContractViem = exports.McdViewContractViem = exports.McdGetCdpsContractViem = exports.LlamaLendViewContractViem = exports.CrvUSDFactoryContractViem = exports.CrvUSDViewContractViem = exports.EulerV2ViewContractViem = exports.SparkIncentiveDataProviderContractViem = exports.SparkViewContractViem = exports.CompV3ViewContractViem = exports.WstETHPriceFeedContractViem = exports.USDCPriceFeedContractViem = exports.ETHPriceFeedContractViem = exports.COMPPriceFeedContractViem = exports.DFSFeedRegistryContractViem = exports.FeedRegistryContractViem = exports.AaveIncentiveDataProviderV3ContractViem = exports.AaveV3ViewContractViem = exports.AaveLoanInfoV2ContractViem = exports.MorphoBlueViewContractViem = exports.createViemContractFromConfigFunc = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
 const viem_1 = require("viem");
 const configRaw = __importStar(require("./config/contracts"));
 // @ts-ignore
@@ -119,3 +119,12 @@ exports.LiquityActivePoolContractViem = (0, exports.createViemContractFromConfig
 exports.LiquityV2ViewContractViem = (0, exports.createViemContractFromConfigFunc)('LiquityV2View');
 exports.LiquityV2LegacyViewContractViem = (0, exports.createViemContractFromConfigFunc)('LiquityV2LegacyView');
 exports.FluidViewContractViem = (0, exports.createViemContractFromConfigFunc)('FluidView');
+exports.AaveIncentivesControllerViem = (0, exports.createViemContractFromConfigFunc)('AaveIncentivesController');
+exports.AaveUmbrellaViewViem = (0, exports.createViemContractFromConfigFunc)('AaveUmbrellaView');
+exports.LiquityLQTYStakingViem = (0, exports.createViemContractFromConfigFunc)('LiquityLQTYStaking');
+exports.LiquityStabilityPoolViem = (0, exports.createViemContractFromConfigFunc)('LiquityStabilityPool');
+exports.UUPSViem = (0, exports.createViemContractFromConfigFunc)('UUPS');
+exports.SparkRewardsControllerViem = (0, exports.createViemContractFromConfigFunc)('SparkRewardsController');
+exports.AaveRewardsControllerViem = (0, exports.createViemContractFromConfigFunc)('AaveRewardsController');
+exports.LiquityV2sBoldVaultViem = (0, exports.createViemContractFromConfigFunc)('LiquityV2sBoldVault');
+exports.StkAAVEViem = (0, exports.createViemContractFromConfigFunc)('StkAAVE');

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 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/cjs/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/cjs/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV3 = exports.aaveV2 = void 0;
+exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV3 = exports.aaveV2 = void 0;
 require("./setup");
 const fluid = __importStar(require("./fluid"));
 exports.fluid = fluid;
@@ -76,4 +76,6 @@ const eulerV2 = __importStar(require("./eulerV2"));
 exports.eulerV2 = eulerV2;
 const portfolio = __importStar(require("./portfolio"));
 exports.portfolio = portfolio;
+const claiming = __importStar(require("./claiming"));
+exports.claiming = claiming;
 __exportStar(require("./types"), exports);

package/cjs/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/cjs/liquity/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLiquityTroveInfo = exports._getLiquityTroveInfo = exports.getDebtInFront = exports.getLiquityAccountBalances = exports._getLiquityAccountBalances = exports.LIQUITY_RECOVERY_MODE_RATIO = exports.LIQUITY_NORMAL_MODE_RATIO = void 0;
+exports.getLiquityStakingData = exports.getLiquityTroveInfo = exports._getLiquityTroveInfo = exports.getDebtInFront = exports.getLiquityAccountBalances = exports._getLiquityAccountBalances = exports.LIQUITY_RECOVERY_MODE_RATIO = exports.LIQUITY_NORMAL_MODE_RATIO = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -20,6 +20,7 @@ const contracts_1 = require("../contracts");
 const types_1 = require("../types");
 const constants_1 = require("../constants");
 const viem_1 = require("../services/viem");
+const utils_1 = require("../services/utils");
 exports.LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 exports.LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
 const _getLiquityAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
@@ -96,3 +97,40 @@ const _getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, v
 exports._getLiquityTroveInfo = _getLiquityTroveInfo;
 const getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLiquityTroveInfo)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, address); });
 exports.getLiquityTroveInfo = getLiquityTroveInfo;
+const getLiquityStakingData = (provider, network, address) => __awaiter(void 0, void 0, void 0, function* () {
+    const lqtyStakingView = (0, contracts_1.LiquityLQTYStakingViem)(provider, network);
+    const stabilityPoolView = (0, contracts_1.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 = (0, utils_1.getEthAmountForDecimals)(totalLUSDDeposits, 18);
+    const totalLQTYStaked = (0, utils_1.getEthAmountForDecimals)(totalLQTYStakes, 18);
+    const stakedLQTY = (0, utils_1.getEthAmountForDecimals)(stakes, 18);
+    const stakedLUSDBalance = (0, utils_1.getEthAmountForDecimals)(compoundedLUSDDeposit, 18);
+    const rewardETH = (0, utils_1.getEthAmountForDecimals)(pendingETHGain, 18);
+    const rewardLUSD = (0, utils_1.getEthAmountForDecimals)(pendingLUSDGain, 18);
+    const stabilityRewardETH = (0, utils_1.getEthAmountForDecimals)(stabilityPoolETHGain, 18);
+    const stabilityRewardLQTY = (0, utils_1.getEthAmountForDecimals)(stabilityPoolLQTYGain, 18);
+    const showStakingBalances = !!(+stakedLQTY || +stakedLUSDBalance
+        || +rewardETH || +rewardLUSD
+        || +stabilityRewardETH || +stabilityRewardLQTY);
+    return {
+        totalLUSDDeposited,
+        totalLQTYStaked,
+        stakedLQTY,
+        stakedLUSDBalance,
+        rewardETH,
+        rewardLUSD,
+        stabilityRewardETH,
+        stabilityRewardLQTY,
+        showStakingBalances,
+    };
+});
+exports.getLiquityStakingData = getLiquityStakingData;

package/cjs/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/cjs/liquityV2/index.js

@@ -300,3 +300,164 @@ const getLiquityV2ClaimableCollateral = (collSurplusPoolAddress, account, provid
     return claimableCollateral.toString();
 });
 exports.getLiquityV2ClaimableCollateral = getLiquityV2ClaimableCollateral;
+// 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/cjs/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 exports.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'];
 exports.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',
 ];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/cjs/markets/compound/marketsAssets.js

@@ -7,7 +7,7 @@ exports.compoundV2CollateralAssets = [
     'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
     'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
-exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'weETH', 'deUSD', 'sdeUSD'];
+exports.v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'weETH', 'deUSD', 'sdeUSD', 'rsETH'];
 exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH', 'wUSDM'];
 exports.v3USDCCollAssetsBase = ['cbETH', 'ETH', 'wstETH', 'cbBTC', 'tBTC'];
 exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -49,7 +49,7 @@ exports.v3USDbCCollAssets = {
     [common_1.NetworkNumber.Base]: exports.v3USDbCCollAssetsBase,
     [common_1.NetworkNumber.Linea]: [],
 };
-exports.v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
+exports.v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
 exports.v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
 exports.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/cjs/markets/spark/marketAssets.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
 const common_1 = require("../../types/common");
-exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH'];
+exports.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`
 exports.sparkAssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,

package/cjs/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/cjs/morphoBlue/index.js

@@ -17,6 +17,7 @@ exports._getMorphoBlueMarketData = _getMorphoBlueMarketData;
 exports.getMorphoBlueMarketData = getMorphoBlueMarketData;
 exports._getMorphoBlueAccountData = _getMorphoBlueAccountData;
 exports.getMorphoBlueAccountData = getMorphoBlueAccountData;
+exports.getMorphoEarn = getMorphoEarn;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -167,16 +168,15 @@ function _getMorphoBlueAccountData(provider, network, account, selectedMarket, m
         ]));
         const usedAssets = {};
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-        const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenBorrowed = (0, tokens_1.assetAmountInEth)(loanInfo.borrowedInAssets.toString(), marketInfo.loanToken);
         usedAssets[marketInfo.loanToken] = {
             symbol: loanTokenInfo.symbol,
-            supplied: loanTokenSupplied,
+            supplied: '0',
             borrowed: loanTokenBorrowed,
-            isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
+            isSupplied: false,
             isBorrowed: new decimal_js_1.default(loanInfo.borrowedInAssets.toString()).gt(0),
             collateral: false,
-            suppliedUsd: new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
+            suppliedUsd: '0',
             borrowedUsd: new decimal_js_1.default(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
         };
         const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
@@ -199,3 +199,37 @@ function getMorphoBlueAccountData(provider, network, account, selectedMarket, ma
         return _getMorphoBlueAccountData((0, viem_1.getViemProvider)(provider, network), network, account, selectedMarket, marketInfo);
     });
 }
+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 decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
+        const viewContract = (0, contracts_1.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 = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
+        const loanTokenSuppliedUsd = new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString();
+        const usedAssets = {
+            [marketInfo.loanToken]: {
+                symbol: loanTokenInfo.symbol,
+                supplied: loanTokenSupplied,
+                borrowed: '0',
+                isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
+                isBorrowed: false,
+                collateral: false,
+                suppliedUsd: loanTokenSuppliedUsd,
+                borrowedUsd: '0',
+            },
+        };
+        const { netApy } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData });
+        return {
+            apy: netApy,
+            amount: loanTokenSupplied,
+            amountUsd: loanTokenSuppliedUsd,
+        };
+    });
+}

package/cjs/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;
+}>;