@1delta/margin-fetcher 0.0.32 → 0.0.34

package/test/mainPrices.test.ts

@@ -1,26 +1,26 @@
 import { describe, it } from 'vitest'
-import { fetchMainPrices } from '../src'
-import { Chain } from '@1delta/asset-registry'
+import { fetchLenderMetaFromDirAndInitialize, fetchMainPrices } from '../src'
+import { Chain } from '@1delta/chain-registry'
 import { prettyPrint } from './utils'
 
 describe(
   'find prices',
   () => {
     it('should return prices for valid tokens', async () => {
+
+      await fetchLenderMetaFromDirAndInitialize()
       const mainPrices = await fetchMainPrices([
-        // Chain.MANTLE,
-        // Chain.BNB_SMART_CHAIN_MAINNET,
-        // Chain.OP_MAINNET,
-        // Chain.POLYGON_MAINNET,
-        // Chain.HEMI_NETWORK,
-        // Chain.ARBITRUM_ONE,
-        // Chain.HYPEREVM,
-        // Chain.ETHEREUM_MAINNET,
-        Chain.BERACHAIN,
-        Chain.XDC_NETWORK,
-        Chain.CRONOS_MAINNET,
+        Chain.MANTLE,
+        Chain.BNB_SMART_CHAIN_MAINNET,
+        Chain.OP_MAINNET,
+        Chain.POLYGON_MAINNET,
+        Chain.HEMI_NETWORK,
+        Chain.ARBITRUM_ONE,
+        Chain.HYPEREVM,
+        Chain.ETHEREUM_MAINNET,
+        Chain.HEMI_NETWORK,
       ])
-      console.log(mainPrices['SOL'])
+      // console.log(mainPrices['Hemi::HEMI'])
       prettyPrint(mainPrices)
     })
   },

package/test/morpho.test.ts

@@ -1,5 +1,5 @@
 import { describe, it } from 'vitest'
-import { Chain } from "@1delta/asset-registry"
+import { Chain } from "@1delta/chain-registry"
 import { prettyPrint } from './utils'
 import { fetchMorphoMarkets } from "../src/lending/morpho/fetchPublic"
 import { convertMarketsToMorphoResponse } from "../src/lending/morpho/convertPublic"

package/test/morphoPrice.test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from 'vitest'
 import { fetchMorphoPriceMeta } from './morpho'
-import { Chain } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
 
 const chainId = Chain.KATANA
 describe(

package/test/userData.test.ts

@@ -9,7 +9,8 @@ import {
   getLenderPublicData,
 } from '../src'
 import { multicallRetry, getEvmClient } from '@1delta/providers'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
 import { LenderUserQuery } from '../src/lending/user-data/types'
 import { getLendersForChain } from '../src/utils'
 

package/test/userDataAave.test.ts

@@ -4,7 +4,7 @@ import {
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
 import { getEvmClient } from '@1delta/providers'
-import { Chain } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
 import { prettyPrint } from './utils'
 import { TestData } from './data'
 

package/test/userDataAaveMainnet.test.ts

@@ -4,11 +4,12 @@ import {
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
 import { getEvmClient } from '@1delta/providers'
-import { Chain } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
 import { prettyPrint } from './utils'
 import { TestDataMainnet } from './dataMainnet'
+import { fetchLenderMetaFromDirAndInitialize } from '../src/lending'
 
-export const queries = {
+const queries = {
   '1': [
     {
       account: '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5',
@@ -83,17 +84,15 @@ describe(
     it.only(
       'should fetch user data for Morpho on Base',
       async () => {
-        try {
-          const { userData } = await getUserData([Chain.ETHEREUM_MAINNET])
+        await fetchLenderMetaFromDirAndInitialize()
 
-          prettyPrint(userData)
+        const { userData } = await getUserData([Chain.ETHEREUM_MAINNET])
 
-          // Basic validation
-          expect(userData).toBeDefined()
-          expect(typeof userData).toBe('object')
-        } catch (error) {
-          console.log('Error fetching Morpho Base data:', error)
-        }
+        prettyPrint(userData)
+
+        // Basic validation
+        expect(userData).toBeDefined()
+        expect(typeof userData).toBe('object')
       },
       { timeout: 30000 },
     )

package/test/userDataAll.test.ts

@@ -4,7 +4,8 @@ import {
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
 import { getEvmClient } from '@1delta/providers'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
 import { prettyPrint } from './utils'
 import { TestData } from './data'
 // random user with ETH

package/test/userDataCompound.test.ts

@@ -9,7 +9,8 @@ import {
   getLenderPublicData,
 } from '../src'
 import { multicallRetry, getEvmClient } from '@1delta/providers'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
 import { LenderUserQuery } from '../src/lending/user-data/types'
 import { getLendersForChain } from '../src/utils'
 import { prettyPrint } from './utils'

package/test/userDataMorpho.test.ts

@@ -5,7 +5,8 @@ import {
 } from '../src/lending/user-data/fetchUserData'
 import { fetchGeneralYields, fetchMainPrices } from '../src'
 import { getEvmClient } from '@1delta/providers'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
 import { LenderUserQuery } from '../src/lending/user-data/types'
 import { fetchMorphoPublicData } from '../src/lending/morpho/publicCallBuild'
 import { prettyPrint } from './utils'

package/test/userDataMorphoEthereum.test.ts

@@ -3,38 +3,44 @@ import {
   getLenderUserDataResult,
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
-import { getEvmClient } from '@1delta/providers'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { getEvmClient, getEvmClientWithCustomRpcs } from '@1delta/providers'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
 import { LenderUserQuery } from '../src/lending/user-data/types'
 import { prettyPrint } from './utils'
+import { fetchLenderMetaFromDirAndInitialize } from '../src/lending'
 
 // random user with ETH
 const TEST_ADDRESS = '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5'
-let prices
+let prices, pricesHist
 
 async function getUserData(chainId: Chain, publicData: any) {
   // Define user queries
   const queries: LenderUserQuery[] = Object.keys(publicData.data).map((m) => ({
     lender: m,
     account: TEST_ADDRESS.toLowerCase(),
+    assets: Object.keys(publicData.data[m].data), // map the assets to query
     // params: lenders,
   }))
 
-// console.log("queries", queries)
+  // console.log("queries", queries)
 
   // Fetch raw user data
   const rawUserData = await getLenderUserDataResult(
     chainId,
     queries,
-    getEvmClient,
+    getEvmClientWithCustomRpcs,
   )
+
+  // console.log('rawUserData', rawUserData)
+
   // Convert raw data to structured format
   const userData = convertLenderUserDataResult(
     chainId,
     queries,
     rawUserData,
     prices as any,
-    prices as any,
+    pricesHist as any,
     { [chainId]: publicData },
   )
 
@@ -47,28 +53,21 @@ describe(
     it(
       'should fetch user data for Morpho on KATANA',
       async () => {
-        try {
-          const chainId = Chain.ETHEREUM_MAINNET
-          const all = await fetch(
-            `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
-          ).then((a) => a.json())
-          prices = all.prices
-
-          const publicData = all.data[chainId]
-          const { userData } = await getUserData(chainId, publicData)
+        await fetchLenderMetaFromDirAndInitialize()
+        const chainId = Chain.ETHEREUM_MAINNET
+        const all = await fetch(
+          `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
+        ).then((a) => a.json())
+        prices = all.prices
+        pricesHist = all.pricesHist
+        const publicData = all.data[chainId]
+        const { userData } = await getUserData(chainId, publicData)
 
-          prettyPrint(
-            userData[
-              'MORPHO_BLUE_C4E18EB6D0E9B0FA90A15BC0A98190CBF3D5BA763AF410346F5174B014CEFD8D'
-            ],
-          )
+        prettyPrint(userData)
 
-          // Basic validation
-          expect(userData).toBeDefined()
-          expect(typeof userData).toBe('object')
-        } catch (error) {
-          console.log('Error fetching Morpho KATANA data:', error)
-        }
+        // Basic validation
+        expect(userData).toBeDefined()
+        expect(typeof userData).toBe('object')
       },
       { timeout: 30000 },
     )

package/test/userDataMorphoKatana.test.ts

@@ -4,7 +4,8 @@ import {
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
 import { getEvmClient } from '@1delta/providers'
-import { Chain, Lender } from '@1delta/asset-registry'
+import { Chain } from '@1delta/chain-registry'
+import { Lender } from '@1delta/lender-registry'
 import { LenderUserQuery } from '../src/lending/user-data/types'
 import { prettyPrint } from './utils'
 

package/test/utils.ts

@@ -10,4 +10,14 @@ export function prettyPrint(obj: any) {
       console.log(`${keyStr} ${value}`)
     }
   }
-}
+}
+
+const getListUrl = (chainId: string) =>
+  `https://raw.githubusercontent.com/1delta-DAO/asset-lists/main/${chainId}.json`
+
+export async function getDeltaTokenList(chain: string) {
+  const data = await fetch(getListUrl(chain))
+  // @ts-ignore
+  const list = (await data.json()).list as GenericTokenList
+  return list
+}

package/dist/lending/user-data/morpho/userCallParseNoDeploy.d.ts

@@ -1,11 +0,0 @@
-import { Lender } from "@1delta/asset-registry";
-import { MorphoUserReserveResponse } from "../types";
-import { MorphoMarket } from "../../morpho/types";
-export declare const getMorphoUserDataConverter: (lender: Lender, chainId: string, account: string, markets: MorphoMarket[], prices: {
-    [asset: string]: number;
-}, pricesHist: {
-    [asset: string]: number;
-}, lenderData: any) => [(data: any[]) => {
-    [market: string]: MorphoUserReserveResponse;
-} | undefined, number];
-//# sourceMappingURL=userCallParseNoDeploy.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"userCallParseNoDeploy.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParseNoDeploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAIpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,YAAY,EAAE,EACvB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CAoDvF,CAAA"}

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

@@ -1,112 +0,0 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets";
-import { createBaseTypeUserState } from "../utils";
-import { MorphoPositionParams } from "./types";
-import { parseRawAmount } from "../../../utils/parsing";
-import { toAssetsDown } from "./morphoLib";
-export const getMorphoUserDataConverter = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
-    const expectedNumberOfCalls = markets.length * 2;
-    return [
-        (data) => {
-            if (data.length !== expectedNumberOfCalls) {
-                return undefined;
-            }
-            let datas = {};
-            for (let i = 0; i < markets.length; i++) {
-                let totalDebt24h = 0;
-                let totalDeposits24h = 0;
-                const market = markets[i];
-                const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarket(i, data, chainId, market, prices, pricesHist);
-                if (!dataForMarket)
-                    continue;
-                totalDebt24h += addedDebt;
-                totalDeposits24h += addedDeposits;
-                const payload = {
-                    chainId,
-                    account,
-                    lendingPositions: { "0": dataForMarket },
-                    rewards: {},
-                };
-                const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h);
-                datas[market.lender] = {
-                    ...payload,
-                    ...userData,
-                    id: market.id
-                };
-            }
-            return datas;
-        },
-        expectedNumberOfCalls,
-    ];
-};
-function createMorphoEntryFromMarket(i, data, chainId, market, prices, pricesHist) {
-    const userPosition = data[2 * i];
-    const marketData = data[2 * i + 1];
-    const collateralBalance = userPosition[MorphoPositionParams.collateral]?.toString();
-    const currentLendShares = userPosition[MorphoPositionParams.supplyShares]?.toString();
-    const currentBorrowShares = userPosition[MorphoPositionParams.borrowShares]?.toString();
-    const totalSupplyShares = BigInt(marketData[MorphoPositionParams.collateral]?.toString() ?? 0n);
-    const totalSupplyAssets = BigInt(marketData[MorphoPositionParams.supplyShares]?.toString() ?? 0n);
-    const totalBorrowShares = BigInt(marketData[MorphoPositionParams.borrowShares]?.toString() ?? 0n);
-    const totalBorrowAssets = BigInt(marketData[MorphoPositionParams.borrowShares]?.toString() ?? 0n);
-    if (currentLendShares === "0" &&
-        currentBorrowShares === "0" &&
-        collateralBalance === "0") {
-        return {
-            dataForMarket: undefined,
-            addedDeposits: 0,
-            addedDebt: 0
-        };
-    }
-    const loanMeta = getAssetMeta(chainId, market.loanAddress);
-    const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(market.loanAddress, chainId);
-    // prices
-    const priceLoan = prices[loanKey] ?? 1;
-    const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan;
-    const deposits = toAssetsDown(currentLendShares, totalSupplyAssets, totalSupplyShares);
-    const borrow = toAssetsDown(currentBorrowShares, totalBorrowAssets, totalBorrowShares);
-    const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
-    const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
-    const dataForLoanAsset = {
-        poolId: market.loanAddress,
-        underlying: market.loanAddress,
-        deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
-        depositsRaw: deposits.toString(),
-        debtStable: "0",
-        debt: borrowDec,
-        depositsUSD: Number(depositDec) * priceLoan,
-        debtStableUSD: 0,
-        debtUSD: Number(borrowDec) * priceLoan,
-        stableBorrowRate: "0",
-        collateralActive: true,
-        claimableRewards: 0,
-    };
-    const assetMeta = getAssetMeta(chainId, market.collateralAddress);
-    const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18;
-    const collateralDec = parseRawAmount(collateralBalance, decimals);
-    const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(market.collateralAddress, chainId);
-    // prices
-    const price = prices[key] ?? 1;
-    const priceHist = pricesHist?.[key] ?? price;
-    const dataForCollateralAsset = {
-        poolId: market.collateralAddress,
-        underlying: market.collateralAddress,
-        deposits: collateralDec,
-        depositsRaw: collateralBalance,
-        debtStable: "0",
-        debt: "0",
-        depositsUSD: Number(collateralDec) * price,
-        debtStableUSD: 0,
-        debtUSD: 0,
-        stableBorrowRate: "0",
-        collateralActive: true,
-        claimableRewards: 0,
-    };
-    return {
-        dataForMarket: {
-            [market.loanAddress]: dataForLoanAsset,
-            [market.collateralAddress]: dataForCollateralAsset
-        },
-        addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
-        addedDebt: Number(borrowDec) * priceHistLoan
-    };
-}