@across-protocol/contracts 0.1.3 → 0.1.4

package/contract-types/ethers/{AVMBridgeDepositBox.ts → AVMBridgeDepositBox.d.ts}

@@ -1,24 +1,26 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+
 import {
-  BaseContract,
+  ethers,
+  EventFilter,
+  Signer,
   BigNumber,
   BigNumberish,
-  BytesLike,
-  CallOverrides,
+  PopulatedTransaction,
+  BaseContract,
   ContractTransaction,
   Overrides,
   PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
+  CallOverrides,
 } from "ethers";
-import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { BytesLike } from "@ethersproject/bytes";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
 
-export interface AVMBridgeDepositBoxInterface extends utils.Interface {
+interface AVMBridgeDepositBoxInterface extends ethers.utils.Interface {
   functions: {
     "bridgeTokens(address,uint32)": FunctionFragment;
     "canBridge(address)": FunctionFragment;
@@ -191,111 +193,48 @@ export interface AVMBridgeDepositBoxInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "WhitelistToken"): EventFragment;
 }
 
-export type DepositsEnabledEvent = TypedEvent<
-  [string, boolean],
-  { l2Token: string; depositsEnabled: boolean }
->;
-
-export type DepositsEnabledEventFilter = TypedEventFilter<DepositsEnabledEvent>;
-
-export type FundsDepositedEvent = TypedEvent<
-  [
-    BigNumber,
-    BigNumber,
-    string,
-    string,
-    string,
-    string,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber
-  ],
-  {
-    chainId: BigNumber;
-    depositId: BigNumber;
-    l1Recipient: string;
-    l2Sender: string;
-    l1Token: string;
-    l2Token: string;
-    amount: BigNumber;
-    slowRelayFeePct: BigNumber;
-    instantRelayFeePct: BigNumber;
-    quoteTimestamp: BigNumber;
-  }
->;
-
-export type FundsDepositedEventFilter = TypedEventFilter<FundsDepositedEvent>;
-
-export type SentCrossDomainMessageEvent = TypedEvent<
-  [string, string, BigNumber, string],
-  { from: string; to: string; id: BigNumber; data: string }
->;
-
-export type SentCrossDomainMessageEventFilter =
-  TypedEventFilter<SentCrossDomainMessageEvent>;
-
-export type SetMinimumBridgingDelayEvent = TypedEvent<
-  [BigNumber],
-  { newMinimumBridgingDelay: BigNumber }
->;
-
-export type SetMinimumBridgingDelayEventFilter =
-  TypedEventFilter<SetMinimumBridgingDelayEvent>;
-
-export type SetXDomainAdminEvent = TypedEvent<[string], { newAdmin: string }>;
-
-export type SetXDomainAdminEventFilter = TypedEventFilter<SetXDomainAdminEvent>;
-
-export type TokensBridgedEvent = TypedEvent<
-  [string, BigNumber, BigNumber, string],
-  {
-    l2Token: string;
-    numberOfTokensBridged: BigNumber;
-    l1Gas: BigNumber;
-    caller: string;
-  }
->;
-
-export type TokensBridgedEventFilter = TypedEventFilter<TokensBridgedEvent>;
-
-export type WhitelistTokenEvent = TypedEvent<
-  [string, string, BigNumber, string],
-  {
-    l1Token: string;
-    l2Token: string;
-    lastBridgeTime: BigNumber;
-    bridgePool: string;
-  }
->;
-
-export type WhitelistTokenEventFilter = TypedEventFilter<WhitelistTokenEvent>;
-
-export interface AVMBridgeDepositBox extends BaseContract {
+export class AVMBridgeDepositBox extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: AVMBridgeDepositBoxInterface;
+  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
+  off<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  on<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  once<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): this;
 
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
+  listeners(eventName?: string): Array<Listener>;
+  off(eventName: string, listener: Listener): this;
+  on(eventName: string, listener: Listener): this;
+  once(eventName: string, listener: Listener): this;
+  removeListener(eventName: string, listener: Listener): this;
+  removeAllListeners(eventName?: string): this;
+
+  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
+    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
     fromBlockOrBlockhash?: string | number | undefined,
     toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
+  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
 
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
+  interface: AVMBridgeDepositBoxInterface;
 
   functions: {
     bridgeTokens(
@@ -539,27 +478,14 @@ export interface AVMBridgeDepositBox extends BaseContract {
   };
 
   filters: {
-    "DepositsEnabled(address,bool)"(
-      l2Token?: null,
-      depositsEnabled?: null
-    ): DepositsEnabledEventFilter;
     DepositsEnabled(
       l2Token?: null,
       depositsEnabled?: null
-    ): DepositsEnabledEventFilter;
+    ): TypedEventFilter<
+      [string, boolean],
+      { l2Token: string; depositsEnabled: boolean }
+    >;
 
-    "FundsDeposited(uint256,uint256,address,address,address,address,uint256,uint64,uint64,uint64)"(
-      chainId?: null,
-      depositId?: null,
-      l1Recipient?: null,
-      l2Sender?: null,
-      l1Token?: null,
-      l2Token?: null,
-      amount?: null,
-      slowRelayFeePct?: null,
-      instantRelayFeePct?: null,
-      quoteTimestamp?: null
-    ): FundsDepositedEventFilter;
     FundsDeposited(
       chainId?: null,
       depositId?: null,
@@ -571,58 +497,80 @@ export interface AVMBridgeDepositBox extends BaseContract {
       slowRelayFeePct?: null,
       instantRelayFeePct?: null,
       quoteTimestamp?: null
-    ): FundsDepositedEventFilter;
+    ): TypedEventFilter<
+      [
+        BigNumber,
+        BigNumber,
+        string,
+        string,
+        string,
+        string,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+      ],
+      {
+        chainId: BigNumber;
+        depositId: BigNumber;
+        l1Recipient: string;
+        l2Sender: string;
+        l1Token: string;
+        l2Token: string;
+        amount: BigNumber;
+        slowRelayFeePct: BigNumber;
+        instantRelayFeePct: BigNumber;
+        quoteTimestamp: BigNumber;
+      }
+    >;
 
-    "SentCrossDomainMessage(address,address,uint256,bytes)"(
-      from?: string | null,
-      to?: string | null,
-      id?: BigNumberish | null,
-      data?: null
-    ): SentCrossDomainMessageEventFilter;
     SentCrossDomainMessage(
       from?: string | null,
       to?: string | null,
       id?: BigNumberish | null,
       data?: null
-    ): SentCrossDomainMessageEventFilter;
+    ): TypedEventFilter<
+      [string, string, BigNumber, string],
+      { from: string; to: string; id: BigNumber; data: string }
+    >;
 
-    "SetMinimumBridgingDelay(uint64)"(
-      newMinimumBridgingDelay?: null
-    ): SetMinimumBridgingDelayEventFilter;
     SetMinimumBridgingDelay(
       newMinimumBridgingDelay?: null
-    ): SetMinimumBridgingDelayEventFilter;
+    ): TypedEventFilter<[BigNumber], { newMinimumBridgingDelay: BigNumber }>;
 
-    "SetXDomainAdmin(address)"(
+    SetXDomainAdmin(
       newAdmin?: string | null
-    ): SetXDomainAdminEventFilter;
-    SetXDomainAdmin(newAdmin?: string | null): SetXDomainAdminEventFilter;
+    ): TypedEventFilter<[string], { newAdmin: string }>;
 
-    "TokensBridged(address,uint256,uint256,address)"(
-      l2Token?: string | null,
-      numberOfTokensBridged?: null,
-      l1Gas?: null,
-      caller?: string | null
-    ): TokensBridgedEventFilter;
     TokensBridged(
       l2Token?: string | null,
       numberOfTokensBridged?: null,
       l1Gas?: null,
       caller?: string | null
-    ): TokensBridgedEventFilter;
+    ): TypedEventFilter<
+      [string, BigNumber, BigNumber, string],
+      {
+        l2Token: string;
+        numberOfTokensBridged: BigNumber;
+        l1Gas: BigNumber;
+        caller: string;
+      }
+    >;
 
