From 760bab8f866ec3d5fc7627ce9bbf5c2eaaef1f36 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 8 Jun 2018 11:18:32 -0700 Subject: Implement SolidityProfiler & adapt sol-cov to work with Geth --- packages/migrations/src/v2/migration.ts | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'packages/migrations/src/v2/migration.ts') 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 From 25866095dbc7ae7e08f1f44939c7cf1910d50b6b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 8 Jun 2018 13:12:07 -0700 Subject: Await transactions in migrations --- packages/migrations/src/v2/migration.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'packages/migrations/src/v2/migration.ts') diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts index 64f5d2d8b..f77063a1b 100644 --- a/packages/migrations/src/v2/migration.ts +++ b/packages/migrations/src/v2/migration.ts @@ -73,10 +73,18 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str secondsRequired, ); artifactsWriter.saveArtifact(assetProxyOwner); - await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner }); - await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { from: owner }); - await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner }); - await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { from: owner }); + 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 }), + ); // Dummy ERC20 tokens for (const token of erc20TokenInfo) { -- cgit v1.2.3