@1delta/margin-fetcher 0.0.44 → 0.0.45

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.44",
+  "version": "0.0.45",
   "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.mts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.mts"
     }
   },
   "keywords": [],
@@ -17,11 +17,12 @@
   "devDependencies": {
     "@types/async-retry": "^1.4.9",
     "async-retry": "^1.3.3",
+    "tsup": "^8.5.0",
     "typescript": "^5.9.2",
     "@1delta/providers": "0.0.16"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsup src/index.ts --format esm --clean && tsc -p tsconfig.dts.json",
     "test": "vitest"
   }
 }

package/src/index.ts

@@ -4,4 +4,4 @@ export * from "./yields"
 export * from "./prices"
 export * from "./utils"
 export * from "./flash-liquidity"
-export type { MulticallRetryFunction, GetEvmClientFunction, ProviderDependencies, OptionalProviderDependencies } from "./types/providers"
+export * from './types';

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

@@ -14,9 +14,9 @@ import {
   AaveV2GeneralPublicResponse,
   AaveV2TypeGetReserveConfigurationData,
   AaveV2TypeGetReserveDataIndexes,
-} from './types'
+} from '../../types/lender/aave-v2-types'
 import { AdditionalYields } from '../../types'
-import { GenericTokenList } from '../types'
+import { GenericTokenList } from '../../types'
 import { Chain } from '@1delta/chain-registry'
 
 export const getAaveV2ReservesDataConverter = (

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

@@ -4,7 +4,7 @@ import {
   AaveV3GetReservesIndexes,
   YLDRTypeGetReserveConfigurationData,
   YLDRTypeGetReserveDataIndexes,
-} from './types'
+} from '../../types/lender/aave-v3-types'
 import { AAVE_V3_EMODES } from './publicCallBuild'
 import { AdditionalYields } from '../../types'
 import { BPS, formatAaveRawApyToApr, parseRawAmount } from '../../utils/parsing'
@@ -15,7 +15,7 @@ import {
   toGenericPriceKey,
   toOracleKey,
 } from '../../assets'
