@1delta/margin-fetcher 0.0.38 → 0.0.39

package/dist/lending/aave-v3-type/publicCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v3-type/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAK5B,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAOhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAG3C,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,GAAG,SAAS,EAAE,MAAM,CAwMnE,CAAA;AA8BD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,GAAG,GACb,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,SAAS,EAAE,MAAM,CAAC,CAuH5C"}
+{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v3-type/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAK5B,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAOhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAG3C,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,GAAG,SAAS,EAAE,MAAM,CA0LnE,CAAA;AAkFD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,GAAG,GACb,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,SAAS,EAAE,MAAM,CAAC,CAuH5C"}

package/dist/lending/aave-v3-type/publicCallParse.js

@@ -79,22 +79,8 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
                         resultReserves[asset] = {
                             ...resultReserves[asset],
                             decimals: Number(configData?.[AaveV3GetreserveConfigDataIndexes.decimals]),
-                            config: {
-                                ...populateEModes(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) /
-                                    BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS),
-                                ...(eModeCategory !== 0
-                                    ? {
-                                        [eModeCategory]: {
-                                            category: eModeCategory,
-                                            label: eModeConfigs[eModeCategory]?.label ?? 'Default',
-                                            borrowCollateralFactor: eModeConfigs[eModeCategory]?.borrowCollateralFactor ??
-                                                0,
-                                            collateralFactor: eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
-                                            borrowFactor: 1,
-                                        },
-                                    }
-                                    : {}),
-                            },
+                            config: populateEModes(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) /
+                                BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS, eModeCategory, eModeConfigs),
                             // flags
                             collateralActive: configData?.[AaveV3GetreserveConfigDataIndexes.usageAsCollateralEnabled],
                             borrowingEnabled: configData?.[AaveV3GetreserveConfigDataIndexes.borrowingEnabled],
@@ -120,7 +106,7 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
         }
     }
 };
