@1delta/margin-fetcher 0.0.215 → 0.0.216

package/dist/index.js

@@ -17893,7 +17893,7 @@ var getEulerV2ReservesDataConverter = (lender, chainId, prices, additionalYields
 };
 
 // src/lending/public-data/aave-v4-type/publicCallBuild.ts
-var CALLS_PER_RESERVE = 6;
+var BASE_CALLS_PER_RESERVE = 5;
 var CALLS_PER_SPOKE_TAIL = 2;
 function isValidAddress(addr) {
   return !!addr && addr !== "0x" && addr.length > 2;
@@ -17901,6 +17901,10 @@ function isValidAddress(addr) {
 function getSpokeReserves(reservesMap, spokeAddr) {
   return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
 }
+function getDynamicConfigCount(spokeEntry) {
+  const max = spokeEntry.dynamicConfigKeyMax ?? 0;
+  return max + 1;
+}
 var buildAaveV4LenderReserveCall = (chainId, lender) => {
   const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
@@ -17912,6 +17916,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
     if (!isValidAddress(spokeEntry.spoke)) continue;
     const spokeAddr = spokeEntry.spoke;
     const reserves = getSpokeReserves(reservesMap, spokeAddr);
+    const dynConfigCount = getDynamicConfigCount(spokeEntry);
     for (const entry of reserves) {
       const rid = typeof entry === "number" ? entry : entry.reserveId;
       calls.push(
@@ -17939,13 +17944,15 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
           address: spokeAddr,
           name: "getReserveTotalDebt",
           params: [rid]
-        },
-        {
-          address: spokeAddr,
-          name: "getDynamicReserveConfig",
-          params: [rid, 0]
         }
       );
+      for (let key = 0; key < dynConfigCount; key++) {
+        calls.push({
+          address: spokeAddr,
+          name: "getDynamicReserveConfig",
+          params: [rid, key]
+        });
+      }
       if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
         const hubLc = spokeEntry.hub.toLowerCase();
         const key = `${hubLc}:${entry.assetId}`;
@@ -18020,7 +18027,8 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
       reservesMap,
       spokeEntry.spoke
     );
-    count += reserves.length * CALLS_PER_RESERVE + CALLS_PER_SPOKE_TAIL;
+    const dynConfigCount = getDynamicConfigCount(spokeEntry);
+    count += reserves.length * (BASE_CALLS_PER_RESERVE + dynConfigCount) + CALLS_PER_SPOKE_TAIL;
     const rids = reserves.map(
       (e) => typeof e === "number" ? e : e.reserveId
     );
@@ -18029,7 +18037,9 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
     }
     for (const entry of reserves) {
       if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
-        hubAssetKeys.add(`${spokeEntry.hub.toLowerCase()}:${entry.assetId}`);
+        hubAssetKeys.add(
+          `${spokeEntry.hub.toLowerCase()}:${entry.assetId}`
+        );
       }
     }
   }
@@ -18208,18 +18218,35 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
       if (!isValidAddress2(spokeEntry.spoke)) continue;
       const spokeAddr = spokeEntry.spoke;
       const reserves = getSpokeReserves2(reservesMap, spokeAddr);
-      const reserveCount = reserves.length;
+      const dynConfigCount = (spokeEntry.dynamicConfigKeyMax ?? 0) + 1;
       const parsedReserves = [];
-      for (let i = 0; i < reserveCount; i++) {
+      for (let i = 0; i < reserves.length; i++) {
         const entry = reserves[i];
         const reserveId = typeof entry === "number" ? entry : entry.reserveId;
-        const baseIdx = offset + i * CALLS_PER_RESERVE;
-        const rawReserve = data[baseIdx];
-        const rawConfig = data[baseIdx + 1];
-        const rawSupplied = data[baseIdx + 2];
-        const rawDebt = data[baseIdx + 3];
-        const rawTotalDebt = data[baseIdx + 4];
-        const rawDynConfig = data[baseIdx + 5];
+        const rawReserve = data[offset];
+        const rawConfig = data[offset + 1];
+        const rawSupplied = data[offset + 2];
+        const rawDebt = data[offset + 3];
+        const rawTotalDebt = data[offset + 4];
+        offset += BASE_CALLS_PER_RESERVE;
+        const dynamicConfigs = {};
+        for (let key = 0; key < dynConfigCount; key++) {
+          const rawDynConfig = data[offset];
+          offset += 1;
+          if (rawDynConfig && rawDynConfig !== "0x") {
+            dynamicConfigs[key] = {
+              collateralFactor: Number(
+                rawDynConfig?.collateralFactor ?? 0
+              ),
+              maxLiquidationBonus: Number(
+                rawDynConfig?.maxLiquidationBonus ?? 0
+              ),
+              liquidationFee: Number(
+                rawDynConfig?.liquidationFee ?? 0
+              )
+            };
+          }
+        }
         const reserve = {
           underlying: rawReserve?.underlying ?? "",
           hub: rawReserve?.hub ?? "",
@@ -18248,20 +18275,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         } else {
           drawnDebt = BigInt(rawDebt ?? 0);
         }
-        const dynamicConfigs = {};
-        if (rawDynConfig && rawDynConfig !== "0x") {
-          dynamicConfigs[0] = {
-            collateralFactor: Number(
-              rawDynConfig?.collateralFactor ?? 0
-            ),
-            maxLiquidationBonus: Number(
-              rawDynConfig?.maxLiquidationBonus ?? 0
-            ),
-            liquidationFee: Number(
-              rawDynConfig?.liquidationFee ?? 0
-            )
-          };
-        }
         if (spokeEntry.hub && typeof entry === "object" && entry.assetId !== void 0) {
           const hubLc = spokeEntry.hub.toLowerCase();
           const key = `${hubLc}:${entry.assetId}`;
@@ -18286,7 +18299,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
           price: 0n
         });
       }
