From 760bab8f866ec3d5fc7627ce9bbf5c2eaaef1f36 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 8 Jun 2018 11:18:32 -0700
Subject: Implement SolidityProfiler & adapt sol-cov to work with Geth

---
 packages/migrations/src/v2/artifacts.ts |  4 ++--
 packages/migrations/src/v2/migration.ts | 29 ++++++++---------------------
 2 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'packages/migrations/src')

diff --git a/packages/migrations/src/v2/artifacts.ts b/packages/migrations/src/v2/artifacts.ts
index 3079e4d89..31dfc5abb 100644
--- a/packages/migrations/src/v2/artifacts.ts
+++ b/packages/migrations/src/v2/artifacts.ts
@@ -1,11 +1,11 @@
 import { ContractArtifact } from '@0xproject/sol-compiler';
 
+import * as AssetProxyOwner from '../../artifacts/2.0.0/AssetProxyOwner.json';
 import * as DummyERC20Token from '../../artifacts/2.0.0/DummyERC20Token.json';
 import * as DummyERC721Token from '../../artifacts/2.0.0/DummyERC721Token.json';
 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 MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress from '../../artifacts/2.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json';
 import * as WETH9 from '../../artifacts/2.0.0/WETH9.json';
 import * as ZRX from '../../artifacts/2.0.0/ZRXToken.json';
 
@@ -13,7 +13,7 @@ export const artifacts = {
     ZRX: (ZRX as any) as ContractArtifact,
     DummyERC20Token: (DummyERC20Token as any) as ContractArtifact,
     DummyERC721Token: (DummyERC721Token as any) as ContractArtifact,
-    MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: (MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress as any) as ContractArtifact,
+    AssetProxyOwner: (AssetProxyOwner as any) as ContractArtifact,
     Exchange: (Exchange as any) as ContractArtifact,
     WETH9: (WETH9 as any) as ContractArtifact,
     ERC20Proxy: (ERC20Proxy as any) as ContractArtifact,
diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts
index d517486ed..64f5d2d8b 100644
--- a/packages/migrations/src/v2/migration.ts
+++ b/packages/migrations/src/v2/migration.ts
@@ -6,12 +6,12 @@ import { ArtifactWriter } from '../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_e_r_c20_token';
 import { DummyERC721TokenContract } from './contract_wrappers/dummy_e_r_c721_token';
 import { ERC20ProxyContract } from './contract_wrappers/e_r_c20_proxy';
 import { ERC721ProxyContract } from './contract_wrappers/e_r_c721_proxy';
 import { ExchangeContract } from './contract_wrappers/exchange';
-import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from './contract_wrappers/multi_sig_wallet_with_time_lock_except_remove_authorized_address';
 import { WETH9Contract } from './contract_wrappers/weth9';
 import { ZRXTokenContract } from './contract_wrappers/zrx_token';
 
@@ -62,34 +62,21 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
     const secondsRequired = new BigNumber(0);
     const owner = accounts[0];
 
-    // TODO(leonid) use `AssetProxyOwner` after https://github.com/0xProject/0x-monorepo/pull/571 is merged
-    // ERC20 Multisig
-    const multiSigERC20 = await MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract.deployFrom0xArtifactAsync(
-        artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,
+    // AssetProxyOwner
+    const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync(
+        artifacts.AssetProxyOwner,
         provider,
         txDefaults,
         owners,
+        [erc20proxy.address, erc721proxy.address],
         confirmationsRequired,
         secondsRequired,
-        erc20proxy.address,
     );
-    artifactsWriter.saveArtifact(multiSigERC20);
+    artifactsWriter.saveArtifact(assetProxyOwner);
     await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner });
-    await erc20proxy.transferOwnership.sendTransactionAsync(multiSigERC20.address, { from: owner });
-
-    // ERC721 Multisig
-    const multiSigERC721 = await MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract.deployFrom0xArtifactAsync(
-        artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,
-        provider,
-        txDefaults,
-        owners,
-        confirmationsRequired,
-        secondsRequired,
-        erc721proxy.address,
-    );
-    artifactsWriter.saveArtifact(multiSigERC721);
+    await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { from: owner });
     await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner });
-    await erc721proxy.transferOwnership.sendTransactionAsync(multiSigERC721.address, { from: owner });
+    await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { from: owner });
 
     // Dummy ERC20 tokens
     for (const token of erc20TokenInfo) {
-- 
cgit v1.2.3