Merge branch 'master' into isValidOrderHash

1 files changed, 13 insertions, 2 deletions

diff --git a/src/ts/globals.d.ts b/src/ts/globals.d.ts
index 1e502b061..796812c87 100644
--- a/src/ts/globals.d.ts
+++ b/src/ts/globals.d.ts
@@ -1,14 +1,25 @@
-declare type ETHAddressBuff = Buffer;
+declare module 'chai-bignumber';
 
 declare interface Schema {
     id: string;
 }
 
+// HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion
+// interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise
+// disallow `namespace`, we disable tslint for the following.
+/* tslint:disable */
+declare namespace Chai {
+    interface Assertion {
+        bignumber: Assertion;
+    }
+}
+/* tslint:enable */
+
 declare module 'ethereumjs-util' {
     const toBuffer: (dataHex: string) => Buffer;
     const hashPersonalMessage: (msg: Buffer) => Buffer;
     const bufferToHex: (buff: Buffer) => string;
     const ecrecover: (msgHashBuff: Buffer, v: number, r: Buffer, s: Buffer) => string;
-    const pubToAddress: (pubKey: string) => ETHAddressBuff;
+    const pubToAddress: (pubKey: string) => Buffer;
     const isValidAddress: (address: string) => boolean;
 }