-      offset += reserveCount * CALLS_PER_RESERVE;
       const rawLiqConfig = data[offset];
       const rawOracle = data[offset + 1];
       offset += CALLS_PER_SPOKE_TAIL;
@@ -19042,7 +19054,7 @@ var buildEulerUserCall = async (chainId, lender, account, subAccountIndexes) =>
 };
 
 // src/lending/user-data/aave-v4-type/userCallBuild.ts
-var USER_CALLS_PER_RESERVE = 3;
+var USER_CALLS_PER_RESERVE = 4;
 var buildAaveV4UserCall = (chainId, lender, account) => {
   const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
@@ -19069,6 +19081,11 @@ var buildAaveV4UserCall = (chainId, lender, account) => {
           address: spokeAddr,
           name: "getUserReserveStatus",
           params: [rid, account]
+        },
+        {
+          address: spokeAddr,
+          name: "getUserPosition",
+          params: [rid, account]
         }
       );
     }
@@ -20237,21 +20254,230 @@ var getEulerUserDataConverter = (lender, chainId, account, metaMap, subAccountIn
   ];
 };
 
+// src/lending/user-data/aave-v4-type/createAaveV4UserState.ts
+function resolveV4Config(configs, userConfigKey) {
+  if (!configs) return { config: void 0, spokeAddr: void 0 };
+  if (userConfigKey && configs[userConfigKey]) {
+    return {
+      config: configs[userConfigKey],
+      spokeAddr: userConfigKey.split(":")[0]
+    };
+  }
+  const entries = Object.entries(configs);
+  if (entries.length === 0) return { config: void 0, spokeAddr: void 0 };
+  const [key, config] = entries[0];
+  const spokeAddr = key.split(":")[0];
+  return { config, spokeAddr };
+}
+function getConfigScopedPrice(meta, spokeAddr, configPriceMap) {
+  return getOraclePrice(meta);
+}
+function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0, configPriceMap) {
+  const assetKeys = getMarketUidsFromMeta(lenderData);
+  const { chainId, account } = payload;
+  let depositInterest = 0;
+  let borrowInterest = 0;
+  let rewardDepositAccrual = 0;
+  let rewardBorrowAccrual = 0;
+  let stakingDepositAccrual = 0;
+  let stakingBorrowAccrual = 0;
+  let deposits = 0;
+  let debt = 0;
+  let oracleDebt = 0;
+  let collateral = 0;
+  let borrowDiscountedCollateral = 0;
+  let borrowDiscountedCollateralAllActive = 0;
+  let collateralAllActive = 0;
+  let rewardsPerAsset = {};
+  for (const marketUid of assetKeys) {
+    if (!lenderData?.[marketUid] || !payload.lendingPositions[marketUid])
+      continue;
+    const pos = payload.lendingPositions[marketUid];
+    const { depositsUSD, debtStableUSD, debtUSD, collateralEnabled } = pos;
+    const depositsUSDOracle = pos.depositsUSDOracle ?? depositsUSD;
+    const debtUSDOracle = pos.debtUSDOracle ?? debtUSD;
+    const {
+      depositRate,
+      intrinsicYield,
+      variableBorrowRate,
+      stableBorrowRate,
+      rewards,
+      flags,
+      configs
+    } = lenderData[marketUid];
+    const { config: userConfigForAsset } = resolveV4Config(
+      configs,
+      pos.userConfigKey
+    );
+    deposits += depositsUSD;
+    debt += debtUSD + (debtStableUSD ?? 0);
+    oracleDebt += debtUSDOracle + (pos.debtStableUSDOracle ?? debtStableUSD ?? 0);
+    (rewards ?? []).forEach((rewardData) => {
+      const key = rewardData.asset;
+      rewardDepositAccrual += rewardData.depositRate * depositsUSD;
+      rewardBorrowAccrual += rewardData.variableBorrowRate * debtUSD;
+      const rewDepo = rewardData.depositRate * depositsUSD;
+      const rewDebt = rewardData.variableBorrowRate * debtUSD;
+      if (!rewardsPerAsset[key])
+        rewardsPerAsset[key] = { depositApr: 0, borrowApr: 0 };
+      if (rewDepo > 0) rewardsPerAsset[key].depositApr += rewDepo;
+      if (rewDebt > 0) rewardsPerAsset[key].borrowApr += rewDebt;
+    });
+    stakingDepositAccrual += (intrinsicYield ?? 0) * depositsUSD;
+    stakingBorrowAccrual += (intrinsicYield ?? 0) * debtUSD;
+    if (flags?.collateralActive || userConfigForAsset && !userConfigForAsset.collateralDisabled) {
+      if (collateralEnabled) {
+        collateral += (userConfigForAsset?.collateralFactor ?? 1) * depositsUSDOracle;
+        borrowDiscountedCollateral += (userConfigForAsset?.borrowCollateralFactor ?? 1) * depositsUSDOracle;
+      }
+      borrowDiscountedCollateralAllActive += (userConfigForAsset?.borrowCollateralFactor ?? 1) * depositsUSDOracle;
+      collateralAllActive += (userConfigForAsset?.collateralFactor ?? 1) * depositsUSDOracle;
+    }
+    depositInterest += (depositRate ?? 0) * depositsUSD;
+    borrowInterest += debtUSD * (variableBorrowRate ?? 0) + (debtStableUSD ?? 0) * (stableBorrowRate ?? 0);
+  }
+  const nav = deposits - debt;
+  const balanceData2 = {
+    borrowDiscountedCollateral,
+    borrowDiscountedCollateralAllActive,
+    collateral,
+    collateralAllActive,
+    deposits,
+    debt,
+    adjustedDebt: oracleDebt,
+    nav,
+    deposits24h: totalDeposits24h,
+    debt24h: totalDebt24h,
+    nav24h: totalDeposits24h - totalDebt24h,
+    ...payload.rewards ? { rewards: payload.rewards } : {}
+  };
+  const aprData2 = {
+    apr: safeDivide(depositInterest - borrowInterest, nav),
+    borrowApr: safeDivide(borrowInterest, debt),
+    depositApr: safeDivide(depositInterest, deposits),
+    rewards: divideAccrualsToAprs(rewardsPerAsset, nav, deposits, debt),
+    rewardApr: safeDivide(rewardDepositAccrual + rewardBorrowAccrual, nav),
+    rewardDepositApr: safeDivide(rewardDepositAccrual, deposits),
+    rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
+    intrinsicApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
+    intrinsicDepositApr: safeDivide(stakingDepositAccrual, deposits),
+    intrinsicBorrowApr: safeDivide(stakingBorrowAccrual, debt)
+  };
+  const userConfig = {
+    selectedMode: "0",
+    id: account,
+    isWhitelisted: true
+  };
+  const creditLine = Math.max(
+    0,
+    borrowDiscountedCollateral - balanceData2.adjustedDebt
+  );
+  for (const marketUid of assetKeys) {
+    if (!lenderData?.[marketUid]) continue;
+    const meta = lenderData[marketUid];
+    const { configs, flags, borrowLiquidity, withdrawLiquidity } = meta;
+    const pos = payload.lendingPositions[marketUid];
+    const { config, spokeAddr } = resolveV4Config(
+      configs,
+      pos ? pos.userConfigKey : void 0
+    );
+    const price = getConfigScopedPrice(meta);
+    const bcf = config?.borrowCollateralFactor ?? 1;
+    const bf = config?.borrowFactor ?? 1;
+    if (pos) {
+      let withdrawable;
+      if (!pos.collateralEnabled || config?.collateralDisabled) {
+        withdrawable = String(pos.deposits);
+      } else if (balanceData2.debt === 0) {
+        withdrawable = String(pos.deposits);
+      } else {
+        const withdrawableUSD = Math.max(creditLine / bcf, 0);
+        withdrawable = String(
+          Math.min(withdrawableUSD / price, Number(pos.deposits))
+        );
+      }
+      if (withdrawLiquidity != null) {
+        withdrawable = String(Math.min(Number(withdrawable), withdrawLiquidity));
+      }
+      let borrowable;
+      if (!flags?.borrowingEnabled || flags?.isFrozen || config?.debtDisabled) {
+        borrowable = "0";
+      } else {
+        const borrowableUSD = Math.max(creditLine / bf, 0);
+        borrowable = String(borrowableUSD / price);
+      }
+      if (borrowLiquidity != null) {
+        borrowable = String(Math.min(Number(borrowable), borrowLiquidity));
+      }
+      pos.withdrawable = withdrawable;
+      pos.borrowable = borrowable;
+      pos.underlyingInfo = buildUnderlyingInfo(meta);
+    } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled) {
+      let borrowable = String(Math.max(creditLine / bf, 0) / price);
+      if (borrowLiquidity != null) {
+        borrowable = String(Math.min(Number(borrowable), borrowLiquidity));
+      }
+      payload.lendingPositions[marketUid] = {
+        marketUid,
+        deposits: "0",
+        debt: "0",
+        debtStable: "0",
+        depositsUSD: 0,
+        debtUSD: 0,
+        debtStableUSD: 0,
+        collateralEnabled: false,
+        claimableRewards: 0,
+        withdrawable: "0",
+        borrowable,
+        underlyingInfo: buildUnderlyingInfo(meta)
+      };
+    }
+  }
+  return {
+    lender: "",
+    account,
+    chainId,
+    data: [
+      {
+        health: balanceData2.debt === 0 ? null : balanceData2.adjustedDebt > 0 ? balanceData2.collateral / balanceData2.adjustedDebt : balanceData2.collateral / balanceData2.debt,
+        borrowCapacityUSD: creditLine,
+        accountId: "0",
+        balanceData: balanceData2,
+        aprData: aprData2,
+        userConfig,
+        positions: Object.values(payload.lendingPositions)
+      }
+    ]
+  };
+}
+
 // src/lending/user-data/aave-v4-type/userCallParse.ts
 var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
   const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
