diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index 8a6ee9b270..f3d7f00c1d 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -51,13 +51,13 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contract-wrappers": "^13.12.1", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@types/lodash": "4.14.104", @@ -79,7 +79,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-erc1155": "^2.1.22", "@0x/contracts-erc20": "^3.3.1", "@0x/contracts-erc721": "^3.1.22", @@ -87,8 +87,8 @@ "@0x/order-utils": "^10.4.14", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "ethereum-types": "^3.4.0", "lodash": "^4.17.11" }, diff --git a/contracts/broker/package.json b/contracts/broker/package.json index 0e8e128ec7..25a6363ecc 100644 --- a/contracts/broker/package.json +++ b/contracts/broker/package.json @@ -51,20 +51,20 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-erc20": "^3.3.1", "@0x/contracts-erc721": "^3.1.22", "@0x/contracts-exchange": "^3.2.23", "@0x/contracts-exchange-libs": "^4.3.22", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -84,10 +84,10 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/order-utils": "^10.4.14", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "ethereum-types": "^3.4.0" }, "publishConfig": { diff --git a/contracts/coordinator/package.json b/contracts/coordinator/package.json index a8d2b27f25..f5ca2c66a8 100644 --- a/contracts/coordinator/package.json +++ b/contracts/coordinator/package.json @@ -52,17 +52,17 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-dev-utils": "^1.3.21", "@0x/contracts-erc20": "^3.3.1", - "@0x/contracts-gen": "^2.0.24", - "@0x/dev-utils": "^4.1.3", + "@0x/contracts-gen": "^2.0.30", + "@0x/dev-utils": "^4.2.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -82,16 +82,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/assert": "^3.0.19", - "@0x/base-contract": "^6.2.14", + "@0x/assert": "^3.0.21", + "@0x/base-contract": "^6.2.18", "@0x/contract-addresses": "^5.9.0", "@0x/contracts-exchange": "^3.2.23", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/json-schemas": "^5.3.4", + "@0x/json-schemas": "^5.4.1", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "ethereum-types": "^3.4.0", "http-status-codes": "^1.3.2" }, diff --git a/contracts/dev-utils/package.json b/contracts/dev-utils/package.json index eab3f9ea75..b7b2e2767c 100644 --- a/contracts/dev-utils/package.json +++ b/contracts/dev-utils/package.json @@ -41,17 +41,17 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/dev-utils", "devDependencies": { - "@0x/abi-gen": "^5.4.13", - "@0x/assert": "^3.0.19", + "@0x/abi-gen": "^5.4.19", + "@0x/assert": "^3.0.21", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-erc20": "^3.3.1", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "ethereum-types": "^3.4.0", "ethers": "~4.0.4", "npm-run-all": "^4.1.2", @@ -63,7 +63,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@types/node": "12.12.54" }, "publishConfig": { diff --git a/contracts/erc1155/package.json b/contracts/erc1155/package.json index 83eb4e5428..f529d88ffe 100644 --- a/contracts/erc1155/package.json +++ b/contracts/erc1155/package.json @@ -52,11 +52,11 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.13", - "@0x/contracts-gen": "^2.0.24", + "@0x/abi-gen": "^5.4.19", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", @@ -80,10 +80,10 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-test-utils": "^5.3.19", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "lodash": "^4.17.11" }, "publishConfig": { diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 0d08257634..4a7915481b 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -51,18 +51,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.13", - "@0x/contracts-gen": "^2.0.24", + "@0x/abi-gen": "^5.4.19", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -82,7 +82,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14" + "@0x/base-contract": "^6.2.18" }, "publishConfig": { "access": "public" diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 35281511bf..8b578c0bc7 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -52,18 +52,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.13", - "@0x/contracts-gen": "^2.0.24", + "@0x/abi-gen": "^5.4.19", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -84,7 +84,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14" + "@0x/base-contract": "^6.2.18" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index fb6c3b83cf..4b3b625f61 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-dev-utils": "^1.3.21", "@0x/contracts-erc1155": "^2.1.22", @@ -60,17 +60,17 @@ "@0x/contracts-erc721": "^3.1.22", "@0x/contracts-exchange": "^3.2.23", "@0x/contracts-exchange-libs": "^4.3.22", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -90,7 +90,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/typescript-typings": "^5.1.6", "ethereum-types": "^3.4.0" }, diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index 10d163bd7b..b8e99811ae 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -52,14 +52,14 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/libs", "devDependencies": { - "@0x/abi-gen": "^5.4.13", - "@0x/contracts-gen": "^2.0.24", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", - "@0x/subproviders": "^6.2.3", + "@0x/abi-gen": "^5.4.19", + "@0x/contracts-gen": "^2.0.30", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", + "@0x/subproviders": "^6.4.1", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -80,13 +80,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", "@0x/order-utils": "^10.4.14", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "ethereum-types": "^3.4.0" }, "publishConfig": { diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index bcfb203a30..929562c78c 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -52,21 +52,21 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-exchange-libs": "^4.3.22", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-multisig": "^4.1.23", "@0x/contracts-staking": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -88,13 +88,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-dev-utils": "^1.3.21", "@0x/contracts-erc1155": "^2.1.22", "@0x/contracts-erc20": "^3.3.1", "@0x/contracts-erc721": "^3.1.22", "@0x/order-utils": "^10.4.14", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "lodash": "^4.17.11" }, "publishConfig": { diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 7c455fa8aa..f66886691b 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -52,23 +52,23 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-dev-utils": "^1.3.21", "@0x/contracts-erc20": "^3.3.1", "@0x/contracts-erc721": "^3.1.22", "@0x/contracts-exchange": "^3.2.23", "@0x/contracts-exchange-libs": "^4.3.22", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -90,7 +90,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-test-utils": "^5.3.19", "@0x/typescript-typings": "^5.1.6", "ethereum-types": "^3.4.0" diff --git a/contracts/integrations/package.json b/contracts/integrations/package.json index 19a350798e..24e169bb47 100644 --- a/contracts/integrations/package.json +++ b/contracts/integrations/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contract-addresses": "^5.9.0", "@0x/contract-wrappers": "^13.12.1", "@0x/contracts-broker": "^1.1.22", @@ -61,16 +61,16 @@ "@0x/contracts-exchange-forwarder": "^4.2.23", "@0x/contracts-exchange-libs": "^4.3.22", "@0x/contracts-extensions": "^6.2.17", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-utils": "^4.7.1", "@0x/coordinator-server": "^1.0.5", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/migrations": "^6.5.10", "@0x/order-utils": "^10.4.14", "@0x/protocol-utils": "^1.1.4", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/tslint-config": "^4.1.3", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@azure/core-asynciterator-polyfill": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", @@ -94,7 +94,7 @@ }, "dependencies": { "@0x/asset-swapper": "^5.8.0", - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-erc1155": "^2.1.22", "@0x/contracts-erc20": "^3.3.1", @@ -104,10 +104,10 @@ "@0x/contracts-staking": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-zero-ex": "^0.18.0", - "@0x/subproviders": "^6.2.3", + "@0x/subproviders": "^6.4.1", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "ethereum-types": "^3.4.0", "ethereumjs-util": "^6.2.0", "lodash": "^4.17.11" diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 21666490e6..a43d584839 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -49,18 +49,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/multisig", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-erc20": "^3.3.1", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", - "@0x/sol-compiler": "^4.4.1", + "@0x/dev-utils": "^4.2.1", + "@0x/sol-compiler": "^4.5.2", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -78,7 +78,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/typescript-typings": "^5.1.6", "ethereum-types": "^3.4.0" }, diff --git a/contracts/staking/package.json b/contracts/staking/package.json index aebd700804..95bf3a095f 100644 --- a/contracts/staking/package.json +++ b/contracts/staking/package.json @@ -53,20 +53,20 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-dev-utils": "^1.3.21", "@0x/contracts-erc20": "^3.3.1", "@0x/contracts-exchange-libs": "^4.3.22", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-utils": "^4.7.1", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@types/lodash": "4.14.104", "@types/node": "12.12.54", "chai": "^4.0.1", @@ -87,10 +87,10 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-test-utils": "^5.3.19", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "ethereum-types": "^3.4.0", "ethereumjs-util": "^5.1.1" }, diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index 59efcb524d..6831a6e09f 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils", "devDependencies": { - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/tslint-config": "^4.1.3", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -42,20 +42,20 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/assert": "^3.0.19", - "@0x/base-contract": "^6.2.14", + "@0x/assert": "^3.0.21", + "@0x/base-contract": "^6.2.18", "@0x/contract-addresses": "^5.9.0", - "@0x/dev-utils": "^4.1.3", - "@0x/json-schemas": "^5.3.4", + "@0x/dev-utils": "^4.2.1", + "@0x/json-schemas": "^5.4.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-coverage": "^4.0.24", - "@0x/sol-profiler": "^4.1.14", - "@0x/sol-trace": "^3.0.24", - "@0x/subproviders": "^6.2.3", + "@0x/sol-coverage": "^4.0.29", + "@0x/sol-profiler": "^4.1.19", + "@0x/sol-trace": "^3.0.29", + "@0x/subproviders": "^6.4.1", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/bn.js": "^4.11.0", "@types/js-combinatorics": "^0.5.29", "@types/lodash": "4.14.104", diff --git a/contracts/utils/package.json b/contracts/utils/package.json index fa27e4a1a3..75c569ee73 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -50,15 +50,15 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils", "devDependencies": { - "@0x/abi-gen": "^5.4.13", - "@0x/contracts-gen": "^2.0.24", + "@0x/abi-gen": "^5.4.19", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/web3-wrapper": "^7.4.1", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", @@ -79,9 +79,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "bn.js": "^4.11.8", "ethereum-types": "^3.4.0" }, diff --git a/contracts/zero-ex/package.json b/contracts/zero-ex/package.json index 469970bac0..a54cbd9d89 100644 --- a/contracts/zero-ex/package.json +++ b/contracts/zero-ex/package.json @@ -55,14 +55,14 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex", "devDependencies": { - "@0x/abi-gen": "^5.4.13", + "@0x/abi-gen": "^5.4.19", "@0x/contract-addresses": "^5.9.0", "@0x/contracts-erc20": "^3.3.1", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/order-utils": "^10.4.14", - "@0x/sol-compiler": "^4.4.1", + "@0x/sol-compiler": "^4.5.2", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@types/isomorphic-fetch": "^0.0.35", @@ -82,13 +82,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/protocol-utils": "^1.1.4", - "@0x/subproviders": "^6.2.3", + "@0x/subproviders": "^6.4.1", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "ethereum-types": "^3.4.0", "ethereumjs-util": "^5.1.1" }, diff --git a/contracts/zero-ex/test/features/meta_transactions_test.ts b/contracts/zero-ex/test/features/meta_transactions_test.ts index dc7e4e7f41..5f1d8b8772 100644 --- a/contracts/zero-ex/test/features/meta_transactions_test.ts +++ b/contracts/zero-ex/test/features/meta_transactions_test.ts @@ -94,7 +94,7 @@ blockchainTests.resets('MetaTransactions feature', env => { value: getRandomInteger(1, '1e18'), feeToken: feeToken.address, feeAmount: getRandomInteger(1, MAX_FEE_AMOUNT), - chainId: 1, // Ganache's `chainid` opcode is hardcoded as 1 + chainId: 1337, verifyingContract: zeroEx.address, ...fields, }); diff --git a/contracts/zero-ex/test/features/native_orders_feature_test.ts b/contracts/zero-ex/test/features/native_orders_feature_test.ts index 5dbe7405c9..4e65d520d4 100644 --- a/contracts/zero-ex/test/features/native_orders_feature_test.ts +++ b/contracts/zero-ex/test/features/native_orders_feature_test.ts @@ -84,6 +84,7 @@ blockchainTests.resets('NativeOrdersFeature', env => { return getRandomLimitOrder({ maker, verifyingContract, + chainId: 1337, takerToken: takerToken.address, makerToken: makerToken.address, taker: NULL_ADDRESS, @@ -96,6 +97,7 @@ blockchainTests.resets('NativeOrdersFeature', env => { return getRandomRfqOrder({ maker, verifyingContract, + chainId: 1337, takerToken: takerToken.address, makerToken: makerToken.address, txOrigin: taker, diff --git a/package.json b/package.json index d15f4db6ab..613d05ea55 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "ignoreDependencyVersionsForPackage": "contract-wrappers" }, "devDependencies": { - "@0x/monorepo-scripts": "^3.0.4", + "@0x/monorepo-scripts": "^3.0.5", "@0x-lerna-fork/lerna": "3.16.10", "@0xproject/npm-cli-login": "^0.0.11", "async-child-process": "^1.1.1", diff --git a/packages/asset-swapper/package.json b/packages/asset-swapper/package.json index 87fdd57d5c..90cfefef30 100644 --- a/packages/asset-swapper/package.json +++ b/packages/asset-swapper/package.json @@ -57,19 +57,19 @@ "registry": "git@github.com:0xProject/gitpkg-registry.git" }, "dependencies": { - "@0x/assert": "^3.0.19", - "@0x/base-contract": "^6.2.14", + "@0x/assert": "^3.0.21", + "@0x/base-contract": "^6.2.18", "@0x/contract-addresses": "^5.9.0", "@0x/contract-wrappers": "^13.12.1", - "@0x/dev-utils": "^4.1.3", - "@0x/json-schemas": "^5.3.4", + "@0x/dev-utils": "^4.2.1", + "@0x/json-schemas": "^5.4.1", "@0x/order-utils": "^10.4.14", "@0x/orderbook": "0xProject/gitpkg-registry#0x-orderbook-v2.2.7-e10a81023", "@0x/quote-server": "^4.0.1", "@0x/types": "^3.3.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@balancer-labs/sor": "0.3.2", "@bancor/sdk": "0.2.9", "@ethersproject/abi": "^5.0.1", @@ -86,19 +86,19 @@ "lodash": "^4.17.11" }, "devDependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-erc20": "^3.3.1", "@0x/contracts-exchange": "^3.2.23", "@0x/contracts-exchange-libs": "^4.3.22", - "@0x/contracts-gen": "^2.0.24", + "@0x/contracts-gen": "^2.0.30", "@0x/contracts-test-utils": "^5.3.19", "@0x/contracts-utils": "^4.7.1", "@0x/contracts-zero-ex": "^0.18.0", "@0x/mesh-rpc-client": "^9.4.2", "@0x/migrations": "^6.5.10", - "@0x/sol-compiler": "^4.4.1", - "@0x/subproviders": "^6.2.3", + "@0x/sol-compiler": "^4.5.2", + "@0x/subproviders": "^6.4.1", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", diff --git a/packages/contract-artifacts/package.json b/packages/contract-artifacts/package.json index 1235428fad..cfdd44013c 100644 --- a/packages/contract-artifacts/package.json +++ b/packages/contract-artifacts/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-artifacts", "devDependencies": { - "@0x/utils": "^6.1.1", + "@0x/utils": "^6.2.0", "@types/mocha": "^5.2.7", "chai": "^4.0.1", "lodash": "^4.17.11", diff --git a/packages/contract-wrappers-test/package.json b/packages/contract-wrappers-test/package.json index ae287ce750..9a13358e05 100644 --- a/packages/contract-wrappers-test/package.json +++ b/packages/contract-wrappers-test/package.json @@ -33,15 +33,15 @@ "devDependencies": { "@0x/contract-wrappers": "^13.12.1", "@0x/contracts-test-utils": "^5.3.19", - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/migrations": "^6.5.10", "@0x/order-utils": "^10.4.14", - "@0x/subproviders": "^6.2.3", + "@0x/subproviders": "^6.4.1", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@types/nock": "^10.0.3", "chai": "^4.0.1", "dirty-chai": "^2.0.1", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 8827802ad7..9f738a9839 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -55,13 +55,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/assert": "^3.0.19", - "@0x/base-contract": "^6.2.14", + "@0x/assert": "^3.0.21", + "@0x/base-contract": "^6.2.18", "@0x/contract-addresses": "^5.9.0", - "@0x/json-schemas": "^5.3.4", + "@0x/json-schemas": "^5.4.1", "@0x/types": "^3.3.1", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "ethereum-types": "^3.4.0", "ethers": "~4.0.4" }, diff --git a/packages/migrations/package.json b/packages/migrations/package.json index e62665e002..bffacb5a48 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -48,7 +48,7 @@ "registry": "git@github.com:0xProject/gitpkg-registry.git" }, "devDependencies": { - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", @@ -67,7 +67,7 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0x/base-contract": "^6.2.14", + "@0x/base-contract": "^6.2.18", "@0x/contract-addresses": "^5.9.0", "@0x/contracts-asset-proxy": "^3.7.4", "@0x/contracts-coordinator": "^3.1.23", @@ -82,11 +82,11 @@ "@0x/contracts-staking": "^2.0.30", "@0x/contracts-utils": "^4.7.1", "@0x/contracts-zero-ex": "^0.18.0", - "@0x/sol-compiler": "^4.4.1", - "@0x/subproviders": "^6.2.3", + "@0x/sol-compiler": "^4.5.2", + "@0x/subproviders": "^6.4.1", "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "@ledgerhq/hw-app-eth": "^4.3.0", "@types/web3-provider-engine": "^14.0.0", "ethereum-types": "^3.4.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index c39eeda402..a935f32d0c 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -43,8 +43,8 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/packages/order-utils", "devDependencies": { - "@0x/dev-utils": "^4.1.3", - "@0x/subproviders": "^6.2.3", + "@0x/dev-utils": "^4.2.1", + "@0x/subproviders": "^6.4.1", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", @@ -68,12 +68,12 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0x/assert": "^3.0.19", + "@0x/assert": "^3.0.21", "@0x/contract-addresses": "^5.9.0", "@0x/contract-wrappers": "^13.12.1", - "@0x/json-schemas": "^5.3.4", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/json-schemas": "^5.4.1", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", "lodash": "^4.17.11" diff --git a/packages/order-utils/test/signature_utils_test.ts b/packages/order-utils/test/signature_utils_test.ts index 8d691812a9..987dfe4813 100644 --- a/packages/order-utils/test/signature_utils_test.ts +++ b/packages/order-utils/test/signature_utils_test.ts @@ -120,7 +120,7 @@ describe('Signature utils', () => { const fakeProvider = { async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - if (payload.method === 'eth_signTypedData') { + if (payload.method.startsWith('eth_signTypedData')) { callback(new Error('Internal RPC Error')); } else if (payload.method === 'eth_sign') { const [address, message] = payload.params; @@ -141,7 +141,7 @@ describe('Signature utils', () => { it('should throw if the user denies the signing request', async () => { const fakeProvider = { async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - if (payload.method === 'eth_signTypedData') { + if (payload.method.startsWith('eth_signTypedData')) { callback(new Error('User denied message signature')); } else if (payload.method === 'eth_sign') { const [address, message] = payload.params; @@ -165,7 +165,7 @@ describe('Signature utils', () => { it('should default to eth_sign if eth_signTypedData is unavailable', async () => { const fakeProvider = { async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - if (payload.method === 'eth_signTypedData') { + if (payload.method.startsWith('eth_signTypedData')) { callback(new Error('Internal RPC Error')); } else if (payload.method === 'eth_sign') { const [address, message] = payload.params; @@ -190,7 +190,7 @@ describe('Signature utils', () => { it('should throw if the user denies the signing request', async () => { const fakeProvider = { async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - if (payload.method === 'eth_signTypedData') { + if (payload.method.startsWith('eth_signTypedData')) { callback(new Error('User denied message signature')); } else if (payload.method === 'eth_sign') { const [address, message] = payload.params; @@ -304,9 +304,9 @@ describe('Signature utils', () => { '0x1b65b7b6205a4511cc81ec8f1b3eb475b398d60985089a3041c74735109f207e99542c7f0f81b0a988317e89b8280ec72829c8532a04c376f1f1236589c911545002'; const fakeProvider = { async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - if (payload.method === 'eth_signTypedData') { + if (payload.method.startsWith('eth_signTypedData')) { const [address, typedData] = payload.params; - const signature = await web3Wrapper.signTypedDataAsync(address, typedData); + const signature = await web3Wrapper.signTypedDataAsync(address, JSON.parse(typedData)); callback(null, { id: 42, jsonrpc: '2.0', @@ -347,9 +347,9 @@ describe('Signature utils', () => { it('should return the correct Signature for signatureHex concatenated as R + S + V', async () => { const fakeProvider = { async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - if (payload.method === 'eth_signTypedData') { + if (payload.method.startsWith('eth_signTypedData')) { const [address, typedData] = payload.params; - const signature = await web3Wrapper.signTypedDataAsync(address, typedData); + const signature = await web3Wrapper.signTypedDataAsync(address, JSON.parse(typedData)); callback(null, { id: 42, jsonrpc: '2.0', diff --git a/packages/protocol-utils/CHANGELOG.json b/packages/protocol-utils/CHANGELOG.json index 308ed25531..bb5b830beb 100644 --- a/packages/protocol-utils/CHANGELOG.json +++ b/packages/protocol-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.1.5", + "changes": [ + { + "note": "Use `Web3Wrapper.signTypedDataAsync()` instead of removed `Web3Wrapper.signTypedDataV4Async()`", + "pr": 124 + } + ] + }, { "timestamp": 1610510890, "version": "1.1.4", diff --git a/packages/protocol-utils/package.json b/packages/protocol-utils/package.json index 15cdf9624f..f2241ae6fa 100644 --- a/packages/protocol-utils/package.json +++ b/packages/protocol-utils/package.json @@ -40,7 +40,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils", "devDependencies": { - "@0x/dev-utils": "^4.1.3", + "@0x/dev-utils": "^4.2.1", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.3", "@0x/types": "^3.3.1", @@ -61,13 +61,13 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0x/assert": "^3.0.19", + "@0x/assert": "^3.0.21", "@0x/contract-addresses": "^5.9.0", "@0x/contract-wrappers": "^13.12.1", - "@0x/json-schemas": "^5.3.4", - "@0x/subproviders": "^6.2.3", - "@0x/utils": "^6.1.1", - "@0x/web3-wrapper": "^7.3.0", + "@0x/json-schemas": "^5.4.1", + "@0x/subproviders": "^6.4.1", + "@0x/utils": "^6.2.0", + "@0x/web3-wrapper": "^7.4.1", "chai": "^4.0.1", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/packages/protocol-utils/src/signature_utils.ts b/packages/protocol-utils/src/signature_utils.ts index 82864d586e..879f54fa06 100644 --- a/packages/protocol-utils/src/signature_utils.ts +++ b/packages/protocol-utils/src/signature_utils.ts @@ -68,7 +68,7 @@ export async function eip712SignTypedDataWithProviderAsync( provider: SupportedProvider, ): Promise { const w3w = new Web3Wrapper(providerUtils.standardizeOrThrow(provider)); - const rpcSig = await w3w.signTypedDataV4Async(signer, data); + const rpcSig = await w3w.signTypedDataAsync(signer, data); return { ...parseRpcSignature(rpcSig), signatureType: SignatureType.EIP712, diff --git a/yarn.lock b/yarn.lock index fd80c9be15..9f18f75140 100644 --- a/yarn.lock +++ b/yarn.lock @@ -643,14 +643,14 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" -"@0x/abi-gen@^5.4.13": - version "5.4.13" - resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.4.13.tgz#fd7101d6937faffee1f95b6cf7bf4f589b6485cc" - integrity sha512-dZCDa9DuIjBBnhO5m3P2EclGXYeTGZowOgLX3QWkpgKnmFBGntAF7OiwzSqtaqEJgJQkJaK/YRsfO4wg5ZnzQg== +"@0x/abi-gen@^5.4.19": + version "5.4.19" + resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.4.19.tgz#d6c9dc9eee390ec191b557f57e2c369a09f6c771" + integrity sha512-uMpaSZpVaqcK52BWuhTsmbIfCrZd1HoGtIlv2J3RIQP+wsuO+pPoQCKmV0DVaJWuklfjlhIF1x3IdYPxJdM+eA== dependencies: "@0x/types" "^3.3.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" + "@0x/utils" "^6.2.0" "@types/node" "12.12.54" "@types/toposort" "^2.0.1" chalk "^2.3.0" @@ -687,27 +687,27 @@ lodash "^4.17.11" valid-url "^1.0.9" -"@0x/assert@^3.0.19": - version "3.0.19" - resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.19.tgz#a60c81706c72912807a55aab306320a1c711bc88" - integrity sha512-H0Fj7kSlxmoAZQwCAXcb0uYyddjQSJBXe3eW9bAGlEphjXE6zAuQGN6U51CqGsw8dhcoX79hayAEg+zgvizFcA== +"@0x/assert@^3.0.21": + version "3.0.21" + resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.21.tgz#b385868d1833625912fd9173a2477be5a4090aed" + integrity sha512-DDl8C6uYuy/Lw19HcOfDjgM2pwGafIUoePqKUwGeGRhMcARBWzr/KcBIKdBdQOVWg9CYKWFkiWyjTlAt8r6G3A== dependencies: - "@0x/json-schemas" "^5.3.4" + "@0x/json-schemas" "^5.4.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" + "@0x/utils" "^6.2.0" "@types/node" "12.12.54" lodash "^4.17.11" valid-url "^1.0.9" -"@0x/base-contract@^6.2.14": - version "6.2.14" - resolved "https://registry.yarnpkg.com/@0x/base-contract/-/base-contract-6.2.14.tgz#a4a8dfc91a7d33dbfd010841ed843a077531c9c6" - integrity sha512-jOOVpZWSz6oDITdWA4PpUshLKLAAe+Pdul8QUhtYNatTAnUvAa7xcVQpeNVSjawPEgP0WUmbVuMh9hY0xe+lAA== +"@0x/base-contract@^6.2.18": + version "6.2.18" + resolved "https://registry.yarnpkg.com/@0x/base-contract/-/base-contract-6.2.18.tgz#d092de93d52d8cf8e5d4600d9ca852421322ab38" + integrity sha512-Fg7KjZQqCwDqsAdSXZQv2CXC7ujlLYFaq/sJIOM76vOkv9yyWpC8KAh5ZJ1r4bOLYCo6L8zICYD4QELBSKy5wQ== dependencies: - "@0x/assert" "^3.0.19" - "@0x/json-schemas" "^5.3.4" - "@0x/utils" "^6.1.1" - "@0x/web3-wrapper" "^7.3.0" + "@0x/assert" "^3.0.21" + "@0x/json-schemas" "^5.4.1" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" "@types/node" "12.12.54" ethereumjs-account "^3.0.0" ethereumjs-blockstream "^7.0.0" @@ -736,16 +736,16 @@ version "4.12.0" resolved "https://registry.yarnpkg.com/@0x/contract-addresses/-/contract-addresses-4.12.0.tgz#2adb0bcde763ad13437f782adf25c403107ff428" -"@0x/contracts-gen@^2.0.24": - version "2.0.24" - resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.24.tgz#494c0867bab7681ebd1de56fe435b7366c1ef39b" - integrity sha512-KIkRc8wIC5HGVjbLtmCYfqGWIZnnUXxcwfZLp8wxQXnyrp5rPNwfgEKQmjnAhejy8numHxR8Grk8Ltx4shGrxg== +"@0x/contracts-gen@^2.0.30": + version "2.0.30" + resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.30.tgz#e143660b6f2aadc675e56d7675061dbd370b4985" + integrity sha512-HpGwQem6lN4n69MAINEN9sPOJ2SgQyA9w8Annr9eq7HY470kDLt8FWR7uSHqQFLBUa00fqsWXmYkluwFrL/riA== dependencies: - "@0x/sol-compiler" "^4.4.1" + "@0x/sol-compiler" "^4.5.2" "@0x/sol-resolver" "^3.1.6" "@0x/types" "^3.3.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" + "@0x/utils" "^6.2.0" "@types/node" "12.12.54" ethereum-types "^3.4.0" lodash "^4.17.11" @@ -780,16 +780,16 @@ typeorm "0.2.7" websocket "^1.0.25" -"@0x/dev-utils@^4.1.3": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-4.1.3.tgz#85eb7fa13b1d71f0b7c881f35944944d1be56ac9" - integrity sha512-/93iF2ZNz5zBpZCo/XhmZURC+CJV5vRykJbhcmFFAXrcmZhRvkSinw6QhBNHv2UJxMO3GwbiGklLWNMhA/LmMQ== +"@0x/dev-utils@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-4.2.1.tgz#f7364d218ae4ef9b2502963aba3cc34d83cf8673" + integrity sha512-t1mwu8FLsoydLVBODlUf9ADK8uFc599I91lND4foPgKgVixBdO2A22nLvNFJzLl3cdY/fPlx2ITL2ruuMRM6vg== dependencies: - "@0x/subproviders" "^6.2.3" + "@0x/subproviders" "^6.4.1" "@0x/types" "^3.3.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" - "@0x/web3-wrapper" "^7.3.0" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" "@types/node" "12.12.54" "@types/web3-provider-engine" "^14.0.0" chai "^4.0.1" @@ -818,10 +818,10 @@ jsonschema "^1.2.0" lodash.values "^4.3.0" -"@0x/json-schemas@^5.3.4": - version "5.3.4" - resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-5.3.4.tgz#1cd43f65436cd4aa959611c65ae7d29472f3ac3e" - integrity sha512-4ff3a19K3XBjEpc3ld0t4Hb6H1ZNQWS8jxJQpuXtnzWTSzEnXbMs8K+0HxsznxcNWm1HplMCQk3gLkBmqS4zwA== +"@0x/json-schemas@^5.4.1": + version "5.4.1" + resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-5.4.1.tgz#488cae01fbb7f37fa9043e426f52ff32de69f6e0" + integrity sha512-zZ2CPrRf2RfqnMdHIVy7h3mv31sCrqav71E2CpgQt0nkgoepbsBJdIEpQfr4AYwF40EsZuSkGe5JoyP+RFyKZw== dependencies: "@0x/typescript-typings" "^5.1.6" "@types/node" "12.12.54" @@ -853,13 +853,13 @@ web3-providers "^2.0.0-alpha.1" websocket "^1.0.29" -"@0x/monorepo-scripts@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@0x/monorepo-scripts/-/monorepo-scripts-3.0.4.tgz#f6755eca9f02dcd0ed6ddd1616f5d8fc348ac313" - integrity sha512-OiBOWv1Z+8J1WZukm2M8kfsP3WwR5VtYNHeIM+rnxg75Zt7wsu+zM0uJQiL4CodJAOptEX2WQTQqebF5HPY3Tg== +"@0x/monorepo-scripts@^3.0.5": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@0x/monorepo-scripts/-/monorepo-scripts-3.0.5.tgz#1f1504d0d8deae3143394d9ae70980be49fceb25" + integrity sha512-QQ1y34Mj4W4PvTMVwK/PUM3O/+xUWeYGx2kHFvFKXfYuPV+OT+9vFkvDqsFM9RtRBeXbMHBNQJyZXeCtoGPtdQ== dependencies: "@0x/types" "^3.3.1" - "@0x/utils" "^6.1.1" + "@0x/utils" "^6.2.0" "@lerna/batch-packages" "^3.0.0-beta.18" "@types/depcheck" "^0.6.0" "@types/node" "12.12.54" @@ -906,18 +906,18 @@ express-async-handler "^1.1.4" http-status-codes "^1.4.0" -"@0x/sol-compiler@^4.4.1": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.4.1.tgz#c10a207bb7e1ab41587df1542e143b88e40b01f7" - integrity sha512-AQIgWHTQHpaoza7rLx+tQIoWJzCBkPTJPX8cAvV5Uv6Ed5ChjAzcqmSlD3tWuJaauUyEgmguqYSGk0y4at5Y6Q== +"@0x/sol-compiler@^4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.5.2.tgz#da47263dfe14045c735955d5a026e1b6af7e855c" + integrity sha512-L5q4S5blMZusY7q5Unmv9GtBo0N0Sjp56F7iDl8bVzTU8F3H83WAaNkqWRzrPZKCHwAQcP3a0rNAprwCtavkeA== dependencies: - "@0x/assert" "^3.0.19" - "@0x/json-schemas" "^5.3.4" + "@0x/assert" "^3.0.21" + "@0x/json-schemas" "^5.4.1" "@0x/sol-resolver" "^3.1.6" "@0x/types" "^3.3.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" - "@0x/web3-wrapper" "^7.3.0" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" "@types/node" "12.12.54" "@types/yargs" "^11.0.0" chalk "^2.3.0" @@ -934,13 +934,13 @@ web3-eth-abi "^1.0.0-beta.24" yargs "^10.0.3" -"@0x/sol-coverage@^4.0.24": - version "4.0.24" - resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.24.tgz#fd4d470e8c2808a668793b5c73bfa75aab4ea7d0" - integrity sha512-ewPLJuDDSd7R8o0iFghdDEfvzhz5nBKxCXgFEI/bY43aI6gmEDyNhXSaHu/clX2Ot7b23+qNQmcbLkpisGgXNA== +"@0x/sol-coverage@^4.0.29": + version "4.0.29" + resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.29.tgz#4ce7d5d20f73f11e435497085378b214124f5ad7" + integrity sha512-uUtDEzT+kuph6F09ciJtmd/bFqF0ypViuI6qn4Axt25w255yklK6p1Xsl8CsFv86xjaWH2Y2n3/QsYtxoetWOA== dependencies: - "@0x/sol-tracing-utils" "^7.1.14" - "@0x/subproviders" "^6.2.3" + "@0x/sol-tracing-utils" "^7.1.19" + "@0x/subproviders" "^6.4.1" "@0x/typescript-typings" "^5.1.6" "@types/minimatch" "^3.0.3" "@types/node" "12.12.54" @@ -949,15 +949,15 @@ minimatch "^3.0.4" web3-provider-engine "14.0.6" -"@0x/sol-profiler@^4.1.14": - version "4.1.14" - resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.14.tgz#bc10c47bbc9bbe7f8b120f8543286355127c39d8" - integrity sha512-1z7C/eFWi2GZQIQQt8IG7dkNQaqDmOSLf3EJEtdqyPmc9rLyOogClLFs0CFPI0AGJFIt0BAVxv62dLupyWnW7A== +"@0x/sol-profiler@^4.1.19": + version "4.1.19" + resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.19.tgz#28deae3d61cfef9e748843a602d6cc096a2ab990" + integrity sha512-pFnYHVA/ncMKCxlwjOcmUP2hW+TnmaIjEoK2YDQwVpaVxJbxlTlRLVcQHGHvIQYqwyzBipfkWseqLx73kvNS2w== dependencies: - "@0x/sol-tracing-utils" "^7.1.14" - "@0x/subproviders" "^6.2.3" + "@0x/sol-tracing-utils" "^7.1.19" + "@0x/subproviders" "^6.4.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" + "@0x/utils" "^6.2.0" "@types/node" "12.12.54" ethereum-types "^3.4.0" ethereumjs-util "^5.1.1" @@ -974,13 +974,13 @@ "@types/node" "12.12.54" lodash "^4.17.11" -"@0x/sol-trace@^3.0.24": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.24.tgz#0219b6a32e4cad6ad44342ae49ddd11df22593f6" - integrity sha512-REU/HCrHu+VmrA8kjRXhrdTQK4EiNuNla83szd+Dqzr3VVoadO6Ua5XowbAP0jn2HgyHlwo1mnLyH8xb+ZKScQ== +"@0x/sol-trace@^3.0.29": + version "3.0.29" + resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.29.tgz#e0d58b0b5a74c42c8c149ad37b46d40571e3c61d" + integrity sha512-i2+V5owTWkiYNBTUPgVmEQt1bpri5P/K+Gbx2GflkFwPt8HIkLi1lR636vqmrSTD+SKaHWY0zs3CXJI5i84l8A== dependencies: - "@0x/sol-tracing-utils" "^7.1.14" - "@0x/subproviders" "^6.2.3" + "@0x/sol-tracing-utils" "^7.1.19" + "@0x/subproviders" "^6.4.1" "@0x/typescript-typings" "^5.1.6" "@types/node" "12.12.54" chalk "^2.3.0" @@ -990,18 +990,18 @@ loglevel "^1.6.1" web3-provider-engine "14.0.6" -"@0x/sol-tracing-utils@^7.1.14": - version "7.1.14" - resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.1.14.tgz#0cc7ac67682dbae0dacbd748488425b70e7494a2" - integrity sha512-VzfTDjuTEXpzTpPR5UZh03ei4bwzc9Tif65oHh/+LejuyB9qijF5NofIYSOmviOAl+UJgUpfEAoYJ8R7v8lptg== +"@0x/sol-tracing-utils@^7.1.19": + version "7.1.19" + resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.1.19.tgz#4e05144e829b4f1e4b49086c5950209ca0d71722" + integrity sha512-g4GTpLuJVH7VdH6g8otuPXQ7uvC2jBGzfGXLWd0/zs2RKUR8tbzxlOiIKhETaVADBnAqEIoUvbKn5//L52j4cw== dependencies: - "@0x/dev-utils" "^4.1.3" - "@0x/sol-compiler" "^4.4.1" + "@0x/dev-utils" "^4.2.1" + "@0x/sol-compiler" "^4.5.2" "@0x/sol-resolver" "^3.1.6" - "@0x/subproviders" "^6.2.3" + "@0x/subproviders" "^6.4.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" - "@0x/web3-wrapper" "^7.3.0" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" "@types/node" "12.12.54" "@types/solidity-parser-antlr" "^0.2.3" chalk "^2.3.0" @@ -1046,16 +1046,16 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.3.0" -"@0x/subproviders@^6.2.3": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-6.2.3.tgz#632ed8b73b65bc6b6d5944eee3e95dda02475629" - integrity sha512-lebZFCaatGvnUo2W+rYbKza+1sQgrhMfxFuuugrPqX8pQnbM1VqrCr2wJL103SPVXJ34MPwONm/m2MMx34V+hw== +"@0x/subproviders@^6.4.1": + version "6.4.1" + resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-6.4.1.tgz#aaec18651f6ae6a1c545481efa6aaebb97525998" + integrity sha512-DurwE7xQeeqfmPDU4FexmuMwK4aNfhfry/naPAYlz8aR7kKf1penZFR4h4bs2wgGhtcPnw3800qUlpFwueQRgw== dependencies: - "@0x/assert" "^3.0.19" + "@0x/assert" "^3.0.21" "@0x/types" "^3.3.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" - "@0x/web3-wrapper" "^7.3.0" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" "@ledgerhq/hw-app-eth" "^4.3.0" "@ledgerhq/hw-transport-u2f" "4.24.0" "@types/hdkey" "^0.7.0" @@ -1066,7 +1066,7 @@ ethereum-types "^3.4.0" ethereumjs-tx "^1.3.5" ethereumjs-util "^5.1.1" - ganache-core "^2.10.2" + ganache-core "^2.13.2" hdkey "^0.7.1" json-rpc-error "2.0.0" lodash "^4.17.11" @@ -1219,10 +1219,10 @@ js-sha3 "^0.7.0" lodash "^4.17.11" -"@0x/utils@^6.1.1": - version "6.1.1" - resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-6.1.1.tgz#bb671283895dd967f912252e10420e02f9562281" - integrity sha512-L3/MKSGQsD2pWCv394VbSr0IbnkzSEN2JTrnKK/+72YaW1RvAtvbXfTuZ1n7KdU9ymC+YdXH+J2uv62X8OGosA== +"@0x/utils@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-6.2.0.tgz#07708d87691ac260163c01713ffac7a7f8e4c795" + integrity sha512-cVJYTHhXsaH8zgEpLxpuX9MnEEFsU8Kzpn9E6ACPlB1jsThOSTC0PPdlSkA6k7IrN5PHCaW879mkcBEcpFCWXQ== dependencies: "@0x/types" "^3.3.1" "@0x/typescript-typings" "^5.1.6" @@ -1268,15 +1268,15 @@ ethers "~4.0.4" lodash "^4.17.11" -"@0x/web3-wrapper@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-7.3.0.tgz#7e6c7a27768f9c596d6809a8a10e1c6c0856a286" - integrity sha512-NTYD6Uo+fifLjM5nJqr1qGdbTEIJQBrHGvgItuKV3b4noH4MlqoRGvFaY3kMFl/37oV1Bal7UFGcDF8Xf285bQ== +"@0x/web3-wrapper@^7.4.1": + version "7.4.1" + resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-7.4.1.tgz#196ed73eef6989ff953d5b2d610352b47748f73e" + integrity sha512-RNr9j/FtPHuAn7BxoKq2UUb1OoOIhbqHxXRLpsBBM4CU78/WjNF7zd95WB4RRnhbEK9HkdhgKb1a/lclCp84cA== dependencies: - "@0x/assert" "^3.0.19" - "@0x/json-schemas" "^5.3.4" + "@0x/assert" "^3.0.21" + "@0x/json-schemas" "^5.4.1" "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.1.1" + "@0x/utils" "^6.2.0" "@types/node" "12.12.54" ethereum-types "^3.4.0" ethereumjs-util "^5.1.1" @@ -5719,6 +5719,18 @@ eth-query@^2.0.2, eth-query@^2.1.0, eth-query@^2.1.2: json-rpc-random-id "^1.0.0" xtend "^4.0.1" +eth-sig-util@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-3.0.0.tgz#75133b3d7c20a5731af0690c385e184ab942b97e" + integrity sha512-4eFkMOhpGbTxBQ3AMzVf0haUX2uTur7DpWiHzWyTURa28BVJJtOkcb9Ok5TV0YvEPG61DODPW7ZUATbJTslioQ== + dependencies: + buffer "^5.2.1" + elliptic "^6.4.0" + ethereumjs-abi "0.6.5" + ethereumjs-util "^5.1.1" + tweetnacl "^1.0.0" + tweetnacl-util "^0.15.0" + eth-sig-util@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210" @@ -6690,6 +6702,43 @@ ganache-core@^2.10.2: ethereumjs-wallet "0.6.5" web3 "1.2.11" +ganache-core@^2.13.2: + version "2.13.2" + resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.13.2.tgz#27e6fc5417c10e6e76e2e646671869d7665814a3" + integrity sha512-tIF5cR+ANQz0+3pHWxHjIwHqFXcVo0Mb+kcsNhglNFALcYo49aQpnS9dqHartqPfMFjiHh/qFoD3mYK0d/qGgw== + dependencies: + abstract-leveldown "3.0.0" + async "2.6.2" + bip39 "2.5.0" + cachedown "1.0.0" + clone "2.1.2" + debug "3.2.6" + encoding-down "5.0.4" + eth-sig-util "3.0.0" + ethereumjs-abi "0.6.8" + ethereumjs-account "3.0.0" + ethereumjs-block "2.2.2" + ethereumjs-common "1.5.0" + ethereumjs-tx "2.1.2" + ethereumjs-util "6.2.1" + ethereumjs-vm "4.2.0" + heap "0.2.6" + keccak "3.0.1" + level-sublevel "6.6.4" + levelup "3.1.1" + lodash "4.17.20" + lru-cache "5.1.1" + merkle-patricia-tree "3.0.0" + patch-package "6.2.2" + seedrandom "3.0.1" + source-map-support "0.5.12" + tmp "0.1.0" + web3-provider-engine "14.2.1" + websocket "1.0.32" + optionalDependencies: + ethereumjs-wallet "0.6.5" + web3 "1.2.11" + gauge@~1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"