From 6470cf54e389b45e82a08ad08225d2bb0f35ac4c Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 24 May 2017 18:49:19 +0200
Subject: Type the ethereumjs-util

---
 src/ts/0x.js.ts     |  4 +---
 src/ts/globals.d.ts | 12 +++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/ts/0x.js.ts b/src/ts/0x.js.ts
index 6d6d5fed6..3b16b643b 100644
--- a/src/ts/0x.js.ts
+++ b/src/ts/0x.js.ts
@@ -9,13 +9,11 @@ export interface ECSignature {
     s: string;
 }
 
-export type ETHAddress = string;
-
 export class ZeroEx {
     /**
      * Checks if the signature is valid
      */
-    public static isValidSignature(data: string, signature: ECSignature, signer: ETHAddress): boolean {
+    public static isValidSignature(data: string, signature: ECSignature, signer: ETHAddressHex): boolean {
         const dataBuff = ethUtil.toBuffer(data);
         const msgHashBuff = ethUtil.hashPersonalMessage(dataBuff);
         try {
diff --git a/src/ts/globals.d.ts b/src/ts/globals.d.ts
index 99f9cf50b..1c3cbf47d 100644
--- a/src/ts/globals.d.ts
+++ b/src/ts/globals.d.ts
@@ -1 +1,11 @@
-declare module 'ethereumjs-util';
+declare type PubKey = string;
+declare type ETHAddressHex = string;
+declare type ETHAddressBuff = Buffer;
+
+declare module 'ethereumjs-util' {
+    const toBuffer: (data: string) => Buffer;
+    const hashPersonalMessage: (msg: Buffer) => Buffer;
+    const bufferToHex: (buff: Buffer) => string;
+    const ecrecover: (msgHashBuff: Buffer, v: number, r: Buffer, s: Buffer) => PubKey;
+    const pubToAddress: (pubKey: PubKey) => ETHAddressBuff;
+}
-- 
cgit