aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2018-06-29 17:31:10 +0800
committerGitHub <noreply@github.com>2018-06-29 17:31:10 +0800
commit3062c18ebda8e55831038f140313000fd6d2cf71 (patch)
tree5e4143f5ed424744c4c5100599288d20abee6b75
parent92322c0e077a9240e514763ea3d26878e6e23421 (diff)
parenta83f5241dc84984a5db46dd14955e1fa052aad59 (diff)
downloaddexon-0x-contracts-3062c18ebda8e55831038f140313000fd6d2cf71.tar.gz
dexon-0x-contracts-3062c18ebda8e55831038f140313000fd6d2cf71.tar.zst
dexon-0x-contracts-3062c18ebda8e55831038f140313000fd6d2cf71.zip
Merge pull request #795 from 0xProject/miscellaneous-fixes/v2-exchange-register-assets
Register the asset proxies to exchange
-rw-r--r--packages/migrations/src/v2/migration.ts31
1 files changed, 26 insertions, 5 deletions
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