From 3d25758b1d107528b0bc8a578e3c5ecf020395b3 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Sun, 19 Aug 2018 20:56:21 -0700
Subject: Add OrderValidator to migrations

---
 packages/migrations/src/2.0.0/migration.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'packages/migrations/src/2.0.0/migration.ts')

diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index 0566e67e8..bddb020d2 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';
 
@@ -75,6 +76,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         secondsRequired,
     );
     artifactsWriter.saveArtifact(assetProxyOwner);
+
     await web3Wrapper.awaitTransactionSuccessAsync(
         await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
             from: owner,
@@ -139,4 +141,14 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         assetDataUtils.encodeERC20AssetData(etherToken.address),
     );
     artifactsWriter.saveArtifact(forwarder);
+
+    // OrderValidator
+    const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync(
+        artifacts.OrderValidator,
+        provider,
+        txDefaults,
+        exchange.address,
+        zrxAssetData,
+    );
+    artifactsWriter.saveArtifact(orderValidator);
 };
-- 
cgit v1.2.3


From 7fa5b474ebac649b6a23c8b9108e07c117dcc00b Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Tue, 21 Aug 2018 10:15:45 -0700
Subject: Add ZRX balances and allowances to TraderInfo

---
 packages/migrations/src/2.0.0/migration.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/migrations/src/2.0.0/migration.ts')

diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index bddb020d2..e1dcea8b0 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -50,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);
 
-- 
cgit v1.2.3


From e456332da71f1ed6c6799fabe6c635985ec2ce9d Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Tue, 4 Sep 2018 16:47:01 -0400
Subject: Rename and update some artifact locations

---
 packages/migrations/src/2.0.0/migration.ts | 155 ++++++++++++-----------------
 1 file changed, 61 insertions(+), 94 deletions(-)

(limited to 'packages/migrations/src/2.0.0/migration.ts')

diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index e1dcea8b0..4100a750c 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -1,37 +1,37 @@
 import { assetDataUtils } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
+import { logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider, TxData } from 'ethereum-types';
 
 import { ArtifactWriter } from '../utils/artifact_writer';
-import { erc20TokenInfo, erc721TokenInfo } from '../utils/token_info';
 
 import { artifacts } from './artifacts';
+import { constants } from './constants';
 import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner';
-import { DummyERC20TokenContract } from './contract_wrappers/dummy_erc20_token';
-import { DummyERC721TokenContract } from './contract_wrappers/dummy_erc721_token';
 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';
 
 /**
- * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2' command.
+ * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-mainnet' command.
  * Migrations could be written to run in parallel, but if you want contract addresses to be created deterministically,
  * the migration should be written to run synchronously.
  * @param provider  Web3 provider instance.
  * @param artifactsDir The directory with compiler artifact files.
  * @param txDefaults Default transaction values to use when deploying contracts.
  */
-export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: string, txDefaults: Partial<TxData>) => {
+export const runV2MainnetMigrationsAsync = async (
+    provider: Provider,
+    artifactsDir: string,
+    txDefaults: Partial<TxData>,
+) => {
     const web3Wrapper = new Web3Wrapper(provider);
     const networkId = await web3Wrapper.getNetworkIdAsync();
     const artifactsWriter = new ArtifactWriter(artifactsDir, networkId);
 
-    // Proxies
+    // Deploy AssetProxies
     const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults);
     artifactsWriter.saveArtifact(erc20proxy);
     const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
@@ -41,109 +41,49 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
     );
     artifactsWriter.saveArtifact(erc721proxy);
 
-    // ZRX
-    const zrxToken = await ZRXTokenContract.deployFrom0xArtifactAsync(artifacts.ZRX, provider, txDefaults);
-    artifactsWriter.saveArtifact(zrxToken);
-
-    // Ether token
-    const etherToken = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults);
-    artifactsWriter.saveArtifact(etherToken);
-
-    // Exchange
-    const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
-    const exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-        artifacts.Exchange,
-        provider,
-        txDefaults,
-        zrxAssetData,
-    );
+    // Deploy Exchange
+    const exchange = await ExchangeContract.deployFrom0xArtifactAsync(artifacts.Exchange, provider, txDefaults);
     artifactsWriter.saveArtifact(exchange);
 
