@1delta/margin-fetcher 0.0.15 → 0.0.17

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

@@ -1,5 +1,6 @@
 import { GetEvmClientFunction } from '../../types';
 export declare const formatAavePrice: (price: string, isV2?: boolean) => number;
+export declare const formatMorphoPrice: (price: string, collateralDec: number, debtDec: number) => number;
 interface OracleData {
     [key: string]: number;
 }

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;AAGlD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAQ7D,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,CA8GpB,CAAA"}
+{"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"}

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

@@ -5,7 +5,7 @@ import { Api3OracleAbi } from '../../abis/oracle/Api3Oracle';
 import { RWADynamicOracleAbi } from '../../abis/oracle/RWADynamicOracle';
 import { api3OracleAddresses } from './addresses/api3';
 import { AAVE_V2_LENDERS, ASSET_META, Chain } from '@1delta/asset-registry';
-import { formatEther } from 'viem';
+import { formatEther, formatUnits } from 'viem';
 import { getAaveAssets } from '../../assets';
 import { chainlinkOracles, getChainLinkKeys, ChainlinkAggregatorIndexes, } from './addresses/chainlink';
 import { fetchDefillamaData } from '../defillama';
@@ -13,10 +13,27 @@ import { multicallViemAbiArray } from '../../utils/multicall';
 import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles';
 import { AAVES_PER_CHAIN } from '../../utils';
 import { parseRawAmount } from '../../utils/parsing';
+import { ProxyOracleAbi } from '../../abis/oracle/ProxyOracle';
+import { MrophoOracles } from './addresses/morpho';
 export const formatAavePrice = (price, isV2 = false) => {
-    return Number(formatEther(BigInt(price ?? '0') *
+    try {
+        return Number(formatEther(BigInt(price ?? '0') *
+            // 10^(18 - decimals)
+            10n ** (isV2 ? 0n : 10n)));
+    }
+    catch {
+        return NaN;
+    }
+};
+export const formatMorphoPrice = (price, collateralDec, debtDec) => {
+    try {
+        return Number(formatUnits(BigInt(price ?? '0'), 
         // 10^(18 - decimals)
-        10n ** (isV2 ? 0n : 10n)));
+        36 + collateralDec - debtDec));
+    }
+    catch {
+        return NaN;
+    }
 };
 const LENDLE_PAIR_MANTLE = '0x4c57BE599d0e0414785943569E9B6A66dA79Aa6b';
 const AU_PAIR_MANTLE = '0x709503fbb50b10f921e812c48fbd5c5522a0b20c';
@@ -43,6 +60,8 @@ export const fetchMainPrices = async (chainIds, getEvmClient) => {
                 handled = [...handled, ...newOnes];
             }
         });
+        const morphoQueries = (MrophoOracles[chainId] ?? []).filter((a) => !handled.includes(a.collateralAsset) || !handled.includes(a.loanAsset));
+        const morphoCalls = getMorphoCalls(morphoQueries);
         const callAave = getAaveCalls(queries);
         const [callsChainLink, chainLinkNames] = getChainLinkCalls(chainId);
         const uniswapV2Calls = getUniswapV2Calls(chainId);
@@ -54,12 +73,14 @@ export const fetchMainPrices = async (chainIds, getEvmClient) => {
             ...AaveOracleAbi,
             ...Api3OracleAbi,
             ...RWADynamicOracleAbi,
+            ...ProxyOracleAbi,
         ], [
             ...callsChainLink,
             ...callAave,
             ...uniswapV2Calls,
             ...api3Calls,
             ...rwaCalls,
+            ...morphoCalls,
         ], getEvmClient).then((multicallResult) => {
             const chainLinkResults = multicallResult.slice(0, callsChainLink.length);
             const aaveResult = multicallResult.slice(callsChainLink.length, callsChainLink.length + callAave.length);
@@ -82,13 +103,27 @@ export const fetchMainPrices = async (chainIds, getEvmClient) => {
                 api3Calls.length +
                 rwaCalls.length);
             const rwaData = parseRWADynamicOracleResults(chainId, rwaResult, rwaNames);
-            return {
+            const morphoResult = multicallResult.slice(callsChainLink.length +
+                callAave.length +
+                uniswapV2Calls.length +
+                api3Calls.length +
+                rwaCalls.length, callsChainLink.length +
+                callAave.length +
+                uniswapV2Calls.length +
+                api3Calls.length +
+                morphoCalls.length);
+            const prices = {
                 ...uniswapData,
                 ...aaveData,
                 ...chainLinkData,
                 ...api3Data,
                 ...rwaData,
             };
+            const morphoData = parseMorphoResults(chainId, morphoResult, morphoQueries, prices);
+            return {
+                ...prices,
+                ...morphoData,
+            };
         });
     });
     promises.push(fetchDefillamaData());
