@1delta/margin-fetcher 0.0.150 → 0.0.151

package/dist/assets/index.d.ts

@@ -1,6 +1,12 @@
 /** No specific configuration */
 export declare const LENDER_MODE_NO_MODE = 0;
-export declare function getAaveStyleProtocolTokenMap(chainId: string, lender: string): any;
+export declare function getAaveStyleProtocolTokenMap(chainId: string, lender: string): {
+    [underlying: string]: {
+        aToken: string;
+        sToken: string;
+        vToken: string;
+    };
+};
 export declare const getAaveAssets: (chainId: string | undefined, lendingProtocol: string | undefined) => string[];
 export declare const getCompoundV3Assets: (chainId: string | undefined, lendingProtocol: string | undefined) => string[];
 export declare function getAaveTypePoolDataProviderAddress(chainId: string, lender: string): string;

package/dist/assets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/assets/index.ts"],"names":[],"mappings":"AAQA,gCAAgC;AAChC,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAC9B,GAAG,CAChD;AAED,eAAO,MAAM,aAAa,GACxB,SAAS,MAAM,GAAG,SAAS,EAC3B,iBAAiB,MAAM,GAAG,SAAS,KAClC,MAAM,EAIR,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,GAAG,SAAS,EAC3B,iBAAiB,MAAM,GAAG,SAAS,KAClC,MAAM,EAIR,CAAA;AAED,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,UAIf;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,MAAM,CAGR;AAED;;;;GAIG;AACH,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,WAEpC,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,cAAc,MAAM,EAAE,SAAS,MAAM,WAEtE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/assets/index.ts"],"names":[],"mappings":"AAQA,gCAAgC;AAChC,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAEpC,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;EAE3E;AAED,eAAO,MAAM,aAAa,GACxB,SAAS,MAAM,GAAG,SAAS,EAC3B,iBAAiB,MAAM,GAAG,SAAS,KAClC,MAAM,EAIR,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,GAAG,SAAS,EAC3B,iBAAiB,MAAM,GAAG,SAAS,KAClC,MAAM,EAIR,CAAA;AAED,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,UAIf;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,MAAM,CAGR;AAED;;;;GAIG;AACH,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,WAEpC,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,cAAc,MAAM,EAAE,SAAS,MAAM,WAEtE,CAAA"}

package/dist/index.js

