@defisaver/positions-sdk 0.0.59 → 0.0.61-dev

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/{LlamaLendCRVCrvUSDController.ts → LlamaLendControllerAbi.ts}

@@ -86,13 +86,13 @@ export type CollectFees = ContractEventLog<{
   1: string;
 }>;
 
-export interface LlamaLendCRVCrvUSDController extends BaseContract {
+export interface LlamaLendControllerAbi extends BaseContract {
   constructor(
     jsonInterface: any[],
     address?: string,
     options?: ContractOptions
-  ): LlamaLendCRVCrvUSDController;
-  clone(): LlamaLendCRVCrvUSDController;
+  ): LlamaLendControllerAbi;
+  clone(): LlamaLendControllerAbi;
   methods: {
     factory(): NonPayableTransactionObject<string>;
 

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

@@ -97,6 +97,7 @@ export declare namespace LlamaLendView {
         number | string | BN,
         number | string | BN,
         number | string | BN,
+        number | string | BN,
         number | string | BN
       ]
     | {
@@ -119,6 +120,7 @@ export declare namespace LlamaLendView {
         lendApr: number | string | BN;
         debtTokenTotalSupply: number | string | BN;
         debtTokenLeftToBorrow: number | string | BN;
+        loanDiscount: number | string | BN;
       };
 
   export type GlobalDataStructOutputArray = [
@@ -140,6 +142,7 @@ export declare namespace LlamaLendView {
     string,
     string,
     string,
+    string,
     string
   ];
   export type GlobalDataStructOutputStruct = {
@@ -162,6 +165,7 @@ export declare namespace LlamaLendView {
     lendApr: string;
     debtTokenTotalSupply: string;
     debtTokenLeftToBorrow: string;
+    loanDiscount: string;
   };
   export type GlobalDataStructOutput = GlobalDataStructOutputArray &
     GlobalDataStructOutputStruct;
@@ -307,6 +311,11 @@ export interface LlamaLendView extends BaseContract {
       numBands: number | string | BN
     ): NonPayableTransactionObject<string>;
 
+    isControllerValid(
+      _controllerAddr: string,
+      _controllerId: number | string | BN
+    ): NonPayableTransactionObject<boolean>;
+
     maxBorrow(
       market: string,
       collateral: number | string | BN,

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

@@ -33,11 +33,8 @@ export type { LendingPoolAddressesProvider } from "./LendingPoolAddressesProvide
 export type { Lido } from "./Lido";
 export type { LiquityActivePool } from "./LiquityActivePool";
 export type { LiquityView } from "./LiquityView";
-export type { LlamaLendCRVCrvUSDController } from "./LlamaLendCRVCrvUSDController";
-export type { LlamaLendCrvUSDCRVController } from "./LlamaLendCrvUSDCRVController";
-export type { LlamaLendTBTCCrvUSDController } from "./LlamaLendTBTCCrvUSDController";
+export type { LlamaLendControllerAbi } from "./LlamaLendControllerAbi";
 export type { LlamaLendView } from "./LlamaLendView";
-export type { LlamaLendWstETHCrvUSDController } from "./LlamaLendWstETHCrvUSDController";
 export type { McdDog } from "./McdDog";
 export type { McdJug } from "./McdJug";
 export type { McdSpotter } from "./McdSpotter";