+  const oracleEntries = aaveV4Oracles()?.[lender]?.[chainId] ?? [];
+  const spokeReserveToUnderlying = /* @__PURE__ */ new Map();
+  for (const oe of oracleEntries) {
+    if (oe.underlying && oe.spoke) {
+      spokeReserveToUnderlying.set(
+        `${oe.spoke.toLowerCase()}:${oe.reserveId}`,
+        oe.underlying.toLowerCase()
+      );
+    }
+  }
   const reserveEntries = [];
   for (const spokeEntry of spokes) {
     const spokeAddr = spokeEntry.spoke;
     if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
     const reserves = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
     for (const entry of reserves) {
+      const rid = typeof entry === "number" ? entry : entry.reserveId;
+      const underlying = ((typeof entry === "object" ? entry.underlying : void 0) ?? spokeReserveToUnderlying.get(`${spokeAddr.toLowerCase()}:${rid}`) ?? "").toLowerCase();
       reserveEntries.push({
         spokeAddr,
-        reserveId: typeof entry === "number" ? entry : entry.reserveId,
+        reserveId: rid,
         hub: (spokeEntry.hub ?? "").toLowerCase(),
-        underlying: (typeof entry === "object" ? entry.underlying ?? "" : "").toLowerCase()
+        underlying
       });
     }
   }
