chore: update dependencies (0xProject#698)

zjbob · Apr 7, 2023 · fe4fe48 · fe4fe48
1 parent 356e74a
commit fe4fe48
Show file tree

Hide file tree

Showing 21 changed files with 339 additions and 200 deletions.
diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,12 @@
 [
+    {
+        "version": "5.4.50",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1678410794,
         "version": "5.4.49",

diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json
@@ -39,19 +39,19 @@
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.35",
+        "@0x/assert": "^3.0.36",
         "@0x/base-contract": "^7.0.0",
         "@0x/contract-addresses": "^8.2.0",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/dev-utils": "^5.0.2",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-profiler": "^4.1.36",
         "@0x/sol-trace": "^3.0.46",
-        "@0x/subproviders": "^7.0.0",
-        "@0x/types": "^3.3.6",
+        "@0x/subproviders": "^8.0.1",
+        "@0x/types": "^3.3.7",
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/web3-wrapper": "^8.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",

diff --git a/contracts/test-utils/src/web3_wrapper.ts b/contracts/test-utils/src/web3_wrapper.ts
@@ -1,12 +1,9 @@
 import { devConstants, env, EnvVars, Web3Config, web3Factory } from '@0x/dev-utils';
-import { prependSubprovider, Web3ProviderEngine } from '@0x/subproviders';
-import { logUtils } from '@0x/utils';
+import { Web3ProviderEngine } from '@0x/subproviders';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
 import { constants } from './constants';
-import { profiler } from './profiler';
-import { revertTrace } from './revert_trace';
 
 export const txDefaults = {
     from: devConstants.TESTRPC_FIRST_ADDRESS,
@@ -31,26 +28,9 @@ export const providerConfigs: Web3Config = {
 export const provider: Web3ProviderEngine = web3Factory.getRpcProvider(providerConfigs);
 provider.stop();
 const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
-const isProfilerEnabled = env.parseBoolean(EnvVars.SolidityProfiler);
-const isRevertTraceEnabled = env.parseBoolean(EnvVars.SolidityRevertTrace);
-const enabledSubproviderCount = _.filter(
-    [isCoverageEnabled, isProfilerEnabled, isRevertTraceEnabled],
-    _.identity.bind(_),
-).length;
+const enabledSubproviderCount = _.filter([isCoverageEnabled], _.identity.bind(_)).length;
 if (enabledSubproviderCount > 1) {
     throw new Error(`Only one of profiler or revert trace subproviders can be enabled at a time`);
 }
-if (isProfilerEnabled) {
-    const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
-    logUtils.log(
-        "By default profilerSubprovider is stopped so that you don't get noise from setup code. Don't forget to start it before the code you want to profile and stop it afterwards",
-    );
-    profilerSubprovider.stop();
-    prependSubprovider(provider, profilerSubprovider);
-}
-if (isRevertTraceEnabled) {
-    const revertTraceSubprovider = revertTrace.getRevertTraceSubproviderSingleton();
-    prependSubprovider(provider, revertTraceSubprovider);
-}
 
 export const web3Wrapper = new Web3Wrapper(provider);
diff --git a/contracts/treasury/CHANGELOG.json b/contracts/treasury/CHANGELOG.json
@@ -1,4 +1,12 @@
 [
+    {
+        "version": "1.4.43",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1678410794,
         "version": "1.4.42",

diff --git a/contracts/treasury/package.json b/contracts/treasury/package.json
@@ -45,11 +45,11 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
+        "@0x/abi-gen": "^5.8.5",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
         "@0x/contracts-erc20": "3.3.57",
-        "@0x/contracts-gen": "^2.0.48",
+        "@0x/contracts-gen": "^2.0.50",
         "@0x/contracts-staking": "^2.0.45",
         "@0x/contracts-test-utils": "^5.4.49",
         "@0x/sol-compiler": "^4.8.2",
@@ -74,11 +74,11 @@
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
         "@0x/protocol-utils": "^11.18.1",
-        "@0x/subproviders": "^7.0.0",
-        "@0x/types": "^3.3.6",
+        "@0x/subproviders": "^8.0.1",
+        "@0x/types": "^3.3.7",
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/web3-wrapper": "^8.0.1",
         "ethereum-types": "^3.7.1",
         "ethereumjs-util": "^7.0.10"
     },

diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json
@@ -1,4 +1,12 @@
 [
+    {
+        "version": "4.8.41",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1678410794,
         "version": "4.8.40",

diff --git a/contracts/utils/package.json b/contracts/utils/package.json
@@ -15,7 +15,6 @@
         "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
-        "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
         "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
         "compile": "sol-compiler",
@@ -44,14 +43,14 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
-        "@0x/contracts-gen": "^2.0.48",
+        "@0x/abi-gen": "^5.8.5",
+        "@0x/contracts-gen": "^2.0.50",
         "@0x/contracts-test-utils": "^5.4.49",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/dev-utils": "^5.0.2",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
-        "@0x/types": "^3.3.6",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/types": "^3.3.7",
+        "@0x/web3-wrapper": "^8.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",

diff --git a/contracts/zero-ex/CHANGELOG.json b/contracts/zero-ex/CHANGELOG.json
@@ -1,4 +1,12 @@
 [
+    {
+        "changes": [
+            {
+                "note": "Uprgade dependencies"
+            }
+        ],
+        "timestamp": 1680893079
+    },
     {
         "version": "0.39.1",
         "changes": [

diff --git a/contracts/zero-ex/package.json b/contracts/zero-ex/package.json
@@ -50,12 +50,12 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
+        "@0x/abi-gen": "^5.8.5",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/contracts-erc20": "^3.3.57",
-        "@0x/contracts-gen": "^2.0.48",
+        "@0x/contracts-gen": "^2.0.50",
         "@0x/contracts-test-utils": "^5.4.49",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/dev-utils": "^5.0.2",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
@@ -81,11 +81,11 @@
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
         "@0x/protocol-utils": "^11.18.1",
-        "@0x/subproviders": "^7.0.0",
-        "@0x/types": "^3.3.6",
+        "@0x/subproviders": "^8.0.1",
+        "@0x/types": "^3.3.7",
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/web3-wrapper": "^8.0.1",
         "ethereum-types": "^3.7.1",
         "ethereumjs-util": "^7.0.10",
         "ethers": "~4.0.4"

diff --git a/contracts/zero-ex/scripts/rollback.ts b/contracts/zero-ex/scripts/rollback.ts
@@ -1,9 +1,9 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
 import { constants } from '@0x/contracts-test-utils';
-import { RPCSubprovider, SupportedProvider, Web3ProviderEngine } from '@0x/subproviders';
+import { RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
 import { AbiEncoder, BigNumber, logUtils, providerUtils } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
-import { MethodAbi } from 'ethereum-types';
+import { MethodAbi, SupportedProvider } from 'ethereum-types';
 import * as fetch from 'isomorphic-fetch';
 import * as _ from 'lodash';
 import * as prompts from 'prompts';

diff --git a/contracts/zero-ex/src/index.ts b/contracts/zero-ex/src/index.ts
@@ -26,6 +26,7 @@ export {
     RevertErrorAbi,
     StandardContractOutput,
     StateMutability,
+    SupportedProvider,
     TupleDataItem,
 } from 'ethereum-types';
 export { artifacts } from './artifacts';
@@ -58,4 +59,3 @@ export {
     ZeroExContract,
 } from './wrappers';
 export { EIP712TypedData } from '@0x/types';
-export { SupportedProvider } from '@0x/subproviders';
diff --git a/contracts/zero-ex/src/migration.ts b/contracts/zero-ex/src/migration.ts
@@ -1,7 +1,6 @@
-import { SupportedProvider } from '@0x/subproviders';
 import { SimpleContractArtifact } from '@0x/types';
 import { NULL_ADDRESS } from '@0x/utils';
-import { TxData } from 'ethereum-types';
+import { TxData, SupportedProvider } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { artifacts } from './artifacts';

diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json
@@ -1,4 +1,12 @@
 [
+	{
+		"version": "13.22.19",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"timestamp": 1678410794,
 		"version": "13.22.18",

diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
@@ -57,13 +57,13 @@
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.35",
+        "@0x/assert": "^3.0.36",
         "@0x/base-contract": "^7.0.0",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/json-schemas": "^6.4.4",
-        "@0x/types": "^3.3.6",
+        "@0x/types": "^3.3.7",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/web3-wrapper": "^8.0.1",
         "ethereum-types": "^3.7.1",
         "ethers": "~4.0.4"
     },

diff --git a/packages/protocol-utils/CHANGELOG.json b/packages/protocol-utils/CHANGELOG.json
@@ -1,4 +1,12 @@
 [
+	{
+		"version": "11.18.2",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"timestamp": 1678410794,
 		"version": "11.18.1",

diff --git a/packages/protocol-utils/package.json b/packages/protocol-utils/package.json
@@ -38,9 +38,9 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils",
     "devDependencies": {
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/dev-utils": "^5.0.2",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/types": "^3.3.6",
+        "@0x/types": "^3.3.7",
         "@0x/typescript-typings": "^5.3.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
@@ -61,13 +61,13 @@
         "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.35",
+        "@0x/assert": "^3.0.36",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/contract-wrappers": "^13.22.18",
         "@0x/json-schemas": "^6.4.4",
-        "@0x/subproviders": "^7.0.0",
+        "@0x/subproviders": "^8.0.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/web3-wrapper": "^8.0.1",
         "@typescript-eslint/parser": "^5.38.0",
         "chai": "^4.0.1",
         "ethereumjs-util": "^7.0.10",

diff --git a/packages/protocol-utils/src/meta_transactions.ts b/packages/protocol-utils/src/meta_transactions.ts
@@ -1,5 +1,5 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
-import { SupportedProvider } from '@0x/subproviders';
+import { SupportedProvider } from 'ethereum-types';
 import { EIP712TypedData } from '@0x/types';
 import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 

diff --git a/packages/protocol-utils/src/nft_orders.ts b/packages/protocol-utils/src/nft_orders.ts
@@ -1,5 +1,5 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
-import { SupportedProvider } from '@0x/subproviders';
+import { SupportedProvider } from 'ethereum-types';
 import { EIP712TypedData } from '@0x/types';
 import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 

diff --git a/packages/protocol-utils/src/orders.ts b/packages/protocol-utils/src/orders.ts
@@ -1,5 +1,5 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
-import { SupportedProvider } from '@0x/subproviders';
+import { SupportedProvider } from 'ethereum-types';
 import { EIP712TypedData } from '@0x/types';
 import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 

diff --git a/packages/protocol-utils/src/signature_utils.ts b/packages/protocol-utils/src/signature_utils.ts
@@ -1,4 +1,4 @@
-import { SupportedProvider } from '@0x/subproviders';
+import { SupportedProvider } from 'ethereum-types';
 import { EIP712TypedData } from '@0x/types';
 import { hexUtils, providerUtils, signTypedDataUtils } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';