Merge branch 'development' into dev-tools-pages

21 files changed, 70 insertions, 54 deletions

diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index 387207b01..816c776a5 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "version": "2.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1541740904
+    },
+    {
         "version": "2.1.0",
         "changes": [
             {
@@ -9,8 +18,13 @@
             {
                 "note": "Add support for `eth_signTypedData` in wallets Mnemonic, Private and EthLightWallet",
                 "pr": 1102
+            },
+            {
+                "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library",
+                "pr": 1105
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "version": "2.0.7",
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index 872948ad7..72ac9d1f7 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,6 +5,16 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.1 - _November 9, 2018_
+
+    * Dependencies updated
+
+## v2.1.0 - _October 18, 2018_
+
+    * Add `MetamaskSubprovider` to handle inconsistent JSON RPC behaviour (#1102)
+    * Add support for `eth_signTypedData` in wallets Mnemonic, Private and EthLightWallet (#1102)
+    * Make web3-provider-engine types a 'dependency' so it's available to users of the library (#1105)
+
 ## v2.0.7 - _October 4, 2018_
 
     * Dependencies updated
@@ -37,7 +47,7 @@ CHANGELOG
 
     * Export types: `PartialTxParams`, `JSONRPCRequestPayloadWithMethod`, `ECSignatureString`, `AccountFetchingConfigs`, `LedgerEthereumClientFactoryAsync`, `OnNextCompleted`, `MnemonicWalletSubproviderConfigs`, LedgerGetAddressResult, `JSONRPCRequestPayload`, `Provider`, `JSONRPCResponsePayload` and `JSONRPCErrorCallback` (#924)
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 90c9b7bbe..6f97d760e 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -1,4 +1,4 @@
-## @0xproject/subproviders
+## @0x/subproviders
 
 A few useful web3 subproviders including a LedgerSubprovider useful for adding Ledger Nano S support.
 
@@ -9,14 +9,14 @@ We have written up a [Wiki](https://0xproject.com/wiki#Web3-Provider-Examples) a
 ## Installation
 
 ```
-yarn add @0xproject/subproviders
+yarn add @0x/subproviders
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -45,13 +45,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/subproviders yarn build
+PKG=@0x/subproviders yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/subproviders yarn watch
+PKG=@0x/subproviders yarn watch
 ```
 
 ### Clean
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index ff3ab7ed5..1a25b5e32 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/subproviders",
-    "version": "2.0.7",
+    "name": "@0x/subproviders",
+    "version": "2.1.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -11,7 +11,7 @@
         "build": "tsc -b",
         "build:ci": "yarn build",
         "clean": "shx rm -rf lib generated_docs",
-        "lint": "tslint --project .",
+        "lint": "tslint --format stylish --project .",
         "run_mocha_unit": "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
         "run_mocha_integration": "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
         "test": "npm run test:unit",
@@ -29,20 +29,21 @@
         }
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.13",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/assert": "^1.0.15",
+        "@0x/types": "^1.2.1",
+        "@0x/typescript-typings": "^3.0.4",
+        "@0x/utils": "^2.0.4",
+        "@0x/web3-wrapper": "^3.1.1",
         "@ledgerhq/hw-app-eth": "^4.3.0",
-        "@ledgerhq/hw-transport-u2f": "^4.3.0",
+        "@ledgerhq/hw-transport-u2f": "4.24.0",
         "@types/eth-lightwallet": "^3.0.0",
         "@types/ganache-core": "^2.1.0",
         "@types/hdkey": "^0.7.0",
+        "@types/web3-provider-engine": "^14.0.0",
         "bip39": "^2.5.0",
         "bn.js": "^4.11.8",
         "eth-lightwallet": "^3.0.1",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.2",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "ganache-core": "^2.2.1",
@@ -53,7 +54,7 @@
         "web3-provider-engine": "14.0.6"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.10",
         "@types/bip39": "^2.4.0",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-tx": "^1.0.0",
@@ -62,10 +63,8 @@
         "@types/mocha": "^2.2.42",
         "@types/node": "*",
         "@types/sinon": "^2.2.2",
-        "@types/web3-provider-engine": "^14.0.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
@@ -74,7 +73,7 @@
         "shx": "^0.2.2",
         "sinon": "^4.0.0",
         "tslint": "5.11.0",
-        "typedoc": "0.12.0",
+        "typedoc": "0.13.0",
         "typescript": "3.0.1",
         "webpack": "^4.20.2"
     },
diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts
index 9f4dac58b..050027f96 100644
--- a/packages/subproviders/src/index.ts
+++ b/packages/subproviders/src/index.ts
@@ -48,14 +48,7 @@ export {
     LedgerGetAddressResult,
 } from './types';
 
-export {
-    ECSignature,
-    EIP712Object,
-    EIP712ObjectValue,
-    EIP712TypedData,
-    EIP712Types,
-    EIP712Parameter,
-} from '@0xproject/types';
+export { ECSignature, EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types, EIP712Parameter } from '@0x/types';
 
 export {
     JSONRPCRequestPayload,
diff --git a/packages/subproviders/src/subproviders/base_wallet_subprovider.ts b/packages/subproviders/src/subproviders/base_wallet_subprovider.ts
index 409a0d330..e9d104074 100644
--- a/packages/subproviders/src/subproviders/base_wallet_subprovider.ts
+++ b/packages/subproviders/src/subproviders/base_wallet_subprovider.ts
@@ -1,5 +1,5 @@
-import { assert } from '@0xproject/assert';
-import { addressUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { addressUtils } from '@0x/utils';
 import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
 import * as _ from 'lodash';
 
diff --git a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
index a1d93ac49..15cd713af 100644
--- a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
+++ b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
@@ -1,4 +1,4 @@
-import { EIP712TypedData } from '@0xproject/types';
+import { EIP712TypedData } from '@0x/types';
 import * as lightwallet from 'eth-lightwallet';
 
 import { PartialTxParams } from '../types';
diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index ee8edde92..28e348f90 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -1,5 +1,5 @@
-import { assert } from '@0xproject/assert';
-import { addressUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { addressUtils } from '@0x/utils';
 import EthereumTx = require('ethereumjs-tx');
 import ethUtil = require('ethereumjs-util');
 import HDNode = require('hdkey');
diff --git a/packages/subproviders/src/subproviders/metamask_subprovider.ts b/packages/subproviders/src/subproviders/metamask_subprovider.ts
index 46fc2a9cd..ba207d4cc 100644
--- a/packages/subproviders/src/subproviders/metamask_subprovider.ts
+++ b/packages/subproviders/src/subproviders/metamask_subprovider.ts
@@ -1,4 +1,4 @@
-import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller, Web3Wrapper } from '@0x/web3-wrapper';
 import { JSONRPCRequestPayload, Provider } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 
diff --git a/packages/subproviders/src/subproviders/mnemonic_wallet.ts b/packages/subproviders/src/subproviders/mnemonic_wallet.ts
index 04a11c7be..140e3d515 100644
--- a/packages/subproviders/src/subproviders/mnemonic_wallet.ts
+++ b/packages/subproviders/src/subproviders/mnemonic_wallet.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { EIP712TypedData } from '@0xproject/types';
-import { addressUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { EIP712TypedData } from '@0x/types';
+import { addressUtils } from '@0x/utils';
 import * as bip39 from 'bip39';
 import HDNode = require('hdkey');
 import * as _ from 'lodash';
diff --git a/packages/subproviders/src/subproviders/private_key_wallet.ts b/packages/subproviders/src/subproviders/private_key_wallet.ts
index e89c4c186..dca7e6810 100644
--- a/packages/subproviders/src/subproviders/private_key_wallet.ts
+++ b/packages/subproviders/src/subproviders/private_key_wallet.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { EIP712TypedData } from '@0xproject/types';
-import { signTypedDataUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { EIP712TypedData } from '@0x/types';
+import { signTypedDataUtils } from '@0x/utils';
 import EthereumTx = require('ethereumjs-tx');
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
diff --git a/packages/subproviders/src/subproviders/redundant_subprovider.ts b/packages/subproviders/src/subproviders/redundant_subprovider.ts
index 59a2986f8..58312f203 100644
--- a/packages/subproviders/src/subproviders/redundant_subprovider.ts
+++ b/packages/subproviders/src/subproviders/redundant_subprovider.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import { JSONRPCRequestPayload } from 'ethereum-types';
 import * as _ from 'lodash';
 
diff --git a/packages/subproviders/src/subproviders/rpc_subprovider.ts b/packages/subproviders/src/subproviders/rpc_subprovider.ts
index 18d6da307..437518e12 100644
--- a/packages/subproviders/src/subproviders/rpc_subprovider.ts
+++ b/packages/subproviders/src/subproviders/rpc_subprovider.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { StatusCodes } from '@0xproject/types';
-import { fetchAsync } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { StatusCodes } from '@0x/types';
+import { fetchAsync } from '@0x/utils';
 import { JSONRPCRequestPayload } from 'ethereum-types';
 import JsonRpcError = require('json-rpc-error');
 
diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts
index eda7db42e..9bd5cbdf1 100644
--- a/packages/subproviders/src/subproviders/signer.ts
+++ b/packages/subproviders/src/subproviders/signer.ts
@@ -1,4 +1,4 @@
-import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller, Web3Wrapper } from '@0x/web3-wrapper';
 import { JSONRPCRequestPayload, Provider } from 'ethereum-types';
 
 import { Callback, ErrorCallback } from '../types';
diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts
index dcf880c79..cd6780e0c 100644
--- a/packages/subproviders/src/subproviders/subprovider.ts
+++ b/packages/subproviders/src/subproviders/subprovider.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import { JSONRPCRequestPayload, JSONRPCResponsePayload, Provider } from 'ethereum-types';
 
 import { Callback, ErrorCallback, JSONRPCRequestPayloadWithMethod } from '../types';
diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index e8a47ad34..ed3aea176 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -1,4 +1,4 @@
-import { ECSignature } from '@0xproject/types';
+import { ECSignature } from '@0x/types';
 import { JSONRPCRequestPayload } from 'ethereum-types';
 import HDNode = require('hdkey');
 
diff --git a/packages/subproviders/test/integration/ledger_subprovider_test.ts b/packages/subproviders/test/integration/ledger_subprovider_test.ts
index 527ee5b22..b072e611b 100644
--- a/packages/subproviders/test/integration/ledger_subprovider_test.ts
+++ b/packages/subproviders/test/integration/ledger_subprovider_test.ts
@@ -1,5 +1,5 @@
-import { DoneCallback } from '@0xproject/types';
-import { promisify } from '@0xproject/utils';
+import { DoneCallback } from '@0x/types';
+import { promisify } from '@0x/utils';
 import Eth from '@ledgerhq/hw-app-eth';
 // HACK: This dependency is optional and tslint skips optional dependencies
 // tslint:disable-next-line:no-implicit-dependencies
diff --git a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
index 05f213cf5..a5cef30dc 100644
--- a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
+++ b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai';
 import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture');
 
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import EthereumTx = require('ethereumjs-tx');
 
 import { NonceTrackerSubprovider, Web3ProviderEngine } from '../../src';
diff --git a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
index e30d2f74e..fb4e43f9e 100644
--- a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
+++ b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '@0xproject/types';
+import { DoneCallback } from '@0x/types';
 import * as chai from 'chai';
 import { JSONRPCResponsePayload } from 'ethereum-types';
 import * as Sinon from 'sinon';
diff --git a/packages/subproviders/test/utils/report_callback_errors.ts b/packages/subproviders/test/utils/report_callback_errors.ts
index eaefea7c3..6eb7420c3 100644
--- a/packages/subproviders/test/utils/report_callback_errors.ts
+++ b/packages/subproviders/test/utils/report_callback_errors.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '@0xproject/types';
+import { DoneCallback } from '@0x/types';
 
 export const reportCallbackErrors = (done: DoneCallback) => {
     return (f: (...args: any[]) => void) => {
diff --git a/packages/subproviders/tslint.json b/packages/subproviders/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/subproviders/tslint.json
+++ b/packages/subproviders/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }