@panoptic-eng/sdk 1.0.69 → 1.0.71

package/dist/index.js

@@ -29,8 +29,16 @@ const providerAbi$1 = parseAbi(["function getPoolDataProvider() view returns (ad
 const dataAbi = parseAbi([
 	"function getAllReservesTokens() view returns ((string symbol, address tokenAddress)[])",
 	"function getAllATokens() view returns ((string symbol, address tokenAddress)[])",
-	"function getUserReserveData(address asset, address user) view returns (uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint40,bool)"
+	"function getUserReserveData(address asset, address user) view returns (uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint40,bool)",
+	"function getReserveData(address asset) view returns (uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint40)"
 ]);
+const RAY = 10n ** 27n;
+const SECONDS_PER_YEAR$4 = 31536e3;
+/** Aave rates are per-second-compounded APRs in ray; convert to an APY in percent. */
+function rayAprToApyPct(rate) {
+	const apr = Number(rate * 1000000n / RAY) / 1e6;
+	return ((1 + apr / SECONDS_PER_YEAR$4) ** SECONDS_PER_YEAR$4 - 1) * 100;
+}
 const oracleAbi$1 = parseAbi(["function BASE_CURRENCY_UNIT() view returns (uint256)", "function getAssetPrice(address asset) view returns (uint256)"]);
 /** Reads accrued Aave V3 balances and oracle prices at a single block. */
 async function getAaveHoldings({ client, provider: provider$1, account }) {
@@ -79,28 +87,39 @@ async function getAaveHoldings({ client, provider: provider$1, account }) {
 			args: [reserve.tokenAddress, account]
 		}))
 	});
-	const balances = rawBalances.map(([supplied, stableDebt, variableDebt]) => [
+	const balances = rawBalances.map(([supplied, stableDebt, variableDebt, , , stableBorrowRate]) => [
 		normalizeUnsignedBigInt(supplied),
 		normalizeUnsignedBigInt(stableDebt),
-		normalizeUnsignedBigInt(variableDebt)
+		normalizeUnsignedBigInt(variableDebt),
+		normalizeUnsignedBigInt(stableBorrowRate)
 	]);
 	const holdings = await Promise.all(reserves.flatMap((reserve, i) => {
-		const [supplied, stableDebt, variableDebt] = balances[i];
+		const [supplied, stableDebt, variableDebt, stableBorrowRate] = balances[i];
 		const debt = stableDebt + variableDebt;
 		if (supplied === 0n && debt === 0n) return [];
 		return [(async () => {
-			const [rawDecimals, rawPrice] = await Promise.all([client.readContract({
-				address: reserve.tokenAddress,
-				abi: erc20Abi,
-				functionName: "decimals",
-				blockNumber
-			}), client.readContract({
-				address: oracle,
-				abi: oracleAbi$1,
-				functionName: "getAssetPrice",
-				args: [reserve.tokenAddress],
-				blockNumber
-			})]);
+			const [rawDecimals, rawPrice, reserveData] = await Promise.all([
+				client.readContract({
+					address: reserve.tokenAddress,
+					abi: erc20Abi,
+					functionName: "decimals",
+					blockNumber
+				}),
+				client.readContract({
+					address: oracle,
+					abi: oracleAbi$1,
+					functionName: "getAssetPrice",
+					args: [reserve.tokenAddress],
+					blockNumber
+				}),
+				client.readContract({
+					address: dataProvider,
+					abi: dataAbi,
+					functionName: "getReserveData",
+					args: [reserve.tokenAddress],
+					blockNumber
+				})
+			]);
 			const decimals = normalizeTokenDecimals(rawDecimals);
 			const price = normalizeUnsignedBigInt(rawPrice);
 			return {
@@ -110,7 +129,15 @@ async function getAaveHoldings({ client, provider: provider$1, account }) {
 				supplied,
 				debt,
 				price,
-				priceUnit
+				priceUnit,
+				supplyApyPct: rayAprToApyPct(normalizeUnsignedBigInt(reserveData[5])),
+				borrowApyPct: (() => {
+					const variableApy = rayAprToApyPct(normalizeUnsignedBigInt(reserveData[6]));
+					if (stableDebt === 0n) return variableApy;
+					const stableApy = rayAprToApyPct(stableBorrowRate);
+					const stableWeight = Number(stableDebt * 1000000n / debt) / 1e6;
+					return stableApy * stableWeight + variableApy * (1 - stableWeight);
+				})()
 			};
 		})()];
 	}));
@@ -134,7 +161,11 @@ const responseSchema = z.object({ data: z.object({ marketPositions: z.object({ i
 	market: z.object({
 		marketId: z.string(),
 		loanAsset: asset,
-		collateralAsset: asset.nullable()
+		collateralAsset: asset.nullable(),
+		state: z.object({
+			supplyApy: z.number().finite().nullable(),
+			borrowApy: z.number().finite().nullable()
+		}).nullable().optional()
 	}),
 	state: z.object({
 		supplyAssets: amount,
@@ -154,7 +185,8 @@ async function getMorphoHoldings(account, chainId) {
 				query: `query Positions($account: [String!], $chains: [Int!], $skip: Int!) {
           marketPositions(first: 100, skip: $skip, where: {userAddress_in: $account, chainId_in: $chains}) {
             items { market { marketId loanAsset { address symbol decimals price { usd } }
-              collateralAsset { address symbol decimals price { usd } } }
+              collateralAsset { address symbol decimals price { usd } }
+              state { supplyApy borrowApy } }
               state { supplyAssets borrowAssets collateral } }
           }
         }`,
@@ -170,21 +202,25 @@ async function getMorphoHoldings(account, chainId) {
 		if (typeof body === "object" && body !== null && "errors" in body) throw new Error("Morpho query failed");
 		const items = responseSchema.parse(body).data.marketPositions.items;
 		for (const { market, state } of items) {
+			const pct = (apy) => apy == null ? null : apy * 100;
 			const legs = [
 				{
 					token: market.loanAsset,
 					amount: state.supplyAssets,
-					kind: "supply"
+					kind: "supply",
+					apyPct: pct(market.state?.supplyApy)
 				},
 				{
 					token: market.loanAsset,
 					amount: -state.borrowAssets,
-					kind: "debt"
+					kind: "debt",
+					apyPct: pct(market.state?.borrowApy)
 				},
 				{
 					token: market.collateralAsset,
 					amount: state.collateral,
-					kind: "collateral"
+					kind: "collateral",
+					apyPct: 0
 				}
 			];
 			for (const leg of legs) {
@@ -194,6 +230,7 @@ async function getMorphoHoldings(account, chainId) {
 					...leg.token,
 					amount: leg.amount,
 					kind: leg.kind,
+					apyPct: leg.apyPct,
 					marketId: market.marketId,
 					priceUsd: leg.token.price?.usd?.toString() ?? null
 				});