aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-28 00:32:48 +0800
committerFabio Berger <me@fabioberger.com>2018-06-28 00:32:48 +0800
commit133b6fe2409930252ee332b95a14e837ed9b84e4 (patch)
tree38ffdcbf705a5196ef9c52579eb4d2c2a75828fb
parentc824fe8718b8893ef64707c52a47590b8b79735a (diff)
downloaddexon-0x-contracts-133b6fe2409930252ee332b95a14e837ed9b84e4.tar.gz
dexon-0x-contracts-133b6fe2409930252ee332b95a14e837ed9b84e4.tar.zst
dexon-0x-contracts-133b6fe2409930252ee332b95a14e837ed9b84e4.zip
Encode ZRX address as needed.
-rw-r--r--packages/migrations/package.json1
-rw-r--r--packages/migrations/src/v2/migration.ts3
-rw-r--r--packages/order-utils/package.json1
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 25ef95cf5..97c6ca115 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -50,6 +50,7 @@
},
"dependencies": {
"@0xproject/base-contract": "^0.3.4",
+ "@0xproject/order-utils": "^1.0.0",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
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);
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 62026f9e6..e3c81de44 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -52,7 +52,6 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.4.4",
- "@0xproject/migrations": "^0.0.8",
"@0xproject/monorepo-scripts": "^0.2.1",
"@0xproject/tslint-config": "^0.4.20",
"@types/ethereumjs-abi": "^0.6.0",