@defisaver/positions-sdk 0.0.201-fluid-dev → 0.0.201-fluid-dev-1

package/src/markets/index.ts

@@ -22,4 +22,4 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets } from './liquityV2';
 export { EulerV2Markets } from './euler';
-export { FluidMarkets } from './fluid';
+export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById } from './fluid';

package/src/morphoBlue/index.ts

@@ -10,14 +10,12 @@ import {
 } from '../types';
 import { USD_QUOTE, WAD } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
+import { isMainnetNetwork, wethToEth } from '../services/utils';
 import {
   getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
 } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
 
-const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;
-
 export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
   const {
     loanToken, collateralToken, oracle, irm, lltv, oracleType,

package/src/multicall/index.ts

@@ -1,4 +1,5 @@
 import Web3 from 'web3';
+import { chunk } from 'lodash';
 import { UniMulticallContract } from '../contracts';
 import { NetworkNumber } from '../types/common';
 
@@ -20,4 +21,12 @@ export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber
   });
 
   return formattedResult;
-};
+};
+
+export const chunkAndMulticall = async (calls: any[], chunkSize: number, blockNumber: 'latest' | number = 'latest', web3: Web3, network: NetworkNumber = NetworkNumber.Eth) => {
+  const chunkedCalls = chunk(calls, chunkSize);
+
+  const results = await Promise.all(chunkedCalls.map((cnk) => multicall(cnk, web3, network, blockNumber)));
+
+  return results.flat(1);
+};

package/src/services/utils.ts

@@ -54,4 +54,6 @@ export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bi
 
 export const MAXUINT:string = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 
-export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
+export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
+
+export const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;

package/src/types/contracts/generated/FluidView.ts

@@ -118,10 +118,6 @@ export declare namespace FluidView {
         number | string | BN,
         number | string | BN,
         number | string | BN,
-        number | string | BN,
-        number | string | BN,
-        number | string | BN,
-        number | string | BN,
         number | string | BN
       ]
     | {
@@ -147,10 +143,6 @@ export declare namespace FluidView {
         oracle: string;
         oraclePriceOperate: number | string | BN;
         oraclePriceLiquidate: number | string | BN;
-        priceOfSupplyToken0InUSD: number | string | BN;
-        priceOfSupplyToken1InUSD: number | string | BN;
-        priceOfBorrowToken0InUSD: number | string | BN;
-        priceOfBorrowToken1InUSD: number | string | BN;
         vaultSupplyExchangePrice: number | string | BN;
         vaultBorrowExchangePrice: number | string | BN;
         supplyRateVault: number | string | BN;
@@ -223,10 +215,6 @@ export declare namespace FluidView {
     string,
     string,
     string,
-    string,
-    string,
-    string,
-    string,
     string
   ];
   export type VaultDataStructOutputStruct = {
@@ -252,10 +240,6 @@ export declare namespace FluidView {
     oracle: string;
     oraclePriceOperate: string;
     oraclePriceLiquidate: string;
-    priceOfSupplyToken0InUSD: string;
-    priceOfSupplyToken1InUSD: string;
-    priceOfBorrowToken0InUSD: string;
-    priceOfBorrowToken1InUSD: string;
     vaultSupplyExchangePrice: string;
     vaultBorrowExchangePrice: string;
     supplyRateVault: string;
@@ -293,37 +277,6 @@ export interface FluidView extends BaseContract {
   ): FluidView;
   clone(): FluidView;
   methods: {
-    feedRegistry(): NonPayableTransactionObject<string>;
-
-    getAaveTokenPriceInETH(
-      _tokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getAaveTokenPriceInUSD(
-      _tokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getAaveV3TokenPriceInETH(
-      _tokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getAaveV3TokenPriceInUSD(
-      _tokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getAddrForChainlinkOracle(
-      _inputTokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getChainlinkPriceInETH(
-      _inputTokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getChainlinkPriceInUSD(
-      _inputTokenAddr: string,
-      _useFallback: boolean
-    ): NonPayableTransactionObject<string>;
-
     getPositionByNftId(
       _nftId: number | string | BN
     ): NonPayableTransactionObject<
@@ -333,35 +286,8 @@ export interface FluidView extends BaseContract {
       }
     >;
 
-    getPriceInETH(_inputTokenAddr: string): NonPayableTransactionObject<string>;
-
-    getPriceInUSD(_inputTokenAddr: string): NonPayableTransactionObject<string>;
-
     getRatio(_nftId: number | string | BN): NonPayableTransactionObject<string>;
 
-    "getRoundInfo(address,uint80,address)"(
-      _inputTokenAddr: string,
-      _roundId: number | string | BN,
-      aggregator: string
-    ): NonPayableTransactionObject<
-      [string, string] & { updateTimestamp: string }
-    >;
-
-    "getRoundInfo(address,uint80)"(
-      _inputTokenAddr: string,
-      _roundId: number | string | BN
-    ): NonPayableTransactionObject<
-      [string, string] & { updateTimestamp: string }
-    >;
-
-    getSparkTokenPriceInETH(
-      _tokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
-    getSparkTokenPriceInUSD(
-      _tokenAddr: string
-    ): NonPayableTransactionObject<string>;
-
     getUserNftIds(_user: string): NonPayableTransactionObject<string[]>;
 
     getUserPositions(
@@ -384,14 +310,6 @@ export interface FluidView extends BaseContract {
     getVaultData(
       _vault: string
     ): NonPayableTransactionObject<FluidView.VaultDataStructOutput>;
-
-    getWBtcPrice(
-      _btcPrice: number | string | BN
-    ): NonPayableTransactionObject<string>;
-
-    getWStEthPrice(
-      _stEthPrice: number | string | BN
-    ): NonPayableTransactionObject<string>;
   };
   events: {
     allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/src/types/fluid.ts

@@ -12,6 +12,10 @@ export interface FluidMarketInfo {
   hasSmartDebt: boolean
   collateralAsset: string
   debtAsset: string
+  ethBased?: boolean,
+  btcBased?: boolean,
+  wstETHBased?: boolean,
+  type: FluidVaultType
 }
 
 export enum FluidMainnetVersion {
@@ -169,17 +173,22 @@ export interface InnerFluidMarketData {
   isSmartDebt: boolean,
   marketAddress: string,
   vaultType: FluidVaultType,
+  vaultValue?: FluidVersions
   oracle: string,
   liquidationPenaltyPercent: string,
   collFactor: string,
   liquidationRatio: string,
+  liqFactor: string,
+  minRatio: string,
   collAsset0: string,
   collAsset1?: string,
   debtAsset0: string,
   debtAsset1?: string,
   totalPositions: string,
   totalSupplyVault: string,
+  totalSupplyVaultUsd: string,
   totalBorrowVault: string,
+  totalBorrowVaultUsd: string,
   withdrawalLimit: string,
   withdrawableUntilLimit: string,
   withdrawable: string,
@@ -190,6 +199,8 @@ export interface InnerFluidMarketData {
   maxBorrowLimit: string,
   baseBorrowLimit: string,
   minimumBorrowing: string,
+  supplyRate: string,
+  borrowRate: string,
 }
 
 export interface FluidMarketData {