@1delta/margin-fetcher 0.0.214 → 0.0.215

package/dist/index.d.ts

@@ -13,7 +13,7 @@ export { computeEModeAnalysis } from './lending/margin/e-mode';
 export type { EModeResult, EModeAssets } from './lending/margin/e-mode';
 export type { LoopPostTradeMetrics, LendingMode } from './lending/margin/loop';
 export type { SumerPositionInput, GroupAccumulator, } from './lending/margin/base';
-export type { LenderYieldComplete, LenderCrossPoolMeta, LenderToLenderCrossPoolMeta, CompoundV2Metadata, AaveMetadata, InitMetadata, EulerV2Metadata, ProtocolParams, } from './lending/user-data/utils/types';
+export type { LenderYieldComplete, LenderCrossPoolMeta, LenderToLenderCrossPoolMeta, CompoundV2Metadata, AaveMetadata, AaveV4Metadata, InitMetadata, EulerV2Metadata, ProtocolParams, } from './lending/user-data/utils/types';
 export { computeSumerWaterfall, buildSumerAccumulators, applyPositionDelta, } from './lending/margin/base/sumer/waterfall';
 export { computeSumerDepositDelta, computeSumerWithdrawDelta, computeSumerBorrowDelta, computeSumerRepayDelta, } from './lending/margin/base/sumer';
 export { fetchEulerSubAccountIndexes, getSubAccountAddress, getSubAccountIndex, } from './lending/user-data/euler/userCallBuild';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,6BAA6B,EAC7B,KAAK,wBAAwB,EAC7B,qBAAqB,EACrB,iBAAiB,EACjB,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,4BAA4B,EAC5B,KAAK,6BAA6B,EAClC,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,sBAAsB,EACtB,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,WAAW,EACX,6BAA6B,EAC7B,4BAA4B,EAC5B,mBAAmB,EACnB,+BAA+B,EAC/B,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,4BAA4B,EAE5B,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EAEnB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EAEnB,wBAAwB,EACxB,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,WAAW,CAAA;AAClB,OAAO,EACL,KAAK,WAAW,EAChB,oBAAoB,EACpB,WAAW,GACZ,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,KAAK,YAAY,EACjB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AAC5E,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,WAAW,EAChB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,cAAc,GACpB,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,MAAM,EACN,aAAa,EACb,UAAU,EACV,aAAa,EACb,eAAe,GAChB,MAAM,SAAS,CAAA;AAChB,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,SAAS,EACd,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,EAClC,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,OAAO,EACZ,KAAK,uBAAuB,EAC5B,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,WAAW,GACjB,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,uBAAuB,EACvB,aAAa,GACd,MAAM,uBAAuB,CAAA;AAC9B,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,KAAK,EACL,YAAY,EACZ,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,0BAA0B,EAC1B,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACvE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAG9E,YAAY,EACV,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,uBAAuB,CAAA;AAC9B,YAAY,EACV,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,GACf,MAAM,iCAAiC,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,yCAAyC,CAAA;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,iBAAiB,EACjB,sBAAsB,EACtB,aAAa,GACd,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,KAAK,cAAc,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EACL,kBAAkB,EAClB,KAAK,UAAU,EAEf,2BAA2B,EAC3B,uBAAuB,EACvB,kBAAkB,EAClB,4BAA4B,EAC5B,yBAAyB,EACzB,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,4BAA4B,GAClC,MAAM,SAAS,CAAA"}

package/dist/index.js

