From 133b6fe2409930252ee332b95a14e837ed9b84e4 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 27 Jun 2018 18:32:48 +0200 Subject: Encode ZRX address as needed. --- packages/migrations/src/v2/migration.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/migrations/src/v2/migration.ts') diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts index f77063a1b..e1c62c838 100644 --- a/packages/migrations/src/v2/migration.ts +++ b/packages/migrations/src/v2/migration.ts @@ -1,3 +1,4 @@ +import { assetProxyUtils } from '@0xproject/order-utils'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Provider, TxData } from 'ethereum-types'; @@ -51,7 +52,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str artifacts.Exchange, provider, txDefaults, - zrxToken.address, + assetProxyUtils.encodeERC20AssetData(zrxToken.address), ); artifactsWriter.saveArtifact(exchange); -- cgit v1.2.3 From a83f5241dc84984a5db46dd14955e1fa052aad59 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Fri, 29 Jun 2018 19:12:42 +1000 Subject: Register the asset proxies to exchange --- packages/migrations/src/v2/migration.ts | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'packages/migrations/src/v2/migration.ts') diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts index e1c62c838..76a31e2a0 100644 --- a/packages/migrations/src/v2/migration.ts +++ b/packages/migrations/src/v2/migration.ts @@ -1,4 +1,4 @@ -import { assetProxyUtils } from '@0xproject/order-utils'; +import { assetProxyUtils, constants } from '@0xproject/order-utils'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Provider, TxData } from 'ethereum-types'; @@ -75,16 +75,37 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str ); artifactsWriter.saveArtifact(assetProxyOwner); await web3Wrapper.awaitTransactionSuccessAsync( - await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner }), + await erc20proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { + from: owner, + }), ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { from: owner }), + await erc20proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { + from: owner, + }), ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner }), + await erc721proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { + from: owner, + }), ); await web3Wrapper.awaitTransactionSuccessAsync( - await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { from: owner }), + await erc721proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { + from: owner, + }), + ); + + // Register the Asset Proxies to the Exchange + // HACK: These are exposed in the types package but migrations currently uses an older version + // but we can pull the asset data id from the proxies + const erc20ProxyId = await erc20proxy.getProxyId.callAsync(); + const erc721ProxyId = await erc721proxy.getProxyId.callAsync(); + const oldAddress = constants.NULL_ADDRESS; + await web3Wrapper.awaitTransactionSuccessAsync( + await exchange.registerAssetProxy.sendTransactionAsync(erc20ProxyId, erc20proxy.address, oldAddress), + ); + await web3Wrapper.awaitTransactionSuccessAsync( + await exchange.registerAssetProxy.sendTransactionAsync(erc721ProxyId, erc721proxy.address, oldAddress), ); // Dummy ERC20 tokens -- cgit v1.2.3 From 7a3be0a32089c77138970137e63926262887197f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 27 Jun 2018 11:57:09 +0300 Subject: Change import paths from z_r_x and e_r_c to zrx and erc in migrations --- packages/migrations/src/v2/migration.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/migrations/src/v2/migration.ts') diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts index 76a31e2a0..d58fbbdde 100644 --- a/packages/migrations/src/v2/migration.ts +++ b/packages/migrations/src/v2/migration.ts @@ -8,10 +8,10 @@ import { erc20TokenInfo, erc721TokenInfo } from '../utils/token_info'; import { artifacts } from './artifacts'; import { AssetProxyOwnerContract } from './contract_wrappers/asset_proxy_owner'; -import { DummyERC20TokenContract } from './contract_wrappers/dummy_e_r_c20_token'; -import { DummyERC721TokenContract } from './contract_wrappers/dummy_e_r_c721_token'; -import { ERC20ProxyContract } from './contract_wrappers/e_r_c20_proxy'; -import { ERC721ProxyContract } from './contract_wrappers/e_r_c721_proxy'; +import { 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 { WETH9Contract } from './contract_wrappers/weth9'; import { ZRXTokenContract } from './contract_wrappers/zrx_token'; -- cgit v1.2.3 From ed4f8c5b664484a161e85f397c3b6f0a87ccca14 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 27 Jun 2018 17:07:50 +0300 Subject: Fix the token supply in migrations --- packages/migrations/src/v2/migration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/migrations/src/v2/migration.ts') diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts index d58fbbdde..168e47a19 100644 --- a/packages/migrations/src/v2/migration.ts +++ b/packages/migrations/src/v2/migration.ts @@ -110,7 +110,7 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str // Dummy ERC20 tokens for (const token of erc20TokenInfo) { - const totalSupply = new BigNumber(100000000000000000000); + const totalSupply = new BigNumber(1000000000000000000000000000); // tslint:disable-next-line:no-unused-variable const dummyErc20Token = await DummyERC20TokenContract.deployFrom0xArtifactAsync( artifacts.DummyERC20Token, -- cgit v1.2.3