@1delta/margin-fetcher 0.0.24 → 0.0.25

package/package.json

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

package/src/lending/user-data/compound-v3/index.ts

@@ -1,3 +1,2 @@
 export * from "./userCallBuild"
-export * from "./userCallParse"
-export * from "./addresses"
+export * from "./userCallParse"

package/src/lending/user-data/compound-v3/userCallBuild.ts

@@ -1,14 +1,21 @@
-import { Lender } from "@1delta/asset-registry"
-import { Call } from "../../../utils/multicall"
-import { getLenderAssets } from "../../../utils"
-import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometRewardsAddress } from "./addresses"
+import { Lender } from '@1delta/asset-registry'
+import { Call } from '../../../utils/multicall'
+import { getLenderAssets } from '../../../utils'
+import {
+  getCompoundV3BaseAsset,
+  getCompoundV3CometAddress,
+  getCompoundV3CometRewardsAddress,
+} from '../../addresses/compoundV3'
 
-export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account: string): Call[] => {
-
-  const baseAsset = getCompoundV3BaseAsset(lender, chainId).baseAsset
+export const buildCompoundV3UserCall = (
+  chainId: string,
+  lender: Lender,
+  account: string,
+): Call[] => {
+  const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset
   const cometContractAddress = getCompoundV3CometAddress(chainId, lender)!
   const assets = getLenderAssets(chainId, lender)
-  const assetsNoBase = assets.filter(a => a !== baseAsset)
+  const assetsNoBase = assets.filter((a) => a !== baseAsset)
 
   const baseCalls = [
     {
@@ -20,7 +27,7 @@ export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account
       address: cometContractAddress,
       name: 'borrowBalanceOf',
       params: [account],
-    }
+    },
   ]
 
   const callsNonBase: Call[] = assetsNoBase.map((tk) => {
@@ -36,11 +43,6 @@ export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account
     name: 'getRewardOwed',
     params: [cometContractAddress, account],
   }
-  const calls = [
-    ...callsNonBase,
-    ...baseCalls,
-    callEarnedBalances
-  ]
+  const calls = [...callsNonBase, ...baseCalls, callEarnedBalances]
   return calls
-
-}
+}

package/src/lending/user-data/compound-v3/userCallParse.ts

@@ -6,7 +6,7 @@ import {
   toGenericPriceKey,
   toOracleKey,
 } from '../../../assets'
-import { getCompoundV3BaseAsset } from './addresses'
+import { getCompoundV3BaseAsset } from '../../addresses/compoundV3'
 import { parseRawAmount } from '../../../utils/parsing'
 import { Asset as SupportedAssets } from '@1delta/asset-registry'
 import { createBaseTypeUserState } from '../utils'
@@ -20,7 +20,7 @@ export const getCompoundV3UserDataConverter = (
   lenderData: any,
 ): [(data: any[]) => CompoundV3UserReserveResponse | undefined, number] => {
   const assetAddresses = getCompoundV3Assets(chainId, lender)
-  const baseAsset = getCompoundV3BaseAsset(lender, chainId).baseAsset
+  const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset
   const assetsNoBase = assetAddresses.filter((a) => a !== baseAsset)
   const expectedNumberOfCalls = assetsNoBase.length + 2 + 1
   return [

package/src/lending/user-data/fetchUserData.ts

@@ -162,7 +162,6 @@ export const convertLenderUserDataResult = (
   lenderState: any,
 ): { [lender: string]: any } => {
   const queries = organizeUserQueries(queriesRaw)
-
   const lenderData: { [lender: string]: any } = {}
   let currentSlice = 0
   for (const query of queries) {

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

@@ -66,16 +66,24 @@ export const getMorphoUserDataConverterWithlens = (
       if (data.length !== expectedNumberOfCalls) {
         return undefined
       }
+
+      // we map the index from the return data
+      // to the real chunk
+      // it is
+      //  (chunk number) * (chunksize = 100) + index
+      function mapMarketToChunk(i: number, c: number) {
+        return (c + 1) * 100 + i
+      }
+
       let marketsHandled: string[] = []
       // de-chunk the calldata
       const returnDatas = data.flatMap((d) => decodePackedDataset(d))
-
       let datas: { [market: string]: MorphoUserReserveResponse } = {}
       for (let i = 0; i < returnDatas.length; i++) {
         let totalDebt24h = 0
         let totalDeposits24h = 0
         const balanceData = returnDatas[i]
-        const markeId = markets[balanceData.index]
+        const markeId = markets[mapMarketToChunk(balanceData.index, i)]
         marketsHandled.push(markeId)
         const market = lenderData[markeId]?.params?.market
         const { dataForMarket, addedDebt, addedDeposits } =
@@ -114,7 +122,7 @@ export const getMorphoUserDataConverterWithlens = (
 
       for (const marketId of markets) {
         const pubData = lenderData[marketId]
-        if (marketsHandled.includes(marketId)) continue;
+        if (marketsHandled.includes(marketId)) continue
         const payload = {
           chainId,
           account,