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

package/cjs/config/contracts.d.ts

@@ -80330,6 +80330,20 @@ export declare const LiquityV2ActivePool: {
 };
 export declare const LiquityV2sBoldVault: {
     readonly abi: readonly [{
+        readonly inputs: readonly [{
+            readonly internalType: "address";
+            readonly name: "account";
+            readonly type: "address";
+        }];
+        readonly name: "balanceOf";
+        readonly outputs: readonly [{
+            readonly internalType: "uint256";
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }, {
         readonly inputs: readonly [{
             readonly internalType: "uint256";
             readonly name: "assets";

package/cjs/config/contracts.js

@@ -1193,7 +1193,7 @@ exports.LiquityV2ActivePool = {
     "networks": {}
 };
 exports.LiquityV2sBoldVault = {
-    "abi": [{ "inputs": [{ "internalType": "uint256", "name": "assets", "type": "uint256" }], "name": "convertToShares", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }], "name": "maxWithdraw", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "name": "sps", "outputs": [{ "internalType": "address", "name": "sp", "type": "address" }, { "internalType": "uint96", "name": "weight", "type": "uint96" }, { "internalType": "address", "name": "coll", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "totalAssets", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }],
+    "abi": [{ "inputs": [{ "internalType": "address", "name": "account", "type": "address" }], "name": "balanceOf", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "assets", "type": "uint256" }], "name": "convertToShares", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }], "name": "maxWithdraw", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "name": "sps", "outputs": [{ "internalType": "address", "name": "sp", "type": "address" }, { "internalType": "uint96", "name": "weight", "type": "uint96" }, { "internalType": "address", "name": "coll", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "totalAssets", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }],
     "networks": {
         "1": {
             "address": "0x50bd66d59911f5e086ec87ae43c811e0d059dd11"

package/cjs/contracts.d.ts

@@ -528167,7 +528167,96 @@ export declare const AaveRewardsControllerViem: (client: Client, network: Networ
 };
 export declare const LiquityV2sBoldVaultViem: (client: Client, network: NetworkNumber, block?: Blockish) => {
     read: {
+        balanceOf: (args: readonly [`0x${string}`], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "account";
+                readonly type: "address";
+            }];
+            readonly name: "balanceOf";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
+            readonly inputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "assets";
+                readonly type: "uint256";
+            }];
+            readonly name: "convertToShares";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
+            readonly inputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "owner";
+                readonly type: "address";
+            }];
+            readonly name: "maxWithdraw";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
+            readonly inputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly name: "sps";
+            readonly outputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "sp";
+                readonly type: "address";
+            }, {
+                readonly internalType: "uint96";
+                readonly name: "weight";
+                readonly type: "uint96";
+            }, {
+                readonly internalType: "address";
+                readonly name: "coll";
+                readonly type: "address";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "totalAssets";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }], "balanceOf", readonly [`0x${string}`]>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<bigint>;
         maxWithdraw: (args: readonly [`0x${string}`], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "account";
+                readonly type: "address";
+            }];
+            readonly name: "balanceOf";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "uint256";
                 readonly name: "assets";
@@ -528229,6 +528318,20 @@ export declare const LiquityV2sBoldVaultViem: (client: Client, network: NetworkN
             readonly type: "function";
         }], "maxWithdraw", readonly [`0x${string}`]>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<bigint>;
         totalAssets: (options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "account";
+                readonly type: "address";
+            }];
+            readonly name: "balanceOf";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "uint256";
                 readonly name: "assets";
@@ -528290,6 +528393,20 @@ export declare const LiquityV2sBoldVaultViem: (client: Client, network: NetworkN
             readonly type: "function";
         }], "totalAssets", readonly []>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<bigint>;
         convertToShares: (args: readonly [bigint], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "account";
+                readonly type: "address";
+            }];
+            readonly name: "balanceOf";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "uint256";
                 readonly name: "assets";
