chore: Update deps (#64)

* update ganache to latest

* Fix test adding 27 to V, which doesn't appear to be required anymore

* Remove merkle-patricia-tree resolution

* bump lodash

* CHANGELOG

* remove echo

abi-gen/package.json

@@ -38,7 +38,7 @@
         "prettier_contract_wrappers": "prettier --write ./test-cli/output/typescript/* --config ../.prettierrc",
         "generate_contract_wrappers": "run-p gen_typescript gen_python",
         "gen_typescript": "abi-gen --abis ${npm_package_config_abis} --debug --output ./test-cli/output/typescript --backend ethers",
-        "gen_python": "pip install regex==2019.11.1 && pip install black && abi-gen --abis  ${npm_package_config_abis} --output ./test-cli/output/python --language Python",
+        "gen_python": "pip install regex==2019.11.1 && pip install black && abi-gen --abis ${npm_package_config_abis} --output ./test-cli/output/python --language Python",
         "diff_contract_wrappers": "git diff --exit-code ./test-cli/output",
         "coverage:report:text": "istanbul report text",
         "coverage:report:html": "istanbul report html && open coverage/index.html",
@@ -73,7 +73,7 @@
         "ethereum-types": "^3.7.0",
         "glob": "^7.1.2",
         "handlebars": "^4.1.2",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "mkdirp": "^0.5.1",
         "tmp": "^0.0.33",
         "to-snake-case": "^1.0.0",

abi-gen/test-cli/test_typescript/test/abi_gen_dummy_test.ts

@@ -140,7 +140,7 @@ describe('AbiGenDummy Contract', () => {
             const r = `0x${signature.slice(2, 66)}`;
             const s = `0x${signature.slice(66, 130)}`;
             const v = signature.slice(130, 132);
-            const v_decimal = parseInt(v, 16) + 27; // v: (0 or 1) => (27 or 28)
+            const v_decimal = parseInt(v, 16);
             // tslint:enable:custom-no-magic-numbers
 
             const result = await abiGenDummy.ecrecoverFn(message, v_decimal, r, s).callAsync();

assert/package.json

@@ -49,7 +49,7 @@
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^6.5.3",
         "@types/node": "12.12.54",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "valid-url": "^1.0.9"
     },
     "publishConfig": {

base-contract/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "7.0.0",
+        "changes": [
+            {
+                "note": "Update downstream dependencies to latest versions",
+                "pr": 64
+            }
+        ]
+    },
     {
         "version": "6.5.0",
         "changes": [

base-contract/package.json

@@ -52,17 +52,13 @@
         "@0x/utils": "^6.5.3",
         "@0x/web3-wrapper": "^7.6.5",
         "@types/node": "12.12.54",
-        "ethereumjs-account": "^3.0.0",
         "ethereumjs-blockstream": "^7.0.0",
-        "ethereumjs-util": "^7.1.0",
-        "ethereumjs-vm": "^4.2.0",
+        "ethereumjs-util": "^7.1.5",
+        "@ethereumjs/vm": "^5.9.3",
         "ethers": "~4.0.4",
         "js-sha3": "^0.7.0",
         "uuid": "^3.3.2"
     },
-    "resolutions": {
-        "merkle-patricia-tree": "^2.3.2"
-    },
     "publishConfig": {
         "access": "public"
     },

base-contract/src/index.ts

@@ -25,15 +25,15 @@ import {
     TxData,
     TxDataPayable,
 } from 'ethereum-types';
-import Account from 'ethereumjs-account';
 import * as util from 'ethereumjs-util';
-import { default as VM } from 'ethereumjs-vm';
-import PStateManager from 'ethereumjs-vm/dist/state/promisified';
+import VM from '@ethereumjs/vm';
 
 export { linkLibrariesInBytecode, methodAbiToFunctionSignature } from './utils';
 
 import { AwaitTransactionSuccessOpts } from './types';
 import { formatABIDataItem } from './utils';
+import { RunCallOpts } from '@ethereumjs/vm/dist/runCall';
+import Common, { Chain, Hardfork } from '@ethereumjs/common';
 
 export { SubscriptionManager } from './subscription_manager';
 
@@ -77,7 +77,7 @@ export class PromiseWithTransactionHash<T> implements Promise<T> {
     public catch<TResult>(onRejected?: (reason: any) => Promise<TResult>): Promise<TResult | T> {
         return this._promise.catch(onRejected);
     }
-    public finally(onFinally?: (() => void) | null): Promise<T> {
+    public finally(onFinally?: () => void | null): Promise<T> {
         return this._promise.finally(onFinally);
     }
     // tslint:enable:promise-function-async
@@ -102,7 +102,7 @@ export class BaseContract {
     public constructorArgs: any[] = [];
     public _deployedBytecodeIfExists?: Buffer;
     private _evmIfExists?: VM;
-    private _evmAccountIfExists?: Buffer;
+    private _evmAccountIfExists?: util.Address;
 
     protected static _formatABIDataItemList(
         abis: DataItem[],
@@ -190,7 +190,9 @@ export class BaseContract {
             const decoded = rawDecoded[i];
             if (!abiUtils.isAbiDataEqual(params.names[i], params.types[i], original, decoded)) {
                 throw new Error(
-                    `Cannot safely encode argument: ${params.names[i]} (${original}) of type ${params.types[i]}. (Possible type overflow or other encoding error)`,
+                    `Cannot safely encode argument: ${params.names[i]} (${original}) of type ${
+                        params.types[i]
+                    }. (Possible type overflow or other encoding error)`,
                 );
             }
         }
@@ -260,37 +262,37 @@ export class BaseContract {
     }
     protected async _evmExecAsync(encodedData: string): Promise<string> {
         const encodedDataBytes = Buffer.from(encodedData.substr(2), 'hex');
-        const addressBuf = Buffer.from(this.address.substr(2), 'hex');
+        const toAddress = new util.Address(Buffer.from(this.address.substr(2), 'hex'));
         // should only run once, the first time it is called
         if (this._evmIfExists === undefined) {
-            const vm = new VM({});
-            const psm = new PStateManager(vm.stateManager);
+            const vm = new VM();
 
             // create an account with 1 ETH
             const accountPk = Buffer.from(ARBITRARY_PRIVATE_KEY, 'hex');
-            const accountAddress = util.privateToAddress(accountPk);
-            const account = new Account({ balance: 1e18 });
-            await psm.putAccount(accountAddress, account);
+            const accountAddress = new util.Address(util.privateToAddress(accountPk));
+            const account = util.Account.fromAccountData({ balance: '0xde0b6b3a7640000' });
+            await vm.stateManager.putAccount(accountAddress, account);
 
             // 'deploy' the contract
             if (this._deployedBytecodeIfExists === undefined) {
                 const contractCode = await this._web3Wrapper.getContractCodeAsync(this.address);
                 this._deployedBytecodeIfExists = Buffer.from(contractCode.substr(2), 'hex');
             }
-            await psm.putContractCode(addressBuf, this._deployedBytecodeIfExists);
+            await vm.stateManager.putContractCode(toAddress, this._deployedBytecodeIfExists);
 
             // save for later
             this._evmIfExists = vm;
             this._evmAccountIfExists = accountAddress;
         }
         let rawCallResult;
         try {
-            const result = await this._evmIfExists.runCall({
-                to: addressBuf,
+            const callOpts: RunCallOpts = {
+                to: toAddress,
                 caller: this._evmAccountIfExists,
                 origin: this._evmAccountIfExists,
                 data: encodedDataBytes,
-            });
+            };
+            const result = await this._evmIfExists.runCall(callOpts);
             rawCallResult = `0x${result.execResult.returnValue.toString('hex')}`;
         } catch (err) {
             BaseContract._throwIfThrownErrorIsRevertError(err);

contracts-gen/package.json

@@ -34,7 +34,7 @@
         "@0x/utils": "^6.5.3",
         "@types/node": "12.12.54",
         "ethereum-types": "^3.7.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "mkdirp": "^0.5.1",
         "prettier": "^1.16.3",
         "to-snake-case": "^1.0.0"

dev-utils/package.json

@@ -58,8 +58,8 @@
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "ethereum-types": "^3.7.0",
-        "lodash": "^4.17.11",
-        "web3-provider-engine": "14.0.6"
+        "lodash": "^4.17.21",
+        "web3-provider-engine": "16.0.4"
     },
     "publishConfig": {
         "access": "public"

monorepo-scripts/package.json

@@ -55,7 +55,7 @@
         "es6-promisify": "^5.0.0",
         "glob": "^7.1.2",
         "isomorphic-fetch": "2.2.1",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "mkdirp": "^0.5.1",
         "moment": "2.21.0",
         "promisify-child-process": "^1.0.5",

sol-compiler/package.json

@@ -70,7 +70,7 @@
         "typedoc": "~0.16.11",
         "types-bn": "^0.0.1",
         "typescript": "4.2.2",
-        "web3-provider-engine": "14.0.6",
+        "web3-provider-engine": "16.0.4",
         "web3-typescript-typings": "^0.10.2",
         "zeppelin-solidity": "1.8.0"
     },
@@ -88,7 +88,7 @@
         "chokidar": "^3.0.2",
         "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "mkdirp": "^0.5.1",
         "pluralize": "^7.0.0",
         "require-from-string": "^2.0.1",

sol-coverage/package.json

@@ -39,9 +39,9 @@
         "@types/minimatch": "^3.0.3",
         "@types/node": "12.12.54",
         "ethereum-types": "^3.7.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "minimatch": "^3.0.4",
-        "web3-provider-engine": "14.0.6"
+        "web3-provider-engine": "16.0.4"
     },
     "devDependencies": {
         "@0x/ts-doc-gen": "^0.0.28",

sol-doc/package.json

@@ -49,7 +49,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
         "shx": "^0.2.2",

sol-profiler/package.json

@@ -40,8 +40,8 @@
         "@types/node": "12.12.54",
         "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.1.0",
-        "lodash": "^4.17.11",
-        "web3-provider-engine": "14.0.6"
+        "lodash": "^4.17.21",
+        "web3-provider-engine": "16.0.4"
     },
     "devDependencies": {
         "@0x/ts-doc-gen": "^0.0.28",

sol-resolver/package.json

@@ -34,7 +34,7 @@
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
         "@types/node": "12.12.54",
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.21"
     },
     "publishConfig": {
         "access": "public"

sol-trace/package.json

@@ -40,9 +40,9 @@
         "chalk": "^2.3.0",
         "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "loglevel": "^1.6.1",
-        "web3-provider-engine": "14.0.6"
+        "web3-provider-engine": "16.0.4"
     },
     "devDependencies": {
         "@0x/ts-doc-gen": "^0.0.28",

sol-tracing-utils/package.json

@@ -53,7 +53,7 @@
         "ethers": "~4.0.4",
         "glob": "^7.1.2",
         "istanbul": "^0.4.5",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "loglevel": "^1.6.1",
         "mkdirp": "^0.5.1",
         "rimraf": "^2.6.2",

subproviders/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "7.0.0",
+        "changes": [
+            {
+                "note": "Update Ganache to 7.x",
+                "pr": 64
+            }
+        ]
+    },
     {
         "timestamp": 1647415391,
         "version": "6.6.5",

subproviders/package.json

@@ -16,6 +16,7 @@
         "build": "tsc -b",
         "build:ci": "yarn build",
         "clean": "shx rm -rf lib generated_docs",
+        "watch": "tsc -b -w",
         "lint": "tslint --format stylish --project .",
         "fix": "tslint --fix --format stylish --project .",
         "run_mocha_unit": "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
@@ -31,7 +32,7 @@
         "s3:sync_md_docs": "aws s3 sync ./docs s3://docs-markdown/${npm_package_name}/v${npm_package_version} --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
         "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
         "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES",
-        "postinstall": "node -e \"try{ fs.unlinkSync(path.resolve(path.dirname(require.resolve('ganache-core')), './typings/index.d.ts')) } catch (err) {}\""
+        "postinstall": ""
     },
     "config": {
         "postpublish": {
@@ -55,12 +56,12 @@
         "bn.js": "^4.11.8",
         "ethereum-types": "^3.7.0",
         "ethereumjs-util": "^7.1.0",
-        "ganache-core": "^2.13.2",
+        "ganache": "^7.3.2",
         "hdkey": "^0.7.1",
         "json-rpc-error": "2.0.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "semaphore-async-await": "^1.5.1",
-        "web3-provider-engine": "14.0.6"
+        "web3-provider-engine": "16.0.4"
     },
     "devDependencies": {
         "@0x/ts-doc-gen": "^0.0.28",
@@ -92,8 +93,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "browser": {
-        "ganache-core": false
-    },
     "gitHead": "4f91bfd907996b2f4dd383778b50c479c2602b56"
 }