@gooddollar/goodprotocol 2.0.34-beta.4 → 2.1.1

package/types/{contracts/reserve/GoodReserveADai.ts → GoodReserveCDai.ts}

@@ -1,39 +1,36 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import type {
-  BaseContract,
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
   BigNumber,
   BigNumberish,
-  BytesLike,
-  CallOverrides,
+  PopulatedTransaction,
+  BaseContract,
   ContractTransaction,
   Overrides,
   PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
+  CallOverrides,
 } from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
+import { BytesLike } from "@ethersproject/bytes";
+import { Listener, Provider } from "@ethersproject/providers";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
 import type {
   TypedEventFilter,
   TypedEvent,
   TypedListener,
   OnEvent,
-} from "../../common";
+} from "./common";
 
-export interface GoodReserveADaiInterface extends utils.Interface {
+export interface GoodReserveCDaiInterface extends ethers.utils.Interface {
   functions: {
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
     "MINTER_ROLE()": FunctionFragment;
     "PAUSER_ROLE()": FunctionFragment;
     "RESERVE_MINTER_ROLE()": FunctionFragment;
-    "aDaiAddress()": FunctionFragment;
     "allowance(address,address)": FunctionFragment;
     "approve(address,uint256)": FunctionFragment;
     "avatar()": FunctionFragment;
@@ -62,7 +59,6 @@ export interface GoodReserveADaiInterface extends utils.Interface {
     "hasRole(bytes32,address)": FunctionFragment;
     "increaseAllowance(address,uint256)": FunctionFragment;
     "initialize(string,string)": FunctionFragment;
-    "initialize(address,bytes32)": FunctionFragment;
     "isClaimedGDX(address)": FunctionFragment;
     "lastMinted()": FunctionFragment;
     "mint(address,uint256)": FunctionFragment;
@@ -95,74 +91,6 @@ export interface GoodReserveADaiInterface extends utils.Interface {
     "when()": FunctionFragment;
   };
 
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "DEFAULT_ADMIN_ROLE"
-      | "MINTER_ROLE"
-      | "PAUSER_ROLE"
-      | "RESERVE_MINTER_ROLE"
-      | "aDaiAddress"
-      | "allowance"
-      | "approve"
-      | "avatar"
-      | "balanceOf"
-      | "burn"
-      | "burnFrom"
-      | "buy"
-      | "cDaiAddress"
-      | "cap"
-      | "currentPrice"
-      | "currentPriceDAI"
-      | "daiAddress"
-      | "dao"
-      | "decimals"
-      | "decreaseAllowance"
-      | "discountDisabled"
-      | "distributionHelper"
-      | "end"
-      | "gdxAirdrop"
-      | "gdxDisabled"
-      | "getMarketMaker"
-      | "getRoleAdmin"
-      | "getRoleMember"
-      | "getRoleMemberCount"
-      | "grantRole"
-      | "hasRole"
-      | "increaseAllowance"
-      | "initialize(string,string)"
-      | "initialize(address,bytes32)"
-      | "isClaimedGDX"
-      | "lastMinted"
-      | "mint"
-      | "mintRewardFromRR"
-      | "mintUBI"
-      | "name"
-      | "nameService"
-      | "nativeToken"
-      | "pause"
-      | "paused"
-      | "pre"
-      | "proxiableUUID"
-      | "recover"
-      | "renounceRole"
-      | "revokeRole"
-      | "sell"
-      | "setAddresses"
-      | "setDistributionHelper"
-      | "setGDXDisabled"
-      | "setReserveRatioDailyExpansion"
-      | "supportsInterface"
-      | "symbol"
-      | "totalSupply"
-      | "transfer"
-      | "transferFrom"
-      | "unpause"
-      | "updateAvatar"
-      | "upgradeTo"
-      | "upgradeToAndCall"
-      | "when"
-  ): FunctionFragment;
-
   encodeFunctionData(
     functionFragment: "DEFAULT_ADMIN_ROLE",
     values?: undefined
@@ -179,10 +107,6 @@ export interface GoodReserveADaiInterface extends utils.Interface {
     functionFragment: "RESERVE_MINTER_ROLE",
     values?: undefined
   ): string;
-  encodeFunctionData(
-    functionFragment: "aDaiAddress",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "allowance",
     values: [string, string]
@@ -271,13 +195,9 @@ export interface GoodReserveADaiInterface extends utils.Interface {
     values: [string, BigNumberish]
   ): string;
   encodeFunctionData(
-    functionFragment: "initialize(string,string)",
+    functionFragment: "initialize",
     values: [string, string]
   ): string;
-  encodeFunctionData(
-    functionFragment: "initialize(address,bytes32)",
-    values: [string, BytesLike]
-  ): string;
   encodeFunctionData(
     functionFragment: "isClaimedGDX",
     values: [string]
@@ -391,10 +311,6 @@ export interface GoodReserveADaiInterface extends utils.Interface {
     functionFragment: "RESERVE_MINTER_ROLE",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "aDaiAddress",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "avatar", data: BytesLike): Result;
@@ -458,14 +374,7 @@ export interface GoodReserveADaiInterface extends utils.Interface {
     functionFragment: "increaseAllowance",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "initialize(string,string)",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "initialize(address,bytes32)",
-    data: BytesLike
-  ): Result;
+  decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "isClaimedGDX",
     data: BytesLike
@@ -579,190 +488,135 @@ export interface GoodReserveADaiInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
 }
 
-export interface AdminChangedEventObject {
-  previousAdmin: string;
-  newAdmin: string;
-}
 export type AdminChangedEvent = TypedEvent<
   [string, string],
-  AdminChangedEventObject
+  { previousAdmin: string; newAdmin: string }
 >;
 
 export type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>;
 
-export interface ApprovalEventObject {
-  owner: string;
-  spender: string;
-  value: BigNumber;
-}
 export type ApprovalEvent = TypedEvent<
   [string, string, BigNumber],
-  ApprovalEventObject
+  { owner: string; spender: string; value: BigNumber }
 >;
 
 export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
 
-export interface BeaconUpgradedEventObject {
-  beacon: string;
-}
-export type BeaconUpgradedEvent = TypedEvent<
-  [string],
-  BeaconUpgradedEventObject
->;
+export type BeaconUpgradedEvent = TypedEvent<[string], { beacon: string }>;
 
 export type BeaconUpgradedEventFilter = TypedEventFilter<BeaconUpgradedEvent>;
 
-export interface DistributionHelperSetEventObject {
-  distributionHelper: string;
-  bps: number;
-}
 export type DistributionHelperSetEvent = TypedEvent<
   [string, number],
-  DistributionHelperSetEventObject
+  { distributionHelper: string; bps: number }
 >;
 
 export type DistributionHelperSetEventFilter =
   TypedEventFilter<DistributionHelperSetEvent>;
 
-export interface InitializedEventObject {
-  version: number;
-}
-export type InitializedEvent = TypedEvent<[number], InitializedEventObject>;
+export type InitializedEvent = TypedEvent<[number], { version: number }>;
 
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 
-export interface NonUBIMintedEventObject {
-  distributionHelper: string;
-  amountMinted: BigNumber;
-  distributionSucceeded: boolean;
-}
 export type NonUBIMintedEvent = TypedEvent<
   [string, BigNumber, boolean],
-  NonUBIMintedEventObject
+  {
+    distributionHelper: string;
+    amountMinted: BigNumber;
+    distributionSucceeded: boolean;
+  }
 >;
 
 export type NonUBIMintedEventFilter = TypedEventFilter<NonUBIMintedEvent>;
 
-export interface PausedEventObject {
-  account: string;
-}
-export type PausedEvent = TypedEvent<[string], PausedEventObject>;
+export type PausedEvent = TypedEvent<[string], { account: string }>;
 
 export type PausedEventFilter = TypedEventFilter<PausedEvent>;
 
-export interface RoleAdminChangedEventObject {
-  role: string;
-  previousAdminRole: string;
-  newAdminRole: string;
-}
 export type RoleAdminChangedEvent = TypedEvent<
   [string, string, string],
-  RoleAdminChangedEventObject
+  { role: string; previousAdminRole: string; newAdminRole: string }
 >;
 
 export type RoleAdminChangedEventFilter =
   TypedEventFilter<RoleAdminChangedEvent>;
 
-export interface RoleGrantedEventObject {
-  role: string;
-  account: string;
-  sender: string;
-}
 export type RoleGrantedEvent = TypedEvent<
   [string, string, string],
-  RoleGrantedEventObject
+  { role: string; account: string; sender: string }
 >;
 
 export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
 
-export interface RoleRevokedEventObject {
-  role: string;
-  account: string;
-  sender: string;
-}
 export type RoleRevokedEvent = TypedEvent<
   [string, string, string],
-  RoleRevokedEventObject
+  { role: string; account: string; sender: string }
 >;
 
 export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
 
-export interface TokenPurchasedEventObject {
-  caller: string;
-  inputToken: string;
-  inputAmount: BigNumber;
-  actualReturn: BigNumber;
-  receiverAddress: string;
-}
 export type TokenPurchasedEvent = TypedEvent<
   [string, string, BigNumber, BigNumber, string],
-  TokenPurchasedEventObject
+  {
+    caller: string;
+    inputToken: string;
+    inputAmount: BigNumber;
+    actualReturn: BigNumber;
+    receiverAddress: string;
+  }
 >;
 
 export type TokenPurchasedEventFilter = TypedEventFilter<TokenPurchasedEvent>;
 
-export interface TokenSoldEventObject {
-  caller: string;
-  outputToken: string;
-  gdAmount: BigNumber;
-  contributionAmount: BigNumber;
-  actualReturn: BigNumber;
-  receiverAddress: string;
-}
 export type TokenSoldEvent = TypedEvent<
   [string, string, BigNumber, BigNumber, BigNumber, string],
-  TokenSoldEventObject
+  {
+    caller: string;
+    outputToken: string;
+    gdAmount: BigNumber;
+    contributionAmount: BigNumber;
+    actualReturn: BigNumber;
+    receiverAddress: string;
+  }
 >;
 
 export type TokenSoldEventFilter = TypedEventFilter<TokenSoldEvent>;
 
-export interface TransferEventObject {
-  from: string;
-  to: string;
-  value: BigNumber;
-}
 export type TransferEvent = TypedEvent<
   [string, string, BigNumber],
-  TransferEventObject
+  { from: string; to: string; value: BigNumber }
 >;
 
 export type TransferEventFilter = TypedEventFilter<TransferEvent>;
 
-export interface UBIMintedEventObject {
-  day: BigNumber;
-  interestToken: string;
-  interestReceived: BigNumber;
-  gdInterestMinted: BigNumber;
-  gdExpansionMinted: BigNumber;
-  gdUbiTransferred: BigNumber;
-}
 export type UBIMintedEvent = TypedEvent<
   [BigNumber, string, BigNumber, BigNumber, BigNumber, BigNumber],
-  UBIMintedEventObject
+  {
+    day: BigNumber;
+    interestToken: string;
+    interestReceived: BigNumber;
+    gdInterestMinted: BigNumber;
+    gdExpansionMinted: BigNumber;
+    gdUbiTransferred: BigNumber;
+  }
 >;
 
 export type UBIMintedEventFilter = TypedEventFilter<UBIMintedEvent>;
 
-export interface UnpausedEventObject {
-  account: string;
-}
-export type UnpausedEvent = TypedEvent<[string], UnpausedEventObject>;
+export type UnpausedEvent = TypedEvent<[string], { account: string }>;
 
 export type UnpausedEventFilter = TypedEventFilter<UnpausedEvent>;
 
-export interface UpgradedEventObject {
-  implementation: string;
-}
-export type UpgradedEvent = TypedEvent<[string], UpgradedEventObject>;
+export type UpgradedEvent = TypedEvent<[string], { implementation: string }>;
 
 export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>;
 
-export interface GoodReserveADai extends BaseContract {
+export interface GoodReserveCDai extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: GoodReserveADaiInterface;
+  interface: GoodReserveCDaiInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -792,8 +646,6 @@ export interface GoodReserveADai extends BaseContract {
 
     RESERVE_MINTER_ROLE(overrides?: CallOverrides): Promise<[string]>;
 
-    aDaiAddress(overrides?: CallOverrides): Promise<[string]>;
-
     allowance(
       owner: string,
       spender: string,
@@ -803,7 +655,7 @@ export interface GoodReserveADai extends BaseContract {
     approve(
       spender: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     avatar(overrides?: CallOverrides): Promise<[string]>;
@@ -812,20 +664,20 @@ export interface GoodReserveADai extends BaseContract {
 
     burn(
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     burnFrom(
       account: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     buy(
       _tokenAmount: BigNumberish,
       _minReturn: BigNumberish,
       _targetAddress: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     cDaiAddress(overrides?: CallOverrides): Promise<[string]>;
@@ -834,9 +686,7 @@ export interface GoodReserveADai extends BaseContract {
 
     currentPrice(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    currentPriceDAI(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { price: BigNumber }>;
+    currentPriceDAI(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     daiAddress(overrides?: CallOverrides): Promise<[string]>;
 
@@ -847,7 +697,7 @@ export interface GoodReserveADai extends BaseContract {
     decreaseAllowance(
       spender: string,
       subtractedValue: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     discountDisabled(overrides?: CallOverrides): Promise<[boolean]>;
@@ -855,7 +705,7 @@ export interface GoodReserveADai extends BaseContract {
     distributionHelper(overrides?: CallOverrides): Promise<[string]>;
 
     end(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     gdxAirdrop(overrides?: CallOverrides): Promise<[string]>;
@@ -880,7 +730,7 @@ export interface GoodReserveADai extends BaseContract {
     grantRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     hasRole(
@@ -892,19 +742,19 @@ export interface GoodReserveADai extends BaseContract {
     increaseAllowance(
       spender: string,
       addedValue: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     "initialize(string,string)"(
       name: string,
       symbol: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     "initialize(address,bytes32)"(
       _ns: string,
       _gdxAirdrop: BytesLike,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     isClaimedGDX(arg0: string, overrides?: CallOverrides): Promise<[boolean]>;
@@ -914,21 +764,21 @@ export interface GoodReserveADai extends BaseContract {
     mint(
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mintRewardFromRR(
       _token: string,
       _to: string,
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     mintUBI(
-      arg0: BigNumberish,
-      arg1: BigNumberish,
-      arg2: string,
-      overrides?: Overrides & { from?: string }
+      _daiToConvert: BigNumberish,
+      _startingCDAIBalance: BigNumberish,
+      _interestToken: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     name(overrides?: CallOverrides): Promise<[string]>;
@@ -938,7 +788,7 @@ export interface GoodReserveADai extends BaseContract {
     nativeToken(overrides?: CallOverrides): Promise<[string]>;
 
     pause(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     paused(overrides?: CallOverrides): Promise<[boolean]>;
@@ -954,19 +804,19 @@ export interface GoodReserveADai extends BaseContract {
 
     recover(
       _token: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     sell(
@@ -974,28 +824,28 @@ export interface GoodReserveADai extends BaseContract {
       _minReturn: BigNumberish,
       _target: string,
       _seller: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     setAddresses(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     setDistributionHelper(
       _helper: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     setGDXDisabled(
       _gdxDisabled: boolean,
       _discountDisabled: boolean,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     setReserveRatioDailyExpansion(
       _nom: BigNumberish,
       _denom: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     supportsInterface(
@@ -1010,33 +860,33 @@ export interface GoodReserveADai extends BaseContract {
     transfer(
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     transferFrom(
       from: string,
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     unpause(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     updateAvatar(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
     when(overrides?: CallOverrides): Promise<[number]>;
@@ -1050,8 +900,6 @@ export interface GoodReserveADai extends BaseContract {
 
   RESERVE_MINTER_ROLE(overrides?: CallOverrides): Promise<string>;
 
-  aDaiAddress(overrides?: CallOverrides): Promise<string>;
-
   allowance(
     owner: string,
     spender: string,
@@ -1061,7 +909,7 @@ export interface GoodReserveADai extends BaseContract {
   approve(
     spender: string,
     amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   avatar(overrides?: CallOverrides): Promise<string>;
@@ -1070,20 +918,20 @@ export interface GoodReserveADai extends BaseContract {
 
   burn(
     amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   burnFrom(
     account: string,
     amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   buy(
     _tokenAmount: BigNumberish,
     _minReturn: BigNumberish,
     _targetAddress: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   cDaiAddress(overrides?: CallOverrides): Promise<string>;
@@ -1103,14 +951,16 @@ export interface GoodReserveADai extends BaseContract {
   decreaseAllowance(
     spender: string,
     subtractedValue: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   discountDisabled(overrides?: CallOverrides): Promise<boolean>;
 
   distributionHelper(overrides?: CallOverrides): Promise<string>;
 
-  end(overrides?: Overrides & { from?: string }): Promise<ContractTransaction>;
+  end(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
 
   gdxAirdrop(overrides?: CallOverrides): Promise<string>;
 
@@ -1134,7 +984,7 @@ export interface GoodReserveADai extends BaseContract {
   grantRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   hasRole(
@@ -1146,19 +996,19 @@ export interface GoodReserveADai extends BaseContract {
   increaseAllowance(
     spender: string,
     addedValue: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   "initialize(string,string)"(
     name: string,
     symbol: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   "initialize(address,bytes32)"(
     _ns: string,
     _gdxAirdrop: BytesLike,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   isClaimedGDX(arg0: string, overrides?: CallOverrides): Promise<boolean>;
@@ -1168,21 +1018,21 @@ export interface GoodReserveADai extends BaseContract {
   mint(
     to: string,
     amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mintRewardFromRR(
     _token: string,
     _to: string,
     _amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   mintUBI(
-    arg0: BigNumberish,
-    arg1: BigNumberish,
-    arg2: string,
-    overrides?: Overrides & { from?: string }
+    _daiToConvert: BigNumberish,
+    _startingCDAIBalance: BigNumberish,
+    _interestToken: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   name(overrides?: CallOverrides): Promise<string>;
@@ -1192,7 +1042,7 @@ export interface GoodReserveADai extends BaseContract {
   nativeToken(overrides?: CallOverrides): Promise<string>;
 
   pause(
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   paused(overrides?: CallOverrides): Promise<boolean>;
@@ -1208,19 +1058,19 @@ export interface GoodReserveADai extends BaseContract {
 
   recover(
     _token: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   renounceRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   revokeRole(
     role: BytesLike,
     account: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   sell(
@@ -1228,28 +1078,28 @@ export interface GoodReserveADai extends BaseContract {
     _minReturn: BigNumberish,
     _target: string,
     _seller: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   setAddresses(
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   setDistributionHelper(
     _helper: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   setGDXDisabled(
     _gdxDisabled: boolean,
     _discountDisabled: boolean,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   setReserveRatioDailyExpansion(
     _nom: BigNumberish,
     _denom: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   supportsInterface(
@@ -1264,33 +1114,33 @@ export interface GoodReserveADai extends BaseContract {
   transfer(
     to: string,
     amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   transferFrom(
     from: string,
     to: string,
     amount: BigNumberish,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   unpause(
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   updateAvatar(
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   upgradeTo(
     newImplementation: string,
-    overrides?: Overrides & { from?: string }
+    overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   upgradeToAndCall(
     newImplementation: string,
     data: BytesLike,
-    overrides?: PayableOverrides & { from?: string }
+    overrides?: PayableOverrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
   when(overrides?: CallOverrides): Promise<number>;
@@ -1304,8 +1154,6 @@ export interface GoodReserveADai extends BaseContract {
 
     RESERVE_MINTER_ROLE(overrides?: CallOverrides): Promise<string>;
 
-    aDaiAddress(overrides?: CallOverrides): Promise<string>;
-
     allowance(
       owner: string,
       spender: string,
@@ -1430,9 +1278,9 @@ export interface GoodReserveADai extends BaseContract {
     ): Promise<void>;
 
     mintUBI(
-      arg0: BigNumberish,
-      arg1: BigNumberish,
-      arg2: string,
+      _daiToConvert: BigNumberish,
+      _startingCDAIBalance: BigNumberish,
+      _interestToken: string,
       overrides?: CallOverrides
     ): Promise<[BigNumber, BigNumber]>;
 
@@ -1697,8 +1545,6 @@ export interface GoodReserveADai extends BaseContract {
 
     RESERVE_MINTER_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
 
-    aDaiAddress(overrides?: CallOverrides): Promise<BigNumber>;
-
     allowance(
       owner: string,
       spender: string,
@@ -1708,7 +1554,7 @@ export interface GoodReserveADai extends BaseContract {
     approve(
       spender: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     avatar(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1717,20 +1563,20 @@ export interface GoodReserveADai extends BaseContract {
 
     burn(
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     burnFrom(
       account: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     buy(
       _tokenAmount: BigNumberish,
       _minReturn: BigNumberish,
       _targetAddress: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     cDaiAddress(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1750,14 +1596,16 @@ export interface GoodReserveADai extends BaseContract {
     decreaseAllowance(
       spender: string,
       subtractedValue: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     discountDisabled(overrides?: CallOverrides): Promise<BigNumber>;
 
     distributionHelper(overrides?: CallOverrides): Promise<BigNumber>;
 
-    end(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
+    end(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
 
     gdxAirdrop(overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -1784,7 +1632,7 @@ export interface GoodReserveADai extends BaseContract {
     grantRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     hasRole(
@@ -1796,19 +1644,19 @@ export interface GoodReserveADai extends BaseContract {
     increaseAllowance(
       spender: string,
       addedValue: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     "initialize(string,string)"(
       name: string,
       symbol: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     "initialize(address,bytes32)"(
       _ns: string,
       _gdxAirdrop: BytesLike,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     isClaimedGDX(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
@@ -1818,21 +1666,21 @@ export interface GoodReserveADai extends BaseContract {
     mint(
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mintRewardFromRR(
       _token: string,
       _to: string,
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     mintUBI(
-      arg0: BigNumberish,
-      arg1: BigNumberish,
-      arg2: string,
-      overrides?: Overrides & { from?: string }
+      _daiToConvert: BigNumberish,
+      _startingCDAIBalance: BigNumberish,
+      _interestToken: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     name(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1841,7 +1689,9 @@ export interface GoodReserveADai extends BaseContract {
 
     nativeToken(overrides?: CallOverrides): Promise<BigNumber>;
 
-    pause(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
+    pause(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
 
     paused(overrides?: CallOverrides): Promise<BigNumber>;
 
@@ -1856,19 +1706,19 @@ export interface GoodReserveADai extends BaseContract {
 
     recover(
       _token: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     sell(
@@ -1876,26 +1726,28 @@ export interface GoodReserveADai extends BaseContract {
       _minReturn: BigNumberish,
       _target: string,
       _seller: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    setAddresses(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
+    setAddresses(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
 
     setDistributionHelper(
       _helper: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     setGDXDisabled(
       _gdxDisabled: boolean,
       _discountDisabled: boolean,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     setReserveRatioDailyExpansion(
       _nom: BigNumberish,
       _denom: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     supportsInterface(
@@ -1910,29 +1762,33 @@ export interface GoodReserveADai extends BaseContract {
     transfer(
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     transferFrom(
       from: string,
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
-    unpause(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
+    unpause(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
 
-    updateAvatar(overrides?: Overrides & { from?: string }): Promise<BigNumber>;
+    updateAvatar(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
     when(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1951,8 +1807,6 @@ export interface GoodReserveADai extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
-    aDaiAddress(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
     allowance(
       owner: string,
       spender: string,
@@ -1962,7 +1816,7 @@ export interface GoodReserveADai extends BaseContract {
     approve(
       spender: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     avatar(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -1974,20 +1828,20 @@ export interface GoodReserveADai extends BaseContract {
 
     burn(
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     burnFrom(
       account: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     buy(
       _tokenAmount: BigNumberish,
       _minReturn: BigNumberish,
       _targetAddress: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     cDaiAddress(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -2007,7 +1861,7 @@ export interface GoodReserveADai extends BaseContract {
     decreaseAllowance(
       spender: string,
       subtractedValue: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     discountDisabled(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -2017,7 +1871,7 @@ export interface GoodReserveADai extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     end(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     gdxAirdrop(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -2045,7 +1899,7 @@ export interface GoodReserveADai extends BaseContract {
     grantRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     hasRole(
@@ -2057,19 +1911,19 @@ export interface GoodReserveADai extends BaseContract {
     increaseAllowance(
       spender: string,
       addedValue: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     "initialize(string,string)"(
       name: string,
       symbol: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     "initialize(address,bytes32)"(
       _ns: string,
       _gdxAirdrop: BytesLike,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     isClaimedGDX(
@@ -2082,21 +1936,21 @@ export interface GoodReserveADai extends BaseContract {
     mint(
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mintRewardFromRR(
       _token: string,
       _to: string,
       _amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     mintUBI(
-      arg0: BigNumberish,
-      arg1: BigNumberish,
-      arg2: string,
-      overrides?: Overrides & { from?: string }
+      _daiToConvert: BigNumberish,
+      _startingCDAIBalance: BigNumberish,
+      _interestToken: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -2106,7 +1960,7 @@ export interface GoodReserveADai extends BaseContract {
     nativeToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     pause(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     paused(overrides?: CallOverrides): Promise<PopulatedTransaction>;
@@ -2122,19 +1976,19 @@ export interface GoodReserveADai extends BaseContract {
 
     recover(
       _token: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     renounceRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     revokeRole(
       role: BytesLike,
       account: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     sell(
@@ -2142,28 +1996,28 @@ export interface GoodReserveADai extends BaseContract {
       _minReturn: BigNumberish,
       _target: string,
       _seller: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     setAddresses(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     setDistributionHelper(
       _helper: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     setGDXDisabled(
       _gdxDisabled: boolean,
       _discountDisabled: boolean,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     setReserveRatioDailyExpansion(
       _nom: BigNumberish,
       _denom: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     supportsInterface(
@@ -2178,33 +2032,33 @@ export interface GoodReserveADai extends BaseContract {
     transfer(
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     transferFrom(
       from: string,
       to: string,
       amount: BigNumberish,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     unpause(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     updateAvatar(
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     upgradeTo(
       newImplementation: string,
-      overrides?: Overrides & { from?: string }
+      overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     upgradeToAndCall(
       newImplementation: string,
       data: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
+      overrides?: PayableOverrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
     when(overrides?: CallOverrides): Promise<PopulatedTransaction>;