@@ -6276,6 +6276,7 @@ function initializeLenderData({
   compoundV3BaseDataOverride,
   morphoPoolsOverride,
   compoundV2TokensOverride,
+  compoundV2TokenArrayOverride,
   compoundV2PoolsOverride,
   initConfigOverride,
   aaveReservesOverride,
@@ -6293,6 +6294,7 @@ function initializeLenderData({
   if (morphoPoolsOverride) data.morphoPools = morphoPoolsOverride;
   if (compoundV3BaseDataOverride) data.compoundV3BaseData = compoundV3BaseDataOverride;
   if (compoundV2TokensOverride) data.compoundV2Tokens = compoundV2TokensOverride;
+  if (compoundV2TokenArrayOverride) data.compoundV2TokenArray = compoundV2TokenArrayOverride;
   if (compoundV2PoolsOverride) data.compoundV2Pools = compoundV2PoolsOverride;
   if (initConfigOverride) data.initConfig = initConfigOverride;
   if (aaveReservesOverride) data.aaveReserves = aaveReservesOverride;
@@ -6315,6 +6317,7 @@ var morphoPools = () => getGlobalData2()?.morphoPools;
 var compoundV3BaseData = () => getGlobalData2()?.compoundV3BaseData;
 var compoundV2Pools = () => getGlobalData2()?.compoundV2Pools;
 var compoundV2Tokens = () => getGlobalData2()?.compoundV2Tokens;
+var compoundV2TokenArray = () => getGlobalData2()?.compoundV2TokenArray;
 var initConfig = () => getGlobalData2()?.initConfig;
 var { uniq } = lodash;
 var COMPOUND_V3_KEY = "COMPOUND_V3";
@@ -7982,6 +7985,7 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
     /** AAVE V2 style with rewards from state */
     default: {
       const assetsToQuery = getAaveAssets(chainId, lender);
+      const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender);
       const expectedNumberOfCalls = assetsToQuery.length * 2;
       return [
         (data) => {
@@ -8077,6 +8081,19 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */]
             };
+            const aaveTokens3 = aaveTokenMap[asset];
+            if (!!aaveTokens3) {
+              resultReserves[asset] = {
+                ...resultReserves[asset],
+                params: {
+                  metadata: {
+                    aToken: aaveTokens3.aToken,
+                    vToken: aaveTokens3.vToken,
+                    sToken: aaveTokens3.sToken
+                  }
+                }
+              };
+            }
           }
           return {
             data: resultReserves,
@@ -8111,6 +8128,7 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
       const assetsToQuery = getAaveAssets(chainId, lender);
       const allModes = AAVE_V3_EMODES(chainId, lender);
       const expectedNumberOfCalls = assetsToQuery.length * 6 + allModes.length + 1;
+      const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender);
       return [
         (data) => {
           if (data.length !== expectedNumberOfCalls) {
@@ -8221,6 +8239,19 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
                 )
               )
             };
+            const aaveTokens3 = aaveTokenMap[asset];
+            if (!!aaveTokens3) {
+              resultReserves[asset] = {
+                ...resultReserves[asset],
+                params: {
+                  metadata: {
+                    aToken: aaveTokens3.aToken,
+                    vToken: aaveTokens3.vToken,
+                    sToken: aaveTokens3.sToken
+                  }
+                }
+              };
+            }
           }
           return {
             data: resultReserves,
@@ -8320,6 +8351,7 @@ function isReserveEnabledOnBitmap(bitmap, reserveIndex) {
 }
 function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
   const assetsToQuery = getAaveAssets(chainId, lender);
+  const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender);
   const expectedNumberOfCalls = assetsToQuery.length * 2;
   return [
     (data) => {
@@ -8401,6 +8433,19 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
           isActive: configData?.[7 /* isActive */],
           isFrozen: configData?.[8 /* isFrozen */]
         };
+        const aaveTokens3 = aaveTokenMap[asset];
+        if (!!aaveTokens3) {
+          resultReserves[asset] = {
+            ...resultReserves[asset],
+            params: {
+              metadata: {
+                aToken: aaveTokens3.aToken,
+                vToken: aaveTokens3.vToken,
+                sToken: aaveTokens3.sToken
+              }
+            }
+          };
+        }
       }
       return {
         data: resultReserves,
@@ -8413,6 +8458,7 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
 }
 function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
   const assetsToQuery = getAaveAssets(chainId, lender);
+  const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender);
   const allModes = AAVE_V3_EMODES(chainId, lender);
   const expectedNumberOfCalls = assetsToQuery.length * 5 + allModes.length * 3 + 2;
   return [
@@ -8534,6 +8580,19 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
             )
           )
         };