-    "WhitelistToken(address,address,uint64,address)"(
-      l1Token?: null,
-      l2Token?: null,
-      lastBridgeTime?: null,
-      bridgePool?: null
-    ): WhitelistTokenEventFilter;
     WhitelistToken(
       l1Token?: null,
       l2Token?: null,
       lastBridgeTime?: null,
       bridgePool?: null
-    ): WhitelistTokenEventFilter;
+    ): TypedEventFilter<
+      [string, string, BigNumber, string],
+      {
+        l1Token: string;
+        l2Token: string;
+        lastBridgeTime: BigNumber;
+        bridgePool: string;
+      }
+    >;
   };
 
   estimateGas: {

package/contract-types/ethers/AVMCrossDomainEnabled.d.ts

@@ -0,0 +1,92 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
+  BigNumber,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
+  ContractTransaction,
+} from "ethers";
+import { BytesLike } from "@ethersproject/bytes";
+import { Listener, Provider } from "@ethersproject/providers";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
+
+interface AVMCrossDomainEnabledInterface extends ethers.utils.Interface {
+  functions: {};
+
+  events: {
+    "SentCrossDomainMessage(address,address,uint256,bytes)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "SentCrossDomainMessage"): EventFragment;
+}
+
+export class AVMCrossDomainEnabled extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
+  off<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  on<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  once<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): this;
+
+  listeners(eventName?: string): Array<Listener>;
+  off(eventName: string, listener: Listener): this;
+  on(eventName: string, listener: Listener): this;
+  once(eventName: string, listener: Listener): this;
+  removeListener(eventName: string, listener: Listener): this;
+  removeAllListeners(eventName?: string): this;
+
+  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
+    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
+
+  interface: AVMCrossDomainEnabledInterface;
+
+  functions: {};
+
+  callStatic: {};
+
+  filters: {
+    SentCrossDomainMessage(
+      from?: string | null,
+      to?: string | null,
+      id?: BigNumberish | null,
+      data?: null
+    ): TypedEventFilter<
+      [string, string, BigNumber, string],
+      { from: string; to: string; id: BigNumber; data: string }
+    >;
+  };
+
+  estimateGas: {};
+
+  populateTransaction: {};
+}

