@1delta/margin-fetcher 0.0.11 → 0.0.13

package/dist/utils/index.js

@@ -1,8 +1,16 @@
-import { AAVE_FORK_POOL_DATA, AAVE_STYLE_RESERVE_ASSETS, AAVE_V2_LENDERS, AAVE_V3_LENDERS, COMPOUND_BASE_TOKENS, COMPOUND_STYLE_RESERVE_ASSETS, INIT_STYLE_RESERVE_ASSETS, Lender, SWAYLEND_RESERVE_ASSETS, INIT_CONFIG_DATA, } from "@1delta/asset-registry";
+import { AAVE_FORK_POOL_DATA, AAVE_STYLE_RESERVE_ASSETS, AAVE_V2_LENDERS, AAVE_V3_LENDERS, COMPOUND_BASE_TOKENS, COMPOUND_STYLE_RESERVE_ASSETS, INIT_STYLE_RESERVE_ASSETS, Lender, SWAYLEND_RESERVE_ASSETS, INIT_CONFIG_DATA, MORPHO_BLUE_POOL_DATA, } from "@1delta/asset-registry";
 import { uniq } from "lodash";
 import { COMPOSERS } from "./constants";
 const AAVE_V3_KEY = "AAVE_V3";
 const COMPOUND_V3_KEY = "COMPOUND_V3";
+export function isCompoundV3(lender) { return lender.startsWith(COMPOUND_V3_KEY); }
+export function isCompoundV3Type(lender) { return lender.startsWith(COMPOUND_V3_KEY); }
+export function isInit(lender) { return lender === Lender.INIT; }
+export function isMorphoType(lender) {
+    return [
+        Lender.MORPHO_BLUE
+    ].includes(lender);
+}
 const SWAYLEND_KEY = "SWAYLEND";
 export const AAVE_V3_2_PROTOCOLS = [Lender.AAVE_V3, Lender.AAVE_V3_ETHER_FI, Lender.AAVE_V3_PRIME];
 export function isAaveV3Type(lender) {
@@ -23,15 +31,6 @@ export function isAaveV32Type(lender) {
 export function isAaveType(lender) {
     return [...AAVE_V3_LENDERS, ...AAVE_V2_LENDERS].includes(lender);
 }
-export function isCompoundV3(lender) {
-    return lender.startsWith(COMPOUND_V3_KEY);
-}
-export function isCompoundV3Type(lender) {
-    return lender.startsWith(COMPOUND_V3_KEY);
-}
-export function isInit(lender) {
-    return lender === Lender.INIT;
-}
 export function isSwaylend(lender) {
     return lender.startsWith(SWAYLEND_KEY);
 }
@@ -55,6 +54,12 @@ export const getLendersForChain = (c) => {
         if (chains.includes(c))
             lenders.push(l);
     });
+    // morpho
+    Object.entries(MORPHO_BLUE_POOL_DATA).forEach(([l, data]) => {
+        const chains = Object.keys(data);
+        if (chains.includes(c))
+            lenders.push(l);
+    });
     return lenders;
 };
 /** Filter lenders by protocol list */
@@ -63,8 +68,9 @@ export const filterLendersByProtocol = (allLenders, protocolList) => {
     if (!protocolList || protocolList.length === 0) {
         return allLenders;
     }
+    const hasMorpho = protocolList.includes(Lender.MORPHO_BLUE);
     // Filter lenders based on protocol list
-    return allLenders.filter((lender) => protocolList.includes(lender));
+    return allLenders.filter((lender) => protocolList.includes(lender) || (hasMorpho && lender.startsWith("MORPHO_BLUE")));
 };
 const getAavesForChain = () => {
     let lenders = {};
@@ -95,3 +101,6 @@ export const getLenderAssets = (chainId, lendingProtocol = Lender.AAVE_V3) => {
         return SWAYLEND_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? 0] ?? [];
     return [];
 };
+export function isMultiMarket(lender) {
+    return lender.startsWith("MORPHO_BLUE");
+}

package/dist/utils/parsing.d.ts

@@ -7,6 +7,7 @@ export declare enum TimeScale {
 }
 export declare const aprToApy: (apr: number) => number;
 export declare const apyToApr: (apy: number) => number;