+        const aaveTokens3 = aaveTokenMap[asset];
+        if (!!aaveTokens3) {
+          resultReserves[asset] = {
+            ...resultReserves[asset],
+            params: {
+              metadata: {
+                aToken: aaveTokens3.aToken,
+                vToken: aaveTokens3.vToken,
+                sToken: aaveTokens3.sToken
+              }
+            }
+          };
+        }
       }
       return {
         data: resultReserves,
@@ -12078,12 +12137,12 @@ function getCompoundV2Comptroller(chainId, lender = Lender.VENUS) {
 function getCompoundV2CollateralTokens(chainId, lender = Lender.VENUS) {
   return compoundV2Tokens()?.[lender]?.[chainId];
 }
-function getCompoundV2Reserves(chainId, lender = Lender.VENUS) {
-  return compoundV2Reserves()?.[lender]?.[chainId];
-}
 function getCompoundV2Lens(chainId, lender) {
   return COMPOUND_V2_LENS[lender]?.[chainId];
 }
+function getCompoundV2Tokens(chainId, lender = Lender.VENUS) {
+  return compoundV2TokenArray()?.[lender]?.[chainId];
+}
 
 // src/abis/compound-v2/VenusLensLegacy.ts
 var VenusLensLegacyAbi = [
@@ -12433,8 +12492,15 @@ function parseMoonwellMarket(input, token) {
 // src/lending/compound-v2/publicCallParse.ts
 var PRICE_DECIMALS = 18;
 var RESERVE_MANTISSA_DECIMALS = 18;
-function convertSingleReserveEntry(opts) {
-  const { entryRaw, reader, asset, prices, additionalYields } = opts;
+function convertSingleEntry(opts) {
+  const {
+    entryRaw,
+    reader,
+    asset,
+    prices,
+    additionalYields,
+    cToken
+  } = opts;
   const decs = asset.decimals;
   const currentEntry = reader(entryRaw, asset);
   const borrowCollateralFactor = parseRawAmount(
@@ -12492,34 +12558,39 @@ function convertSingleReserveEntry(opts) {
     isActive: Boolean(currentEntry?.isListed) && !allPaused,
     isFrozen: pausedActions[0 /* MINT */] && pausedActions[2 /* BORROW */],
     rewards: {},
-    state: {
-      exchangeRateCurrent: exchangeRateRaw.toString(),
-      cTokenDecimals: Number(currentEntry?.cTokenDecimals?.toString())
-    },
     collateralActive,
-    borrowingEnabled
+    borrowingEnabled,
     // borrowCap example left commented as in original:
     // borrowCap: parseRawAmount(currentEntry?.borrowCap?.toString(), decs),
+    params: {
+      metadata: {
+        cToken,
+        exchangeRate: exchangeRateRaw.toString(),
+        cTokenDecimals: Number(currentEntry?.cTokenDecimals?.toString())
+      }
+    }
   };
 }
-var getCompoundV2ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
-  const assetsToQuery = getCompoundV2Reserves(chainId, lender);
-  const expectedNumberOfCalls = assetsToQuery.length;
+var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
+  const compoundV2Tokens2 = getCompoundV2Tokens(chainId, lender);
+  const expectedNumberOfCalls = compoundV2Tokens2.length;
   const reader = getReader(lender);
   return [
     (data) => {
       if (data.length !== expectedNumberOfCalls) return void 0;
       const out = { data: {}, chainId };
-      for (let i = 0; i < assetsToQuery.length; i++) {
-        const poolId = assetsToQuery[i];
+      for (let i = 0; i < compoundV2Tokens2.length; i++) {
+        const { underlying, cToken } = compoundV2Tokens2[i];
+        const poolId = underlying;
         const asset = tokenList[poolId];
         const entryRaw = data[i];
-        out.data[poolId] = convertSingleReserveEntry({
+        out.data[poolId] = convertSingleEntry({
           entryRaw,
           reader,
           asset,
           prices,
-          additionalYields
+          additionalYields,
+          cToken
         });
       }
       return out;
@@ -13427,7 +13498,7 @@ function getLenderDataConverter(lender, chainId, prices, additionalYields, token
     );
   }
   if (isCompoundV2Type(lender))
-    return getCompoundV2ReservesDataConverter(
+    return getCompoundV2DataConverter(
       lender,
       chainId,
       prices,
@@ -19447,6 +19518,7 @@ var compoundV3Reserves2 = baseUrl + "/data/compound-v3-reserves.json";
 var initConfig2 = baseUrl + "/data/init-config.json";
 var aaveTokens2 = baseUrl + "/data/aave-tokens.json";
 var compoundV2CTokens = baseUrl + "/data/compound-v2-c-tokens.json";
+var compoundV2TokenArray2 = baseUrl + "/data/compound-v2-tokens.json";
 var compoundV3Base = baseUrl + "/data/compound-v3-base-data.json";
 var baseUrlChains = "https://raw.githubusercontent.com/1delta-DAO/chains/main";
 var chains = baseUrlChains + "/data.json";
@@ -19468,6 +19540,7 @@ async function fetchLenderMetaFromDirAndInitialize() {
     initConfigOverride,
     aaveTokensOverride,
     compoundV2TokensOverride,
+    compoundV2TokenArrayOverride,
     compoundV3BaseDataOverride,
     aaveOraclesOverride,
     morphoTypeOraclesOverride,
@@ -19481,6 +19554,7 @@ async function fetchLenderMetaFromDirAndInitialize() {
     compoundV3BaseDataOverride,
     morphoPoolsOverride,
     compoundV2TokensOverride,
+    compoundV2TokenArrayOverride,
     compoundV2PoolsOverride,
     initConfigOverride,
     aaveReservesOverride,
@@ -19505,6 +19579,7 @@ async function fetchLenderMetaFromDir() {
     initConfig2,
     aaveTokens2,
     compoundV2CTokens,
+    compoundV2TokenArray2,
     compoundV3Base,
     aaveOracles2,
     morphoTypeOracles2,
@@ -19523,6 +19598,7 @@ async function fetchLenderMetaFromDir() {
     initConfigOverride,
     aaveTokensOverride,
     compoundV2TokensOverride,
+    compoundV2TokenArrayOverride,
     compoundV3BaseDataOverride,
     aaveOraclesOverride,
     morphoTypeOraclesOverride,
@@ -19541,6 +19617,7 @@ async function fetchLenderMetaFromDir() {
     initConfigOverride,
     aaveTokensOverride,
     compoundV2TokensOverride,
+    compoundV2TokenArrayOverride,
     compoundV3BaseDataOverride,
     aaveOraclesOverride,
     morphoTypeOraclesOverride,