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

package/src/markets/index.ts

@@ -20,5 +20,6 @@ export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
-
-export { EulerV2Markets } from './euler';
+export { LiquityV2Markets } from './liquityV2';
+export { EulerV2Markets } from './euler';
+export { FluidMarkets } from './fluid';

package/src/markets/liquityV2/index.ts

@@ -0,0 +1,44 @@
+import { NetworkNumber } from '../../types/common';
+import { LiquityV2MarketInfo, LiquityV2Versions } from '../../types/liquityV2';
+
+export const LIQUITY_V2_ETH_MARKET = (networkId: NetworkNumber = NetworkNumber.Eth): LiquityV2MarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Liquity V2 ETH',
+  shortLabel: 'ETH',
+  value: LiquityV2Versions.LiquityV2Eth,
+  url: 'eth',
+  debtToken: 'BOLD',
+  collateralToken: 'ETH',
+  marketAddress: '0x38e1f07b954cfab7239d7acab49997fbaad96476',
+  protocolName: 'liquity-v2',
+});
+
+export const LIQUITY_V2_WSTETH_MARKET = (networkId: NetworkNumber = NetworkNumber.Eth): LiquityV2MarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Liquity V2 wstETH',
+  shortLabel: 'wstETH',
+  value: LiquityV2Versions.LiquityV2WstEth,
+  url: 'wsteth',
+  debtToken: 'BOLD',
+  collateralToken: 'wstETH',
+  marketAddress: '0x2d4ef56cb626e9a4c90c156018ba9ce269573c61',
+  protocolName: 'liquity-v2',
+});
+
+export const LIQUITY_V2_RETH_MARKET = (networkId: NetworkNumber = NetworkNumber.Eth): LiquityV2MarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Liquity V2 rETH',
+  shortLabel: 'rETH',
+  value: LiquityV2Versions.LiquityV2REth,
+  url: 'reth',
+  debtToken: 'BOLD',
+  collateralToken: 'rETH',
+  marketAddress: '0x3b48169809dd827f22c9e0f2d71ff12ea7a94a2f',
+  protocolName: 'liquity-v2',
+});
+
+export const LiquityV2Markets = (networkId: NetworkNumber) => ({
+  [LiquityV2Versions.LiquityV2Eth]: LIQUITY_V2_ETH_MARKET(networkId),
+  [LiquityV2Versions.LiquityV2WstEth]: LIQUITY_V2_WSTETH_MARKET(networkId),
+  [LiquityV2Versions.LiquityV2REth]: LIQUITY_V2_RETH_MARKET(networkId),
+}) as const;

package/src/moneymarket/moneymarketCommonService.ts