-    // Multisigs
-    const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync();
-    const owners = [accounts[0], accounts[1]];
-    const confirmationsRequired = new BigNumber(2);
-    const secondsRequired = new BigNumber(0);
-    const owner = accounts[0];
+    let txHash;
+    // Register AssetProxies in Exchange
+    txHash = await exchange.registerAssetProxy.sendTransactionAsync(erc20proxy.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Registering ERC20Proxy');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+
+    txHash = await exchange.registerAssetProxy.sendTransactionAsync(erc721proxy.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Registering ERC721Proxy');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
 
-    // AssetProxyOwner
+    // Deploy AssetProxyOwner
+    const assetProxies = [erc20proxy.address, erc721proxy.address];
     const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync(
         artifacts.AssetProxyOwner,
         provider,
         txDefaults,
-        owners,
-        [erc20proxy.address, erc721proxy.address],
-        confirmationsRequired,
-        secondsRequired,
+        constants.ASSET_PROXY_OWNER_OWNERS,
+        assetProxies,
+        constants.ASSET_PROXY_OWNER_REQUIRED_CONFIRMATIONS,
+        constants.ASSET_PROXY_OWNER_SECONDS_TIMELOCKED,
     );
     artifactsWriter.saveArtifact(assetProxyOwner);
 
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
-            from: owner,
-        }),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, {
-            from: owner,
-        }),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
-            from: owner,
-        }),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, {
-            from: owner,
-        }),
-    );
-
-    // Register the Asset Proxies to the Exchange
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await exchange.registerAssetProxy.sendTransactionAsync(erc20proxy.address),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await exchange.registerAssetProxy.sendTransactionAsync(erc721proxy.address),
-    );
-
-    // Dummy ERC20 tokens
-    for (const token of erc20TokenInfo) {
-        const totalSupply = new BigNumber(1000000000000000000000000000);
-        // tslint:disable-next-line:no-unused-variable
-        const dummyErc20Token = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
-            artifacts.DummyERC20Token,
-            provider,
-            txDefaults,
-            token.name,
-            token.symbol,
-            token.decimals,
-            totalSupply,
-        );
-    }
-
-    // ERC721
-    // tslint:disable-next-line:no-unused-variable
-    const cryptoKittieToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-        artifacts.DummyERC721Token,
-        provider,
-        txDefaults,
-        erc721TokenInfo[0].name,
-        erc721TokenInfo[0].symbol,
-    );
-
-    // Forwarder
+    // Deploy Forwarder
+    const zrxAssetData = assetDataUtils.encodeERC20AssetData(constants.ZRX_ADDRESS);
+    const wethAssetData = assetDataUtils.encodeERC20AssetData(constants.WETH_ADDRESS);
     const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
         artifacts.Forwarder,
         provider,
         txDefaults,
         exchange.address,
-        assetDataUtils.encodeERC20AssetData(zrxToken.address),
-        assetDataUtils.encodeERC20AssetData(etherToken.address),
+        zrxAssetData,
+        wethAssetData,
     );
     artifactsWriter.saveArtifact(forwarder);
 
-    // OrderValidator
+    // Deploy OrderValidator
     const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync(
         artifacts.OrderValidator,
         provider,
@@ -152,4 +92,31 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         zrxAssetData,
     );
     artifactsWriter.saveArtifact(orderValidator);
+
+    // Authorize Exchange contracts to call AssetProxies
+    txHash = await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Authorizing Exchange on ERC20Proxy');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+
+    txHash = await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Authorizing Exchange on ERC721Proxy');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+
+    // Transfer ownership of AssetProxies and Exchange to AssetProxyOwner
+    txHash = await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Transferring ownership of ERC20Proxy');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+
+    txHash = await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Transferring ownership of ERC721Proxy');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+
+    txHash = await exchange.transferOwnership.sendTransactionAsync(assetProxyOwner.address);
+    logUtils.log(`transactionHash: ${txHash}`);
+    logUtils.log('Transferring ownership of Exchange');
+    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
 };