@@ -145,6 +180,21 @@ const getAaveCalls = (query) => {
     }))
         .flat();
 };
+/**
+ * Create calldata for aave oracles
+ * @param chainId network
+ * @param addressesAaveUnderlyings address array
+ * @returns call data
+ */
+const getMorphoCalls = (query = []) => {
+    if (query.length === 0)
+        return [];
+    return query.map(({ oracle }) => ({
+        address: oracle,
+        name: 'price',
+        params: [],
+    }));
+};
 /**
  * Create calldata for chainLink oracles
  * @param chainId network
@@ -232,6 +282,22 @@ const parseAaveResults = (chainId, data, queries) => {
     });
     return prices;
 };
+const parseMorphoResults = (chainId, data, queries, donePrices = {}) => {
+    let prices = {};
+    data.forEach((d, i) => {
+        const details = queries[i];
+        const { loanAsset, collateralAsset, loanAssetDecimals, collateralAssetDecimals, } = details;
+        const oracleId = ASSET_META[chainId][loanAsset]?.assetGroup ?? chainId + '-' + loanAsset;
+        const debtPrice = donePrices[oracleId];
+        const oracleIdCollateral = ASSET_META[chainId][collateralAsset]?.assetGroup ??
+            chainId + '-' + collateralAsset;
+        if (debtPrice) {
+            const priceCollateral = formatMorphoPrice(d.toString(), loanAssetDecimals, collateralAssetDecimals);
+            prices[oracleIdCollateral] = priceCollateral * debtPrice;
+        }
+    });
+    return prices;
+};
 /**
  * Parser for aave results in ulticall slice
  * @param chainId network

package/dist/types/providers.d.ts

@@ -1,5 +1,5 @@
 import { PublicClient } from 'viem';
-export type MulticallRetryFunction = (chain: string, calls: any[], abi: any, batchSize?: number, maxRetries?: number, providerId?: number, allowFailure?: boolean) => Promise<any[]>;
+export type MulticallRetryFunction = (chain: string, calls: any[], abi: any, batchSize?: number, maxRetries?: number, providerId?: number, allowFailure?: boolean, orverrides?: any) => Promise<any[]>;
 export type GetEvmClientFunction = (chain: string, rpcId?: number) => PublicClient;
 export interface ProviderDependencies {
     multicallRetry: MulticallRetryFunction;

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

@@ -1 +1 @@
-{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/types/providers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG,CACnC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,OAAO,KACnB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;AAEnB,MAAM,MAAM,oBAAoB,GAAG,CACjC,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,KACX,YAAY,CAAA;AAEjB,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,sBAAsB,CAAA;IACtC,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,sBAAsB,CAAA;IACvC,YAAY,CAAC,EAAE,oBAAoB,CAAA;CACpC"}
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/types/providers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG,CACnC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,GAAG,KACb,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;AAEnB,MAAM,MAAM,oBAAoB,GAAG,CACjC,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,KACX,YAAY,CAAA;AAEjB,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,sBAAsB,CAAA;IACtC,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,sBAAsB,CAAA;IACvC,YAAY,CAAC,EAAE,oBAAoB,CAAA;CACpC"}

package/package.json

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

package/src/abis/oracle/ProxyOracle.ts

@@ -0,0 +1,15 @@
+export const ProxyOracleAbi = [
+  {
+    inputs: [],
+    name: 'price',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const