@@ -20,7 +20,7 @@ export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, b
 
 export const calculateBorrowingAssetLimit = (assetBorrowedUsd: string, borrowLimitUsd: string) => new Dec(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
 
-export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
+export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD', 'BOLD'];
 
 export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   let borrowUnstable = 0;

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

@@ -0,0 +1,399 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type {
+  Callback,
+  PayableTransactionObject,
+  NonPayableTransactionObject,
+  BlockType,
+  ContractEventLog,
+  BaseContract,
+} from "./types";
+
+export interface EventOptions {
+  filter?: object;
+  fromBlock?: BlockType;
+  topics?: string[];
+}
+
+export declare namespace FluidView {
+  export type UserPositionStruct =
+    | [
+        number | string | BN,
+        string,
+        boolean,
+        boolean,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+      ]
+    | {
+        nftId: number | string | BN;
+        owner: string;
+        isLiquidated: boolean;
+        isSupplyPosition: boolean;
+        supply: number | string | BN;
+        borrow: number | string | BN;
+        ratio: number | string | BN;
+        tick: number | string | BN;
+        tickId: number | string | BN;
+      };
+
+  export type UserPositionStructOutputArray = [
+    string,
+    string,
+    boolean,
+    boolean,
+    string,
+    string,
+    string,
+    string,
+    string
+  ];
+  export type UserPositionStructOutputStruct = {
+    nftId: string;
+    owner: string;
+    isLiquidated: boolean;
+    isSupplyPosition: boolean;
+    supply: string;
+    borrow: string;
+    ratio: string;
+    tick: string;
+    tickId: string;
+  };
+  export type UserPositionStructOutput = UserPositionStructOutputArray &
+    UserPositionStructOutputStruct;
+
+  export type VaultDataStruct =
+    | [
+        string,
+        number | string | BN,
+        number | string | BN,
+        boolean,
+        boolean,
+        string,
+        string,
+        string,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+      ]
+    | {
+        vault: string;
+        vaultId: number | string | BN;
+        vaultType: number | string | BN;
+        isSmartColl: boolean;
+        isSmartDebt: boolean;
+        supplyToken0: string;
+        supplyToken1: string;
+        borrowToken0: string;
+        borrowToken1: string;
+        supplyToken0Decimals: number | string | BN;
+        supplyToken1Decimals: number | string | BN;
+        borrowToken0Decimals: number | string | BN;
+        borrowToken1Decimals: number | string | BN;
+        collateralFactor: number | string | BN;
+        liquidationThreshold: number | string | BN;
+        liquidationMaxLimit: number | string | BN;
+        withdrawalGap: number | string | BN;
+        liquidationPenalty: number | string | BN;
+        borrowFee: number | string | BN;
+        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;
+        borrowRateVault: number | string | BN;
+        rewardsOrFeeRateSupply: number | string | BN;
+        rewardsOrFeeRateBorrow: number | string | BN;
+        totalPositions: number | string | BN;
+        totalSupplyVault: number | string | BN;
+        totalBorrowVault: number | string | BN;
+        withdrawalLimit: number | string | BN;
+        withdrawableUntilLimit: number | string | BN;
+        withdrawable: number | string | BN;
+        baseWithdrawalLimit: number | string | BN;
+        withdrawExpandPercent: number | string | BN;
+        withdrawExpandDuration: number | string | BN;
+        borrowLimit: number | string | BN;
+        borrowableUntilLimit: number | string | BN;
+        borrowable: number | string | BN;
+        borrowLimitUtilization: number | string | BN;
+        maxBorrowLimit: number | string | BN;
+        borrowExpandPercent: number | string | BN;
+        borrowExpandDuration: number | string | BN;
+        baseBorrowLimit: number | string | BN;
+        minimumBorrowing: number | string | BN;
+      };
+
+  export type VaultDataStructOutputArray = [
+    string,
+    string,
+    string,
+    boolean,
+    boolean,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string
+  ];
+  export type VaultDataStructOutputStruct = {
+    vault: string;
+    vaultId: string;
+    vaultType: string;
+    isSmartColl: boolean;
+    isSmartDebt: boolean;
+    supplyToken0: string;
+    supplyToken1: string;
+    borrowToken0: string;
+    borrowToken1: string;
+    supplyToken0Decimals: string;
+    supplyToken1Decimals: string;
+    borrowToken0Decimals: string;
+    borrowToken1Decimals: string;
+    collateralFactor: string;
+    liquidationThreshold: string;
+    liquidationMaxLimit: string;
+    withdrawalGap: string;
+    liquidationPenalty: string;
+    borrowFee: string;
+    oracle: string;
+    oraclePriceOperate: string;
+    oraclePriceLiquidate: string;
+    priceOfSupplyToken0InUSD: string;
+    priceOfSupplyToken1InUSD: string;
+    priceOfBorrowToken0InUSD: string;
+    priceOfBorrowToken1InUSD: string;
+    vaultSupplyExchangePrice: string;
+    vaultBorrowExchangePrice: string;
+    supplyRateVault: string;
+    borrowRateVault: string;
+    rewardsOrFeeRateSupply: string;
+    rewardsOrFeeRateBorrow: string;
+    totalPositions: string;
+    totalSupplyVault: string;
+    totalBorrowVault: string;
+    withdrawalLimit: string;
+    withdrawableUntilLimit: string;
+    withdrawable: string;
+    baseWithdrawalLimit: string;
+    withdrawExpandPercent: string;
+    withdrawExpandDuration: string;
+    borrowLimit: string;
+    borrowableUntilLimit: string;
+    borrowable: string;
+    borrowLimitUtilization: string;
+    maxBorrowLimit: string;
+    borrowExpandPercent: string;
+    borrowExpandDuration: string;
+    baseBorrowLimit: string;
+    minimumBorrowing: string;
+  };
+  export type VaultDataStructOutput = VaultDataStructOutputArray &
+    VaultDataStructOutputStruct;
+}
+
+export interface FluidView extends BaseContract {
+  constructor(
+    jsonInterface: any[],
+    address?: string,
+    options?: ContractOptions
+  ): 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<
+      [FluidView.UserPositionStructOutput, FluidView.VaultDataStructOutput] & {
+        position: FluidView.UserPositionStructOutput;
+        vault: FluidView.VaultDataStructOutput;
+      }
+    >;
+
+    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(
+      _user: string
+    ): NonPayableTransactionObject<
+      [
+        FluidView.UserPositionStructOutput[],
+        FluidView.VaultDataStructOutput[]
+      ] & {
+        positions: FluidView.UserPositionStructOutput[];
+        vaults: FluidView.VaultDataStructOutput[];
+      }
+    >;
+
+    getVaultAddresses(
+      _ids: number | string | BN[],
+      _fetchAll: boolean
+    ): NonPayableTransactionObject<string[]>;
+
+    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/contracts/generated/LiquityV2CollSurplusPool.ts

@@ -0,0 +1,130 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type {
+  Callback,
+  PayableTransactionObject,
+  NonPayableTransactionObject,
+  BlockType,
+  ContractEventLog,
+  BaseContract,
+} from "./types";
+
+export interface EventOptions {
+  filter?: object;
+  fromBlock?: BlockType;
+  topics?: string[];
+}
+
+export type BorrowerOperationsAddressChanged = ContractEventLog<{
+  _newBorrowerOperationsAddress: string;
+  0: string;
+}>;
+export type CollBalanceUpdated = ContractEventLog<{
+  _account: string;
+  _newBalance: string;
+  0: string;
+  1: string;
+}>;
+export type CollSent = ContractEventLog<{
+  _to: string;
+  _amount: string;
+  0: string;
+  1: string;
+}>;
+export type TroveManagerAddressChanged = ContractEventLog<{
+  _newTroveManagerAddress: string;
+  0: string;
+}>;
+
+export interface LiquityV2CollSurplusPool extends BaseContract {
+  constructor(
+    jsonInterface: any[],
+    address?: string,
+    options?: ContractOptions
+  ): LiquityV2CollSurplusPool;
+  clone(): LiquityV2CollSurplusPool;
+  methods: {
+    NAME(): NonPayableTransactionObject<string>;
+
+    accountSurplus(
+      _account: string,
+      _amount: number | string | BN
+    ): NonPayableTransactionObject<void>;
+
+    borrowerOperationsAddress(): NonPayableTransactionObject<string>;
+
+    claimColl(_account: string): NonPayableTransactionObject<void>;
+
+    collToken(): NonPayableTransactionObject<string>;
+
+    getCollBalance(): NonPayableTransactionObject<string>;
+
+    getCollateral(_account: string): NonPayableTransactionObject<string>;
+
+    troveManagerAddress(): NonPayableTransactionObject<string>;
+  };
+  events: {
+    BorrowerOperationsAddressChanged(
+      cb?: Callback<BorrowerOperationsAddressChanged>
+    ): EventEmitter;
+    BorrowerOperationsAddressChanged(
+      options?: EventOptions,
+      cb?: Callback<BorrowerOperationsAddressChanged>
+    ): EventEmitter;
+
+    CollBalanceUpdated(cb?: Callback<CollBalanceUpdated>): EventEmitter;
+    CollBalanceUpdated(
+      options?: EventOptions,
+      cb?: Callback<CollBalanceUpdated>
+    ): EventEmitter;
+
+    CollSent(cb?: Callback<CollSent>): EventEmitter;
+    CollSent(options?: EventOptions, cb?: Callback<CollSent>): EventEmitter;
+
+    TroveManagerAddressChanged(
+      cb?: Callback<TroveManagerAddressChanged>
+    ): EventEmitter;
+    TroveManagerAddressChanged(
+      options?: EventOptions,
+      cb?: Callback<TroveManagerAddressChanged>
+    ): EventEmitter;
+
+    allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+  };
+
+  once(
+    event: "BorrowerOperationsAddressChanged",
+    cb: Callback<BorrowerOperationsAddressChanged>
+  ): void;
+  once(
+    event: "BorrowerOperationsAddressChanged",
+    options: EventOptions,
+    cb: Callback<BorrowerOperationsAddressChanged>
+  ): void;
+
+  once(event: "CollBalanceUpdated", cb: Callback<CollBalanceUpdated>): void;
+  once(
+    event: "CollBalanceUpdated",
+    options: EventOptions,
+    cb: Callback<CollBalanceUpdated>
+  ): void;
+
+  once(event: "CollSent", cb: Callback<CollSent>): void;
+  once(event: "CollSent", options: EventOptions, cb: Callback<CollSent>): void;
+
+  once(
+    event: "TroveManagerAddressChanged",
+    cb: Callback<TroveManagerAddressChanged>
+  ): void;
+  once(
+    event: "TroveManagerAddressChanged",
+    options: EventOptions,
+    cb: Callback<TroveManagerAddressChanged>
+  ): void;
+}