Publish

- 0x.js@1.0.6
 - @0xproject/abi-gen@1.0.11
 - @0xproject/assert@1.0.11
 - @0xproject/asset-buyer@1.0.1
 - @0xproject/base-contract@2.0.5
 - @0xproject/connect@2.0.4
 - @0xproject/contract-wrappers@2.0.0
 - contracts@2.1.47
 - @0xproject/dev-utils@1.0.10
 - ethereum-types@1.0.8
 - @0xproject/fill-scenarios@1.0.5
 - @0xproject/json-schemas@1.0.4
 - @0xproject/metacoin@0.0.21
 - @0xproject/migrations@1.0.12
 - @0xproject/order-utils@1.0.5
 - @0xproject/order-watcher@2.0.0
 - @0xproject/react-docs@1.0.11
 - @0xproject/react-shared@1.0.12
 - @0xproject/sol-compiler@1.1.5
 - @0xproject/sol-cov@2.1.5
 - @0xproject/sol-resolver@1.0.11
 - @0xproject/sra-report@1.0.11
 - @0xproject/sra-spec@1.0.4
 - @0xproject/subproviders@2.0.5
 - @0xproject/testnet-faucets@1.0.49
 - @0xproject/types@1.1.1
 - @0xproject/typescript-typings@2.0.2
 - @0xproject/utils@1.0.11
 - @0xproject/web3-wrapper@3.0.1
 - @0xproject/website@0.0.52

packages/0x.js/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.5",

packages/0x.js/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.6 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.5 - _September 25, 2018_
 
     * Dependencies updated

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,9 +41,9 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/migrations": "^1.0.11",
+        "@0xproject/migrations": "^1.0.12",
         "@0xproject/monorepo-scripts": "^1.0.9",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/lodash": "4.14.104",
@@ -73,17 +73,17 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/contract-wrappers": "^1.0.5",
+        "@0xproject/contract-wrappers": "^2.0.0",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/order-watcher": "^1.0.5",
+        "@0xproject/order-watcher": "^2.0.0",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethers": "3.0.22",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"

packages/abi-gen/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",

packages/abi-gen/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated

packages/abi-gen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,10 +30,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.5",

packages/assert/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",

packages/assert/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated

packages/assert/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/assert",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,9 +44,9 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
         "lodash": "^4.17.5",
         "valid-url": "^1.0.9"
     },

packages/asset-buyer/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.0",

packages/asset-buyer/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.1 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.0 - _September 25, 2018_
 
     * Dependencies updated

