@1delta/margin-fetcher 0.0.18 → 0.0.19

package/dist/assets/liquidityThresholds.d.ts

@@ -26,4 +26,14 @@ export declare function meetsLiquidityThresholds(pool: {
     totalDebtUSD: number;
     totalLiquidityUSD: number;
 }, thresholds: LiquidityThresholds): boolean;
+export declare function meetsLiquidityThresholdsLong(pool: {
+    totalDepositsUSD: number;
+    totalDebtUSD: number;
+    totalLiquidityUSD: number;
+}, thresholds: LiquidityThresholds): boolean;
+export declare function meetsLiquidityThresholdsShort(pool: {
+    totalDepositsUSD: number;
+    totalDebtUSD: number;
+    totalLiquidityUSD: number;
+}, thresholds: LiquidityThresholds): boolean;
 //# sourceMappingURL=liquidityThresholds.d.ts.map

package/dist/assets/liquidityThresholds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liquidityThresholds.d.ts","sourceRoot":"","sources":["../../src/assets/liquidityThresholds.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,mBAAmB;IAClC,oCAAoC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,4BAA4B,EAAE,mBAI1C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAMzF,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAWpE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAEhF,CAAC;AAKF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAC,MAAM,GACjB,mBAAmB,CAkBrB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,EACnF,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAMT"}
+{"version":3,"file":"liquidityThresholds.d.ts","sourceRoot":"","sources":["../../src/assets/liquidityThresholds.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,mBAAmB;IAClC,oCAAoC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,4BAA4B,EAAE,mBAI1C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAMzF,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAWpE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAEhF,CAAC;AAKF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,CAAC,EAAC,MAAM,GACjB,mBAAmB,CAkBrB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,EACnF,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAMT;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,EACnF,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAIT;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,EACnF,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAKT"}

package/dist/assets/liquidityThresholds.js

@@ -1,8 +1,8 @@
 import { Chain } from "@1delta/asset-registry";
 export const DEFAULT_LIQUIDITY_THRESHOLDS = {
-    minDepositsUSD: 50_000,
+    minDepositsUSD: 25_000,
     minDebtUSD: 10_000,
-    minLiquidityUSD: 25_000,
+    minLiquidityUSD: 15_000,
 };
 export const ASSET_GROUP_LIQUIDITY_THRESHOLDS = {
     'USDC': {
@@ -49,3 +49,10 @@ export function meetsLiquidityThresholds(pool, thresholds) {
         pool.totalDebtUSD >= thresholds.minDebtUSD &&
         pool.totalLiquidityUSD >= thresholds.minLiquidityUSD);
 }
+export function meetsLiquidityThresholdsLong(pool, thresholds) {
+    return (pool.totalDepositsUSD >= thresholds.minDepositsUSD);
+}
+export function meetsLiquidityThresholdsShort(pool, thresholds) {
+    return (pool.totalDebtUSD >= thresholds.minDebtUSD &&
+        pool.totalLiquidityUSD >= thresholds.minLiquidityUSD);
+}

package/dist/flash-liquidity/fetchLiquidity.d.ts

@@ -1,4 +1,4 @@
-import { MulticallRetryFunction } from "../types";
-import { FlashLiquiditiesOnChain } from "./types";
+import { MulticallRetryFunction } from '../types';
+import { FlashLiquiditiesOnChain } from './types';
 export declare function fetchFlashLiquidityForChain(chain: string, multicallRetry: MulticallRetryFunction): Promise<FlashLiquiditiesOnChain>;
 //# sourceMappingURL=fetchLiquidity.d.ts.map

package/dist/flash-liquidity/fetchLiquidity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchLiquidity.d.ts","sourceRoot":"","sources":["../../src/flash-liquidity/fetchLiquidity.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAgB,MAAM,SAAS,CAAC;AAoBhE,wBAAsB,2BAA2B,CAC7C,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,sBAAsB,oCAyQzC"}
+{"version":3,"file":"fetchLiquidity.d.ts","sourceRoot":"","sources":["../../src/flash-liquidity/fetchLiquidity.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAEjD,OAAO,EAAE,uBAAuB,EAAgB,MAAM,SAAS,CAAA;AAsB/D,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,sBAAsB,oCAwSvC"}

package/dist/flash-liquidity/fetchLiquidity.js

@@ -1,12 +1,12 @@
-import { getAaveStyleProtocolTokenMap, getAaveTypePoolAddress, getAssetMeta } from "../assets";
-import { AAVES_PER_CHAIN } from "../utils";
-import { RELEVANT_BALANCER_V2_FORKS, RELEVANT_BALANCER_V3_FORKS, RELEVANT_LENDING_ASSETS, RELEVANT_MORPHOB_FORKS, RELEVANT_UNISWAP_V4_FORKS } from "./assets";
-import { FlashAbi } from "../abis/flashloan-united/flashAbi";
-import { FlashLoanIds } from "./types";
-import { FLASH_LOAN_IDS } from "@1delta/dex-registry";
-import { formatUnits, zeroAddress } from "viem";
-import { AAVE_V2_LENDERS, AAVE_V3_LENDERS } from "@1delta/asset-registry";
-import { MULTICALL_ADDRESS } from "../utils/constants";
+import { getAaveStyleProtocolTokenMap, getAaveTypePoolAddress, getAssetMeta, } from '../assets';
+import { AAVES_PER_CHAIN } from '../utils';
+import { RELEVANT_BALANCER_V2_FORKS, RELEVANT_BALANCER_V3_FORKS, RELEVANT_LENDING_ASSETS, RELEVANT_MORPHOB_FORKS, RELEVANT_UNISWAP_V4_FORKS, } from './assets';
+import { FlashAbi } from '../abis/flashloan-united/flashAbi';
+import { FlashLoanIds } from './types';
+import { FLASH_LOAN_IDS } from '@1delta/dex-registry';
+import { formatUnits, zeroAddress } from 'viem';
+import { AAVE_V2_LENDERS, AAVE_V3_LENDERS } from '@1delta/asset-registry';
+import { MULTICALL_ADDRESS } from '../utils/constants';
 const DEFAULT_BATCH_SIZE = 4096;
 var BalanceFetchCall;
 (function (BalanceFetchCall) {
@@ -24,21 +24,21 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
     let aaveCalls = [];
     const aaveProtocols = AAVES_PER_CHAIN[chain] ?? [];
     // we only ned to check aave flash liquidity for aave assets
-    aaveProtocols.forEach(aaveFork => {
+    aaveProtocols.forEach((aaveFork) => {
         const underlyingsAndATokens = Object.entries(getAaveStyleProtocolTokenMap(chain, aaveFork));
         const pool = getAaveTypePoolAddress(chain, aaveFork);
         const tokenCalls = underlyingsAndATokens
             .map(([a, b]) => [
             { name: BalanceFetchCall.balanceOf, address: a, args: [b.aToken] },
-            { name: "getConfiguration", address: pool, args: [a] }
+            { name: 'getConfiguration', address: pool, args: [a] },
         ])
             .reduce((acc, b) => [...acc, ...b], []);
-        aaveAssets[aaveFork] = underlyingsAndATokens.map(a => a[0]);
+        aaveAssets[aaveFork] = underlyingsAndATokens.map((a) => a[0]);
         callLengths[aaveFork] = tokenCalls.length * 2 + 1;
         aaveCalls = [
             ...aaveCalls,
             ...tokenCalls,
-            { name: "FLASHLOAN_PREMIUM_TOTAL", address: pool },
+            { name: 'FLASHLOAN_PREMIUM_TOTAL', address: pool },
         ];
     });
     // @ts-ignore
@@ -46,60 +46,84 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
     const otherAssets = RELEVANT_LENDING_ASSETS[chain] ?? [];
     let morphoCalls = [];
     if (morphoBs && morphoBs.length > 0) {
-        morphoBs.forEach(bFork => {
+        morphoBs.forEach((bFork) => {
             callLengths[bFork.pool] = otherAssets.length;
             morphoCalls = [
                 ...morphoCalls,
-                ...otherAssets.map(address => address === zeroAddress ? ({
-                    name: BalanceFetchCall.getEthBalance,
-                    address: MULTICALL_ADDRESS[chain],
-                    args: [bFork.address],
-                }) : ({ name: BalanceFetchCall.balanceOf, address, args: [bFork.address] }))
+                ...otherAssets.map((address) => address === zeroAddress
+                    ? {
+                        name: BalanceFetchCall.getEthBalance,
+                        address: MULTICALL_ADDRESS[chain],
+                        args: [bFork.address],
+                    }
+                    : {
+                        name: BalanceFetchCall.balanceOf,
+                        address,
+                        args: [bFork.address],
+                    }),
             ];
         });
     }
     const balancerV2s = RELEVANT_BALANCER_V2_FORKS[chain] ?? [];
     let balancerV2Calls = [];
     if (balancerV2s && balancerV2s.length > 0) {
-        balancerV2s.forEach(bFork => {
+        balancerV2s.forEach((bFork) => {
             callLengths[bFork.pool] = otherAssets.length;
             balancerV2Calls = [
                 ...balancerV2Calls,
-                ...otherAssets.map(address => address === zeroAddress ? ({
-                    name: BalanceFetchCall.getEthBalance,
-                    address: MULTICALL_ADDRESS[chain],
-                    args: [bFork.address],
-                }) : ({ name: BalanceFetchCall.balanceOf, address, args: [bFork.address] }))
+                ...otherAssets.map((address) => address === zeroAddress
+                    ? {
+                        name: BalanceFetchCall.getEthBalance,
+                        address: MULTICALL_ADDRESS[chain],
+                        args: [bFork.address],
+                    }
+                    : {
+                        name: BalanceFetchCall.balanceOf,
+                        address,
+                        args: [bFork.address],
+                    }),
             ];
         });
     }
     const balancerV3s = RELEVANT_BALANCER_V3_FORKS[chain] ?? [];
     let balancerV3Calls = [];
     if (balancerV3s && balancerV3s.length > 0) {
-        balancerV3s.forEach(bFork => {
+        balancerV3s.forEach((bFork) => {
             callLengths[bFork.pool] = otherAssets.length;
             balancerV3Calls = [
                 ...balancerV3Calls,
-                ...otherAssets.map(address => address === zeroAddress ? ({
-                    name: BalanceFetchCall.getEthBalance,
-                    address: MULTICALL_ADDRESS[chain],
-                    args: [bFork.address],
-                }) : ({ name: BalanceFetchCall.balanceOf, address, args: [bFork.address] }))
+                ...otherAssets.map((address) => address === zeroAddress
+                    ? {
+                        name: BalanceFetchCall.getEthBalance,
+                        address: MULTICALL_ADDRESS[chain],
+                        args: [bFork.address],
+                    }
+                    : {
+                        name: BalanceFetchCall.balanceOf,
+                        address,
+                        args: [bFork.address],
+                    }),
             ];
         });
     }
     const uniswapV4s = RELEVANT_UNISWAP_V4_FORKS[chain] ?? [];
     let uniswapV4Calls = [];
     if (uniswapV4s && uniswapV4s.length > 0) {
-        uniswapV4s.forEach(u4Fork => {
+        uniswapV4s.forEach((u4Fork) => {
             callLengths[u4Fork.pool] = otherAssets.length;
             uniswapV4Calls = [
                 ...uniswapV4Calls,
-                ...otherAssets.map(address => address === zeroAddress ? ({
-                    name: BalanceFetchCall.getEthBalance,
-                    address: MULTICALL_ADDRESS[chain],
-                    args: [u4Fork.address],
-                }) : ({ name: BalanceFetchCall.balanceOf, address, args: [u4Fork.address] }))
+                ...otherAssets.map((address) => address === zeroAddress
+                    ? {
+                        name: BalanceFetchCall.getEthBalance,
+                        address: MULTICALL_ADDRESS[chain],
+                        args: [u4Fork.address],
+                    }
+                    : {
+                        name: BalanceFetchCall.balanceOf,
+                        address,
+                        args: [u4Fork.address],
+                    }),
             ];
         });
     }
@@ -113,7 +137,7 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
     const rawResults = await multicallRetry(chain, calls, FlashAbi, DEFAULT_BATCH_SIZE, 3, 0, false);
     let liquidity = {};
     let currentOffset = 0;
-    aaveProtocols.forEach(aave => {
+    aaveProtocols.forEach((aave) => {
         const callLen = aaveAssets[aave].length * 2 + 1;
         const data = rawResults.slice(currentOffset, callLen + currentOffset);
         const fee = data[callLen - 1];
@@ -124,22 +148,25 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
             const rawAmount = data[2 * i];
             const config = data[2 * i + 1];
             const enabled = !AAVE_V3_LENDERS.includes(aave) || getFlashLoanEnabled(config);
-            if (enabled && rawAmount > 0n) {
+            if (enabled && rawAmount > 0n && FLASH_LOAN_IDS[aave] !== undefined) {
                 if (!liquidity[asset])
                     liquidity[asset] = [];
                 liquidity[asset].push({
                     id: FLASH_LOAN_IDS[aave],
                     name: aave,
-                    type: AAVE_V2_LENDERS.includes(aave) ? FlashLoanIds.AAVE_V2 : FlashLoanIds.AAVE_V3,
+                    type: AAVE_V2_LENDERS.includes(aave)
+                        ? FlashLoanIds.AAVE_V2
+                        : FlashLoanIds.AAVE_V3,
                     source: getAaveTypePoolAddress(chain, aave),
                     fee: fee.toString(),
                     availableRaw: rawAmount.toString(),
-                    available: Number(formatUnits(rawAmount, decimals ?? 18))
+                    available: Number(formatUnits(rawAmount, decimals ?? 18)),
+                    decimals,
                 });
             }
         });
     });
-    balancerV2s.forEach(balancer => {
+    balancerV2s.forEach((balancer) => {
         const callLen = otherAssets.length;
         const data = rawResults.slice(currentOffset, callLen + currentOffset);
         // update offset
@@ -155,37 +182,39 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
                     name: balancer.pool,
                     type: FlashLoanIds.BALANCER_V2,
                     source: balancer.address,
-                    fee: "0",
+                    fee: '0',
                     availableRaw: rawAmount.toString(),
-                    available: Number(formatUnits(rawAmount, decimals ?? 18))
+                    available: Number(formatUnits(rawAmount, decimals ?? 18)),
+                    decimals,
                 });
             }
         });
     });
-    morphoBs.forEach(morpho => {
+    morphoBs.forEach((morpho) => {
         const callLen = otherAssets.length;
         const data = rawResults.slice(currentOffset, callLen + currentOffset);
         // update offset
         currentOffset += callLen;
         otherAssets.forEach((asset, i) => {
-            const decimals = getAssetMeta(chain, asset)?.decimals;
             const rawAmount = data[i];
             if (rawAmount > 0n) {
                 if (!liquidity[asset])
                     liquidity[asset] = [];
+                const decimals = getAssetMeta(chain, asset)?.decimals;
                 liquidity[asset].push({
                     id: FLASH_LOAN_IDS[morpho.pool],
                     name: morpho.pool,
                     type: FlashLoanIds.MORPHO,
                     source: morpho.address,
-                    fee: "0",
+                    fee: '0',
                     availableRaw: rawAmount.toString(),
-                    available: Number(formatUnits(rawAmount, decimals ?? 18))
+                    available: Number(formatUnits(rawAmount, decimals ?? 18)),
+                    decimals,
                 });
             }
         });
     });
-    balancerV3s.forEach(balancerV3 => {
+    balancerV3s.forEach((balancerV3) => {
         const callLen = otherAssets.length;
         const data = rawResults.slice(currentOffset, callLen + currentOffset);
         // update offset
@@ -201,14 +230,15 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
                     name: balancerV3.pool,
                     type: FlashLoanIds.SINGLETON,
                     source: balancerV3.address,
-                    fee: "0",
+                    fee: '0',
                     availableRaw: rawAmount.toString(),
-                    available: Number(formatUnits(rawAmount, decimals ?? 18))
+                    available: Number(formatUnits(rawAmount, decimals ?? 18)),
+                    decimals,
                 });
             }
         });
     });
-    uniswapV4s.forEach(uniV4 => {
+    uniswapV4s.forEach((uniV4) => {
         const callLen = otherAssets.length;
         const data = rawResults.slice(currentOffset, callLen + currentOffset);
         // update offset
@@ -224,9 +254,10 @@ export async function fetchFlashLiquidityForChain(chain, multicallRetry) {
                     name: uniV4.pool,
                     type: FlashLoanIds.SINGLETON,
                     source: uniV4.address,
-                    fee: "0",
+                    fee: '0',
                     availableRaw: rawAmount.toString(),
-                    available: Number(formatUnits(rawAmount, decimals ?? 18))
+                    available: Number(formatUnits(rawAmount, decimals ?? 18)),
+                    decimals,
                 });
             }
         });

package/dist/flash-liquidity/types.d.ts

@@ -13,6 +13,7 @@ export interface FlashLoanLiquidityForAsset {
     fee: string;
     availableRaw: string;
     available: number;
+    decimals: number;
 }
 export type FlashLiquiditiesOnChain = {
     [asset: string]: FlashLoanLiquidityForAsset[];

package/dist/flash-liquidity/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/flash-liquidity/types.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY;IACpB,MAAM,IAAI;IACV,WAAW,IAAI;IACf,OAAO,IAAI;IACX,OAAO,IAAI;IACX,SAAS,cAAc;CAC1B;AACD,MAAM,WAAW,0BAA0B;IACvC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,uBAAuB,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,0BAA0B,EAAE,CAAA;CAAE,CAAA;AAEvF,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/flash-liquidity/types.ts"],"names":[],"mappings":"AAAA,oBAAY,YAAY;IACpB,MAAM,IAAI;IACV,WAAW,IAAI;IACf,OAAO,IAAI;IACX,OAAO,IAAI;IACX,SAAS,cAAc;CAC1B;AACD,MAAM,WAAW,0BAA0B;IACvC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,MAAM,uBAAuB,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,0BAA0B,EAAE,CAAA;CAAE,CAAA;AAEvF,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,CAAA"}

package/dist/lending/aave-v3-type/publicCallBuild.d.ts

@@ -1,4 +1,4 @@
-import { Lender } from "@1delta/asset-registry";
+import { Lender } from '@1delta/asset-registry';
 export declare const AAVE_V3_EMODES: number[];
 export declare const buildAaveV3StyleLenderReserveCall: (chainId: string, lender: Lender) => import("../../types").GeneralCall[];
 //# sourceMappingURL=publicCallBuild.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"publicCallBuild.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v3-type/publicCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAK/C,eAAO,MAAM,cAAc,UAAwB,CAAA;AA0EnD,eAAO,MAAM,iCAAiC,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,wCAoEhF,CAAA"}
+{"version":3,"file":"publicCallBuild.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v3-type/publicCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAS/C,eAAO,MAAM,cAAc,UAAwB,CAAA;AA+EnD,eAAO,MAAM,iCAAiC,GAC5C,SAAS,MAAM,EACf,QAAQ,MAAM,wCA+Df,CAAA"}

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

@@ -1,8 +1,9 @@
-import { Lender } from "@1delta/asset-registry";
-import { getAaveAssets, getAaveTypePoolAddress, getAaveTypePoolDataProviderAddress } from "../../assets";
+import { Lender } from '@1delta/asset-registry';
+import { getAaveAssets, getAaveTypePoolAddress, getAaveTypePoolDataProviderAddress, } from '../../assets';
+import { isAaveV32Type } from '../../utils';
 export const AAVE_V3_EMODES = [0, 1, 2, 3, 4, 5, 6];
 function yldrBaseline(assetsToQuery, providerAddress) {
-    return assetsToQuery.flatMap(tk => [
+    return assetsToQuery.flatMap((tk) => [
         {
             address: providerAddress,
             name: 'getReserveData',
@@ -12,7 +13,7 @@ function yldrBaseline(assetsToQuery, providerAddress) {
             address: providerAddress,
             name: 'getReserveConfigurationData',
             params: [tk],
-        }
+        },
     ]);
 }
 function aaveV3baseline(assetsToQuery, providerAddress, poolAddress, legacy = false) {
@@ -26,7 +27,7 @@ function aaveV3baseline(assetsToQuery, providerAddress, poolAddress, legacy = fa
         name: 'getReservesList',
         params: [],
     };
-    const callsBase = assetsToQuery.flatMap(tk => [
+    const callsBase = assetsToQuery.flatMap((tk) => [
         {
             address: providerAddress,
             name: 'getReserveData',
@@ -52,55 +53,56 @@ function aaveV3baseline(assetsToQuery, providerAddress, poolAddress, legacy = fa
             name: 'getDebtCeiling',
             params: [tk],
         },
-        ...legacy ? [{
-                address: providerAddress,
-                name: 'getReserveEModeCategory',
-                params: [tk],
-            }
-        ] : []
+        ...(legacy
+            ? [
+                {
+                    address: providerAddress,
+                    name: 'getReserveEModeCategory',
+                    params: [tk],
+                },
+            ]
+            : []),
     ]);
     return {
         callsBase,
         callReservesList,
-        callDecimals
+        callDecimals,
     };
 }
 export const buildAaveV3StyleLenderReserveCall = (chainId, lender) => {
     const providerAddress = getAaveTypePoolDataProviderAddress(chainId, lender);
     const assetsToQuery = getAaveAssets(chainId, lender);
     const poolAddress = getAaveTypePoolAddress(chainId, lender);
-    switch (lender) {
-        case Lender.AAVE_V3:
-        case Lender.AAVE_V3_ETHER_FI:
-        case Lender.AAVE_V3_PRIME: {
-            const getEModeCategoryData = AAVE_V3_EMODES.flatMap((eMode) => {
-                return [
-                    {
-                        address: poolAddress,
-                        name: 'getEModeCategoryData',
-                        params: [eMode],
-                    },
-                    {
-                        address: poolAddress,
-                        name: 'getEModeCategoryBorrowableBitmap',
-                        params: [eMode],
-                    },
-                    {
-                        address: poolAddress,
-                        name: 'getEModeCategoryCollateralBitmap',
-                        params: [eMode],
-                    }
-                ];
-            });
-            const { callDecimals, callReservesList, callsBase } = aaveV3baseline(assetsToQuery, providerAddress, poolAddress);
-            const calls = [
-                ...callsBase,
-                ...getEModeCategoryData,
-                callReservesList,
-                callDecimals
+    if (isAaveV32Type(lender)) {
+        const getEModeCategoryData = AAVE_V3_EMODES.flatMap((eMode) => {
+            return [
+                {
+                    address: poolAddress,
+                    name: 'getEModeCategoryData',
+                    params: [eMode],
+                },
+                {
+                    address: poolAddress,
+                    name: 'getEModeCategoryBorrowableBitmap',
+                    params: [eMode],
+                },
+                {
+                    address: poolAddress,
+                    name: 'getEModeCategoryCollateralBitmap',
+                    params: [eMode],
+                },
             ];
-            return calls;
-        }
+        });
+        const { callDecimals, callReservesList, callsBase } = aaveV3baseline(assetsToQuery, providerAddress, poolAddress);
+        const calls = [
+            ...callsBase,
+            ...getEModeCategoryData,
+            callReservesList,
+            callDecimals,
+        ];
+        return calls;
+    }
+    switch (lender) {
         case Lender.YLDR: {
             const calls = yldrBaseline(assetsToQuery, providerAddress);
             return calls;
@@ -112,11 +114,7 @@ export const buildAaveV3StyleLenderReserveCall = (chainId, lender) => {
                 params: [eMode],
             }));
             const { callDecimals, callsBase } = aaveV3baseline(assetsToQuery, providerAddress, poolAddress, true);
-            const calls = [
-                ...callsBase,
-                ...getEModeCategoryData,
-                callDecimals
-            ];
+            const calls = [...callsBase, ...getEModeCategoryData, callDecimals];
             return calls;
         }
     }

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,wBAAwB,CAAA;AAQ/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,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,CA2MnE,CAAA;AA0BD,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,CA0H5C"}
+{"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,wBAAwB,CAAA;AAQ/C,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,CA2MnE,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,CA0H5C"}

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

@@ -3,8 +3,9 @@ import { AAVE_V3_EMODES } from './publicCallBuild';
 import { BPS, formatAaveRawApyToApr, parseRawAmount } from '../../utils/parsing';
 import { Lender } from '@1delta/asset-registry';
 import { getAaveAssets, getAssetMeta, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey, } from '../../assets';
+import { isAaveV32Type } from '../../utils';
 export const getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
-    if (lender.startsWith('AAVE_V3'))
+    if (isAaveV32Type(lender))
         return parseAave32(chainId, lender, prices, additionalYields, tokenList);
     switch (lender) {
         /** AAVE V3 style with rewards from state */
@@ -136,7 +137,12 @@ const populateEModes = (borrowCollateralFactor, collateralFactor) => {
 };
 /** Replica of aave's bitmap checker */
 function isReserveEnabledOnBitmap(bitmap, reserveIndex) {
-    return ((bitmap >> BigInt(reserveIndex)) & 1n) !== 0n;
+    try {
+        return ((bitmap >> BigInt(reserveIndex)) & 1n) !== 0n;
+    }
+    catch {
+        return false;
+    }
 }
 export function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
     const assetsToQuery = getAaveAssets(chainId, lender);

package/dist/lending/compound-v3/publicCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/compound-v3/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAEL,+BAA+B,EAChC,MAAM,SAAS,CAAA;AAUhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,eAAO,MAAM,kCAAkC,GAC7C,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,+BAA+B,GAAG,SAAS,EAAE,MAAM,CA8KvE,CAAA"}
+{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/compound-v3/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAEL,+BAA+B,EAChC,MAAM,SAAS,CAAA;AAUhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,eAAO,MAAM,kCAAkC,GAC7C,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,+BAA+B,GAAG,SAAS,EAAE,MAAM,CAqLvE,CAAA"}

package/dist/lending/compound-v3/publicCallParse.js

@@ -29,6 +29,7 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                 const totals = parseRawAmount(resultsTotals[0], decimals);
                 const oracleKey = toOracleKey(assetMeta?.assetGroup) ??
                     toGenericPriceKey(asset, chainId);
+                const totalUsd = Number(totals) * (prices[oracleKey] ?? 1);
                 result[asset] = {
                     poolId: asset,
                     underlying: asset,
@@ -52,13 +53,15 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                     // debt and liquidity are zero
                     totalDebt: 0,
                     totalDebtUSD: 0,
-                    totalLiquidity: 0,
-                    totalLiquidityUSD: 0,
+                    totalLiquidity: totals,
+                    totalLiquidityUSD: totalUsd,
                     // deposits are different outputs for base asset and others
                     totalDeposits: totals,
-                    totalDepositsUSD: Number(totals) * (prices[oracleKey] ?? 1),
+                    totalDepositsUSD: totalUsd,
                     // rewards
                     rewards: {},
+                    isActive: true,
+                    isFrozen: false,
                     borrowingEnabled: false,
                 };
             }
@@ -125,6 +128,8 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                         },
                     },
                     borrowingEnabled: true,
+                    isActive: true,
+                    isFrozen: false,
                     stakingYield: additionalYields.intrinsicYields[oracleKeyBase] ?? 0,
                 },
             };

package/dist/lending/fetchLender.js

@@ -12,7 +12,7 @@ import { InitLensAbi } from '../abis/init/InitLens';
 import { CometAbi } from '../abis/compound-v3/Comet';
 import { CometExtAbi } from '../abis/compound-v3/CometExt';
 import { IrgetterAbi } from '../abis/compound-v3/IrGetter';
-import { isAaveV2Type, isAaveV3Original, isAaveV3Type, isCompoundV3, isInit, } from '../utils';
+import { isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isInit, } from '../utils';
 import { buildAaveV2StyleLenderReserveCall } from './aave-v2-type/publicCallBuild';
 import { buildAaveV3StyleLenderReserveCall } from './aave-v3-type/publicCallBuild';
 import { buildInitStyleLenderReserveCall } from './init/publicCallBuild';
@@ -55,7 +55,7 @@ const getAbi = (lender) => {
             ...RewarderAbi,
             ...IncentivesControllerAbi,
         ];
-    if (isAaveV3Original(lender))
+    if (isAaveV32Type(lender))
         return [...AavePoolV3UpgradedAbi, ...AaveV3ProtocolDataProviderAbi];
     if (lender === Lender.YLDR)
         return [...YLDRProtocolDataProviderAbi];

package/dist/lending/morpho/convertPublic.js

@@ -81,7 +81,7 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
                 totalDebtStable: 0,
                 totalDebt: 0,
                 totalLiquidity: 0,
-                totalLiquidityUSD: 0,
+                totalLiquidityUSD: Number(state.collateralAssetsUsd),
                 totalDepositsUSD: Number(state.collateralAssetsUsd),
                 totalDebtStableUSD: 0,
                 totalDebtUSD: 0,

package/dist/lending/user-data/types.js

@@ -1,8 +1,8 @@
 import { Lender } from '@1delta/asset-registry';
 /** Filter all morphos into one for querying */
 export function organizeUserQueries(queries) {
-    const morphos = queries.filter((q) => q.lender.startsWith('MORPHO_BLUE'));
-    const nonMorphos = queries.filter((q) => !q.lender.startsWith('MORPHO_BLUE'));
+    const morphos = queries.filter((q) => q.lender?.startsWith('MORPHO_BLUE'));
+    const nonMorphos = queries.filter((q) => !q.lender?.startsWith('MORPHO_BLUE'));
     const morphosCollapsed = {
         lender: Lender.MORPHO_BLUE,
         account: queries[0].account,

package/dist/lending-pairs/computeLendingPairs.d.ts

@@ -1,9 +1,17 @@
-import { LenderData } from "../types";
+import { GenericCurrency } from '../lending/types';
+import { LenderData } from '../types';
+interface SimpleAssetInfo {
+    asset: GenericCurrency;
+    poolId: string;
+}
 export interface LendingPair {
     chainId: string;
     lender: string;
     assetLong: string;
     assetShort: string;
+    /** Full asset info */
+    infoLong: SimpleAssetInfo;
+    infoShort: SimpleAssetInfo;
     assetGroupLong: string;
     assetGroupShort: string;
     price: number;
@@ -40,4 +48,5 @@ export declare function getTopPairs(pairs: LendingPair[]): {
     gainers: LendingPair[];
 };
 export declare function getDistinctPairsByShortAsset(pairs: LendingPair[]): LendingPair[];
+export {};
 //# sourceMappingURL=computeLendingPairs.d.ts.map