-const populateEModes = (borrowCollateralFactor, collateralFactor) => {
+const populateEModes = (borrowCollateralFactor, collateralFactor, eModeCategory, eModeConfigs) => {
     let data = {};
     AAVE_V3_EMODES.forEach((e) => {
         data[e] = {
@@ -129,6 +115,45 @@ const populateEModes = (borrowCollateralFactor, collateralFactor) => {
             collateralFactor,
             borrowFactor: 1,
         };
+        if (e > 0)
+            data[e].debtDisabled = true;
+        if (e > 0 && e === eModeCategory && eModeConfigs[e]) {
+            data[e] = {
+                ...data[e],
+                category: e,
+                label: eModeConfigs[e]?.label ?? 'Default',
+                borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
+                collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
+                borrowFactor: 1,
+                debtDisabled: false,
+            };
+        }
+    });
+    return data;
+};
+const populateEModes32 = (borrowCollateralFactor, collateralFactor, collateralBitmap, debtBitmap, assetIndex, eModeConfigs) => {
+    let data = {};
+    AAVE_V3_EMODES.forEach((e) => {
+        data[e] = {
+            category: e,
+            borrowCollateralFactor,
+            collateralFactor,
+            borrowFactor: 1,
+        };
+        if (e > 0)
+            data[e].debtDisabled = !!eModeConfigs[e];
+        if (e > 0 && eModeConfigs[e]) {
+            data[e] = {
+                ...data[e],
+                category: e,
+                label: eModeConfigs[e]?.label ?? 'Default',
+                borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
+                collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
+                borrowFactor: 1,
+                collateralDisabled: !isReserveEnabledOnBitmap(collateralBitmap[e], assetIndex),
+                debtDisabled: !isReserveEnabledOnBitmap(debtBitmap[e], assetIndex),
+            };
+        }
     });
     return data;
 };
@@ -281,28 +306,16 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
                     // rewards
                     rewards: {},
                 };
-                const activeEmodes = AAVE_V3_EMODES.map((mode) => isReserveEnabledOnBitmap(debtBitmap[mode], lowerReservesList.indexOf(asset)) ||
-                    isReserveEnabledOnBitmap(collateralBitmap[mode], lowerReservesList.indexOf(asset))
+                const assetIndex = lowerReservesList.indexOf(asset);
+                const activeEmodes = AAVE_V3_EMODES.map((mode) => isReserveEnabledOnBitmap(debtBitmap[mode], assetIndex) ||
+                    isReserveEnabledOnBitmap(collateralBitmap[mode], assetIndex)
                     ? mode
                     : -1).filter((m) => m !== undefined && m > 0);
                 const eModeCategory = activeEmodes.length === 0 ? 0 : activeEmodes[0]; // Number(emodeResult[index].toString())
                 resultReserves[asset] = {
                     ...resultReserves[asset],
                     decimals: Number(configData?.[AaveV3GetreserveConfigDataIndexes.decimals]),
-                    config: {
-                        ...populateEModes(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) / BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS),
-                        ...(eModeCategory !== 0
-                            ? {
-                                [eModeCategory]: {
-                                    category: eModeCategory,
-                                    label: eModeConfigs[eModeCategory]?.label ?? 'Default',
-                                    borrowCollateralFactor: eModeConfigs[eModeCategory]?.borrowCollateralFactor ?? 0,
-                                    collateralFactor: eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
-                                    borrowFactor: 1,
-                                },
-                            }
-                            : {}),
-                    },
+                    config: populateEModes32(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) / BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS, collateralBitmap, debtBitmap, assetIndex, eModeConfigs),
                     // flags
                     collateralActive: configData?.[AaveV3GetreserveConfigDataIndexes.usageAsCollateralEnabled],
                     borrowingEnabled: configData?.[AaveV3GetreserveConfigDataIndexes.borrowingEnabled],

package/dist/lending/fetchLenderAll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchLenderAll.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLenderAll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAa1C,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,gBAAgB,sBAAsB,EACtC,YAAY,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAC1C,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAyBnC,CAAA"}
+{"version":3,"file":"fetchLenderAll.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLenderAll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAc1C,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,gBAAgB,sBAAsB,EACtC,YAAY,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAC1C,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAyBnC,CAAA"}

package/dist/lending/fetchLenderAll.js

@@ -10,6 +10,8 @@ function lenderCanUseApi(lender, chainId) {
             return false;
         if (chainId === Chain.SONEIUM)
             return false;
+        if (chainId === Chain.HEMI_NETWORK)
+            return false;
         return true;
     }
     return false;

package/dist/lending/morpho/constants/markets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markets.d.ts","sourceRoot":"","sources":["../../../../src/lending/morpho/constants/markets.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CA6DvD,CAAA"}
+{"version":3,"file":"markets.d.ts","sourceRoot":"","sources":["../../../../src/lending/morpho/constants/markets.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CA2FvD,CAAA"}

package/dist/lending/morpho/constants/markets.js

@@ -17,6 +17,23 @@ export const MORPHO_MARKETS = {
         '0x19e47d37453628ebf0fd18766ce6fee1b08ea46752a5da83ca0bfecb270d07e8',
         '0x1c6b87ae1b97071ef444eedcba9f5a92cfe974edbbcaa1946644fc7ab0e283af',
         '0x1da89208e6cb5173e97a83461853b8400de4f7c37542cf010a10579a5f7ca451',
+        '0x292f0a3ddfb642fbaadf258ebcccf9e4b0048a9dc5af93036288502bde1a71b1',
+        '0xace279b5c6eff0a1ce7287249369fa6f4d3d32225e1629b04ef308e0eb568fb0',
+        '0x96c7abf76aed53d50b2cc84e2ed17846e0d1c4cc28236d95b6eb3b12dcc86909',
+        '0x5fe3ac84f3a2c4e3102c3e6e9accb1ec90c30f6ee87ab1fcafc197b8addeb94c',
+        '0x707dddc200e95dc984feb185abf1321cabec8486dca5a9a96fb5202184106e54',
+        '0x87272614b7a2022c31ddd7bba8eb21d5ab40a6bcbea671264d59dc732053721d',
+        '0xe9a9bb9ed3cc53f4ee9da4eea0370c2c566873d5de807e16559a99907c9ae227',
+        '0xb39e45107152f02502c001a46e2d3513f429d2363323cdaffbc55a951a69b998',
+        '0x1f79fe1822f6bfe7a70f8e7e5e768efd0c3f10db52af97c2f14e4b71e3130e70',
+        '0xe500760b79e397869927a5275d64987325faae43326daf6be5a560184e30a521',
+        '0x86d7bc359391486de8cd1204da45c53d6ada60ab9764450dc691e1775b2e8d69',
+        '0x920244a8682a53b17fe15597b63abdaa3aecec44e070379c5e43897fb9f42a2b',
+        '0xd4fd53f612eaf411a1acea053cfa28cbfeea683273c4133bf115b47a20130305',
+        '0x1df0d0ebcdc52069692452cb9a3e5cf6c017b237378141eaf08a05ce17205ed6',
+        '0x888679b2af61343a4c7c0da0639fc5ca5fc5727e246371c4425e4d634c09e1f6',
+        '0xe0a1de770a9a72a083087fe1745c998426aaea984ddf155ea3d5fbba5b759713',
+        '0x1df0d0ebcdc52069692452cb9a3e5cf6c017b237378141eaf08a05ce17205ed6',
         '0x216bd19960f140177a4a3fb9cf258edcbadb1f5d54740fc944503bff4a00e65e',
         '0x2acd218c67daa94dd2f92e81f477ffc9f8507319f0f2d698eae5ed631ae14039',
         '0x2b62c4153d81d5b5a233d1d2b7ef899d3fca4076d458e215ff3a00176b415b0d',
@@ -26,8 +43,11 @@ export const MORPHO_MARKETS = {
         '0x53bf81793c2cc384c19a3bc9b032467e179a390a9225cd9542742ac10f539cc2',
         '0x5ecb7a25d51c870ec57f810c880e3e20743e56d0524575b7b8934a778aaec1af',
         '0x5ef35fe4418a6bcfcc70fe32efce30074f22e9a782f81d432c1e537ddbda11e2',
+        '0x64e7db7f042812d4335947a7cdf6af1093d29478aff5f1ccd93cc67f8aadfddc',
         '0x65f2a559764859a559d8c39604cf665942bab7d10dfaa1b82e914c9d351038d4',
+        '0x707dddc200e95dc984feb185abf1321cabec8486dca5a9a96fb5202184106e54',
         '0x7268244d330f1462f77ded7a14e2f868893e86e76e8b8eaa869405d588aff6ce',
+        '0x78f6b57d825ef01a5dc496ad1f426a6375c685047d07a30cd07ac5107ffc7976',
         '0x83bab0d612f592d0f145b2ec82fd730144dfb3d72c8fc838b27555558e49c496',
         '0x8eb8cfe3b1ac8f653608ae09fb099263fa2fe25d4a59305c309937292c2aeee9',
         '0x964e7d1db11bdf32262c71274c297dcdb4710d73acb814f04fdca8b0c7cdf028',
@@ -35,6 +55,7 @@ export const MORPHO_MARKETS = {
         '0xa24d04c3aff60d49b3475f0084334546cbf66182e788b6bf173e6f9990b2c816',
         '0xa62327642e110efd38ba2d153867a8625c8dc40832e1d211ba4f4151c3de9050',
         '0xa7fe39c692f0192fb2f281a6cc16c8b2e1c8f9b9f2bc418e0c0c1e9374bf4b04',
+        '0xace279b5c6eff0a1ce7287249369fa6f4d3d32225e1629b04ef308e0eb568fb0',
         '0xb142d65d7c624def0a9f4b49115b83f400a86bd2904d4f3339ec4441e28483ea',
         '0xb5b575e402c7c19def8661069c39464c8bf3297b638e64d841b09a4eb2807de5',
         '0xbc15a1782163f4be46c23ac61f5da50fed96ad40293f86a5ce0501ce4a246b32',
@@ -47,6 +68,7 @@ export const MORPHO_MARKETS = {
         '0xebeabb17bd69d4b8ed6929a821d69478b564f4cc604d0995944c9da8b5cb3f04',
         '0xed00791e29eb08c9bc0d8b389fe1f00084699baf2a785ba2a42e915706b17b82',
         '0xf25db2433ae650155eae04ebd8b3795d19bfcb318d22926a8a5e746e8028e0a8',
+        '0xfbe436e9aa361487f0c3e4ff94c88aea72887a4482c6b8bcfec60a8584cdb05e',
     ],
     [Chain.OP_MAINNET]: [
         '0x173b66359f0741b1c7f1963075cd271c739b6dc73b658e108a54ce6febeb279b',
@@ -60,4 +82,12 @@ export const MORPHO_MARKETS = {
         '0xebaf3dc6fa2fb3f78d18c87adcc37c06fe64874c5b2d69619ef7696088780df9',
         '0x5869019d7ec9f92db2e90c0156b542cda7c0a679c626eac842aa5117a0483d4a',
     ],
+    [Chain.HEMI_NETWORK]: [
+        '0x36931ab4ffe6fed55ab0624afd2bf6eb1cebdbd6d5c98334e949841e402f86ff',
+        '0x08abb2b634eb6454a5819dbaa5c0229136989a9990ed757727c406dbcb4e606b',
+        '0xf1b97d86baa12ef4622eeca186a49fa7f7ea1ac2aa55ea4c20a26e815ddd6bc6',
+        '0xb7dd4c2e7c164de474b28c354cddb137deb0ce2583b925d20c33322074c22178',
+        '0x4b670128dfaa02a92f833bb9b99949262b685c2d3f55d4f7c97da1849d2b6355',
+        '0x7c985a3ba92fa76a362f661b37a68c9955490eb659b7905aab6019b91042b452',
+    ],
 };

package/dist/lending/morpho/fetchPublic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchPublic.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/fetchPublic.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,EAAE,MAAM,MAAM,EAAE,SAAS,MAAM,WAoDjE,CAAA;AAKD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,gBAoBvD"}
+{"version":3,"file":"fetchPublic.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/fetchPublic.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,EAAE,MAAM,MAAM,EAAE,SAAS,MAAM,WAoDjE,CAAA;AAID,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,gBAwDvD"}

package/dist/lending/morpho/fetchPublic.js

@@ -1,3 +1,4 @@
+import { Chain } from '@1delta/chain-registry';
 export const query = (first, skip, chainId) => `
 query GetMarkets {
   markets(first: ${first}, skip: ${skip}, where:  {
@@ -51,22 +52,53 @@ query GetMarkets {
   }
 }
 `;
-const BASE_URL = "https://blue-api.morpho.org/graphql";
+const BASE_URL = 'https://blue-api.morpho.org/graphql';
 export async function fetchMorphoMarkets(chainId) {
-    const requestBody = {
+    if (chainId !== Chain.ETHEREUM_MAINNET) {
+        const requestBody = {
+            query: query(200, 0, chainId),
+            variables: {},
+        };
+        const response = await fetch(BASE_URL, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(requestBody),
+        });
+        if (!response.ok) {
+            throw new Error(`Network error: ${response.status} - ${response.statusText}`);
+        }
+        const data = await response.json();
+        return data.data;
+    }
+    const requestBody0 = {
         query: query(200, 0, chainId),
         variables: {},
     };
-    const response = await fetch(BASE_URL, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
+    const requestBody1 = {
+        query: query(200, 200, chainId),
+        variables: {},
+    };
+    const [data0, data1] = await Promise.all([
+        fetch(BASE_URL, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(requestBody0),
+        }).then((x) => x.json()),
+        fetch(BASE_URL, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(requestBody1),
+        }).then((x) => x.json()),
+    ]);
+    return {
+        markets: {
+            items: [...data0.data.markets.items, ...data1.data.markets.items],
         },
-        body: JSON.stringify(requestBody),
-    });
-    if (!response.ok) {
-        throw new Error(`Network error: ${response.status} - ${response.statusText}`);
-    }
-    const data = await response.json();
-    return data.data;
+    };
 }

package/dist/lending/morpho/getMarketsFromChain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMarketsFromChain.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/getMarketsFromChain.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAA;AAOrD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EAAE,EACjB,gBAAgB,EAAE,gBAAgB,YAIjC,EACD,MAAM,EAAE,gBAAgB,YAAK,EAC7B,MAAM,EAAE,GAAG;;GAwLZ;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,GAAG,EACX,gBAAgB,GAAE,gBAIjB,EACD,MAAM,GAAE,gBAAqB,GAC5B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,SAAS,EAAE,MAAM,CAAC,CAqL5C"}
+{"version":3,"file":"getMarketsFromChain.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/getMarketsFromChain.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAA;AAOrD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EAAE,EACjB,gBAAgB,EAAE,gBAAgB,YAIjC,EACD,MAAM,EAAE,gBAAgB,YAAK,EAC7B,MAAM,EAAE,GAAG;;GAuLZ;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,GAAG,EACX,gBAAgB,GAAE,gBAIjB,EACD,MAAM,GAAE,gBAAqB,GAC5B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,SAAS,EAAE,MAAM,CAAC,CAqL5C"}

package/dist/lending/user-data/morpho/userCallBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAI/C,eAAO,MAAM,WAAW,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAS9C,CAAA;AAyBD,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,gBAAgB,MAAM,EAAE,KACvB,IAAI,EAIN,CAAA;AAED,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,gBAAgB,MAAM,EAAE,KACvB,IAAI,EAaN,CAAA"}
+{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAI/C,eAAO,MAAM,WAAW,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAU9C,CAAA;AAyBD,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,gBAAgB,MAAM,EAAE,KACvB,IAAI,EAIN,CAAA;AAED,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,gBAAgB,MAAM,EAAE,KACvB,IAAI,EAaN,CAAA"}

package/dist/lending/user-data/morpho/userCallBuild.js

@@ -2,6 +2,7 @@ import { Chain } from '@1delta/chain-registry';
 import { chunk } from 'lodash';
 import { morphoPools } from '@1delta/data-sdk';
 export const MORPHO_LENS = {
+    [Chain.HEMI_NETWORK]: '0x1170Ef5B1A7f9c4F0ce34Ddf66CC0e6090Fd107E',
     [Chain.BASE]: '0x05f3f58716a88A52493Be45aA0871c55b3748f18',
     [Chain.POLYGON_MAINNET]: '0x04102873b1A80647879Aa8B8a119F07aE08f457a',
     [Chain.OP_MAINNET]: '0x61895aEB0a42679E2Df8EE64334C405a8d47D244',

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

@@ -73,7 +73,7 @@ export const fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
             ...RWADynamicOracleAbi,
             ...ProxyOracleAbi,
         ];
-        const result = await multicallRetry(chainId, allCalls, abis, undefined, 3, 0, true, rpcOverrides);
+        const result = await multicallRetry(chainId, allCalls, abis, undefined, 3, 0, false, rpcOverrides);
         return {
             chainId,
             result,
@@ -317,17 +317,17 @@ const parseUniswapV2results = (data, chainId) => {
             return {};
     }
 };
-function lowDecimalOracle(chainId, fork) {
+function getExponentForOracle(chainId, fork) {
     // some chains only have high decimal oracles
     if (chainId === Chain.AVALANCHE_C_CHAIN || chainId === Chain.MODE) {
-        return false;
+        return 10n;
     }
     if (chainId === Chain.XDC_NETWORK)
-        return true;
+        return 0n;
     if (chainId === Chain.TELOS_EVM_MAINNET)
-        return true;
+        return 10n;
     // otherwise, it depends on whether it is aave V3
-    return AAVE_V2_LENDERS.includes(fork);
+    return AAVE_V2_LENDERS.includes(fork) ? 0n : 10n;
 }
 /**
  * Parser for aave results in ulticall slice
@@ -343,7 +343,7 @@ const parseAaveResults = (chainId, data, queries, list = {}) => {
             const details = queries[i];
             details.assets.forEach((a, j) => {
                 const oracleId = list[a]?.assetGroup ?? chainId + '-' + a;
-                prices[oracleId] = formatAavePrice(d[j].toString(), lowDecimalOracle(chainId, details.fork));
+                prices[oracleId] = formatAavePrice(d[j].toString(), getExponentForOracle(chainId, details.fork));
             });
         }
     });

package/dist/utils/parsing.d.ts

@@ -12,6 +12,6 @@ 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;
 export declare const convertRateToApr: (ratePerSecond: number | string) => number;
-export declare const formatAavePrice: (price: string, isV2?: boolean) => number;
+export declare const formatAavePrice: (price: string, exponent?: bigint) => number;
 export declare const formatMorphoPrice: (price: string, collateralDec: number, debtDec: number) => number;
 //# sourceMappingURL=parsing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD,eAAO,MAAM,GAAG,QAAQ,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAA;AAED,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAI1C,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAA;AAGD,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAA;AAED,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"}
+{"version":3,"file":"parsing.d.ts","sourceRoot":"","sources":["../../src/utils/parsing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD,eAAO,MAAM,GAAG,QAAQ,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,iBAAa,KAAG,MAO/D,CAAA;AAED,oBAAY,SAAS;IACnB,KAAK,IAAA;IACL,EAAE,IAAA;CACH;AAYD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAI1C,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,IAAI,MAAM,GAAG,MAAM,KAAG,MAG7D,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,GAAG,MAAM,EACT,SAAS,MAAM,EACf,eAAiC,KAChC,MAgBF,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,WAGrE,CAAA;AAGD,eAAO,MAAM,gBAAgB,GAAI,eAAe,MAAM,GAAG,MAAM,WAI9D,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,iBAAc,KAAG,MAY/D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,eAAe,MAAM,EACrB,SAAS,MAAM,KACd,MAYF,CAAA"}

package/dist/utils/parsing.js

@@ -65,11 +65,11 @@ export const convertRateToApr = (ratePerSecond) => {
         return 0;
     return rps * 3600 * 24 * 365 * 100;
 };
-export const formatAavePrice = (price, isV2 = false) => {
+export const formatAavePrice = (price, exponent = 10n) => {
     try {
         return Number(formatEther(BigInt(price ?? '0') *
             // 10^(18 - decimals)
-            10n ** (isV2 ? 0n : 10n)));
+            10n ** (exponent)));
     }
     catch {
         return NaN;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAqGA,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,uCA+c9B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yields/index.ts"],"names":[],"mappings":"AAwGA,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,uCAmf9B,CAAA"}

package/dist/yields/index.js

@@ -31,6 +31,7 @@ const usdThree = 'Web 3 Dollar::USD3';
 const jitoSol = 'Jito Staked SOL::JitoSOL';
 const thBill = 'Theo Short Duration US Treasury Fund::THBILL';
 const ssuperusd = 'SuperReturn sSuperUSD::SSUPERUSD';
+const hbhype = 'hyperbeat x ether.fi HYPE::beHYPE';
 const FeedData = {
     WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
     STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -65,6 +66,7 @@ const FeedData = {
     THBILL: 'https://thbill-api.theo.xyz/snapshots',
     YEARN_KATANA: 'https://katana-apr-service.vercel.app/api/vaults',
     SSUPERUSD: 'https://www.superreturn.ai/api/trpc/cmc.getUSDCPrice,rewardBackend.getYield,rewardBackend.getTvlChange?batch=1&input=%7B%220%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%221%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%222%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%7D',
+    HBHYPE: 'https://api.hyperbeat.org/api/v1/staking?address=0xCeaD893b162D38e714D82d06a7fe0b0dc3c38E0b',
 };
 const LenderAPIs = {
     MERIDIAN: 'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields',
@@ -147,6 +149,29 @@ export const fetchGeneralYields = async () => {
             return 0;
         }
     });
+    const hbhypePromise = safeFetch('HBHYPE', async () => {
+        try {
+            const response = await fetch(FeedData.HBHYPE);
+            if (!response.ok) {
+                throw new Error(`HTTP error! Status: ${response.status}`);
+            }
+            const result = await response.json();
+            // Ensure data exists and delegations is an array
+            if (!result.success ||
+                !result.data ||
+                !Array.isArray(result.data.delegations)) {
+                throw new Error('Invalid response structure');
+            }
+            const delegations = result.data.delegations;
+            // Compute average APR
+            const totalApr = delegations.reduce((sum, validator) => sum + Number(validator.apr ?? 0), 0);
+            const averageApr = totalApr / delegations.length;
+            return averageApr;
+        }
+        catch (e) {
+            return 0;
+        }
+    });
     const ssuperusdPromise = safeFetch('SSUPERUSD', async () => {
         try {
             const res = await fetch(FeedData.SSUPERUSD, {
@@ -394,7 +419,7 @@ export const fetchGeneralYields = async () => {
             },
         })));
     });
-    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData, rtokensData, hypeData, osEthData, ethXData, pufEthData, angleData, susdsData, srUsdData, yusdData, rlpData, wstusrData, csusdlData, sdeusdData, rswethData, ynethxData, ethZeroData, usdZeroPlusData, jitoSolData, thBillData, yearnKatanaData, ssuperusdData,] = await Promise.all([
+    const [wstethData, ezethData, rethData, weethData, stmaticData, methData, maticXdata, susdeData, meridianData, savaxData, cbethData, rsethData, trumaticData, rtokensData, hypeData, osEthData, ethXData, pufEthData, angleData, susdsData, srUsdData, yusdData, rlpData, wstusrData, csusdlData, sdeusdData, rswethData, ynethxData, ethZeroData, usdZeroPlusData, jitoSolData, thBillData, yearnKatanaData, ssuperusdData, hbhypeData,] = await Promise.all([
         wstethPromise,
         ezethPromise,
         rethPromise,
@@ -429,6 +454,7 @@ export const fetchGeneralYields = async () => {
         thbillPromise,
         yearnKatanaPromise,
         ssuperusdPromise,
+        hbhypePromise,
     ]);
     const data = {
         intrinsicYields: {
@@ -464,6 +490,7 @@ export const fetchGeneralYields = async () => {
             [jitoSol]: jitoSolData,
             [thBill]: thBillData,
             [ssuperusd]: ssuperusdData,
+            [hbhype]: hbhypeData,
             ...rtokensData,
             ...hypeData,
             ...angleData,

package/package.json

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

package/src/lending/aave-v3-type/publicCallParse.ts

@@ -158,31 +158,17 @@ export const getAaveV3ReservesDataConverter = (
                 configData?.[AaveV3GetreserveConfigDataIndexes.decimals],
               ),
 
-              config: {
-                ...populateEModes(
-                  Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) /
-                    BPS,
-                  Number(
-                    configData?.[
-                      AaveV3GetreserveConfigDataIndexes.liquidationThreshold
-                    ],
-                  ) / BPS,
-                ),
-                ...(eModeCategory !== 0
-                  ? {
-                      [eModeCategory]: {
-                        category: eModeCategory,
-                        label: eModeConfigs[eModeCategory]?.label ?? 'Default',
-                        borrowCollateralFactor:
-                          eModeConfigs[eModeCategory]?.borrowCollateralFactor ??
-                          0,
-                        collateralFactor:
-                          eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
-                        borrowFactor: 1,
-                      },
-                    }
-                  : {}),
-              },
+              config: populateEModes(
+                Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) /
+                  BPS,
+                Number(
+                  configData?.[
+                    AaveV3GetreserveConfigDataIndexes.liquidationThreshold
+                  ],
+                ) / BPS,
+                eModeCategory,
+                eModeConfigs,
+              ),
 
               // flags
               collateralActive:
@@ -229,6 +215,8 @@ export const getAaveV3ReservesDataConverter = (
 const populateEModes = (
   borrowCollateralFactor: number,
   collateralFactor: number,
+  eModeCategory: number,
+  eModeConfigs: any,
 ) => {
   let data: any = {}
   AAVE_V3_EMODES.forEach((e) => {
@@ -238,6 +226,56 @@ const populateEModes = (
       collateralFactor,
       borrowFactor: 1,
     }
+
+    if (e > 0) data[e].debtDisabled = true
+
+    if (e > 0 && e === eModeCategory && eModeConfigs[e]) {
+      data[e] = {
+        ...data[e],
+        category: e,
+        label: eModeConfigs[e]?.label ?? 'Default',
+        borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
+        collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
+        borrowFactor: 1,
+        debtDisabled: false,
+      }
+    }
+  })
+  return data
+}
+
+const populateEModes32 = (
+  borrowCollateralFactor: number,
+  collateralFactor: number,
+  collateralBitmap: any,
+  debtBitmap: any,
+  assetIndex: number,
+  eModeConfigs: any,
+) => {
+  let data: any = {}
+  AAVE_V3_EMODES.forEach((e) => {
+    data[e] = {
+      category: e,
+      borrowCollateralFactor,
+      collateralFactor,
+      borrowFactor: 1,
+    }
+    if (e > 0) data[e].debtDisabled = !!eModeConfigs[e]
+    if (e > 0 && eModeConfigs[e]) {
+      data[e] = {
+        ...data[e],
+        category: e,
+        label: eModeConfigs[e]?.label ?? 'Default',
+        borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
+        collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
+        borrowFactor: 1,
+        collateralDisabled: !isReserveEnabledOnBitmap(
+          collateralBitmap[e],
+          assetIndex,
+        ),
+        debtDisabled: !isReserveEnabledOnBitmap(debtBitmap[e], assetIndex),
+      }
+    }
   })
   return data
 }
@@ -423,6 +461,7 @@ function parseAave32(
         debtBitmap[mode] = emodeDataResult[3 * index + 1]
         collateralBitmap[mode] = emodeDataResult[3 * index + 2]
       })
+
       // we get the reserves list to obtain the index per reserve
       const lowerReservesList = (reservesList as string[])?.map((a) =>
         a.toLowerCase(),
@@ -495,18 +534,14 @@ function parseAave32(
           // rewards
           rewards: {},
         }
+        const assetIndex = lowerReservesList.indexOf(asset)
         const activeEmodes = AAVE_V3_EMODES.map((mode) =>
-          isReserveEnabledOnBitmap(
-            debtBitmap[mode],
-            lowerReservesList.indexOf(asset),
-          ) ||
-          isReserveEnabledOnBitmap(
-            collateralBitmap[mode],
-            lowerReservesList.indexOf(asset),
-          )
+          isReserveEnabledOnBitmap(debtBitmap[mode], assetIndex) ||
+          isReserveEnabledOnBitmap(collateralBitmap[mode], assetIndex)
             ? mode
             : -1,
         ).filter((m) => m !== undefined && m > 0)
+
         const eModeCategory = activeEmodes.length === 0 ? 0 : activeEmodes[0] // Number(emodeResult[index].toString())
 
         resultReserves[asset] = {
@@ -515,29 +550,18 @@ function parseAave32(
             configData?.[AaveV3GetreserveConfigDataIndexes.decimals],
           ),
 
-          config: {
-            ...populateEModes(
-              Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) / BPS,
-              Number(
-                configData?.[
-                  AaveV3GetreserveConfigDataIndexes.liquidationThreshold
-                ],
-              ) / BPS,
-            ),
-            ...(eModeCategory !== 0
-              ? {
-                  [eModeCategory]: {
-                    category: eModeCategory,
-                    label: eModeConfigs[eModeCategory]?.label ?? 'Default',
-                    borrowCollateralFactor:
-                      eModeConfigs[eModeCategory]?.borrowCollateralFactor ?? 0,
-                    collateralFactor:
-                      eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
-                    borrowFactor: 1,
-                  },
-                }
-              : {}),
-          },
+          config: populateEModes32(
+            Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) / BPS,
+            Number(
+              configData?.[
+                AaveV3GetreserveConfigDataIndexes.liquidationThreshold
+              ],
+            ) / BPS,
+            collateralBitmap,
+            debtBitmap,
+            assetIndex,
+            eModeConfigs,
+          ),
 
           // flags
           collateralActive:

package/src/lending/fetchLenderAll.ts

@@ -10,6 +10,7 @@ function lenderCanUseApi(lender: string, chainId: string) {
     if (chainId === Chain.HYPEREVM) return false
     if (chainId === Chain.OP_MAINNET) return false
     if (chainId === Chain.SONEIUM) return false
+    if (chainId === Chain.HEMI_NETWORK) return false
     return true
   }
   return false

package/src/lending/morpho/constants/markets.ts

@@ -18,6 +18,23 @@ export const MORPHO_MARKETS: { [chain: string]: string[] } = {
     '0x19e47d37453628ebf0fd18766ce6fee1b08ea46752a5da83ca0bfecb270d07e8',
     '0x1c6b87ae1b97071ef444eedcba9f5a92cfe974edbbcaa1946644fc7ab0e283af',
     '0x1da89208e6cb5173e97a83461853b8400de4f7c37542cf010a10579a5f7ca451',
+    '0x292f0a3ddfb642fbaadf258ebcccf9e4b0048a9dc5af93036288502bde1a71b1',
+    '0xace279b5c6eff0a1ce7287249369fa6f4d3d32225e1629b04ef308e0eb568fb0',
+    '0x96c7abf76aed53d50b2cc84e2ed17846e0d1c4cc28236d95b6eb3b12dcc86909',
+    '0x5fe3ac84f3a2c4e3102c3e6e9accb1ec90c30f6ee87ab1fcafc197b8addeb94c',
+    '0x707dddc200e95dc984feb185abf1321cabec8486dca5a9a96fb5202184106e54',
+    '0x87272614b7a2022c31ddd7bba8eb21d5ab40a6bcbea671264d59dc732053721d',
+    '0xe9a9bb9ed3cc53f4ee9da4eea0370c2c566873d5de807e16559a99907c9ae227',
+    '0xb39e45107152f02502c001a46e2d3513f429d2363323cdaffbc55a951a69b998',
+    '0x1f79fe1822f6bfe7a70f8e7e5e768efd0c3f10db52af97c2f14e4b71e3130e70',
+    '0xe500760b79e397869927a5275d64987325faae43326daf6be5a560184e30a521',
+    '0x86d7bc359391486de8cd1204da45c53d6ada60ab9764450dc691e1775b2e8d69',
+    '0x920244a8682a53b17fe15597b63abdaa3aecec44e070379c5e43897fb9f42a2b',
+    '0xd4fd53f612eaf411a1acea053cfa28cbfeea683273c4133bf115b47a20130305',
+    '0x1df0d0ebcdc52069692452cb9a3e5cf6c017b237378141eaf08a05ce17205ed6',
+    '0x888679b2af61343a4c7c0da0639fc5ca5fc5727e246371c4425e4d634c09e1f6',
+    '0xe0a1de770a9a72a083087fe1745c998426aaea984ddf155ea3d5fbba5b759713',
+    '0x1df0d0ebcdc52069692452cb9a3e5cf6c017b237378141eaf08a05ce17205ed6',
     '0x216bd19960f140177a4a3fb9cf258edcbadb1f5d54740fc944503bff4a00e65e',
     '0x2acd218c67daa94dd2f92e81f477ffc9f8507319f0f2d698eae5ed631ae14039',
     '0x2b62c4153d81d5b5a233d1d2b7ef899d3fca4076d458e215ff3a00176b415b0d',
@@ -27,8 +44,11 @@ export const MORPHO_MARKETS: { [chain: string]: string[] } = {
     '0x53bf81793c2cc384c19a3bc9b032467e179a390a9225cd9542742ac10f539cc2',
     '0x5ecb7a25d51c870ec57f810c880e3e20743e56d0524575b7b8934a778aaec1af',
     '0x5ef35fe4418a6bcfcc70fe32efce30074f22e9a782f81d432c1e537ddbda11e2',
+    '0x64e7db7f042812d4335947a7cdf6af1093d29478aff5f1ccd93cc67f8aadfddc',
     '0x65f2a559764859a559d8c39604cf665942bab7d10dfaa1b82e914c9d351038d4',
+    '0x707dddc200e95dc984feb185abf1321cabec8486dca5a9a96fb5202184106e54',
     '0x7268244d330f1462f77ded7a14e2f868893e86e76e8b8eaa869405d588aff6ce',
+    '0x78f6b57d825ef01a5dc496ad1f426a6375c685047d07a30cd07ac5107ffc7976',
     '0x83bab0d612f592d0f145b2ec82fd730144dfb3d72c8fc838b27555558e49c496',
     '0x8eb8cfe3b1ac8f653608ae09fb099263fa2fe25d4a59305c309937292c2aeee9',
     '0x964e7d1db11bdf32262c71274c297dcdb4710d73acb814f04fdca8b0c7cdf028',
@@ -36,6 +56,7 @@ export const MORPHO_MARKETS: { [chain: string]: string[] } = {
     '0xa24d04c3aff60d49b3475f0084334546cbf66182e788b6bf173e6f9990b2c816',
     '0xa62327642e110efd38ba2d153867a8625c8dc40832e1d211ba4f4151c3de9050',
     '0xa7fe39c692f0192fb2f281a6cc16c8b2e1c8f9b9f2bc418e0c0c1e9374bf4b04',
+    '0xace279b5c6eff0a1ce7287249369fa6f4d3d32225e1629b04ef308e0eb568fb0',
     '0xb142d65d7c624def0a9f4b49115b83f400a86bd2904d4f3339ec4441e28483ea',
     '0xb5b575e402c7c19def8661069c39464c8bf3297b638e64d841b09a4eb2807de5',
     '0xbc15a1782163f4be46c23ac61f5da50fed96ad40293f86a5ce0501ce4a246b32',
@@ -48,6 +69,7 @@ export const MORPHO_MARKETS: { [chain: string]: string[] } = {
     '0xebeabb17bd69d4b8ed6929a821d69478b564f4cc604d0995944c9da8b5cb3f04',
     '0xed00791e29eb08c9bc0d8b389fe1f00084699baf2a785ba2a42e915706b17b82',
     '0xf25db2433ae650155eae04ebd8b3795d19bfcb318d22926a8a5e746e8028e0a8',
+    '0xfbe436e9aa361487f0c3e4ff94c88aea72887a4482c6b8bcfec60a8584cdb05e',
   ],
   [Chain.OP_MAINNET]: [
     '0x173b66359f0741b1c7f1963075cd271c739b6dc73b658e108a54ce6febeb279b',
@@ -61,4 +83,12 @@ export const MORPHO_MARKETS: { [chain: string]: string[] } = {
     '0xebaf3dc6fa2fb3f78d18c87adcc37c06fe64874c5b2d69619ef7696088780df9',
     '0x5869019d7ec9f92db2e90c0156b542cda7c0a679c626eac842aa5117a0483d4a',
   ],
+  [Chain.HEMI_NETWORK]: [
+    '0x36931ab4ffe6fed55ab0624afd2bf6eb1cebdbd6d5c98334e949841e402f86ff',
+    '0x08abb2b634eb6454a5819dbaa5c0229136989a9990ed757727c406dbcb4e606b',
+    '0xf1b97d86baa12ef4622eeca186a49fa7f7ea1ac2aa55ea4c20a26e815ddd6bc6',
+    '0xb7dd4c2e7c164de474b28c354cddb137deb0ce2583b925d20c33322074c22178',
+    '0x4b670128dfaa02a92f833bb9b99949262b685c2d3f55d4f7c97da1849d2b6355',
+    '0x7c985a3ba92fa76a362f661b37a68c9955490eb659b7905aab6019b91042b452',
+  ],
 }

package/src/lending/morpho/fetchPublic.ts

@@ -1,3 +1,4 @@
+import { Chain } from '@1delta/chain-registry'
 
 export const query = (first: number, skip: number, chainId: string) => `
 query GetMarkets {
@@ -53,27 +54,62 @@ query GetMarkets {
 }
 `
 
-const BASE_URL = "https://blue-api.morpho.org/graphql"
-
+const BASE_URL = 'https://blue-api.morpho.org/graphql'
 
 export async function fetchMorphoMarkets(chainId: string) {
+  if (chainId !== Chain.ETHEREUM_MAINNET) {
     const requestBody = {
-        query: query(200, 0, chainId),
-        variables: {},
-    };
+      query: query(200, 0, chainId),
+      variables: {},
+    }
     const response = await fetch(BASE_URL, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(requestBody),
-    });
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(requestBody),
+    })
 
     if (!response.ok) {
-        throw new Error(`Network error: ${response.status} - ${response.statusText}`);
+      throw new Error(
+        `Network error: ${response.status} - ${response.statusText}`,
+      )
     }
 
-    const data: any = await response.json();
+    const data: any = await response.json()
 
     return data.data
-}
+  }
+
+  const requestBody0 = {
+    query: query(200, 0, chainId),
+    variables: {},
+  }
+
+  const requestBody1 = {
+    query: query(200, 200, chainId),
+    variables: {},
+  }
+  const [data0, data1] = await Promise.all([
+    fetch(BASE_URL, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(requestBody0),
+    }).then((x) => x.json()),
+    fetch(BASE_URL, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(requestBody1),
+    }).then((x) => x.json()),
+  ])
+
+  return {
+    markets: {
+      items: [...data0.data.markets.items, ...data1.data.markets.items],
+    },
+  }
+}

package/src/lending/morpho/getMarketsFromChain.ts

@@ -63,7 +63,6 @@ export async function getMarkets(
       // get assets from list
       const loanAsset = tokens[loanToken.toLowerCase()]
       const collateralAsset = tokens[collateralToken.toLowerCase()]
-
       const loanKey =
         toOracleKey(loanAsset?.assetGroup!) ??
         toGenericPriceKey(loanAsset.address, chainId)

package/src/lending/user-data/morpho/userCallBuild.ts

@@ -5,6 +5,7 @@ import { chunk } from 'lodash'
 import { morphoPools } from '@1delta/data-sdk'
 
 export const MORPHO_LENS: { [c: string]: string } = {
+  [Chain.HEMI_NETWORK]: '0x1170Ef5B1A7f9c4F0ce34Ddf66CC0e6090Fd107E',
   [Chain.BASE]: '0x05f3f58716a88A52493Be45aA0871c55b3748f18',
   [Chain.POLYGON_MAINNET]: '0x04102873b1A80647879Aa8B8a119F07aE08f457a',
   [Chain.OP_MAINNET]: '0x61895aEB0a42679E2Df8EE64334C405a8d47D244',

package/src/prices/main-prices/fetchOracleData.ts

@@ -112,7 +112,7 @@ export const fetchMainPrices = async (
       undefined,
       3,
       0,
-      true,
+      false,
       rpcOverrides,
     )
 
@@ -451,15 +451,15 @@ const parseUniswapV2results = (data: any[], chainId: string) => {
   }
 }
 
-function lowDecimalOracle(chainId: string, fork: string) {
+function getExponentForOracle(chainId: string, fork: string) {
   // some chains only have high decimal oracles
   if (chainId === Chain.AVALANCHE_C_CHAIN || chainId === Chain.MODE) {
-    return false
+    return 10n
   }
-  if (chainId === Chain.XDC_NETWORK) return true
-  if (chainId === Chain.TELOS_EVM_MAINNET) return true
+  if (chainId === Chain.XDC_NETWORK) return 0n
+  if (chainId === Chain.TELOS_EVM_MAINNET) return 10n
   // otherwise, it depends on whether it is aave V3
-  return AAVE_V2_LENDERS.includes(fork as any)
+  return AAVE_V2_LENDERS.includes(fork as any) ? 0n : 10n
 }
 
 /**
@@ -484,7 +484,7 @@ const parseAaveResults = (
         const oracleId = list[a]?.assetGroup ?? chainId + '-' + a
         prices[oracleId] = formatAavePrice(
           d[j].toString(),
-          lowDecimalOracle(chainId, details.fork as any),
+          getExponentForOracle(chainId, details.fork as any),
         )
       })
     }

package/src/utils/parsing.ts

@@ -81,13 +81,13 @@ export const convertRateToApr = (ratePerSecond: number | string) => {
   return rps * 3600 * 24 * 365 * 100
 }
 
-export const formatAavePrice = (price: string, isV2 = false): number => {
+export const formatAavePrice = (price: string, exponent = 10n): number => {
   try {
     return Number(
       formatEther(
         BigInt(price ?? '0') *
           // 10^(18 - decimals)
-          10n ** (isV2 ? 0n : 10n),
+          10n ** (exponent),
       ),
     )
   } catch {

package/src/yields/index.ts

@@ -33,6 +33,7 @@ const usdThree = 'Web 3 Dollar::USD3'
 const jitoSol = 'Jito Staked SOL::JitoSOL'
 const thBill = 'Theo Short Duration US Treasury Fund::THBILL'
 const ssuperusd = 'SuperReturn sSuperUSD::SSUPERUSD'
+const hbhype = 'hyperbeat x ether.fi HYPE::beHYPE'
 const FeedData = {
   WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
   STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -70,6 +71,8 @@ const FeedData = {
   YEARN_KATANA: 'https://katana-apr-service.vercel.app/api/vaults',
   SSUPERUSD:
     'https://www.superreturn.ai/api/trpc/cmc.getUSDCPrice,rewardBackend.getYield,rewardBackend.getTvlChange?batch=1&input=%7B%220%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%221%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%222%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%7D',
+  HBHYPE:
+    'https://api.hyperbeat.org/api/v1/staking?address=0xCeaD893b162D38e714D82d06a7fe0b0dc3c38E0b',
 }
 
 const LenderAPIs = {
@@ -185,6 +188,39 @@ export const fetchGeneralYields = async () => {
     }
   })
 
+  const hbhypePromise = safeFetch('HBHYPE', async () => {
+    try {
+      const response = await fetch(FeedData.HBHYPE)
+      if (!response.ok) {
+        throw new Error(`HTTP error! Status: ${response.status}`)
+      }
+
+      const result = await response.json()
+
+      // Ensure data exists and delegations is an array
+      if (
+        !result.success ||
+        !result.data ||
+        !Array.isArray(result.data.delegations)
+      ) {
+        throw new Error('Invalid response structure')
+      }
+
+      const delegations = result.data.delegations
+
+      // Compute average APR
+      const totalApr = delegations.reduce(
+        (sum: any, validator: any) => sum + Number(validator.apr ?? 0),
+        0,
+      )
+      const averageApr = totalApr / delegations.length
+
+      return averageApr
+    } catch (e) {
+      return 0
+    }
+  })
+
   const ssuperusdPromise = safeFetch('SSUPERUSD', async () => {
     try {
       const res = await fetch(FeedData.SSUPERUSD, {
@@ -507,6 +543,7 @@ export const fetchGeneralYields = async () => {
     thBillData,
     yearnKatanaData,
     ssuperusdData,
+    hbhypeData,
   ] = await Promise.all([
     wstethPromise,
     ezethPromise,
@@ -542,6 +579,7 @@ export const fetchGeneralYields = async () => {
     thbillPromise,
     yearnKatanaPromise,
     ssuperusdPromise,
+    hbhypePromise,
   ])
 
   const data: YieldDataWithTimestamp = {
@@ -578,6 +616,7 @@ export const fetchGeneralYields = async () => {
       [jitoSol]: jitoSolData,
       [thBill]: thBillData,
       [ssuperusd]: ssuperusdData,
+      [hbhype]: hbhypeData,
       ...rtokensData,
       ...hypeData,
       ...angleData,

package/test/lenderData.test.ts

@@ -20,7 +20,7 @@ describe(
     it.only('should return lender data', async () => {
       await fetchLenderMetaFromDirAndInitialize()
 
-      const chainId = Chain.MORPH
+      const chainId = Chain.OP_MAINNET
       const list = await getDeltaTokenList(chainId)
       const ps = [
         fetchMainPrices([chainId], undefined, { [chainId]: { list } }),
@@ -32,7 +32,7 @@ describe(
       // console.log("yields", yields)
       // console.log("prices", prices)
 
-      const lenders =  getLendersForChain(chainId) as any
+      const lenders =[Lender.AAVE_V3]//  getLendersForChain(chainId) as any
       console.log('lenders', lenders)
       const lendingData = await getLenderPublicData(
         chainId,
@@ -44,7 +44,7 @@ describe(
       )
 
       prettyPrint(lendingData)
-    })
+    },{timeout:50000})
 
     it('should return pairs', async () => {
       const chainId = Chain.POLYGON_MAINNET

package/test/mainPrices.test.ts

@@ -9,7 +9,7 @@ describe(
     it('should return prices for valid tokens', async () => {
 
       await fetchLenderMetaFromDirAndInitialize()
-      const chainId = Chain.MORPH
+      const chainId = Chain.HEMI_NETWORK
       const list = await getDeltaTokenList(chainId)
       const mainPrices = await fetchMainPrices([
         chainId,

package/test/mbChain.test.ts

@@ -10,8 +10,7 @@ const fetchFromApi = async () =>
     (a) => a.json(),
   )
 
-
-const chainId = Chain.SONEIUM
+const chainId = Chain.HEMI_NETWORK
 
 describe(
   'find prices',
@@ -27,8 +26,8 @@ describe(
 
       const tokens = await getDeltaTokenList(chainId)
 
-      //   const ms = ((await fetchFromApi()) as any).map((a) => a.marketId)
-      //   console.log('ms', ms)
+      // const ms = ((await fetchFromApi()) as any).map((a:any) => a.marketId)
+      // console.log('ms', ms)
       const marketDatas = await getMarkets(
         chainId,
         MORPHO_MARKETS[chainId],

package/test/morpho.test.ts

@@ -8,7 +8,7 @@ import { convertMarketsToMorphoResponse } from "../src/lending/morpho/convertPub
 describe('find MB lending data', () => {
 
     it('should return and convert MB public data', async () => {
-        const chainId = Chain.KATANA
+        const chainId = Chain.ETHEREUM_MAINNET
 
         const mbData = await fetchMorphoMarkets(chainId)