@1delta/margin-fetcher 0.0.24 → 0.0.26

package/dist/lending/user-data/compound-v3/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./userCallBuild";
 export * from "./userCallParse";
-export * from "./addresses";
 //# sourceMappingURL=index.d.ts.map

package/dist/lending/user-data/compound-v3/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA"}

package/dist/lending/user-data/compound-v3/index.js

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

package/dist/lending/user-data/compound-v3/userCallBuild.d.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry";
-import { Call } from "../../../utils/multicall";
+import { Lender } from '@1delta/asset-registry';
+import { Call } from '../../../utils/multicall';
 export declare const buildCompoundV3UserCall: (chainId: string, lender: Lender, account: string) => Call[];
 //# sourceMappingURL=userCallBuild.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAI/C,eAAO,MAAM,uBAAuB,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,KAAG,IAAI,EAwC9F,CAAA"}
+{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAQ/C,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,KACd,IAAI,EAkCN,CAAA"}

package/dist/lending/user-data/compound-v3/userCallBuild.js

@@ -1,10 +1,10 @@
-import { getLenderAssets } from "../../../utils";
-import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometRewardsAddress } from "./addresses";
+import { getLenderAssets } from '../../../utils';
+import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometRewardsAddress, } from '../../addresses/compoundV3';
 export const buildCompoundV3UserCall = (chainId, lender, account) => {
-    const baseAsset = getCompoundV3BaseAsset(lender, chainId).baseAsset;
+    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 = [
         {
             address: cometContractAddress,
@@ -15,7 +15,7 @@ export const buildCompoundV3UserCall = (chainId, lender, account) => {
             address: cometContractAddress,
             name: 'borrowBalanceOf',
             params: [account],
-        }
+        },
     ];
     const callsNonBase = assetsNoBase.map((tk) => {
         return {
@@ -29,10 +29,6 @@ export const buildCompoundV3UserCall = (chainId, lender, account) => {
         name: 'getRewardOwed',
         params: [cometContractAddress, account],
     };
-    const calls = [
-        ...callsNonBase,
-        ...baseCalls,
-        callEarnedBalances
-    ];
+    const calls = [...callsNonBase, ...baseCalls, callEarnedBalances];
     return calls;
 };

package/dist/lending/user-data/compound-v3/userCallParse.js

@@ -1,11 +1,11 @@
 import { getAssetMeta, getCompoundV3Assets, 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';
 export const getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
     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/dist/lending/user-data/fetchUserData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CA4Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAuCzB,CAAA"}
+{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CA4Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAsCzB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AA+CpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,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,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CA+EP,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AA+CpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,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,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CAuFP,CAAA"}

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

@@ -49,6 +49,13 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
             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, c) {
+                return (c + 1) * 100 + i;
+            }
             let marketsHandled = [];
             // de-chunk the calldata
             const returnDatas = data.flatMap((d) => decodePackedDataset(d));
@@ -57,7 +64,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 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 } = createMorphoEntryFromMarketWithLens(balanceData, chainId, market, prices, pricesHist);

package/dist/prices/main-prices/addresses/morpho.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"morpho.d.ts","sourceRoot":"","sources":["../../../../src/prices/main-prices/addresses/morpho.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,uBAAuB,EAAE,MAAM,CAAA;CAChC;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAsrC5D,CAAA"}
+{"version":3,"file":"morpho.d.ts","sourceRoot":"","sources":["../../../../src/prices/main-prices/addresses/morpho.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,uBAAuB,EAAE,MAAM,CAAA;CAChC;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAq9E5D,CAAA"}