From 82d1412d456ee28d80597208a241a2b62f561837 Mon Sep 17 00:00:00 2001
From: Remco Bloemen <remco@wicked.ventures>
Date: Mon, 11 Jun 2018 09:19:52 +0200
Subject: Simplified handling of source < 32 edge case

---
 .../src/contracts/current/utils/LibMem/LibMem.sol  | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/contracts/src/contracts/current/utils/LibMem/LibMem.sol b/packages/contracts/src/contracts/current/utils/LibMem/LibMem.sol
index 6afb9973a..97fb5fb0f 100644
--- a/packages/contracts/src/contracts/current/utils/LibMem/LibMem.sol
+++ b/packages/contracts/src/contracts/current/utils/LibMem/LibMem.sol
@@ -80,9 +80,6 @@ contract LibMem
             //
             if (source > dest) {
                 assembly {
-                    // Record the total number of full words to copy
-                    let nWords := div(length, 32)
-
                     // We subtract 32 from `sEnd` and `dEnd` because it
                     // is easier to compare with in the loop, and these
                     // are also the addresses we need for copying the
@@ -98,20 +95,19 @@ contract LibMem
                     let last := mload(sEnd)
 
                     // Copy whole words front to back
-                    for {let i := 0} lt(i, nWords) {i := add(i, 1)} {
+                    // Note: the first check is always true,
+                    // this could have been a do-while loop.
+                    for {} lt(source, sEnd) {} {
                         mstore(dest, mload(source))
                         source := add(source, 32)
                         dest := add(dest, 32)
                     }
-
+                    
                     // Write the last 32 bytes
                     mstore(dEnd, last)
                 }
             } else {
                 assembly {
-                    // Record the total number of full words to copy
-                    let nWords := div(length, 32)
-
                     // We subtract 32 from `sEnd` and `dEnd` because those
                     // are the starting points when copying a word at the end.
                     length := sub(length, 32)
@@ -125,12 +121,18 @@ contract LibMem
                     let first := mload(source)
 
                     // Copy whole words back to front
-                    for {let i := 0} lt(i, nWords) {i := add(i, 1)} {
+                    // We use a signed comparisson here to allow dEnd to become
+                    // negative (happens when source and dest < 32). Valid
+                    // addresses in local memory will never be larger than
+                    // 2**255, so they can be safely re-interpreted as signed.
+                    // Note: the first check is always true,
+                    // this could have been a do-while loop.
+                    for {} slt(dest, dEnd) {} {
                         mstore(dEnd, mload(sEnd))
                         sEnd := sub(sEnd, 32)
                         dEnd := sub(dEnd, 32)
                     }
-
+                    
                     // Write the first 32 bytes
                     mstore(dest, first)
                 }
-- 
cgit v1.2.3


From 4a2e4d2b55c89c91cebf434570feee91ccc449fa Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Wed, 13 Jun 2018 23:09:36 -0400
Subject: Document contract_templates

---
 packages/contract_templates/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/contract_templates/README.md

diff --git a/packages/contract_templates/README.md b/packages/contract_templates/README.md
new file mode 100644
index 000000000..39aa2d2c0
--- /dev/null
+++ b/packages/contract_templates/README.md
@@ -0,0 +1,15 @@
+These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen).
+
+To successfully compile the generated TypeScript contract wrappers, you must:
+* Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/types @0xproject/utils @0xproject/web3-wrapper ethers lodash`
+* Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
+* Ensure that your TypeScript configuration includes the following:
+```
+"compilerOptions": {
+  "lib": ["ES2015"],
+  "typeRoots": [
+    "node_modules/@0xproject/typescript-typings/types",
+    "node_modules/@types"
+  ]
+}
+```
-- 
cgit v1.2.3


From 15a63c4bc5e05583d15910a562d524ca9b1e4b9d Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Wed, 13 Jun 2018 23:09:59 -0400
Subject: workaround for TypeScript trailing comma bug

before this change, TypeScript compilation of the generated contract
wrapper was giving me the following errors:

$ abi-gen --abis 'build/contracts/*.json' --out build/types --template contract_templates/contract.handlebars --partials 'contract_templates/partials/*.handlebars'
Found 7 partial templates
Found 1 ABI files
Processing: Migrations...
Created: build/types/migrations.ts
$ tsc
build/types/migrations.ts(81,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
build/types/migrations.ts(108,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
build/types/migrations.ts(130,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
build/types/migrations.ts(146,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
build/types/migrations.ts(173,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
build/types/migrations.ts(195,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.

Here is the generated code around the first error:

74:    public setCompleted = {
75:        async sendTransactionAsync(
76:            completed: BigNumber,
77:            txData: Partial<TxData> = {},
78:        ): Promise<string> {
79:            const self = this as any as MigrationsContract;
80:            const inputAbi = self._lookupAbi('setCompleted(uint256)').inputs;
81:            [completed,
82:    ] = BaseContract._formatABIDataItemList(inputAbi, [completed,
83:    ], BaseContract._bigNumberToString.bind(self));

All of the other errors are the same, a destructuring assignment with a
single element but with a trailing comma.

This is legal JavaScript but it is not allowed by the TypeScript
compiler, apparently per the bug described at
https://github.com/Microsoft/TypeScript/issues/24628 .

While awaiting the 3.0 version of TypeScript, it's a simple enough
change to have the template not append a trailing comma.
---
 packages/contract_templates/partials/params.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contract_templates/partials/params.handlebars b/packages/contract_templates/partials/params.handlebars
index ac5d4ae85..2d9bb8ed9 100644
--- a/packages/contract_templates/partials/params.handlebars
+++ b/packages/contract_templates/partials/params.handlebars
@@ -1,3 +1,3 @@
 {{#each inputs}}
-{{name}},
+{{name}}{{#if @last}}{{else}},{{/if}}
 {{/each}}
-- 
cgit v1.2.3


From f9e05d0cad9ab4624be2ce546e04aba109dec829 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Thu, 14 Jun 2018 09:38:18 -0400
Subject: remove mistaken comment

It must have been left over from when an abi-gen output was modified to
be the source of this template.
---
 packages/contract_templates/contract.handlebars | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 431359109..997088c8f 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -1,7 +1,3 @@
-/**
- * This file is auto-generated using abi-gen. Don't edit directly.
- * Templates can be found at https://github.com/0xProject/0x-monorepo/tree/development/packages/contract_templates.
- */
 // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
-- 
cgit v1.2.3


From 677e77d0ae3f0daf9c5c6d43f73a089c24d60ea6 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 14 Jun 2018 10:28:02 -0700
Subject: Add Portal v2 logging

---
 .../components/onboarding/portal_onboarding_flow.tsx  | 19 +++++++++++++++++--
 packages/website/ts/components/portal/portal.tsx      |  6 +++++-
 .../ts/components/relayer_index/relayer_grid_tile.tsx |  9 +++++++--
 .../components/relayer_index/relayer_top_tokens.tsx   |  7 ++++++-
 packages/website/ts/components/wallet/wallet.tsx      | 14 +++++++++++---
 .../website/ts/components/wallet/wrap_ether_item.tsx  | 18 ++++++++++++------
 packages/website/ts/containers/portal.ts              |  2 ++
 .../website/ts/containers/portal_onboarding_flow.ts   |  2 ++
 8 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
index bf52684d7..086cddc52 100644
--- a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
@@ -1,12 +1,15 @@
+import { constants as sharedConstants } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
 import { BigNumber } from '@0xproject/utils';
+import { analytics } from 'ts/utils/analytics';
 import { OnboardingFlow, Step } from 'ts/components/onboarding/onboarding_flow';
 import { ProviderType, TokenByAddress, TokenStateByAddress } from 'ts/types';
 import { utils } from 'ts/utils/utils';
 
 export interface PortalOnboardingFlowProps {
+    networkId: number;
     stepIndex: number;
     isRunning: boolean;
     userAddress: string;
@@ -34,8 +37,8 @@ export class PortalOnboardingFlow extends React.Component<PortalOnboardingFlowPr
                 steps={this._getSteps()}
                 stepIndex={this.props.stepIndex}
                 isRunning={this.props.isRunning}
-                onClose={this.props.updateIsRunning.bind(this, false)}
-                updateOnboardingStep={this.props.updateOnboardingStep}
+                onClose={this._closeOnboarding.bind(this)}
+                updateOnboardingStep={this._updateOnboardingStep.bind(this)}
             />
         );
     }
@@ -122,7 +125,19 @@ export class PortalOnboardingFlow extends React.Component<PortalOnboardingFlowPr
     }
     private _autoStartOnboardingIfShould(): void {
         if (!this.props.isRunning && !this.props.hasBeenSeen && this.props.blockchainIsLoaded) {
+            const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+            analytics.logEvent('Portal', 'Onboarding Started - Automatic', networkName, this.props.stepIndex);
             this.props.updateIsRunning(true);
         }
     }
+    private _updateOnboardingStep(stepIndex: number): void {
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+        this.props.updateOnboardingStep(stepIndex);
+        analytics.logEvent('Portal', 'Update Onboarding Step', networkName, stepIndex);
+    }
+    private _closeOnboarding(): void {
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+        this.props.updateIsRunning(false);
+        analytics.logEvent('Portal', 'Onboarding Closed', networkName, this.props.stepIndex);
+    }
 }
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index 1b3bf3dae..3e9f4ebb2 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, constants as sharedConstants, Styles } from '@0xproject/react-shared';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
@@ -6,6 +6,7 @@ import * as DocumentTitle from 'react-document-title';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { Blockchain } from 'ts/blockchain';
+import { analytics } from 'ts/utils/analytics';
 import { BlockchainErrDialog } from 'ts/components/dialogs/blockchain_err_dialog';
 import { LedgerConfigDialog } from 'ts/components/dialogs/ledger_config_dialog';
 import { PortalDisclaimerDialog } from 'ts/components/dialogs/portal_disclaimer_dialog';
@@ -71,6 +72,7 @@ export interface PortalProps {
     flashMessage?: string | React.ReactNode;
     lastForceTokenStateRefetch: number;
     translate: Translate;
+    portalOnboardingStep: number;
 }
 
 interface PortalState {
@@ -358,6 +360,8 @@ export class Portal extends React.Component<PortalProps, PortalState> {
     }
 
     private _startOnboarding(): void {
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+        analytics.logEvent('Portal', 'Onboarding Started - Manual', networkName, this.props.portalOnboardingStep);
         this.props.dispatcher.updatePortalOnboardingShowing(true);
     }
     private _renderWalletSection(): React.ReactNode {
diff --git a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
index fbb634164..7ff8208b0 100644
--- a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
@@ -1,7 +1,8 @@
-import { Styles } from '@0xproject/react-shared';
+import { constants as sharedConstants, Styles } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import { GridTile } from 'material-ui/GridList';
 import * as React from 'react';
+import { analytics } from 'ts/utils/analytics';
 
 import { TopTokens } from 'ts/components/relayer_index/relayer_top_tokens';
 import { Container } from 'ts/components/ui/container';
@@ -64,10 +65,14 @@ export const RelayerGridTile: React.StatelessComponent<RelayerGridTileProps> = (
     const link = props.relayerInfo.appUrl || props.relayerInfo.url;
     const topTokens = props.relayerInfo.topTokens;
     const weeklyTxnVolume = props.relayerInfo.weeklyTxnVolume;
+    let trackRelayerClick = (): void => undefined;
+    const networkName = sharedConstants.NETWORK_NAME_BY_ID[props.networkId];
+    const eventLabel = `${props.relayerInfo.name}-${networkName}`;
+    trackRelayerClick = () => analytics.logEvent('Portal', 'Relayer Click', eventLabel);
     return (
         <Island style={styles.root} Component={GridTile}>
             <div style={styles.innerDiv}>
-                <a href={link} target="_blank" style={{ textDecoration: 'none' }}>
+                <a href={link} target="_blank" style={{ textDecoration: 'none' }} onClick={trackRelayerClick}>
                     <ImgWithFallback
                         src={props.relayerInfo.headerImgUrl}
                         fallbackSrc={FALLBACK_IMG_SRC}
diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
index a5754180b..75335185a 100644
--- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
@@ -1,6 +1,7 @@
-import { colors, EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, constants as sharedConstants, EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
+import { analytics } from 'ts/utils/analytics';
 
 import { WebsiteBackendTokenInfo } from 'ts/types';
 
@@ -61,6 +62,9 @@ class TokenLink extends React.Component<TokenLinkProps, TokenLinkState> {
             cursor: 'pointer',
             opacity: this.state.isHovering ? 0.5 : 1,
         };
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+        const eventLabel = `${this.props.tokenInfo.symbol}-${networkName}`;
+        const trackTokenClick = () => analytics.logEvent('Portal', 'Token Click', eventLabel);
         return (
             <a
                 href={tokenLinkFromToken(this.props.tokenInfo, this.props.networkId)}
@@ -68,6 +72,7 @@ class TokenLink extends React.Component<TokenLinkProps, TokenLinkState> {
                 style={style}
                 onMouseEnter={this._onToggleHover.bind(this, true)}
                 onMouseLeave={this._onToggleHover.bind(this, false)}
+                onClick={trackTokenClick}
             >
                 {this.props.tokenInfo.symbol}
             </a>
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index f80be6313..237e86306 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -1,9 +1,10 @@
-import { EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared';
+import { constants as sharedConstants, EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared';
 import { BigNumber, errorUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
 import FloatingActionButton from 'material-ui/FloatingActionButton';
+
 import { ListItem } from 'material-ui/List';
 import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet';
 import ContentAdd from 'material-ui/svg-icons/content/add';
@@ -12,6 +13,7 @@ import * as React from 'react';
 import { Link } from 'react-router-dom';
 import firstBy = require('thenby');
 
+import { analytics } from 'ts/utils/analytics';
 import { Blockchain } from 'ts/blockchain';
 import { AllowanceToggle } from 'ts/components/inputs/allowance_toggle';
 import { Container } from 'ts/components/ui/container';
@@ -495,18 +497,24 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
             }
         }
         const onClick = isWrappedEtherDirectionOpen
-            ? this._closeWrappedEtherActionRow.bind(this)
+            ? this._closeWrappedEtherActionRow.bind(this, wrappedEtherDirection)
             : this._openWrappedEtherActionRow.bind(this, wrappedEtherDirection);
         return (
             <IconButton iconName={buttonIconName} labelText={buttonLabel} onClick={onClick} color={colors.mediumBlue} />
         );
     }
     private _openWrappedEtherActionRow(wrappedEtherDirection: Side): void {
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+        const action = wrappedEtherDirection === Side.Deposit ? 'Wallet - Wrap ETH Opened' : 'Wallet - Unwrap WETH Opened';
+        analytics.logEvent('Portal', action, networkName);
         this.setState({
             wrappedEtherDirection,
         });
     }
-    private _closeWrappedEtherActionRow(): void {
+    private _closeWrappedEtherActionRow(wrappedEtherDirection: Side): void {
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
+        const action = wrappedEtherDirection === Side.Deposit ? 'Wallet - Wrap ETH Closed' : 'Wallet - Unwrap WETH Closed';
+        analytics.logEvent('Portal', action, networkName);
         this.setState({
             wrappedEtherDirection: undefined,
         });
diff --git a/packages/website/ts/components/wallet/wrap_ether_item.tsx b/packages/website/ts/components/wallet/wrap_ether_item.tsx
index f65257142..1651595ca 100644
--- a/packages/website/ts/components/wallet/wrap_ether_item.tsx
+++ b/packages/website/ts/components/wallet/wrap_ether_item.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { constants as sharedConstants, Styles } from '@0xproject/react-shared';
 import { BigNumber, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
@@ -6,6 +6,7 @@ import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
 
 import { Blockchain } from 'ts/blockchain';
+import { analytics } from 'ts/utils/analytics';
 import { EthAmountInput } from 'ts/components/inputs/eth_amount_input';
 import { TokenAmountInput } from 'ts/components/inputs/token_amount_input';
 import { Dispatcher } from 'ts/redux/dispatcher';
@@ -186,6 +187,7 @@ export class WrapEtherItem extends React.Component<WrapEtherItemProps, WrapEther
         this.setState({
             isEthConversionHappening: true,
         });
+        const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
         try {
             const etherToken = this.props.etherToken;
             const amountToConvert = this.state.currentInputAmount;
@@ -193,10 +195,12 @@ export class WrapEtherItem extends React.Component<WrapEtherItemProps, WrapEther
                 await this.props.blockchain.convertEthToWrappedEthTokensAsync(etherToken.address, amountToConvert);
                 const ethAmount = Web3Wrapper.toUnitAmount(amountToConvert, constants.DECIMAL_PLACES_ETH);
                 this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
+                analytics.logEvent('Portal', 'Wrap ETH Successfully', networkName);
             } else {
                 await this.props.blockchain.convertWrappedEthTokensToEthAsync(etherToken.address, amountToConvert);
                 const tokenAmount = Web3Wrapper.toUnitAmount(amountToConvert, etherToken.decimals);
                 this.props.dispatcher.showFlashMessage(`Successfully unwrapped ${tokenAmount.toString()} WETH to ETH`);
+                analytics.logEvent('Portal', 'Unwrap WETH Successfully', networkName);
             }
             await this.props.refetchEthTokenStateAsync();
             this.props.onConversionSuccessful();
@@ -207,11 +211,13 @@ export class WrapEtherItem extends React.Component<WrapEtherItemProps, WrapEther
             } else if (!utils.didUserDenyWeb3Request(errMsg)) {
                 logUtils.log(`Unexpected error encountered: ${err}`);
                 logUtils.log(err.stack);
-                const errorMsg =
-                    this.props.direction === Side.Deposit
-                        ? 'Failed to wrap your ETH. Please try again.'
-                        : 'Failed to unwrap your WETH. Please try again.';
-                this.props.dispatcher.showFlashMessage(errorMsg);
+                if (this.props.direction === Side.Deposit) {
+                    this.props.dispatcher.showFlashMessage('Failed to wrap your ETH. Please try again.');
+                    analytics.logEvent('Portal', 'Wrap ETH Failed', networkName);
+                } else {
+                    this.props.dispatcher.showFlashMessage('Failed to unwrap your WETH. Please try again.');
+                    analytics.logEvent('Portal', 'Unwrap WETH Failed', networkName);
+                }
                 await errorReporter.reportAsync(err);
             }
         }
diff --git a/packages/website/ts/containers/portal.ts b/packages/website/ts/containers/portal.ts
index 5876e65f5..4f33ca1b1 100644
--- a/packages/website/ts/containers/portal.ts
+++ b/packages/website/ts/containers/portal.ts
@@ -28,6 +28,7 @@ interface ConnectedState {
     userSuppliedOrderCache: Order;
     flashMessage?: string | React.ReactNode;
     translate: Translate;
+    portalOnboardingStep: number;
 }
 
 interface ConnectedDispatch {
@@ -76,6 +77,7 @@ const mapStateToProps = (state: State, _ownProps: PortalComponentProps): Connect
         userSuppliedOrderCache: state.userSuppliedOrderCache,
         flashMessage: state.flashMessage,
         translate: state.translate,
+        portalOnboardingStep: state.portalOnboardingStep,
     };
 };
 
diff --git a/packages/website/ts/containers/portal_onboarding_flow.ts b/packages/website/ts/containers/portal_onboarding_flow.ts
index 4298ab275..67ee6bb28 100644
--- a/packages/website/ts/containers/portal_onboarding_flow.ts
+++ b/packages/website/ts/containers/portal_onboarding_flow.ts
@@ -12,6 +12,7 @@ interface PortalOnboardingFlowProps {
 }
 
 interface ConnectedState {
+    networkId: number;
     stepIndex: number;
     isRunning: boolean;
     userAddress: string;
@@ -29,6 +30,7 @@ interface ConnectedDispatch {
 }
 
 const mapStateToProps = (state: State, _ownProps: PortalOnboardingFlowProps): ConnectedState => ({
+    networkId: state.networkId,
     stepIndex: state.portalOnboardingStep,
     isRunning: state.isPortalOnboardingShowing,
     userAddress: state.userAddress,
-- 
cgit v1.2.3


From 81d6df925e430f2199ddef44b3ccd353e6c3c19b Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 14 Jun 2018 15:47:59 -0700
Subject: Run linter

---
 .../ts/components/onboarding/portal_onboarding_flow.tsx   |  2 +-
 packages/website/ts/components/portal/portal.tsx          |  2 +-
 .../ts/components/relayer_index/relayer_top_tokens.tsx    |  8 +++++++-
 packages/website/ts/components/wallet/wallet.tsx          | 15 +++++++++++----
 packages/website/ts/components/wallet/wrap_ether_item.tsx |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
index 086cddc52..e4df1ec36 100644
--- a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
@@ -3,9 +3,9 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import { BigNumber } from '@0xproject/utils';
-import { analytics } from 'ts/utils/analytics';
 import { OnboardingFlow, Step } from 'ts/components/onboarding/onboarding_flow';
 import { ProviderType, TokenByAddress, TokenStateByAddress } from 'ts/types';
+import { analytics } from 'ts/utils/analytics';
 import { utils } from 'ts/utils/utils';
 
 export interface PortalOnboardingFlowProps {
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index 3e9f4ebb2..9c89145ca 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -6,7 +6,6 @@ import * as DocumentTitle from 'react-document-title';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { Blockchain } from 'ts/blockchain';
-import { analytics } from 'ts/utils/analytics';
 import { BlockchainErrDialog } from 'ts/components/dialogs/blockchain_err_dialog';
 import { LedgerConfigDialog } from 'ts/components/dialogs/ledger_config_dialog';
 import { PortalDisclaimerDialog } from 'ts/components/dialogs/portal_disclaimer_dialog';
@@ -45,6 +44,7 @@ import {
     TokenVisibility,
     WebsitePaths,
 } from 'ts/types';
+import { analytics } from 'ts/utils/analytics';
 import { backendClient } from 'ts/utils/backend_client';
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
index 75335185a..b599e7123 100644
--- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
@@ -1,4 +1,10 @@
-import { colors, constants as sharedConstants, EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared';
+import {
+    colors,
+    constants as sharedConstants,
+    EtherscanLinkSuffixes,
+    Styles,
+    utils as sharedUtils,
+} from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { analytics } from 'ts/utils/analytics';
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 237e86306..42aa5af5d 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -1,4 +1,9 @@
-import { constants as sharedConstants, EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared';
+import {
+    constants as sharedConstants,
+    EtherscanLinkSuffixes,
+    Styles,
+    utils as sharedUtils,
+} from '@0xproject/react-shared';
 import { BigNumber, errorUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
@@ -13,7 +18,6 @@ import * as React from 'react';
 import { Link } from 'react-router-dom';
 import firstBy = require('thenby');
 
-import { analytics } from 'ts/utils/analytics';
 import { Blockchain } from 'ts/blockchain';
 import { AllowanceToggle } from 'ts/components/inputs/allowance_toggle';
 import { Container } from 'ts/components/ui/container';
@@ -37,6 +41,7 @@ import {
     TokenStateByAddress,
     WebsitePaths,
 } from 'ts/types';
+import { analytics } from 'ts/utils/analytics';
 import { constants } from 'ts/utils/constants';
 import { utils } from 'ts/utils/utils';
 import { styles as walletItemStyles } from 'ts/utils/wallet_item_styles';
@@ -505,7 +510,8 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
     }
     private _openWrappedEtherActionRow(wrappedEtherDirection: Side): void {
         const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
-        const action = wrappedEtherDirection === Side.Deposit ? 'Wallet - Wrap ETH Opened' : 'Wallet - Unwrap WETH Opened';
+        const action =
+            wrappedEtherDirection === Side.Deposit ? 'Wallet - Wrap ETH Opened' : 'Wallet - Unwrap WETH Opened';
         analytics.logEvent('Portal', action, networkName);
         this.setState({
             wrappedEtherDirection,
@@ -513,7 +519,8 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
     }
     private _closeWrappedEtherActionRow(wrappedEtherDirection: Side): void {
         const networkName = sharedConstants.NETWORK_NAME_BY_ID[this.props.networkId];
-        const action = wrappedEtherDirection === Side.Deposit ? 'Wallet - Wrap ETH Closed' : 'Wallet - Unwrap WETH Closed';
+        const action =
+            wrappedEtherDirection === Side.Deposit ? 'Wallet - Wrap ETH Closed' : 'Wallet - Unwrap WETH Closed';
         analytics.logEvent('Portal', action, networkName);
         this.setState({
             wrappedEtherDirection: undefined,
diff --git a/packages/website/ts/components/wallet/wrap_ether_item.tsx b/packages/website/ts/components/wallet/wrap_ether_item.tsx
index 1651595ca..d6135ce4d 100644
--- a/packages/website/ts/components/wallet/wrap_ether_item.tsx
+++ b/packages/website/ts/components/wallet/wrap_ether_item.tsx
@@ -6,12 +6,12 @@ import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
 
 import { Blockchain } from 'ts/blockchain';
-import { analytics } from 'ts/utils/analytics';
 import { EthAmountInput } from 'ts/components/inputs/eth_amount_input';
 import { TokenAmountInput } from 'ts/components/inputs/token_amount_input';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { colors } from 'ts/style/colors';
 import { BlockchainCallErrs, Side, Token } from 'ts/types';
+import { analytics } from 'ts/utils/analytics';
 import { constants } from 'ts/utils/constants';
 import { errorReporter } from 'ts/utils/error_reporter';
 import { utils } from 'ts/utils/utils';
-- 
cgit v1.2.3


From 8bac1706a119c0c4c02bbca77553976080f5ee20 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <gene@aumson.org>
Date: Fri, 15 Jun 2018 10:37:37 -0400
Subject: change @0xproject/types to ethereum-types

---
 packages/contract_templates/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contract_templates/README.md b/packages/contract_templates/README.md
index 39aa2d2c0..9546506c5 100644
--- a/packages/contract_templates/README.md
+++ b/packages/contract_templates/README.md
@@ -1,7 +1,7 @@
 These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen).
 
 To successfully compile the generated TypeScript contract wrappers, you must:
-* Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/types @0xproject/utils @0xproject/web3-wrapper ethers lodash`
+* Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/utils @0xproject/web3-wrapper ethereum-types ethers lodash`
 * Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
 * Ensure that your TypeScript configuration includes the following:
 ```
-- 
cgit v1.2.3


From ff95da411b8f7bb791e2ecfc57d2ba03dc591a52 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Mon, 4 Jun 2018 13:54:56 -0700
Subject: Split transfer impl and AssetProxyMixin

---
 .../current/protocol/AssetProxy/ERC20Proxy.sol     | 59 +---------------
 .../current/protocol/AssetProxy/ERC721Proxy.sol    | 42 +-----------
 .../protocol/AssetProxy/MixinERC20Transfer.sol     | 71 +++++++++++++++++++
 .../protocol/AssetProxy/MixinERC721Transfer.sol    | 79 ++++++++++++++++++++++
 4 files changed, 156 insertions(+), 95 deletions(-)
 create mode 100644 packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol
 create mode 100644 packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol

diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
index eeddb9707..7ca823d1f 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
@@ -22,69 +22,16 @@ pragma experimental ABIEncoderV2;
 import "../../utils/LibBytes/LibBytes.sol";
 import "./MixinAssetProxy.sol";
 import "./MixinAuthorizable.sol";
-import "../../tokens/ERC20Token/IERC20Token.sol";
+import "./MixinERC20Transfer.sol";
 
 contract ERC20Proxy is
-    LibBytes,
     MixinAssetProxy,
-    MixinAuthorizable
+    MixinAuthorizable,
+    MixinERC20Transfer
 {
-
     // Id of this proxy.
     uint8 constant PROXY_ID = 1;
 
-    /// @dev Internal version of `transferFrom`.
-    /// @param assetData Encoded byte array.
-    /// @param from Address to transfer asset from.
-    /// @param to Address to transfer asset to.
-    /// @param amount Amount of asset to transfer.
-    function transferFromInternal(
-        bytes memory assetData,
-        address from,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        // Decode asset data.
-        address token = readAddress(assetData, 0);
-
-        // Transfer tokens.
-        // We do a raw call so we can check the success separate
-        // from the return data.
-        bool success = token.call(abi.encodeWithSelector(
-            IERC20Token(token).transferFrom.selector,
-            from,
-            to,
-            amount
-        ));
-        require(
-            success,
-            TRANSFER_FAILED
-        );
-        
-        // Check return data.
-        // If there is no return data, we assume the token incorrectly
-        // does not return a bool. In this case we expect it to revert
-        // on failure, which was handled above.
-        // If the token does return data, we require that it is a single
-        // value that evaluates to true.
-        assembly {
-            if returndatasize {
-                success := 0
-                if eq(returndatasize, 32) {
-                    // First 64 bytes of memory are reserved scratch space
-                    returndatacopy(0, 0, 32)
-                    success := mload(0)
-                }
-            }
-        }
-        require(
-            success,
-            TRANSFER_FAILED
-        );
-    }
-
     /// @dev Gets the proxy id associated with the proxy address.
     /// @return Proxy id.
     function getProxyId()
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
index 861fac2c1..2b280add4 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
@@ -22,52 +22,16 @@ pragma experimental ABIEncoderV2;
 import "../../utils/LibBytes/LibBytes.sol";
 import "./MixinAssetProxy.sol";
 import "./MixinAuthorizable.sol";
-import "../../tokens/ERC721Token/ERC721Token.sol";
+import "./MixinERC721Transfer.sol";
 
 contract ERC721Proxy is
-    LibBytes,
     MixinAssetProxy,
-    MixinAuthorizable
+    MixinAuthorizable,
+    MixinERC721Transfer
 {
-
     // Id of this proxy.
     uint8 constant PROXY_ID = 2;
 
-    /// @dev Internal version of `transferFrom`.
-    /// @param assetData Encoded byte array.
-    /// @param from Address to transfer asset from.
-    /// @param to Address to transfer asset to.
-    /// @param amount Amount of asset to transfer.
-    function transferFromInternal(
-        bytes memory assetData,
-        address from,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        // There exists only 1 of each token.
-        require(
-            amount == 1,
-            INVALID_AMOUNT
-        );
-    
-        // Decode asset data.
-        (
-            address token,
-            uint256 tokenId,
-            bytes memory receiverData
-        ) = decodeERC721AssetData(assetData);
-
-        // Transfer token. Saves gas by calling safeTransferFrom only
-        // when there is receiverData present. Either succeeds or throws.
-        if (receiverData.length > 0) {
-            ERC721Token(token).safeTransferFrom(from, to, tokenId, receiverData);
-        } else {
-            ERC721Token(token).transferFrom(from, to, tokenId);
-        }
-    }
-
     /// @dev Gets the proxy id associated with the proxy address.
     /// @return Proxy id.
     function getProxyId()
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol
new file mode 100644
index 000000000..b0c32db59
--- /dev/null
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol
@@ -0,0 +1,71 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.4.24;
+pragma experimental ABIEncoderV2;
+
+import "../../utils/LibBytes/LibBytes.sol";
+import "../../tokens/ERC20Token/IERC20Token.sol";
+
+contract MixinERC20Transfer is
+    LibBytes
+{
+    // Id of this proxy.
+    uint8 constant PROXY_ID = 1;
+    // Revert reasons
+    string constant INVALID_METADATA_LENGTH = "Metadata must have a length of 21.";
+    string constant TRANSFER_FAILED = "Transfer failed.";
+    string constant PROXY_ID_MISMATCH = "Proxy id in metadata does not match this proxy id.";
+
+    /// @dev Internal version of `transferFrom`.
+    /// @param assetMetadata Encoded byte array.
+    /// @param from Address to transfer asset from.
+    /// @param to Address to transfer asset to.
+    /// @param amount Amount of asset to transfer.
+    function transferFromInternal(
+        bytes memory assetMetadata,
+        address from,
+        address to,
+        uint256 amount
+    )
+        internal
+    {
+        // Data must be intended for this proxy.
+        uint256 length = assetMetadata.length;
+
+        require(
+            length == 21,
+            INVALID_METADATA_LENGTH
+        );
+
+        require(
+            uint8(assetMetadata[length - 1]) == PROXY_ID,
+            PROXY_ID_MISMATCH
+        );
+
+        // Decode metadata.
+        address token = readAddress(assetMetadata, 0);
+
+        // Transfer tokens.
+        bool success = IERC20Token(token).transferFrom(from, to, amount);
+        require(
+            success == true,
+            TRANSFER_FAILED
+        );
+    }
+}
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
new file mode 100644
index 000000000..bbb807956
--- /dev/null
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
@@ -0,0 +1,79 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.4.24;
+pragma experimental ABIEncoderV2;
+
+import "../../utils/LibBytes/LibBytes.sol";
+import "../../tokens/ERC721Token/ERC721Token.sol";
+
+contract MixinERC721Transfer is
+    LibBytes
+{
+
+    // Id of this proxy.
+    uint8 constant PROXY_ID = 2;
+
+    // Revert reasons
+    string constant INVALID_TRANSFER_AMOUNT = "Transfer amount must equal 1.";
+    string constant INVALID_METADATA_LENGTH = "Metadata must have a length of 53.";
+    string constant PROXY_ID_MISMATCH = "Proxy id in metadata does not match this proxy id.";
+
+    /// @dev Internal version of `transferFrom`.
+    /// @param assetMetadata Encoded byte array.
+    /// @param from Address to transfer asset from.
+    /// @param to Address to transfer asset to.
+    /// @param amount Amount of asset to transfer.
+    function transferFromInternal(
+        bytes memory assetMetadata,
+        address from,
+        address to,
+        uint256 amount
+    )
+        internal
+    {
+        // Data must be intended for this proxy.
+        uint256 length = assetMetadata.length;
+
+        require(
+            length == 53,
+            INVALID_METADATA_LENGTH
+        );
+
+        require(
+            uint8(assetMetadata[length - 1]) == PROXY_ID,
+            PROXY_ID_MISMATCH
+        );
+
+        // There exists only 1 of each token.
+        require(
+            amount == 1,
+            INVALID_TRANSFER_AMOUNT
+        );
+
+        // Decode metadata
+        address token = readAddress(assetMetadata, 0);
+        uint256 tokenId = readUint256(assetMetadata, 20);
+
+        // Transfer token.
+        // Either succeeds or throws.
+        // @TODO: Call safeTransferFrom if there is additional
+        //        data stored in `assetMetadata`.
+        ERC721Token(token).transferFrom(from, to, tokenId);
+    }
+}
-- 
cgit v1.2.3


From 96c90e6295315802aaad1b80e5a31e4cef886675 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Mon, 18 Jun 2018 16:19:45 +1000
Subject: Rebase with latest removing PROXY_ID from transfer

---
 .../current/protocol/AssetProxy/ERC721Proxy.sol    | 30 --------
 .../protocol/AssetProxy/MixinERC20Transfer.sol     | 62 +++++++++-------
 .../protocol/AssetProxy/MixinERC721Transfer.sol    | 85 +++++++++++++---------
 .../AssetProxy/libs/LibAssetProxyErrors.sol        |  4 -
 .../protocol/AssetProxy/libs/LibTransferErrors.sol | 25 +++++++
 5 files changed, 111 insertions(+), 95 deletions(-)
 create mode 100644 packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibTransferErrors.sol

diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
index 2b280add4..7ff25aea3 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
@@ -41,34 +41,4 @@ contract ERC721Proxy is
     {
         return PROXY_ID;
     }
-
-    /// @dev Decodes ERC721 Asset data.
-    /// @param assetData Encoded byte array.
-    /// @return proxyId Intended ERC721 proxy id.
-    /// @return token ERC721 token address.
-    /// @return tokenId ERC721 token id.
-    /// @return receiverData Additional data with no specific format, which
-    ///                      is passed to the receiving contract's onERC721Received.
-    function decodeERC721AssetData(bytes memory assetData)
-        internal
-        pure
-        returns (
-            address token,
-            uint256 tokenId,
-            bytes memory receiverData
-        )
-    {
-        // Decode asset data.
-        token = readAddress(assetData, 0);
-        tokenId = readUint256(assetData, 20);
-        if (assetData.length > 52) {
-            receiverData = readBytes(assetData, 52);
-        }
-
-        return (
-            token,
-            tokenId,
-            receiverData
-        );
-    }
 }
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol
index b0c32db59..4af39a00b 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC20Transfer.sol
@@ -21,50 +21,60 @@ pragma experimental ABIEncoderV2;
 
 import "../../utils/LibBytes/LibBytes.sol";
 import "../../tokens/ERC20Token/IERC20Token.sol";
+import "./libs/LibTransferErrors.sol";
 
 contract MixinERC20Transfer is
-    LibBytes
+    LibBytes,
+    LibTransferErrors
 {
-    // Id of this proxy.
-    uint8 constant PROXY_ID = 1;
-    // Revert reasons
-    string constant INVALID_METADATA_LENGTH = "Metadata must have a length of 21.";
-    string constant TRANSFER_FAILED = "Transfer failed.";
-    string constant PROXY_ID_MISMATCH = "Proxy id in metadata does not match this proxy id.";
-
     /// @dev Internal version of `transferFrom`.
-    /// @param assetMetadata Encoded byte array.
+    /// @param assetData Encoded byte array.
     /// @param from Address to transfer asset from.
     /// @param to Address to transfer asset to.
     /// @param amount Amount of asset to transfer.
     function transferFromInternal(
-        bytes memory assetMetadata,
+        bytes memory assetData,
         address from,
         address to,
         uint256 amount
     )
         internal
     {
-        // Data must be intended for this proxy.
-        uint256 length = assetMetadata.length;
-
-        require(
-            length == 21,
-            INVALID_METADATA_LENGTH
-        );
+        // Decode asset data.
+        address token = readAddress(assetData, 0);
 
+        // Transfer tokens.
+        // We do a raw call so we can check the success separate
+        // from the return data.
+        bool success = token.call(abi.encodeWithSelector(
+            IERC20Token(token).transferFrom.selector,
+            from,
+            to,
+            amount
+        ));
         require(
-            uint8(assetMetadata[length - 1]) == PROXY_ID,
-            PROXY_ID_MISMATCH
+            success,
+            TRANSFER_FAILED
         );
-
-        // Decode metadata.
-        address token = readAddress(assetMetadata, 0);
-
-        // Transfer tokens.
-        bool success = IERC20Token(token).transferFrom(from, to, amount);
+        
+        // Check return data.
+        // If there is no return data, we assume the token incorrectly
+        // does not return a bool. In this case we expect it to revert
+        // on failure, which was handled above.
+        // If the token does return data, we require that it is a single
+        // value that evaluates to true.
+        assembly {
+            if returndatasize {
+                success := 0
+                if eq(returndatasize, 32) {
+                    // First 64 bytes of memory are reserved scratch space
+                    returndatacopy(0, 0, 32)
+                    success := mload(0)
+                }
+            }
+        }
         require(
-            success == true,
+            success,
             TRANSFER_FAILED
         );
     }
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
index bbb807956..d09aba599 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinERC721Transfer.sol
@@ -21,59 +21,74 @@ pragma experimental ABIEncoderV2;
 
 import "../../utils/LibBytes/LibBytes.sol";
 import "../../tokens/ERC721Token/ERC721Token.sol";
+import "./libs/LibTransferErrors.sol";
 
 contract MixinERC721Transfer is
-    LibBytes
+    LibBytes,
+    LibTransferErrors
 {
-
-    // Id of this proxy.
-    uint8 constant PROXY_ID = 2;
-
-    // Revert reasons
-    string constant INVALID_TRANSFER_AMOUNT = "Transfer amount must equal 1.";
-    string constant INVALID_METADATA_LENGTH = "Metadata must have a length of 53.";
-    string constant PROXY_ID_MISMATCH = "Proxy id in metadata does not match this proxy id.";
-
     /// @dev Internal version of `transferFrom`.
-    /// @param assetMetadata Encoded byte array.
+    /// @param assetData Encoded byte array.
     /// @param from Address to transfer asset from.
     /// @param to Address to transfer asset to.
     /// @param amount Amount of asset to transfer.
     function transferFromInternal(
-        bytes memory assetMetadata,
+        bytes memory assetData,
         address from,
         address to,
         uint256 amount
     )
         internal
     {
-        // Data must be intended for this proxy.
-        uint256 length = assetMetadata.length;
-
-        require(
-            length == 53,
-            INVALID_METADATA_LENGTH
-        );
-
-        require(
-            uint8(assetMetadata[length - 1]) == PROXY_ID,
-            PROXY_ID_MISMATCH
-        );
-
         // There exists only 1 of each token.
         require(
             amount == 1,
-            INVALID_TRANSFER_AMOUNT
+            INVALID_AMOUNT
         );
+    
+        // Decode asset data.
+        (
+            address token,
+            uint256 tokenId,
+            bytes memory receiverData
+        ) = decodeERC721AssetData(assetData);
+
+        // Transfer token. Saves gas by calling safeTransferFrom only
+        // when there is receiverData present. Either succeeds or throws.
+        if (receiverData.length > 0) {
+            ERC721Token(token).safeTransferFrom(from, to, tokenId, receiverData);
+        } else {
+            ERC721Token(token).transferFrom(from, to, tokenId);
+        }
+    }
 
-        // Decode metadata
-        address token = readAddress(assetMetadata, 0);
-        uint256 tokenId = readUint256(assetMetadata, 20);
-
-        // Transfer token.
-        // Either succeeds or throws.
-        // @TODO: Call safeTransferFrom if there is additional
-        //        data stored in `assetMetadata`.
-        ERC721Token(token).transferFrom(from, to, tokenId);
+    /// @dev Decodes ERC721 Asset data.
+    /// @param assetData Encoded byte array.
+    /// @return proxyId Intended ERC721 proxy id.
+    /// @return token ERC721 token address.
+    /// @return tokenId ERC721 token id.
+    /// @return receiverData Additional data with no specific format, which
+    ///                      is passed to the receiving contract's onERC721Received.
+    function decodeERC721AssetData(bytes memory assetData)
+        internal
+        pure
+        returns (
+            address token,
+            uint256 tokenId,
+            bytes memory receiverData
+        )
+    {
+        // Decode asset data.
+        token = readAddress(assetData, 0);
+        tokenId = readUint256(assetData, 20);
+        if (assetData.length > 52) {
+            receiverData = readBytes(assetData, 52);
+        }
+
+        return (
+            token,
+            tokenId,
+            receiverData
+        );
     }
 }
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
index 65bdacdb7..dca4f400f 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
@@ -25,8 +25,4 @@ contract LibAssetProxyErrors {
     string constant TARGET_ALREADY_AUTHORIZED = "TARGET_ALREADY_AUTHORIZED";      // Target address must not already be authorized.
     string constant INDEX_OUT_OF_BOUNDS = "INDEX_OUT_OF_BOUNDS";                  // Specified array index is out of bounds.
     string constant AUTHORIZED_ADDRESS_MISMATCH = "AUTHORIZED_ADDRESS_MISMATCH";  // Address at index does not match given target address.
-
-    /// AssetProxy errors ///
-    string constant INVALID_AMOUNT = "INVALID_AMOUNT";                            // Transfer amount must equal 1.
-    string constant TRANSFER_FAILED = "TRANSFER_FAILED";                          // Transfer failed.
 }
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibTransferErrors.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibTransferErrors.sol
new file mode 100644
index 000000000..ba784ab22
--- /dev/null
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibTransferErrors.sol
@@ -0,0 +1,25 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.4.24;
+
+contract LibTransferErrors {
+    /// Transfer errors ///
+    string constant INVALID_AMOUNT = "INVALID_AMOUNT";                            // Transfer amount must equal 1.
+    string constant TRANSFER_FAILED = "TRANSFER_FAILED";                          // Transfer failed.
+}
-- 
cgit v1.2.3


From f97e605bf6769a17d0352219f5fb1133f7cb2430 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Mon, 18 Jun 2018 16:55:52 -0700
Subject: Consolidate account state messaging logic

---
 .../website/ts/components/portal/drawer_menu.tsx   | 28 +++++++++++------
 .../ts/components/top_bar/provider_display.tsx     | 35 +++++++++------------
 packages/website/ts/components/top_bar/top_bar.tsx |  9 +++++-
 packages/website/ts/components/ui/identicon.tsx    | 36 ++++++++++++----------
 packages/website/ts/utils/utils.ts                 | 19 ++++++++++++
 5 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/packages/website/ts/components/portal/drawer_menu.tsx b/packages/website/ts/components/portal/drawer_menu.tsx
index 8ac2b9091..4bd07769f 100644
--- a/packages/website/ts/components/portal/drawer_menu.tsx
+++ b/packages/website/ts/components/portal/drawer_menu.tsx
@@ -2,10 +2,12 @@ import { Styles } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
+import { Blockchain } from 'ts/blockchain';
 import { defaultMenuItemEntries, Menu } from 'ts/components/portal/menu';
 import { Identicon } from 'ts/components/ui/identicon';
+import { Text } from 'ts/components/ui/text';
 import { colors } from 'ts/style/colors';
-import { WebsitePaths } from 'ts/types';
+import { ProviderType, WebsitePaths } from 'ts/types';
 import { utils } from 'ts/utils/utils';
 
 const IDENTICON_DIAMETER = 45;
@@ -25,14 +27,15 @@ const styles: Styles = {
         MozBorderRadius: BORDER_RADIUS,
         WebkitBorderRadius: BORDER_RADIUS,
     },
-    userAddress: {
-        color: colors.white,
-    },
 };
 
 export interface DrawerMenuProps {
     selectedPath?: string;
     userAddress?: string;
+    injectedProviderName: string;
+    providerType: ProviderType;
+    blockchain?: Blockchain;
+    blockchainIsLoaded: boolean;
 }
 export const DrawerMenu = (props: DrawerMenuProps) => {
     const relayerItemEntry = {
@@ -41,9 +44,15 @@ export const DrawerMenu = (props: DrawerMenuProps) => {
         iconName: 'zmdi-portable-wifi',
     };
     const menuItemEntries = _.concat(relayerItemEntry, defaultMenuItemEntries);
+    const displayMessage = utils.getReadableAccountState(
+        props.blockchainIsLoaded && !_.isUndefined(props.blockchain),
+        props.providerType,
+        props.injectedProviderName,
+        props.userAddress,
+    );
     return (
         <div style={styles.root}>
-            <Header userAddress={props.userAddress} />
+            <Header userAddress={props.userAddress} displayMessage={displayMessage} />
             <Menu selectedPath={props.selectedPath} menuItemEntries={menuItemEntries} />
         </div>
     );
@@ -51,17 +60,16 @@ export const DrawerMenu = (props: DrawerMenuProps) => {
 
 interface HeaderProps {
     userAddress?: string;
+    displayMessage: string;
 }
 const Header = (props: HeaderProps) => {
     return (
         <div className="flex flex-center py4">
             <div className="flex flex-column mx-auto">
                 <Identicon address={props.userAddress} diameter={IDENTICON_DIAMETER} style={styles.identicon} />
-                {!_.isUndefined(props.userAddress) && (
-                    <div className="pt2" style={styles.userAddress}>
-                        {utils.getAddressBeginAndEnd(props.userAddress)}
-                    </div>
-                )}
+                <Text className="pt2" fontColor={colors.white}>
+                    {props.displayMessage}
+                </Text>
             </div>
         </div>
     );
diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx
index cb7c9b483..0e9954350 100644
--- a/packages/website/ts/components/top_bar/provider_display.tsx
+++ b/packages/website/ts/components/top_bar/provider_display.tsx
@@ -6,8 +6,10 @@ import * as React from 'react';
 
 import { Blockchain } from 'ts/blockchain';
 import { ProviderPicker } from 'ts/components/top_bar/provider_picker';
+import { Container } from 'ts/components/ui/container';
 import { DropDown } from 'ts/components/ui/drop_down';
 import { Identicon } from 'ts/components/ui/identicon';
+import { Text } from 'ts/components/ui/text';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { colors } from 'ts/style/colors';
 import { ProviderType } from 'ts/types';
@@ -40,23 +42,16 @@ const styles: Styles = {
 
 export class ProviderDisplay extends React.Component<ProviderDisplayProps, ProviderDisplayState> {
     public render(): React.ReactNode {
-        const isAddressAvailable = !_.isEmpty(this.props.userAddress);
         const isExternallyInjectedProvider = utils.isExternallyInjected(
             this.props.providerType,
             this.props.injectedProviderName,
         );
-        let displayMessage;
-        if (!this._isBlockchainReady()) {
-            displayMessage = 'loading account';
-        } else if (isAddressAvailable) {
-            displayMessage = utils.getAddressBeginAndEnd(this.props.userAddress);
-            // tslint:disable-next-line: prefer-conditional-expression
-        } else if (isExternallyInjectedProvider) {
-            displayMessage = 'Account locked';
-        } else {
-            displayMessage = '0x0000...0000';
-        }
-
+        const displayMessage = utils.getReadableAccountState(
+            this._isBlockchainReady(),
+            this.props.providerType,
+            this.props.injectedProviderName,
+            this.props.userAddress,
+        );
         // If the "injected" provider is our fallback public node, then we want to
         // show the "connect a wallet" message instead of the providerName
         const injectedProviderName = isExternallyInjectedProvider
@@ -66,7 +61,7 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi
             this.props.providerType === ProviderType.Injected ? injectedProviderName : 'Ledger Nano S';
         const isProviderMetamask = providerTitle === constants.PROVIDER_NAME_METAMASK;
         const hoverActiveNode = (
-            <div className="flex right lg-pr0 md-pr2 sm-pr2 p1" style={styles.root}>
+            <div className="flex items-center p1" style={styles.root}>
                 <div>
                     {this._isBlockchainReady() ? (
                         <Identicon address={this.props.userAddress} diameter={ROOT_HEIGHT} />
@@ -74,13 +69,13 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi
                         <CircularProgress size={ROOT_HEIGHT} thickness={2} />
                     )}
                 </div>
-                <div style={{ marginLeft: 12, paddingTop: 3 }}>
-                    <div style={{ fontSize: 16, color: colors.darkGrey }}>{displayMessage}</div>
-                </div>
+                <Container marginLeft="12px" marginRight="12px">
+                    <Text fontSize="14px" fontColor={colors.darkGrey}>
+                        {displayMessage}
+                    </Text>
+                </Container>
                 {isProviderMetamask && (
-                    <div style={{ marginLeft: 16 }}>
-                        <img src="/images/metamask_icon.png" style={{ width: ROOT_HEIGHT, height: ROOT_HEIGHT }} />
-                    </div>
+                    <img src="/images/metamask_icon.png" style={{ width: ROOT_HEIGHT, height: ROOT_HEIGHT }} />
                 )}
             </div>
         );
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 1a69827a4..537edc7bb 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -297,7 +297,14 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 openSecondary={true}
                 onRequestChange={this._onMenuButtonClick.bind(this)}
             >
-                <DrawerMenu selectedPath={this.props.location.pathname} userAddress={this.props.userAddress} />
+                <DrawerMenu
+                    selectedPath={this.props.location.pathname}
+                    userAddress={this.props.userAddress}
+                    injectedProviderName={this.props.injectedProviderName}
+                    providerType={this.props.providerType}
+                    blockchainIsLoaded={this.props.blockchainIsLoaded}
+                    blockchain={this.props.blockchain}
+                />
             </Drawer>
         );
     }
diff --git a/packages/website/ts/components/ui/identicon.tsx b/packages/website/ts/components/ui/identicon.tsx
index 83c86a144..6a9b94e5b 100644
--- a/packages/website/ts/components/ui/identicon.tsx
+++ b/packages/website/ts/components/ui/identicon.tsx
@@ -1,7 +1,8 @@
 import blockies = require('blockies');
 import * as _ from 'lodash';
 import * as React from 'react';
-import { constants } from 'ts/utils/constants';
+
+import { colors } from 'ts/style/colors';
 
 interface IdenticonProps {
     address: string;
@@ -16,14 +17,9 @@ export class Identicon extends React.Component<IdenticonProps, IdenticonState> {
         style: {},
     };
     public render(): React.ReactNode {
-        let address = this.props.address;
-        if (_.isEmpty(address)) {
-            address = constants.NULL_ADDRESS;
-        }
+        const address = this.props.address;
         const diameter = this.props.diameter;
-        const icon = blockies({
-            seed: address.toLowerCase(),
-        });
+        const radius = diameter / 2;
         return (
             <div
                 className="circle mx-auto relative transitionFix"
@@ -34,14 +30,22 @@ export class Identicon extends React.Component<IdenticonProps, IdenticonState> {
                     ...this.props.style,
                 }}
             >
-                <img
-                    src={icon.toDataURL()}
-                    style={{
-                        width: diameter,
-                        height: diameter,
-                        imageRendering: 'pixelated',
-                    }}
-                />
+                {!_.isEmpty(address) ? (
+                    <img
+                        src={blockies({
+                            seed: address.toLowerCase(),
+                        }).toDataURL()}
+                        style={{
+                            width: diameter,
+                            height: diameter,
+                            imageRendering: 'pixelated',
+                        }}
+                    />
+                ) : (
+                    <svg height={diameter} width={diameter}>
+                        <circle cx={radius} cy={radius} r={radius} fill={colors.grey200} />
+                    </svg>
+                )}
             </div>
         );
     }
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 414361c1b..0bd3dbcfa 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -190,6 +190,25 @@ export const utils = {
         const truncatedAddress = `${address.substring(0, 6)}...${address.substr(-4)}`; // 0x3d5a...b287
         return truncatedAddress;
     },
+    getReadableAccountState(
+        isBlockchainReady: boolean,
+        providerType: ProviderType,
+        injectedProviderName: string,
+        userAddress?: string,
+    ): string {
+        const isAddressAvailable = !_.isUndefined(userAddress) && !_.isEmpty(userAddress);
+        const isExternallyInjectedProvider = utils.isExternallyInjected(providerType, injectedProviderName);
+        if (!isBlockchainReady) {
+            return 'Loading account';
+        } else if (isAddressAvailable) {
+            return utils.getAddressBeginAndEnd(userAddress);
+            // tslint:disable-next-line: prefer-conditional-expression
+        } else if (isExternallyInjectedProvider) {
+            return 'Account locked';
+        } else {
+            return 'No wallet detected';
+        }
+    },
     hasUniqueNameAndSymbol(tokens: Token[], token: Token): boolean {
         if (token.isRegistered) {
             return true; // Since it's registered, it is the canonical token
-- 
cgit v1.2.3


From 0bfcf79e79b762a9fb98e90b8e6310c781cfae97 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Mon, 18 Jun 2018 17:44:09 -0700
Subject: Increase number of columns in relayer grid for small screens

---
 packages/website/ts/components/relayer_index/relayer_index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/ts/components/relayer_index/relayer_index.tsx b/packages/website/ts/components/relayer_index/relayer_index.tsx
index 8dd4f0fbf..d565eb608 100644
--- a/packages/website/ts/components/relayer_index/relayer_index.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_index.tsx
@@ -39,7 +39,7 @@ const styles: Styles = {
 const CELL_HEIGHT = 290;
 const NUMBER_OF_COLUMNS_LARGE = 3;
 const NUMBER_OF_COLUMNS_MEDIUM = 2;
-const NUMBER_OF_COLUMNS_SMALL = 1;
+const NUMBER_OF_COLUMNS_SMALL = 2;
 const GRID_PADDING = 20;
 
 export class RelayerIndex extends React.Component<RelayerIndexProps, RelayerIndexState> {
-- 
cgit v1.2.3


From 3b73a0e26908a5c147cd377efb3dbe64b6febed4 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Mon, 18 Jun 2018 18:00:32 -0700
Subject: Check network state immediately instead of waiting for delay

---
 packages/website/ts/blockchain.ts         |  6 +--
 packages/website/ts/blockchain_watcher.ts | 89 ++++++++++++++++---------------
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 3ebdd1dee..46a4d6629 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -229,7 +229,7 @@ export class Blockchain {
             shouldPollUserAddress,
         );
         this._contractWrappers.setProvider(provider, this.networkId);
-        this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceState();
+        await this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceStateAsync();
         this._dispatcher.updateProviderType(ProviderType.Ledger);
     }
     public async updateProviderToInjectedAsync(): Promise<void> {
@@ -259,7 +259,7 @@ export class Blockchain {
         this._contractWrappers.setProvider(provider, this.networkId);
 
         await this.fetchTokenInformationAsync();
-        this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceState();
+        await this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceStateAsync();
         this._dispatcher.updateProviderType(ProviderType.Injected);
         delete this._ledgerSubprovider;
         delete this._cachedProvider;
@@ -816,7 +816,7 @@ export class Blockchain {
         this._userAddressIfExists = userAddresses[0];
         this._dispatcher.updateUserAddress(this._userAddressIfExists);
         await this.fetchTokenInformationAsync();
-        this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceState();
+        await this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceStateAsync();
         await this._rehydrateStoreWithContractEventsAsync();
     }
     private _updateProviderName(injectedWeb3: Web3): void {
diff --git a/packages/website/ts/blockchain_watcher.ts b/packages/website/ts/blockchain_watcher.ts
index 3890a9e57..c576db6ac 100644
--- a/packages/website/ts/blockchain_watcher.ts
+++ b/packages/website/ts/blockchain_watcher.ts
@@ -34,56 +34,15 @@ export class BlockchainWatcher {
     public updatePrevUserAddress(userAddress: string): void {
         this._prevUserAddressIfExists = userAddress;
     }
-    public startEmittingNetworkConnectionAndUserBalanceState(): void {
+    public async startEmittingNetworkConnectionAndUserBalanceStateAsync(): Promise<void> {
         if (!_.isUndefined(this._watchNetworkAndBalanceIntervalId)) {
             return; // we are already emitting the state
         }
-
-        let prevNodeVersion: string;
         this._prevUserEtherBalanceInWei = undefined;
         this._dispatcher.updateNetworkId(this._prevNetworkId);
+        await this._updateNetworkAndBalanceAsync();
         this._watchNetworkAndBalanceIntervalId = intervalUtils.setAsyncExcludingInterval(
-            async () => {
-                // Check for network state changes
-                let currentNetworkId;
-                try {
-                    currentNetworkId = await this._web3Wrapper.getNetworkIdAsync();
-                } catch (err) {
-                    // Noop
-                }
-                if (currentNetworkId !== this._prevNetworkId) {
-                    this._prevNetworkId = currentNetworkId;
-                    this._dispatcher.updateNetworkId(currentNetworkId);
-                }
-
-                // Check for node version changes
-                const currentNodeVersion = await this._web3Wrapper.getNodeVersionAsync();
-                if (currentNodeVersion !== prevNodeVersion) {
-                    prevNodeVersion = currentNodeVersion;
-                    this._dispatcher.updateNodeVersion(currentNodeVersion);
-                }
-
-                if (this._shouldPollUserAddress) {
-                    const addresses = await this._web3Wrapper.getAvailableAddressesAsync();
-                    const userAddressIfExists = addresses[0];
-                    // Update makerAddress on network change
-                    if (this._prevUserAddressIfExists !== userAddressIfExists) {
-                        this._prevUserAddressIfExists = userAddressIfExists;
-                        this._dispatcher.updateUserAddress(userAddressIfExists);
-                    }
-
-                    // Check for user ether balance changes
-                    if (!_.isUndefined(userAddressIfExists)) {
-                        await this._updateUserWeiBalanceAsync(userAddressIfExists);
-                    }
-                } else {
-                    // This logic is primarily for the Ledger, since we don't regularly poll for the address
-                    // we simply update the balance for the last fetched address.
-                    if (!_.isUndefined(this._prevUserAddressIfExists)) {
-                        await this._updateUserWeiBalanceAsync(this._prevUserAddressIfExists);
-                    }
-                }
-            },
+            this._updateNetworkAndBalanceAsync.bind(this),
             5000,
             (err: Error) => {
                 logUtils.log(`Watching network and balances failed: ${err.stack}`);
@@ -91,6 +50,48 @@ export class BlockchainWatcher {
             },
         );
     }
+    private async _updateNetworkAndBalanceAsync(): Promise<void> {
+        // Check for network state changes
+        let prevNodeVersion: string;
+        let currentNetworkId;
+        try {
+            currentNetworkId = await this._web3Wrapper.getNetworkIdAsync();
+        } catch (err) {
+            // Noop
+        }
+        if (currentNetworkId !== this._prevNetworkId) {
+            this._prevNetworkId = currentNetworkId;
+            this._dispatcher.updateNetworkId(currentNetworkId);
+        }
+
+        // Check for node version changes
+        const currentNodeVersion = await this._web3Wrapper.getNodeVersionAsync();
+        if (currentNodeVersion !== prevNodeVersion) {
+            prevNodeVersion = currentNodeVersion;
+            this._dispatcher.updateNodeVersion(currentNodeVersion);
+        }
+
+        if (this._shouldPollUserAddress) {
+            const addresses = await this._web3Wrapper.getAvailableAddressesAsync();
+            const userAddressIfExists = addresses[0];
+            // Update makerAddress on network change
+            if (this._prevUserAddressIfExists !== userAddressIfExists) {
+                this._prevUserAddressIfExists = userAddressIfExists;
+                this._dispatcher.updateUserAddress(userAddressIfExists);
+            }
+
+            // Check for user ether balance changes
+            if (!_.isUndefined(userAddressIfExists)) {
+                await this._updateUserWeiBalanceAsync(userAddressIfExists);
+            }
+        } else {
+            // This logic is primarily for the Ledger, since we don't regularly poll for the address
+            // we simply update the balance for the last fetched address.
+            if (!_.isUndefined(this._prevUserAddressIfExists)) {
+                await this._updateUserWeiBalanceAsync(this._prevUserAddressIfExists);
+            }
+        }
+    }
     private async _updateUserWeiBalanceAsync(userAddress: string): Promise<void> {
         const balanceInWei = await this._web3Wrapper.getBalanceInWeiAsync(userAddress);
         if (_.isUndefined(this._prevUserEtherBalanceInWei) || !balanceInWei.eq(this._prevUserEtherBalanceInWei)) {
-- 
cgit v1.2.3


From 2a4456b9cae6515d0210e3a2aa4b511c0262849c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 10:48:00 +0200
Subject: Update CHANGELOG's with publishes performed on development branch

---
 packages/0x.js/CHANGELOG.json              | 36 +++++++++++++++
 packages/0x.js/CHANGELOG.md                | 18 +++++++-
 packages/abi-gen/CHANGELOG.json            | 18 ++++++++
 packages/abi-gen/CHANGELOG.md              | 10 ++++-
 packages/assert/CHANGELOG.json             | 18 ++++++++
 packages/assert/CHANGELOG.md               | 10 ++++-
 packages/base-contract/CHANGELOG.json      | 19 ++++++++
 packages/base-contract/CHANGELOG.md        | 10 ++++-
 packages/connect/CHANGELOG.json            | 18 ++++++++
 packages/connect/CHANGELOG.md              | 10 ++++-
 packages/contract-wrappers/CHANGELOG.json  | 12 ++++-
 packages/contract-wrappers/CHANGELOG.md    | 12 +++++
 packages/dev-utils/CHANGELOG.json          |  9 ++++
 packages/dev-utils/CHANGELOG.md            | 10 ++++-
 packages/fill-scenarios/CHANGELOG.json     | 15 +++++--
 packages/fill-scenarios/CHANGELOG.md       |  8 ++++
 packages/json-schemas/CHANGELOG.json       |  9 ++++
 packages/json-schemas/CHANGELOG.md         | 10 ++++-
 packages/migrations/CHANGELOG.json         |  9 ++++
 packages/migrations/CHANGELOG.md           | 10 ++++-
 packages/monorepo-scripts/CHANGELOG.json   | 10 +++++
 packages/monorepo-scripts/CHANGELOG.md     |  8 ++++
 packages/order-utils/CHANGELOG.json        | 11 ++---
 packages/order-utils/CHANGELOG.md          | 10 ++++-
 packages/order-watcher/CHANGELOG.json      | 36 +++++++++++++++
 packages/order-watcher/CHANGELOG.md        | 16 +++++++
 packages/react-docs/CHANGELOG.json         | 18 ++++++++
 packages/react-docs/CHANGELOG.md           | 10 ++++-
 packages/react-shared/CHANGELOG.json       | 12 ++++-
 packages/react-shared/CHANGELOG.md         | 10 ++++-
 packages/sol-compiler/CHANGELOG.json       |  9 ++++
 packages/sol-compiler/CHANGELOG.md         | 10 ++++-
 packages/sol-cov/CHANGELOG.json            | 71 +++---------------------------
 packages/sol-cov/CHANGELOG.md              | 10 ++++-
 packages/sol-resolver/CHANGELOG.json       | 19 +++++---
 packages/sol-resolver/CHANGELOG.md         | 10 ++++-
 packages/sra-report/CHANGELOG.json         | 36 +++++++++++++++
 packages/sra-report/CHANGELOG.md           | 18 +++++++-
 packages/subproviders/CHANGELOG.json       |  9 ++++
 packages/subproviders/CHANGELOG.md         | 10 ++++-
 packages/tslint-config/CHANGELOG.json      | 21 +++++++++
 packages/tslint-config/CHANGELOG.md        |  8 ++++
 packages/types/CHANGELOG.json              |  9 ++++
 packages/types/CHANGELOG.md                | 10 ++++-
 packages/typescript-typings/CHANGELOG.json |  9 ++++
 packages/typescript-typings/CHANGELOG.md   | 10 ++++-
 packages/utils/CHANGELOG.json              | 19 ++++----
 packages/utils/CHANGELOG.md                | 10 ++++-
 packages/web3-wrapper/CHANGELOG.json       | 13 ++++++
 packages/web3-wrapper/CHANGELOG.md         | 10 ++++-
 50 files changed, 622 insertions(+), 111 deletions(-)

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 2a219180d..04439921e 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.38.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617805,
+        "version": "0.38.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617227,
+        "version": "0.38.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527616612,
+        "version": "0.38.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.38.0",
         "changes": [
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index f7ceaa552..3c7c76662 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,12 +5,28 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.38.4 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.38.3 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.38.2 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.38.1 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.38.0 - _May 22, 2018_
 
     * Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
     * Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
 
-## v0.37.2 - _May 4, 2018_
+## v0.37.2 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json
index 71cbaac1e..438b25649 100644
--- a/packages/abi-gen/CHANGELOG.json
+++ b/packages/abi-gen/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.3.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.3.1",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ],
+        "timestamp": 1527810075
+    },
     {
         "version": "0.3.0",
         "changes": [
diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md
index bcd807a3c..5167af522 100644
--- a/packages/abi-gen/CHANGELOG.md
+++ b/packages/abi-gen/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.3.2 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.3.1 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.3.0 - _May 22, 2018_
 
     * Properly export the executable binary (#588)
 
-## v0.2.13 - _May 4, 2018_
+## v0.2.13 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json
index 048763732..883d55f5b 100644
--- a/packages/assert/CHANGELOG.json
+++ b/packages/assert/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.2.11",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ],
+        "timestamp": 1527810075
+    },
     {
         "timestamp": 1527008270,
         "version": "0.2.10",
diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md
index 974ac5c42..98a83e81b 100644
--- a/packages/assert/CHANGELOG.md
+++ b/packages/assert/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.2.12 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.2.11 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.2.10 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.2.9 - _May 4, 2018_
+## v0.2.9 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json
index 04029576c..e5788b867 100644
--- a/packages/base-contract/CHANGELOG.json
+++ b/packages/base-contract/CHANGELOG.json
@@ -1,4 +1,23 @@
 [
+    {
+        "version": "0.3.4",
+        "changes": [
+            {
+                "note":
+                    "Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201"
+            }
+        ],
+        "timestamp": 1529397769
+    },
+    {
+        "timestamp": 1527810075,
+        "version": "0.3.3",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ]
+    },
     {
         "timestamp": 1527008270,
         "version": "0.3.2",
diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md
index 90ad066b5..a37a08584 100644
--- a/packages/base-contract/CHANGELOG.md
+++ b/packages/base-contract/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.3.4 - _June 19, 2018_
+
+    * Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201
+
+## v0.3.3 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.3.2 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.3.1 - _May 4, 2018_
+## v0.3.1 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json
index 58fcc635b..9bbb107cb 100644
--- a/packages/connect/CHANGELOG.json
+++ b/packages/connect/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.6.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527616612,
+        "version": "0.6.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1527008270,
         "version": "0.6.13",
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index acc6f33bd..1c44c2a60 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.6.15 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.6.14 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.6.13 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.6.12 - _May 4, 2018_
+## v0.6.12 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json
index 39b63178a..33d9bc4c0 100644
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,6 +1,16 @@
 [
     {
-        "version": "0.1.0",
+        "timestamp": 1529397769,
+        "version": "0.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617227,
+        "version": "0.0.4",
         "changes": [
             {
                 "note": "Expose 'abi' ContractAbi property on all contract wrappers"
diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md
index c8a0145d5..3f8eb921c 100644
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.5 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.4 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.0.3 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.0.2 - _May 22, 2018_
 
     * Dependencies updated
diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json
index a49535366..6c52bbf6b 100644
--- a/packages/dev-utils/CHANGELOG.json
+++ b/packages/dev-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.4.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.4.3",
         "changes": [
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 8e2f007d2..af4a800cc 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.4.4 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.4.3 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.4.2 - _May 22, 2018_
 
     * Move callbackErrorReporter over from 0x.js (#579)
 
-## v0.4.1 - _May 4, 2018_
+## v0.4.1 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json
index 0f78fab22..87b49c196 100644
--- a/packages/fill-scenarios/CHANGELOG.json
+++ b/packages/fill-scenarios/CHANGELOG.json
@@ -1,10 +1,19 @@
 [
     {
-        "version": "0.1.0",
+        "timestamp": 1529397769,
+        "version": "0.0.4",
         "changes": [
             {
-                "note": "Make fill-scenarios compatible with V2 of 0x protocol",
-                "pr": 656
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527616612,
+        "version": "0.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
             }
         ]
     },
diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md
index b32b8a289..e609fc88c 100644
--- a/packages/fill-scenarios/CHANGELOG.md
+++ b/packages/fill-scenarios/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.4 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.3 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.0.2 - _May 22, 2018_
 
     * Dependencies updated
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json
index 3399a452a..bb9cd3cd2 100644
--- a/packages/json-schemas/CHANGELOG.json
+++ b/packages/json-schemas/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.8.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.8.0",
         "changes": [
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index 0b35f2408..46a7c18cd 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.8.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.8.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.7.24 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.7.23 - _May 4, 2018_
+## v0.7.23 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json
index 50fe6885a..0eb67736e 100644
--- a/packages/migrations/CHANGELOG.json
+++ b/packages/migrations/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.0.7",
         "changes": [
diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md
index 78d915b6c..a5445ce80 100644
--- a/packages/migrations/CHANGELOG.md
+++ b/packages/migrations/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.8 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.7 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.0.6 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.0.5 - _May 4, 2018_
+## v0.0.5 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/monorepo-scripts/CHANGELOG.json b/packages/monorepo-scripts/CHANGELOG.json
index a41262ed2..a1dda0176 100644
--- a/packages/monorepo-scripts/CHANGELOG.json
+++ b/packages/monorepo-scripts/CHANGELOG.json
@@ -1,5 +1,15 @@
 [
     {
+        "timestamp": 1529397769,
+        "version": "0.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1529081166,
         "version": "0.2.0",
         "changes": [
             {
diff --git a/packages/monorepo-scripts/CHANGELOG.md b/packages/monorepo-scripts/CHANGELOG.md
index db5afd5af..7e5aadef0 100644
--- a/packages/monorepo-scripts/CHANGELOG.md
+++ b/packages/monorepo-scripts/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.2.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.2.0 - _June 15, 2018_
+
+    * Add `prepublish_checks` script (#650)
+
 ## v0.1.20 - _May 22, 2018_
 
     * Dependencies updated
diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index f3c54711f..6290eee0f 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -1,18 +1,19 @@
 [
     {
+        "timestamp": 1529397769,
+        "version": "0.0.7",
         "changes": [
             {
-                "note": "Export parseECSignature method",
-                "pr": 684
+                "note": "Dependencies updated"
             }
         ]
     },
     {
-        "version": "0.1.0",
+        "timestamp": 1527616612,
+        "version": "0.0.6",
         "changes": [
             {
-                "note": "Make order-utils compatible with V2 of 0x protocol",
-                "pr": 636
+                "note": "Dependencies updated"
             }
         ]
     },
diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md
index 5b10c13bc..81b66373a 100644
--- a/packages/order-utils/CHANGELOG.md
+++ b/packages/order-utils/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.7 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.6 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.0.5 - _May 22, 2018_
 
     * Add orderStateUtils, a module for computing order state needed to decide if an order is still valid
 
-## v0.0.4 - _May 4, 2018_
+## v0.0.4 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index dde78445a..4afd4b9b5 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617805,
+        "version": "0.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617227,
+        "version": "0.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527616612,
+        "version": "0.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1527008794,
         "version": "0.0.2",
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 999d62f44..5e216f90c 100644
--- a/packages/order-watcher/CHANGELOG.md
+++ b/packages/order-watcher/CHANGELOG.md
@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.6 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.5 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.0.4 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.0.3 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.0.2 - _May 22, 2018_
 
     * Dependencies updated
diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 32fa49264..30e48197d 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.0.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.0.13",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ],
+        "timestamp": 1527810075
+    },
     {
         "timestamp": 1527009133,
         "version": "0.0.12",
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index e46198f6c..fcbf3698b 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.14 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.13 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.0.12 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.0.11 - _May 4, 2018_
+## v0.0.11 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index 5227bbf72..deee2c6e6 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -1,7 +1,15 @@
 [
     {
-        "timestamp": 1527009133,
-        "version": "0.1.7",
+        "timestamp": 1529397769,
+        "version": "0.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.2.0",
         "changes": [
             {
                 "note": "Dependencies updated"
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index 68eac96cf..b28923eec 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.2.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.2.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.1.7 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.1.6 - _May 4, 2018_
+## v0.1.6 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index e0ebd3a2d..bb1a5f006 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.5.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.5.1",
         "changes": [
diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md
index ee9b53f4e..524a361de 100644
--- a/packages/sol-compiler/CHANGELOG.md
+++ b/packages/sol-compiler/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.5.2 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.5.1 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.5.0 - _May 22, 2018_
 
     * Properly export the executable binary (#588)
 
-## v0.4.3 - _May 4, 2018_
+## v0.4.3 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json
index 7e934ad6e..464a5a13c 100644
--- a/packages/sol-cov/CHANGELOG.json
+++ b/packages/sol-cov/CHANGELOG.json
@@ -1,81 +1,24 @@
 [
     {
-        "version": "0.2.0",
+        "timestamp": 1529397769,
+        "version": "0.1.1",
         "changes": [
             {
-                "note": "Fixed a bug causing RegExp to crash if contract code is longer that 32767 characters",
-                "pr": 675
-            },
-            {
-                "note": "Fixed a bug caused by Geth debug trace depth being 1-indexed",
-                "pr": 675
-            },
-            {
-                "note": "Fixed a bug when the tool crashed on empty traces",
-                "pr": 675
-            },
-            {
-                "note": "Use `BlockchainLifecycle` to support reverts on Geth",
-                "pr": 675
-            },
-            {
-                "note": "Add `ProfilerSubprovider` as a hacky way to profile code using coverage tools",
-                "pr": 675
-            },
-            {
-                "note": "Collect traces from `estimate_gas` calls",
-                "pr": 675
-            },
-            {
-                "note": "Fix a race condition caused by not awaiting the transaction before getting a trace",
-                "pr": 675
-            },
-            {
-                "note": "Add `start`/`stop` functionality to `CoverageSubprovider` and `ProfilerSubprovider`",
-                "pr": 675
-            },
-            {
-                "note": "Skip interface artifacts with a warning instead of failing",
-                "pr": 675
-            },
-            {
-                "note": "Fix solcVersion regex in parameter validation",
-                "pr": 690
-            },
-            {
-                "note": "Fix a bug when in TruffleArtifactsAdapter causing it to throw if compiler.json is not there",
-                "pr": 690
-            },
-            {
-                "note": "HUGE perf improvements",
-                "pr": 690
+                "note": "Dependencies updated"
             }
         ]
     },
     {
-        "timestamp": 1527009134,
         "version": "0.1.0",
         "changes": [
             {
-                "note": "Add artifact adapter as a parameter for CoverageSubprovider. Export AbstractArtifactAdapter",
-                "pr": 589
-            },
-            {
-                "note": "Implement SolCompilerArtifactAdapter and TruffleArtifactAdapter",
-                "pr": 589
-            },
-            {
-                "note": "Properly parse multi-level traces",
-                "pr": 589
-            },
-            {
-                "note": "Add support for solidity libraries",
-                "pr": 589
+                "note": "Incorrect publish that was unpublished"
             }
-        ]
+        ],
+        "timestamp": 1527810075
     },
     {
-        "timestamp": 1527009133,
+        "timestamp": 1527009134,
         "version": "0.0.11",
         "changes": [
             {
diff --git a/packages/sol-cov/CHANGELOG.md b/packages/sol-cov/CHANGELOG.md
index f0312d297..d8f7c5310 100644
--- a/packages/sol-cov/CHANGELOG.md
+++ b/packages/sol-cov/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.1.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.1.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.0.11 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.0.10 - _May 4, 2018_
+## v0.0.10 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json
index 895bd2104..4c4fcc25f 100644
--- a/packages/sol-resolver/CHANGELOG.json
+++ b/packages/sol-resolver/CHANGELOG.json
@@ -1,17 +1,22 @@
 [
     {
-        "version": "0.0.5",
+        "timestamp": 1529397769,
+        "version": "0.0.7",
         "changes": [
             {
-                "note": "Fix a bug in FsResolver where it tries to read directories as files",
-                "pr": 589
-            },
-            {
-                "note": "Fix a bug in NameResolver where it is not ignoring .sol files",
-                "pr": 589
+                "note": "Dependencies updated"
             }
         ]
     },
+    {
+        "version": "0.0.6",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ],
+        "timestamp": 1527810075
+    },
     {
         "timestamp": 1527009133,
         "version": "0.0.5",
diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md
index bd94b1b41..514121ee1 100644
--- a/packages/sol-resolver/CHANGELOG.md
+++ b/packages/sol-resolver/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.7 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.6 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.0.5 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.0.4 - _May 4, 2018_
+## v0.0.4 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sra-report/CHANGELOG.json b/packages/sra-report/CHANGELOG.json
index 015279157..d4ca1aebb 100644
--- a/packages/sra-report/CHANGELOG.json
+++ b/packages/sra-report/CHANGELOG.json
@@ -1,4 +1,40 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617805,
+        "version": "0.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617227,
+        "version": "0.1.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527616612,
+        "version": "0.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.1.0",
         "changes": [
diff --git a/packages/sra-report/CHANGELOG.md b/packages/sra-report/CHANGELOG.md
index 208a1e174..8acda5aa5 100644
--- a/packages/sra-report/CHANGELOG.md
+++ b/packages/sra-report/CHANGELOG.md
@@ -5,11 +5,27 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.1.4 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.1.3 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.1.2 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.1.1 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.1.0 - _May 22, 2018_
 
     * Properly export the executable binary (#588)
 
-## v0.0.14 - _May 4, 2018_
+## v0.0.14 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index d7fe5e330..65a74f7a8 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.10.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.10.3",
         "changes": [
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index 8c4990a7c..855524e4a 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.10.4 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.10.3 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.10.2 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.10.1 - _May 4, 2018_
+## v0.10.1 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 4868b3983..6ae195ae7 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,5 +1,26 @@
 [
     {
+<<<<<<< HEAD
+=======
+        "timestamp": 1529397769,
+        "version": "0.4.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.4.19",
+        "changes": [
+            {
+                "note": "Incorrect publish that was unpublished"
+            }
+        ],
+        "timestamp": 1527810075
+    },
+    {
+>>>>>>> 40a061a5... Updated CHANGELOGS
         "timestamp": 1527009133,
         "version": "0.4.18",
         "changes": [
diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md
index 56b65cadd..2a862f8e1 100644
--- a/packages/tslint-config/CHANGELOG.md
+++ b/packages/tslint-config/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.4.20 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.4.19 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.4.18 - _May 22, 2018_
 
     * Dependencies updated
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json
index 6acfbb98a..40197ab92 100644
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.8.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.8.0",
         "changes": [
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 68e5ed438..aa3ba5eab 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.8.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.8.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.7.0 - _May 22, 2018_
 
     * Moved ExchangeContractErrs, DoneCallback, Token, OrderRelevantState, OrderStateValid, OrderStateInvalid, OrderState, OrderAddresses and OrderValues types from 0x.js (#579)
 
-## v0.6.3 - _May 4, 2018_
+## v0.6.3 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json
index 555da22d1..5b5d5c31d 100644
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1529397769,
+        "version": "0.4.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "0.4.0",
         "changes": [
diff --git a/packages/typescript-typings/CHANGELOG.md b/packages/typescript-typings/CHANGELOG.md
index e12ce63f2..a34ff86e1 100644
--- a/packages/typescript-typings/CHANGELOG.md
+++ b/packages/typescript-typings/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.4.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.4.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.3.2 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.3.1 - _May 4, 2018_
+## v0.3.1 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json
index 339d73e05..ac54cc42c 100644
--- a/packages/utils/CHANGELOG.json
+++ b/packages/utils/CHANGELOG.json
@@ -1,27 +1,28 @@
 [
     {
-        "version": "0.6.3",
+        "timestamp": 1529397769,
+        "version": "0.7.1",
         "changes": [
             {
-                "note": "Added errorUtils.spawnSwitchErr"
+                "note": "Dependencies updated"
             }
         ]
     },
     {
-        "timestamp": 1527009133,
-        "version": "0.6.2",
+        "version": "0.7.0",
         "changes": [
             {
-                "note": "Dependencies updated"
+                "note": "Incorrect publish that was unpublished"
             }
-        ]
+        ],
+        "timestamp": 1527810075
     },
     {
-        "version": "0.7.0",
+        "timestamp": 1527009133,
+        "version": "0.6.2",
         "changes": [
             {
-                "note": "Add logUtils.warn",
-                "pr": 589
+                "note": "Dependencies updated"
             }
         ]
     },
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index 0c01bf4f1..60a575297 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.7.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.7.0 - _June 1, 2018_
+
+    * Incorrect publish that was unpublished
+
 ## v0.6.2 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.6.1 - _May 4, 2018_
+## v0.6.1 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index bd4bf06dd..1f1c8e2c0 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,5 +1,18 @@
 [
     {
+<<<<<<< HEAD
+=======
+        "timestamp": 1529397769,
+        "version": "0.7.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1528070400,
+>>>>>>> 40a061a5... Updated CHANGELOGS
         "version": "0.7.0",
         "changes": [
             {
diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md
index 4b8fb7bac..1ac36a316 100644
--- a/packages/web3-wrapper/CHANGELOG.md
+++ b/packages/web3-wrapper/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.7.1 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.7.0 - _June 4, 2018_
+
+    * Add default parameters when sending a raw payload
+
 ## v0.6.4 - _May 22, 2018_
 
     * Dependencies updated
 
-## v0.6.3 - _May 4, 2018_
+## v0.6.3 - _May 5, 2018_
 
     * Dependencies updated
 
-- 
cgit v1.2.3


From f2e0f1b2f180a783c1676120218712f50f4f93d7 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 11:32:55 +0200
Subject: Update all package versions to match latest published to NPM

---
 packages/0x.js/package.json              | 36 ++++++++++++++++----------------
 packages/abi-gen/package.json            | 10 ++++-----
 packages/assert/package.json             | 12 +++++------
 packages/base-contract/package.json      | 14 ++++++-------
 packages/connect/package.json            | 16 +++++++-------
 packages/contract-wrappers/package.json  | 36 ++++++++++++++++----------------
 packages/contracts/package.json          | 22 +++++++++----------
 packages/dev-utils/package.json          | 14 ++++++-------
 packages/ethereum-types/package.json     |  4 ++--
 packages/fill-scenarios/package.json     | 18 ++++++++--------
 packages/json-schemas/package.json       |  8 +++----
 packages/metacoin/package.json           | 24 ++++++++++-----------
 packages/migrations/package.json         | 22 +++++++++----------
 packages/monorepo-scripts/package.json   |  2 +-
 packages/order-utils/package.json        | 24 ++++++++++-----------
 packages/order-watcher/package.json      | 36 ++++++++++++++++----------------
 packages/react-docs-example/package.json |  6 +++---
 packages/react-docs/package.json         | 12 +++++------
 packages/react-shared/package.json       |  8 +++----
 packages/sol-compiler/package.json       | 20 +++++++++---------
 packages/sol-cov/package.json            | 18 ++++++++--------
 packages/sol-resolver/package.json       |  8 +++----
 packages/sra-report/package.json         | 20 +++++++++---------
 packages/subproviders/package.json       | 16 +++++++-------
 packages/testnet-faucets/package.json    | 10 ++++-----
 packages/tslint-config/package.json      |  4 ++--
 packages/types/package.json              |  4 ++--
 packages/typescript-typings/package.json |  4 ++--
 packages/utils/package.json              | 10 ++++-----
 packages/web3-wrapper/package.json       | 12 +++++------
 packages/website/package.json            | 18 ++++++++--------
 31 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 3df2a0e06..7a2c3c1a4 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "0.38.0",
+    "version": "0.38.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -69,12 +69,12 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/migrations": "^0.0.6",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/migrations": "^0.0.8",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -100,18 +100,18 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/base-contract": "^0.3.2",
-        "@0xproject/contract-wrappers": "^0.0.2",
-        "@0xproject/order-utils": "0.0.5",
-        "@0xproject/order-watcher": "^0.0.2",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/types": "0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/base-contract": "^0.3.4",
+        "@0xproject/contract-wrappers": "^0.0.5",
+        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/order-watcher": "^0.0.6",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index 19977fc86..9d3c6d00d 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -27,8 +27,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "ethereum-types": "^0.0.1",
         "chalk": "^2.3.0",
         "glob": "^7.1.2",
@@ -39,8 +39,8 @@
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/glob": "^5.0.33",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",
diff --git a/packages/assert/package.json b/packages/assert/package.json
index e9e3bec32..16e8849a7 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/assert",
-    "version": "0.2.10",
+    "version": "0.2.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -31,8 +31,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/valid-url": "^1.0.2",
@@ -48,9 +48,9 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "lodash": "^4.17.4",
         "valid-url": "^1.0.9"
     },
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index 595bca3a9..02825bb79 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "copyfiles": "^1.2.0",
@@ -44,10 +44,10 @@
     },
     "dependencies": {
         "ethereum-types": "^0.0.1",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
-        "ethers": "^3.0.15",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 6b5a5a7b0..86f7aeca2 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/connect",
-    "version": "0.6.13",
+    "version": "0.6.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,19 +51,19 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/types": "^0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.4",
         "query-string": "^5.0.1",
         "websocket": "^1.0.25"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/fetch-mock": "^5.12.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index d5d4bfbc8..5d2792f54 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/contract-wrappers",
-    "version": "0.0.2",
+    "version": "0.0.5",
     "description": "Smart TS wrappers for 0x smart contracts",
     "keywords": [
         "0xproject",
@@ -46,13 +46,13 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/migrations": "^0.0.6",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/migrations": "^0.0.8",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -77,19 +77,19 @@
         "web3-provider-engine": "^14.0.4"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/base-contract": "^0.3.2",
-        "@0xproject/fill-scenarios": "^0.0.2",
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/order-utils": "0.0.5",
-        "@0xproject/types": "0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/base-contract": "^0.3.4",
+        "@0xproject/fill-scenarios": "^0.0.4",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
         "ethereumjs-blockstream": "^2.0.6",
         "ethereumjs-util": "^5.1.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "js-sha3": "^0.7.0",
         "lodash": "^4.17.4",
         "uuid": "^3.1.0"
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 2495795dc..272bdcad9 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "contracts",
-    "version": "2.1.29",
+    "version": "2.1.33",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,11 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/tslint-config": "^0.4.20",
         "@0xproject/subproviders": "^0.10.1",
-        "@0xproject/sol-cov": "^0.0.11",
+        "@0xproject/sol-cov": "^0.1.1",
         "@types/lodash": "4.14.104",
         "@types/bn.js": "^4.11.0",
         "@types/node": "^8.0.53",
@@ -71,18 +71,18 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^0.3.2",
+        "@0xproject/base-contract": "^0.3.4",
         "@0xproject/order-utils": "^0.0.6",
-        "@0xproject/sol-compiler": "^0.5.0",
+        "@0xproject/sol-compiler": "^0.5.2",
         "@0xproject/types": "^1.0.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
         "bn.js": "^4.11.8",
         "ethereumjs-abi": "^0.6.4",
         "ethereumjs-util": "^5.1.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4",
         "web3": "^0.20.0"
     }
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index cac3863a6..a12d6c161 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/dev-utils",
-    "version": "0.4.2",
+    "version": "0.4.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,8 +30,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "chai": "^4.0.1",
@@ -45,11 +45,11 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/types": "^0.7.0",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/types": "^0.8.1",
         "ethereum-types": "^0.0.1",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "lodash": "^4.17.4",
         "web3": "^0.20.0",
         "web3-provider-engine": "^14.0.4"
diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json
index 68755c206..a937f6ad1 100644
--- a/packages/ethereum-types/package.json
+++ b/packages/ethereum-types/package.json
@@ -35,8 +35,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index d0c2b8000..897b32092 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -28,10 +28,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
@@ -41,14 +41,14 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^0.3.2",
+        "@0xproject/base-contract": "^0.3.4",
         "@0xproject/order-utils": "^0.0.6",
         "@0xproject/types": "1.0.0",
         "ethereum-types": "^0.0.1",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
-        "ethers": "^3.0.15",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index c6ab369b3..66ef364d6 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -47,15 +47,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^0.3.2",
+        "@0xproject/typescript-typings": "^0.4.1",
         "@types/node": "^8.0.53",
         "jsonschema": "^1.2.0",
         "lodash.values": "^4.3.0"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
+        "@0xproject/utils": "^0.7.1",
         "@types/lodash.foreach": "^4.5.3",
         "@types/lodash.values": "^4.3.3",
         "@types/mocha": "^2.2.42",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 9b706fa09..6db14334e 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/metacoin",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,22 +29,22 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/base-contract": "^0.3.2",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/sol-cov": "^0.0.11",
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/tslint-config": "^0.4.18",
-        "@0xproject/types": "^0.7.0",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/base-contract": "^0.3.4",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/sol-cov": "^0.1.1",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/tslint-config": "^0.4.20",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4",
         "web3-provider-engine": "^14.0.4"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.2",
+        "@0xproject/dev-utils": "^0.4.4",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 1b452f937..25ef95cf5 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/migrations",
-    "version": "0.0.6",
+    "version": "0.0.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -36,10 +36,10 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/tslint-config": "^0.4.18",
-        "@0xproject/types": "^0.7.0",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/tslint-config": "^0.4.20",
+        "@0xproject/types": "^0.8.1",
         "@types/yargs": "^10.0.0",
         "yargs": "^10.0.3",
         "make-promises-safe": "^1.1.0",
@@ -49,13 +49,13 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/base-contract": "^0.3.2",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/base-contract": "^0.3.4",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 5fbf7dbdf..270b5d2c7 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/monorepo-scripts",
-    "version": "0.1.20",
+    "version": "0.2.1",
     "engines": {
         "node": ">=6.12"
     },
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 8f37bb138..7f1351b02 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-utils",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,10 +51,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/migrations": "^0.0.6",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/migrations": "^0.0.8",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/ethereumjs-abi": "^0.6.0",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
@@ -73,20 +73,20 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/base-contract": "^0.3.2",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/base-contract": "^0.3.4",
         "@0xproject/json-schemas": "1.0.0",
-        "@0xproject/sol-compiler": "^0.5.0",
+        "@0xproject/sol-compiler": "^0.5.2",
         "@0xproject/types": "^1.0.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "@types/node": "^8.0.53",
         "bn.js": "^4.11.8",
         "ethereum-types": "^0.0.1",
         "ethereumjs-abi": "^0.6.4",
         "ethereumjs-util": "^5.1.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 2e5dfb094..09b9cef11 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-watcher",
-    "version": "0.0.2",
+    "version": "0.0.6",
     "description": "An order watcher daemon that watches for order validity",
     "keywords": [
         "0x",
@@ -47,12 +47,12 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/migrations": "^0.0.6",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/migrations": "^0.0.8",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -77,19 +77,19 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/base-contract": "^0.3.2",
-        "@0xproject/contract-wrappers": "^0.0.2",
-        "@0xproject/fill-scenarios": "^0.0.2",
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/order-utils": "0.0.5",
-        "@0xproject/types": "0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/base-contract": "^0.3.4",
+        "@0xproject/contract-wrappers": "^0.0.5",
+        "@0xproject/fill-scenarios": "^0.0.4",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
         "bintrees": "^1.0.2",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {
diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json
index 76e780c44..3a743df77 100644
--- a/packages/react-docs-example/package.json
+++ b/packages/react-docs-example/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@0xproject/react-docs-example",
-    "version": "0.0.12",
+    "version": "0.0.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -26,7 +26,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
@@ -50,7 +50,7 @@
         "webpack-dev-server": "^2.11.1"
     },
     "dependencies": {
-        "@0xproject/react-docs": "^0.0.12",
+        "@0xproject/react-docs": "^0.0.14",
         "basscss": "^8.0.3",
         "lodash": "^4.17.4",
         "material-ui": "^0.17.1",
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 5e8492d25..8c70f4f6d 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "0.0.12",
+    "version": "0.0.14",
     "engines": {
         "node": ">=6.12"
     },
@@ -25,9 +25,9 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/compare-versions": "^3.0.0",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
@@ -36,8 +36,8 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^0.1.7",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/react-shared": "^0.2.1",
+        "@0xproject/utils": "^0.7.1",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index d6f748580..b2ba67ed3 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-shared",
-    "version": "0.1.7",
+    "version": "0.2.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -25,9 +25,9 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 14eba283f..41e225167 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-compiler",
-    "version": "0.5.0",
+    "version": "0.5.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -53,9 +53,9 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/mkdirp": "^0.5.2",
         "@types/require-from-string": "^1.2.0",
         "@types/semver": "^5.5.0",
@@ -77,12 +77,12 @@
     },
     "dependencies": {
         "@0xproject/assert": "0.2.10",
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/sol-resolver": "^0.0.5",
-        "@0xproject/types": "^0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/sol-resolver": "^0.0.7",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "@types/yargs": "^11.0.0",
         "ethereum-types": "^0.0.1",
         "chalk": "^2.3.0",
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 1d9d7f94d..39618eacf 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-cov",
-    "version": "0.0.11",
+    "version": "0.1.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -50,12 +50,12 @@
     },
     "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
     "dependencies": {
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
-        "@0xproject/dev-utils": "^0.4.2",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
+        "@0xproject/dev-utils": "^0.4.4",
         "ethereum-types": "^0.0.1",
         "ethereumjs-util": "^5.1.1",
         "glob": "^7.1.2",
@@ -68,8 +68,8 @@
         "solidity-parser-antlr": "^0.2.12"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/istanbul": "^0.4.30",
         "@types/loglevel": "^1.5.3",
         "@types/mkdirp": "^0.5.1",
diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json
index 6c2ed8f8b..ae36648e9 100644
--- a/packages/sol-resolver/package.json
+++ b/packages/sol-resolver/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sol-resolver",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
@@ -33,7 +33,7 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/types": "^0.7.0",
+        "@0xproject/types": "^0.8.1",
         "@0xproject/typescript-typings": "^0.0.3",
         "lodash": "^4.17.4"
     },
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index 2e120d661..49cc3d043 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/sra-report",
-    "version": "0.1.0",
+    "version": "0.1.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -32,21 +32,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/types": "0.7.0",
-        "@0xproject/order-utils": "0.0.5",
-        "@0xproject/connect": "0.6.12",
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/connect": "0.6.15",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "chalk": "^2.3.0",
         "lodash": "^4.17.4",
         "newman": "^3.9.3",
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.48",
         "@types/nock": "^9.1.2",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index b222ace3b..2f3ffe22e 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/subproviders",
-    "version": "0.10.2",
+    "version": "0.10.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -40,10 +40,10 @@
         }
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/types": "^0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "^4.3.0",
         "ethereum-types": "^0.0.1",
@@ -59,9 +59,9 @@
         "web3-provider-engine": "^14.0.4"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
+        "@0xproject/utils": "^0.7.1",
         "@types/bip39": "^2.4.0",
         "@types/bn.js": "^4.11.0",
         "@types/hdkey": "^0.7.0",
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 2d1252596..6753285cd 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@0xproject/testnet-faucets",
-    "version": "1.0.30",
+    "version": "1.0.34",
     "engines": {
         "node": ">=6.12"
     },
@@ -19,9 +19,9 @@
     "license": "Apache-2.0",
     "dependencies": {
         "0x.js": "^0.38.0",
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "body-parser": "^1.17.1",
         "ethereumjs-tx": "^1.3.3",
         "ethereumjs-util": "^5.1.1",
@@ -32,7 +32,7 @@
         "web3-provider-engine": "^14.0.4"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/body-parser": "^1.16.1",
         "@types/express": "^4.0.35",
         "@types/lodash": "4.14.104",
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 452ac48a4..9cb6a2da0 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/tslint-config",
-    "version": "0.4.18",
+    "version": "0.4.20",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,7 +34,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
+        "@0xproject/monorepo-scripts": "^0.2.1",
         "@types/lodash": "4.14.104",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
diff --git a/packages/types/package.json b/packages/types/package.json
index fd2073db3..0d5e308b9 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -24,8 +24,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json
index 0dde47c97..f10d35666 100644
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/typescript-typings",
-    "version": "0.3.2",
+    "version": "0.4.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,7 +29,7 @@
         "bignumber.js": "~4.1.0"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
+        "@0xproject/monorepo-scripts": "^0.2.1",
         "copyfiles": "^1.2.0",
         "shx": "^0.2.2"
     },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 3828fa9ee..06d67566c 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/utils",
-    "version": "0.6.2",
+    "version": "0.7.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "copyfiles": "^1.2.0",
         "make-promises-safe": "^1.1.0",
@@ -36,11 +36,11 @@
     },
     "dependencies": {
         "ethereum-types": "^0.0.1",
-        "@0xproject/typescript-typings": "^0.3.2",
+        "@0xproject/typescript-typings": "^0.4.1",
         "@types/node": "^8.0.53",
         "ethereumjs-util": "^5.1.1",
         "bignumber.js": "~4.1.0",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "js-sha3": "^0.7.0",
         "lodash": "^4.17.4",
         "web3": "^0.20.0"
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index de2b72ac6..3c5b2c616 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/web3-wrapper",
-    "version": "0.6.4",
+    "version": "0.7.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -45,8 +45,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
@@ -64,10 +64,10 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
         "ethereum-types": "^0.0.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4",
         "web3": "^0.20.0"
     },
diff --git a/packages/website/package.json b/packages/website/package.json
index 5287414c7..a2ac617eb 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/website",
-    "version": "0.0.33",
+    "version": "0.0.37",
     "engines": {
         "node": ">=6.12"
     },
@@ -18,14 +18,14 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/contract-wrappers": "^0.0.2",
-        "@0xproject/react-docs": "^0.0.12",
-        "@0xproject/react-shared": "^0.1.7",
-        "@0xproject/subproviders": "^0.10.2",
-        "@0xproject/types": "0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/contract-wrappers": "^0.0.5",
+        "@0xproject/react-docs": "^0.0.14",
+        "@0xproject/react-shared": "^0.2.1",
+        "@0xproject/subproviders": "^0.10.4",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
-- 
cgit v1.2.3


From e3299b546e7b1d5028a86e4e3d4e533bc0640c26 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 11:33:46 +0200
Subject: Export OrderWatcherConfig from 0x.js

---
 packages/0x.js/src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index c79dbdb77..5c7ad6e1c 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -19,6 +19,8 @@ export {
     TransactionReceiptWithDecodedLogs,
 } from '@0xproject/types';
 
+export { OrderWatcherConfig } from '@0xproject/order-watcher';
+
 export {
     EventCallback,
     ContractEvent,
-- 
cgit v1.2.3


From 84a4a888e65e1d623ed6f3f6205c3727c51ffb24 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 11:34:44 +0200
Subject: Add OrderWatcherConfig type to 0x.js docs page

---
 packages/website/ts/containers/zero_ex_js_documentation.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index a8890a07a..bd0d1732a 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -173,6 +173,7 @@ const docsInfoConfig: DocsInfoConfig = {
             'OrderStateInvalid',
             'OrderState',
             'OrderStateWatcherConfig',
+            'OrderWatcherConfig',
             'FilterObject',
             'OrderRelevantState',
             'JSONRPCRequestPayload',
-- 
cgit v1.2.3


From a96abe24227b54b7a038278c432b7bf8a70c22a4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 12:32:43 +0200
Subject: Fix additional versions and update yarn.lock

---
 packages/0x.js/package.json             |   2 +-
 packages/contract-wrappers/package.json |   2 +-
 packages/contracts/package.json         |   2 +-
 packages/fill-scenarios/package.json    |   2 +-
 packages/order-utils/package.json       |   2 +-
 packages/order-watcher/package.json     |   2 +-
 packages/sol-compiler/package.json      |   2 +-
 packages/sra-report/package.json        |   2 +-
 yarn.lock                               | 156 ++++++++++++++------------------
 9 files changed, 75 insertions(+), 97 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 7a2c3c1a4..2aeb1ddf2 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -103,7 +103,7 @@
         "@0xproject/assert": "^0.2.12",
         "@0xproject/base-contract": "^0.3.4",
         "@0xproject/contract-wrappers": "^0.0.5",
-        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/order-utils": "^0.0.7",
         "@0xproject/order-watcher": "^0.0.6",
         "@0xproject/sol-compiler": "^0.5.2",
         "@0xproject/types": "^0.8.1",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 5d2792f54..cd4b25957 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -81,7 +81,7 @@
         "@0xproject/base-contract": "^0.3.4",
         "@0xproject/fill-scenarios": "^0.0.4",
         "@0xproject/json-schemas": "0.8.1",
-        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/order-utils": "^0.0.7",
         "@0xproject/types": "^0.8.1",
         "@0xproject/typescript-typings": "^0.4.1",
         "@0xproject/utils": "^0.7.1",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 272bdcad9..8807c727e 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -72,7 +72,7 @@
     },
     "dependencies": {
         "@0xproject/base-contract": "^0.3.4",
-        "@0xproject/order-utils": "^0.0.6",
+        "@0xproject/order-utils": "^1.0.0",
         "@0xproject/sol-compiler": "^0.5.2",
         "@0xproject/types": "^1.0.0",
         "@0xproject/typescript-typings": "^0.4.1",
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 897b32092..883300fa0 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -42,7 +42,7 @@
     },
     "dependencies": {
         "@0xproject/base-contract": "^0.3.4",
-        "@0xproject/order-utils": "^0.0.6",
+        "@0xproject/order-utils": "^1.0.0",
         "@0xproject/types": "1.0.0",
         "ethereum-types": "^0.0.1",
         "@0xproject/typescript-typings": "^0.4.1",
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 7f1351b02..bd18b7855 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-utils",
-    "version": "0.0.7",
+    "version": "1.0.0",
     "engines": {
         "node": ">=6.12"
     },
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 09b9cef11..c407d25bd 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -82,7 +82,7 @@
         "@0xproject/contract-wrappers": "^0.0.5",
         "@0xproject/fill-scenarios": "^0.0.4",
         "@0xproject/json-schemas": "0.8.1",
-        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/order-utils": "^0.0.7",
         "@0xproject/types": "^0.8.1",
         "@0xproject/typescript-typings": "^0.4.1",
         "@0xproject/utils": "^0.7.1",
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 41e225167..deeed8299 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -76,7 +76,7 @@
         "zeppelin-solidity": "1.8.0"
     },
     "dependencies": {
-        "@0xproject/assert": "0.2.10",
+        "@0xproject/assert": "0.2.12",
         "@0xproject/json-schemas": "0.8.1",
         "@0xproject/sol-resolver": "^0.0.7",
         "@0xproject/types": "^0.8.1",
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index 49cc3d043..379b8cb1e 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -34,7 +34,7 @@
     "dependencies": {
         "@0xproject/assert": "^0.2.12",
         "@0xproject/types": "^0.8.1",
-        "@0xproject/order-utils": "0.0.7",
+        "@0xproject/order-utils": "^0.0.7",
         "@0xproject/connect": "0.6.15",
         "@0xproject/json-schemas": "0.8.1",
         "@0xproject/typescript-typings": "^0.4.1",
diff --git a/yarn.lock b/yarn.lock
index d6524eff3..fdb0d53e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6,73 +6,43 @@
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.9.tgz#bb89c645612f8ccfaffac1ca6e3c11f168c9cf59"
 
-"@0xproject/connect@0.6.12":
-  version "0.6.12"
-  resolved "https://registry.yarnpkg.com/@0xproject/connect/-/connect-0.6.12.tgz#7d4711804f2c760f0436b5f2ddbf6631aaee36ba"
-  dependencies:
-    "@0xproject/assert" "^0.2.9"
-    "@0xproject/json-schemas" "^0.7.23"
-    "@0xproject/types" "^0.6.3"
-    "@0xproject/typescript-typings" "^0.3.1"
-    "@0xproject/utils" "^0.6.1"
-    isomorphic-fetch "^2.2.1"
-    lodash "^4.17.4"
-    query-string "^5.0.1"
-    websocket "^1.0.25"
-
-"@0xproject/fill-scenarios@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.2.tgz#176ac2cba13f527e84346fbf06da84965a852bab"
-  dependencies:
-    "@0xproject/base-contract" "^0.3.2"
-    "@0xproject/order-utils" "^0.0.5"
-    "@0xproject/types" "^0.7.0"
-    "@0xproject/typescript-typings" "^0.3.2"
-    "@0xproject/utils" "^0.6.2"
-    "@0xproject/web3-wrapper" "^0.6.4"
-    ethers "^3.0.15"
-    lodash "^4.17.4"
-
-"@0xproject/json-schemas@0.7.22":
-  version "0.7.22"
-  resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.7.22.tgz#95cbdc9ec0eff3d1920903960284d491eb668f28"
-  dependencies:
-    "@0xproject/typescript-typings" "^0.3.0"
-    "@types/node" "^8.0.53"
-    jsonschema "^1.2.0"
-    lodash.values "^4.3.0"
-
-"@0xproject/json-schemas@^0.7.23", "@0xproject/json-schemas@^0.7.24":
-  version "0.7.24"
-  resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.7.24.tgz#21a12b43ab0ab4aa302d02c4891668cda36b6c64"
+"@0xproject/fill-scenarios@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.4.tgz#4d23c75abda7e9f117b698c0b8b142af07e0c69e"
+  dependencies:
+    "@0xproject/base-contract" "^0.3.4"
+    "@0xproject/order-utils" "^0.0.7"
+    "@0xproject/types" "^0.8.1"
+    "@0xproject/typescript-typings" "^0.4.1"
+    "@0xproject/utils" "^0.7.1"
+    "@0xproject/web3-wrapper" "^0.7.1"
+    ethers "3.0.22"
+    lodash "4.17.10"
+
+"@0xproject/json-schemas@0.8.1", "@0xproject/json-schemas@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.8.1.tgz#2613fd9405728bc65f2eb78e86258d44b4925ab0"
   dependencies:
-    "@0xproject/typescript-typings" "^0.3.2"
-    "@types/node" "^8.0.53"
-    jsonschema "^1.2.0"
-    lodash.values "^4.3.0"
+    "@0xproject/typescript-typings" "^0.4.1"
+    "@types/node" "9.6.0"
+    jsonschema "1.2.2"
+    lodash.values "4.3.0"
 
-"@0xproject/order-utils@0.0.5", "@0xproject/order-utils@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.5.tgz#c8d92a112740b0020e08f13137844f8c183c863b"
-  dependencies:
-    "@0xproject/assert" "^0.2.10"
-    "@0xproject/json-schemas" "^0.7.24"
-    "@0xproject/types" "^0.7.0"
-    "@0xproject/typescript-typings" "^0.3.2"
-    "@0xproject/utils" "^0.6.2"
-    "@0xproject/web3-wrapper" "^0.6.4"
-    "@types/node" "^8.0.53"
-    bn.js "^4.11.8"
-    ethereumjs-abi "^0.6.4"
-    ethereumjs-util "^5.1.1"
-    lodash "^4.17.4"
-
-"@0xproject/types@0.7.0", "@0xproject/types@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.7.0.tgz#fad13925ee92ad4ee1980668a5cb2bed4dcaab8f"
-  dependencies:
-    "@types/node" "^8.0.53"
-    bignumber.js "~4.1.0"
+"@0xproject/order-utils@^0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.7.tgz#eaa465782ea5745bdad54e1a851533172d993b7c"
+  dependencies:
+    "@0xproject/assert" "^0.2.12"
+    "@0xproject/json-schemas" "^0.8.1"
+    "@0xproject/types" "^0.8.1"
+    "@0xproject/typescript-typings" "^0.4.1"
+    "@0xproject/utils" "^0.7.1"
+    "@0xproject/web3-wrapper" "^0.7.1"
+    "@types/node" "9.6.0"
+    bn.js "4.11.7"
+    ethereumjs-abi "0.6.5"
+    ethereumjs-util "5.1.5"
+    lodash "4.17.10"
 
 "@0xproject/types@^0.5.0":
   version "0.5.0"
@@ -80,11 +50,11 @@
   dependencies:
     bignumber.js "~4.1.0"
 
-"@0xproject/types@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.6.3.tgz#0bc066967aad4151011b6e478bb707b1afb8504b"
+"@0xproject/types@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.8.1.tgz#ba436a1054d2ac6362bb0668611af4f52402a54e"
   dependencies:
-    "@types/node" "^8.0.53"
+    "@types/node" "9.6.0"
     bignumber.js "~4.1.0"
 
 "@0xproject/typescript-typings@^0.0.3":
@@ -350,6 +320,10 @@
   version "9.6.5"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.5.tgz#ee700810fdf49ac1c399fc5980b7559b3e5a381d"
 
+"@types/node@9.6.0":
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
+
 "@types/node@^8.0.53":
   version "8.10.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.8.tgz#794cba23cc9f8d9715f6543fa8827433b5f5cd3b"
@@ -438,7 +412,7 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/semver@^5.5.0":
+"@types/semver@5.5.0", "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
 
@@ -4068,7 +4042,7 @@ ethereum-common@^0.0.18:
   version "0.0.18"
   resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
 
-ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
+ethereumjs-abi@0.6.5, ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
   version "0.6.5"
   resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf"
   dependencies:
@@ -4117,17 +4091,7 @@ ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default, ethe
     ethereum-common "^0.0.18"
     ethereumjs-util "^5.0.0"
 
-ethereumjs-util@^4.0.1, ethereumjs-util@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
-  dependencies:
-    bn.js "^4.8.0"
-    create-hash "^1.1.2"
-    keccakjs "^0.2.0"
-    rlp "^2.0.0"
-    secp256k1 "^3.0.1"
-
-ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
+ethereumjs-util@5.1.5, ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz#2f02575852627d45622426f25ee4a0b5f377f27a"
   dependencies:
@@ -4139,6 +4103,16 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
+ethereumjs-util@^4.0.1, ethereumjs-util@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
+  dependencies:
+    bn.js "^4.8.0"
+    create-hash "^1.1.2"
+    keccakjs "^0.2.0"
+    rlp "^2.0.0"
+    secp256k1 "^3.0.1"
+
 ethereumjs-vm@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.3.3.tgz#05719139e0c4a59e829022964a6048b17d2d84b0"
@@ -4183,7 +4157,7 @@ ethereumjs-wallet@~0.6.0:
     utf8 "^2.1.1"
     uuid "^2.0.1"
 
-ethers@0xproject/ethers.js#eip-838-reasons, ethers@^3.0.15:
+ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
   version "3.0.18"
   resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447"
   dependencies:
@@ -6353,7 +6327,7 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
   dependencies:
@@ -6623,6 +6597,10 @@ jsonschema@*, jsonschema@^1.2.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464"
 
+jsonschema@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -7191,7 +7169,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash.values@^4.3.0:
+lodash.values@4.3.0, lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
@@ -7201,6 +7179,10 @@ lodash.words@^3.0.0:
   dependencies:
     lodash._root "^3.0.0"
 
+lodash@4.17.10, lodash@^4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@4.17.2:
   version "4.17.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
@@ -7217,10 +7199,6 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5,
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-lodash@^4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
-- 
cgit v1.2.3


From 17d49067e9cefc61fb906e1118dac1d85f6ee69b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 12:56:22 +0200
Subject: Fix missed merge conflicts

---
 packages/tslint-config/CHANGELOG.json     | 3 ---
 packages/web3-wrapper/CHANGELOG.json      | 3 ---
 packages/website/md/docs/sol_cov/usage.md | 8 --------
 3 files changed, 14 deletions(-)

diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 6ae195ae7..ffb0c4e81 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,7 +1,5 @@
 [
     {
-<<<<<<< HEAD
-=======
         "timestamp": 1529397769,
         "version": "0.4.20",
         "changes": [
@@ -20,7 +18,6 @@
         "timestamp": 1527810075
     },
     {
->>>>>>> 40a061a5... Updated CHANGELOGS
         "timestamp": 1527009133,
         "version": "0.4.18",
         "changes": [
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index 1f1c8e2c0..624ad7151 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,7 +1,5 @@
 [
     {
-<<<<<<< HEAD
-=======
         "timestamp": 1529397769,
         "version": "0.7.1",
         "changes": [
@@ -12,7 +10,6 @@
     },
     {
         "timestamp": 1528070400,
->>>>>>> 40a061a5... Updated CHANGELOGS
         "version": "0.7.0",
         "changes": [
             {
diff --git a/packages/website/md/docs/sol_cov/usage.md b/packages/website/md/docs/sol_cov/usage.md
index 59638f611..433cfad96 100644
--- a/packages/website/md/docs/sol_cov/usage.md
+++ b/packages/website/md/docs/sol_cov/usage.md
@@ -11,9 +11,6 @@ In order to use `CoverageSubprovider` with your favorite framework you need to p
 If you are generating your artifacts with [@0xproject/sol-compiler](LINK) you can use the `SolCompilerArtifactsAdapter` we've implemented for you.
 
 ```typescript
-<<<<<<< HEAD
-import { CoverageSubprovider } from '@0xproject/sol-cov';
-=======
 import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov';
 const artifactsPath = 'src/artifacts';
 const contractsPath = 'src/contracts';
@@ -42,7 +39,6 @@ Look at the code of the two adapters above for examples.
 ```typescript
 import { CoverageSubprovider } from '@0xproject/sol-cov';
 import ProviderEngine = require('web3-provider-engine');
->>>>>>> Improve sol-cov docs
 
 const provider = new ProviderEngine();
 
@@ -51,12 +47,8 @@ const contractsPath = 'src/contracts';
 const networkId = 50;
 // Some calls might not have `from` address specified. Nevertheless - transactions need to be submitted from an address with at least some funds. defaultFromAddress is the address that will be used to submit those calls as transactions from.
 const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
-<<<<<<< HEAD
-const coverageSubprovider = new CoverageSubprovider(artifactsPath, contractsPath, defaultFromAddress);
-=======
 const isVerbose = true;
 const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose);
->>>>>>> Improve sol-cov docs
 
 provider.addProvider(coverageSubprovider);
 ```
-- 
cgit v1.2.3


From df50232ed90fd880019eff9c9fe66fb2a4cff4bb Mon Sep 17 00:00:00 2001
From: Ara Kevonian <=>
Date: Tue, 19 Jun 2018 04:13:32 -0700
Subject: Update default params in sendRawPaylodAsync for improved JSON-RPC
 compatibility

---
 packages/web3-wrapper/src/web3_wrapper.ts | 9 +++++++--
 yarn.lock                                 | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts
index 5d2eedcb3..6ea69883c 100644
--- a/packages/web3-wrapper/src/web3_wrapper.ts
+++ b/packages/web3-wrapper/src/web3_wrapper.ts
@@ -491,8 +491,13 @@ export class Web3Wrapper {
     }
     private async _sendRawPayloadAsync<A>(payload: Partial<JSONRPCRequestPayload>): Promise<A> {
         const sendAsync = this._web3.currentProvider.sendAsync.bind(this._web3.currentProvider);
-        payload.id = this._jsonRpcRequestId++;
-        const response = await promisify<JSONRPCResponsePayload>(sendAsync)(payload);
+        const payloadWithDefaults = {
+            id: this._jsonRpcRequestId++,
+            params: [],
+            jsonrpc: '2.0',
+            ...payload,
+        };
+        const response = await promisify<JSONRPCResponsePayload>(sendAsync)(payloadWithDefaults);
         const result = response.result;
         return result;
     }
diff --git a/yarn.lock b/yarn.lock
index d6524eff3..cbd8be18d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -438,7 +438,7 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/semver@^5.5.0":
+"@types/semver@5.5.0", "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
 
@@ -6353,7 +6353,7 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
   dependencies:
-- 
cgit v1.2.3


From f3ae5d8160f2e8a2fea8d045d9a02e37a7cdaa21 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Jun 2018 13:46:39 +0200
Subject: Prettier fix

---
 packages/contract_templates/README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/contract_templates/README.md b/packages/contract_templates/README.md
index 9546506c5..e5f4b09d1 100644
--- a/packages/contract_templates/README.md
+++ b/packages/contract_templates/README.md
@@ -1,9 +1,11 @@
 These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen).
 
 To successfully compile the generated TypeScript contract wrappers, you must:
-* Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/utils @0xproject/web3-wrapper ethereum-types ethers lodash`
-* Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
-* Ensure that your TypeScript configuration includes the following:
+
+*   Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/utils @0xproject/web3-wrapper ethereum-types ethers lodash`
+*   Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
+*   Ensure that your TypeScript configuration includes the following:
+
 ```
 "compilerOptions": {
   "lib": ["ES2015"],
-- 
cgit v1.2.3


From 829bc962095096a2b70516862ebddc40d21ff7ee Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 19 Jun 2018 10:30:28 -0700
Subject: Use Image component instead of img tag

---
 packages/website/ts/components/top_bar/provider_display.tsx |  3 ++-
 packages/website/ts/components/ui/identicon.tsx             | 10 ++++------
 packages/website/ts/components/ui/image.tsx                 |  4 +++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx
index 0e9954350..1e8855c14 100644
--- a/packages/website/ts/components/top_bar/provider_display.tsx
+++ b/packages/website/ts/components/top_bar/provider_display.tsx
@@ -9,6 +9,7 @@ import { ProviderPicker } from 'ts/components/top_bar/provider_picker';
 import { Container } from 'ts/components/ui/container';
 import { DropDown } from 'ts/components/ui/drop_down';
 import { Identicon } from 'ts/components/ui/identicon';
+import { Image } from 'ts/components/ui/image';
 import { Text } from 'ts/components/ui/text';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { colors } from 'ts/style/colors';
@@ -75,7 +76,7 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi
                     </Text>
                 </Container>
                 {isProviderMetamask && (
-                    <img src="/images/metamask_icon.png" style={{ width: ROOT_HEIGHT, height: ROOT_HEIGHT }} />
+                    <Image src="/images/metamask_icon.png" height={ROOT_HEIGHT} width={ROOT_HEIGHT} />
                 )}
             </div>
         );
diff --git a/packages/website/ts/components/ui/identicon.tsx b/packages/website/ts/components/ui/identicon.tsx
index 6a9b94e5b..30df995c8 100644
--- a/packages/website/ts/components/ui/identicon.tsx
+++ b/packages/website/ts/components/ui/identicon.tsx
@@ -2,6 +2,7 @@ import blockies = require('blockies');
 import * as _ from 'lodash';
 import * as React from 'react';
 
+import { Image } from 'ts/components/ui/image';
 import { colors } from 'ts/style/colors';
 
 interface IdenticonProps {
@@ -31,15 +32,12 @@ export class Identicon extends React.Component<IdenticonProps, IdenticonState> {
                 }}
             >
                 {!_.isEmpty(address) ? (
-                    <img
+                    <Image
                         src={blockies({
                             seed: address.toLowerCase(),
                         }).toDataURL()}
-                        style={{
-                            width: diameter,
-                            height: diameter,
-                            imageRendering: 'pixelated',
-                        }}
+                        height={diameter}
+                        width={diameter}
                     />
                 ) : (
                     <svg height={diameter} width={diameter}>
diff --git a/packages/website/ts/components/ui/image.tsx b/packages/website/ts/components/ui/image.tsx
index 0958d2e5e..369dc8b7e 100644
--- a/packages/website/ts/components/ui/image.tsx
+++ b/packages/website/ts/components/ui/image.tsx
@@ -5,7 +5,8 @@ export interface ImageProps {
     className?: string;
     src?: string;
     fallbackSrc?: string;
-    height?: string;
+    height?: string | number;
+    width?: string | number;
 }
 interface ImageState {
     imageLoadFailed: boolean;
@@ -26,6 +27,7 @@ export class Image extends React.Component<ImageProps, ImageState> {
                 onError={this._onError.bind(this)}
                 src={src}
                 height={this.props.height}
+                width={this.props.width}
             />
         );
     }
-- 
cgit v1.2.3


From 5305db689de361eec7b1dd73a05049258642d1eb Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 19 Jun 2018 10:41:27 -0700
Subject: Update PR template

---
 PULL_REQUEST_TEMPLATE.md | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 8752069db..34f74b601 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,24 +1,10 @@
-<!--- Thank you for taking the time to submit a Pull Request -->
-
-<!--- Provide a general summary of the issue in the Title above -->
-
 ## Description
 
 <!--- Describe your changes in detail -->
 
-## Motivation and Context
-
-<!--- Why is this change required? What problem does it solve? -->
-
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How Has This Been Tested?
-
-<!--- Please describe in detail how you tested your changes. -->
-
-<!--- Include details of your testing environment, and the tests you ran to -->
+## Testing instructions
 
-<!--- see how your change affects other areas of the code, etc. -->
+<!--- Please describe how reviewers can test your changes -->
 
 ## Types of changes
 
-- 
cgit v1.2.3