@1delta/margin-fetcher 0.0.18 → 0.0.19

package/dist/prices/main-prices/addresses/morpho.js

@@ -1,5 +1,119 @@
 import { Chain } from '@1delta/asset-registry';
 export const MrophoOracles = {
+    [Chain.ARBITRUM_ONE]: [
+        {
+            oracle: '0x8e02a9b9Cc29d783b2fCB71C3a72651B591cae31',
+            loanAsset: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+            collateralAsset: '0x5979d7b546e38e414f7e9822514be443a4800529',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x3855b7833C7Cb22aDCAB28505D838A2015eA8457',
+            loanAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            collateralAsset: '0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f',
+            loanAssetDecimals: 18,
+            collateralAssetDecimals: 8,
+        },
+        {
+            oracle: '0x88193FcB705d29724A40Bb818eCAA47dD5F014d9',
+            loanAsset: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+            collateralAsset: '0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 8,
+        },
+        {
+            oracle: '0x9041D09213607A0E85190719e60d11125583612D',
+            loanAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            collateralAsset: '0x5979d7b546e38e414f7e9822514be443a4800529',
+            loanAssetDecimals: 18,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x8e02a9b9Cc29d783b2fCB71C3a72651B591cae31',
+            loanAsset: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
+            collateralAsset: '0x5979d7b546e38e414f7e9822514be443a4800529',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x52CC7c3b27bb61D0a83785B5344acC919F8f7124',
+            loanAsset: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
+            collateralAsset: '0xddb46999f8891663a8f2828d25298f70416d7610',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0xEDcAE878827fc68B9bC9c700CA17c20F811b1612',
+            loanAsset: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
+            collateralAsset: '0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 8,
+        },
+        {
+            oracle: '0x4E49d73434a78866d217BE0B542CA868495CBc77',
+            loanAsset: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
+            collateralAsset: '0x35751007a407ca6feffe80b3cb397736d2cf4dbe',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x282FEB10549fde52bD61A6979424Ddf18A4971A2',
+            loanAsset: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9',
+            collateralAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x282FEB10549fde52bD61A6979424Ddf18A4971A2',
+            loanAsset: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+            collateralAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x4E49d73434a78866d217BE0B542CA868495CBc77',
+            loanAsset: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+            collateralAsset: '0x35751007a407ca6feffe80b3cb397736d2cf4dbe',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0x52CC7c3b27bb61D0a83785B5344acC919F8f7124',
+            loanAsset: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
+            collateralAsset: '0xddb46999f8891663a8f2828d25298f70416d7610',
+            loanAssetDecimals: 6,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0xa23175b3066672F4C5e07c6Fd21913efEA74e6EF',
+            loanAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            collateralAsset: '0xec70dcb4a1efa46b8f2d97c310c9c4790ba5ffa8',
+            loanAssetDecimals: 18,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0xE468929f1E6F065926c9C88E1E4Fd2a20005275e',
+            loanAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            collateralAsset: '0x2416092f143378750bb29b79ed961ab195cceea5',
+            loanAssetDecimals: 18,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0xAC55d7601C7108A9CFE3D1E0224984204089154F',
+            loanAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            collateralAsset: '0x4186bfc76e2e237523cbc30fd220fe055156b41f',
+            loanAssetDecimals: 18,
+            collateralAssetDecimals: 18,
+        },
+        {
+            oracle: '0xF287a5725E9e78B55cA3aEd614ce9bD8Ea6d5583',
+            loanAsset: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+            collateralAsset: '0x35751007a407ca6feffe80b3cb397736d2cf4dbe',
+            loanAssetDecimals: 18,
+            collateralAssetDecimals: 18,
+        },
+    ],
     [Chain.BASE]: [
         {
             oracle: '0x663BECd10daE6C4A3Dcd89F1d76c1174199639B9',

package/dist/prices/main-prices/fetchOracleData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchOracleData.d.ts","sourceRoot":"","sources":["../../../src/prices/main-prices/fetchOracleData.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKlD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAY7D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA;AAOD,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAQD;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAAE,EAClB,cAAc,oBAAoB,KACjC,OAAO,CAAC,UAAU,CAgJpB,CAAA"}
+{"version":3,"file":"fetchOracleData.d.ts","sourceRoot":"","sources":["../../../src/prices/main-prices/fetchOracleData.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKlD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAY7D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA;AAOD,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAID;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAAE,EAClB,cAAc,oBAAoB,KACjC,OAAO,CAAC,UAAU,CAiJpB,CAAA"}

package/dist/prices/main-prices/fetchOracleData.js

@@ -9,6 +9,7 @@ import { formatEther, formatUnits } from 'viem';
 import { getAaveAssets } from '../../assets';
 import { chainlinkOracles, getChainLinkKeys, ChainlinkAggregatorIndexes, } from './addresses/chainlink';
 import { fetchDefillamaData } from '../defillama';
+import { fetchPendlePrices } from '../pendle';
 import { multicallViemAbiArray } from '../../utils/multicall';
 import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles';
 import { AAVES_PER_CHAIN } from '../../utils';
@@ -127,6 +128,7 @@ export const fetchMainPrices = async (chainIds, getEvmClient) => {
         });
     });
     promises.push(fetchDefillamaData());
+    promises.push(fetchPendlePrices());
     const result = await Promise.all(promises);
     let data = {};
     result.forEach((r) => {
@@ -272,13 +274,15 @@ function lowDecimalOracle(chainId, fork) {
 const parseAaveResults = (chainId, data, queries) => {
     let prices = {};
     data.forEach((d, i) => {
-        const details = queries[i];
-        details.assets.forEach((a, j) => {
-            const oracleId = ASSET_META[chainId][a]?.assetGroup ??
-                ASSET_META[chainId]?.[a]?.symbol ??
-                chainId + '-' + a;
-            prices[oracleId] = formatAavePrice(d[j].toString(), lowDecimalOracle(chainId, details.fork));
-        });
+        if (d !== '0x') {
+            const details = queries[i];
+            details.assets.forEach((a, j) => {
+                const oracleId = ASSET_META[chainId][a]?.assetGroup ??
+                    ASSET_META[chainId]?.[a]?.symbol ??
+                    chainId + '-' + a;
+                prices[oracleId] = formatAavePrice(d[j].toString(), lowDecimalOracle(chainId, details.fork));
+            });
+        }
     });
     return prices;
 };
@@ -291,9 +295,17 @@ const parseMorphoResults = (chainId, data, queries, donePrices = {}) => {
         const debtPrice = donePrices[oracleId];
         const oracleIdCollateral = ASSET_META[chainId][collateralAsset]?.assetGroup ??
             chainId + '-' + collateralAsset;
+        const collateralPrice = donePrices[oracleIdCollateral];
+        const priceDebtToCollateral = formatMorphoPrice(d.toString(), loanAssetDecimals, collateralAssetDecimals);
         if (debtPrice) {
-            const priceCollateral = formatMorphoPrice(d.toString(), loanAssetDecimals, collateralAssetDecimals);
-            prices[oracleIdCollateral] = priceCollateral * debtPrice;
+            if (!prices[oracleIdCollateral])
+                prices[oracleIdCollateral] = priceDebtToCollateral * debtPrice;
+        }
+        else {
+            if (collateralPrice) {
+                if (!prices[oracleId])
+                    prices[oracleId] = collateralPrice / priceDebtToCollateral;
+            }
         }
     });
     return prices;

package/dist/prices/pendle/fetchPendlePrices.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Main function to fetch Pendle prices
+ */
+export declare function fetchPendlePrices(): Promise<{
+    [address: string]: number;
+}>;
+//# sourceMappingURL=fetchPendlePrices.d.ts.map

package/dist/prices/pendle/fetchPendlePrices.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchPendlePrices.d.ts","sourceRoot":"","sources":["../../../src/prices/pendle/fetchPendlePrices.ts"],"names":[],"mappings":"AAsKA;;GAEG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IACjD,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B,CAAC,CAoCD"}

package/dist/prices/pendle/fetchPendlePrices.js

@@ -0,0 +1,148 @@
+const PENDLE_API_BASE = 'https://api-v2.pendle.finance/core';
+const MARKETS_ENDPOINT = (chainId) => `${PENDLE_API_BASE}/v1/${chainId}/markets/active`;
+const PRICES_ENDPOINT = (chainId, type = 'SY') => `${PENDLE_API_BASE}/v1/${chainId}/assets/prices?&type=${type}`;
+const SUPPORTED_CHAINS = [
+    // '1', Disabled for now
+    '42161',
+    '10',
+    '56',
+    '8453',
+    '5000',
+    '146',
+    '80094',
+];
+let marketsCache = null;
+let marketsCacheTimestamp = 0;
+const MARKETS_CACHE_TTL = 5 * 60 * 1000; // 5mins
+/**
+ * Fetch Pendle markets data for a specific chain
+ */
+async function fetchMarketsForChain(chainId) {
+    try {
+        const response = await fetch(MARKETS_ENDPOINT(chainId));
+        const data = (await response.json());
+        return data.markets || [];
+    }
+    catch (error) {
+        console.error(`Error fetching markets for chain ${chainId}:`, error);
+        return [];
+    }
+}
+/**
+ * Fetch and cache Pendle markets data for all supported chains
+ */
+async function fetchPendleMarkets() {
+    const now = Date.now();
+    if (marketsCache && now - marketsCacheTimestamp < MARKETS_CACHE_TTL) {
+        return marketsCache;
+    }
+    try {
+        const allMarkets = [];
+        const promises = [];
+        for (const chainId of SUPPORTED_CHAINS) {
+            const chainMarkets = fetchMarketsForChain(chainId);
+            promises.push(chainMarkets);
+        }
+        const results = await Promise.all(promises);
+        allMarkets.push(...results.flat());
+        const result = { markets: allMarkets };
+        marketsCache = result;
+        marketsCacheTimestamp = now;
+        return result;
+    }
+    catch (error) {
+        console.error('Error fetching Pendle markets:', error);
+        // return cached data (if any, even if expired, it is better than nothing I guess)
+        return marketsCache || { markets: [] };
+    }
+}
+/**
+ * Fetch prices for a specific chain and token type
+ */
+async function fetchPendlePricesForChain(chainId, type = 'all') {
+    try {
+        // Fetch prices for different token types (PT, YT, SY, PENDLE_LP)
+        const types = type === 'all' ? ['PT', 'YT', 'SY', 'PENDLE_LP'] : [type];
+        let allPrices = {};
+        try {
+            const response = await fetch(PRICES_ENDPOINT(chainId, types.join(',')));
+            const data = (await response.json());
+            allPrices = data.prices;
+        }
+        catch (error) {
+            console.error(`Error fetching prices for chain ${chainId}:`, error);
+        }
+        return allPrices;
+    }
+    catch (error) {
+        console.error(`Error fetching Pendle prices for chain ${chainId}:`, error);
+        return {};
+    }
+}
+/**
+ * Extract relevant token addresses from markets data
+ * Note: Seperating the chainId from address is not really required since we do the same when we return results
+ * but it allows to extend the file later and use individual addresses (maybe), or we can simplify this
+ */
+function extractTokenAddressesFromMarkets(markets) {
+    const tokensByChain = {};
+    markets.forEach((market) => {
+        const chain = market.pt?.split('-')[0];
+        if (chain && !tokensByChain[chain]) {
+            tokensByChain[chain] = { pt: [], yt: [], sy: [] };
+        }
+        // Add token addresses to their respective chains
+        if (market.pt && chain) {
+            const address = market.pt.split('-')[1];
+            if (address && !tokensByChain[chain].pt.includes(address)) {
+                tokensByChain[chain].pt.push(address);
+            }
+        }
+        if (market.yt && chain) {
+            const address = market.yt.split('-')[1];
+            if (address && !tokensByChain[chain].yt.includes(address)) {
+                tokensByChain[chain].yt.push(address);
+            }
+        }
+        if (market.sy && chain) {
+            const address = market.sy.split('-')[1];
+            if (address && !tokensByChain[chain].sy.includes(address)) {
+                tokensByChain[chain].sy.push(address);
+            }
+        }
+    });
+    return tokensByChain;
+}
+/**
+ * Main function to fetch Pendle prices
+ */
+export async function fetchPendlePrices() {
+    try {
+        const marketsResponse = await fetchPendleMarkets();
+        if (!marketsResponse.markets.length) {
+            // console.warn('No Pendle markets found')
+            return {};
+        }
+        const tokensByChain = extractTokenAddressesFromMarkets(marketsResponse.markets);
+        const allPrices = {};
+        for (const chainId of SUPPORTED_CHAINS) {
+            if (tokensByChain[chainId]) {
+                // console.log(`Fetching Pendle prices for chain ${chainId}`)
+                const chainPrices = await fetchPendlePricesForChain(chainId, 'YT'); // only fetch YT prices
+                // create a chainId-address key for each token price
+                Object.entries(chainPrices).forEach(([address, price]) => {
+                    if (price !== 0) {
+                        const prefixedAddress = `${chainId}-${address}`;
+                        allPrices[prefixedAddress] = price;
+                    }
+                });
+            }
+        }
+        // console.log(`Fetched ${Object.keys(allPrices).length} Pendle token prices`)
+        return allPrices;
+    }
+    catch (error) {
+        console.error('Error in fetchPendlePrices:', error);
+        return {};
+    }
+}

package/dist/prices/pendle/index.d.ts

@@ -0,0 +1,2 @@
+export * from './fetchPendlePrices';
+//# sourceMappingURL=index.d.ts.map

package/dist/prices/pendle/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/prices/pendle/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA"}

package/dist/prices/pendle/index.js

@@ -0,0 +1 @@
+export * from './fetchPendlePrices';

package/dist/types/apiReturnType.d.ts

@@ -1,3 +1,4 @@
+import { GenericCurrency } from '../lending';
 export interface BaseYields {
     variableBorrowRate: number;
     stableBorrowRate: number;
@@ -29,6 +30,7 @@ interface EMode {
 export interface PoolData {
     poolId: string;
     underlying: string;
+    asset: GenericCurrency;
     totalDeposits: string;
     totalDebtStable: string;
     totalDebt: string;

package/dist/types/apiReturnType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiReturnType.d.ts","sourceRoot":"","sources":["../../src/types/apiReturnType.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IAEzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IAExB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAA;AAE3D,MAAM,WAAW,YAAa,SAAQ,UAAU;IAE9C,YAAY,EAAE,MAAM,CAAA;IAGpB,OAAO,CAAC,EAAE,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,UAAU;IAClB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC;CACjC;AAED,UAAU,KAAK;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,IAAI,EAAE;YACJ,CAAC,MAAM,EAAE,MAAM,GAAG;gBAChB,IAAI,EAAE;oBACJ,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;iBAC3B,CAAC;gBACF,MAAM,EAAE;oBAAE,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;iBAAE,CAAA;gBACnC,OAAO,EAAE,MAAM,CAAA;aAChB,CAAA;SACF,CAAC;QACF,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;CACF,CAAA"}
+{"version":3,"file":"apiReturnType.d.ts","sourceRoot":"","sources":["../../src/types/apiReturnType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,WAAW,UAAU;IAEzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IAExB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAA;AAE3D,MAAM,WAAW,YAAa,SAAQ,UAAU;IAE9C,YAAY,EAAE,MAAM,CAAA;IAGpB,OAAO,CAAC,EAAE,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,UAAU,UAAU;IAClB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAA;CAChC;AAED,UAAU,KAAK;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,sBAAsB,EAAE,MAAM,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,CAAA;IACxB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,UAAU,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,UAAU,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;IACzB,gBAAgB,EAAE,OAAO,CAAA;IACzB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,IAAI,EAAE;YACJ,CAAC,MAAM,EAAE,MAAM,GAAG;gBAChB,IAAI,EAAE;oBACJ,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;iBAC3B,CAAA;gBACD,MAAM,EAAE;oBAAE,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;iBAAE,CAAA;gBACnC,OAAO,EAAE,MAAM,CAAA;aAChB,CAAA;SACF,CAAA;QACD,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;CACF,CAAA"}

package/dist/utils/index.d.ts

@@ -3,12 +3,10 @@ export declare function isCompoundV3(lender: string): boolean;
 export declare function isCompoundV3Type(lender: string): boolean;
 export declare function isInit(lender: string): lender is Lender.INIT;
 export declare function isMorphoType(lender: string): boolean;
-export declare const AAVE_V3_2_PROTOCOLS: Lender[];
 export declare function isAaveV3Type(lender: string): boolean;
-export declare function isAaveV3Original(lender: string): boolean;
 export declare function isAaveV2Type(lender: string): boolean;
 export declare function isYLDR(lender: string): lender is Lender.YLDR;
-export declare function isAaveV32Type(lender: Lender): boolean;
+export declare function isAaveV32Type(lender: string): boolean;
 export declare function isAaveType(lender: string): boolean;
 export declare function isSwaylend(lender: string): boolean;
 export declare const getLendersForChain: (c: string) => string[];

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAIP,MAAM,wBAAwB,CAAA;AAO/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAA+C;AAE1F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAA+C;AAE9F,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAAmC;AAExE,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAI1C;AAID,eAAO,MAAM,mBAAmB,UAAkE,CAAA;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA4B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAS7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACpC,wBAAgC,KAC/B,MAAM,EAOR,CAAA;AAGD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAKP,MAAM,wBAAwB,CAAA;AAO/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAAgD;AAE3F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAAgD;AAE/F,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAAmC;AAExE,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA4B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAS7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACpC,wBAAgC,KAC/B,MAAM,EAOR,CAAA;AAGD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}

package/dist/utils/index.js

@@ -1,24 +1,18 @@
-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 { 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, AAVE_V32_LENDERS, } from "@1delta/asset-registry";
 import { uniq } from "lodash";
 import { COMPOSERS } from "./constants";
-const AAVE_V3_KEY = "AAVE_V3";
+import { zeroAddress } from "viem";
 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 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);
+    return lender?.startsWith("MORPHO_BLUE");
 }
 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) {
     return AAVE_V3_LENDERS.includes(lender);
 }
-export function isAaveV3Original(lender) {
-    return lender.startsWith(AAVE_V3_KEY);
-}
 export function isAaveV2Type(lender) {
     return AAVE_V2_LENDERS.includes(lender);
 }
@@ -26,13 +20,13 @@ export function isYLDR(lender) {
     return lender === Lender.YLDR;
 }
 export function isAaveV32Type(lender) {
-    return AAVE_V3_2_PROTOCOLS.includes(lender);
+    return AAVE_V32_LENDERS.includes(lender);
 }
 export function isAaveType(lender) {
     return [...AAVE_V3_LENDERS, ...AAVE_V2_LENDERS].includes(lender);
 }
 export function isSwaylend(lender) {
-    return lender.startsWith(SWAYLEND_KEY);
+    return lender?.startsWith(SWAYLEND_KEY);
 }
 export const getLendersForChain = (c) => {
     let lenders = [];
@@ -70,7 +64,7 @@ export const filterLendersByProtocol = (allLenders, protocolList) => {
     }
     const hasMorpho = protocolList.includes(Lender.MORPHO_BLUE);
     // Filter lenders based on protocol list
-    return allLenders.filter((lender) => protocolList.includes(lender) || (hasMorpho && lender.startsWith("MORPHO_BLUE")));
+    return allLenders.filter((lender) => protocolList.includes(lender) || (hasMorpho && lender?.startsWith("MORPHO_BLUE")));
 };
 const getAavesForChain = () => {
     let lenders = {};
@@ -86,7 +80,7 @@ const getAavesForChain = () => {
 /** All aave protocols per chain */
 export const AAVES_PER_CHAIN = getAavesForChain();
 export const getComposerAddress = (chainId) => {
-    return COMPOSERS[chainId];
+    return COMPOSERS[chainId] ?? zeroAddress;
 };
 export const getLenderAssets = (chainId, lendingProtocol = Lender.AAVE_V3) => {
     if (!chainId)
@@ -102,5 +96,5 @@ export const getLenderAssets = (chainId, lendingProtocol = Lender.AAVE_V3) => {
     return [];
 };
 export function isMultiMarket(lender) {
-    return lender.startsWith("MORPHO_BLUE");
+    return lender?.startsWith("MORPHO_BLUE");
 }

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAwCA,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,qBAAqB,EAAE,GAAG,CAAA;IAC1B,oBAAoB,EAAE,GAAG,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IACxD,aAAa,EAAE;QACb,CAAC,OAAO,EAAE,MAAM,GAAG;YACjB,CAAC,MAAM,EAAE,MAAM,GAAG;gBAAE,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAA;aAAE,CAAA;SACzD,CAAA;KACF,CAAA;CACF;AAcD,eAAO,MAAM,kBAAkB,uCAoK9B,CAAA"}