@gooddollar/goodprotocol 2.1.1 → 2.1.3

package/types/{IAaveIncentivesController.ts → contracts/Interfaces.sol/IAaveIncentivesControllerV3.ts}

@@ -1,63 +1,63 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
+import type {
   BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
   ContractTransaction,
   Overrides,
-  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
 } from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import type { FunctionFragment, Result } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
   TypedEvent,
   TypedListener,
   OnEvent,
-} from "./common";
+} from "../../common";
 
-export interface IAaveIncentivesControllerInterface
-  extends ethers.utils.Interface {
+export interface IAaveIncentivesControllerV3Interface extends utils.Interface {
   functions: {
-    "claimRewards(address[],uint256,address)": FunctionFragment;
-    "getRewardsBalance(address[],address)": FunctionFragment;
+    "claimAllRewards(address[],address)": FunctionFragment;
+    "getAllUserRewards(address[],address)": FunctionFragment;
   };
 
+  getFunction(
+    nameOrSignatureOrTopic: "claimAllRewards" | "getAllUserRewards"
+  ): FunctionFragment;
+
   encodeFunctionData(
-    functionFragment: "claimRewards",
-    values: [string[], BigNumberish, string]
+    functionFragment: "claimAllRewards",
+    values: [string[], string]
   ): string;
   encodeFunctionData(
-    functionFragment: "getRewardsBalance",
+    functionFragment: "getAllUserRewards",
     values: [string[], string]
   ): string;
 
   decodeFunctionResult(
-    functionFragment: "claimRewards",
+    functionFragment: "claimAllRewards",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "getRewardsBalance",
+    functionFragment: "getAllUserRewards",
     data: BytesLike
   ): Result;
 
   events: {};
 }
 
-export interface IAaveIncentivesController extends BaseContract {
+export interface IAaveIncentivesControllerV3 extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: IAaveIncentivesControllerInterface;
+  interface: IAaveIncentivesControllerV3Interface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -79,59 +79,61 @@ export interface IAaveIncentivesController extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    claimRewards(
+    claimAllRewards(
       assets: string[],
-      amount: BigNumberish,
       to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
-    getRewardsBalance(
+    getAllUserRewards(
       assets: string[],
       user: string,
       overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
+    ): Promise<
+      [string[], BigNumber[]] & { rewards: string[]; amounts: BigNumber[] }
+    >;
   };
 
-  claimRewards(
+  claimAllRewards(
     assets: string[],
-    amount: BigNumberish,
     to: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
-  getRewardsBalance(
+  getAllUserRewards(
     assets: string[],
     user: string,
     overrides?: CallOverrides
-  ): Promise<BigNumber>;
+  ): Promise<
+    [string[], BigNumber[]] & { rewards: string[]; amounts: BigNumber[] }
+  >;
 
   callStatic: {
-    claimRewards(
+    claimAllRewards(
       assets: string[],
-      amount: BigNumberish,
       to: string,
       overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    ): Promise<[string[], BigNumber[]]>;
 
-    getRewardsBalance(
+    getAllUserRewards(
       assets: string[],
       user: string,
       overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    ): Promise<
+      [string[], BigNumber[]] & { rewards: string[]; amounts: BigNumber[] }
+    >;
   };
 
   filters: {};
 
   estimateGas: {
-    claimRewards(
+    claimAllRewards(
       assets: string[],
-      amount: BigNumberish,
       to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
-    getRewardsBalance(
+    getAllUserRewards(
       assets: string[],
       user: string,
       overrides?: CallOverrides
@@ -139,14 +141,13 @@ export interface IAaveIncentivesController extends BaseContract {
   };
 
   populateTransaction: {
-    claimRewards(
+    claimAllRewards(
       assets: string[],
-      amount: BigNumberish,
       to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
-    getRewardsBalance(
+    getAllUserRewards(
       assets: string[],
       user: string,
       overrides?: CallOverrides

package/types/{ILendingPool.ts → contracts/Interfaces.sol/ILendingPoolV3.ts}

@@ -1,85 +1,98 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
+import type {
+  BaseContract,
   BigNumber,
   BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
+  BytesLike,
+  CallOverrides,
   ContractTransaction,
   Overrides,
-  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
 } from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import type { FunctionFragment, Result } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
 import type {
   TypedEventFilter,
   TypedEvent,
   TypedListener,
   OnEvent,
-} from "./common";
-
-export type ReserveConfigurationMapStruct = { data: BigNumberish };
-
-export type ReserveConfigurationMapStructOutput = [BigNumber] & {
-  data: BigNumber;
-};
-
-export type ReserveDataStruct = {
-  configuration: ReserveConfigurationMapStruct;
-  liquidityIndex: BigNumberish;
-  variableBorrowIndex: BigNumberish;
-  currentLiquidityRate: BigNumberish;
-  currentVariableBorrowRate: BigNumberish;
-  currentStableBorrowRate: BigNumberish;
-  lastUpdateTimestamp: BigNumberish;
-  aTokenAddress: string;
-  stableDebtTokenAddress: string;
-  variableDebtTokenAddress: string;
-  interestRateStrategyAddress: string;
-  id: BigNumberish;
-};
-
-export type ReserveDataStructOutput = [
-  ReserveConfigurationMapStructOutput,
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  BigNumber,
-  number,
-  string,
-  string,
-  string,
-  string,
-  number
-] & {
-  configuration: ReserveConfigurationMapStructOutput;
-  liquidityIndex: BigNumber;
-  variableBorrowIndex: BigNumber;
-  currentLiquidityRate: BigNumber;
-  currentVariableBorrowRate: BigNumber;
-  currentStableBorrowRate: BigNumber;
-  lastUpdateTimestamp: number;
-  aTokenAddress: string;
-  stableDebtTokenAddress: string;
-  variableDebtTokenAddress: string;
-  interestRateStrategyAddress: string;
-  id: number;
-};
-
-export interface ILendingPoolInterface extends ethers.utils.Interface {
+} from "../../common";
+
+export declare namespace DataTypes {
+  export type ReserveConfigurationMapStruct = { data: BigNumberish };
+
+  export type ReserveConfigurationMapStructOutput = [BigNumber] & {
+    data: BigNumber;
+  };
+
+  export type ReserveDataV3Struct = {
+    configuration: DataTypes.ReserveConfigurationMapStruct;
+    liquidityIndex: BigNumberish;
+    currentLiquidityRate: BigNumberish;
+    variableBorrowIndex: BigNumberish;
+    currentVariableBorrowRate: BigNumberish;
+    currentStableBorrowRate: BigNumberish;
+    lastUpdateTimestamp: BigNumberish;
+    id: BigNumberish;
+    aTokenAddress: string;
+    stableDebtTokenAddress: string;
+    variableDebtTokenAddress: string;
+    interestRateStrategyAddress: string;
+    accruedToTreasury: BigNumberish;
+    unbacked: BigNumberish;
+    isolationModeTotalDebt: BigNumberish;
+  };
+
+  export type ReserveDataV3StructOutput = [
+    DataTypes.ReserveConfigurationMapStructOutput,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    number,
+    number,
+    string,
+    string,
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    BigNumber
+  ] & {
+    configuration: DataTypes.ReserveConfigurationMapStructOutput;
+    liquidityIndex: BigNumber;
+    currentLiquidityRate: BigNumber;
+    variableBorrowIndex: BigNumber;
+    currentVariableBorrowRate: BigNumber;
+    currentStableBorrowRate: BigNumber;
+    lastUpdateTimestamp: number;
+    id: number;
+    aTokenAddress: string;
+    stableDebtTokenAddress: string;
+    variableDebtTokenAddress: string;
+    interestRateStrategyAddress: string;
+    accruedToTreasury: BigNumber;
+    unbacked: BigNumber;
+    isolationModeTotalDebt: BigNumber;
+  };
+}
+
+export interface ILendingPoolV3Interface extends utils.Interface {
   functions: {
     "deposit(address,uint256,address,uint16)": FunctionFragment;
     "getReserveData(address)": FunctionFragment;
     "withdraw(address,uint256,address)": FunctionFragment;
   };
 
+  getFunction(
+    nameOrSignatureOrTopic: "deposit" | "getReserveData" | "withdraw"
+  ): FunctionFragment;
+
   encodeFunctionData(
     functionFragment: "deposit",
     values: [string, BigNumberish, string, BigNumberish]
@@ -103,12 +116,12 @@ export interface ILendingPoolInterface extends ethers.utils.Interface {
   events: {};
 }
 
-export interface ILendingPool extends BaseContract {
+export interface ILendingPoolV3 extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: ILendingPoolInterface;
+  interface: ILendingPoolV3Interface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -135,19 +148,19 @@ export interface ILendingPool extends BaseContract {
       amount: BigNumberish,
       onBehalfOf: string,
       referralCode: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
 
     getReserveData(
       asset: string,
       overrides?: CallOverrides
-    ): Promise<[ReserveDataStructOutput]>;
+    ): Promise<[DataTypes.ReserveDataV3StructOutput]>;
 
     withdraw(
       asset: string,
       amount: BigNumberish,
       to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>;
   };
 
@@ -156,19 +169,19 @@ export interface ILendingPool extends BaseContract {
     amount: BigNumberish,
     onBehalfOf: string,
     referralCode: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   getReserveData(
     asset: string,
     overrides?: CallOverrides
-  ): Promise<ReserveDataStructOutput>;
+  ): Promise<DataTypes.ReserveDataV3StructOutput>;
 
   withdraw(
     asset: string,
     amount: BigNumberish,
     to: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>;
 
   callStatic: {
@@ -183,7 +196,7 @@ export interface ILendingPool extends BaseContract {
     getReserveData(
       asset: string,
       overrides?: CallOverrides
-    ): Promise<ReserveDataStructOutput>;
+    ): Promise<DataTypes.ReserveDataV3StructOutput>;
 
     withdraw(
       asset: string,
@@ -201,7 +214,7 @@ export interface ILendingPool extends BaseContract {
       amount: BigNumberish,
       onBehalfOf: string,
       referralCode: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
 
     getReserveData(
@@ -213,7 +226,7 @@ export interface ILendingPool extends BaseContract {
       asset: string,
       amount: BigNumberish,
       to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>;
   };
 
@@ -223,7 +236,7 @@ export interface ILendingPool extends BaseContract {
       amount: BigNumberish,
       onBehalfOf: string,
       referralCode: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
 
     getReserveData(
@@ -235,7 +248,7 @@ export interface ILendingPool extends BaseContract {
       asset: string,
       amount: BigNumberish,
       to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>;
   };
 }