package/contract-types/ethers/{AccessControl.ts → AccessControl.d.ts}

@@ -1,22 +1,25 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+
 import {
-  BaseContract,
+  ethers,
+  EventFilter,
+  Signer,
   BigNumber,
-  BytesLike,
-  CallOverrides,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
   ContractTransaction,
   Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
+  CallOverrides,
 } from "ethers";
-import { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import { BytesLike } from "@ethersproject/bytes";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
 
-export interface AccessControlInterface extends utils.Interface {
+interface AccessControlInterface extends ethers.utils.Interface {
   functions: {
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
     "getRoleAdmin(bytes32)": FunctionFragment;
@@ -87,53 +90,48 @@ export interface AccessControlInterface extends utils.Interface {
   getEvent(nameOrSignatureOrTopic: "RoleRevoked"): EventFragment;
 }
 
-export type RoleAdminChangedEvent = TypedEvent<
-  [string, string, string],
-  { role: string; previousAdminRole: string; newAdminRole: string }
->;
-
-export type RoleAdminChangedEventFilter =
-  TypedEventFilter<RoleAdminChangedEvent>;
-
-export type RoleGrantedEvent = TypedEvent<
-  [string, string, string],
-  { role: string; account: string; sender: string }
->;
-
-export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>;
-
-export type RoleRevokedEvent = TypedEvent<
-  [string, string, string],
-  { role: string; account: string; sender: string }
->;
-
-export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>;
-
-export interface AccessControl extends BaseContract {
+export class AccessControl extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: AccessControlInterface;
+  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
+  off<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  on<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  once<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): this;
+
+  listeners(eventName?: string): Array<Listener>;
+  off(eventName: string, listener: Listener): this;
+  on(eventName: string, listener: Listener): this;
+  once(eventName: string, listener: Listener): this;
+  removeListener(eventName: string, listener: Listener): this;
+  removeAllListeners(eventName?: string): this;
 
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
+  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
+    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
     fromBlockOrBlockhash?: string | number | undefined,
     toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
+  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
 
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
+  interface: AccessControlInterface;
 
   functions: {
     DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
@@ -239,38 +237,32 @@ export interface AccessControl extends BaseContract {
   };
 
   filters: {
-    "RoleAdminChanged(bytes32,bytes32,bytes32)"(
-      role?: BytesLike | null,
-      previousAdminRole?: BytesLike | null,
-      newAdminRole?: BytesLike | null
-    ): RoleAdminChangedEventFilter;
     RoleAdminChanged(
       role?: BytesLike | null,
       previousAdminRole?: BytesLike | null,
       newAdminRole?: BytesLike | null
-    ): RoleAdminChangedEventFilter;
+    ): TypedEventFilter<
+      [string, string, string],
+      { role: string; previousAdminRole: string; newAdminRole: string }
+    >;
 
-    "RoleGranted(bytes32,address,address)"(
-      role?: BytesLike | null,
-      account?: string | null,
-      sender?: string | null
-    ): RoleGrantedEventFilter;
     RoleGranted(
       role?: BytesLike | null,
       account?: string | null,
       sender?: string | null
-    ): RoleGrantedEventFilter;
+    ): TypedEventFilter<
+      [string, string, string],
+      { role: string; account: string; sender: string }
+    >;
 
-    "RoleRevoked(bytes32,address,address)"(
-      role?: BytesLike | null,
-      account?: string | null,
-      sender?: string | null
-    ): RoleRevokedEventFilter;
     RoleRevoked(
       role?: BytesLike | null,
       account?: string | null,
       sender?: string | null
-    ): RoleRevokedEventFilter;
+    ): TypedEventFilter<
+      [string, string, string],
+      { role: string; account: string; sender: string }
+    >;
   };
 
   estimateGas: {

package/contract-types/ethers/{AddressWhitelistInterface.ts → AddressWhitelistInterface.d.ts}

@@ -1,22 +1,25 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+
 import {
-  BaseContract,
+  ethers,
+  EventFilter,
+  Signer,
   BigNumber,
-  BytesLike,
-  CallOverrides,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
   ContractTransaction,
   Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
+  CallOverrides,
 } from "ethers";
-import { FunctionFragment, Result } from "@ethersproject/abi";
+import { BytesLike } from "@ethersproject/bytes";
 import { Listener, Provider } from "@ethersproject/providers";
-import { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "./common";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import { TypedEventFilter, TypedEvent, TypedListener } from "./commons";
 
-export interface AddressWhitelistInterfaceInterface extends utils.Interface {
+interface AddressWhitelistInterfaceInterface extends ethers.utils.Interface {
   functions: {
     "addToWhitelist(address)": FunctionFragment;
     "getWhitelist()": FunctionFragment;
@@ -61,31 +64,48 @@ export interface AddressWhitelistInterfaceInterface extends utils.Interface {
   events: {};
 }
 
-export interface AddressWhitelistInterface extends BaseContract {
+export class AddressWhitelistInterface extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: AddressWhitelistInterfaceInterface;
+  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
+  off<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  on<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  once<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
+    listener: TypedListener<EventArgsArray, EventArgsObject>
+  ): this;
+  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
+    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
+  ): this;
 
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
+  listeners(eventName?: string): Array<Listener>;
+  off(eventName: string, listener: Listener): this;
+  on(eventName: string, listener: Listener): this;
+  once(eventName: string, listener: Listener): this;
+  removeListener(eventName: string, listener: Listener): this;
+  removeAllListeners(eventName?: string): this;
+
+  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
+    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
     fromBlockOrBlockhash?: string | number | undefined,
     toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
+  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
 
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
+  interface: AddressWhitelistInterfaceInterface;
 
   functions: {
     addToWhitelist(