@gooddollar/goodprotocol 2.1.1 → 2.1.2

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

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