packages/asset-buyer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/asset-buyer",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -36,17 +36,17 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/connect": "^2.0.3",
+        "@0xproject/connect": "^2.0.4",
-        "@0xproject/contract-wrappers": "^1.0.5",
+        "@0xproject/contract-wrappers": "^2.0.0",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.6",
+        "ethereum-types": "^1.0.8",
         "lodash": "^4.17.10"
     },
     "devDependencies": {

packages/base-contract/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "2.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "2.0.4",

packages/base-contract/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.5 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v2.0.4 - _September 25, 2018_
 
     * Dependencies updated

packages/base-contract/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -40,10 +40,10 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

packages/connect/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "2.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.0.3",
         "changes": [

packages/connect/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.4 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v2.0.3 - _September 25, 2018_
 
     * Import SRA-related types from @0xproject/types (#1085)

packages/connect/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/connect",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,12 +43,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
         "lodash": "^4.17.5",
         "query-string": "^5.0.1",
         "sinon": "^4.0.0",

packages/contract-wrappers/CHANGELOG.json

@@ -1,21 +1,37 @@
 [
     {
-        "timestamp": 1537875740,
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note":
+                    "Fixes dropped events in subscriptions by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
+                "pr": 1080
+            },
+            {
+                "note":
+                    "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
+                "pr": 1080
+            }
+        ],
+        "timestamp": 1537907159
+    },
+    {
         "version": "1.0.5",
         "changes": [
             {
                 "note": "Dependencies updated"
             }
-        ]
+        ],
+        "timestamp": 1537875740
     },
     {
-        "timestamp": 1537541580,
         "version": "1.0.4",
         "changes": [
             {
                 "note": "Dependencies updated"
             }
-        ]
+        ],
+        "timestamp": 1537541580
     },
     {
         "version": "1.0.3",

packages/contract-wrappers/CHANGELOG.md

@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.0 - _September 25, 2018_
+
+    * Fixes dropped events in subscriptions by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too. (#1080)
+    * Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it (#1080)
+
 ## v1.0.5 - _September 25, 2018_
 
     * Dependencies updated

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/contract-wrappers",
-    "version": "1.0.5",
+    "version": "2.0.0",
     "description": "Smart TS wrappers for 0x smart contracts",
     "keywords": [
         "0xproject",
@@ -41,10 +41,10 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/migrations": "^1.0.11",
+        "@0xproject/migrations": "^1.0.12",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -72,17 +72,17 @@
         "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/fill-scenarios": "^1.0.4",
+        "@0xproject/fill-scenarios": "^1.0.5",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
-        "ethereumjs-blockstream": "5.0.0",
+        "ethereumjs-blockstream": "6.0.0",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
         "js-sha3": "^0.7.0",

packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts

@@ -1,14 +1,14 @@
 import { AbiDecoder, intervalUtils, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
 import {
     BlockParamLiteral,
-    BlockWithoutTransactionData,
     ContractAbi,
     ContractArtifact,
     FilterObject,
     LogEntry,
     LogWithDecodedArgs,
     RawLog,
+    RawLogEntry,
 } from 'ethereum-types';
 import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
 import * as _ from 'lodash';
@@ -158,7 +158,8 @@ export abstract class ContractWrapper {
             return addressIfExists;
         }
     }
-    private _onLogStateChanged<ArgsType extends ContractEventArgs>(isRemoved: boolean, log: LogEntry): void {
+    private _onLogStateChanged<ArgsType extends ContractEventArgs>(isRemoved: boolean, rawLog: RawLogEntry): void {
+        const log: LogEntry = marshaller.unmarshalLog(rawLog);
         _.forEach(this._filters, (filter: FilterObject, filterToken: string) => {
             if (filterUtils.matchesFilter(log, filter)) {
                 const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs<ArgsType>;
@@ -175,8 +176,8 @@ export abstract class ContractWrapper {
             throw new Error(ContractWrappersError.SubscriptionAlreadyPresent);
         }
         this._blockAndLogStreamerIfExists = new BlockAndLogStreamer(
-            this._getBlockOrNullAsync.bind(this),
+            this._blockstreamGetBlockOrNullAsync.bind(this),
-            this._web3Wrapper.getLogsAsync.bind(this._web3Wrapper),
+            this._blockstreamGetLogsAsync.bind(this),
             ContractWrapper._onBlockAndLogStreamerError.bind(this, isVerbose),
         );
         const catchAllLogFilter = {};
@@ -196,12 +197,30 @@ export abstract class ContractWrapper {
         );
     }
     // This method only exists in order to comply with the expected interface of Blockstream's constructor
-    private async _getBlockOrNullAsync(): Promise<BlockWithoutTransactionData | null> {
+    private async _blockstreamGetBlockOrNullAsync(hash: string): Promise<Block | null> {
-        const blockIfExists = await this._web3Wrapper.getBlockIfExistsAsync.bind(this._web3Wrapper);
+        const shouldIncludeTransactionData = false;
-        if (_.isUndefined(blockIfExists)) {
+        const blockOrNull = await this._web3Wrapper.sendRawPayloadAsync<Block | null>({
-            return null;
+            method: 'eth_getBlockByHash',
+            params: [hash, shouldIncludeTransactionData],
+        });
+        return blockOrNull;
     }
-        return blockIfExists;
+    // This method only exists in order to comply with the expected interface of Blockstream's constructor
+    private async _blockstreamGetLatestBlockOrNullAsync(): Promise<Block | null> {
+        const shouldIncludeTransactionData = false;
+        const blockOrNull = await this._web3Wrapper.sendRawPayloadAsync<Block | null>({
+            method: 'eth_getBlockByNumber',
+            params: [BlockParamLiteral.Latest, shouldIncludeTransactionData],
+        });
+        return blockOrNull;
+    }
+    // This method only exists in order to comply with the expected interface of Blockstream's constructor
+    private async _blockstreamGetLogsAsync(filterOptions: FilterObject): Promise<RawLogEntry[]> {
+        const logs = await this._web3Wrapper.sendRawPayloadAsync<RawLogEntry[]>({
+            method: 'eth_getLogs',
+            params: [filterOptions],
+        });
+        return logs as RawLogEntry[];
     }
     // HACK: This should be a package-scoped method (which doesn't exist in TS)
     // We don't want this method available in the public interface for all classes
@@ -221,14 +240,14 @@ export abstract class ContractWrapper {
         delete this._blockAndLogStreamerIfExists;
     }
     private async _reconcileBlockAsync(): Promise<void> {
-        const latestBlockIfExists = await this._web3Wrapper.getBlockIfExistsAsync(BlockParamLiteral.Latest);
+        const latestBlockOrNull = await this._blockstreamGetLatestBlockOrNullAsync();
-        if (_.isUndefined(latestBlockIfExists)) {
+        if (_.isNull(latestBlockOrNull)) {
             return; // noop
         }
         // We need to coerce to Block type cause Web3.Block includes types for mempool blocks
         if (!_.isUndefined(this._blockAndLogStreamerIfExists)) {
             // If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined
-            await this._blockAndLogStreamerIfExists.reconcileNewBlock((latestBlockIfExists as any) as Block);
+            await this._blockAndLogStreamerIfExists.reconcileNewBlock(latestBlockOrNull);
         }
     }
 }

packages/contracts/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "contracts",
-    "version": "2.1.46",
+    "version": "2.1.47",
     "engines": {
         "node": ">=6.12"
     },
@@ -45,11 +45,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/sol-compiler": "^1.1.4",
+        "@0xproject/sol-compiler": "^1.1.5",
-        "@0xproject/sol-cov": "^2.1.4",
+        "@0xproject/sol-cov": "^2.1.5",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-abi": "^0.6.0",
@@ -72,15 +72,15 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-abi": "0.6.5",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",

packages/dev-utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.9",

packages/dev-utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.10 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.9 - _September 25, 2018_
 
     * Dependencies updated

packages/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/dev-utils",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,12 +42,12 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "lodash": "^4.17.5"
     },
     "publishConfig": {

packages/ethereum-types/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537541580,
         "version": "1.0.7",

packages/ethereum-types/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.8 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.7 - _September 21, 2018_
 
     * Dependencies updated

packages/ethereum-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ethereum-types",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "engines": {
         "node": ">=6.12"
     },

packages/ethereum-types/src/index.ts

@@ -181,6 +181,7 @@ export interface CallData extends CallTxDataBase {
 export interface FilterObject {
     fromBlock?: number | string;
     toBlock?: number | string;
+    blockHash?: string;
     address?: string;
     topics?: LogTopic[];
 }

packages/fill-scenarios/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.4",

packages/fill-scenarios/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.4 - _September 25, 2018_
 
     * Dependencies updated

packages/fill-scenarios/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/fill-scenarios",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "0x order fill scenario generator",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -26,7 +26,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/lodash": "4.14.104",
         "copyfiles": "^2.0.0",
@@ -37,13 +37,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

packages/json-schemas/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.3",

packages/json-schemas/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.3 - _September 25, 2018_
 
     * Dependencies updated

packages/json-schemas/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/json-schemas",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -38,14 +38,14 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
         "@types/node": "*",
         "jsonschema": "^1.2.0",
         "lodash.values": "^4.3.0"
     },
     "devDependencies": {
         "@0xproject/tslint-config": "^1.0.7",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
         "@types/lodash.foreach": "^4.5.3",
         "@types/lodash.values": "^4.3.3",
         "@types/mocha": "^2.2.42",

packages/metacoin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/metacoin",
-    "version": "0.0.20",
+    "version": "0.0.21",
     "engines": {
         "node": ">=6.12"
     },
@@ -28,25 +28,25 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/sol-cov": "^2.1.4",
+        "@0xproject/sol-cov": "^2.1.5",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
         "@0xproject/tslint-config": "^1.0.7",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "@types/mocha": "^5.2.2",
         "copyfiles": "^2.0.0",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethers": "3.0.22",
         "lodash": "^4.17.5",
         "run-s": "^0.0.0"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/sol-compiler": "^1.1.4",
+        "@0xproject/sol-compiler": "^1.1.5",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",

packages/migrations/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.11",

packages/migrations/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.12 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.11 - _September 25, 2018_
 
     * Dependencies updated

packages/migrations/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/migrations",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,10 +30,10 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
         "@types/yargs": "^10.0.0",
         "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
@@ -44,15 +44,15 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/sol-compiler": "^1.1.4",
+        "@0xproject/sol-compiler": "^1.1.5",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "@ledgerhq/hw-app-eth": "^4.3.0",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

packages/order-utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.4",

packages/order-utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.5 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.4 - _September 25, 2018_
 
     * Dependencies updated

packages/order-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-utils",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -38,7 +38,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
@@ -57,16 +57,16 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "@types/node": "*",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-abi": "0.6.5",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",

packages/order-utils/src/order_state_utils.ts

@@ -114,7 +114,7 @@ export class OrderStateUtils {
      * @return State relevant to the signedOrder, as well as whether the signedOrder is "valid".
      * Validity is defined as a non-zero amount of the order can still be filled.
      */
-    public async getOpenOrderStateAsync(signedOrder: SignedOrder): Promise<OrderState> {
+    public async getOpenOrderStateAsync(signedOrder: SignedOrder, transactionHash?: string): Promise<OrderState> {
         const orderRelevantState = await this.getOpenOrderRelevantStateAsync(signedOrder);
         const orderHash = orderHashUtils.getOrderHashHex(signedOrder);
         const isOrderCancelled = await this._orderFilledCancelledFetcher.isOrderCancelledAsync(orderHash);
@@ -134,6 +134,7 @@ export class OrderStateUtils {
                 isValid: true,
                 orderHash,
                 orderRelevantState,
+                transactionHash,
             };
             return orderState;
         } else {
@@ -141,6 +142,7 @@ export class OrderStateUtils {
                 isValid: false,
                 orderHash,
                 error: orderValidationResult.error,
+                transactionHash,
             };
             return orderState;
         }

packages/order-utils/test/order_state_utils_test.ts

@@ -120,5 +120,25 @@ describe('OrderStateUtils', () => {
             const orderState = await orderStateUtils.getOpenOrderStateAsync(signedOrder);
             expect(orderState.isValid).to.eq(false);
         });
+        it('should include the transactionHash in orderState if supplied in method invocation', async () => {
+            const makerAssetAmount = new BigNumber(10);
+            const takerAssetAmount = new BigNumber(10000000000000000);
+            const takerBalance = takerAssetAmount;
+            const orderFilledAmount = new BigNumber(0);
+            const mockBalanceFetcher = buildMockBalanceFetcher(takerBalance);
+            const mockOrderFilledFetcher = buildMockOrderFilledFetcher(orderFilledAmount);
+            const [signedOrder] = testOrderFactory.generateTestSignedOrders(
+                {
+                    makerAssetAmount,
+                    takerAssetAmount,
+                },
+                1,
+            );
+
+            const orderStateUtils = new OrderStateUtils(mockBalanceFetcher, mockOrderFilledFetcher);
+            const transactionHash = '0xdeadbeef';
+            const orderState = await orderStateUtils.getOpenOrderStateAsync(signedOrder, transactionHash);
+            expect(orderState.transactionHash).to.eq(transactionHash);
+        });
     });
 });

packages/order-watcher/CHANGELOG.json

@@ -1,21 +1,42 @@
 [
     {
-        "timestamp": 1537875740,
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note":
+                    "Fixes dropped events issue by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
+                "pr": 1080
+            },
+            {
+                "note":
+                    "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
+                "pr": 1080
+            },
+            {
+                "note":
+                    "Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction.",
+                "pr": 1087
+            }
+        ],
+        "timestamp": 1537907159
+    },
+    {
         "version": "1.0.5",
         "changes": [
             {
                 "note": "Dependencies updated"
             }
-        ]
+        ],
+        "timestamp": 1537875740
     },
     {
-        "timestamp": 1537541580,
         "version": "1.0.4",
         "changes": [
             {
                 "note": "Dependencies updated"
             }
-        ]
+        ],
+        "timestamp": 1537541580
     },
     {
         "version": "1.0.3",

packages/order-watcher/CHANGELOG.md

@@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.0 - _September 25, 2018_
+
+    * Fixes dropped events issue by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too. (#1080)
+    * Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it (#1080)
+    * Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction. (#1087)
+
 ## v1.0.5 - _September 25, 2018_
 
     * Dependencies updated

packages/order-watcher/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-watcher",
-    "version": "1.0.5",
+    "version": "2.0.0",
     "description": "An order watcher daemon that watches for order validity",
     "keywords": [
         "0x",
@@ -42,9 +42,9 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.10",
+        "@0xproject/abi-gen": "^1.0.11",
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/migrations": "^1.0.11",
+        "@0xproject/migrations": "^1.0.12",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
@@ -70,19 +70,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/base-contract": "^2.0.4",
+        "@0xproject/base-contract": "^2.0.5",
-        "@0xproject/contract-wrappers": "^1.0.5",
+        "@0xproject/contract-wrappers": "^2.0.0",
-        "@0xproject/fill-scenarios": "^1.0.4",
+        "@0xproject/fill-scenarios": "^1.0.5",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "bintrees": "^1.0.2",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
-        "ethereumjs-blockstream": "5.0.0",
+        "ethereumjs-blockstream": "6.0.0",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },

packages/order-watcher/src/order_watcher/event_watcher.ts

@@ -1,6 +1,6 @@
 import { intervalUtils, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
-import { BlockParamLiteral, BlockWithoutTransactionData, LogEntry, Provider } from 'ethereum-types';
+import { BlockParamLiteral, FilterObject, LogEntry, Provider, RawLogEntry } from 'ethereum-types';
 import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
 import * as _ from 'lodash';
 
@@ -20,7 +20,6 @@ enum LogEventState {
  */
 export class EventWatcher {
     private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _stateLayer: BlockParamLiteral;
     private readonly _isVerbose: boolean;
     private _blockAndLogStreamerIfExists: BlockAndLogStreamer<Block, Log> | undefined;
     private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
@@ -35,7 +34,6 @@ export class EventWatcher {
     ) {
         this._isVerbose = isVerbose;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._stateLayer = stateLayer;
         this._pollingIntervalMs = _.isUndefined(pollingIntervalIfExistsMs)
             ? DEFAULT_EVENT_POLLING_INTERVAL_MS
             : pollingIntervalIfExistsMs;
@@ -62,8 +60,8 @@ export class EventWatcher {
             throw new Error(OrderWatcherError.SubscriptionAlreadyPresent);
         }
         this._blockAndLogStreamerIfExists = new BlockAndLogStreamer(
-            this._getBlockOrNullAsync.bind(this),
+            this._blockstreamGetBlockOrNullAsync.bind(this),
-            this._web3Wrapper.getLogsAsync.bind(this._web3Wrapper),
+            this._blockstreamGetLogsAsync.bind(this),
             this._onBlockAndLogStreamerError.bind(this),
         );
         const catchAllLogFilter = {};
@@ -83,12 +81,30 @@ export class EventWatcher {
         );
     }
     // This method only exists in order to comply with the expected interface of Blockstream's constructor
-    private async _getBlockOrNullAsync(): Promise<BlockWithoutTransactionData | null> {
+    private async _blockstreamGetBlockOrNullAsync(hash: string): Promise<Block | null> {
-        const blockIfExists = await this._web3Wrapper.getBlockIfExistsAsync.bind(this._web3Wrapper);
+        const shouldIncludeTransactionData = false;
-        if (_.isUndefined(blockIfExists)) {
+        const blockOrNull = await this._web3Wrapper.sendRawPayloadAsync<Block | null>({
-            return null;
+            method: 'eth_getBlockByHash',
+            params: [hash, shouldIncludeTransactionData],
+        });
+        return blockOrNull;
     }
-        return blockIfExists;
+    // This method only exists in order to comply with the expected interface of Blockstream's constructor
+    private async _blockstreamGetLatestBlockOrNullAsync(): Promise<Block | null> {
+        const shouldIncludeTransactionData = false;
+        const blockOrNull = await this._web3Wrapper.sendRawPayloadAsync<Block | null>({
+            method: 'eth_getBlockByNumber',
+            params: [BlockParamLiteral.Latest, shouldIncludeTransactionData],
+        });
+        return blockOrNull;
+    }
+    // This method only exists in order to comply with the expected interface of Blockstream's constructor
+    private async _blockstreamGetLogsAsync(filterOptions: FilterObject): Promise<RawLogEntry[]> {
+        const logs = await this._web3Wrapper.sendRawPayloadAsync<RawLogEntry[]>({
+            method: 'eth_getLogs',
+            params: [filterOptions],
+        });
+        return logs as RawLogEntry[];
     }
     private _stopBlockAndLogStream(): void {
         if (_.isUndefined(this._blockAndLogStreamerIfExists)) {
@@ -103,19 +119,20 @@ export class EventWatcher {
     private async _onLogStateChangedAsync(
         callback: EventWatcherCallback,
         isRemoved: boolean,
-        log: LogEntry,
+        rawLog: RawLogEntry,
     ): Promise<void> {
+        const log: LogEntry = marshaller.unmarshalLog(rawLog);
         await this._emitDifferencesAsync(log, isRemoved ? LogEventState.Removed : LogEventState.Added, callback);
     }
     private async _reconcileBlockAsync(): Promise<void> {
-        const latestBlockIfExists = await this._web3Wrapper.getBlockIfExistsAsync(this._stateLayer);
+        const latestBlockOrNull = await this._blockstreamGetLatestBlockOrNullAsync();
-        if (_.isUndefined(latestBlockIfExists)) {
+        if (_.isNull(latestBlockOrNull)) {
             return; // noop
         }
         // We need to coerce to Block type cause Web3.Block includes types for mempool blocks
         if (!_.isUndefined(this._blockAndLogStreamerIfExists)) {
             // If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined
-            await this._blockAndLogStreamerIfExists.reconcileNewBlock((latestBlockIfExists as any) as Block);
+            await this._blockAndLogStreamerIfExists.reconcileNewBlock(latestBlockOrNull);
         }
     }
     private async _emitDifferencesAsync(

packages/order-watcher/src/order_watcher/order_watcher.ts

@@ -275,6 +275,7 @@ export class OrderWatcher {
             return; // noop
         }
         const decodedLog = (maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>;
+        const transactionHash = decodedLog.transactionHash;
         switch (decodedLog.event) {
             case ERC20TokenEvents.Approval:
             case ERC721TokenEvents.Approval: {
@@ -290,7 +291,7 @@ export class OrderWatcher {
                         args._owner,
                         tokenAssetData,
                     );
-                    await this._emitRevalidateOrdersAsync(orderHashes);
+                    await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                     break;
                 } else {
                     // ERC721
@@ -303,7 +304,7 @@ export class OrderWatcher {
                         args._owner,
                         tokenAssetData,
                     );
-                    await this._emitRevalidateOrdersAsync(orderHashes);
+                    await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                     break;
                 }
             }
@@ -322,7 +323,7 @@ export class OrderWatcher {
                         args._from,
                         tokenAssetData,
                     );
-                    await this._emitRevalidateOrdersAsync(orderHashes);
+                    await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                     break;
                 } else {
                     // ERC721
@@ -336,7 +337,7 @@ export class OrderWatcher {
                         args._from,
                         tokenAssetData,
                     );
-                    await this._emitRevalidateOrdersAsync(orderHashes);
+                    await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                     break;
                 }
             }
@@ -350,7 +351,7 @@ export class OrderWatcher {
                     args._owner,
                     tokenAddress,
                 );
-                await this._emitRevalidateOrdersAsync(orderHashes);
+                await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                 break;
             }
             case WETH9Events.Deposit: {
@@ -363,7 +364,7 @@ export class OrderWatcher {
                     args._owner,
                     tokenAssetData,
                 );
-                await this._emitRevalidateOrdersAsync(orderHashes);
+                await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                 break;
             }
             case WETH9Events.Withdrawal: {
@@ -376,7 +377,7 @@ export class OrderWatcher {
                     args._owner,
                     tokenAssetData,
                 );
-                await this._emitRevalidateOrdersAsync(orderHashes);
+                await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                 break;
             }
             case ExchangeEvents.Fill: {
@@ -387,7 +388,7 @@ export class OrderWatcher {
                 const orderHash = args.orderHash;
                 const isOrderWatched = !_.isUndefined(this._orderByOrderHash[orderHash]);
                 if (isOrderWatched) {
-                    await this._emitRevalidateOrdersAsync([orderHash]);
+                    await this._emitRevalidateOrdersAsync([orderHash], transactionHash);
                 }
                 break;
             }
@@ -399,7 +400,7 @@ export class OrderWatcher {
                 const orderHash = args.orderHash;
                 const isOrderWatched = !_.isUndefined(this._orderByOrderHash[orderHash]);
                 if (isOrderWatched) {
-                    await this._emitRevalidateOrdersAsync([orderHash]);
+                    await this._emitRevalidateOrdersAsync([orderHash], transactionHash);
                 }
                 break;
             }
@@ -410,7 +411,7 @@ export class OrderWatcher {
                 this._orderFilledCancelledLazyStore.deleteAllIsCancelled();
                 // Revalidate orders
                 const orderHashes = this._dependentOrderHashesTracker.getDependentOrderHashesByMaker(args.makerAddress);
-                await this._emitRevalidateOrdersAsync(orderHashes);
+                await this._emitRevalidateOrdersAsync(orderHashes, transactionHash);
                 break;
             }
 
@@ -418,12 +419,12 @@ export class OrderWatcher {
                 throw errorUtils.spawnSwitchErr('decodedLog.event', decodedLog.event);
         }
     }
-    private async _emitRevalidateOrdersAsync(orderHashes: string[]): Promise<void> {
+    private async _emitRevalidateOrdersAsync(orderHashes: string[], transactionHash?: string): Promise<void> {
         for (const orderHash of orderHashes) {
             const signedOrder = this._orderByOrderHash[orderHash];
             // Most of these calls will never reach the network because the data is fetched from stores
             // and only updated when cache is invalidated
-            const orderState = await this._orderStateUtils.getOpenOrderStateAsync(signedOrder);
+            const orderState = await this._orderStateUtils.getOpenOrderStateAsync(signedOrder, transactionHash);
             if (_.isUndefined(this._callbackIfExists)) {
                 break; // Unsubscribe was called
             }

packages/order-watcher/test/order_watcher_test.ts

@@ -250,6 +250,32 @@ describe('OrderWatcher', () => {
                 await contractWrappers.exchange.fillOrderAsync(signedOrder, fillableAmount, takerAddress);
             })().catch(done);
         });
+        it('should include transactionHash in emitted orderStateInvalid when watched order fully filled', (done: DoneCallback) => {
+            (async () => {
+                signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                    makerAssetData,
+                    takerAssetData,
+                    makerAddress,
+                    takerAddress,
+                    fillableAmount,
+                );
+                await orderWatcher.addOrderAsync(signedOrder);
+
+                let transactionHash: string;
+                const callback = callbackErrorReporter.reportNodeCallbackErrors(done)((orderState: OrderState) => {
+                    expect(orderState.isValid).to.be.false();
+                    const invalidOrderState = orderState as OrderStateInvalid;
+                    expect(invalidOrderState.transactionHash).to.be.equal(transactionHash);
+                });
+                orderWatcher.subscribe(callback);
+
+                transactionHash = await contractWrappers.exchange.fillOrderAsync(
+                    signedOrder,
+                    fillableAmount,
+                    takerAddress,
+                );
+            })().catch(done);
+        });
         it('should emit orderStateValid when watched order partially filled', (done: DoneCallback) => {
             (async () => {
                 signedOrder = await fillScenarios.createFillableSignedOrderAsync(

packages/react-docs/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",

packages/react-docs/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated

packages/react-docs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^2.0.0",
@@ -33,8 +33,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^1.0.11",
+        "@0xproject/react-shared": "^1.0.12",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "^0.20.0",
         "@types/node": "*",

packages/react-docs/src/components/signature.tsx

@@ -134,7 +134,10 @@ function renderTypeParameter(
 ): React.ReactNode {
     const typeParam = (
         <span>
-            {`<${typeParameter.name} extends `}
+            {`<${typeParameter.name}`}
+            {!_.isUndefined(typeParameter.type) && (
+                <span>
+                    {' extends '}
                     <Type
                         type={typeParameter.type}
                         sectionName={sectionName}
@@ -142,6 +145,8 @@ function renderTypeParameter(
                         docsInfo={docsInfo}
                         isInPopover={isInPopover}
                     />
+                </span>
+            )}
             {`>`}
         </span>
     );

packages/react-docs/src/types.ts

@@ -150,7 +150,7 @@ export interface Parameter {
 
 export interface TypeParameter {
     name: string;
-    type: Type;
+    type?: Type;
 }
 
 export interface Type {

packages/react-docs/src/utils/typedoc_utils.ts

@@ -419,7 +419,10 @@ export class TypeDocUtils {
         return func;
     }
     private _convertTypeParameter(entity: TypeDocNode, sectionName: string): TypeParameter {
-        const type = this._convertType(entity.type, sectionName);
+        let type;
+        if (!_.isUndefined(entity.type)) {
+            type = this._convertType(entity.type, sectionName);
+        }
         const parameter = {
             name: entity.name,
             type,

packages/react-shared/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.11",

packages/react-shared/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.12 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.11 - _September 25, 2018_
 
     * Dependencies updated

packages/react-shared/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-shared",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,7 +24,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
         "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",

packages/sol-compiler/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.1.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.1.4",

packages/sol-compiler/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.5 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.1.4 - _September 25, 2018_
 
     * Dependencies updated

packages/sol-compiler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-compiler",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,7 +41,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
         "@0xproject/tslint-config": "^1.0.7",
         "@types/mkdirp": "^0.5.2",
         "@types/require-from-string": "^1.2.0",
@@ -64,16 +64,16 @@
         "zeppelin-solidity": "1.8.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/sol-resolver": "^1.0.10",
+        "@0xproject/sol-resolver": "^1.0.11",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "@types/yargs": "^11.0.0",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5",
         "mkdirp": "^0.5.1",

packages/sol-cov/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "2.1.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "2.1.4",

packages/sol-cov/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.5 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v2.1.4 - _September 25, 2018_
 
     * Dependencies updated

packages/sol-cov/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-cov",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,13 +41,13 @@
     },
     "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
     "dependencies": {
-        "@0xproject/dev-utils": "^1.0.9",
+        "@0xproject/dev-utils": "^1.0.10",
-        "@0xproject/sol-compiler": "^1.1.4",
+        "@0xproject/sol-compiler": "^1.1.5",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-util": "^5.1.1",
         "glob": "^7.1.2",
         "istanbul": "^0.4.5",

packages/sol-resolver/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",

packages/sol-resolver/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated

packages/sol-resolver/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-resolver",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
         "lodash": "^4.17.5"
     },
     "publishConfig": {

packages/sra-report/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",

packages/sra-report/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated

packages/sra-report/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sra-report",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -33,13 +33,13 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
         "@0xproject/connect": "1.0.4",
         "@0xproject/json-schemas": "^0.8.3",
         "@0xproject/order-utils": "^0.0.9",
         "@0xproject/types": "^0.8.2",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
         "chalk": "^2.3.0",
         "lodash": "^4.17.5",
         "newman": "^3.9.3",

packages/sra-spec/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.3",

packages/sra-spec/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.3 - _September 25, 2018_
 
     * Dependencies updated

packages/sra-spec/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sra-spec",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,7 +34,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md",
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.3"
+        "@0xproject/json-schemas": "^1.0.4"
     },
     "devDependencies": {
         "@0xproject/tslint-config": "^1.0.7",

packages/subproviders/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "2.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "2.0.4",

packages/subproviders/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.5 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v2.0.4 - _September 25, 2018_
 
     * Dependencies updated

packages/subproviders/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/subproviders",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -28,11 +28,11 @@
         }
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "^4.3.0",
         "@types/eth-lightwallet": "^3.0.0",
@@ -41,7 +41,7 @@
         "bip39": "^2.5.0",
         "bn.js": "^4.11.8",
         "eth-lightwallet": "^3.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "ganache-core": "0xProject/ganache-core#monorepo-dep",

packages/testnet-faucets/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@0xproject/testnet-faucets",
-    "version": "1.0.48",
+    "version": "1.0.49",
     "engines": {
         "node": ">=6.12"
     },
@@ -17,13 +17,13 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "0x.js": "^1.0.5",
+        "0x.js": "^1.0.6",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "body-parser": "^1.17.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "express": "^4.15.2",

packages/types/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "1.1.0",
         "changes": [

packages/types/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.1 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.1.0 - _September 25, 2018_
 
     * Add ObjectMap type (#1037)

packages/types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/types",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -32,7 +32,7 @@
     "dependencies": {
         "@types/node": "*",
         "bignumber.js": "~4.1.0",
-        "ethereum-types": "^1.0.7"
+        "ethereum-types": "^1.0.8"
     },
     "publishConfig": {
         "access": "public"

packages/types/src/index.ts

@@ -111,12 +111,14 @@ export interface OrderStateValid {
     isValid: true;
     orderHash: string;
     orderRelevantState: OrderRelevantState;
+    transactionHash?: string;
 }
 
 export interface OrderStateInvalid {
     isValid: false;
     orderHash: string;
     error: ExchangeContractErrs;
+    transactionHash?: string;
 }
 
 export type OrderState = OrderStateValid | OrderStateInvalid;

packages/typescript-typings/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "2.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537541580,
         "version": "2.0.1",

packages/typescript-typings/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.2 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v2.0.1 - _September 21, 2018_
 
     * Dependencies updated

packages/typescript-typings/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/typescript-typings",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -26,7 +26,7 @@
         "@types/bn.js": "^4.11.0",
         "@types/react": "*",
         "bignumber.js": "~4.1.0",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "popper.js": "1.14.3"
     },
     "devDependencies": {

packages/utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "1.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1537875740,
         "version": "1.0.10",

packages/utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.11 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v1.0.10 - _September 25, 2018_
 
     * Dependencies updated

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/utils",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,13 +41,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
         "@types/node": "*",
         "abortcontroller-polyfill": "^1.1.9",
         "bignumber.js": "~4.1.0",
         "detect-node": "2.0.3",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
         "isomorphic-fetch": "^2.2.1",

packages/web3-wrapper/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1537907159,
+        "version": "3.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "3.0.0",
         "changes": [
@@ -6,6 +15,11 @@
                 "note":
                     "Rename `getBlockAsync` to `getBlockIfExistsAsync` and rather then throw if the requested block wasn't found, return undefined.",
                 "pr": 1082
+            },
+            {
+                "note":
+                    "Expose `sendRawPayloadAsync` so one can easily extend `Web3Wrapper` with their own custom JSON RPC calls",
+                "pr": 1080
             }
         ],
         "timestamp": 1537875740

packages/web3-wrapper/CHANGELOG.md

@@ -5,9 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.1 - _September 25, 2018_
+
+    * Dependencies updated
+
 ## v3.0.0 - _September 25, 2018_
 
     * Rename `getBlockAsync` to `getBlockIfExistsAsync` and rather then throw if the requested block wasn't found, return undefined. (#1082)
+    * Expose `sendRawPayloadAsync` so one can easily extend `Web3Wrapper` with their own custom JSON RPC calls (#1080)
 
 ## v2.0.3 - _September 21, 2018_
 

packages/web3-wrapper/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/web3-wrapper",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -53,11 +53,11 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.10",
+        "@0xproject/assert": "^1.0.11",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-util": "^5.1.1",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"

packages/web3-wrapper/src/web3_wrapper.ts

@@ -193,7 +193,7 @@ export class Web3Wrapper {
      * @returns Ethereum node's version string
      */
     public async getNodeVersionAsync(): Promise<string> {
-        const nodeVersion = await this._sendRawPayloadAsync<string>({ method: 'web3_clientVersion' });
+        const nodeVersion = await this.sendRawPayloadAsync<string>({ method: 'web3_clientVersion' });
         return nodeVersion;
     }
     /**
@@ -201,7 +201,7 @@ export class Web3Wrapper {
      * @returns The network id
      */
     public async getNetworkIdAsync(): Promise<number> {
-        const networkIdStr = await this._sendRawPayloadAsync<string>({ method: 'net_version' });
+        const networkIdStr = await this.sendRawPayloadAsync<string>({ method: 'net_version' });
         const networkId = _.parseInt(networkIdStr);
         return networkId;
     }
@@ -212,7 +212,7 @@ export class Web3Wrapper {
      */
     public async getTransactionReceiptAsync(txHash: string): Promise<TransactionReceipt> {
         assert.isHexString('txHash', txHash);
-        const transactionReceipt = await this._sendRawPayloadAsync<TransactionReceipt>({
+        const transactionReceipt = await this.sendRawPayloadAsync<TransactionReceipt>({
             method: 'eth_getTransactionReceipt',
             params: [txHash],
         });
@@ -228,7 +228,7 @@ export class Web3Wrapper {
      */
     public async getTransactionByHashAsync(txHash: string): Promise<Transaction> {
         assert.isHexString('txHash', txHash);
-        const transaction = await this._sendRawPayloadAsync<Transaction>({
+        const transaction = await this.sendRawPayloadAsync<Transaction>({
             method: 'eth_getTransactionByHash',
             params: [txHash],
         });
@@ -247,7 +247,7 @@ export class Web3Wrapper {
         }
         const marshalledDefaultBlock = marshaller.marshalBlockParam(defaultBlock);
         const encodedOwner = marshaller.marshalAddress(owner);
-        const balanceInWei = await this._sendRawPayloadAsync<string>({
+        const balanceInWei = await this.sendRawPayloadAsync<string>({
             method: 'eth_getBalance',
             params: [encodedOwner, marshalledDefaultBlock],
         });
@@ -279,7 +279,7 @@ export class Web3Wrapper {
         }
         const marshalledDefaultBlock = marshaller.marshalBlockParam(defaultBlock);
         const encodedAddress = marshaller.marshalAddress(address);
-        const code = await this._sendRawPayloadAsync<string>({
+        const code = await this.sendRawPayloadAsync<string>({
             method: 'eth_getCode',
             params: [encodedAddress, marshalledDefaultBlock],
         });
@@ -293,7 +293,7 @@ export class Web3Wrapper {
      */
     public async getTransactionTraceAsync(txHash: string, traceParams: TraceParams): Promise<TransactionTrace> {
         assert.isHexString('txHash', txHash);
-        const trace = await this._sendRawPayloadAsync<TransactionTrace>({
+        const trace = await this.sendRawPayloadAsync<TransactionTrace>({
             method: 'debug_traceTransaction',
             params: [txHash, traceParams],
         });
@@ -308,7 +308,7 @@ export class Web3Wrapper {
     public async signMessageAsync(address: string, message: string): Promise<string> {
         assert.isETHAddressHex('address', address);
         assert.isString('message', message); // TODO: Should this be stricter? Hex string?
-        const signData = await this._sendRawPayloadAsync<string>({
+        const signData = await this.sendRawPayloadAsync<string>({
             method: 'eth_sign',
             params: [address, message],
         });
@@ -319,7 +319,7 @@ export class Web3Wrapper {
      * @returns Block number
      */
     public async getBlockNumberAsync(): Promise<number> {
-        const blockNumberHex = await this._sendRawPayloadAsync<string>({
+        const blockNumberHex = await this.sendRawPayloadAsync<string>({
             method: 'eth_blockNumber',
             params: [],
         });
@@ -339,7 +339,7 @@ export class Web3Wrapper {
         const encodedBlockParam = marshaller.marshalBlockParam(blockParam);
         const method = utils.isHexStrict(blockParam) ? 'eth_getBlockByHash' : 'eth_getBlockByNumber';
         const shouldIncludeTransactionData = false;
-        const blockWithoutTransactionDataWithHexValuesOrNull = await this._sendRawPayloadAsync<
+        const blockWithoutTransactionDataWithHexValuesOrNull = await this.sendRawPayloadAsync<
             BlockWithoutTransactionDataRPC
         >({
             method,
@@ -366,7 +366,7 @@ export class Web3Wrapper {
         }
         const method = utils.isHexStrict(blockParam) ? 'eth_getBlockByHash' : 'eth_getBlockByNumber';
         const shouldIncludeTransactionData = true;
-        const blockWithTransactionDataWithHexValues = await this._sendRawPayloadAsync<BlockWithTransactionDataRPC>({
+        const blockWithTransactionDataWithHexValues = await this.sendRawPayloadAsync<BlockWithTransactionDataRPC>({
             method,
             params: [encodedBlockParam, shouldIncludeTransactionData],
         });
@@ -393,7 +393,7 @@ export class Web3Wrapper {
      * @returns Available user addresses
      */
     public async getAvailableAddressesAsync(): Promise<string[]> {
-        const addresses = await this._sendRawPayloadAsync<string>({
+        const addresses = await this.sendRawPayloadAsync<string>({
             method: 'eth_accounts',
             params: [],
         });
@@ -405,7 +405,7 @@ export class Web3Wrapper {
      * @returns The snapshot id. This can be used to revert to this snapshot
      */
     public async takeSnapshotAsync(): Promise<number> {
-        const snapshotId = Number(await this._sendRawPayloadAsync<string>({ method: 'evm_snapshot', params: [] }));
+        const snapshotId = Number(await this.sendRawPayloadAsync<string>({ method: 'evm_snapshot', params: [] }));
         return snapshotId;
     }
     /**
@@ -415,14 +415,14 @@ export class Web3Wrapper {
      */
     public async revertSnapshotAsync(snapshotId: number): Promise<boolean> {
         assert.isNumber('snapshotId', snapshotId);
-        const didRevert = await this._sendRawPayloadAsync<boolean>({ method: 'evm_revert', params: [snapshotId] });
+        const didRevert = await this.sendRawPayloadAsync<boolean>({ method: 'evm_revert', params: [snapshotId] });
         return didRevert;
     }
     /**
      * Mine a block on a TestRPC/Ganache local node
      */
     public async mineBlockAsync(): Promise<void> {
-        await this._sendRawPayloadAsync<string>({ method: 'evm_mine', params: [] });
+        await this.sendRawPayloadAsync<string>({ method: 'evm_mine', params: [] });
     }
     /**
      * Increase the next blocks timestamp on TestRPC/Ganache or Geth local node.
@@ -434,9 +434,9 @@ export class Web3Wrapper {
         // Detect Geth vs. Ganache and use appropriate endpoint.
         const version = await this.getNodeVersionAsync();
         if (_.includes(version, uniqueVersionIds.geth)) {
-            return this._sendRawPayloadAsync<number>({ method: 'debug_increaseTime', params: [timeDelta] });
+            return this.sendRawPayloadAsync<number>({ method: 'debug_increaseTime', params: [timeDelta] });
         } else if (_.includes(version, uniqueVersionIds.ganache)) {
-            return this._sendRawPayloadAsync<number>({ method: 'evm_increaseTime', params: [timeDelta] });
+            return this.sendRawPayloadAsync<number>({ method: 'evm_increaseTime', params: [timeDelta] });
         } else {
             throw new Error(`Unknown client version: ${version}`);
         }
@@ -447,6 +447,12 @@ export class Web3Wrapper {
      * @returns The corresponding log entries
      */
     public async getLogsAsync(filter: FilterObject): Promise<LogEntry[]> {
+        if (!_.isUndefined(filter.blockHash) && (!_.isUndefined(filter.fromBlock) || !_.isUndefined(filter.toBlock))) {
+            throw new Error(
+                `Cannot specify 'blockHash' as well as 'fromBlock'/'toBlock' in the filter supplied to 'getLogsAsync'`,
+            );
+        }
+
         let fromBlock = filter.fromBlock;
         if (_.isNumber(fromBlock)) {
             fromBlock = utils.numberToHex(fromBlock);
@@ -464,7 +470,7 @@ export class Web3Wrapper {
             method: 'eth_getLogs',
             params: [serializedFilter],
         };
-        const rawLogs = await this._sendRawPayloadAsync<RawLogEntry[]>(payload);
+        const rawLogs = await this.sendRawPayloadAsync<RawLogEntry[]>(payload);
         const formattedLogs = _.map(rawLogs, marshaller.unmarshalLog.bind(marshaller));
         return formattedLogs;
     }
@@ -480,7 +486,7 @@ export class Web3Wrapper {
             schemas.jsNumber,
         ]);
         const txDataHex = marshaller.marshalTxData(txData);
-        const gasHex = await this._sendRawPayloadAsync<string>({ method: 'eth_estimateGas', params: [txDataHex] });
+        const gasHex = await this.sendRawPayloadAsync<string>({ method: 'eth_estimateGas', params: [txDataHex] });
         const gas = utils.convertHexToNumber(gasHex);
         return gas;
     }
@@ -501,7 +507,7 @@ export class Web3Wrapper {
         }
         const marshalledDefaultBlock = marshaller.marshalBlockParam(defaultBlock);
         const callDataHex = marshaller.marshalCallData(callData);
-        const rawCallResult = await this._sendRawPayloadAsync<string>({
+        const rawCallResult = await this.sendRawPayloadAsync<string>({
             method: 'eth_call',
             params: [callDataHex, marshalledDefaultBlock],
         });
@@ -522,7 +528,7 @@ export class Web3Wrapper {
             schemas.jsNumber,
         ]);
         const txDataHex = marshaller.marshalTxData(txData);
-        const txHash = await this._sendRawPayloadAsync<string>({ method: 'eth_sendTransaction', params: [txDataHex] });
+        const txHash = await this.sendRawPayloadAsync<string>({ method: 'eth_sendTransaction', params: [txDataHex] });
         return txHash;
     }
     /**
@@ -632,7 +638,24 @@ export class Web3Wrapper {
      */
     public async setHeadAsync(blockNumber: number): Promise<void> {
         assert.isNumber('blockNumber', blockNumber);
-        await this._sendRawPayloadAsync<void>({ method: 'debug_setHead', params: [utils.numberToHex(blockNumber)] });
+        await this.sendRawPayloadAsync<void>({ method: 'debug_setHead', params: [utils.numberToHex(blockNumber)] });
+    }
+    /**
+     * Sends a raw Ethereum JSON RPC payload and returns the response's `result` key
+     * @param payload A partial JSON RPC payload. No need to include version, id, params (if none needed)
+     * @return The contents nested under the result key of the response body
+     */
+    public async sendRawPayloadAsync<A>(payload: Partial<JSONRPCRequestPayload>): Promise<A> {
+        const sendAsync = this._provider.sendAsync.bind(this._provider);
+        const payloadWithDefaults = {
+            id: this._jsonRpcRequestId++,
+            params: [],
+            jsonrpc: '2.0',
+            ...payload,
+        };
+        const response = await promisify<JSONRPCResponsePayload>(sendAsync)(payloadWithDefaults);
+        const result = response.result;
+        return result;
     }
     /**
      * Returns either NodeType.Geth or NodeType.Ganache depending on the type of
@@ -648,16 +671,4 @@ export class Web3Wrapper {
             throw new Error(`Unknown client version: ${version}`);
         }
     }
-    private async _sendRawPayloadAsync<A>(payload: Partial<JSONRPCRequestPayload>): Promise<A> {
-        const sendAsync = this._provider.sendAsync.bind(this._provider);
-        const payloadWithDefaults = {
-            id: this._jsonRpcRequestId++,
-            params: [],
-            jsonrpc: '2.0',
-            ...payload,
-        };
-        const response = await promisify<JSONRPCResponsePayload>(sendAsync)(payloadWithDefaults);
-        const result = response.result;
-        return result;
-    }
 } // tslint:disable-line:max-file-line-count

packages/website/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/website",
-    "version": "0.0.51",
+    "version": "0.0.52",
     "engines": {
         "node": ">=6.12"
     },
@@ -19,22 +19,22 @@
     "license": "Apache-2.0",
     "dependencies": {
         "0x.js": "^0.38.6",
-        "@0xproject/contract-wrappers": "^1.0.5",
+        "@0xproject/contract-wrappers": "^2.0.0",
-        "@0xproject/json-schemas": "^1.0.3",
+        "@0xproject/json-schemas": "^1.0.4",
-        "@0xproject/order-utils": "^1.0.4",
+        "@0xproject/order-utils": "^1.0.5",
-        "@0xproject/react-docs": "^1.0.10",
+        "@0xproject/react-docs": "^1.0.11",
-        "@0xproject/react-shared": "^1.0.11",
+        "@0xproject/react-shared": "^1.0.12",
-        "@0xproject/subproviders": "^2.0.4",
+        "@0xproject/subproviders": "^2.0.5",
-        "@0xproject/types": "^1.1.0",
+        "@0xproject/types": "^1.1.1",
-        "@0xproject/typescript-typings": "^2.0.1",
+        "@0xproject/typescript-typings": "^2.0.2",
-        "@0xproject/utils": "^1.0.10",
+        "@0xproject/utils": "^1.0.11",
-        "@0xproject/web3-wrapper": "^3.0.0",
+        "@0xproject/web3-wrapper": "^3.0.1",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
         "bowser": "^1.9.3",
         "deep-equal": "^1.0.1",
-        "ethereum-types": "^1.0.7",
+        "ethereum-types": "^1.0.8",
         "ethereumjs-util": "^5.1.1",
         "find-versions": "^2.0.0",
         "jsonschema": "^1.2.0",

yarn.lock

@@ -1356,9 +1356,9 @@ aes-js@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
 
-aes-js@^3.1.1:
+aes-js@^0.2.3:
-  version "3.1.1"
+  version "0.2.4"
-  resolved "https://registry.npmjs.org/aes-js/-/aes-js-3.1.1.tgz#89fd1f94ae51b4c72d62466adc1a7323ff52f072"
+  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d"
 
 ajv-keywords@^2.1.0:
   version "2.1.1"
@@ -2424,6 +2424,10 @@ balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
+base-x@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-1.1.0.tgz#42d3d717474f9ea02207f6d1aa1f426913eeb7ac"
+
 base-x@^3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.4.tgz#94c1788736da065edb1d68808869e357c977fa77"
@@ -2835,7 +2839,7 @@ browserslist@^2.1.2:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
-bs58@=4.0.1, bs58@^4.0.0:
+bs58@=4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
   dependencies:
@@ -2845,13 +2849,18 @@ bs58@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d"
 
-bs58check@^2.1.2:
+bs58@^3.1.0:
-  version "2.1.2"
+  version "3.1.0"
-  resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
+  resolved "https://registry.yarnpkg.com/bs58/-/bs58-3.1.0.tgz#d4c26388bf4804cac714141b1945aa47e5eb248e"
   dependencies:
-    bs58 "^4.0.0"
+    base-x "^1.1.0"
+
+bs58check@^1.0.8:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-1.3.4.tgz#c52540073749117714fa042c3047eb8f9151cbf8"
+  dependencies:
+    bs58 "^3.1.0"
     create-hash "^1.1.0"
-    safe-buffer "^5.1.2"
 
 btoa@1.1.2:
   version "1.1.2"
@@ -5203,6 +5212,14 @@ ethereumjs-blockstream@5.0.0:
     source-map-support "0.5.6"
     uuid "3.2.1"
 
+ethereumjs-blockstream@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ethereumjs-blockstream/-/ethereumjs-blockstream-6.0.0.tgz#79d726d1f358935eb65195e91d40344c31e87eff"
+  dependencies:
+    immutable "3.8.2"
+    source-map-support "0.5.6"
+    uuid "3.2.1"
+
 ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default:
   version "1.3.4"
   resolved "https://codeload.github.com/0xProject/ethereumjs-tx/tar.gz/29d1153889c389591f74b2401da8a0c6ad40f9a7"
@@ -5229,7 +5246,7 @@ ethereumjs-util@5.1.5, ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumj
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
-ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0:
+ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
   dependencies:
@@ -5283,18 +5300,17 @@ ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4:
     rustbn.js "~0.1.1"
     safe-buffer "^5.1.1"
 
-ethereumjs-wallet@~0.6.0:
+ethereumjs-wallet@0.6.0:
-  version "0.6.2"
+  version "0.6.0"
-  resolved "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
+  resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz#82763b1697ee7a796be7155da9dfb49b2f98cfdb"
   dependencies:
-    aes-js "^3.1.1"
+    aes-js "^0.2.3"
-    bs58check "^2.1.2"
+    bs58check "^1.0.8"
-    ethereumjs-util "^5.2.0"
+    ethereumjs-util "^4.4.0"
-    hdkey "^1.0.0"
+    hdkey "^0.7.0"
-    safe-buffer "^5.1.2"
     scrypt.js "^0.2.0"
-    utf8 "^3.0.0"
+    utf8 "^2.1.1"
-    uuid "^3.3.2"
+    uuid "^2.0.1"
 
 ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
   version "3.0.18"
@@ -6053,7 +6069,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
     ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
     ethereumjs-util "^5.2.0"
     ethereumjs-vm "2.3.5"
-    ethereumjs-wallet "~0.6.0"
+    ethereumjs-wallet "0.6.0"
     fake-merkle-patricia-tree "~1.0.1"
     heap "~0.2.6"
     js-scrypt "^0.2.0"
@@ -6735,21 +6751,13 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-hdkey@^0.7.1:
+hdkey@^0.7.0, hdkey@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632"
   dependencies:
     coinstring "^2.0.0"
     secp256k1 "^3.0.1"
 
-hdkey@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
-  dependencies:
-    coinstring "^2.0.0"
-    safe-buffer "^5.1.1"
-    secp256k1 "^3.0.1"
-
 he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -14242,10 +14250,6 @@ utf8@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
 
-utf8@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
-
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"