From f4a2e227e1a7224fbbe9c99d9aa033d176a9c4de Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 29 Jul 2018 21:58:39 +0200 Subject: Remove all in-package monorepo-scripts by adding doc gen/upload and aggregate release note publishing to publish script --- packages/migrations/src/monorepo_scripts/postpublish.ts | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 packages/migrations/src/monorepo_scripts/postpublish.ts (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/monorepo_scripts/postpublish.ts b/packages/migrations/src/monorepo_scripts/postpublish.ts deleted file mode 100644 index dcb99d0f7..000000000 --- a/packages/migrations/src/monorepo_scripts/postpublish.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { postpublishUtils } from '@0xproject/monorepo-scripts'; - -import * as packageJSON from '../package.json'; -import * as tsConfigJSON from '../tsconfig.json'; - -const cwd = `${__dirname}/..`; -// tslint:disable-next-line:no-floating-promises -postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd); -- cgit v1.2.3 From 1ba26ea5e8034699315b39f2f55917abea963555 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Tue, 21 Aug 2018 10:50:09 -0700 Subject: Remove redundant constructor args --- packages/migrations/src/2.0.0/migration.ts | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts index f51c236de..0566e67e8 100644 --- a/packages/migrations/src/2.0.0/migration.ts +++ b/packages/migrations/src/2.0.0/migration.ts @@ -135,8 +135,6 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str provider, txDefaults, exchange.address, - etherToken.address, - zrxToken.address, assetDataUtils.encodeERC20AssetData(zrxToken.address), assetDataUtils.encodeERC20AssetData(etherToken.address), ); -- cgit v1.2.3 From 3d25758b1d107528b0bc8a578e3c5ecf020395b3 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 19 Aug 2018 20:56:21 -0700 Subject: Add OrderValidator to migrations --- packages/migrations/src/2.0.0-beta-testnet/artifacts.ts | 2 ++ packages/migrations/src/2.0.0-beta-testnet/migration.ts | 10 ++++++++++ packages/migrations/src/2.0.0/artifacts.ts | 2 ++ packages/migrations/src/2.0.0/migration.ts | 12 ++++++++++++ 4 files changed, 26 insertions(+) (limited to 'packages/migrations/src') 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 c9a341eb3..5fcf14328 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..c5780615f 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,15 @@ export const runV2TestnetMigrationsAsync = async ( ); artifactsWriter.saveArtifact(assetProxyOwner); + // Deploy OrderValidator + const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync( + artifacts.OrderValidator, + provider, + txDefaults, + exchange.address, + ); + 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 8bbd1fcd9..da0dec6c0 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 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 Date: Tue, 21 Aug 2018 10:15:45 -0700 Subject: Add ZRX balances and allowances to TraderInfo --- packages/migrations/src/2.0.0-beta-testnet/migration.ts | 1 + packages/migrations/src/2.0.0/migration.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/migrations/src') 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 c5780615f..cc9f5a859 100644 --- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts +++ b/packages/migrations/src/2.0.0-beta-testnet/migration.ts @@ -82,6 +82,7 @@ export const runV2TestnetMigrationsAsync = async ( provider, txDefaults, exchange.address, + zrxAssetData, ); artifactsWriter.saveArtifact(orderValidator); 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 301cb296ec77e8af5c1722679e04cb983c848153 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 21 Aug 2018 23:58:06 +0100 Subject: Move types from sol-compiler to types so they can be used in other places without requiring sol-compiler as a dep --- packages/migrations/src/1.0.0/artifacts.ts | 2 +- packages/migrations/src/2.0.0-beta-testnet/artifacts.ts | 2 +- packages/migrations/src/2.0.0/artifacts.ts | 2 +- packages/migrations/src/utils/artifact_writer.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/1.0.0/artifacts.ts b/packages/migrations/src/1.0.0/artifacts.ts index d0a9f735a..f5226e174 100644 --- a/packages/migrations/src/1.0.0/artifacts.ts +++ b/packages/migrations/src/1.0.0/artifacts.ts @@ -1,4 +1,4 @@ -import { ContractArtifact } from '@0xproject/sol-compiler'; +import { ContractArtifact } from 'ethereum-types'; import * as DummyERC20Token from '../../artifacts/1.0.0/DummyERC20Token.json'; import * as Exchange from '../../artifacts/1.0.0/Exchange_v1.json'; 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 c9a341eb3..1c9ffd2d6 100644 --- a/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts +++ b/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts @@ -1,4 +1,4 @@ -import { ContractArtifact } from '@0xproject/sol-compiler'; +import { ContractArtifact } from 'ethereum-types'; import * as AssetProxyOwner from '../../artifacts/2.0.0-beta-testnet/AssetProxyOwner.json'; import * as ERC20Proxy from '../../artifacts/2.0.0-beta-testnet/ERC20Proxy.json'; diff --git a/packages/migrations/src/2.0.0/artifacts.ts b/packages/migrations/src/2.0.0/artifacts.ts index 8bbd1fcd9..8d66e3b63 100644 --- a/packages/migrations/src/2.0.0/artifacts.ts +++ b/packages/migrations/src/2.0.0/artifacts.ts @@ -1,4 +1,4 @@ -import { ContractArtifact } from '@0xproject/sol-compiler'; +import { ContractArtifact } from 'ethereum-types'; import * as AssetProxyOwner from '../../artifacts/2.0.0/AssetProxyOwner.json'; import * as DummyERC20Token from '../../artifacts/2.0.0/DummyERC20Token.json'; diff --git a/packages/migrations/src/utils/artifact_writer.ts b/packages/migrations/src/utils/artifact_writer.ts index b7522df05..ea9c7952d 100644 --- a/packages/migrations/src/utils/artifact_writer.ts +++ b/packages/migrations/src/utils/artifact_writer.ts @@ -1,5 +1,5 @@ import { BaseContract } from '@0xproject/base-contract'; -import { ContractArtifact } from '@0xproject/sol-compiler'; +import { ContractArtifact } from 'ethereum-types'; import * as fs from 'fs'; import * as path from 'path'; -- cgit v1.2.3 From 9304d09da6c3a78e25caf67a024b0cfef4a3b922 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 30 Aug 2018 13:38:57 -0700 Subject: Add mainnet migrations --- packages/migrations/src/2.0.0-mainnet/artifacts.ts | 17 +++ packages/migrations/src/2.0.0-mainnet/constants.ts | 13 +++ packages/migrations/src/2.0.0-mainnet/migration.ts | 122 +++++++++++++++++++++ packages/migrations/src/migrate.ts | 18 ++- 4 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 packages/migrations/src/2.0.0-mainnet/artifacts.ts create mode 100644 packages/migrations/src/2.0.0-mainnet/constants.ts create mode 100644 packages/migrations/src/2.0.0-mainnet/migration.ts (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/2.0.0-mainnet/artifacts.ts b/packages/migrations/src/2.0.0-mainnet/artifacts.ts new file mode 100644 index 000000000..8091fa9d0 --- /dev/null +++ b/packages/migrations/src/2.0.0-mainnet/artifacts.ts @@ -0,0 +1,17 @@ +import { ContractArtifact } from 'ethereum-types'; + +import * as AssetProxyOwner from '../../artifacts/2.0.0-mainnet/AssetProxyOwner.json'; +import * as ERC20Proxy from '../../artifacts/2.0.0-mainnet/ERC20Proxy.json'; +import * as ERC721Proxy from '../../artifacts/2.0.0-mainnet/ERC721Proxy.json'; +import * as Exchange from '../../artifacts/2.0.0-mainnet/Exchange.json'; +import * as Forwarder from '../../artifacts/2.0.0-mainnet/Forwarder.json'; +import * as OrderValidator from '../../artifacts/2.0.0-mainnet/OrderValidator.json'; + +export const artifacts = { + AssetProxyOwner: (AssetProxyOwner as any) as ContractArtifact, + ERC20Proxy: (ERC20Proxy as any) as ContractArtifact, + ERC721Proxy: (ERC721Proxy as any) as ContractArtifact, + Exchange: (Exchange 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-mainnet/constants.ts b/packages/migrations/src/2.0.0-mainnet/constants.ts new file mode 100644 index 000000000..99649f687 --- /dev/null +++ b/packages/migrations/src/2.0.0-mainnet/constants.ts @@ -0,0 +1,13 @@ +import { BigNumber } from '@0xproject/utils'; + +export const constants = { + ASSET_PROXY_OWNER_OWNERS: [ + '0x257619b7155d247e43c8b6d90c8c17278ae481f0', + '0x5ee2a00f8f01d099451844af7f894f26a57fcbf2', + '0x894d623e0e0e8ed12c4a73dada999e275684a37d', + ], + ASSET_PROXY_OWNER_REQUIRED_CONFIRMATIONS: new BigNumber(2), + ASSET_PROXY_OWNER_SECONDS_TIMELOCKED: new BigNumber(1209600), + WETH_ADDRESS: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', + ZRX_ADDRESS: '0xe41d2489571d322189246dafa5ebde1f4699f498', +}; diff --git a/packages/migrations/src/2.0.0-mainnet/migration.ts b/packages/migrations/src/2.0.0-mainnet/migration.ts new file mode 100644 index 000000000..4100a750c --- /dev/null +++ b/packages/migrations/src/2.0.0-mainnet/migration.ts @@ -0,0 +1,122 @@ +import { assetDataUtils } from '@0xproject/order-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 { artifacts } from './artifacts'; +import { constants } from './constants'; +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 { ForwarderContract } from './contract_wrappers/forwarder'; +import { OrderValidatorContract } from './contract_wrappers/order_validator'; + +/** + * 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 runV2MainnetMigrationsAsync = async ( + provider: Provider, + artifactsDir: string, + txDefaults: Partial, +) => { + const web3Wrapper = new Web3Wrapper(provider); + const networkId = await web3Wrapper.getNetworkIdAsync(); + const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); + + // Deploy AssetProxies + const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults); + artifactsWriter.saveArtifact(erc20proxy); + const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( + artifacts.ERC721Proxy, + provider, + txDefaults, + ); + artifactsWriter.saveArtifact(erc721proxy); + + // Deploy Exchange + 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); + + // Deploy AssetProxyOwner + const assetProxies = [erc20proxy.address, erc721proxy.address]; + 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, + ); + artifactsWriter.saveArtifact(assetProxyOwner); + + // 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, + zrxAssetData, + wethAssetData, + ); + artifactsWriter.saveArtifact(forwarder); + + // 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}`); + 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); +}; diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts index c46d3580a..6c8b38762 100644 --- a/packages/migrations/src/migrate.ts +++ b/packages/migrations/src/migrate.ts @@ -7,6 +7,7 @@ import * as yargs from 'yargs'; import { runV1MigrationsAsync } from './1.0.0/migration'; import { runV2TestnetMigrationsAsync } from './2.0.0-beta-testnet/migration'; +import { runV2MainnetMigrationsAsync } from './2.0.0-mainnet/migration'; import { runV2MigrationsAsync } from './2.0.0/migration'; import { providerFactory } from './utils/provider_factory'; @@ -15,6 +16,7 @@ enum ContractVersions { V1 = '1.0.0', V2 = '2.0.0', V2Testnet = '2.0.0-beta-testnet', + V2Mainnet = '2.0.0-mainnet', } const args = yargs.argv; @@ -24,6 +26,8 @@ const args = yargs.argv; let providerConfigs; let provider: Provider; let txDefaults; + let web3Wrapper: Web3Wrapper; + let accounts: string[]; switch (contractsVersion) { case ContractVersions.V1: providerConfigs = { shouldUseInProcessGanache: false }; @@ -43,14 +47,24 @@ const args = yargs.argv; break; case ContractVersions.V2Testnet: provider = await providerFactory.getLedgerProviderAsync(); - const web3Wrapper = new Web3Wrapper(provider); - const accounts = await web3Wrapper.getAvailableAddressesAsync(); + web3Wrapper = new Web3Wrapper(provider); + accounts = await web3Wrapper.getAvailableAddressesAsync(); txDefaults = { from: accounts[0], gas: devConstants.GAS_LIMIT, }; await runV2TestnetMigrationsAsync(provider, artifactsDir, txDefaults); break; + case ContractVersions.V2Mainnet: + provider = await providerFactory.getLedgerProviderAsync(); + web3Wrapper = new Web3Wrapper(provider); + accounts = await web3Wrapper.getAvailableAddressesAsync(); + txDefaults = { + from: accounts[0], + gas: devConstants.GAS_LIMIT, + }; + await runV2MainnetMigrationsAsync(provider, artifactsDir, txDefaults); + break; default: throw new Error(`Unsupported contract version: ${contractsVersion}`); } -- cgit v1.2.3 From 66ed6b9b887b97fa117d91f1034ad1aa3c095249 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Tue, 4 Sep 2018 09:48:13 -0700 Subject: Update mainnet configs --- packages/migrations/src/migrate.ts | 7 ++++--- packages/migrations/src/utils/constants.ts | 2 ++ packages/migrations/src/utils/provider_factory.ts | 14 +++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts index 6c8b38762..e3651f2dc 100644 --- a/packages/migrations/src/migrate.ts +++ b/packages/migrations/src/migrate.ts @@ -46,7 +46,7 @@ const args = yargs.argv; await runV2MigrationsAsync(provider, artifactsDir, txDefaults); break; case ContractVersions.V2Testnet: - provider = await providerFactory.getLedgerProviderAsync(); + provider = await providerFactory.getKovanLedgerProviderAsync(); web3Wrapper = new Web3Wrapper(provider); accounts = await web3Wrapper.getAvailableAddressesAsync(); txDefaults = { @@ -56,12 +56,13 @@ const args = yargs.argv; await runV2TestnetMigrationsAsync(provider, artifactsDir, txDefaults); break; case ContractVersions.V2Mainnet: - provider = await providerFactory.getLedgerProviderAsync(); + provider = await providerFactory.getMainnetLedgerProviderAsync(); web3Wrapper = new Web3Wrapper(provider); accounts = await web3Wrapper.getAvailableAddressesAsync(); txDefaults = { - from: accounts[0], + from: accounts[2], gas: devConstants.GAS_LIMIT, + gasPrice: 6000000000, }; await runV2MainnetMigrationsAsync(provider, artifactsDir, txDefaults); break; diff --git a/packages/migrations/src/utils/constants.ts b/packages/migrations/src/utils/constants.ts index 4ae2ff833..63898ac02 100644 --- a/packages/migrations/src/utils/constants.ts +++ b/packages/migrations/src/utils/constants.ts @@ -13,4 +13,6 @@ export const constants = { NULL_ADDRESS: '0x0000000000000000000000000000000000000000', KOVAN_RPC_URL: 'https://kovan.infura.io/', KOVAN_NETWORK_ID: 42, + MAINNET_RPC_URL: 'https://mainnet.infura.io/', + MAINNET_NETWORK_ID: 1, }; diff --git a/packages/migrations/src/utils/provider_factory.ts b/packages/migrations/src/utils/provider_factory.ts index a0d4e436e..e7e00a039 100644 --- a/packages/migrations/src/utils/provider_factory.ts +++ b/packages/migrations/src/utils/provider_factory.ts @@ -12,7 +12,7 @@ async function ledgerEthereumNodeJsClientFactoryAsync(): Promise { + async getKovanLedgerProviderAsync(): Promise { const provider = new Web3ProviderEngine(); const ledgerWalletConfigs = { networkId: constants.KOVAN_NETWORK_ID, @@ -24,4 +24,16 @@ export const providerFactory = { provider.start(); return provider; }, + async getMainnetLedgerProviderAsync(): Promise { + const provider = new Web3ProviderEngine(); + const ledgerWalletConfigs = { + networkId: constants.MAINNET_NETWORK_ID, + ledgerEthereumClientFactoryAsync: ledgerEthereumNodeJsClientFactoryAsync, + }; + const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs); + provider.addProvider(ledgerSubprovider); + provider.addProvider(new RPCSubprovider(constants.MAINNET_RPC_URL)); + provider.start(); + return provider; + }, }; -- cgit v1.2.3 From ab1b52ba87718e39e730d4ef14db21a7fa1d78cf Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Tue, 4 Sep 2018 19:29:40 +0100 Subject: Ropsten/Kovan Contract deployment --- .../migrations/src/2.0.0-beta-testnet/artifacts.ts | 8 +++ .../migrations/src/2.0.0-beta-testnet/migration.ts | 81 ++++++++++++++++++++-- packages/migrations/src/utils/token_info.ts | 18 ++++- 3 files changed, 101 insertions(+), 6 deletions(-) (limited to 'packages/migrations/src') 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 a9c7235c1..ba5fa68a4 100644 --- a/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts +++ b/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts @@ -1,15 +1,23 @@ import { ContractArtifact } from 'ethereum-types'; import * as AssetProxyOwner from '../../artifacts/2.0.0-beta-testnet/AssetProxyOwner.json'; +import * as DummyERC20Token from '../../artifacts/2.0.0-beta-testnet/DummyERC20Token.json'; +import * as DummyERC721Token from '../../artifacts/2.0.0-beta-testnet/DummyERC721Token.json'; 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 Forwarder from '../../artifacts/2.0.0-beta-testnet/Forwarder.json'; import * as OrderValidator from '../../artifacts/2.0.0-beta-testnet/OrderValidator.json'; +import * as ZRXToken from '../../artifacts/2.0.0-beta-testnet/ZRXToken.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, + DummyERC721Token: (DummyERC721Token as any) as ContractArtifact, + DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, + Forwarder: (Forwarder as any) as ContractArtifact, OrderValidator: (OrderValidator as any) as ContractArtifact, + ZRX: (ZRXToken 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 cc9f5a859..66bc79239 100644 --- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts +++ b/packages/migrations/src/2.0.0-beta-testnet/migration.ts @@ -1,19 +1,24 @@ import { assetDataUtils } from '@0xproject/order-utils'; -import { logUtils } from '@0xproject/utils'; +import { BigNumber, logUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Provider, TxData } from 'ethereum-types'; import { ArtifactWriter } from '../utils/artifact_writer'; - import { constants } from '../utils/constants'; +import { erc20TokenInfo, erc721TokenInfo, etherTokenByNetwork } 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'; +const ERC20_TOTAL_SUPPLY = new BigNumber(1000000000000000000000000000); + /** * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-beta-testnet' command. * Migrations could be written to run in parallel, but if you want contract addresses to be created deterministically, @@ -41,9 +46,21 @@ export const runV2TestnetMigrationsAsync = async ( ); artifactsWriter.saveArtifact(erc721proxy); + const zrxDecimals = new BigNumber(18); + const zrxSupply = ERC20_TOTAL_SUPPLY; + const zrxToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC20Token, + provider, + txDefaults, + '0x Protocol Token', + 'ZRX', + zrxDecimals, + zrxSupply, + ); + artifactsWriter.saveArtifact(zrxToken); + // Deploy Exchange - const zrxAddressOnKovan = '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570'; - const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxAddressOnKovan); + const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const exchange = await ExchangeContract.deployFrom0xArtifactAsync( artifacts.Exchange, provider, @@ -63,6 +80,18 @@ export const runV2TestnetMigrationsAsync = async ( logUtils.log(`transactionHash: ${txHash}`); logUtils.log('Registering ERC721Proxy'); await web3Wrapper.awaitTransactionSuccessAsync(txHash); + // Ether token is already deployed on various test nets + const etherTokenAddress = etherTokenByNetwork[networkId].address; + const wethAssetData = assetDataUtils.encodeERC20AssetData(etherTokenAddress); + const forwarder = await ForwarderContract.deployFrom0xArtifactAsync( + artifacts.Forwarder, + provider, + txDefaults, + exchange.address, + zrxAssetData, + wethAssetData, + ); + artifactsWriter.saveArtifact(forwarder); // Deploy AssetProxyOwner const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync( @@ -112,4 +141,48 @@ export const runV2TestnetMigrationsAsync = async ( logUtils.log(`transactionHash: ${txHash}`); logUtils.log('Transferring ownership of Exchange'); await web3Wrapper.awaitTransactionSuccessAsync(txHash); + + // Set enough ZRX Balance to the Forwarder + const maxZRXMintAmount = await zrxToken.MAX_MINT_AMOUNT.callAsync(); + const forwarderZRXBalance = maxZRXMintAmount.times(10); + txHash = await zrxToken.setBalance.sendTransactionAsync(forwarder.address, forwarderZRXBalance); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + + txHash = await zrxToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); + logUtils.log(`transactionHash: ${txHash}`); + logUtils.log('Transferring ownership of ZRX token'); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + + // Dummy Tokens + for (const token of erc20TokenInfo) { + const totalSupply = ERC20_TOTAL_SUPPLY; + const dummyToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC20Token, + provider, + txDefaults, + token.name, + token.symbol, + token.decimals, + totalSupply, + ); + logUtils.log(`DummyERC20 ${token.name}: ${dummyToken.address}`); + txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); + logUtils.log(`transactionHash: ${txHash}`); + logUtils.log(`Transferring ownership of ${token.name} `); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + } + for (const token of erc721TokenInfo) { + const dummyToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC721Token, + provider, + txDefaults, + token.name, + token.symbol, + ); + logUtils.log(`DummyERC721 ${token.name}: ${dummyToken.address}`); + txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); + logUtils.log(`transactionHash: ${txHash}`); + logUtils.log(`Transferring ownership of ${token.name} `); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + } }; diff --git a/packages/migrations/src/utils/token_info.ts b/packages/migrations/src/utils/token_info.ts index 7975c2174..200f94896 100644 --- a/packages/migrations/src/utils/token_info.ts +++ b/packages/migrations/src/utils/token_info.ts @@ -2,6 +2,20 @@ import { BigNumber, NULL_BYTES } from '@0xproject/utils'; import { ERC20Token, ERC721Token } from '../types'; +export const etherTokenByNetwork: { [networkId: number]: { address: string } } = { + 3: { + address: '0xc778417e063141139fce010982780140aa0cd5ab', + }, + 4: { + address: '0xc778417e063141139fce010982780140aa0cd5ab', + }, + 42: { + address: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', + }, + 50: { + address: '', + }, +}; export const erc20TokenInfo: ERC20Token[] = [ { name: 'Augur Reputation Token', @@ -42,7 +56,7 @@ export const erc20TokenInfo: ERC20Token[] = [ export const erc721TokenInfo: ERC721Token[] = [ { - name: 'CryptoKitties', - symbol: 'CK', + name: '0xen ERC721', + symbol: '0xen', }, ]; -- cgit v1.2.3 From 508e6ccf89cdca9198ec2e98937a0e2e354d289b Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Tue, 4 Sep 2018 19:57:05 +0100 Subject: Tslint magic-number --- packages/migrations/src/2.0.0-beta-testnet/migration.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/migrations/src') 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 66bc79239..62a16ddae 100644 --- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts +++ b/packages/migrations/src/2.0.0-beta-testnet/migration.ts @@ -17,6 +17,7 @@ import { ExchangeContract } from './contract_wrappers/exchange'; import { ForwarderContract } from './contract_wrappers/forwarder'; import { OrderValidatorContract } from './contract_wrappers/order_validator'; +// tslint:disable-next-line:custom-no-magic-numbers const ERC20_TOTAL_SUPPLY = new BigNumber(1000000000000000000000000000); /** @@ -144,6 +145,7 @@ export const runV2TestnetMigrationsAsync = async ( // Set enough ZRX Balance to the Forwarder const maxZRXMintAmount = await zrxToken.MAX_MINT_AMOUNT.callAsync(); + // tslint:disable-next-line:custom-no-magic-numbers const forwarderZRXBalance = maxZRXMintAmount.times(10); txHash = await zrxToken.setBalance.sendTransactionAsync(forwarder.address, forwarderZRXBalance); await web3Wrapper.awaitTransactionSuccessAsync(txHash); -- cgit v1.2.3 From e456332da71f1ed6c6799fabe6c635985ec2ce9d Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 4 Sep 2018 16:47:01 -0400 Subject: Rename and update some artifact locations --- .../migrations/src/2.0.0-beta-testnet/artifacts.ts | 23 --- .../migrations/src/2.0.0-beta-testnet/migration.ts | 190 --------------------- packages/migrations/src/2.0.0-mainnet/artifacts.ts | 17 -- packages/migrations/src/2.0.0-mainnet/constants.ts | 13 -- packages/migrations/src/2.0.0-mainnet/migration.ts | 122 ------------- packages/migrations/src/2.0.0-testnet/artifacts.ts | 23 +++ packages/migrations/src/2.0.0-testnet/migration.ts | 190 +++++++++++++++++++++ packages/migrations/src/2.0.0/artifacts.ts | 10 +- packages/migrations/src/2.0.0/constants.ts | 13 ++ packages/migrations/src/2.0.0/migration.ts | 155 +++++++---------- 10 files changed, 288 insertions(+), 468 deletions(-) delete mode 100644 packages/migrations/src/2.0.0-beta-testnet/artifacts.ts delete mode 100644 packages/migrations/src/2.0.0-beta-testnet/migration.ts delete mode 100644 packages/migrations/src/2.0.0-mainnet/artifacts.ts delete mode 100644 packages/migrations/src/2.0.0-mainnet/constants.ts delete mode 100644 packages/migrations/src/2.0.0-mainnet/migration.ts create mode 100644 packages/migrations/src/2.0.0-testnet/artifacts.ts create mode 100644 packages/migrations/src/2.0.0-testnet/migration.ts create mode 100644 packages/migrations/src/2.0.0/constants.ts (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts b/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts deleted file mode 100644 index ba5fa68a4..000000000 --- a/packages/migrations/src/2.0.0-beta-testnet/artifacts.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as AssetProxyOwner from '../../artifacts/2.0.0-beta-testnet/AssetProxyOwner.json'; -import * as DummyERC20Token from '../../artifacts/2.0.0-beta-testnet/DummyERC20Token.json'; -import * as DummyERC721Token from '../../artifacts/2.0.0-beta-testnet/DummyERC721Token.json'; -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 Forwarder from '../../artifacts/2.0.0-beta-testnet/Forwarder.json'; -import * as OrderValidator from '../../artifacts/2.0.0-beta-testnet/OrderValidator.json'; -import * as ZRXToken from '../../artifacts/2.0.0-beta-testnet/ZRXToken.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, - DummyERC721Token: (DummyERC721Token as any) as ContractArtifact, - DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, - Forwarder: (Forwarder as any) as ContractArtifact, - OrderValidator: (OrderValidator as any) as ContractArtifact, - ZRX: (ZRXToken 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 deleted file mode 100644 index 62a16ddae..000000000 --- a/packages/migrations/src/2.0.0-beta-testnet/migration.ts +++ /dev/null @@ -1,190 +0,0 @@ -import { assetDataUtils } from '@0xproject/order-utils'; -import { BigNumber, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; -import { Provider, TxData } from 'ethereum-types'; - -import { ArtifactWriter } from '../utils/artifact_writer'; -import { constants } from '../utils/constants'; -import { erc20TokenInfo, erc721TokenInfo, etherTokenByNetwork } 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'; - -// tslint:disable-next-line:custom-no-magic-numbers -const ERC20_TOTAL_SUPPLY = new BigNumber(1000000000000000000000000000); - -/** - * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-beta-testnet' 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 runV2TestnetMigrationsAsync = async ( - provider: Provider, - artifactsDir: string, - txDefaults: Partial, -) => { - const web3Wrapper = new Web3Wrapper(provider); - const networkId = await web3Wrapper.getNetworkIdAsync(); - const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); - - // Deploy AssetProxies - const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults); - artifactsWriter.saveArtifact(erc20proxy); - const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( - artifacts.ERC721Proxy, - provider, - txDefaults, - ); - artifactsWriter.saveArtifact(erc721proxy); - - const zrxDecimals = new BigNumber(18); - const zrxSupply = ERC20_TOTAL_SUPPLY; - const zrxToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( - artifacts.DummyERC20Token, - provider, - txDefaults, - '0x Protocol Token', - 'ZRX', - zrxDecimals, - zrxSupply, - ); - artifactsWriter.saveArtifact(zrxToken); - - // Deploy Exchange - const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); - const exchange = await ExchangeContract.deployFrom0xArtifactAsync( - artifacts.Exchange, - provider, - txDefaults, - zrxAssetData, - ); - 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); - // Ether token is already deployed on various test nets - const etherTokenAddress = etherTokenByNetwork[networkId].address; - const wethAssetData = assetDataUtils.encodeERC20AssetData(etherTokenAddress); - const forwarder = await ForwarderContract.deployFrom0xArtifactAsync( - artifacts.Forwarder, - provider, - txDefaults, - exchange.address, - zrxAssetData, - wethAssetData, - ); - artifactsWriter.saveArtifact(forwarder); - - // Deploy AssetProxyOwner - const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync( - artifacts.AssetProxyOwner, - provider, - txDefaults, - constants.ASSET_PROXY_OWNER_OWNERS, - [erc20proxy.address, erc721proxy.address], - constants.ASSET_PROXY_OWNER_CONFIRMATIONS, - constants.ASSET_PROXY_OWNER_TIMELOCK, - ); - 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}`); - 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); - - // Set enough ZRX Balance to the Forwarder - const maxZRXMintAmount = await zrxToken.MAX_MINT_AMOUNT.callAsync(); - // tslint:disable-next-line:custom-no-magic-numbers - const forwarderZRXBalance = maxZRXMintAmount.times(10); - txHash = await zrxToken.setBalance.sendTransactionAsync(forwarder.address, forwarderZRXBalance); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - - txHash = await zrxToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); - logUtils.log(`transactionHash: ${txHash}`); - logUtils.log('Transferring ownership of ZRX token'); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - - // Dummy Tokens - for (const token of erc20TokenInfo) { - const totalSupply = ERC20_TOTAL_SUPPLY; - const dummyToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( - artifacts.DummyERC20Token, - provider, - txDefaults, - token.name, - token.symbol, - token.decimals, - totalSupply, - ); - logUtils.log(`DummyERC20 ${token.name}: ${dummyToken.address}`); - txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); - logUtils.log(`transactionHash: ${txHash}`); - logUtils.log(`Transferring ownership of ${token.name} `); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - } - for (const token of erc721TokenInfo) { - const dummyToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync( - artifacts.DummyERC721Token, - provider, - txDefaults, - token.name, - token.symbol, - ); - logUtils.log(`DummyERC721 ${token.name}: ${dummyToken.address}`); - txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); - logUtils.log(`transactionHash: ${txHash}`); - logUtils.log(`Transferring ownership of ${token.name} `); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - } -}; diff --git a/packages/migrations/src/2.0.0-mainnet/artifacts.ts b/packages/migrations/src/2.0.0-mainnet/artifacts.ts deleted file mode 100644 index 8091fa9d0..000000000 --- a/packages/migrations/src/2.0.0-mainnet/artifacts.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as AssetProxyOwner from '../../artifacts/2.0.0-mainnet/AssetProxyOwner.json'; -import * as ERC20Proxy from '../../artifacts/2.0.0-mainnet/ERC20Proxy.json'; -import * as ERC721Proxy from '../../artifacts/2.0.0-mainnet/ERC721Proxy.json'; -import * as Exchange from '../../artifacts/2.0.0-mainnet/Exchange.json'; -import * as Forwarder from '../../artifacts/2.0.0-mainnet/Forwarder.json'; -import * as OrderValidator from '../../artifacts/2.0.0-mainnet/OrderValidator.json'; - -export const artifacts = { - AssetProxyOwner: (AssetProxyOwner as any) as ContractArtifact, - ERC20Proxy: (ERC20Proxy as any) as ContractArtifact, - ERC721Proxy: (ERC721Proxy as any) as ContractArtifact, - Exchange: (Exchange 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-mainnet/constants.ts b/packages/migrations/src/2.0.0-mainnet/constants.ts deleted file mode 100644 index 99649f687..000000000 --- a/packages/migrations/src/2.0.0-mainnet/constants.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { BigNumber } from '@0xproject/utils'; - -export const constants = { - ASSET_PROXY_OWNER_OWNERS: [ - '0x257619b7155d247e43c8b6d90c8c17278ae481f0', - '0x5ee2a00f8f01d099451844af7f894f26a57fcbf2', - '0x894d623e0e0e8ed12c4a73dada999e275684a37d', - ], - ASSET_PROXY_OWNER_REQUIRED_CONFIRMATIONS: new BigNumber(2), - ASSET_PROXY_OWNER_SECONDS_TIMELOCKED: new BigNumber(1209600), - WETH_ADDRESS: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - ZRX_ADDRESS: '0xe41d2489571d322189246dafa5ebde1f4699f498', -}; diff --git a/packages/migrations/src/2.0.0-mainnet/migration.ts b/packages/migrations/src/2.0.0-mainnet/migration.ts deleted file mode 100644 index 4100a750c..000000000 --- a/packages/migrations/src/2.0.0-mainnet/migration.ts +++ /dev/null @@ -1,122 +0,0 @@ -import { assetDataUtils } from '@0xproject/order-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 { artifacts } from './artifacts'; -import { constants } from './constants'; -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 { ForwarderContract } from './contract_wrappers/forwarder'; -import { OrderValidatorContract } from './contract_wrappers/order_validator'; - -/** - * 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 runV2MainnetMigrationsAsync = async ( - provider: Provider, - artifactsDir: string, - txDefaults: Partial, -) => { - const web3Wrapper = new Web3Wrapper(provider); - const networkId = await web3Wrapper.getNetworkIdAsync(); - const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); - - // Deploy AssetProxies - const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults); - artifactsWriter.saveArtifact(erc20proxy); - const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( - artifacts.ERC721Proxy, - provider, - txDefaults, - ); - artifactsWriter.saveArtifact(erc721proxy); - - // Deploy Exchange - 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); - - // Deploy AssetProxyOwner - const assetProxies = [erc20proxy.address, erc721proxy.address]; - 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, - ); - artifactsWriter.saveArtifact(assetProxyOwner); - - // 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, - zrxAssetData, - wethAssetData, - ); - artifactsWriter.saveArtifact(forwarder); - - // 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}`); - 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); -}; diff --git a/packages/migrations/src/2.0.0-testnet/artifacts.ts b/packages/migrations/src/2.0.0-testnet/artifacts.ts new file mode 100644 index 000000000..f1c6ecd88 --- /dev/null +++ b/packages/migrations/src/2.0.0-testnet/artifacts.ts @@ -0,0 +1,23 @@ +import { ContractArtifact } from 'ethereum-types'; + +import * as AssetProxyOwner from '../../artifacts/2.0.0-testnet/AssetProxyOwner.json'; +import * as DummyERC20Token from '../../artifacts/2.0.0-testnet/DummyERC20Token.json'; +import * as DummyERC721Token from '../../artifacts/2.0.0-testnet/DummyERC721Token.json'; +import * as ERC20Proxy from '../../artifacts/2.0.0-testnet/ERC20Proxy.json'; +import * as ERC721Proxy from '../../artifacts/2.0.0-testnet/ERC721Proxy.json'; +import * as Exchange from '../../artifacts/2.0.0-testnet/Exchange.json'; +import * as Forwarder from '../../artifacts/2.0.0-testnet/Forwarder.json'; +import * as OrderValidator from '../../artifacts/2.0.0-testnet/OrderValidator.json'; +import * as ZRXToken from '../../artifacts/2.0.0-testnet/ZRXToken.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, + DummyERC721Token: (DummyERC721Token as any) as ContractArtifact, + DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, + Forwarder: (Forwarder as any) as ContractArtifact, + OrderValidator: (OrderValidator as any) as ContractArtifact, + ZRX: (ZRXToken as any) as ContractArtifact, +}; diff --git a/packages/migrations/src/2.0.0-testnet/migration.ts b/packages/migrations/src/2.0.0-testnet/migration.ts new file mode 100644 index 000000000..62a16ddae --- /dev/null +++ b/packages/migrations/src/2.0.0-testnet/migration.ts @@ -0,0 +1,190 @@ +import { assetDataUtils } from '@0xproject/order-utils'; +import { BigNumber, logUtils } from '@0xproject/utils'; +import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Provider, TxData } from 'ethereum-types'; + +import { ArtifactWriter } from '../utils/artifact_writer'; +import { constants } from '../utils/constants'; +import { erc20TokenInfo, erc721TokenInfo, etherTokenByNetwork } 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'; + +// tslint:disable-next-line:custom-no-magic-numbers +const ERC20_TOTAL_SUPPLY = new BigNumber(1000000000000000000000000000); + +/** + * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-beta-testnet' 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 runV2TestnetMigrationsAsync = async ( + provider: Provider, + artifactsDir: string, + txDefaults: Partial, +) => { + const web3Wrapper = new Web3Wrapper(provider); + const networkId = await web3Wrapper.getNetworkIdAsync(); + const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); + + // Deploy AssetProxies + const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults); + artifactsWriter.saveArtifact(erc20proxy); + const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( + artifacts.ERC721Proxy, + provider, + txDefaults, + ); + artifactsWriter.saveArtifact(erc721proxy); + + const zrxDecimals = new BigNumber(18); + const zrxSupply = ERC20_TOTAL_SUPPLY; + const zrxToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC20Token, + provider, + txDefaults, + '0x Protocol Token', + 'ZRX', + zrxDecimals, + zrxSupply, + ); + artifactsWriter.saveArtifact(zrxToken); + + // Deploy Exchange + const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); + const exchange = await ExchangeContract.deployFrom0xArtifactAsync( + artifacts.Exchange, + provider, + txDefaults, + zrxAssetData, + ); + 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); + // Ether token is already deployed on various test nets + const etherTokenAddress = etherTokenByNetwork[networkId].address; + const wethAssetData = assetDataUtils.encodeERC20AssetData(etherTokenAddress); + const forwarder = await ForwarderContract.deployFrom0xArtifactAsync( + artifacts.Forwarder, + provider, + txDefaults, + exchange.address, + zrxAssetData, + wethAssetData, + ); + artifactsWriter.saveArtifact(forwarder); + + // Deploy AssetProxyOwner + const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync( + artifacts.AssetProxyOwner, + provider, + txDefaults, + constants.ASSET_PROXY_OWNER_OWNERS, + [erc20proxy.address, erc721proxy.address], + constants.ASSET_PROXY_OWNER_CONFIRMATIONS, + constants.ASSET_PROXY_OWNER_TIMELOCK, + ); + 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}`); + 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); + + // Set enough ZRX Balance to the Forwarder + const maxZRXMintAmount = await zrxToken.MAX_MINT_AMOUNT.callAsync(); + // tslint:disable-next-line:custom-no-magic-numbers + const forwarderZRXBalance = maxZRXMintAmount.times(10); + txHash = await zrxToken.setBalance.sendTransactionAsync(forwarder.address, forwarderZRXBalance); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + + txHash = await zrxToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); + logUtils.log(`transactionHash: ${txHash}`); + logUtils.log('Transferring ownership of ZRX token'); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + + // Dummy Tokens + for (const token of erc20TokenInfo) { + const totalSupply = ERC20_TOTAL_SUPPLY; + const dummyToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC20Token, + provider, + txDefaults, + token.name, + token.symbol, + token.decimals, + totalSupply, + ); + logUtils.log(`DummyERC20 ${token.name}: ${dummyToken.address}`); + txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); + logUtils.log(`transactionHash: ${txHash}`); + logUtils.log(`Transferring ownership of ${token.name} `); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + } + for (const token of erc721TokenInfo) { + const dummyToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC721Token, + provider, + txDefaults, + token.name, + token.symbol, + ); + logUtils.log(`DummyERC721 ${token.name}: ${dummyToken.address}`); + txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); + logUtils.log(`transactionHash: ${txHash}`); + logUtils.log(`Transferring ownership of ${token.name} `); + await web3Wrapper.awaitTransactionSuccessAsync(txHash); + } +}; diff --git a/packages/migrations/src/2.0.0/artifacts.ts b/packages/migrations/src/2.0.0/artifacts.ts index e96c555d6..65736c001 100644 --- a/packages/migrations/src/2.0.0/artifacts.ts +++ b/packages/migrations/src/2.0.0/artifacts.ts @@ -1,25 +1,17 @@ import { ContractArtifact } from 'ethereum-types'; 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 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'; export const artifacts = { - ZRX: (ZRX as any) as ContractArtifact, - DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, - DummyERC721Token: (DummyERC721Token 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, ERC721Proxy: (ERC721Proxy as any) as ContractArtifact, + Exchange: (Exchange 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/constants.ts b/packages/migrations/src/2.0.0/constants.ts new file mode 100644 index 000000000..99649f687 --- /dev/null +++ b/packages/migrations/src/2.0.0/constants.ts @@ -0,0 +1,13 @@ +import { BigNumber } from '@0xproject/utils'; + +export const constants = { + ASSET_PROXY_OWNER_OWNERS: [ + '0x257619b7155d247e43c8b6d90c8c17278ae481f0', + '0x5ee2a00f8f01d099451844af7f894f26a57fcbf2', + '0x894d623e0e0e8ed12c4a73dada999e275684a37d', + ], + ASSET_PROXY_OWNER_REQUIRED_CONFIRMATIONS: new BigNumber(2), + ASSET_PROXY_OWNER_SECONDS_TIMELOCKED: new BigNumber(1209600), + WETH_ADDRESS: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', + ZRX_ADDRESS: '0xe41d2489571d322189246dafa5ebde1f4699f498', +}; 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) => { +export const runV2MainnetMigrationsAsync = async ( + provider: Provider, + artifactsDir: string, + txDefaults: Partial, +) => { 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 Date: Tue, 4 Sep 2018 17:22:22 -0400 Subject: More small chnages/bug fixes --- packages/migrations/src/2.0.0-testnet/artifacts.ts | 23 --- packages/migrations/src/2.0.0-testnet/migration.ts | 190 --------------------- packages/migrations/src/2.0.0/migration.ts | 6 +- packages/migrations/src/index.ts | 1 - packages/migrations/src/migrate.ts | 30 ---- 5 files changed, 1 insertion(+), 249 deletions(-) delete mode 100644 packages/migrations/src/2.0.0-testnet/artifacts.ts delete mode 100644 packages/migrations/src/2.0.0-testnet/migration.ts (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/2.0.0-testnet/artifacts.ts b/packages/migrations/src/2.0.0-testnet/artifacts.ts deleted file mode 100644 index f1c6ecd88..000000000 --- a/packages/migrations/src/2.0.0-testnet/artifacts.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as AssetProxyOwner from '../../artifacts/2.0.0-testnet/AssetProxyOwner.json'; -import * as DummyERC20Token from '../../artifacts/2.0.0-testnet/DummyERC20Token.json'; -import * as DummyERC721Token from '../../artifacts/2.0.0-testnet/DummyERC721Token.json'; -import * as ERC20Proxy from '../../artifacts/2.0.0-testnet/ERC20Proxy.json'; -import * as ERC721Proxy from '../../artifacts/2.0.0-testnet/ERC721Proxy.json'; -import * as Exchange from '../../artifacts/2.0.0-testnet/Exchange.json'; -import * as Forwarder from '../../artifacts/2.0.0-testnet/Forwarder.json'; -import * as OrderValidator from '../../artifacts/2.0.0-testnet/OrderValidator.json'; -import * as ZRXToken from '../../artifacts/2.0.0-testnet/ZRXToken.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, - DummyERC721Token: (DummyERC721Token as any) as ContractArtifact, - DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, - Forwarder: (Forwarder as any) as ContractArtifact, - OrderValidator: (OrderValidator as any) as ContractArtifact, - ZRX: (ZRXToken as any) as ContractArtifact, -}; diff --git a/packages/migrations/src/2.0.0-testnet/migration.ts b/packages/migrations/src/2.0.0-testnet/migration.ts deleted file mode 100644 index 62a16ddae..000000000 --- a/packages/migrations/src/2.0.0-testnet/migration.ts +++ /dev/null @@ -1,190 +0,0 @@ -import { assetDataUtils } from '@0xproject/order-utils'; -import { BigNumber, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; -import { Provider, TxData } from 'ethereum-types'; - -import { ArtifactWriter } from '../utils/artifact_writer'; -import { constants } from '../utils/constants'; -import { erc20TokenInfo, erc721TokenInfo, etherTokenByNetwork } 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'; - -// tslint:disable-next-line:custom-no-magic-numbers -const ERC20_TOTAL_SUPPLY = new BigNumber(1000000000000000000000000000); - -/** - * Custom migrations should be defined in this function. This will be called with the CLI 'migrate:v2-beta-testnet' 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 runV2TestnetMigrationsAsync = async ( - provider: Provider, - artifactsDir: string, - txDefaults: Partial, -) => { - const web3Wrapper = new Web3Wrapper(provider); - const networkId = await web3Wrapper.getNetworkIdAsync(); - const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); - - // Deploy AssetProxies - const erc20proxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC20Proxy, provider, txDefaults); - artifactsWriter.saveArtifact(erc20proxy); - const erc721proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( - artifacts.ERC721Proxy, - provider, - txDefaults, - ); - artifactsWriter.saveArtifact(erc721proxy); - - const zrxDecimals = new BigNumber(18); - const zrxSupply = ERC20_TOTAL_SUPPLY; - const zrxToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( - artifacts.DummyERC20Token, - provider, - txDefaults, - '0x Protocol Token', - 'ZRX', - zrxDecimals, - zrxSupply, - ); - artifactsWriter.saveArtifact(zrxToken); - - // Deploy Exchange - const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); - const exchange = await ExchangeContract.deployFrom0xArtifactAsync( - artifacts.Exchange, - provider, - txDefaults, - zrxAssetData, - ); - 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); - // Ether token is already deployed on various test nets - const etherTokenAddress = etherTokenByNetwork[networkId].address; - const wethAssetData = assetDataUtils.encodeERC20AssetData(etherTokenAddress); - const forwarder = await ForwarderContract.deployFrom0xArtifactAsync( - artifacts.Forwarder, - provider, - txDefaults, - exchange.address, - zrxAssetData, - wethAssetData, - ); - artifactsWriter.saveArtifact(forwarder); - - // Deploy AssetProxyOwner - const assetProxyOwner = await AssetProxyOwnerContract.deployFrom0xArtifactAsync( - artifacts.AssetProxyOwner, - provider, - txDefaults, - constants.ASSET_PROXY_OWNER_OWNERS, - [erc20proxy.address, erc721proxy.address], - constants.ASSET_PROXY_OWNER_CONFIRMATIONS, - constants.ASSET_PROXY_OWNER_TIMELOCK, - ); - 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}`); - 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); - - // Set enough ZRX Balance to the Forwarder - const maxZRXMintAmount = await zrxToken.MAX_MINT_AMOUNT.callAsync(); - // tslint:disable-next-line:custom-no-magic-numbers - const forwarderZRXBalance = maxZRXMintAmount.times(10); - txHash = await zrxToken.setBalance.sendTransactionAsync(forwarder.address, forwarderZRXBalance); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - - txHash = await zrxToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); - logUtils.log(`transactionHash: ${txHash}`); - logUtils.log('Transferring ownership of ZRX token'); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - - // Dummy Tokens - for (const token of erc20TokenInfo) { - const totalSupply = ERC20_TOTAL_SUPPLY; - const dummyToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( - artifacts.DummyERC20Token, - provider, - txDefaults, - token.name, - token.symbol, - token.decimals, - totalSupply, - ); - logUtils.log(`DummyERC20 ${token.name}: ${dummyToken.address}`); - txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); - logUtils.log(`transactionHash: ${txHash}`); - logUtils.log(`Transferring ownership of ${token.name} `); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - } - for (const token of erc721TokenInfo) { - const dummyToken = await DummyERC721TokenContract.deployFrom0xArtifactAsync( - artifacts.DummyERC721Token, - provider, - txDefaults, - token.name, - token.symbol, - ); - logUtils.log(`DummyERC721 ${token.name}: ${dummyToken.address}`); - txHash = await dummyToken.transferOwnership.sendTransactionAsync(assetProxyOwner.address); - logUtils.log(`transactionHash: ${txHash}`); - logUtils.log(`Transferring ownership of ${token.name} `); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - } -}; 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, -) => { +export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: string, txDefaults: Partial) => { const web3Wrapper = new Web3Wrapper(provider); const networkId = await web3Wrapper.getNetworkIdAsync(); const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); diff --git a/packages/migrations/src/index.ts b/packages/migrations/src/index.ts index 188f566df..5354b3501 100644 --- a/packages/migrations/src/index.ts +++ b/packages/migrations/src/index.ts @@ -1,3 +1,2 @@ export { runV1MigrationsAsync } from './1.0.0/migration'; export { runV2MigrationsAsync } from './2.0.0/migration'; -export { runV2TestnetMigrationsAsync } from './2.0.0-beta-testnet/migration'; diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts index e3651f2dc..338832feb 100644 --- a/packages/migrations/src/migrate.ts +++ b/packages/migrations/src/migrate.ts @@ -1,22 +1,15 @@ #!/usr/bin/env node import { devConstants, web3Factory } from '@0xproject/dev-utils'; import { logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as yargs from 'yargs'; import { runV1MigrationsAsync } from './1.0.0/migration'; -import { runV2TestnetMigrationsAsync } from './2.0.0-beta-testnet/migration'; -import { runV2MainnetMigrationsAsync } from './2.0.0-mainnet/migration'; import { runV2MigrationsAsync } from './2.0.0/migration'; -import { providerFactory } from './utils/provider_factory'; - enum ContractVersions { V1 = '1.0.0', V2 = '2.0.0', - V2Testnet = '2.0.0-beta-testnet', - V2Mainnet = '2.0.0-mainnet', } const args = yargs.argv; @@ -26,8 +19,6 @@ const args = yargs.argv; let providerConfigs; let provider: Provider; let txDefaults; - let web3Wrapper: Web3Wrapper; - let accounts: string[]; switch (contractsVersion) { case ContractVersions.V1: providerConfigs = { shouldUseInProcessGanache: false }; @@ -45,27 +36,6 @@ const args = yargs.argv; }; await runV2MigrationsAsync(provider, artifactsDir, txDefaults); break; - case ContractVersions.V2Testnet: - provider = await providerFactory.getKovanLedgerProviderAsync(); - web3Wrapper = new Web3Wrapper(provider); - accounts = await web3Wrapper.getAvailableAddressesAsync(); - txDefaults = { - from: accounts[0], - gas: devConstants.GAS_LIMIT, - }; - await runV2TestnetMigrationsAsync(provider, artifactsDir, txDefaults); - break; - case ContractVersions.V2Mainnet: - provider = await providerFactory.getMainnetLedgerProviderAsync(); - web3Wrapper = new Web3Wrapper(provider); - accounts = await web3Wrapper.getAvailableAddressesAsync(); - txDefaults = { - from: accounts[2], - gas: devConstants.GAS_LIMIT, - gasPrice: 6000000000, - }; - await runV2MainnetMigrationsAsync(provider, artifactsDir, txDefaults); - break; default: throw new Error(`Unsupported contract version: ${contractsVersion}`); } -- cgit v1.2.3 From 9d45d19c80bce5ead92049ab743501f6e40d515a Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 4 Sep 2018 18:10:23 -0400 Subject: More small artifacts updates/changes --- packages/migrations/src/2.0.0/artifacts.ts | 10 +- packages/migrations/src/2.0.0/constants.ts | 13 --- packages/migrations/src/2.0.0/migration.ts | 142 ++++++++++++++++++----------- 3 files changed, 96 insertions(+), 69 deletions(-) delete mode 100644 packages/migrations/src/2.0.0/constants.ts (limited to 'packages/migrations/src') diff --git a/packages/migrations/src/2.0.0/artifacts.ts b/packages/migrations/src/2.0.0/artifacts.ts index 65736c001..e96c555d6 100644 --- a/packages/migrations/src/2.0.0/artifacts.ts +++ b/packages/migrations/src/2.0.0/artifacts.ts @@ -1,17 +1,25 @@ import { ContractArtifact } from 'ethereum-types'; 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 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'; export const artifacts = { + ZRX: (ZRX as any) as ContractArtifact, + DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, + DummyERC721Token: (DummyERC721Token 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, ERC721Proxy: (ERC721Proxy as any) as ContractArtifact, - Exchange: (Exchange 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/constants.ts b/packages/migrations/src/2.0.0/constants.ts deleted file mode 100644 index 99649f687..000000000 --- a/packages/migrations/src/2.0.0/constants.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { BigNumber } from '@0xproject/utils'; - -export const constants = { - ASSET_PROXY_OWNER_OWNERS: [ - '0x257619b7155d247e43c8b6d90c8c17278ae481f0', - '0x5ee2a00f8f01d099451844af7f894f26a57fcbf2', - '0x894d623e0e0e8ed12c4a73dada999e275684a37d', - ], - ASSET_PROXY_OWNER_REQUIRED_CONFIRMATIONS: new BigNumber(2), - ASSET_PROXY_OWNER_SECONDS_TIMELOCKED: new BigNumber(1209600), - WETH_ADDRESS: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - ZRX_ADDRESS: '0xe41d2489571d322189246dafa5ebde1f4699f498', -}; 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