+export declare const apyToAprPercent: (apy: number) => number;
 export declare const formatAaveYieldToNumber: (n?: string | bigint) => number;
 export declare const calculateRateForCompound: (n: string, chainId: string, lender?: Lender) => number;
 export declare const formatAaveRawApyToApr: (raw: bigint | string | undefined) => number;

package/dist/utils/parsing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIvD,eAAO,MAAM,GAAG,QAAQ,CAAC;AAEzB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAC;AAEF,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAC;AAGF,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAC"}
+{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIvD,eAAO,MAAM,GAAG,QAAQ,CAAC;AAEzB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAC;AAEF,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAE1C,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAC;AACF,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAC;AAGF,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAC"}

package/dist/utils/parsing.js

@@ -30,6 +30,9 @@ export const aprToApy = (apr) => {
 export const apyToApr = (apy) => {
     return ((apy + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
 };
+export const apyToAprPercent = (apy) => {
+    return 100 * ((apy / 100 + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
+};
 export const formatAaveYieldToNumber = (n) => {
     if (!n)
         return 0;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAiCA,UAAU,iBAAiB;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAA;CACrG;AAYD,eAAO,MAAM,kBAAkB,uCA6I9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAkCA,UAAU,iBAAiB;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAA;CACrG;AAYD,eAAO,MAAM,kBAAkB,uCAqJ9B,CAAA"}

package/dist/yields/index.js

@@ -1,4 +1,4 @@
-import { apyToApr } from "../utils/parsing";
+import { apyToAprPercent, apyToApr } from "../utils/parsing";
 const FeedData = {
     WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
     STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -11,6 +11,7 @@ const FeedData = {
     WEETH: 'https://www.ether.fi/api/apr',
     SAVAX: "https://api.benqi.fi/liquidstaking/apr",
     RSETH: "https://universe.kelpdao.xyz/rseth/totalApy",
+    TRUMATIC: "https://api.trufin.io/staker/apy?staker=MATIC"
 };
 const LenderAPIs = {
     MERIDIAN: 'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields'
@@ -81,7 +82,7 @@ export const fetchGeneralYields = async () => {
     const susdePromise = safeFetch('SUSDE', async () => {
         try {
             const res = await fetch(FeedData.SUSDE).then(r => r.json());
-            return Number(res?.data[0]?.apy ?? 0);
+            return apyToAprPercent(res?.data[0]?.apy ?? 0);
         }
         catch (e) {
             return 0;
@@ -89,7 +90,11 @@ export const fetchGeneralYields = async () => {
     });
     const rsethPromise = safeFetch('RSETH', async () => {
         const res = await fetch(FeedData.RSETH).then(r => r.json());
-        return Number(res.totalAPY);
+        return apyToAprPercent(res.totalAPY);
+    });
+    const trumaticPromise = safeFetch('TRUMATIC', async () => {
+        const res = await fetch(FeedData.TRUMATIC).then(r => r.json());
+        return apyToAprPercent(res.apy);
     });
     const cbethPromise = safeFetch('CBETH', async () => {
         try {
@@ -99,7 +104,7 @@ export const fetchGeneralYields = async () => {
                     "Content-Type": "application/json"
                 }
             }).then(r => r.json());
-            return Number(res.apy) * 100;
+            return apyToAprPercent(res.apy) * 100;
         }
         catch (e) {
             console.log("CBETH failed", e);
@@ -116,7 +121,7 @@ export const fetchGeneralYields = async () => {
             }
         })));
     });
-    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData,] = await Promise.all([
+    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData] = await Promise.all([
         wstethPromise,
         ezethPromise,
         rethPromise,
@@ -129,6 +134,7 @@ export const fetchGeneralYields = async () => {
         savaxPromise,
         cbethPromise,
         rsethPromise,
+        trumaticPromise,
     ]);
     const data = {
         intrinsicYields: {
@@ -146,6 +152,7 @@ export const fetchGeneralYields = async () => {
             SAVAX: savaxData,
             CBETH: cbethData,
             RSETH: rsethData,
+            TRUMATIC: trumaticData,
         },
         lenderRewards: {
             "167000": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/abis/morpho/blue.ts

@@ -0,0 +1,99 @@
+export const MorphoBlueAbi = [
+    {
+        "inputs": [
+            {
+                "internalType": "Id",
+                "name": "",
+                "type": "bytes32"
+            },
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "position",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "supplyShares",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint128",
+                "name": "borrowShares",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "collateral",
+                "type": "uint128"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32[]",
+                "name": "slots",
+                "type": "bytes32[]"
+            }
+        ],
+        "name": "extSloads",
+        "outputs": [
+            {
+                "internalType": "bytes32[]",
+                "name": "res",
+                "type": "bytes32[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "Id",
+                "name": "",
+                "type": "bytes32"
+            }
+        ],
+        "name": "market",
+        "outputs": [
+            {
+                "internalType": "uint128",
+                "name": "totalSupplyAssets",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "totalSupplyShares",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "totalBorrowAssets",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "totalBorrowShares",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "lastUpdate",
+                "type": "uint128"
+            },
+            {
+                "internalType": "uint128",
+                "name": "fee",
+                "type": "uint128"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+] as const

package/src/abis/morpho/lens.ts

@@ -0,0 +1,31 @@
+export const MorphoLensAbi = [
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32[]",
+                "name": "marketsIds",
+                "type": "bytes32[]"
+            },
+            {
+                "internalType": "address",
+                "name": "user",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "morpho",
+                "type": "address"
+            }
+        ],
+        "name": "getUserDataCompact",
+        "outputs": [
+            {
+                "internalType": "bytes",
+                "name": "data",
+                "type": "bytes"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/src/lending/aave-v2-type/types.ts

@@ -1,4 +1,5 @@
 import { RewardsMap } from "../aave-v3-type/types";
+import { GenericCurrency } from "../types";
 
 
 export enum AaveV2TypeGetReserveDataIndexes {
@@ -53,6 +54,7 @@ export enum AaveV2TypeIncentivesControllerPoolInfoIndexes {
 export interface AaveV2GeneralPublicResponse {
   data: {
     [tokenSymbol: string]: {
+      asset: GenericCurrency
       // token amounts
       totalDeposits: number;
       totalDebtStable: number;

package/src/lending/fetchLender.ts

@@ -1,4 +1,3 @@
-
 // aave v2 style
 import { ProtocolDataProviderAbi } from '../abis/aave-v2/ProtocolDataProvider'
 import { IncentivesControllerAbi } from '../abis/lendle/IncentivesController'
@@ -17,7 +16,13 @@ import { CometAbi } from '../abis/compound-v3/Comet'
 import { CometExtAbi } from '../abis/compound-v3/CometExt'
 import { IrgetterAbi } from '../abis/compound-v3/IrGetter'
 
-import { isAaveV2Type, isAaveV3Original, isAaveV3Type, isCompoundV3, isInit } from '../utils'
+import {
+  isAaveV2Type,
+  isAaveV3Original,
+  isAaveV3Type,
+  isCompoundV3,
+  isInit,
+} from '../utils'
 import { AdditionalYields, MulticallRetryFunction } from '../types'
 import { buildAaveV2StyleLenderReserveCall } from './aave-v2-type/publicCallBuild'
 import { buildAaveV3StyleLenderReserveCall } from './aave-v3-type/publicCallBuild'
@@ -35,10 +40,14 @@ import { YLDRProtocolDataProviderAbi } from '../abis/aave-v2/YLDR'
 import { GenericTokenList } from './types'
 
 function buildLenderCall(chainId: string, lender: Lender) {
-  if (isAaveV2Type(lender)) return buildAaveV2StyleLenderReserveCall(chainId, lender)
-  if (isAaveV3Type(lender)) return buildAaveV3StyleLenderReserveCall(chainId, lender)
+  if (isAaveV2Type(lender))
+    return buildAaveV2StyleLenderReserveCall(chainId, lender)
+  if (isAaveV3Type(lender))
+    return buildAaveV3StyleLenderReserveCall(chainId, lender)
+  if (isCompoundV3(lender))
+    return buildCompoundV3StyleLenderReserveCall(chainId, lender)
   if (isInit(lender)) return buildInitStyleLenderReserveCall(chainId, lender)
-  return buildCompoundV3StyleLenderReserveCall(chainId, lender)
+  return []
 }
 
 function getLenderDataConverter(
@@ -46,44 +55,63 @@ function getLenderDataConverter(
   chainId: string,
   prices: { [a: string]: number },
   additionalYields: AdditionalYields,
-  tokenList: GenericTokenList = {}
+  tokenList: GenericTokenList = {},
 ) {
-  if (isAaveV2Type(lender)) return getAaveV2ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList)
-  if (isAaveV3Type(lender)) return getAaveV3ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList)
-  if (isInit(lender)) return getInitReservesDataConverter(lender, chainId, prices, additionalYields, tokenList)
-  return getCompoundV3ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList)
+  if (isAaveV2Type(lender))
+    return getAaveV2ReservesDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      tokenList,
+    )
+  if (isAaveV3Type(lender))
+    return getAaveV3ReservesDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      tokenList,
+    )
+  if (isCompoundV3(lender))
+    return getCompoundV3ReservesDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      tokenList,
+    )
+
+  if (isInit(lender))
+    return getInitReservesDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      tokenList,
+    )
+  return [() => null, 0] as any
 }
 
 const getAbi = (lender: string) => {
-  if (isAaveV2Type(lender)) return [
-    ...ProtocolDataProviderAbi,
-    ...UniswapV2PairAbi,
-    ...RewarderAbi,
-    ...IncentivesControllerAbi
-  ]
-
-  if (isAaveV3Original(lender)) return [
-    ...AavePoolV3UpgradedAbi,
-    ...AaveV3ProtocolDataProviderAbi
-  ]
-  if (lender === Lender.YLDR) return [
-    ...YLDRProtocolDataProviderAbi,
-  ]
-
-  if (isAaveV3Type(lender)) return [
-    ...AavePoolLegacyAbi,
-    ...AavePoolDataProviderLegacyAbi
-  ]
-
-
-  if (isCompoundV3(lender)) return [
-    ...IrgetterAbi,
-    ...CometAbi,
-    ...CometExtAbi
-  ]
+  if (isAaveV2Type(lender))
+    return [
+      ...ProtocolDataProviderAbi,
+      ...UniswapV2PairAbi,
+      ...RewarderAbi,
+      ...IncentivesControllerAbi,
+    ]
 
-  if (isInit(lender))
-    return InitLensAbi
+  if (isAaveV3Original(lender))
+    return [...AavePoolV3UpgradedAbi, ...AaveV3ProtocolDataProviderAbi]
+  if (lender === Lender.YLDR) return [...YLDRProtocolDataProviderAbi]
+
+  if (isAaveV3Type(lender))
+    return [...AavePoolLegacyAbi, ...AavePoolDataProviderLegacyAbi]
+
+  if (isCompoundV3(lender)) return [...IrgetterAbi, ...CometAbi, ...CometExtAbi]
+
+  if (isInit(lender)) return InitLensAbi
 
   return []
 }
@@ -94,7 +122,9 @@ export const getLenderPublicData = async (
   prices: { [asset: string]: number },
   additionalYields: AdditionalYields,
   multicallRetry: MulticallRetryFunction,
-  tokenList: () => Promise<GenericTokenList> = async () => { return {} }
+  tokenList: () => Promise<GenericTokenList> = async () => {
+    return {}
+  },
 ): Promise<{ [lender: string]: any }> => {
   let calls: {
     call: Call
@@ -127,17 +157,24 @@ export const getLenderPublicData = async (
 
   let currentSlice = 0
   for (const lender of lenders) {
-    const [converter, sliceLength] = getLenderDataConverter(lender, chainId, prices, additionalYields, list)
-
-    const data = rawResults.slice(currentSlice, currentSlice + sliceLength)
-    const convertedData = converter(data)
-    if (!convertedData) {
-      invalidLenders.push(lender)
-    } else {
-      lenderData[lender] = convertedData
+    const [converter, sliceLength] = getLenderDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      list,
+    )
+    if (sliceLength > 0) {
+      const data = rawResults.slice(currentSlice, currentSlice + sliceLength)
+      const convertedData = converter(data)
+      if (!convertedData) {
+        invalidLenders.push(lender)
+      } else {
+        lenderData[lender] = convertedData
+      }
+
+      currentSlice += sliceLength
     }
-
-    currentSlice += sliceLength
   }
 
   return lenderData

package/src/lending/fetchLenderAll.ts

@@ -0,0 +1,30 @@
+import { AdditionalYields, MulticallRetryFunction } from '../types'
+import { Lender } from '@1delta/asset-registry'
+import { getLenderPublicData } from './fetchLender'
+import { getLenderPublicDataViaApi } from './fetchLenderExt'
+import { GenericTokenList } from './types'
+
+const LENDERS_VIA_API: string[] = [Lender.MORPHO_BLUE]
+
+export const getLenderPublicDataAll = async (
+  chainId: string,
+  lenders: Lender[],
+  prices: { [asset: string]: number },
+  additionalYields: AdditionalYields,
+  multicallRetry: MulticallRetryFunction,
+  tokenList?: () => Promise<GenericTokenList>
+): Promise<{ [lender: string]: any }> => {
+
+  const lendersApi = lenders.filter(l => LENDERS_VIA_API.includes(l))
+
+  const lendersOnChain = lenders.filter(l => !LENDERS_VIA_API.includes(l))
+
+  const onChain = getLenderPublicData(chainId, lendersOnChain, prices, additionalYields, multicallRetry, tokenList)
+
+  const api = getLenderPublicDataViaApi(chainId, lendersApi, prices, additionalYields, tokenList)
+
+  const [onChainRes, apiRes] = await Promise.all([onChain, api])
+
+  return { ...onChainRes, ...apiRes }
+
+}

package/src/lending/fetchLenderExt.ts

@@ -0,0 +1,82 @@
+import { isMorphoType, isMultiMarket } from '../utils'
+import { AdditionalYields } from '../types'
+import { Lender } from '@1delta/asset-registry'
+import { GenericTokenList } from './types'
+import { fetchMorphoMarkets } from './morpho/fetchPublic'
+import { convertMarketsToMorphoResponse } from './morpho/convertPublic'
+
+async function getLenderDataFromApi(
+  lender: Lender,
+  chainId: string,
+  prices: { [a: string]: number },
+  additionalYields: AdditionalYields,
+) {
+  if (isMorphoType(lender)) return await fetchMorphoMarkets(chainId)
+  return {}
+}
+
+function convertLenderDataFromApi(
+  lender: Lender,
+  chainId: string,
+  data: any,
+  prices: { [a: string]: number },
+  additionalYields: AdditionalYields,
+  list: GenericTokenList = {},
+) {
+  if (isMorphoType(lender))
+    return convertMarketsToMorphoResponse(data, chainId, additionalYields, list)
+  return {}
+}
+
+export const getLenderPublicDataViaApi = async (
+  chainId: string,
+  lenders: Lender[],
+  prices: { [asset: string]: number },
+  additionalYields: AdditionalYields,
+  tokenList: () => Promise<GenericTokenList> = async () => {
+    return {}
+  },
+): Promise<{ [lender: string]: any }> => {
+  let promises: any[] = []
+  for (const lender of lenders) {
+    promises.push(
+      getLenderDataFromApi(lender, chainId, prices, additionalYields),
+    )
+  }
+
+  const [list, ...results] = await Promise.all([tokenList(), ...promises])
+
+  const lenderData: { [lender: string]: any } = {}
+  for (let i = 0; i < lenders.length; i++) {
+    try {
+      const lender = lenders[i]
+      if (isMultiMarket(lender)) {
+        const dataObtained = results[i]
+        const converted: any = convertLenderDataFromApi(
+          lender,
+          chainId,
+          dataObtained,
+          prices,
+          additionalYields,
+          list,
+        )
+        Object.keys(converted).forEach((marketId: string) => {
+          lenderData[marketId] = converted[marketId]
+        })
+      } else {
+        lenderData[lender] = convertLenderDataFromApi(
+          lender,
+          chainId,
+          results[i],
+          prices,
+          additionalYields,
+          list,
+        )
+      }
+    } catch (e) {
+      console.log('error fetching from API on', chainId, ':', e)
+    }
+  }
+
+  return lenderData
+}

package/src/lending/index.ts

@@ -1,3 +1,5 @@
 export * from "./fetchLender"
+export * from "./fetchLenderExt"
+export * from "./fetchLenderAll"
 export * from "./user-data"
-export * from "./types"
+export * from "./types"