@@ -17895,8 +17895,8 @@ var getEulerV2ReservesDataConverter = (lender, chainId, prices, additionalYields
 // src/lending/public-data/aave-v4-type/publicCallBuild.ts
 var CALLS_PER_RESERVE = 6;
 var CALLS_PER_SPOKE_TAIL = 2;
-function hasValidOracle(oracle) {
-  return !!oracle && oracle !== "0x" && oracle.length > 2;
+function isValidAddress(addr) {
+  return !!addr && addr !== "0x" && addr.length > 2;
 }
 function getSpokeReserves(reservesMap, spokeAddr) {
   return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
@@ -17909,6 +17909,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
   const hubAssetKeys = /* @__PURE__ */ new Set();
   const hubAssetList = [];
   for (const spokeEntry of spokes) {
+    if (!isValidAddress(spokeEntry.spoke)) continue;
     const spokeAddr = spokeEntry.spoke;
     const reserves = getSpokeReserves(reservesMap, spokeAddr);
     for (const entry of reserves) {
@@ -17946,11 +17947,12 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
         }
       );
       if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
-        const key = `${spokeEntry.hub}:${entry.assetId}`;
+        const hubLc = spokeEntry.hub.toLowerCase();
+        const key = `${hubLc}:${entry.assetId}`;
         if (!hubAssetKeys.has(key)) {
           hubAssetKeys.add(key);
           hubAssetList.push({
-            hub: spokeEntry.hub,
+            hub: hubLc,
             assetId: entry.assetId
           });
         }
@@ -17970,6 +17972,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
     );
   }
   for (const spokeEntry of spokes) {
+    if (!isValidAddress(spokeEntry.spoke)) continue;
     const reserves = getSpokeReserves(
       reservesMap,
       spokeEntry.spoke
@@ -17977,7 +17980,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
     const rids = reserves.map(
       (e) => typeof e === "number" ? e : e.reserveId
     );
-    if (rids.length > 0 && hasValidOracle(spokeEntry.oracle)) {
+    if (rids.length > 0 && isValidAddress(spokeEntry.oracle)) {
       calls.push({
         address: spokeEntry.oracle,
         name: "getReservesPrices",
@@ -18012,6 +18015,7 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
   let count = 0;
   const hubAssetKeys = /* @__PURE__ */ new Set();
   for (const spokeEntry of spokes) {
+    if (!isValidAddress(spokeEntry.spoke)) continue;
     const reserves = getSpokeReserves(
       reservesMap,
       spokeEntry.spoke
@@ -18020,12 +18024,12 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
     const rids = reserves.map(
       (e) => typeof e === "number" ? e : e.reserveId
     );
-    if (rids.length > 0 && hasValidOracle(spokeEntry.oracle)) {
+    if (rids.length > 0 && isValidAddress(spokeEntry.oracle)) {
       count += 1;
     }
     for (const entry of reserves) {
       if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
-        hubAssetKeys.add(`${spokeEntry.hub}:${entry.assetId}`);
+        hubAssetKeys.add(`${spokeEntry.hub.toLowerCase()}:${entry.assetId}`);
       }
     }
   }
@@ -18073,7 +18077,8 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
     for (const reserve of spokeReserves) {
       const underlying = reserve.reserve.underlying.toLowerCase();
       const decimals = reserve.reserve.decimals;
-      const refAddress = `${spokeAddr}:${reserve.reserveId}`;
+      const hubAddr = reserve.reserve.hub.toLowerCase();
+      const refAddress = `${hubAddr}:${underlying}`;
       const marketUid = createMarketUidFn(chainId, lender, refAddress);
       const assetMeta = tokenList[underlying];
       const oracleKey = toOracleKeyFn(assetMeta?.assetGroup ?? null) ?? toGenericPriceKeyFn(underlying, chainId);
@@ -18183,8 +18188,8 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
 }
 
 // src/lending/public-data/aave-v4-type/publicCallParse.ts
-function hasValidOracle2(oracle) {
-  return !!oracle && oracle !== "0x" && oracle.length > 2;
+function isValidAddress2(addr) {
+  return !!addr && addr !== "0x" && addr.length > 2;
 }
 function getSpokeReserves2(reservesMap, spokeAddr) {
   return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
@@ -18200,6 +18205,7 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
     const hubAssetKeys = /* @__PURE__ */ new Set();
     const hubAssetList = [];
     for (const spokeEntry of spokes) {
+      if (!isValidAddress2(spokeEntry.spoke)) continue;
       const spokeAddr = spokeEntry.spoke;
       const reserves = getSpokeReserves2(reservesMap, spokeAddr);
       const reserveCount = reserves.length;
@@ -18257,11 +18263,12 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
           };
         }
         if (spokeEntry.hub && typeof entry === "object" && entry.assetId !== void 0) {
-          const key = `${spokeEntry.hub}:${entry.assetId}`;
+          const hubLc = spokeEntry.hub.toLowerCase();
+          const key = `${hubLc}:${entry.assetId}`;
           if (!hubAssetKeys.has(key)) {
             hubAssetKeys.add(key);
             hubAssetList.push({
-              hub: spokeEntry.hub,
+              hub: hubLc,
               assetId: entry.assetId
             });
           }
@@ -18303,23 +18310,19 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         reserves: parsedReserves
       });
     }
-    for (let si = 0; si < spokes.length; si++) {
-      const reserves = getSpokeReserves2(
-        reservesMap,
-        spokes[si].spoke
-      );
+    for (let si = 0; si < spokeDataList.length; si++) {
+      const sd = spokeDataList[si];
+      const reserves = getSpokeReserves2(reservesMap, sd.spoke);
       const rids = reserves.map(
         (e) => typeof e === "number" ? e : e.reserveId
       );
-      if (rids.length > 0 && hasValidOracle2(spokes[si].oracle)) {
+      if (rids.length > 0 && isValidAddress2(sd.oracle)) {
         const rawPrices = data[offset];
         offset += 1;
         const priceArray = Array.isArray(rawPrices) ? rawPrices : [];
-        for (let ri = 0; ri < spokeDataList[si].reserves.length; ri++) {
+        for (let ri = 0; ri < sd.reserves.length; ri++) {
           if (ri < priceArray.length) {
-            spokeDataList[si].reserves[ri].price = BigInt(
-              priceArray[ri] ?? 0
-            );
+            sd.reserves[ri].price = BigInt(priceArray[ri] ?? 0);
           }
         }
       }
@@ -19047,6 +19050,7 @@ var buildAaveV4UserCall = (chainId, lender, account) => {
   const calls = [];
   for (const spokeEntry of spokes) {
     const spokeAddr = spokeEntry.spoke;
+    if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
     const reserveIds = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
     for (const entry of reserveIds) {
       const rid = typeof entry === "number" ? entry : entry.reserveId;
@@ -20240,10 +20244,15 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
   const reserveEntries = [];
   for (const spokeEntry of spokes) {
     const spokeAddr = spokeEntry.spoke;
-    const reserveIds = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
-    for (const entry of reserveIds) {
-      const rid = typeof entry === "number" ? entry : entry.reserveId;
-      reserveEntries.push({ spokeAddr, reserveId: rid });
+    if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
+    const reserves = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+    for (const entry of reserves) {
+      reserveEntries.push({
+        spokeAddr,
+        reserveId: typeof entry === "number" ? entry : entry.reserveId,
+        hub: (spokeEntry.hub ?? "").toLowerCase(),
+        underlying: (typeof entry === "object" ? entry.underlying ?? "" : "").toLowerCase()
+      });
     }
   }
   const expectedNumberOfCalls = reserveEntries.length * USER_CALLS_PER_RESERVE;
@@ -20256,8 +20265,8 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
       let totalDebt24h = 0;
       let totalDeposits24h = 0;
       for (let i = 0; i < reserveEntries.length; i++) {
-        const { spokeAddr, reserveId } = reserveEntries[i];
-        const refAddress = `${spokeAddr.toLowerCase()}:${reserveId}`;
+        const { hub, underlying } = reserveEntries[i];
+        const refAddress = `${hub}:${underlying}`;
         const key = createMarketUid(chainId, lender, refAddress);
         const metaEntity = metaMap?.[key];
         if (!metaEntity) continue;
@@ -31877,10 +31886,15 @@ var eulerV2Fetcher = {
 };
 function getAaveV4OracleGroups(chainId) {
   const oracles = aaveV4Oracles() ?? {};
+  const spokes = aaveV4Spokes() ?? {};
   const groups = [];
   for (const [fork, chains] of Object.entries(oracles)) {
     const oracleEntries = chains[chainId] ?? [];
     if (oracleEntries.length === 0) continue;
+    const spokeToHub = /* @__PURE__ */ new Map();
+    for (const s of spokes[fork]?.[chainId] ?? []) {
+      if (s.hub) spokeToHub.set(s.spoke.toLowerCase(), s.hub.toLowerCase());
+    }
     const byOracle = /* @__PURE__ */ new Map();
     for (const entry of oracleEntries) {
       if (!entry.oracle || entry.oracle === "0x") continue;
@@ -31890,10 +31904,13 @@ function getAaveV4OracleGroups(chainId) {
         group = { decimals: entry.decimals ?? 8, entries: [] };
         byOracle.set(key, group);
       }
+      const spokeLc = entry.spoke.toLowerCase();
+      const hub = spokeToHub.get(spokeLc) ?? "";
       group.entries.push({
         underlying: entry.underlying.toLowerCase(),
-        spoke: entry.spoke.toLowerCase(),
-        reserveId: entry.reserveId
+        hub,
+        reserveId: entry.reserveId,
+        spoke: spokeLc
       });
     }
     for (const [oracle, group] of byOracle) {
@@ -31948,8 +31965,9 @@ function parseAaveV4Results(data, meta, context) {
         marketUid: createMarketUid(
           chainId,
           meta.fork,
-          `${entry.spoke}:${entry.reserveId}`
-        )
+          `${entry.hub}:${entry.underlying}`
+        ),
+        configId: entry.spoke
       });
     } catch {
       continue;