Merge branch 'v2-prototype' into feature/website/wallet-flex-box

* v2-prototype: (95 commits)
  Add missing dep to website
  Upgrade solidity parser
  Fix trace test
  Fix linter issues
  Move contract utils
  Fix prettier
  Fix NameResolver
  Fix prettier
  Remove 0x.js as a dependency from website
  Enable 0x.js tests
  Fix small bug in order-utils
  Address feedback
  Fix Tslint error caused by "PromiseLike" value
  Fix Tslint error caused by "PromiseLike" value
  Update dogfood url
  fix contract-wrappers version
  Parse compiler.json in SolCompilerArtifactsAdapter
  Fix TokenTransferProxy artifact name since it's now suffixed with _v1
  Update yarn.lock
  Fix signature verification test
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/packages/contracts/test/tutorials/arbitrage.ts b/packages/contracts/test/tutorials/arbitrage.ts
index 723ddb066..e5787d5b8 100644
--- a/packages/contracts/test/tutorials/arbitrage.ts
+++ b/packages/contracts/test/tutorials/arbitrage.ts
@@ -38,7 +38,7 @@
 //     let amountGive: BigNumber;
 //     let makerTokenAmount: BigNumber;
 //     let takerTokenAmount: BigNumber;
-//     const feeRecipient = ZeroEx.NULL_ADDRESS;
+//     const feeRecipient = constants.NULL_ADDRESS;
 //     const INITIAL_BALANCE = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
 //     const INITIAL_ALLOWANCE = ZeroEx.toBaseUnitAmount(new BigNumber(10000), 18);
 
@@ -115,7 +115,7 @@
 //             exchangeContractAddress: exchange.address,
 //             networkId: constants.TESTRPC_NETWORK_ID,
 //         });
-//         exWrapper = new ExchangeWrapper(exchange, zeroEx);
+//         exWrapper = new ExchangeWrapper(exchange, provider);
 
 //         makerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
 //         takerTokenAmount = makerTokenAmount;