merge v2-prototype

4 files changed, 42 insertions, 4 deletions

diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index b75387e3e..7f93e746e 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -16,7 +16,7 @@ import { addressUtils } from './address_utils';
 import { BigNumber } from './configured_bignumber';
 
 export class AbiDecoder {
-    private _methodIds: { [signatureHash: string]: EventAbi } = {};
+    private readonly _methodIds: { [signatureHash: string]: EventAbi } = {};
     constructor(abiArrays: AbiDefinition[][]) {
         _.forEach(abiArrays, this.addABI.bind(this));
     }
diff --git a/packages/utils/src/abi_utils.ts b/packages/utils/src/abi_utils.ts
index 413c2f481..421dd405c 100644
--- a/packages/utils/src/abi_utils.ts
+++ b/packages/utils/src/abi_utils.ts
@@ -6,7 +6,7 @@ export const abiUtils = {
         if (param.type === 'tuple') {
             // Parse out tuple types into {type_1, type_2, ..., type_N}
             const tupleComponents = param.components;
-            const paramString = _.map(tupleComponents, component => this.parseFunctionParam(component));
+            const paramString = _.map(tupleComponents, component => abiUtils.parseFunctionParam(component));
             const tupleParamString = `{${paramString}}`;
             return tupleParamString;
         }
@@ -14,7 +14,7 @@ export const abiUtils = {
     },
     getFunctionSignature(methodAbi: MethodAbi): string {
         const functionName = methodAbi.name;
-        const parameterTypeList = _.map(methodAbi.inputs, (param: DataItem) => this.parseFunctionParam(param));
+        const parameterTypeList = _.map(methodAbi.inputs, (param: DataItem) => abiUtils.parseFunctionParam(param));
         const functionSignature = `${functionName}(${parameterTypeList})`;
         return functionSignature;
     },
@@ -37,7 +37,7 @@ export const abiUtils = {
         // Sort method Abis into alphabetical order, by function signature
         const methodAbisOrdered = _.sortBy(methodAbis, [
             (methodAbi: MethodAbi) => {
-                const functionSignature = this.getFunctionSignature(methodAbi);
+                const functionSignature = abiUtils.getFunctionSignature(methodAbi);
                 return functionSignature;
             },
         ]);
diff --git a/packages/utils/src/fetchAsync.ts b/packages/utils/src/fetchAsync.ts
new file mode 100644
index 000000000..c02e5baba
--- /dev/null
+++ b/packages/utils/src/fetchAsync.ts
@@ -0,0 +1,37 @@
+import isNode = require('detect-node');
+import 'isomorphic-fetch';
+
+export const fetchAsync = async (
+    endpoint: string,
+    options: RequestInit = {},
+    timeoutMs: number = 20000,
+): Promise<Response> => {
+    if (options.signal || (options as any).timeout) {
+        throw new Error(
+            'Cannot call fetchAsync with options.signal or options.timeout. To set a timeout, please use the supplied "timeoutMs" parameter.',
+        );
+    }
+    let optionsWithAbortParam;
+    if (!isNode) {
+        const controller = new AbortController();
+        const signal = controller.signal;
+        setTimeout(() => {
+            controller.abort();
+        }, timeoutMs);
+        optionsWithAbortParam = {
+            signal,
+            ...options,
+        };
+    } else {
+        // HACK: the `timeout` param only exists in `node-fetch`, and not on the `isomorphic-fetch`
+        // `RequestInit` type. Since `isomorphic-fetch` conditionally wraps `node-fetch` when the
+        // execution environment is `Node.js`, we need to cast it to `any` in that scenario.
+        optionsWithAbortParam = {
+            timeout: timeoutMs,
+            ...options,
+        } as any;
+    }
+
+    const response = await fetch(endpoint, optionsWithAbortParam);
+    return response;
+};
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index fd102cecb..b8e0b1775 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -8,3 +8,4 @@ export { logUtils } from './log_utils';
 export { abiUtils } from './abi_utils';
 export { NULL_BYTES } from './constants';
 export { errorUtils } from './error_utils';
+export { fetchAsync } from './fetchAsync';