@defisaver/positions-sdk 0.0.27 → 0.0.29

package/src/types/common.ts

@@ -1,84 +1,84 @@
-// General
-export type EthAddress = string;
-export type Blockish = number | 'latest';
-export type AssetSymbol = string;
-export type Amount = string | number;
-
-export enum NetworkNumber {
-  Eth = 1,
-  Opt = 10,
-  Arb = 42161,
-  Base = 8453,
-}
-export type Networkish = string | NetworkNumber;
-
-// Common
-export interface MMAssetData {
-  symbol: string,
-  supplyRate: string,
-  borrowRate: string,
-  price: string,
-  collateralFactor: string,
-  underlyingTokenAddress: string,
-  marketLiquidity: string,
-  utilization: string,
-  borrowCap: string,
-  totalSupply: string,
-  canBeBorrowed: boolean,
-  canBeSupplied: boolean,
-  totalBorrow: string,
-  incentiveBorrowApy?: string,
-  incentiveBorrowToken?: string,
-  incentiveSupplyApy?: string,
-  incentiveSupplyToken?: string,
-  borrowRateP2P?: string,
-  supplyRateP2P?: string,
-}
-
-export interface MMAssetsData {
-  [token: string]: MMAssetData,
-}
-export interface MMMarketData {
-  assetsData: MMAssetData[],
-}
-export interface MMUsedAsset {
-  symbol: string,
-  supplied: string,
-  suppliedUsd: string,
-  isSupplied: boolean,
-  borrowed: string,
-  borrowedUsd: string,
-  isBorrowed: boolean,
-  debt: string,
-  supplyRate?: string,
-  borrowRate?: string,
-  discountedBorrowRate?: string,
-  stableBorrowRate?: string,
-  interestMode?: string,
-  collateral?: boolean,
-}
-export interface MMUsedAssets {
-  [token: string]: MMUsedAsset,
-}
-export interface MMUsedAssetWStableB extends MMUsedAsset {
-  stableBorrowRate: string,
-  borrowedStable: string,
-  borrowedVariable: string,
-  borrowedUsdStable: string,
-  borrowedUsdVariable: string,
-  interestMode: string,
-}
-export interface MMPositionData {
-  usedAssets: any,
-  netApy: string,
-  lastUpdated: number,
-  // ...
-}
-
-export type Balances = Record<AssetSymbol, Amount>;
-export interface PositionBalances {
-  collateral?: Balances,
-  debt?: Balances,
-  selling?: Balances,
-  deposited?: Balances,
+// General
+export type EthAddress = string;
+export type Blockish = number | 'latest';
+export type AssetSymbol = string;
+export type Amount = string | number;
+
+export enum NetworkNumber {
+  Eth = 1,
+  Opt = 10,
+  Arb = 42161,
+  Base = 8453,
+}
+export type Networkish = string | NetworkNumber;
+
+// Common
+export interface MMAssetData {
+  symbol: string,
+  supplyRate: string,
+  borrowRate: string,
+  price: string,
+  collateralFactor: string,
+  underlyingTokenAddress: string,
+  marketLiquidity: string,
+  utilization: string,
+  borrowCap: string,
+  totalSupply: string,
+  canBeBorrowed: boolean,
+  canBeSupplied: boolean,
+  totalBorrow: string,
+  incentiveBorrowApy?: string,
+  incentiveBorrowToken?: string,
+  incentiveSupplyApy?: string,
+  incentiveSupplyToken?: string,
+  borrowRateP2P?: string,
+  supplyRateP2P?: string,
+}
+
+export interface MMAssetsData {
+  [token: string]: MMAssetData,
+}
+export interface MMMarketData {
+  assetsData: MMAssetData[],
+}
+export interface MMUsedAsset {
+  symbol: string,
+  supplied: string,
+  suppliedUsd: string,
+  isSupplied: boolean,
+  borrowed: string,
+  borrowedUsd: string,
+  isBorrowed: boolean,
+  debt: string,
+  supplyRate?: string,
+  borrowRate?: string,
+  discountedBorrowRate?: string,
+  stableBorrowRate?: string,
+  interestMode?: string,
+  collateral?: boolean,
+}
+export interface MMUsedAssets {
+  [token: string]: MMUsedAsset,
+}
+export interface MMUsedAssetWStableB extends MMUsedAsset {
+  stableBorrowRate: string,
+  borrowedStable: string,
+  borrowedVariable: string,
+  borrowedUsdStable: string,
+  borrowedUsdVariable: string,
+  interestMode: string,
+}
+export interface MMPositionData {
+  usedAssets: any,
+  netApy: string,
+  lastUpdated: number,
+  // ...
+}
+
+export type Balances = Record<AssetSymbol, Amount>;
+export interface PositionBalances {
+  collateral?: Balances,
+  debt?: Balances,
+  selling?: Balances,
+  deposited?: Balances,
 }

package/src/types/compound.ts

@@ -1,129 +1,129 @@
-import {
-  MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
-} from './common';
-
-export enum CompoundVersions {
-  'CompoundV2' = 'v2',
-  'CompoundV3USDC' = 'v3-USDC',
-  'CompoundV3USDCe' = 'v3-USDC.e',
-  'CompoundV3ETH' = 'v3-ETH',
-  'CompoundV3USDbC' = 'v3-USDbC',
-}
-
-export interface CompoundBulkerOptions {
-  supply: number | string,
-  withdraw: number | string,
-}
-
-export interface CompoundMarketData {
-  chainIds: NetworkNumber[],
-  label: string,
-  shortLabel: string,
-  value: CompoundVersions,
-  baseAsset: string,
-  collAssets: readonly string[],
-  baseMarket: string,
-  baseMarketAddress: string,
-  secondLabel: string,
-  bulkerName: string,
-  bulkerAddress: string,
-  bulkerOptions: CompoundBulkerOptions,
-  // icon: Function,
-}
-
-export interface CompoundUsedAsset extends MMUsedAsset {
-  collateral: boolean,
-  limit?: string,
-}
-
-export interface CompoundV2UsedAsset extends CompoundUsedAsset {
-}
-export interface CompoundV3UsedAsset extends CompoundUsedAsset {
-}
-
-export interface CompoundUsedAssets<T> {
-  [token: string]: T,
-}
-
-export type CompoundV2UsedAssets = CompoundUsedAssets<CompoundV2UsedAsset>;
-export type CompoundV3UsedAssets = CompoundUsedAssets<CompoundV3UsedAsset>;
-
-export interface CompoundAssetData extends MMAssetData {
-  supplyCapAlternative?: string,
-  totalSupplyAlternative?: string,
-  priceAlternative?: string,
-  sortIndex?: number,
-}
-
-export interface CompoundV2AssetData extends CompoundAssetData {
-}
-export interface CompoundV3AssetData extends CompoundAssetData {
-  borrowCollateralFactor: string,
-  liquidateCollateralFactor: string,
-  minDebt: string,
-  liquidationRatio: string,
-  supplyCap: string,
-  priceInBaseAsset: string,
-}
-
-export interface CompoundAssetsData<T> {
-  [token: string]: T
-}
-export type CompoundV2AssetsData = CompoundAssetsData<CompoundV2AssetData>;
-export type CompoundV3AssetsData = CompoundAssetsData<CompoundV3AssetData>;
-
-export type CompoundMarketsData<T> = { assetsData: T };
-export type CompoundV2MarketsData = CompoundMarketsData<CompoundV2AssetsData>;
-export type CompoundV3MarketsData = CompoundMarketsData<CompoundV3AssetsData>;
-
-export interface BaseAdditionalAssetData {
-  totalBorrow: string,
-  utilization: string,
-  marketLiquidity: string,
-  rewardSupplySpeed: string,
-  rewardBorrowSpeed: string,
-  minDebt: string,
-  isBase: boolean,
-}
-
-export interface CompoundAggregatedPositionData {
-  suppliedUsd: string,
-  suppliedCollateralUsd: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  liquidationLimitUsd: string,
-  leftToBorrowUsd: string,
-  ratio: string,
-  collRatio: string,
-  netApy: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  liqRatio: string,
-  liqPercent: string,
-  leveragedType: string,
-  leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
-  liquidationPrice?: string,
-  minRatio: string,
-  debtTooLow: boolean,
-  minDebt: string,
-}
-
-export interface CompoundPositionData extends MMPositionData {
-  ratio: string,
-  minRatio: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  isSubscribedToAutomation?: boolean,
-  automationResubscribeRequired?: boolean,
-}
-
-export interface CompoundV2PositionData extends CompoundPositionData {
-  usedAssets: CompoundV2UsedAssets,
-}
-
-export interface CompoundV3PositionData extends CompoundPositionData {
-  usedAssets: CompoundV3UsedAssets,
+import {
+  MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
+} from './common';
+
+export enum CompoundVersions {
+  'CompoundV2' = 'v2',
+  'CompoundV3USDC' = 'v3-USDC',
+  'CompoundV3USDCe' = 'v3-USDC.e',
+  'CompoundV3ETH' = 'v3-ETH',
+  'CompoundV3USDbC' = 'v3-USDbC',
+}
+
+export interface CompoundBulkerOptions {
+  supply: number | string,
+  withdraw: number | string,
+}
+
+export interface CompoundMarketData {
+  chainIds: NetworkNumber[],
+  label: string,
+  shortLabel: string,
+  value: CompoundVersions,
+  baseAsset: string,
+  collAssets: readonly string[],
+  baseMarket: string,
+  baseMarketAddress: string,
+  secondLabel: string,
+  bulkerName: string,
+  bulkerAddress: string,
+  bulkerOptions: CompoundBulkerOptions,
+  // icon: Function,
+}
+
+export interface CompoundUsedAsset extends MMUsedAsset {
+  collateral: boolean,
+  limit?: string,
+}
+
+export interface CompoundV2UsedAsset extends CompoundUsedAsset {
+}
+export interface CompoundV3UsedAsset extends CompoundUsedAsset {
+}
+
+export interface CompoundUsedAssets<T> {
+  [token: string]: T,
+}
+
+export type CompoundV2UsedAssets = CompoundUsedAssets<CompoundV2UsedAsset>;
+export type CompoundV3UsedAssets = CompoundUsedAssets<CompoundV3UsedAsset>;
+
+export interface CompoundAssetData extends MMAssetData {
+  supplyCapAlternative?: string,
+  totalSupplyAlternative?: string,
+  priceAlternative?: string,
+  sortIndex?: number,
+}
+
+export interface CompoundV2AssetData extends CompoundAssetData {
+}
+export interface CompoundV3AssetData extends CompoundAssetData {
+  borrowCollateralFactor: string,
+  liquidateCollateralFactor: string,
+  minDebt: string,
+  liquidationRatio: string,
+  supplyCap: string,
+  priceInBaseAsset: string,
+}
+
+export interface CompoundAssetsData<T> {
+  [token: string]: T
+}
+export type CompoundV2AssetsData = CompoundAssetsData<CompoundV2AssetData>;
+export type CompoundV3AssetsData = CompoundAssetsData<CompoundV3AssetData>;
+
+export type CompoundMarketsData<T> = { assetsData: T };
+export type CompoundV2MarketsData = CompoundMarketsData<CompoundV2AssetsData>;
+export type CompoundV3MarketsData = CompoundMarketsData<CompoundV3AssetsData>;
+
+export interface BaseAdditionalAssetData {
+  totalBorrow: string,
+  utilization: string,
+  marketLiquidity: string,
+  rewardSupplySpeed: string,
+  rewardBorrowSpeed: string,
+  minDebt: string,
+  isBase: boolean,
+}
+
+export interface CompoundAggregatedPositionData {
+  suppliedUsd: string,
+  suppliedCollateralUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  liquidationLimitUsd: string,
+  leftToBorrowUsd: string,
+  ratio: string,
+  collRatio: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  liqRatio: string,
+  liqPercent: string,
+  leveragedType: string,
+  leveragedAsset?: string,
+  leveragedLsdAssetRatio?: string,
+  liquidationPrice?: string,
+  minRatio: string,
+  debtTooLow: boolean,
+  minDebt: string,
+}
+
+export interface CompoundPositionData extends MMPositionData {
+  ratio: string,
+  minRatio: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  isSubscribedToAutomation?: boolean,
+  automationResubscribeRequired?: boolean,
+}
+
+export interface CompoundV2PositionData extends CompoundPositionData {
+  usedAssets: CompoundV2UsedAssets,
+}
+
+export interface CompoundV3PositionData extends CompoundPositionData {
+  usedAssets: CompoundV3UsedAssets,
 }

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

@@ -159,9 +159,7 @@ export declare namespace CurveUsdView {
         number | string | BN,
         number | string | BN,
         [number | string | BN, number | string | BN],
-        [number | string | BN[], number | string | BN[]],
-        number | string | BN,
-        boolean
+        [number | string | BN[], number | string | BN[]]
       ]
     | {
         loanExists: boolean;
@@ -176,8 +174,6 @@ export declare namespace CurveUsdView {
         health: number | string | BN;
         bandRange: [number | string | BN, number | string | BN];
         usersBands: [number | string | BN[], number | string | BN[]];
-        collRatio: number | string | BN;
-        isInSoftLiquidation: boolean;
       };
 
   export type UserDataStructOutputArray = [
@@ -192,9 +188,7 @@ export declare namespace CurveUsdView {
     string,
     string,
     [string, string],
-    [string[], string[]],
-    string,
-    boolean
+    [string[], string[]]
   ];
   export type UserDataStructOutputStruct = {
     loanExists: boolean;
@@ -209,8 +203,6 @@ export declare namespace CurveUsdView {
     health: string;
     bandRange: [string, string];
     usersBands: [string[], string[]];
-    collRatio: string;
-    isInSoftLiquidation: boolean;
   };
   export type UserDataStructOutput = UserDataStructOutputArray &
     UserDataStructOutputStruct;
@@ -224,10 +216,6 @@ export interface CrvUSDView extends BaseContract {
   ): CrvUSDView;
   clone(): CrvUSDView;
   methods: {
-    WBTC_HEALTH_ZAP(): NonPayableTransactionObject<string>;
-
-    WBTC_MARKET(): NonPayableTransactionObject<string>;
-
     createLoanData(
       market: string,
       collateral: number | string | BN,
@@ -240,32 +228,18 @@ export interface CrvUSDView extends BaseContract {
       n: number | string | BN
     ): NonPayableTransactionObject<CurveUsdView.BandStructOutput>;
 
-    getBandsData(
-      market: string,
-      from: number | string | BN,
-      to: number | string | BN
-    ): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
-
-    getBandsDataForPosition(
+    "getBandsData(address,uint256,uint256,uint256)"(
       market: string,
       collateral: number | string | BN,
       debt: number | string | BN,
       N: number | string | BN
     ): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
 
-    getCollAmountsFromAMM(
-      _controllerAddress: string,
-      _user: string
-    ): NonPayableTransactionObject<
-      [string, string] & { crvUsdAmount: string; collAmount: string }
-    >;
-
-    getCollateralRatio(
-      _user: string,
-      _controllerAddr: string
-    ): NonPayableTransactionObject<
-      [string, boolean] & { collRatio: string; isInSoftLiquidation: boolean }
-    >;
+    "getBandsData(address,int256,int256)"(
+      market: string,
+      from: number | string | BN,
+      to: number | string | BN
+    ): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
 
     globalData(
       market: string
@@ -280,10 +254,6 @@ export interface CrvUSDView extends BaseContract {
       numBands: number | string | BN
     ): NonPayableTransactionObject<string>;
 
-    isControllerValid(
-      _controllerAddr: string
-    ): NonPayableTransactionObject<boolean>;
-
     maxBorrow(
       market: string,
       collateral: number | string | BN,
@@ -300,11 +270,6 @@ export interface CrvUSDView extends BaseContract {
       market: string,
       user: string
     ): NonPayableTransactionObject<CurveUsdView.UserDataStructOutput>;
-
-    userMaxWithdraw(
-      _controllerAddress: string,
-      _user: string
-    ): NonPayableTransactionObject<string>;
   };
   events: {
     allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;