diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-12 01:54:59 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-12 01:54:59 +0800 |
| commit | 60f5a52964d6965d35eb3c3cb15abc8471de6fd6 (patch) | |
| tree | 3912c687aa7e3eb9891d1f4d5a46d516805a4503 /packages/migrations/package.json | |
| parent | 89b7b56a2cb38d95f65067e5493e8135cb1e7e98 (diff) | |
| parent | 7e5866ce3fffc67633d3ab84cc3d2a6abdd22ce5 (diff) | |
| download | dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.gz dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.bz2 dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.lz dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.xz dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.tar.zst dexon-sol-tools-60f5a52964d6965d35eb3c3cb15abc8471de6fd6.zip | |
Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulator
* v2-prototype:
Fix a bug in SolCompilerArtifacts adapter config overriding
Increase timeout for contract migrations
Remove some copy-paste code
Await transactions in migrations
Fix typos
Await transactions in migrations
Await fake transactions
Fix a typo
Implement SolidityProfiler & adapt sol-cov to work with Geth
# Conflicts:
# packages/migrations/CHANGELOG.json
Diffstat (limited to 'packages/migrations/package.json')
| -rw-r--r-- | packages/migrations/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 605cabee3..1b452f937 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -31,7 +31,7 @@ "v1": "artifacts/1.0.0/@(DummyERC20Token|TokenTransferProxy_v1|Exchange_v1|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|WETH9).json", "v2": - "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|ZRXToken|WETH9|IWallet|IValidator).json" + "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|AssetProxyOwner|ZRXToken|WETH9|IWallet|IValidator).json" } }, "license": "Apache-2.0", |