Merge development branch

4 files changed, 29 insertions, 3 deletions

diff --git a/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts b/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts
index 1c9ffd2d6..a9c7235c1 100644
--- a/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts
+++ b/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts
@@ -4,10 +4,12 @@ import * as AssetProxyOwner from '../../artifacts/2.0.0-beta-testnet/AssetProxyO
 import * as ERC20Proxy from '../../artifacts/2.0.0-beta-testnet/ERC20Proxy.json';
 import * as ERC721Proxy from '../../artifacts/2.0.0-beta-testnet/ERC721Proxy.json';
 import * as Exchange from '../../artifacts/2.0.0-beta-testnet/Exchange.json';
+import * as OrderValidator from '../../artifacts/2.0.0-beta-testnet/OrderValidator.json';
 
 export const artifacts = {
     AssetProxyOwner: (AssetProxyOwner as any) as ContractArtifact,
     Exchange: (Exchange as any) as ContractArtifact,
     ERC20Proxy: (ERC20Proxy as any) as ContractArtifact,
     ERC721Proxy: (ERC721Proxy as any) as ContractArtifact,
+    OrderValidator: (OrderValidator as any) as ContractArtifact,
 };
diff --git a/packages/migrations/src/2.0.0-beta-testnet/migration.ts b/packages/migrations/src/2.0.0-beta-testnet/migration.ts
index 19fe5f02c..cc9f5a859 100644
--- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts
+++ b/packages/migrations/src/2.0.0-beta-testnet/migration.ts
@@ -12,6 +12,7 @@ import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner';
 import { ERC20ProxyContract } from './contract_wrappers/erc20_proxy';
 import { ERC721ProxyContract } from './contract_wrappers/erc721_proxy';
 import { ExchangeContract } from './contract_wrappers/exchange';
+import { OrderValidatorContract } from './contract_wrappers/order_validator';
 
 /**
  * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-beta-testnet' command.
@@ -75,6 +76,16 @@ export const runV2TestnetMigrationsAsync = async (
     );
     artifactsWriter.saveArtifact(assetProxyOwner);
 
+    // Deploy OrderValidator
+    const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync(
+        artifacts.OrderValidator,
+        provider,
+        txDefaults,
+        exchange.address,
+        zrxAssetData,
+    );
+    artifactsWriter.saveArtifact(orderValidator);
+
     // Authorize Exchange contracts to call AssetProxies
     txHash = await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address);
     logUtils.log(`transactionHash: ${txHash}`);
diff --git a/packages/migrations/src/2.0.0/artifacts.ts b/packages/migrations/src/2.0.0/artifacts.ts
index 8d66e3b63..e96c555d6 100644
--- a/packages/migrations/src/2.0.0/artifacts.ts
+++ b/packages/migrations/src/2.0.0/artifacts.ts
@@ -7,6 +7,7 @@ import * as ERC20Proxy from '../../artifacts/2.0.0/ERC20Proxy.json';
 import * as ERC721Proxy from '../../artifacts/2.0.0/ERC721Proxy.json';
 import * as Exchange from '../../artifacts/2.0.0/Exchange.json';
 import * as Forwarder from '../../artifacts/2.0.0/Forwarder.json';
+import * as OrderValidator from '../../artifacts/2.0.0/OrderValidator.json';
 import * as WETH9 from '../../artifacts/2.0.0/WETH9.json';
 import * as ZRX from '../../artifacts/2.0.0/ZRXToken.json';
 
@@ -20,4 +21,5 @@ export const artifacts = {
     ERC20Proxy: (ERC20Proxy as any) as ContractArtifact,
     ERC721Proxy: (ERC721Proxy as any) as ContractArtifact,
     Forwarder: (Forwarder as any) as ContractArtifact,
+    OrderValidator: (OrderValidator as any) as ContractArtifact,
 };
diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index f51c236de..e1dcea8b0 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -14,6 +14,7 @@ import { ERC20ProxyContract } from './contract_wrappers/erc20_proxy';
 import { ERC721ProxyContract } from './contract_wrappers/erc721_proxy';
 import { ExchangeContract } from './contract_wrappers/exchange';
 import { ForwarderContract } from './contract_wrappers/forwarder';
+import { OrderValidatorContract } from './contract_wrappers/order_validator';
 import { WETH9Contract } from './contract_wrappers/weth9';
 import { ZRXTokenContract } from './contract_wrappers/zrx_token';
 
@@ -49,11 +50,12 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
     artifactsWriter.saveArtifact(etherToken);
 
     // Exchange
+    const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
     const exchange = await ExchangeContract.deployFrom0xArtifactAsync(
         artifacts.Exchange,
         provider,
         txDefaults,
-        assetDataUtils.encodeERC20AssetData(zrxToken.address),
+        zrxAssetData,
     );
     artifactsWriter.saveArtifact(exchange);
 
@@ -75,6 +77,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         secondsRequired,
     );
     artifactsWriter.saveArtifact(assetProxyOwner);
+
     await web3Wrapper.awaitTransactionSuccessAsync(
         await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
             from: owner,
@@ -135,10 +138,18 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         provider,
         txDefaults,
         exchange.address,
-        etherToken.address,
-        zrxToken.address,
         assetDataUtils.encodeERC20AssetData(zrxToken.address),
         assetDataUtils.encodeERC20AssetData(etherToken.address),
     );
     artifactsWriter.saveArtifact(forwarder);
+
+    // OrderValidator
+    const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync(
+        artifacts.OrderValidator,
+        provider,
+        txDefaults,
+        exchange.address,
+        zrxAssetData,
+    );
+    artifactsWriter.saveArtifact(orderValidator);
 };