From 49898525afde7e6a761220fcc46dc16993d85c03 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 13 Nov 2017 20:56:01 -0500
Subject: Fix tslint issue

---
 packages/0x.js/src/utils/abi_decoder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/src/utils/abi_decoder.ts b/packages/0x.js/src/utils/abi_decoder.ts
index 840ad9be0..df0fb2d6f 100644
--- a/packages/0x.js/src/utils/abi_decoder.ts
+++ b/packages/0x.js/src/utils/abi_decoder.ts
@@ -34,7 +34,7 @@ export class AbiDecoder {
                 value = this.padZeros(new BigNumber(value).toString(16));
             } else if (param.type === SolidityTypes.Uint256 ||
                        param.type === SolidityTypes.Uint8 ||
-                       param.type === SolidityTypes.Uint ) {
+                       param.type === SolidityTypes.Uint) {
                 value = new BigNumber(value);
             }
             decodedParams[param.name] = value;
-- 
cgit v1.2.3


From 2b806455a50ad9d99cb482bbf03af645adfd1e5d Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 13 Nov 2017 20:57:26 -0500
Subject: Add tslint-config sub-package

---
 packages/0x.js/package.json | 11 ++++++-----
 packages/0x.js/tslint.json  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 6839e6513..8cd0ec9bf 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -76,19 +76,18 @@
     "sinon": "^4.0.0",
     "source-map-support": "^0.5.0",
     "truffle-hdwallet-provider": "^0.0.3",
-    "tslint": "~5.5.0",
-    "tslint-config-0xproject": "^0.0.2",
     "typedoc": "~0.8.0",
     "types-bn": "^0.0.1",
     "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
     "typescript": "~2.6.1",
     "web3-provider-engine": "^13.0.1",
     "web3-typescript-typings": "^0.7.1",
-    "webpack": "^3.1.0"
+    "webpack": "^3.1.0",
+    "@0xproject/tslint-config": "0.0.2"
   },
   "dependencies": {
-    "@0xproject/assert": "0.0.3",
     "0x-json-schemas": "^0.6.1",
+    "@0xproject/assert": "0.0.3",
     "bignumber.js": "~4.1.0",
     "compare-versions": "^3.0.1",
     "es6-promisify": "^5.0.0",
@@ -99,7 +98,9 @@
     "js-sha3": "^0.6.1",
     "lodash": "^4.17.4",
     "publish-release": "^1.3.3",
+    "tslint": "5.8.0",
     "uuid": "^3.1.0",
-    "web3": "^0.20.0"
+    "web3": "^0.20.0",
+    "bn.js": "4.11.8"
   }
 }
diff --git a/packages/0x.js/tslint.json b/packages/0x.js/tslint.json
index 5842a872a..a07795151 100644
--- a/packages/0x.js/tslint.json
+++ b/packages/0x.js/tslint.json
@@ -1,5 +1,5 @@
 {
   "extends": [
-    "tslint-config-0xproject"
+    "@0xproject/tslint-config"
   ]
 }
-- 
cgit v1.2.3


From f98042a7f82915a4f63b62951c9b1d1df95126a2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 14 Nov 2017 12:25:20 -0500
Subject: Alphabetize

---
 packages/0x.js/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 8cd0ec9bf..c8456a736 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -89,6 +89,7 @@
     "0x-json-schemas": "^0.6.1",
     "@0xproject/assert": "0.0.3",
     "bignumber.js": "~4.1.0",
+    "bn.js": "4.11.8",
     "compare-versions": "^3.0.1",
     "es6-promisify": "^5.0.0",
     "ethereumjs-abi": "^0.6.4",
@@ -100,7 +101,6 @@
     "publish-release": "^1.3.3",
     "tslint": "5.8.0",
     "uuid": "^3.1.0",
-    "web3": "^0.20.0",
-    "bn.js": "4.11.8"
+    "web3": "^0.20.0"
   }
 }
-- 
cgit v1.2.3