Merge pull request #113 from 0xProject/ethereumjs-util-types

Add ethereumjs-utils types

4 files changed, 29 insertions, 19 deletions

diff --git a/package.json b/package.json
index 34ab8194e..b9c72cec6 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
     "tslint-config-0xproject": "^0.0.2",
     "typedoc": "^0.7.1",
     "types-bn": "^0.0.1",
+    "types-ethereumjs-util": "^0.0.5",
     "typescript": "^2.4.1",
     "web3-provider-engine": "^13.0.1",
     "web3-typescript-typings": "^0.2.1",
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 3d19b96cc..f1720e366 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -81,17 +81,6 @@ declare module '*.json' {
     /* 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) => Buffer;
-    const isValidAddress: (address: string) => boolean;
-    const bufferToInt: (buffer: Buffer) => number;
-    const fromRpcSig: (signature: string) => {v: number, r: Buffer, s: Buffer};
-}
-
 // truffle-contract declarations
 declare interface ContractInstance {
     address: string;
diff --git a/tsconfig.json b/tsconfig.json
index 9c045bb0b..0684d4f1b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,7 @@
     "./src/**/*",
     "./test/**/*",
     "./node_modules/types-bn/index.d.ts",
+    "./node_modules/types-ethereumjs-util/index.d.ts",
     "./node_modules/web3-typescript-typings/index.d.ts",
     "./node_modules/chai-typescript-typings/index.d.ts",
     "./node_modules/chai-as-promised-typescript-typings/index.d.ts"
diff --git a/yarn.lock b/yarn.lock
index ef6bea4df..3406c2cef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -752,6 +752,10 @@ bignumber.js@^4.0.2:
   version "2.0.7"
   resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
 
+"bignumber.js@git+https://github.com/frozeman/bignumber.js-nolookahead.git":
+  version "2.0.7"
+  resolved "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
+
 binary-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
@@ -798,7 +802,7 @@ bn.js@4.11.6:
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
 
-bn.js@4.11.7, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.4.0, bn.js@^4.8.0:
+bn.js@4.11.7, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.11.7, bn.js@^4.4.0, bn.js@^4.8.0:
   version "4.11.7"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
 
@@ -933,6 +937,13 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.6.tgz#2ea669f7eec0b6eda05b08f8b5ff661b28573588"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -4842,6 +4853,14 @@ types-bn@^0.0.1:
   dependencies:
     bn.js "4.11.7"
 
+types-ethereumjs-util@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/types-ethereumjs-util/-/types-ethereumjs-util-0.0.5.tgz#a65060741c73d1ee5157b9ba2d502b4fe4a19d1c"
+  dependencies:
+    bn.js "^4.11.7"
+    buffer "^5.0.6"
+    rlp "^2.0.0"
+
 typescript@2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.2.tgz#f0f045e196f69a72f06b25fd3bd39d01c3ce9984"
@@ -5014,9 +5033,9 @@ web3-provider-engine@^8.4.0:
     xhr "^2.2.0"
     xtend "^4.0.1"
 
-web3-typescript-typings@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.0.11.tgz#97ade6e4c102e79f9ee0d81885729e66c69108df"
+web3-typescript-typings@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.2.1.tgz#28c893f9b39700599f7763648517729032e46039"
   dependencies:
     bignumber.js "^4.0.2"
 
@@ -5039,11 +5058,11 @@ web3@^0.18.0, web3@^0.18.2:
     xhr2 "*"
     xmlhttprequest "*"
 
-web3@^0.19.0:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-0.19.1.tgz#e763d5b1107c4bc24abd4f8cbee1ba3659e6eb31"
+web3@^0.20.0:
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.1.tgz#fb262e9ad71552167a6af012fdd420de017032f0"
   dependencies:
-    bignumber.js "^4.0.2"
+    bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
     crypto-js "^3.1.4"
     utf8 "^2.1.1"
     xhr2 "*"