@@ -20262,12 +20488,23 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
         return void 0;
       }
       const lendingPositions = {};
+      const underlyingToUid = /* @__PURE__ */ new Map();
+      if (metaMap) {
+        for (const [uid, meta] of Object.entries(metaMap)) {
+          const addr = (meta?.underlying ?? "").toLowerCase();
+          if (addr) underlyingToUid.set(addr, uid);
+        }
+      }
       let totalDebt24h = 0;
       let totalDeposits24h = 0;
       for (let i = 0; i < reserveEntries.length; i++) {
-        const { hub, underlying } = reserveEntries[i];
-        const refAddress = `${hub}:${underlying}`;
-        const key = createMarketUid(chainId, lender, refAddress);
+        const { hub, underlying, spokeAddr } = reserveEntries[i];
+        let key;
+        if (hub) {
+          key = createMarketUid(chainId, lender, `${hub}:${underlying}`);
+        } else {
+          key = underlyingToUid.get(underlying) ?? createMarketUid(chainId, lender, `:${underlying}`);
+        }
         const metaEntity = metaMap?.[key];
         if (!metaEntity) continue;
         const base = i * USER_CALLS_PER_RESERVE;
@@ -20278,6 +20515,11 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
           metaEntity
         );
         if (!dataForAsset) continue;
+        const userPositionResult = data[base + 3];
+        const userDynConfigKey = Number(
+          userPositionResult?.dynamicConfigKey ?? 0
+        );
+        dataForAsset.userConfigKey = `${spokeAddr.toLowerCase()}:${userDynConfigKey}`;
         totalDebt24h += addedDebt;
         totalDeposits24h += addedDeposits;
         lendingPositions[key] = dataForAsset;
@@ -20286,10 +20528,8 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
         chainId,
         account,
         lendingPositions,
-        rewards: [],
-        userEMode: 0
-      };
-      const userData = createBaseTypeUserState(
+        rewards: []};
+      const userData = createAaveV4UserState(
         payload,
         metaMap,
         totalDeposits24h,