-- 
cgit v1.2.3


From e70882a657acecb7437ce9dd28218d719f8beb3d Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Tue, 4 Sep 2018 17:22:22 -0400
Subject: More small chnages/bug fixes

---
 packages/migrations/src/2.0.0/migration.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'packages/migrations/src/2.0.0/migration.ts')

diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index 4100a750c..0f20813f1 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -22,11 +22,7 @@ import { OrderValidatorContract } from './contract_wrappers/order_validator';
  * @param artifactsDir The directory with compiler artifact files.
  * @param txDefaults Default transaction values to use when deploying contracts.
  */
-export const runV2MainnetMigrationsAsync = async (
-    provider: Provider,
-    artifactsDir: string,
-    txDefaults: Partial<TxData>,
-) => {
+export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: string, txDefaults: Partial<TxData>) => {
     const web3Wrapper = new Web3Wrapper(provider);
     const networkId = await web3Wrapper.getNetworkIdAsync();
     const artifactsWriter = new ArtifactWriter(artifactsDir, networkId);
-- 
cgit v1.2.3


From 9d45d19c80bce5ead92049ab743501f6e40d515a Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Tue, 4 Sep 2018 18:10:23 -0400
Subject: More small artifacts updates/changes

---
 packages/migrations/src/2.0.0/migration.ts | 142 ++++++++++++++++++-----------
 1 file changed, 87 insertions(+), 55 deletions(-)

(limited to 'packages/migrations/src/2.0.0/migration.ts')

diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index 0f20813f1..1c30fb9ec 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -1,21 +1,25 @@
 import { assetDataUtils } from '@0xproject/order-utils';
-import { logUtils } from '@0xproject/utils';
+import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider, TxData } from 'ethereum-types';
 
 import { ArtifactWriter } from '../utils/artifact_writer';
+import { erc20TokenInfo, erc721TokenInfo } from '../utils/token_info';
 
 import { artifacts } from './artifacts';
-import { constants } from './constants';
 import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner';