-import { GenericTokenList } from '../types'
+import { GenericTokenList } from '../../types'
 import { isAaveV32Type } from '../../utils'
 
 export const getAaveV3ReservesDataConverter = (

package/src/lending/compound-v3/publicCallParse.ts

@@ -3,7 +3,7 @@ import { AdditionalYields } from '../../types'
 import {
   CometInterestRateIndexes,
   CompoundV3GeneralPublicResponse,
-} from './types'
+} from '../../types/lender/compound-v3-types'
 import {
   getCompoundV3Assets,
   LENDER_MODE_NO_MODE,
@@ -12,7 +12,7 @@ import {
 } from '../../assets'
 import { getCompoundV3BaseAsset } from '../addresses/compoundV3'
 import { calculateRateForCompound, parseRawAmount } from '../../utils/parsing'
-import { GenericTokenList } from '../types'
+import { GenericTokenList } from '../../types'
 
 const COMET_RISK_DECIMALS = 18
 const SECONDS_PER_DAY = 3600 * 24

package/src/lending/fetchLender.ts

@@ -39,10 +39,10 @@ import { AavePoolDataProviderLegacyAbi } from '../abis/aave-v3/AavePoolDataProvi
 import { Lender } from '@1delta/lender-registry'
 import { Call } from 'viem'
 import { YLDRProtocolDataProviderAbi } from '../abis/aave-v2/YLDR'
-import { GenericTokenList } from './types'
 import { buildMorphoCall } from './morpho/publicCallBuild'
 import { getMorphoMarketDataConverter } from './morpho/getMarketsFromChain'
 import { MorphoLensAbi } from '../abis/morpho/lens'
+import { GenericTokenList } from '../types/general'
 
 function buildLenderCall(chainId: string, lender: Lender) {
   if (isAaveV2Type(lender))

package/src/lending/fetchLenderAll.ts

@@ -2,8 +2,8 @@ import { AdditionalYields, MulticallRetryFunction } from '../types'
 import { Lender } from '@1delta/lender-registry'
 import { getLenderPublicData } from './fetchLender'
 import { getLenderPublicDataViaApi } from './fetchLenderExt'
-import { GenericTokenList } from './types'
 import { Chain } from '@1delta/chain-registry'
+import { GenericTokenList } from '../types/general'
 
 function lenderCanUseApi(lender: string, chainId: string) {
   if (lender === Lender.MORPHO_BLUE) {

package/src/lending/fetchLenderExt.ts

@@ -1,9 +1,9 @@
 import { isMorphoType, isMultiMarket } from '../utils'
 import { AdditionalYields } from '../types'
 import { Lender } from '@1delta/lender-registry'
-import { GenericTokenList } from './types'
 import { fetchMorphoMarkets } from './morpho/fetchPublic'
 import { convertMarketsToMorphoResponse } from './morpho/convertPublic'
+import { GenericTokenList } from '../types/general'
 
 async function getLenderDataFromApi(
   lender: Lender,

package/src/lending/index.ts

@@ -2,5 +2,4 @@ export * from "./fetchLender"
 export * from "./fetchLenderExt"
 export * from "./fetchLenderAll"
 export * from "./user-data"
-export * from "./types"
 export * from "./meta"

package/src/lending/init/publicCallParse.ts

@@ -1,10 +1,10 @@
-import { InitGeneralPublicResponse } from './types'
+import { InitGeneralPublicResponse } from '../../types/lender/init-types'
 import { AdditionalYields } from '../../types'
 import { INIT_MODES } from './publicCallBuild'
 import { toGenericPriceKey, toOracleKey } from '../../assets'
 import { convertRateToApr, parseRawAmount } from '../../utils/parsing'
 import { Lender } from '@1delta/lender-registry'
-import { GenericTokenList } from '../types'
+import { GenericTokenList } from '../../types'
 
 export const INIT_EMODE_LABELS: { [mode: number]: string } = {
   [1]: 'Default',

package/src/lending/morpho/convertPublic.ts

@@ -2,10 +2,10 @@ import {
   MorphoGeneralPublicResponse,
   RewardsMap,
   GetMarketsResponse,
-} from './types'
+} from '../../types/lender/morpho-types'
 import { apyToApr } from '../user-data/utils'
 import { AdditionalYields } from '../../types'
-import { GenericTokenList } from '../types'
+import { GenericTokenList } from '../../types'
 import { formatNr, parseLtv } from './utils/parsers'
 
 export function convertMarketsToMorphoResponse(

package/src/lending/morpho/getMarketsFromChain.ts

@@ -4,9 +4,9 @@ import { formatEther, parseAbi } from 'viem'
 import { MORPHO_LENS } from '../user-data/morpho/userCallBuild'
 import { decodeMarkets } from './utils/evmParser'
 import { AdditionalYields } from '../../types'
-import { GenericTokenList } from '../types'
+import { GenericTokenList } from '../../types'
 import { formatNr, parseLtv } from './utils/parsers'
-import { MorphoGeneralPublicResponse } from './types'
+import { MorphoGeneralPublicResponse } from '../../types/lender/morpho-types'
 import { toGenericPriceKey, toOracleKey } from '../../assets'
 import { MathLib } from './utils/mathLib'
 import { apyToApr } from '../user-data/utils'

package/src/lending/user-data/aave-v2-type/userCallParse.ts

@@ -3,10 +3,10 @@ import { toGenericPriceKey, toOracleKey } from '../../../assets'
 import {
   AaveV2TypeGetUserReserveData,
   AaveV2UserReserveResponse,
-} from '../types'
+} from '../../../types/lenderTypes'
 import { createBaseTypeUserState } from '../utils'
 import { parseRawAmount } from '../../../utils/parsing'
-import { GenericCurrency } from '../../types'
+import { GenericCurrency } from '../../../types'
 
 export const getAaveV2UserDataConverter = (
   lender: Lender,

package/src/lending/user-data/aave-v3-type/userCallParse.ts

@@ -3,11 +3,11 @@ import {
   toGenericPriceKey,
   toOracleKey,
 } from '../../../assets'
-import { AaveV3UserReserveResponse } from '../types'
+import { AaveV3UserReserveResponse } from '../../../types/lenderTypes'
 import { createBaseTypeUserState } from '../utils'
-import { AaveTypeGetUserReserveIndexes } from '../../aave-v3-type/types'
 import { parseRawAmount } from '../../../utils/parsing'
-import { GenericCurrency } from '../../types'
+import { AaveTypeGetUserReserveIndexes } from '../../../types/lender/aave-v3-types'
+import { GenericCurrency } from '../../../types'
 
 export const getAaveV3UserDataConverter = (
   lender: Lender,

package/src/lending/user-data/aave-v3-type/userCallParseYldr.ts

@@ -1,10 +1,10 @@
 import { Lender } from '@1delta/lender-registry'
 import { toGenericPriceKey, toOracleKey } from '../../../assets'
-import { AaveV3UserReserveResponse } from '../types'
+import { AaveV3UserReserveResponse } from '../../../types/lenderTypes'
 import { createBaseTypeUserState } from '../utils'
-import { YldrTypeGetUserReserveIndexes } from '../../aave-v3-type/types'
 import { parseRawAmount } from '../../../utils/parsing'
-import { GenericCurrency } from '../../types'
+import { GenericCurrency } from '../../../types'
+import { YldrTypeGetUserReserveIndexes } from '../../../types/lender/aave-v3-types'
 
 /** Like Aave V3, not stable debt data and no emode */
 export const getYldrUserDataConverter = (

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

@@ -1,5 +1,5 @@
 import { Lender } from '@1delta/lender-registry'
-import { CompoundV3UserReserveResponse } from '../types'
+import { CompoundV3UserReserveResponse } from '../../../types/lenderTypes'
 import { toGenericPriceKey, toOracleKey } from '../../../assets'
 import { getCompoundV3BaseAsset } from '../../addresses/compoundV3'
 import { parseRawAmount } from '../../../utils/parsing'

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

@@ -12,7 +12,7 @@ import {
   isMultiMarket,
   isYLDR,
 } from '../../utils'
-import { LenderUserQuery, organizeUserQueries } from './types'
+import { LenderUserQuery, organizeUserQueries } from '../../types/lenderTypes'
 import { GetEvmClientFunction } from '../../types'
 import { buildAaveV2UserCall } from './aave-v2-type/userCallBuild'
 import { buildAaveV3UserCall } from './aave-v3-type/userCallBuild'

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

@@ -1,2 +1 @@
-export * from "./fetchUserData"
-export * from "./types" 
+export * from "./fetchUserData"

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

@@ -1,11 +1,11 @@
 import { Lender } from '@1delta/lender-registry'
-import { InitUserReserveResponse } from "../types"
+import { InitUserReserveResponse } from "../../../types/lenderTypes"
 import { getInitFlashAggregatorAddress } from "./userCallBuild"
-import { InitGetUserPositionDataIndexes } from "../../init/types"
 import { getLenderAssets } from "../../../utils"
 import { toOracleKey } from "../../../assets"
 import { parseRawAmount } from "../../../utils/parsing"
 import { createMultiAccountTypeUserState } from "../utils/createMultiAccountStyleUserState"
+import { InitGetUserPositionDataIndexes } from '../../../types/lender/init-types'
 
 export const getInitUserDataConverter = (
   lender: Lender,

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

@@ -1,10 +1,10 @@
 import { Lender } from '@1delta/lender-registry'
 import { toGenericPriceKey, toOracleKey } from '../../../assets'
-import { MorphoUserReserveResponse } from '../types'
+import { MorphoUserReserveResponse } from '../../../types/lenderTypes'
 import { createBaseTypeUserState } from '../utils'
 import { parseRawAmount } from '../../../utils/parsing'
-import { MorphoMarket } from '../../morpho/types'
 import { BalanceInfo, decodePackedDataset } from './decoder'
+import { MorphoMarket } from '../../../types/lender/morpho-types'
 
 const CHUNK_SIZE = 100
 

package/src/lending/user-data/utils/createGeneralUserState.ts

@@ -6,7 +6,7 @@ import {
   AaveV3UserReserveResponse,
   CompoundV3Public,
   CompoundV3UserReserveResponse,
-} from '../types'
+} from '../../../types/lenderTypes'
 import { safeDivide } from './formatting'
 
 type LenderUserData =

package/src/lending/user-data/utils/createMultiAccountStyleUserState.ts

@@ -1,5 +1,5 @@
 import { LENDER_MODE_NO_MODE } from "../../../assets"
-import { InitPublic, InitUserReserveResponse } from "../types"
+import { InitPublic, InitUserReserveResponse } from "../../../types/lenderTypes"
 import { safeDivide } from "./formatting"
 
 export function createMultiAccountTypeUserState(

package/src/lending/user-data/utils/formatting/generalFormatters.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { LenderConfigMap } from '../../types'
+import { LenderConfigMap } from '../../../../types/lenderTypes'
 
 export const safeDivide = (a: number, b: number) => {
   return a === 0 || isNaN(a) ? 0 : b !== 0 ? a / b : Infinity

package/src/lending/user-data/utils/index.ts

@@ -1,4 +1,4 @@
-import { UserApr } from "../types"
+import { UserApr } from "../../../types/lenderTypes"
 import { safeDivide } from "./formatting"
 
 export * from "./createGeneralUserState"

package/src/lending-pairs/computeLendingPairs.ts

@@ -4,8 +4,8 @@ import {
   meetsLiquidityThresholdsLong,
   meetsLiquidityThresholdsShort,
 } from '../assets/liquidityThresholds'
-import { GenericCurrency } from '../lending/types'
 import { ConfigEntry, LenderData, PoolData } from '../types'
+import { GenericCurrency } from '../types/general'
 import { isAaveV3Type, isInit, isMorphoType } from '../utils'
 
 interface SimpleAssetInfo {

package/src/types/apiReturnType.ts

@@ -1,4 +1,4 @@
-import { GenericCurrency } from '../lending'
+import { GenericCurrency } from "./general"
 
 export interface BaseYields {
   // borrow interest rates
@@ -10,13 +10,6 @@ export interface BaseYields {
 
 export type RewardsMap = { [rewardId: string]: BaseYields }
 
-export interface LenderYields extends BaseYields {
-  // staking
-  stakingYield: number
-
-  // rewards
-  rewards?: RewardsMap
-}
 
 export interface ConfigEntry {
   category: number

package/src/types/index.ts

@@ -1,44 +1,5 @@
 export * from './apiReturnType'
-
-export interface ParsedResponse {
-  price: number
-  time: number
-}
-export interface ChainLinkResponse extends ParsedResponse {
-  roundId: number
-}
-
-export enum ChainlinkAggregatorIndexes {
-  roundId = 0,
-  answer,
-  startedAt,
-  updatedAt,
-  answeredInRound,
-}
-
-interface LenderRewardsEntry {
-  deposit: number
-  borrow: number
-}
-
-export type LenderRewardsMap = { [key: string]: LenderRewardsEntry }
-export type NumberMap = { [key: string]: number }
-export type FullLenderRewardsMap = {
-  [chainId: string]: { [lender: string]: LenderRewardsMap }
-}
-export type AdditionalYields = {
-  intrinsicYields: NumberMap
-  lenderRewards: FullLenderRewardsMap
-  loaded: boolean
-}
-export declare interface GeneralCall {
-  address: string // Address of the contract
-  name: string // Function name on the contract (example: balanceOf)
-  params?: any[] // Function params
-}
-
-export type TokenList = {
-  [address: string]: { decimals: number; assetGroup?: string }
-}
-
+export * from './misc'
 export * from './providers'
+export * from './lenderTypes'
+export * from './general'

package/src/{lending/aave-v2-type/types.ts → types/lender/aave-v2-types.ts}

@@ -1,6 +1,5 @@
-import { RewardsMap } from "../aave-v3-type/types";
-import { GenericCurrency } from "../types";
-
+import { RewardsMap } from './aave-v3-types'
+import { GenericCurrency } from '../general'
 
 export enum AaveV2TypeGetReserveDataIndexes {
   availableLiquidity = 0,
@@ -40,7 +39,6 @@ export enum AaveV2TypeGetUserReserveData {
   usageAsCollateralEnabled,
 }
 
-
 export enum AaveV2TypeIncentivesControllerPoolInfoIndexes {
   totalSupply = 0,
   allocPoint,
@@ -49,20 +47,18 @@ export enum AaveV2TypeIncentivesControllerPoolInfoIndexes {
   onwardIncentives,
 }
 
-
-
 export interface AaveV2GeneralPublicResponse {
   data: {
     [tokenSymbol: string]: {
       asset: GenericCurrency
       // token amounts
-      totalDeposits: number;
-      totalDebtStable: number;
-      totalDebt: number;
+      totalDeposits: number
+      totalDebtStable: number
+      totalDebt: number
       // USD amounts
-      totalDepositsUSD: number;
-      totalDebtStableUSD: number;
-      totalDebtUSD: number;
+      totalDepositsUSD: number
+      totalDebtStableUSD: number
+      totalDebtUSD: number
 
       // reserve market data
       depositRate: number
@@ -80,20 +76,20 @@ export interface AaveV2GeneralPublicResponse {
 
       config: {
         [0]: {
-          category: 0,
+          category: 0
           // collateral factors
-          borrowCollateralFactor: number,
-          collateralFactor: number,
+          borrowCollateralFactor: number
+          collateralFactor: number
           borrowFactor: number
         }
       }
 
       // flags
-      collateralActive: boolean;
-      borrowingEnabled: boolean;
-      hasStable: boolean;
-      isActive: boolean;
-      isFrozen: boolean;
+      collateralActive: boolean
+      borrowingEnabled: boolean
+      hasStable: boolean
+      isActive: boolean
+      isFrozen: boolean
     }
   }
   chainId: string

package/src/{lending/aave-v3-type/types.ts → types/lender/aave-v3-types.ts}

@@ -1,5 +1,4 @@
-import { GenericCurrency } from "../types"
-
+import { GenericCurrency } from '../general'
 
 export interface BaseYields {
   // borrow interest rates
@@ -11,17 +10,15 @@ export interface BaseYields {
 
 export type RewardsMap = { [rewardId: string]: BaseYields }
 
-
 export interface ModeBase {
   category: number
   label: string
 }
 
-
 export interface EModeData extends ModeBase {
-  borrowCollateralFactor: number;
-  collateralFactor: number;
-  priceSource: string;
+  borrowCollateralFactor: number
+  collateralFactor: number
+  priceSource: string
 }
 
 export enum AaveV3GetReservesIndexes {
@@ -36,10 +33,9 @@ export enum AaveV3GetReservesIndexes {
   averageStableBorrowRate = 8,
   liquidityIndex = 9,
   variableBorrowIndex = 10,
-  lastUpdateTimestamp = 11
+  lastUpdateTimestamp = 11,
 }
 
-
 export enum AaveV3PoolGetReservesFields {
   configuration = 0,
   liquidityIndex,
@@ -78,7 +74,7 @@ export enum AaveV3GetEModeCategoryDataIndexes {
   liquidationThreshold = 'liquidationThreshold',
   liquidationBonus = 'liquidationBonus',
   priceSource = 'priceSource',
-  label = 'label'
+  label = 'label',
 }
 
 export interface AaveV3GeneralPublicResponse {
@@ -86,27 +82,27 @@ export interface AaveV3GeneralPublicResponse {
     [tokenSymbol: string]: {
       asset: GenericCurrency
       // token amounts
-      totalDeposits: number;
-      totalDebtStable: number;
-      totalDebt: number;
+      totalDeposits: number
+      totalDebtStable: number
+      totalDebt: number
       // USD amounts
-      totalDepositsUSD: number;
-      totalDebtStableUSD: number;
-      totalDebtUSD: number;
+      totalDepositsUSD: number
+      totalDebtStableUSD: number
+      totalDebtUSD: number
       // rates
-      depositRate: number;
-      variableBorrowRate: number;
-      stableBorrowRate: number;
-      averageStableBorrowRate: number;
+      depositRate: number
+      variableBorrowRate: number
+      stableBorrowRate: number
+      averageStableBorrowRate: number
       // misc
-      liquidityIndex: string;
-      variableBorrowIndex: string;
-      lastUpdateTimestamp: number;
+      liquidityIndex: string
+      variableBorrowIndex: string
+      lastUpdateTimestamp: number
       // rewards
       rewards?: RewardsMap
 
       // config part
-      decimals: number;
+      decimals: number
 
       config: {
         [modeId: number]: {
@@ -119,25 +115,25 @@ export interface AaveV3GeneralPublicResponse {
       }
 
       // flags
-      collateralActive: boolean;
-      borrowingEnabled: boolean;
-      hasStable: boolean;
-      isActive: boolean;
-      isFrozen: boolean;
+      collateralActive: boolean
+      borrowingEnabled: boolean
+      hasStable: boolean
+      isActive: boolean
+      isFrozen: boolean
 
       // eMode
       eMode: {
-        label: string;
-        category: number;
-        borrowCollateralFactor: number;
-        collateralFactor: number;
-        priceSource: string;
-      };
+        label: string
+        category: number
+        borrowCollateralFactor: number
+        collateralFactor: number
+        priceSource: string
+      }
 
       // caps
-      borrowCap: number;
-      supplyCap: number;
-      debtCeiling: number;
+      borrowCap: number
+      supplyCap: number
+      debtCeiling: number
     }
   }
   chainId: string
@@ -166,8 +162,6 @@ export enum YldrTypeGetUserReserveIndexes {
   usageAsCollateralEnabled,
 }
 
-
-
 export enum YLDRTypeGetReserveDataIndexes {
   accruedToTreasuryScaled = 0,
   totalYToken,
@@ -176,7 +170,7 @@ export enum YLDRTypeGetReserveDataIndexes {
   variableBorrowRate,
   liquidityIndex,
   variableBorrowIndex,
-  lastUpdateTimestamp
+  lastUpdateTimestamp,
 }
 export enum YLDRTypeGetReserveConfigurationData {
   decimals = 0,