Move some ethers-related types to typescript-typings/ethers

3 files changed, 25 insertions, 13 deletions

diff --git a/packages/base-contract/src/index.ts b/packages/base-contract/src/index.ts
index 31d2e4019..12f974445 100644
--- a/packages/base-contract/src/index.ts
+++ b/packages/base-contract/src/index.ts
@@ -87,7 +87,7 @@ export class BaseContract {
     // if it overflows the corresponding Solidity type, there is a bug in the
     // encoder, or the encoder performs unsafe type coercion.
     public static strictArgumentEncodingCheck(inputAbi: DataItem[], args: any[]): void {
-        const coder = (ethers as any).utils.AbiCoder.defaultCoder;
+        const coder = ethers.utils.AbiCoder.defaultCoder;
         const params = abiUtils.parseEthersParams(inputAbi);
         const rawEncoded = coder.encode(params.names, params.types, args);
         const rawDecoded = coder.decode(params.names, params.types, rawEncoded);
diff --git a/packages/typescript-typings/types/ethers/index.d.ts b/packages/typescript-typings/types/ethers/index.d.ts
index f869196e0..58bc1e8a9 100644
--- a/packages/typescript-typings/types/ethers/index.d.ts
+++ b/packages/typescript-typings/types/ethers/index.d.ts
@@ -34,4 +34,22 @@ declare module 'ethers' {
     const enum errors {
         INVALID_ARGUMENT = 'INVALID_ARGUMENT',
     }
+
+    export type ParamName = null | string | NestedParamName;
+
+    export interface NestedParamName {
+        name: string | null;
+        names: ParamName[];
+    }
+
+    export const utils: {
+        AbiCoder: {
+            defaultCoder: AbiCoder;
+        };
+    };
+
+    export interface AbiCoder {
+        encode: (names?: ParamName[], types: string[], args: any[]) => string;
+        decode: (names?: ParamName[], types: string[], data: string) => any;
+    }
 }
diff --git a/packages/utils/src/abi_utils.ts b/packages/utils/src/abi_utils.ts
index 874e0b2da..fc64a2a89 100644
--- a/packages/utils/src/abi_utils.ts
+++ b/packages/utils/src/abi_utils.ts
@@ -1,20 +1,14 @@
 import { AbiDefinition, AbiType, ContractAbi, DataItem, MethodAbi } from 'ethereum-types';
+import * as ethers from 'ethers';
 import * as _ from 'lodash';
 
 import { BigNumber } from './configured_bignumber';
 
-export type EthersParamName = null | string | EthersNestedParamName;
-
-export interface EthersNestedParamName {
-    name: string | null;
-    names: EthersParamName[];
-}
-
 // Note(albrow): This function is unexported in ethers.js. Copying it here for
 // now.
 // Source: https://github.com/ethers-io/ethers.js/blob/884593ab76004a808bf8097e9753fb5f8dcc3067/contracts/interface.js#L30
-function parseEthersParams(params: DataItem[]): { names: EthersParamName[]; types: string[] } {
-    const names: EthersParamName[] = [];
+function parseEthersParams(params: DataItem[]): { names: ethers.ParamName[]; types: string[] } {
+    const names: ethers.ParamName[] = [];
     const types: string[] = [];
 
     params.forEach((param: DataItem) => {
@@ -43,7 +37,7 @@ function parseEthersParams(params: DataItem[]): { names: EthersParamName[]; type
 // returns true if x is equal to y and false otherwise. Performs some minimal
 // type conversion and data massaging for x and y, depending on type. name and
 // type should typically be derived from parseEthersParams.
-function isAbiDataEqual(name: EthersParamName, type: string, x: any, y: any): boolean {
+function isAbiDataEqual(name: ethers.ParamName, type: string, x: any, y: any): boolean {
     if (_.isUndefined(x) && _.isUndefined(y)) {
         return true;
     } else if (_.isUndefined(x) && !_.isUndefined(y)) {
@@ -70,7 +64,7 @@ function isAbiDataEqual(name: EthersParamName, type: string, x: any, y: any): bo
         if (_.isString(name)) {
             throw new Error('Internal error: type was tuple but names was a string');
         } else if (_.isNull(name)) {
-            throw new Error('Internal error: type was tuple but names was a null');
+            throw new Error('Internal error: type was tuple but names was null');
         }
         // For tuples, we iterate through the underlying values and check each
         // one individually.
@@ -95,7 +89,7 @@ function isAbiDataEqual(name: EthersParamName, type: string, x: any, y: any): bo
             //
             const nestedName = _.isString(name.names[i])
                 ? (name.names[i] as string)
-                : ((name.names[i] as EthersNestedParamName).name as string);
+                : ((name.names[i] as ethers.NestedParamName).name as string);
             if (!isAbiDataEqual(name.names[i], types[i], x[nestedName], y[nestedName])) {
                 return false;
             }