+import { DummyERC20TokenContract } from './contract_wrappers/dummy_erc20_token';
+import { DummyERC721TokenContract } from './contract_wrappers/dummy_erc721_token';
 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';
 
 /**
- * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-mainnet' command.
+ * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2' command.
  * Migrations could be written to run in parallel, but if you want contract addresses to be created deterministically,
  * the migration should be written to run synchronously.
  * @param provider  Web3 provider instance.
@@ -27,7 +31,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
     const networkId = await web3Wrapper.getNetworkIdAsync();
     const artifactsWriter = new ArtifactWriter(artifactsDir, networkId);
 
-    // Deploy AssetProxies
+    // Proxies
     const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults);
     artifactsWriter.saveArtifact(erc20proxy);
     const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
@@ -37,49 +41,104 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
     );
     artifactsWriter.saveArtifact(erc721proxy);
 
-    // Deploy Exchange
+    // ZRX
+    const zrxToken = await ZRXTokenContract.deployFrom0xArtifactAsync(artifacts.ZRX, provider, txDefaults);
+    artifactsWriter.saveArtifact(zrxToken);
+
+    // Ether token
+    const etherToken = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults);
+    artifactsWriter.saveArtifact(etherToken);
+
+    // Exchange
+    const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
     const exchange = await ExchangeContract.deployFrom0xArtifactAsync(artifacts.Exchange, provider, txDefaults);
     artifactsWriter.saveArtifact(exchange);
 
-    let txHash;
-    // Register AssetProxies in Exchange
-    txHash = await exchange.registerAssetProxy.sendTransactionAsync(erc20proxy.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Registering ERC20Proxy');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-
-    txHash = await exchange.registerAssetProxy.sendTransactionAsync(erc721proxy.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Registering ERC721Proxy');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+    // Multisigs
+    const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync();
+    const owners = [accounts[0], accounts[1]];
+    const confirmationsRequired = new BigNumber(2);
+    const secondsRequired = new BigNumber(0);
+    const owner = accounts[0];
 
-    // Deploy AssetProxyOwner
-    const assetProxies = [erc20proxy.address, erc721proxy.address];
+    // AssetProxyOwner
     const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync(
         artifacts.AssetProxyOwner,
         provider,
         txDefaults,
-        constants.ASSET_PROXY_OWNER_OWNERS,
-        assetProxies,
-        constants.ASSET_PROXY_OWNER_REQUIRED_CONFIRMATIONS,
-        constants.ASSET_PROXY_OWNER_SECONDS_TIMELOCKED,
+        owners,
+        [erc20proxy.address, erc721proxy.address],
+        confirmationsRequired,
+        secondsRequired,
     );
     artifactsWriter.saveArtifact(assetProxyOwner);
 
-    // Deploy Forwarder
-    const zrxAssetData = assetDataUtils.encodeERC20AssetData(constants.ZRX_ADDRESS);
-    const wethAssetData = assetDataUtils.encodeERC20AssetData(constants.WETH_ADDRESS);
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
+            from: owner,
+        }),
+    );
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, {
+            from: owner,
+        }),
+    );
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
+            from: owner,
+        }),
+    );
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, {
+            from: owner,
+        }),
+    );
+
+    // Register the Asset Proxies to the Exchange
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await exchange.registerAssetProxy.sendTransactionAsync(erc20proxy.address),
+    );
+    await web3Wrapper.awaitTransactionSuccessAsync(
+        await exchange.registerAssetProxy.sendTransactionAsync(erc721proxy.address),
+    );
+
+    // Dummy ERC20 tokens
+    for (const token of erc20TokenInfo) {
+        const totalSupply = new BigNumber(1000000000000000000000000000);
+        // tslint:disable-next-line:no-unused-variable
+        const dummyErc20Token = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
+            artifacts.DummyERC20Token,
+            provider,
+            txDefaults,
+            token.name,
+            token.symbol,
+            token.decimals,
+            totalSupply,
+        );
+    }
+
+    // ERC721
+    // tslint:disable-next-line:no-unused-variable
+    const cryptoKittieToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync(
+        artifacts.DummyERC721Token,
+        provider,
+        txDefaults,
+        erc721TokenInfo[0].name,
+        erc721TokenInfo[0].symbol,
+    );
+
+    // Forwarder
     const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
         artifacts.Forwarder,
         provider,
         txDefaults,
         exchange.address,
-        zrxAssetData,
-        wethAssetData,
+        assetDataUtils.encodeERC20AssetData(zrxToken.address),
+        assetDataUtils.encodeERC20AssetData(etherToken.address),
     );
     artifactsWriter.saveArtifact(forwarder);
 
-    // Deploy OrderValidator
+    // OrderValidator
     const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync(
         artifacts.OrderValidator,
         provider,
@@ -88,31 +147,4 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
         zrxAssetData,
     );
     artifactsWriter.saveArtifact(orderValidator);
-
-    // Authorize Exchange contracts to call AssetProxies
-    txHash = await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Authorizing Exchange on ERC20Proxy');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-
-    txHash = await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Authorizing Exchange on ERC721Proxy');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-
-    // Transfer ownership of AssetProxies and Exchange to AssetProxyOwner
-    txHash = await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Transferring ownership of ERC20Proxy');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-
-    txHash = await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Transferring ownership of ERC721Proxy');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-
-    txHash = await exchange.transferOwnership.sendTransactionAsync(assetProxyOwner.address);
-    logUtils.log(`transactionHash: ${txHash}`);
-    logUtils.log('Transferring ownership of Exchange');
-    await web3Wrapper.awaitTransactionSuccessAsync(txHash);
 };
-- 
cgit v1.2.3


From 3a7bb97ad1182eb9c718797bda8dca5eb5d7f9cd Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Wed, 3 Oct 2018 16:21:17 -0700
Subject: Remove artifacts from migrations package and update contract-wrappers
 accordingly

---
 packages/migrations/src/2.0.0/migration.ts | 150 -----------------------------
 1 file changed, 150 deletions(-)
 delete mode 100644 packages/migrations/src/2.0.0/migration.ts

(limited to 'packages/migrations/src/2.0.0/migration.ts')

diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
deleted file mode 100644
index 1c30fb9ec..000000000
--- a/packages/migrations/src/2.0.0/migration.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { assetDataUtils } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { Provider, TxData } from 'ethereum-types';
-
-import { ArtifactWriter } from '../utils/artifact_writer';
-import { erc20TokenInfo, erc721TokenInfo } from '../utils/token_info';
-
-import { artifacts } from './artifacts';
-import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner';
-import { DummyERC20TokenContract } from './contract_wrappers/dummy_erc20_token';
-import { DummyERC721TokenContract } from './contract_wrappers/dummy_erc721_token';
-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';
-
-/**
- * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2' command.
- * Migrations could be written to run in parallel, but if you want contract addresses to be created deterministically,
- * the migration should be written to run synchronously.
- * @param provider  Web3 provider instance.
- * @param artifactsDir The directory with compiler artifact files.
- * @param txDefaults Default transaction values to use when deploying contracts.
- */
-export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: string, txDefaults: Partial<TxData>) => {
-    const web3Wrapper = new Web3Wrapper(provider);
-    const networkId = await web3Wrapper.getNetworkIdAsync();
-    const artifactsWriter = new ArtifactWriter(artifactsDir, networkId);
-
-    // Proxies
-    const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults);
-    artifactsWriter.saveArtifact(erc20proxy);
-    const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
-        artifacts.ERC721Proxy,
-        provider,
-        txDefaults,
-    );
-    artifactsWriter.saveArtifact(erc721proxy);
-
-    // ZRX
-    const zrxToken = await ZRXTokenContract.deployFrom0xArtifactAsync(artifacts.ZRX, provider, txDefaults);
-    artifactsWriter.saveArtifact(zrxToken);
-
-    // Ether token
-    const etherToken = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults);
-    artifactsWriter.saveArtifact(etherToken);
-
-    // Exchange
-    const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
-    const exchange = await ExchangeContract.deployFrom0xArtifactAsync(artifacts.Exchange, provider, txDefaults);
-    artifactsWriter.saveArtifact(exchange);
-
-    // Multisigs
-    const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync();
-    const owners = [accounts[0], accounts[1]];
-    const confirmationsRequired = new BigNumber(2);
-    const secondsRequired = new BigNumber(0);
-    const owner = accounts[0];
-
-    // AssetProxyOwner
-    const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync(
-        artifacts.AssetProxyOwner,
-        provider,
-        txDefaults,
-        owners,
-        [erc20proxy.address, erc721proxy.address],
-        confirmationsRequired,
-        secondsRequired,
-    );
-    artifactsWriter.saveArtifact(assetProxyOwner);
-
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
-            from: owner,
-        }),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, {
-            from: owner,
-        }),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, {
-            from: owner,
-        }),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, {
-            from: owner,
-        }),
-    );
-
-    // Register the Asset Proxies to the Exchange
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await exchange.registerAssetProxy.sendTransactionAsync(erc20proxy.address),
-    );
-    await web3Wrapper.awaitTransactionSuccessAsync(
-        await exchange.registerAssetProxy.sendTransactionAsync(erc721proxy.address),
-    );
-
-    // Dummy ERC20 tokens
-    for (const token of erc20TokenInfo) {
-        const totalSupply = new BigNumber(1000000000000000000000000000);
-        // tslint:disable-next-line:no-unused-variable
-        const dummyErc20Token = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
-            artifacts.DummyERC20Token,
-            provider,
-            txDefaults,
-            token.name,
-            token.symbol,
-            token.decimals,
-            totalSupply,
-        );
-    }
-
-    // ERC721
-    // tslint:disable-next-line:no-unused-variable
-    const cryptoKittieToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-        artifacts.DummyERC721Token,
-        provider,
-        txDefaults,
-        erc721TokenInfo[0].name,
-        erc721TokenInfo[0].symbol,
-    );
-
-    // Forwarder
-    const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
-        artifacts.Forwarder,
-        provider,
-        txDefaults,
-        exchange.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);
-};
-- 
cgit v1.2.3