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/2.0.0/migration.ts') diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts index 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/migration.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'packages/migrations/src/2.0.0/migration.ts') diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts index 0566e67e8..bddb020d2 100644 --- a/packages/migrations/src/2.0.0/migration.ts +++ b/packages/migrations/src/2.0.0/migration.ts @@ -14,6 +14,7 @@ import { ERC20ProxyContract } from './contract_wrappers/erc20_proxy'; import { ERC721ProxyContract } from './contract_wrappers/erc721_proxy'; import { ExchangeContract } from './contract_wrappers/exchange'; import { ForwarderContract } from './contract_wrappers/forwarder'; +import { OrderValidatorContract } from './contract_wrappers/order_validator'; import { WETH9Contract } from './contract_wrappers/weth9'; import { ZRXTokenContract } from './contract_wrappers/zrx_token'; @@ -75,6 +76,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str secondsRequired, ); artifactsWriter.saveArtifact(assetProxyOwner); + await web3Wrapper.awaitTransactionSuccessAsync( await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner, @@ -139,4 +141,14 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str assetDataUtils.encodeERC20AssetData(etherToken.address), ); artifactsWriter.saveArtifact(forwarder); + + // OrderValidator + const orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync( + artifacts.OrderValidator, + provider, + txDefaults, + exchange.address, + zrxAssetData, + ); + artifactsWriter.saveArtifact(orderValidator); }; -- cgit v1.2.3 From 7fa5b474ebac649b6a23c8b9108e07c117dcc00b Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Tue, 21 Aug 2018 10:15:45 -0700 Subject: Add ZRX balances and allowances to TraderInfo --- packages/migrations/src/2.0.0/migration.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/migrations/src/2.0.0/migration.ts') diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts index bddb020d2..e1dcea8b0 100644 --- a/packages/migrations/src/2.0.0/migration.ts +++ b/packages/migrations/src/2.0.0/migration.ts @@ -50,11 +50,12 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str artifactsWriter.saveArtifact(etherToken); // Exchange + const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const exchange = await ExchangeContract.deployFrom0xArtifactAsync( artifacts.Exchange, provider, txDefaults, - assetDataUtils.encodeERC20AssetData(zrxToken.address), + zrxAssetData, ); artifactsWriter.saveArtifact(exchange); -- cgit v1.2.3