@@ -528351,6 +528468,20 @@ export declare const LiquityV2sBoldVaultViem: (client: Client, network: NetworkN
             readonly type: "function";
         }], "convertToShares", readonly [bigint]>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<bigint>;
         sps: (args: readonly [bigint], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [{
+                readonly internalType: "address";
+                readonly name: "account";
+                readonly type: "address";
+            }];
+            readonly name: "balanceOf";
+            readonly outputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "";
+                readonly type: "uint256";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "uint256";
                 readonly name: "assets";
@@ -528414,6 +528545,20 @@ export declare const LiquityV2sBoldVaultViem: (client: Client, network: NetworkN
     };
     address: `0x${string}`;
     abi: readonly [{
+        readonly inputs: readonly [{
+            readonly internalType: "address";
+            readonly name: "account";
+            readonly type: "address";
+        }];
+        readonly name: "balanceOf";
+        readonly outputs: readonly [{
+            readonly internalType: "uint256";
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }, {
         readonly inputs: readonly [{
             readonly internalType: "uint256";
             readonly name: "assets";

package/cjs/liquityV2/index.d.ts

@@ -37,3 +37,30 @@ export declare const getLiquityV2TroveData: (provider: EthereumProvider, network
     allMarketsData: Record<LiquityV2Versions, LiquityV2MarketData>;
 }, fetchDebtInFront?: boolean) => Promise<LiquityV2TroveData>;
 export declare const getLiquityV2ClaimableCollateral: (collSurplusPoolAddress: EthAddress, account: EthAddress, provider: EthereumProvider, network: NetworkNumber) => Promise<string>;
+export type sBoldYieldParameters = {
+    WETH: string;
+    wsETH: string;
+    rETH: string;
+};
+export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<{
+    totalBOLDDeposited: string;
+    stakedBOLDBalance: string;
+    stabilityRewardColl: string;
+    stabilityRewardYield: string;
+    showStakingBalances: boolean;
+    debtTokenBalance: string;
+    stabilityPoolApy: string;
+}>;
+export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<{
+    spApy: string;
+    yBoldApy: string;
+    totalBoldDepositedSBold: string;
+    boldRateSBold: string;
+    maxWithdrawSBold: string;
+    totalBoldDepositedYBold: string;
+    boldRateYBold: string;
+    maxWithdrawYBold: string;
+    sBoldBalance: string;
+    yBoldBalance: string;
+    stYBoldBalance: string;
+}>;

package/cjs/liquityV2/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.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
+exports.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -300,164 +300,138 @@ 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;
-// };
+const stabilityPoolAddrForMarket = {
+    [types_1.LiquityV2Versions.LiquityV2Eth]: '0x5721cbbd64fc7Ae3Ef44A0A3F9a790A9264Cf9BF',
+    [types_1.LiquityV2Versions.LiquityV2WstEth]: '0x9502b7c397e9aa22fe9db7ef7daf21cd2aebe56b',
+    [types_1.LiquityV2Versions.LiquityV2REth]: '0xd442e41019b7f5c4dd78f50dc03726c446148695',
+    [types_1.LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+    [types_1.LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+    [types_1.LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+};
+const activePoolAddrForMarket = {
+    [types_1.LiquityV2Versions.LiquityV2Eth]: '0xeB5A8C825582965f1d84606E078620a84ab16AfE',
+    [types_1.LiquityV2Versions.LiquityV2WstEth]: '0x531a8f99c70d6a56a7cee02d6b4281650d7919a0',
+    [types_1.LiquityV2Versions.LiquityV2REth]: '0x9074d72cc82dad1e13e454755aa8f144c479532f',
+    [types_1.LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+    [types_1.LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+    [types_1.LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+};
+function ceilDiv(a, b) {
+    return new decimal_js_1.default(a).add(new decimal_js_1.default(b).sub(1)).div(b).toString();
+}
+const SP_YIELD_SPLIT = new decimal_js_1.default(75).mul(Math.pow(10, 16)).toString(); // 75%
+const calcPendingSPYield = (aggWeightedDebtSum, lastAggUpdateTime, currentTime) => {
+    const a = new decimal_js_1.default(aggWeightedDebtSum).mul(new decimal_js_1.default(currentTime).sub(new decimal_js_1.default(lastAggUpdateTime))).toString();
+    const b = new decimal_js_1.default(constants_1.SECONDS_PER_YEAR).mul(1000).mul(1e18).toString();
+    return new decimal_js_1.default(ceilDiv(a, b)).mul(SP_YIELD_SPLIT).div(1e18).toString();
+};
+const calculateStabilityPoolApy = (spYieldGainParams) => {
+    const { aggWeightedDebtSum, totalBoldDeposits, lastAggUpdateTime, yieldGainsPending, } = spYieldGainParams;
+    if (new decimal_js_1.default(totalBoldDeposits).eq(0)) {
+        return '0';
+    }
+    const now = Date.now().toString();
+    const lastAggUpdateTimeScaled = new decimal_js_1.default(lastAggUpdateTime).mul(1000).toString();
+    const pendingSPYield = new decimal_js_1.default(calcPendingSPYield(aggWeightedDebtSum, lastAggUpdateTimeScaled, now)).add(yieldGainsPending).toString();
+    const annualizedYield = new decimal_js_1.default(pendingSPYield).mul(constants_1.SECONDS_PER_YEAR).mul(1000).div(new decimal_js_1.default(now).minus(lastAggUpdateTimeScaled))
+        .toString();
+    return new decimal_js_1.default(annualizedYield).div(totalBoldDeposits).mul(100).toString();
+};
+const getYBoldApyApi = () => __awaiter(void 0, void 0, void 0, function* () {
+    const url = 'https://ydaemon.yearn.fi/1/vaults/0x23346B04a7f55b8760E5860AA5A77383D63491cD?strategiesDetails=withDetails&strategiesCondition=inQueue';
+    const yBoldData = yield fetch(url)
+        .then(res => res.json())
+        .catch(console.error);
+    return new decimal_js_1.default(yBoldData.apr.netAPR).mul(100).toString();
+});
+const calculateSPApy = (spYieldGainParams, spAPYs) => {
+    const { WETH, wsETH, rETH, } = spYieldGainParams;
+    const apy = new decimal_js_1.default(WETH).mul(spAPYs.apyEth).add(new decimal_js_1.default(wsETH).mul(spAPYs.apyWstEth)).add(new decimal_js_1.default(rETH).mul(spAPYs.apyREth))
+        .toString();
+    return apy;
+};
+const getLiquityV2Staking = (provider, network, market, user) => __awaiter(void 0, void 0, void 0, function* () {
+    const stabilityPoolView = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2StabilityPool', stabilityPoolAddrForMarket[market])(provider, network);
+    const activePoolView = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2ActivePool', activePoolAddrForMarket[market])(provider, network);
+    const debtTokenInfo = (0, tokens_1.getAssetInfo)((0, markets_1.LiquityV2Markets)(network)[market].debtToken, network);
+    const debtTokenContract = (0, contracts_1.createViemContractFromConfigFunc)('Erc20', debtTokenInfo.address)(provider, network);
+    const [stabilityRewardColl, stabilityRewardYield, compoundedBoldDeposit, totalBoldDeposits, P, currentScale, yieldGainsPending, debtTokenBalance, aggWeightedDebtSum, lastAggUpdateTime,] = yield 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(),
+    ]);
+    const stabilityPoolYieldParams = {
+        aggWeightedDebtSum: aggWeightedDebtSum.toString(),
+        lastAggUpdateTime: lastAggUpdateTime.toString(),
+        P: P.toString(),
+        currentScale: currentScale.toString(),
+        yieldGainsPending: yieldGainsPending.toString(),
+        totalBoldDeposits: totalBoldDeposits.toString(),
+    };
+    const stabilityPoolApy = calculateStabilityPoolApy(stabilityPoolYieldParams);
+    const stakedBOLDBalanceForUser = (0, utils_1.getEthAmountForDecimals)(compoundedBoldDeposit.toString(), 18);
+    const stabilityRewardCollForUser = (0, utils_1.getEthAmountForDecimals)(stabilityRewardColl.toString(), 18);
+    const stabilityRewardYieldForUser = (0, utils_1.getEthAmountForDecimals)(stabilityRewardYield.toString(), 18);
+    return {
+        totalBOLDDeposited: (0, utils_1.getEthAmountForDecimals)(totalBoldDeposits.toString(), 18),
+        stakedBOLDBalance: stakedBOLDBalanceForUser,
+        stabilityRewardColl: stabilityRewardCollForUser,
+        stabilityRewardYield: stabilityRewardYieldForUser,
+        showStakingBalances: !!(+stakedBOLDBalanceForUser || +stabilityRewardCollForUser || +stabilityRewardYieldForUser),
+        debtTokenBalance: (0, utils_1.getEthAmountForDecimals)(debtTokenBalance.toString(), debtTokenInfo.decimals),
+        stabilityPoolApy,
+    };
+});
+exports.getLiquityV2Staking = getLiquityV2Staking;
+const getLiquitySAndYBold = (provider, network, markets, user) => __awaiter(void 0, void 0, void 0, function* () {
+    const sBold = (0, contracts_1.LiquityV2sBoldVaultViem)(provider, network);
+    const yBold = (0, contracts_1.createViemContractFromConfigFunc)('Erc4626', '0x9F4330700a36B29952869fac9b33f45EEdd8A3d8')(provider, network);
+    const stYBold = (0, contracts_1.createViemContractFromConfigFunc)('Erc4626', '0x23346B04a7f55b8760E5860AA5A77383D63491cD')(provider, network);
+    const spAPYs = {
+        apyEth: markets[types_1.LiquityV2Versions.LiquityV2Eth].data.stabilityPoolApy,
+        apyWstEth: markets[types_1.LiquityV2Versions.LiquityV2WstEth].data.stabilityPoolApy,
+        apyREth: markets[types_1.LiquityV2Versions.LiquityV2REth].data.stabilityPoolApy,
+    };
+    const [sBoldTotalAssets, sBoldConvertToShares, sBoldMaxWithdraw, wethApy, wsETHApy, rETHApy, yBoldTotalAssets, yBoldMaxWithdraw, stYBoldConvertToShares, yBoldApy, sBoldBalance, yBoldBalance, stYBoldBalance,] = yield Promise.all([
+        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)]),
+        getYBoldApyApi(),
+        sBold.read.balanceOf([user]),
+        yBold.read.balanceOf([user]),
+        stYBold.read.balanceOf([user]),
+    ]);
+    const spMarketRes = {
+        WETH: new decimal_js_1.default(wethApy[1]).div(10000).toString(),
+        wsETH: new decimal_js_1.default(wsETHApy[1]).div(10000).toString(),
+        rETH: new decimal_js_1.default(rETHApy[1]).div(10000).toString(),
+    };
+    const spApy = calculateSPApy(spMarketRes, spAPYs);
+    return {
+        spApy,
+        yBoldApy,
+        totalBoldDepositedSBold: (0, tokens_1.assetAmountInEth)(sBoldTotalAssets.toString(), 'sBOLD'),
+        boldRateSBold: (0, tokens_1.assetAmountInEth)(sBoldConvertToShares.toString(), 'sBOLD'),
+        maxWithdrawSBold: (0, tokens_1.assetAmountInEth)(sBoldMaxWithdraw.toString(), 'sBOLD'),
+        totalBoldDepositedYBold: (0, tokens_1.assetAmountInEth)(yBoldTotalAssets.toString(), 'yBOLD'),
+        boldRateYBold: (0, tokens_1.assetAmountInEth)(stYBoldConvertToShares.toString(), 'yBOLD'),
+        maxWithdrawYBold: (0, tokens_1.assetAmountInEth)(yBoldMaxWithdraw.toString(), 'yBOLD'),
+        sBoldBalance: (0, tokens_1.assetAmountInEth)(sBoldBalance.toString(), 'sBOLD'),
+        yBoldBalance: (0, tokens_1.assetAmountInEth)(yBoldBalance.toString(), 'yBOLD'),
+        stYBoldBalance: (0, tokens_1.assetAmountInEth)(stYBoldBalance.toString(), 'yBOLD'),
+    };
+});
+exports.getLiquitySAndYBold = getLiquitySAndYBold;

package/cjs/morphoBlue/index.js

@@ -168,15 +168,16 @@ 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: '0',
+            supplied: loanTokenSupplied,
             borrowed: loanTokenBorrowed,
-            isSupplied: false,
+            isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
             isBorrowed: new decimal_js_1.default(loanInfo.borrowedInAssets.toString()).gt(0),
             collateral: false,
-            suppliedUsd: '0',
+            suppliedUsd: new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
             borrowedUsd: new decimal_js_1.default(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
         };
         const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];