@defisaver/positions-sdk 0.0.99 → 0.0.100

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/AaveV3View.ts

@@ -22,6 +22,41 @@ export interface EventOptions {
 }
 
 export declare namespace AaveV3View {
+  export type LiquidityChangeParamsStruct =
+    | [string, number | string | BN, number | string | BN]
+    | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+      };
+
+  export type LiquidityChangeParamsStructOutputArray = [string, string, string];
+  export type LiquidityChangeParamsStructOutputStruct = {
+    reserveAddress: string;
+    liquidityAdded: string;
+    liquidityTaken: string;
+  };
+  export type LiquidityChangeParamsStructOutput =
+    LiquidityChangeParamsStructOutputArray &
+      LiquidityChangeParamsStructOutputStruct;
+
+  export type EstimatedRatesStruct =
+    | [string, number | string | BN, number | string | BN]
+    | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+      };
+
+  export type EstimatedRatesStructOutputArray = [string, string, string];
+  export type EstimatedRatesStructOutputStruct = {
+    reserveAddress: string;
+    supplyRate: string;
+    variableBorrowRate: string;
+  };
+  export type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray &
+    EstimatedRatesStructOutputStruct;
+
   export type TokenInfoFullStruct =
     | [
         string,
@@ -177,6 +212,7 @@ export declare namespace AaveV3View {
         number | string | BN,
         number | string | BN,
         string[],
+        boolean[],
         string[],
         number | string | BN[],
         number | string | BN[],
@@ -192,6 +228,7 @@ export declare namespace AaveV3View {
         ratio: number | string | BN;
         eMode: number | string | BN;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: number | string | BN[];
         borrowStableAmounts: number | string | BN[];
@@ -208,6 +245,7 @@ export declare namespace AaveV3View {
     string,
     string,
     string[],
+    boolean[],
     string[],
     string[],
     string[],
@@ -223,6 +261,7 @@ export declare namespace AaveV3View {
     ratio: string;
     eMode: string;
     collAddr: string[];
+    enabledAsColl: boolean[];
     borrowAddr: string[];
     collAmounts: string[];
     borrowStableAmounts: string[];
@@ -315,9 +354,10 @@ export interface AaveV3View extends BaseContract {
   methods: {
     AAVE_REFERRAL_CODE(): NonPayableTransactionObject<string>;
 
-    STABLE_ID(): NonPayableTransactionObject<string>;
-
-    VARIABLE_ID(): NonPayableTransactionObject<string>;
+    getApyAfterValuesEstimation(
+      _market: string,
+      _reserveParams: AaveV3View.LiquidityChangeParamsStruct[]
+    ): NonPayableTransactionObject<AaveV3View.EstimatedRatesStructOutput[]>;
 
     getAssetPrice(
       _market: string,

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

@@ -22,6 +22,41 @@ export interface EventOptions {
 }
 
 export declare namespace SparkView {
+  export type LiquidityChangeParamsStruct =
+    | [string, number | string | BN, number | string | BN]
+    | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+      };
+
+  export type LiquidityChangeParamsStructOutputArray = [string, string, string];
+  export type LiquidityChangeParamsStructOutputStruct = {
+    reserveAddress: string;
+    liquidityAdded: string;
+    liquidityTaken: string;
+  };
+  export type LiquidityChangeParamsStructOutput =
+    LiquidityChangeParamsStructOutputArray &
+      LiquidityChangeParamsStructOutputStruct;
+
+  export type EstimatedRatesStruct =
+    | [string, number | string | BN, number | string | BN]
+    | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+      };
+
+  export type EstimatedRatesStructOutputArray = [string, string, string];
+  export type EstimatedRatesStructOutputStruct = {
+    reserveAddress: string;
+    supplyRate: string;
+    variableBorrowRate: string;
+  };
+  export type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray &
+    EstimatedRatesStructOutputStruct;
+
   export type TokenInfoFullStruct =
     | [
         string,
@@ -177,6 +212,7 @@ export declare namespace SparkView {
         number | string | BN,
         number | string | BN,
         string[],
+        boolean[],
         string[],
         number | string | BN[],
         number | string | BN[],
@@ -192,6 +228,7 @@ export declare namespace SparkView {
         ratio: number | string | BN;
         eMode: number | string | BN;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: number | string | BN[];
         borrowStableAmounts: number | string | BN[];
@@ -208,6 +245,7 @@ export declare namespace SparkView {
     string,
     string,
     string[],
+    boolean[],
     string[],
     string[],
     string[],
@@ -223,6 +261,7 @@ export declare namespace SparkView {
     ratio: string;
     eMode: string;
     collAddr: string[];
+    enabledAsColl: boolean[];
     borrowAddr: string[];
     collAmounts: string[];
     borrowStableAmounts: string[];
@@ -315,9 +354,10 @@ export interface SparkView extends BaseContract {
   methods: {
     SPARK_REFERRAL_CODE(): NonPayableTransactionObject<string>;
 
-    STABLE_ID(): NonPayableTransactionObject<string>;
-
-    VARIABLE_ID(): NonPayableTransactionObject<string>;
+    getApyAfterValuesEstimation(
+      _market: string,
+      _reserveParams: SparkView.LiquidityChangeParamsStruct[]
+    ): NonPayableTransactionObject<SparkView.EstimatedRatesStructOutput[]>;
 
     getAssetPrice(
       _market: string,