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