diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-08-21 07:50:24 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-08-21 07:50:24 +0800 |
| commit | e45d320fc5830cb6336908cfe0c5f021718064c7 (patch) | |
| tree | 3e5a0aeb42ed968e629b2342834f8748348f46c9 /packages/contract-wrappers | |
| parent | cabce8cb674e937a566e8a821e3959076390f603 (diff) | |
| parent | dd2e54d60d3490a62e57ef3f24a9af0127e2ec88 (diff) | |
| download | dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.tar dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.tar.gz dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.tar.bz2 dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.tar.lz dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.tar.xz dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.tar.zst dexon-sol-tools-e45d320fc5830cb6336908cfe0c5f021718064c7.zip | |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/connect/sra-api-v2
Diffstat (limited to 'packages/contract-wrappers')
| -rw-r--r-- | packages/contract-wrappers/package.json | 2 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/global_hooks.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 098c95ef0..3399c7a9f 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -29,7 +29,7 @@ "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "config": { - "contracts_v2_beta": "Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken Forwarder", + "contracts_v2_beta": "AssetProxyOwner Exchange ERC20Proxy ERC20Token ERC721Proxy ERC721Token WETH9 ZRXToken Forwarder", "contracts_v2": "DummyERC20Token DummyERC721Token" }, "repository": { diff --git a/packages/contract-wrappers/test/global_hooks.ts b/packages/contract-wrappers/test/global_hooks.ts index 05b23d5b8..8731318e7 100644 --- a/packages/contract-wrappers/test/global_hooks.ts +++ b/packages/contract-wrappers/test/global_hooks.ts @@ -12,6 +12,6 @@ before('migrate contracts', async function(): Promise<void> { gas: devConstants.GAS_LIMIT, from: devConstants.TESTRPC_FIRST_ADDRESS, }; - const artifactsDir = `../migrations/artifacts/2.0.0`; + const artifactsDir = `src/artifacts`; await runV2MigrationsAsync(provider, artifactsDir, txDefaults); }); |