From b83043648e68dfb4f413f701394baab506d471d6 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Tue, 1 Oct 2019 16:58:05 +0800 Subject: [PATCH 1/5] Also exclude coordinator and extension contract packages when running `build` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c27cb1a9e3..db9e5a5863 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "install:all": "yarn install", "wsrun": "wsrun", "lerna": "lerna", - "build": "lerna link && wsrun build $PKG -r --stages --fast-exit --exclude-missing", + "build": "lerna link && wsrun build $PKG -r --stages --fast-exit --exclude-missing --exclude @0x/contracts-extensions --exclude @0x/contracts-coordinator", "build:ci": "lerna link && wsrun build:ci $PKG --fast-exit -r --stages --exclude-missing --exclude @0x/contracts-extensions --exclude @0x/contracts-coordinator", "build:contracts": "lerna link && wsrun build -p ${npm_package_config_contractsPackages} -c --fast-exit -r --stages --exclude-missing", "build:monorepo_scripts": "PKG=@0x/monorepo-scripts yarn build", From 71660850afbce56a20efb0e3016da9bd28d1745f Mon Sep 17 00:00:00 2001 From: fabioberger Date: Tue, 1 Oct 2019 17:11:54 +0800 Subject: [PATCH 2/5] Add new addresses to contract-addresses given the latest deployment --- packages/contract-addresses/src/index.ts | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index 61320fcb0c..9b43da8a27 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -30,29 +30,29 @@ const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'; const networkToAddresses: { [networkId: number]: ContractAddresses } = { 1: { - exchange: '0x080bf510fcbf18b91105470639e9561022937712', + exchange: NULL_ADDRESS, erc20Proxy: '0x95e6f48254609a6ee006f7d493c8e5fb97094cef', erc721Proxy: '0xefc70a1b18c432bdc64b596838b4d138f6bc6cad', - forwarder: '0x76481caa104b5f6bccb540dae4cefaf1c398ebea', - orderValidator: '0xa09329c6003c9a5402102e226417738ee22cf1f2', + forwarder: NULL_ADDRESS, + orderValidator: NULL_ADDRESS, zrxToken: '0xe41d2489571d322189246dafa5ebde1f4699f498', etherToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - assetProxyOwner: '0xdffe798c7172dd6deb32baee68af322e8f495ce0', - dutchAuction: '0xa3856622276a64fee0f17f67329fac24368d4aae', + assetProxyOwner: NULL_ADDRESS, + dutchAuction: NULL_ADDRESS, coordinatorRegistry: '0x45797531b873fd5e519477a070a955764c1a5b07', coordinator: '0xa14857e8930acd9a882d33ec20559beb5479c8a6', multiAssetProxy: '0xef701d5389ae74503d633396c4d654eabedc9d78', staticCallProxy: '0x3517b88c19508c08650616019062b898ab65ed29', erc1155Proxy: '0x7eefbd48fd63d441ec7435d024ec7c5131019add', - devUtils: '0x92d9a4d50190ae04e03914db2ee650124af844e6', + devUtils: NULL_ADDRESS, }, 3: { erc20Proxy: '0xb1408f4c245a23c31b98d2c626777d4c0d766caa', erc721Proxy: '0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4', zrxToken: '0xff67881f8d12f372d91baae9752eb3631ff0ed00', etherToken: '0xc778417e063141139fce010982780140aa0cd5ab', - exchange: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831', - assetProxyOwner: '0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b', + exchange: '0x725bc2f8c85ed0289d3da79cde3125d33fc1d7e6', + assetProxyOwner: '0xdcf20f7b447d51f2b3e5499b7f6cbbf7295a5d26', forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913', orderValidator: '0x6eb6237350f3c110c96223e6ff9db55532525d2b', dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc', @@ -64,12 +64,12 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { devUtils: '0x3e0b46bad8e374e4a110c12b832cb120dbe4a479', }, 4: { - exchange: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831', + exchange: '0x8e1dfaf747b804d041adaed79d68dcef85b8de85', erc20Proxy: '0x2f5ae4f6106e89b4147651688a92256885c5f410', erc721Proxy: '0x7656d773e11ff7383a14dcf09a9c50990481cd10', zrxToken: '0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa', etherToken: '0xc778417e063141139fce010982780140aa0cd5ab', - assetProxyOwner: '0xe1703da878afcebff5b7624a826902af475b9c03', + assetProxyOwner: '0x5d751aa855a1aee5fe44cf5350ed25b5727b66ae', forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913', orderValidator: '0x6eb6237350f3c110c96223e6ff9db55532525d2b', dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc', @@ -85,8 +85,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { erc721Proxy: '0x2a9127c745688a165106c11cd4d647d2220af821', zrxToken: '0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa', etherToken: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', - exchange: '0x30589010550762d2f0d06f650d8e8b6ade6dbf4b', - assetProxyOwner: '0x2c824d2882baa668e0d5202b1e7f2922278703f8', + exchange: '0x617602cd3f734cf1e028c96b3f54c0489bed8022', + assetProxyOwner: '0x3654e5363cd75c8974c76208137df9691e820e97', forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913', orderValidator: '0xbcd49bf9b75cab056610fab3c788e8ce1b209f30', dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc', @@ -104,7 +104,7 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { erc1155Proxy: '0x6a4a62e5a7ed13c361b176a5f62c2ee620ac0df8', zrxToken: '0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c', etherToken: '0x0b1ba0af832d7c05fd64161e0db78e85978e8082', - exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788', + exchange: NULL_ADDRESS, assetProxyOwner: '0x8d42e38980ce74736c21c059b2240df09958d3c8', forwarder: '0xaa86dda78e9434aca114b6676fc742a18d15a1cc', orderValidator: '0x4d3d5c850dd5bd9d6f4adda3dd039a3c8054ca29', From 8c5e12d389078565922eb488445117208d7b8080 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Tue, 1 Oct 2019 17:56:57 +0800 Subject: [PATCH 3/5] Update or add CHANGELOG entries for all packages that will be published by Lerna to include a beta version. This dictates the version published to NPM and avoids any default patch bumps --- contracts/asset-proxy/CHANGELOG.json | 2 +- contracts/coordinator/CHANGELOG.json | 2 +- contracts/dev-utils/CHANGELOG.json | 2 +- contracts/erc1155/CHANGELOG.json | 2 +- contracts/erc20/CHANGELOG.json | 8 ++++++++ contracts/erc721/CHANGELOG.json | 8 ++++++++ contracts/exchange-forwarder/CHANGELOG.json | 8 ++++++++ contracts/exchange-libs/CHANGELOG.json | 2 +- contracts/exchange/CHANGELOG.json | 2 +- contracts/extensions/CHANGELOG.json | 8 ++++++++ contracts/multisig/CHANGELOG.json | 8 ++++++++ contracts/staking/CHANGELOG.json | 2 +- contracts/test-utils/CHANGELOG.json | 2 +- contracts/utils/CHANGELOG.json | 2 +- packages/0x.js/CHANGELOG.json | 8 ++++++++ packages/abi-gen-wrappers/CHANGELOG.json | 2 +- packages/abi-gen/CHANGELOG.json | 8 ++++++++ packages/assert/CHANGELOG.json | 8 ++++++++ packages/asset-buyer/CHANGELOG.json | 8 ++++++++ packages/asset-swapper/CHANGELOG.json | 8 ++++++++ packages/base-contract/CHANGELOG.json | 2 +- packages/connect/CHANGELOG.json | 8 ++++++++ packages/contract-addresses/CHANGELOG.json | 2 +- packages/contract-artifacts/CHANGELOG.json | 2 +- packages/contract-wrappers/CHANGELOG.json | 2 +- packages/contracts-gen/CHANGELOG.json | 2 +- packages/dev-utils/CHANGELOG.json | 2 +- packages/ethereum-types/CHANGELOG.json | 2 +- packages/fill-scenarios/CHANGELOG.json | 2 +- packages/json-schemas/CHANGELOG.json | 2 +- packages/migrations/CHANGELOG.json | 2 +- packages/order-utils/CHANGELOG.json | 2 +- packages/orderbook/CHANGELOG.json | 8 ++++++++ packages/sol-compiler/CHANGELOG.json | 2 +- packages/sol-coverage/CHANGELOG.json | 8 ++++++++ packages/sol-doc/CHANGELOG.json | 8 ++++++++ packages/sol-profiler/CHANGELOG.json | 8 ++++++++ packages/sol-resolver/CHANGELOG.json | 8 ++++++++ packages/sol-trace/CHANGELOG.json | 8 ++++++++ packages/sol-tracing-utils/CHANGELOG.json | 8 ++++++++ packages/sra-spec/CHANGELOG.json | 8 ++++++++ packages/subproviders/CHANGELOG.json | 8 ++++++++ packages/types/CHANGELOG.json | 2 +- packages/typescript-typings/CHANGELOG.json | 2 +- packages/utils/CHANGELOG.json | 2 +- packages/web3-wrapper/CHANGELOG.json | 2 +- 46 files changed, 186 insertions(+), 26 deletions(-) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index d4fa7bb152..08f6ccf2c6 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.0.0", + "version": "2.3.0-beta.0", "changes": [ { "note": "Disallow the zero address from being made an authorized address in MixinAuthorizable, and created an archive directory that includes an old version of Ownable", diff --git a/contracts/coordinator/CHANGELOG.json b/contracts/coordinator/CHANGELOG.json index 93ecd5e65e..36f8ea116c 100644 --- a/contracts/coordinator/CHANGELOG.json +++ b/contracts/coordinator/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.0.0", + "version": "2.1.0-beta.0", "changes": [ { "note": "Add chainId to domain separator", diff --git a/contracts/dev-utils/CHANGELOG.json b/contracts/dev-utils/CHANGELOG.json index b7fb45f384..27865b5070 100644 --- a/contracts/dev-utils/CHANGELOG.json +++ b/contracts/dev-utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.0.0", + "version": "0.1.0-beta.0", "changes": [ { "note": "Use built in selectors instead of hard coded constants", diff --git a/contracts/erc1155/CHANGELOG.json b/contracts/erc1155/CHANGELOG.json index 4ba2fafdcf..98933fa5cd 100644 --- a/contracts/erc1155/CHANGELOG.json +++ b/contracts/erc1155/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.1.16", + "version": "1.2.0-beta.0", "changes": [ { "note": "Add `mintKnownFungibleTokensAsync()`, `isNonFungibleItemAsync()`, `isFungibleItemAsync()`, `getOwnerOfAsync()`, `getBalanceAsync()` to `Erc1155Wrapper`.", diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 1380664901..a7375c368e 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.3.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.2.14", diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index e57032dd49..9874270f75 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.2.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.1.15", diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index fe5484a869..75f246baa3 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "3.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "3.0.12", diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index f4c2d53115..6fc8af8a76 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.1.0", + "version": "3.1.0-beta.0", "changes": [ { "note": "Break up `LibEIP712` into reusable components", diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index dbcbcf3cc9..afc115d905 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.0.0", + "version": "2.2.0-beta.0", "changes": [ { "note": "Use new/cheaper reentrancy guard/mutex", diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 4968d29bb9..a6e0fef7dd 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "4.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "4.0.8", diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index 80efc18e85..f6b963104d 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "3.2.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "3.1.14", diff --git a/contracts/staking/CHANGELOG.json b/contracts/staking/CHANGELOG.json index da9df57fe2..ab12ae2f72 100644 --- a/contracts/staking/CHANGELOG.json +++ b/contracts/staking/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.0.0", + "version": "1.0.0-beta.0", "changes": [ { "note": "Created package", diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 5703365767..282dcd9817 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "4.0.0", + "version": "3.2.0-beta.0", "changes": [ { "note": "Add `chainId` to `TransactionFactory` constructor", diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 1557a9c289..1940438ff0 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.2.5", + "version": "3.3.0-beta.0", "changes": [ { "note": "Change ReentrancyGuard implementation to cheaper one", diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index a79dd838e2..e52696efde 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "7.1.0-beta.0", + "changes": [ + { + "note": "Updated to work with 0x v3" + } + ] + }, { "timestamp": 1568744790, "version": "7.0.2", diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json index 81feeb5df0..1e46d8b4ba 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.json +++ b/packages/abi-gen-wrappers/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "6.0.0", + "version": "5.4.0-beta.0", "changes": [ { "note": "Use V3 contracts", diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 72342560f5..b4230a887c 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "4.3.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "4.2.1", "changes": [ diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index 5249681b7a..86197fa9d0 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.2.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.1.6", diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index 7c5385420b..ed8dad3442 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "6.2.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "6.1.14", diff --git a/packages/asset-swapper/CHANGELOG.json b/packages/asset-swapper/CHANGELOG.json index ca3b01158a..2a48478030 100644 --- a/packages/asset-swapper/CHANGELOG.json +++ b/packages/asset-swapper/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index e7370d4fb2..b186f4a508 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "5.5.0", + "version": "5.5.0-beta.0", "changes": [ { "note": "Automatically decode and throw rich reverts in `_throwIfRevertWithReasonCallResult`", diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index 57d0e5bb4a..c653721f13 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "5.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "5.0.19", diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index 52e66e4cf2..0c54429737 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "4.0.0", + "version": "3.3.0-beta.0", "changes": [ { "note": "Removed `getNetworkIdByExchangeAddressOrThrow`. It's not needed with V3 tooling.", diff --git a/packages/contract-artifacts/CHANGELOG.json b/packages/contract-artifacts/CHANGELOG.json index 7fa5e3441b..8de3a2f8b9 100644 --- a/packages/contract-artifacts/CHANGELOG.json +++ b/packages/contract-artifacts/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.0.0", + "version": "2.3.0-beta.0", "changes": [ { "note": "Use V3 contracts", diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 8b8d2bb4f4..41590bd13c 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "12.2.0", + "version": "12.2.0-beta.0", "changes": [ { "note": "Use new `Order` and `ZeroExTransaction` structures with `domain` field", diff --git a/packages/contracts-gen/CHANGELOG.json b/packages/contracts-gen/CHANGELOG.json index 6ef663f02f..52ffa3a43c 100644 --- a/packages/contracts-gen/CHANGELOG.json +++ b/packages/contracts-gen/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.1.0", + "version": "1.1.0-beta.0", "changes": [ { "note": "Generate boilerplate for all contracts if none are specified or if all contracts identifier is used", diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 1924529ea5..21980adc6c 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "2.4.0", + "version": "2.4.0-beta.0", "changes": [ { "note": "`revertWith` mocha extensions now accept Promise-like objects instead of just Promises", diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json index 9d7002e308..405f764e97 100644 --- a/packages/ethereum-types/CHANGELOG.json +++ b/packages/ethereum-types/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "2.2.0", + "version": "2.2.0-beta.0", "changes": [ { "note": "Add `RevertErrorAbi` interface as part of `AbiDefinition` types", diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index cad61e91ba..5b1c197d3d 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.1.0", + "version": "3.1.0-beta.0", "changes": [ { "note": "Use new `Order` structure with `domain` field", diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 9b6983b679..8a90054029 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "4.0.3", + "version": "4.1.0-beta.0", "changes": [ { "note": "Add `eip712DomainSchema` schema", diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index f483a3a62e..2864b67852 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "4.4.0", + "version": "4.4.0-beta.0", "changes": [ { "note": "Update Coordinator and Exchange deployments to pass `chainId`", diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 8f3a957f32..a247461d0f 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "9.0.0", + "version": "8.5.0-beta.0", "changes": [ { "note": "Add `chainId` `OrderValidationUtils`, `OrderFactory`", diff --git a/packages/orderbook/CHANGELOG.json b/packages/orderbook/CHANGELOG.json index 161bc1bd48..61a59b453f 100644 --- a/packages/orderbook/CHANGELOG.json +++ b/packages/orderbook/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "0.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "0.0.2", diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 61c1c5e389..22847d146d 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "3.2.0", + "version": "3.2.0-beta.0", "changes": [ { "note": "Convert `getContractNamesToCompile` to public function of `Compiler` class", diff --git a/packages/sol-coverage/CHANGELOG.json b/packages/sol-coverage/CHANGELOG.json index ac2cecd31a..a1ff759828 100644 --- a/packages/sol-coverage/CHANGELOG.json +++ b/packages/sol-coverage/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "3.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "3.0.12", diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json index 4ccdbffda6..419d82013d 100644 --- a/packages/sol-doc/CHANGELOG.json +++ b/packages/sol-doc/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.0.19", diff --git a/packages/sol-profiler/CHANGELOG.json b/packages/sol-profiler/CHANGELOG.json index 3e1e74d13d..7308befbad 100644 --- a/packages/sol-profiler/CHANGELOG.json +++ b/packages/sol-profiler/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "3.2.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "3.1.14", diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index 14411c27e5..5208d80128 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.0.11", diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json index f8148e7a7d..f65ea76cbc 100644 --- a/packages/sol-trace/CHANGELOG.json +++ b/packages/sol-trace/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.0.20", diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index 5f1b5ae83c..8da6fadb84 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "6.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "6.0.19", diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json index 6e631296b9..937c6640fc 100644 --- a/packages/sra-spec/CHANGELOG.json +++ b/packages/sra-spec/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "2.0.17", diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index 7833994445..9672c0a909 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "5.1.0-beta.0", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1568744790, "version": "5.0.4", diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 4a317f6ed6..e5425cf8dc 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "2.4.4", + "version": "2.5.0-beta.0", "changes": [ { "note": "Add `OrderStatus` type", diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json index 5c60331f4b..1bafbc1019 100644 --- a/packages/typescript-typings/CHANGELOG.json +++ b/packages/typescript-typings/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "4.4.0", + "version": "4.4.0-beta.0", "changes": [ { "note": "Add types for `@0x/dev-utils` chai helpers in `types/@0x`", diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index d3a23a7d04..d567f8e35f 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "4.6.0", + "version": "4.6.0-beta.0", "changes": [ { "note": "Allow for array types in `RevertError`s.", diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 7781956917..2def09b902 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "6.0.14", + "version": "6.1.0-beta.0", "changes": [ { "note": "Let `toBaseUnitAmount()` accept a `number`", From 39a8c0f4e6a953d22ade2684a98884a8be81df10 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Tue, 1 Oct 2019 18:43:56 +0800 Subject: [PATCH 4/5] Update the Ganache snapshot addresses with latest v3 snapshot --- packages/contract-addresses/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index 9b43da8a27..7a21b7dc26 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -104,8 +104,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { erc1155Proxy: '0x6a4a62e5a7ed13c361b176a5f62c2ee620ac0df8', zrxToken: '0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c', etherToken: '0x0b1ba0af832d7c05fd64161e0db78e85978e8082', - exchange: NULL_ADDRESS, - assetProxyOwner: '0x8d42e38980ce74736c21c059b2240df09958d3c8', + exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788', + assetProxyOwner: NULL_ADDRESS, forwarder: '0xaa86dda78e9434aca114b6676fc742a18d15a1cc', orderValidator: '0x4d3d5c850dd5bd9d6f4adda3dd039a3c8054ca29', dutchAuction: '0xa31e64ea55b9b6bbb9d6a676738e9a5b23149f84', From e0743352850ffc10bfcf9cdfd1aecac515bc4656 Mon Sep 17 00:00:00 2001 From: fabioberger Date: Wed, 2 Oct 2019 09:15:50 +0800 Subject: [PATCH 5/5] Null out all contracts not re-deployed or updated to V3 --- packages/contract-addresses/src/index.ts | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index 7a21b7dc26..153c8e57c4 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -40,7 +40,7 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { assetProxyOwner: NULL_ADDRESS, dutchAuction: NULL_ADDRESS, coordinatorRegistry: '0x45797531b873fd5e519477a070a955764c1a5b07', - coordinator: '0xa14857e8930acd9a882d33ec20559beb5479c8a6', + coordinator: NULL_ADDRESS, multiAssetProxy: '0xef701d5389ae74503d633396c4d654eabedc9d78', staticCallProxy: '0x3517b88c19508c08650616019062b898ab65ed29', erc1155Proxy: '0x7eefbd48fd63d441ec7435d024ec7c5131019add', @@ -53,15 +53,15 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { etherToken: '0xc778417e063141139fce010982780140aa0cd5ab', exchange: '0x725bc2f8c85ed0289d3da79cde3125d33fc1d7e6', assetProxyOwner: '0xdcf20f7b447d51f2b3e5499b7f6cbbf7295a5d26', - forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913', - orderValidator: '0x6eb6237350f3c110c96223e6ff9db55532525d2b', - dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc', + forwarder: NULL_ADDRESS, + orderValidator: NULL_ADDRESS, + dutchAuction: NULL_ADDRESS, coordinatorRegistry: '0x403cc23e88c17c4652fb904784d1af640a6722d9', - coordinator: '0x2ba02e03ee0029311e0f43715307870a3e701b53', + coordinator: NULL_ADDRESS, multiAssetProxy: '0xab8fbd189c569ccdee3a4d929bb7f557be4028f6', staticCallProxy: '0xe1b97e47aa3796276033a5341e884d2ba46b6ac1', erc1155Proxy: '0x19bb6caa3bc34d39e5a23cedfa3e6c7e7f3c931d', - devUtils: '0x3e0b46bad8e374e4a110c12b832cb120dbe4a479', + devUtils: NULL_ADDRESS, }, 4: { exchange: '0x8e1dfaf747b804d041adaed79d68dcef85b8de85', @@ -70,15 +70,15 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { zrxToken: '0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa', etherToken: '0xc778417e063141139fce010982780140aa0cd5ab', assetProxyOwner: '0x5d751aa855a1aee5fe44cf5350ed25b5727b66ae', - forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913', - orderValidator: '0x6eb6237350f3c110c96223e6ff9db55532525d2b', - dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc', + forwarder: NULL_ADDRESS, + orderValidator: NULL_ADDRESS, + dutchAuction: NULL_ADDRESS, coordinatorRegistry: '0x1084b6a398e47907bae43fec3ff4b677db6e4fee', - coordinator: '0x2ba02e03ee0029311e0f43715307870a3e701b53', + coordinator: NULL_ADDRESS, multiAssetProxy: '0xb34cde0ad3a83d04abebc0b66e75196f22216621', staticCallProxy: '0xe1b97e47aa3796276033a5341e884d2ba46b6ac1', erc1155Proxy: '0x19bb6caa3bc34d39e5a23cedfa3e6c7e7f3c931d', - devUtils: '0x2d4a9abda7b8b3605c8dbd34e3550a7467c78287', + devUtils: NULL_ADDRESS, }, 42: { erc20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e', @@ -87,11 +87,11 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { etherToken: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', exchange: '0x617602cd3f734cf1e028c96b3f54c0489bed8022', assetProxyOwner: '0x3654e5363cd75c8974c76208137df9691e820e97', - forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913', - orderValidator: '0xbcd49bf9b75cab056610fab3c788e8ce1b209f30', - dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc', + forwarder: NULL_ADDRESS, + orderValidator: NULL_ADDRESS, + dutchAuction: NULL_ADDRESS, coordinatorRegistry: '0x09fb99968c016a3ff537bf58fb3d9fe55a7975d5', - coordinator: '0x2ba02e03ee0029311e0f43715307870a3e701b53', + coordinator: NULL_ADDRESS, multiAssetProxy: '0xf6313a772c222f51c28f2304c0703b8cf5428fd8', staticCallProxy: '0x48e94bdb9033640d45ea7c721e25f380f8bffa43', erc1155Proxy: '0x64517fa2b480ba3678a2a3c0cf08ef7fd4fad36f', @@ -106,11 +106,11 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { etherToken: '0x0b1ba0af832d7c05fd64161e0db78e85978e8082', exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788', assetProxyOwner: NULL_ADDRESS, - forwarder: '0xaa86dda78e9434aca114b6676fc742a18d15a1cc', - orderValidator: '0x4d3d5c850dd5bd9d6f4adda3dd039a3c8054ca29', - dutchAuction: '0xa31e64ea55b9b6bbb9d6a676738e9a5b23149f84', + forwarder: NULL_ADDRESS, + orderValidator: NULL_ADDRESS, + dutchAuction: NULL_ADDRESS, coordinatorRegistry: '0x1941ff73d1154774d87521d2d0aaad5d19c8df60', - coordinator: '0x0d8b0dd11f5d34ed41d556def5f841900d5b1c6b', + coordinator: NULL_ADDRESS, multiAssetProxy: '0xcfc18cec799fbd1793b5c43e773c98d4d61cc2db', staticCallProxy: '0x6dfff22588be9b3ef8cf0ad6dc9b84796f9fb45f', devUtils: '0x38ef19fdf8e8415f18c307ed71967e19aac28ba1',