diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-02 04:08:38 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-02 04:08:38 +0800 |
| commit | a22434fd73fa7c7c02791e5339ab8904294e682f (patch) | |
| tree | 0c0995681ff1ed895a60a35e26994f5ee0cbc2c6 /packages/migrations/package.json | |
| parent | b7b45b69a66cfaf9c3737d1a8d95be21edccf527 (diff) | |
| parent | c41846805d71983fd4232c5eb796715c3d776d25 (diff) | |
| download | dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.tar dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.tar.gz dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.tar.bz2 dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.tar.lz dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.tar.xz dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.tar.zst dexon-sol-tools-a22434fd73fa7c7c02791e5339ab8904294e682f.zip | |
Merge branch 'v2-prototype' into refactor/order-utils/for-v2
* v2-prototype:
Update v2 artifacts
Add IWallet and IValidator to compiled contracts
Split migrations compile command into one for V1 and another for V2
# Conflicts:
# packages/migrations/artifacts/2.0.0/Exchange.json
# packages/migrations/artifacts/2.0.0/TestSignatureValidator.json
Diffstat (limited to 'packages/migrations/package.json')
| -rw-r--r-- | packages/migrations/package.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 75d735e6a..8c4cd915d 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -14,8 +14,8 @@ "build": "tsc", "clean": "shx rm -rf lib src/contract_wrappers", "lint": "tslint --project .", - "migrate:v1": "run-s build compile script:migrate:v1", - "migrate:v2": "run-s build compile script:migrate:v2", + "migrate:v1": "run-s build compile:v1 script:migrate:v1", + "migrate:v2": "run-s build compile:v2 script:migrate:v2", "script:migrate:v1": "node ./lib/migrate.js --contracts-version 1.0.0", "script:migrate:v2": "node ./lib/migrate.js --contracts-version 2.0.0", "generate_contract_wrappers": "run-p generate_contract_wrappers:*", @@ -23,7 +23,8 @@ "abi-gen --abis ${npm_package_config_abis_v1} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v1/contract_wrappers --backend ethers && prettier --write 'src/v1/contract_wrappers/**.ts'", "generate_contract_wrappers:v2": "abi-gen --abis ${npm_package_config_abis_v2} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v2/contract_wrappers --backend ethers && prettier --write 'src/v2/contract_wrappers/**.ts'", - "compile": "sol-compiler" + "compile:v1": "sol-compiler --artifacts-dir artifacts/1.0.0 --contracts Exchange_v1,DummyERC20Token,ZRXToken,WETH9,TokenTransferProxy_v1,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,TokenRegistry", + "compile:v2": "sol-compiler --artifacts-dir artifacts/2.0.0 --contracts DummyERC20Token,DummyERC721Token,ERC20Proxy,ERC721Proxy,Exchange,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,ZRXToken,WETH9,IWallet,IValidator" }, "config": { "abis": { |