Move CLI tests for abi-gen (#1930)

Closes #1925, #1926
2019-07-10 09:19:50 -07:00
parent e503cacf57
commit 50da1354f3
27 changed files with 431 additions and 417 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -95,8 +95,6 @@ contracts/erc1155/generated-artifacts/
 contracts/extensions/generated-artifacts/
 contracts/exchange-forwarder/generated-artifacts/
 contracts/dev-utils/generated-artifacts/
-packages/abi-gen/test/generated-test/generated-artifacts
-packages/abi-gen/test/generated-test/output
 packages/sol-tracing-utils/test/fixtures/artifacts/
 packages/metacoin/artifacts/
 python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/
@@ -118,6 +116,9 @@ contracts/exchange-forwarder/generated-wrappers/
 contracts/dev-utils/generated-wrappers/
 packages/metacoin/src/contract_wrappers

+# cli test output
+packages/abi-gen/test-cli/output
+
 # solc-bin in sol-compiler
 packages/sol-compiler/solc_bin/

--- a/.prettierignore
+++ b/.prettierignore
@@ -24,8 +24,9 @@ lib
 /contracts/exchange-forwarder/generated-artifacts
 /contracts/dev-utils/generated-wrappers
 /contracts/dev-utils/generated-artifacts
-/packages/abi-gen/test/generated-test/generated-artifacts
-/packages/abi-gen/test/generated-test/known-good
+/packages/abi-gen/test-cli/fixtures/artifacts/
+/packages/abi-gen/test-cli/output
+/packages/abi-gen/test-cli/expected-output
 /packages/abi-gen-wrappers/src/generated-wrappers
 /packages/contract-artifacts/artifacts
 /python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts
--- a/packages/abi-gen/README.md
+++ b/packages/abi-gen/README.md
@@ -102,3 +102,27 @@ yarn clean
 ```bash
 yarn lint
 ```
+
+### CLI tests
+
+The files in `test-cli/` are used to test the CLI output against a set of dummy contracts.
+
+Compile dummy contracts and generate wrappers:
+
+```
+yarn test_cli:prebuild
+```
+
+Build generated wrappers and unit tests:
+
+```
+yarn test_cli:build
+```
+
+Run unit tests and check diffs of generated wrappers vs known wrappers:
+
+```
+yarn test_cli
+```
+
+Known-good wrappers have been previously committed and are kept in `test-cli/expected-output/{language}`. They are intended to provide sample output and should be kept in sync with the generating code. When making changes to this project or `@0x/abi-gen-templates`, run `yarn test_cli:prebuild` to generate fresh code into `test-cli/output/{language}`, and then manually copy it to `test-cli/expected-output/{language}`.
--- a/packages/abi-gen/compiler.json
+++ b/packages/abi-gen/compiler.json
@@ -1,6 +1,6 @@
 {
-    "artifactsDir": "./test/generated-test/generated-artifacts",
-    "contractsDir": "./test/generated-test/contracts",
+    "artifactsDir": "./test-cli/fixtures/artifacts",
+    "contractsDir": "./test-cli/fixtures/contracts",
    "useDockerisedSolc": false,
    "isOfflineMode": false,
    "compilerSettings": {
--- a/packages/abi-gen/diff.sh
+++ b/packages/abi-gen/diff.sh
@@ -1,5 +1,5 @@
-diff $1 $2
+diff -r $1 $2
 if [ $? -ne 0 ]; then
-    echo "ERROR: Freshly generated code does not match known-good, commited output.  If you're confident that the freshly generated code should be considered known-good, then copy it into there and commit it."
+    echo "ERROR: Freshly generated output does not match expected output.  If you're confident that the expected output should be updated, copy it in there and commit it."
    exit 1
 fi
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -9,38 +9,37 @@
    "types": "lib/src/index.d.ts",
    "scripts": {
        "lint": "tslint --format stylish --project . && yarn lint-contracts",
-        "lint-contracts": "solhint -c ../../contracts/.solhint.json contracts/**/**/**/**/*.sol",
+        "lint-contracts": "solhint -c ../../contracts/.solhint.json test-cli/contracts/*.sol",
        "fix": "tslint --fix --format stylish --project . && yarn lint-contracts",
-        "clean": "shx rm -rf lib test/generated-test/output",
-        "build": "tsc -b",
-        "build_contracts_to_wrap": "run-s compile:sol",
-        "build_contract_wrappers": "tsc --project test/generated-test/tsconfig.json",
+        "clean": "shx rm -rf lib && yarn test_cli:clean",
+        "build": "tsc -b && yarn generate_contract_wrappers && yarn test_cli:build",
        "build:ci": "yarn build",
-        "test": "run-s run_mocha build_contracts_to_wrap generate_contract_wrappers diff_contract_wrappers # build_contract_wrappers run_contract_wrapper_tests HACK: note this is commented out. building those contract wrappers is broken on development right now",
+        "test": "yarn run_mocha && yarn test_cli",
+        "test:circleci": "yarn test:coverage && yarn test_cli",
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/*_test.js --timeout 100000 --bail --exit",
-        "run_contract_wrapper_tests": "mocha --require source-map-support/register --require make-promises-safe test/generated-test/output/TypeScript/lib/**/*_test.js --timeout 100000 --bail --exit",
-        "test:circleci": "yarn test:coverage",
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
+        "test_cli": "yarn test_cli:run_mocha && yarn diff_contract_wrappers",
+        "test_cli:clean": "rm -rf test-cli/output && rm -rf test-cli/test_typescript/lib",
+        "test_cli:build": "tsc --project test-cli/tsconfig.json",
+        "test_cli:run_mocha": "mocha --require source-map-support/register --require make-promises-safe test-cli/test_typescript/lib/**/*_test.js --timeout 100000 --bail --exit",
        "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",
-        "clean:sol": "rm -rf test/generated-test/generated-artifacts",
+        "clean:sol": "rm -rf test-cli/artifacts",
        "compile:sol": "sol-compiler",
        "watch:sol": "sol-compiler -w",
        "generate_contract_wrappers": "run-p gen_typescript gen_python",
-        "gen_typescript": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output ./test/generated-test/output/TypeScript/src --backend ethers",
-        "gen_python": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/Python/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/Python/partials/**/*.handlebars' --output ./test/generated-test/output/Python --language Python",
-        "diff_contract_wrappers": "run-p diff_typescript diff_python",
-        "diff_typescript": "./diff.sh ./test/generated-test/known-good/TypeScript ./test/generated-test/output/TypeScript/src",
-        "diff_python": "./diff.sh ./test/generated-test/known-good/Python ./test/generated-test/output/Python",
+        "gen_typescript": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output ./test-cli/output/typescript --backend ethers",
+        "gen_python": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/Python/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/Python/partials/**/*.handlebars' --output ./test-cli/output/python --language Python",
+        "diff_contract_wrappers": "./diff.sh ./test-cli/expected-output ./test-cli/output",
        "coverage:report:text": "istanbul report text",
        "coverage:report:html": "istanbul report html && open coverage/index.html",
        "profiler:report:html": "istanbul report html && open coverage/index.html",
        "contracts:gen": "contracts-gen"
    },
    "config": {
-        "abis": "./test/generated-test/generated-artifacts/@(AbiGenDummy|LibDummy|TestLibDummy).json",
+        "abis": "./test-cli/fixtures/artifacts/@(AbiGenDummy|LibDummy|TestLibDummy).json",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
    },
    "bin": {
@@ -67,7 +66,6 @@
        "handlebars": "^4.0.11",
        "lodash": "^4.17.11",
        "mkdirp": "^0.5.1",
-        "sleep": "^5.1.1",
        "tmp": "^0.0.33",
        "to-snake-case": "^1.0.0",
        "yargs": "^10.0.3"
@@ -85,7 +83,6 @@
        "@types/handlebars": "^4.0.36",
        "@types/mkdirp": "^0.5.2",
        "@types/node": "*",
-        "@types/sleep": "^0.0.7",
        "@types/tmp": "^0.0.33",
        "@types/yargs": "^11.0.0",
        "chai": "^4.0.1",
--- a/packages/abi-gen/test/generated-test/known-good/Python/abi_gen_dummy.py
+++ b/packages/abi-gen/test/generated-test/known-good/Python/abi_gen_dummy.py
--- a/packages/abi-gen/test/generated-test/known-good/Python/lib_dummy.py
+++ b/packages/abi-gen/test/generated-test/known-good/Python/lib_dummy.py
--- a/packages/abi-gen/test/generated-test/known-good/Python/test_lib_dummy.py
+++ b/packages/abi-gen/test/generated-test/known-good/Python/test_lib_dummy.py
--- a/packages/abi-gen/test/generated-test/known-good/TypeScript/abi_gen_dummy.ts
+++ b/packages/abi-gen/test/generated-test/known-good/TypeScript/abi_gen_dummy.ts
--- a/packages/abi-gen/test/generated-test/known-good/TypeScript/lib_dummy.ts
+++ b/packages/abi-gen/test/generated-test/known-good/TypeScript/lib_dummy.ts
--- a/packages/abi-gen/test/generated-test/known-good/TypeScript/test_lib_dummy.ts
+++ b/packages/abi-gen/test/generated-test/known-good/TypeScript/test_lib_dummy.ts
--- a/packages/abi-gen/test-cli/fixtures/artifacts/AbiGenDummy.json
+++ b/packages/abi-gen/test-cli/fixtures/artifacts/AbiGenDummy.json
--- a/packages/abi-gen/test-cli/fixtures/artifacts/LibDummy.json
+++ b/packages/abi-gen/test-cli/fixtures/artifacts/LibDummy.json
@@ -0,0 +1,60 @@
+{
+	"schemaVersion": "2.0.0",
+	"contractName": "LibDummy",
+	"compilerOutput": {
+		"abi": [],
+		"evm": {
+			"bytecode": {
+				"linkReferences": {},
+				"object": "0x60556023600b82828239805160001a607314601657fe5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea265627a7a72305820a278ce8d53a26107b2f2ba78687fa040ee9ab2ecf0e44ebff0f9410c586e0c6d64736f6c634300050a0032",
+				"opcodes": "PUSH1 0x55 PUSH1 0x23 PUSH1 0xB DUP3 DUP3 DUP3 CODECOPY DUP1 MLOAD PUSH1 0x0 BYTE PUSH1 0x73 EQ PUSH1 0x16 JUMPI INVALID JUMPDEST ADDRESS PUSH1 0x0 MSTORE PUSH1 0x73 DUP2 MSTORE8 DUP3 DUP2 RETURN INVALID PUSH20 0x0 ADDRESS EQ PUSH1 0x80 PUSH1 0x40 MSTORE PUSH1 0x0 DUP1 REVERT INVALID LOG2 PUSH6 0x627A7A723058 KECCAK256 LOG2 PUSH25 0xCE8D53A26107B2F2BA78687FA040EE9AB2ECF0E44EBFF0F941 0xc PC PUSH15 0xC6D64736F6C634300050A00320000 ",
+				"sourceMap": "606:385:1:-;;132:2:-1;166:7;155:9;146:7;137:37;255:7;249:14;246:1;241:23;235:4;232:33;222:2;;269:9;222:2;293:9;290:1;283:20;323:4;314:7;306:22;347:7;338;331:24"
+			},
+			"deployedBytecode": {
+				"linkReferences": {},
+				"object": "0x73000000000000000000000000000000000000000030146080604052600080fdfea265627a7a72305820a278ce8d53a26107b2f2ba78687fa040ee9ab2ecf0e44ebff0f9410c586e0c6d64736f6c634300050a0032",
+				"opcodes": "PUSH20 0x0 ADDRESS EQ PUSH1 0x80 PUSH1 0x40 MSTORE PUSH1 0x0 DUP1 REVERT INVALID LOG2 PUSH6 0x627A7A723058 KECCAK256 LOG2 PUSH25 0xCE8D53A26107B2F2BA78687FA040EE9AB2ECF0E44EBFF0F941 0xc PC PUSH15 0xC6D64736F6C634300050A00320000 ",
+				"sourceMap": "606:385:1:-;;;;;;;;"
+			}
+		}
+	},
+	"sources": {
+		"LibDummy.sol": {
+			"id": 1
+		}
+	},
+	"sourceCodes": {
+		"LibDummy.sol": "/*\n\n  Copyright 2018 ZeroEx Intl.\n\n  Licensed under the Apache License, Version 2.0 (the \"License\");\n  you may not use this file except in compliance with the License.\n  You may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.\n\n*/\n\npragma solidity ^0.5.5;\n\n\nlibrary LibDummy {\n\n    using LibDummy for uint256;\n    uint256 constant internal SOME_CONSTANT = 1234;\n\n    function addOne (uint256 x)\n        internal\n        pure\n        returns (uint256 sum)\n    {\n        return x + 1;\n    }\n\n    function addConstant (uint256 x)\n        internal\n        pure\n        returns (uint256 someConstant)\n    {\n        return x + SOME_CONSTANT;\n    }\n}\n"
+	},
+	"sourceTreeHashHex": "0xe9654f3d694bd3513dddbcc0ccd7a75739bf63dc92b974e163f191122416fdb6",
+	"compiler": {
+		"name": "solc",
+		"version": "soljson-v0.5.10+commit.5a6ea5b1.js",
+		"settings": {
+			"optimizer": {
+				"enabled": true,
+				"runs": 1000000,
+				"details": {
+					"yul": true,
+					"deduplicate": true,
+					"cse": true,
+					"constantOptimizer": true
+				}
+			},
+			"outputSelection": {
+				"*": {
+					"*": [
+						"abi",
+						"evm.bytecode.object",
+						"evm.bytecode.sourceMap",
+						"evm.deployedBytecode.object",
+						"evm.deployedBytecode.sourceMap"
+					]
+				}
+			},
+			"evmVersion": "constantinople",
+			"remappings": []
+		}
+	},
+	"networks": {}
+}
--- a/packages/abi-gen/test-cli/fixtures/artifacts/TestLibDummy.json
+++ b/packages/abi-gen/test-cli/fixtures/artifacts/TestLibDummy.json
@@ -0,0 +1,103 @@
+{
+	"schemaVersion": "2.0.0",
+	"contractName": "TestLibDummy",
+	"compilerOutput": {
+		"abi": [
+			{
+				"constant": true,
+				"inputs": [
+					{
+						"name": "x",
+						"type": "uint256"
+					}
+				],
+				"name": "publicAddConstant",
+				"outputs": [
+					{
+						"name": "result",
+						"type": "uint256"
+					}
+				],
+				"payable": false,
+				"stateMutability": "pure",
+				"type": "function"
+			},
+			{
+				"constant": true,
+				"inputs": [
+					{
+						"name": "x",
+						"type": "uint256"
+					}
+				],
+				"name": "publicAddOne",
+				"outputs": [
+					{
+						"name": "result",
+						"type": "uint256"
+					}
+				],
+				"payable": false,
+				"stateMutability": "pure",
+				"type": "function"
+			}
+		],
+		"evm": {
+			"bytecode": {
+				"linkReferences": {},
+				"object": "0x608060405234801561001057600080fd5b5060d78061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c806322935e921460375780632b82fdf0146063575b600080fd5b605160048036036020811015604b57600080fd5b5035607d565b60408051918252519081900360200190f35b605160048036036020811015607757600080fd5b5035608c565b60006086826095565b92915050565b6000608682609c565b6104d20190565b6001019056fea265627a7a72305820c97345939b2d163165dee7bdfbbd7ca281c5bdaea7b03de53b0ceb32b097cdf864736f6c634300050a0032",
+				"opcodes": "PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH2 0x10 JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP PUSH1 0xD7 DUP1 PUSH2 0x1F PUSH1 0x0 CODECOPY PUSH1 0x0 RETURN INVALID PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xF JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP PUSH1 0x4 CALLDATASIZE LT PUSH1 0x32 JUMPI PUSH1 0x0 CALLDATALOAD PUSH1 0xE0 SHR DUP1 PUSH4 0x22935E92 EQ PUSH1 0x37 JUMPI DUP1 PUSH4 0x2B82FDF0 EQ PUSH1 0x63 JUMPI JUMPDEST PUSH1 0x0 DUP1 REVERT JUMPDEST PUSH1 0x51 PUSH1 0x4 DUP1 CALLDATASIZE SUB PUSH1 0x20 DUP2 LT ISZERO PUSH1 0x4B JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP CALLDATALOAD PUSH1 0x7D JUMP JUMPDEST PUSH1 0x40 DUP1 MLOAD SWAP2 DUP3 MSTORE MLOAD SWAP1 DUP2 SWAP1 SUB PUSH1 0x20 ADD SWAP1 RETURN JUMPDEST PUSH1 0x51 PUSH1 0x4 DUP1 CALLDATASIZE SUB PUSH1 0x20 DUP2 LT ISZERO PUSH1 0x77 JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP CALLDATALOAD PUSH1 0x8C JUMP JUMPDEST PUSH1 0x0 PUSH1 0x86 DUP3 PUSH1 0x95 JUMP JUMPDEST SWAP3 SWAP2 POP POP JUMP JUMPDEST PUSH1 0x0 PUSH1 0x86 DUP3 PUSH1 0x9C JUMP JUMPDEST PUSH2 0x4D2 ADD SWAP1 JUMP JUMPDEST PUSH1 0x1 ADD SWAP1 JUMP INVALID LOG2 PUSH6 0x627A7A723058 KECCAK256 0xc9 PUSH20 0x45939B2D163165DEE7BDFBBD7CA281C5BDAEA7B0 RETURNDATASIZE 0xe5 EXTCODESIZE 0xc 0xeb ORIGIN 0xb0 SWAP8 0xcd 0xf8 PUSH5 0x736F6C6343 STOP SDIV EXP STOP ORIGIN ",
+				"sourceMap": "632:346:2:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;632:346:2;;;;;;;"
+			},
+			"deployedBytecode": {
+				"linkReferences": {},
+				"object": "0x6080604052348015600f57600080fd5b506004361060325760003560e01c806322935e921460375780632b82fdf0146063575b600080fd5b605160048036036020811015604b57600080fd5b5035607d565b60408051918252519081900360200190f35b605160048036036020811015607757600080fd5b5035608c565b60006086826095565b92915050565b6000608682609c565b6104d20190565b6001019056fea265627a7a72305820c97345939b2d163165dee7bdfbbd7ca281c5bdaea7b03de53b0ceb32b097cdf864736f6c634300050a0032",
+				"opcodes": "PUSH1 0x80 PUSH1 0x40 MSTORE CALLVALUE DUP1 ISZERO PUSH1 0xF JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP PUSH1 0x4 CALLDATASIZE LT PUSH1 0x32 JUMPI PUSH1 0x0 CALLDATALOAD PUSH1 0xE0 SHR DUP1 PUSH4 0x22935E92 EQ PUSH1 0x37 JUMPI DUP1 PUSH4 0x2B82FDF0 EQ PUSH1 0x63 JUMPI JUMPDEST PUSH1 0x0 DUP1 REVERT JUMPDEST PUSH1 0x51 PUSH1 0x4 DUP1 CALLDATASIZE SUB PUSH1 0x20 DUP2 LT ISZERO PUSH1 0x4B JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP CALLDATALOAD PUSH1 0x7D JUMP JUMPDEST PUSH1 0x40 DUP1 MLOAD SWAP2 DUP3 MSTORE MLOAD SWAP1 DUP2 SWAP1 SUB PUSH1 0x20 ADD SWAP1 RETURN JUMPDEST PUSH1 0x51 PUSH1 0x4 DUP1 CALLDATASIZE SUB PUSH1 0x20 DUP2 LT ISZERO PUSH1 0x77 JUMPI PUSH1 0x0 DUP1 REVERT JUMPDEST POP CALLDATALOAD PUSH1 0x8C JUMP JUMPDEST PUSH1 0x0 PUSH1 0x86 DUP3 PUSH1 0x95 JUMP JUMPDEST SWAP3 SWAP2 POP POP JUMP JUMPDEST PUSH1 0x0 PUSH1 0x86 DUP3 PUSH1 0x9C JUMP JUMPDEST PUSH2 0x4D2 ADD SWAP1 JUMP JUMPDEST PUSH1 0x1 ADD SWAP1 JUMP INVALID LOG2 PUSH6 0x627A7A723058 KECCAK256 0xc9 PUSH20 0x45939B2D163165DEE7BDFBBD7CA281C5BDAEA7B0 RETURNDATASIZE 0xe5 EXTCODESIZE 0xc 0xeb ORIGIN 0xb0 SWAP8 0xcd 0xf8 PUSH5 0x736F6C6343 STOP SDIV EXP STOP ORIGIN ",
+				"sourceMap": "632:346:2:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;632:346:2;;;;;;;;;;;;;;;;;;;;;;;;833:143;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;833:143:2;;:::i;:::-;;;;;;;;;;;;;;;;694:133;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;694:133:2;;:::i;833:143::-;917:14;954:15;:1;:13;:15::i;:::-;947:22;833:143;-1:-1:-1;;833:143:2:o;694:133::-;773:14;810:10;:1;:8;:10::i;842:147:1:-;704:4;965:17;;842:147::o;715:121::-;828:1;824:5;;715:121::o"
+			}
+		}
+	},
+	"sources": {
+		"TestLibDummy.sol": {
+			"id": 2
+		},
+		"LibDummy.sol": {
+			"id": 1
+		}
+	},
+	"sourceCodes": {
+		"TestLibDummy.sol": "/*\n\n  Copyright 2018 ZeroEx Intl.\n\n  Licensed under the Apache License, Version 2.0 (the \"License\");\n  you may not use this file except in compliance with the License.\n  You may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.\n\n*/\n\npragma solidity ^0.5.5;\n\nimport \"./LibDummy.sol\";\n\n\ncontract TestLibDummy {\n\n    using LibDummy for uint256;\n\n    function publicAddOne (uint256 x)\n        public\n        pure\n        returns (uint256 result)\n    {\n        return x.addOne();\n    }\n\n    function publicAddConstant (uint256 x)\n        public\n        pure\n        returns (uint256 result)\n    {\n        return x.addConstant();\n    }\n}\n",
+		"LibDummy.sol": "/*\n\n  Copyright 2018 ZeroEx Intl.\n\n  Licensed under the Apache License, Version 2.0 (the \"License\");\n  you may not use this file except in compliance with the License.\n  You may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.\n\n*/\n\npragma solidity ^0.5.5;\n\n\nlibrary LibDummy {\n\n    using LibDummy for uint256;\n    uint256 constant internal SOME_CONSTANT = 1234;\n\n    function addOne (uint256 x)\n        internal\n        pure\n        returns (uint256 sum)\n    {\n        return x + 1;\n    }\n\n    function addConstant (uint256 x)\n        internal\n        pure\n        returns (uint256 someConstant)\n    {\n        return x + SOME_CONSTANT;\n    }\n}\n"
+	},
+	"sourceTreeHashHex": "0xca99c7d7de9db975842de61e6ec01debdada66cf91d28fc3f2983de3011560dc",
+	"compiler": {
+		"name": "solc",
+		"version": "soljson-v0.5.10+commit.5a6ea5b1.js",
+		"settings": {
+			"optimizer": {
+				"enabled": true,
+				"runs": 1000000,
+				"details": {
+					"yul": true,
+					"deduplicate": true,
+					"cse": true,
+					"constantOptimizer": true
+				}
+			},
+			"outputSelection": {
+				"*": {
+					"*": [
+						"abi",
+						"evm.bytecode.object",
+						"evm.bytecode.sourceMap",
+						"evm.deployedBytecode.object",
+						"evm.deployedBytecode.sourceMap"
+					]
+				}
+			},
+			"evmVersion": "constantinople",
+			"remappings": []
+		}
+	},
+	"networks": {}
+}
--- a/packages/abi-gen/test/generated-test/contracts/AbiGenDummy.sol
+++ b/packages/abi-gen/test/generated-test/contracts/AbiGenDummy.sol
--- a/packages/abi-gen/test/generated-test/contracts/LibDummy.sol
+++ b/packages/abi-gen/test/generated-test/contracts/LibDummy.sol
--- a/packages/abi-gen/test/generated-test/contracts/TestLibDummy.sol
+++ b/packages/abi-gen/test/generated-test/contracts/TestLibDummy.sol
--- a/packages/abi-gen/test-cli/test_typescript/src/artifacts.ts
+++ b/packages/abi-gen/test-cli/test_typescript/src/artifacts.ts
@@ -5,9 +5,9 @@
 */
 import { ContractArtifact } from 'ethereum-types';

-import * as AbiGenDummy from '../generated-artifacts/AbiGenDummy.json';
-import * as LibDummy from '../generated-artifacts/LibDummy.json';
-import * as TestLibDummy from '../generated-artifacts/TestLibDummy.json';
+import * as AbiGenDummy from '../../fixtures/artifacts/AbiGenDummy.json';
+import * as LibDummy from '../../fixtures/artifacts/LibDummy.json';
+import * as TestLibDummy from '../../fixtures/artifacts/TestLibDummy.json';
 export const artifacts = {
    AbiGenDummy: AbiGenDummy as ContractArtifact,
    LibDummy: LibDummy as ContractArtifact,
--- a/packages/abi-gen/test-cli/test_typescript/src/index.ts
+++ b/packages/abi-gen/test-cli/test_typescript/src/index.ts
--- a/packages/abi-gen/test-cli/test_typescript/src/wrappers.ts
+++ b/packages/abi-gen/test-cli/test_typescript/src/wrappers.ts
@@ -3,6 +3,6 @@
 * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
 * -----------------------------------------------------------------------------
 */
-export * from '../generated-wrappers/abi_gen_dummy';
-export * from '../generated-wrappers/lib_dummy';
-export * from '../generated-wrappers/test_lib_dummy';
+export * from '../../output/typescript/abi_gen_dummy';
+export * from '../../output/typescript/lib_dummy';
+export * from '../../output/typescript/test_lib_dummy';
--- a/packages/abi-gen/test-cli/test_typescript/test/abi_gen_dummy_test.ts
+++ b/packages/abi-gen/test-cli/test_typescript/test/abi_gen_dummy_test.ts
--- a/packages/abi-gen/test-cli/tsconfig.json
+++ b/packages/abi-gen/test-cli/tsconfig.json
@@ -0,0 +1,14 @@
+{
+    "extends": "../../../tsconfig.json",
+    "compilerOptions": {
+        "resolveJsonModule": true,
+        "outDir": "./test_typescript/lib",
+        "rootDir": "."
+    },
+    "files": [
+        "./fixtures/artifacts/AbiGenDummy.json",
+        "./fixtures/artifacts/LibDummy.json",
+        "./fixtures/artifacts/TestLibDummy.json"
+    ],
+    "include": ["./output/typescript/**/*", "./test_typescript/**/*"]
+}
--- a/packages/abi-gen/test/generated-test/tsconfig.json
+++ b/packages/abi-gen/test/generated-test/tsconfig.json
@@ -1,16 +0,0 @@
-{
-    "extends": "../../../../tsconfig.json",
-    "compilerOptions": {
-        "resolveJsonModule": true,
-        "outDir": "./output/lib",
-        "rootDir": "."
-    },
-    "files": [
-        "./generated-artifacts/AbiGenDummy.json",
-        "./generated-artifacts/LibDummy.json",
-        "./generated-artifacts/TestLibDummy.json",
-        "./output/src/abi_gen_dummy.ts",
-        "./output/src/lib_dummy.ts",
-        "./output/src/test_lib_dummy.ts"
-    ]
-}
--- a/packages/abi-gen/tsconfig.json
+++ b/packages/abi-gen/tsconfig.json
@@ -5,7 +5,7 @@
        "rootDir": "."
    },
    "exclude": [
-        "./test/generated-test/**/*",
+        "./test-cli/**/*",
        "./src/artifacts.ts",
        "./src/wrappers.ts",
        "prior two elements refer to code generated by contracts-gen for test fixture contracts"
--- a/packages/abi-gen/tslint.json
+++ b/packages/abi-gen/tslint.json
@@ -1,6 +1,6 @@
 {
    "extends": ["@0x/tslint-config"],
    "linterOptions": {
-        "exclude": ["./test/generated-test/generated-artifacts/**/*", "**/lib/**/*"]
+        "exclude": ["./test-cli/fixtures/**/*", "**/lib/**/*"]
    }
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -677,12 +677,6 @@
  dependencies:
    regenerator-runtime "^0.12.0"

-"@babel/runtime@^7.3.1":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
 "@babel/types@^7.0.0":
  version "7.1.3"
  resolved "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
@@ -1395,12 +1389,6 @@
  dependencies:
    "@types/node" "*"

-"@types/bn.js@^4.11.4":
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.5.tgz#40e36197433f78f807524ec623afcf0169ac81dc"
-  dependencies:
-    "@types/node" "*"
-
 "@types/body-parser@*", "@types/body-parser@^1.16.1":
  version "1.16.8"
  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3"
@@ -1625,10 +1613,6 @@
  version "10.9.4"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"

-"@types/node@^10.12.18":
-  version "10.14.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.10.tgz#e491484c6060af8d461e12ec81c0da8a3282b8de"
-
 "@types/numeral@^0.0.22":
  version "0.0.22"
  resolved "https://registry.yarnpkg.com/@types/numeral/-/numeral-0.0.22.tgz#86bef1f0a2d743afdc2ef3168d45f2905e1a0b93"
@@ -1844,10 +1828,6 @@
  version "2.3.7"
  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-2.3.7.tgz#e92c2fed3297eae078d78d1da032b26788b4af86"

-"@types/sleep@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@types/sleep/-/sleep-0.0.7.tgz#0572b5d06978b4305671c614b0f68b4640ce7d43"
-
 "@types/solidity-parser-antlr@^0.2.3":
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/@types/solidity-parser-antlr/-/solidity-parser-antlr-0.2.3.tgz#bb2d9c6511bf483afe4fc3e2714da8a924e59e3f"
@@ -3732,7 +3712,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6:
    inherits "^2.0.1"
    safe-buffer "^5.0.1"

-browserify-cipher@^1.0.0, browserify-cipher@^1.0.1:
+browserify-cipher@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
  dependencies:
@@ -4216,10 +4196,6 @@ chardet@^0.7.0:
  version "0.7.0"
  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"

-"charenc@>= 0.0.1":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
 check-error@^1.0.1, check-error@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -4384,6 +4360,12 @@ cli-cursor@^2.1.0:
  dependencies:
    restore-cursor "^2.0.0"

+cli-format@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/cli-format/-/cli-format-3.0.9.tgz#ea2cf6df891a8deaaa0dae7d9b8bd21dd8661bb2"
+  dependencies:
+    string-width "^1.0.1"
+
 cli-highlight@^1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-1.2.3.tgz#b200f97ed0e43d24633e89de0f489a48bb87d2bf"
@@ -5104,10 +5086,6 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.4, cross-spawn@^6.0.5:
    shebang-command "^1.2.0"
    which "^1.2.9"

-"crypt@>= 0.0.1":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
 cryptiles@2.x.x:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -6371,13 +6349,6 @@ eth-block-tracker@^3.0.0:
    pify "^2.3.0"
    tape "^4.6.3"

-eth-ens-namehash@2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf"
-  dependencies:
-    idna-uts46-hx "^2.3.1"
-    js-sha3 "^0.5.7"
-
 eth-json-rpc-infura@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-3.1.0.tgz#01b955a04d1a827b14c6cdc8a78b3a025d06a183"
@@ -6426,14 +6397,6 @@ eth-lib@0.2.7:
    elliptic "^6.4.0"
    xhr-request-promise "^0.1.2"

-eth-lib@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.8.tgz#b194058bef4b220ad12ea497431d6cb6aa0623c8"
-  dependencies:
-    bn.js "^4.11.6"
-    elliptic "^6.4.0"
-    xhr-request-promise "^0.1.2"
-
 eth-lightwallet@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/eth-lightwallet/-/eth-lightwallet-3.0.1.tgz#297022932aa568f4e4eb0873bff257f5e5b78709"
@@ -6572,7 +6535,7 @@ ethereumjs-common@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.1.0.tgz#5ec9086c314d619d8f05e79a0525829fcb0e93cb"

-ethereumjs-tx@1.3.7, ethereumjs-tx@^1.3.7:
+ethereumjs-tx@1.3.7:
  version "1.3.7"
  resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a"
  dependencies:
@@ -6677,21 +6640,6 @@ ethereumjs-wallet@0.6.2:
    utf8 "^3.0.0"
    uuid "^3.3.2"

-ethers@^4.0.27:
-  version "4.0.31"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.31.tgz#50b066d8c74140944edfd2ad0a805162c30e3a20"
-  dependencies:
-    "@types/node" "^10.3.2"
-    aes-js "3.0.0"
-    bn.js "^4.4.0"
-    elliptic "6.3.3"
-    hash.js "1.1.3"
-    js-sha3 "0.5.7"
-    scrypt-js "2.0.4"
-    setimmediate "1.0.4"
-    uuid "2.0.1"
-    xmlhttprequest "1.8.0"
-
 ethers@~4.0.4:
  version "4.0.4"
  resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.4.tgz#d3f85e8b27f4b59537e06526439b0fb15b44dc65"
@@ -6723,7 +6671,7 @@ ethjs-abi@^0.2.1:
    js-sha3 "0.5.5"
    number-to-bn "1.7.0"

-ethjs-unit@0.1.6, ethjs-unit@^0.1.6:
+ethjs-unit@0.1.6:
  version "0.1.6"
  resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699"
  dependencies:
@@ -6778,14 +6726,10 @@ eventemitter3@1.x.x:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"

-eventemitter3@3.1.0, eventemitter3@^3.0.0:
+eventemitter3@^3.0.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"

-eventemitter3@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
-
 events@1.1.1, events@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
@@ -8106,20 +8050,10 @@ got@^6.7.1:
    unzip-response "^2.0.1"
    url-parse-lax "^1.0.0"

-graceful-fs@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  dependencies:
-    natives "^1.1.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@4.1.15, graceful-fs@^3.0.0, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~1.2.0:
  version "4.1.15"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"

-graceful-fs@~1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-
 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -8696,12 +8630,6 @@ icss-replace-symbols@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"

-idna-uts46-hx@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz#a1dc5c4df37eee522bf66d969cc980e00e8711f9"
-  dependencies:
-    punycode "2.1.0"
-
 ieee754@1.1.8:
  version "1.1.8"
  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -9857,7 +9785,7 @@ js-sha3@0.5.5:
  version "0.5.5"
  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.5.tgz#baf0c0e8c54ad5903447df96ade7a4a1bca79a4a"

-js-sha3@0.5.7, js-sha3@^0.5.7:
+js-sha3@0.5.7:
  version "0.5.7"
  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"

@@ -11555,7 +11483,7 @@ mz@^2.4.0, mz@^2.6.0:
    object-assign "^4.0.1"
    thenify-all "^1.0.0"

-nan@2.10.0, nan@>=2.5.1, nan@^2.0.8, nan@^2.2.1, nan@^2.3.0, nan@^2.3.3, nan@^2.6.2, nan@^2.9.2, nan@~2.10.0:
+nan@2.10.0, nan@^2.0.8, nan@^2.2.1, nan@^2.3.0, nan@^2.3.3, nan@^2.6.2, nan@^2.9.2, nan@~2.10.0:
  version "2.10.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"

@@ -11584,10 +11512,6 @@ nanomatch@^1.2.9:
    snapdragon "^0.8.1"
    to-regex "^3.0.1"

-natives@^1.1.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb"
-
 natural-compare@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -12737,16 +12661,6 @@ pause-stream@0.0.11:
  dependencies:
    through "~2.3"

-pbkdf2@^3.0.17:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 pbkdf2@^3.0.3, pbkdf2@^3.0.9:
  version "3.0.14"
  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
@@ -13480,14 +13394,14 @@ punycode@1.3.2:
  version "1.3.2"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"

-punycode@2.1.0, punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
-
 punycode@^1.2.4, punycode@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"

+punycode@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+
 q@^1.1.2, q@^1.5.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -13542,10 +13456,6 @@ querystringify@0.0.x:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"

-querystringify@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-
 querystringify@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
@@ -13598,12 +13508,6 @@ randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
  dependencies:
    safe-buffer "^5.1.0"

-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  dependencies:
-    safe-buffer "^5.1.0"
-
 randomfill@^1.0.3:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
@@ -14627,7 +14531,7 @@ require-package-name@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"

-requires-port@1.0.x, requires-port@1.x.x, requires-port@^1.0.0, requires-port@~1.0.0:
+requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"

@@ -14864,12 +14768,6 @@ rxjs@^6.1.0:
  dependencies:
    tslib "^1.9.0"

-rxjs@^6.4.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -14958,14 +14856,6 @@ scrypt.js@0.2.0, scrypt.js@^0.2.0:
    scrypt "^6.0.2"
    scryptsy "^1.2.1"

-scrypt.js@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.3.0.tgz#6c62d61728ad533c8c376a2e5e3e86d41a95c4c0"
-  dependencies:
-    scryptsy "^1.2.1"
-  optionalDependencies:
-    scrypt "^6.0.2"
-
 scrypt@^6.0.2:
  version "6.0.3"
  resolved "https://registry.yarnpkg.com/scrypt/-/scrypt-6.0.3.tgz#04e014a5682b53fa50c2d5cce167d719c06d870d"
@@ -15177,13 +15067,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
    inherits "^2.0.1"
    safe-buffer "^5.0.1"

-sha1@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz#addaa7a93168f393f19eb2b15091618e2700f848"
-  dependencies:
-    charenc ">= 0.0.1"
-    crypt ">= 0.0.1"
-
 sha3@^1.1.0:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/sha3/-/sha3-1.2.2.tgz#a66c5098de4c25bc88336ec8b4817d005bca7ba9"
@@ -15306,12 +15189,6 @@ slash@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"

-sleep@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/sleep/-/sleep-5.1.1.tgz#878fa1d44d08eeb0f26fb2018ef8629eb1a3ab94"
-  dependencies:
-    nan ">=2.5.1"
-
 slice-ansi@0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -17105,13 +16982,6 @@ url-parse@1.0.x:
    querystringify "0.0.x"
    requires-port "1.0.x"

-url-parse@1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  dependencies:
-    querystringify "^2.0.0"
-    requires-port "^1.0.0"
-
 url-parse@^1.1.8:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.3.0.tgz#04a06c420d22beb9804f7ada2d57ad13160a4258"
@@ -17226,14 +17096,14 @@ uuid@3.2.1, uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
  version "3.2.1"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"

-uuid@3.3.2, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-
 uuid@^2.0.1:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"

+uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+
 v8-compile-cache@^2.0.2:
  version "2.0.2"
  resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
@@ -17466,16 +17336,6 @@ web3-core-helpers@1.0.0-beta.35:
    web3-eth-iban "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-core-helpers@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.55.tgz#832b8499889f9f514b1d174f00172fd3683d63de"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    lodash "^4.17.11"
-    web3-core "1.0.0-beta.55"
-    web3-eth-iban "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-core-method@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.35.tgz#fc10e2d546cf4886038e6130bd5726b0952a4e5f"
@@ -17486,19 +17346,6 @@ web3-core-method@1.0.0-beta.35:
    web3-core-subscriptions "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-core-method@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.55.tgz#0af994295ac2dd64ccd53305b7df8da76e11da49"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    eventemitter3 "3.1.0"
-    lodash "^4.17.11"
-    rxjs "^6.4.0"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-subscriptions "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-core-promievent@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.35.tgz#4f1b24737520fa423fee3afee110fbe82bcb8691"
@@ -17524,14 +17371,6 @@ web3-core-subscriptions@1.0.0-beta.35:
    underscore "1.8.3"
    web3-core-helpers "1.0.0-beta.35"

-web3-core-subscriptions@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.55.tgz#105902c13db53466fc17d07a981ad3d41c700f76"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    eventemitter3 "^3.1.0"
-    lodash "^4.17.11"
-
 web3-core@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.35.tgz#0c44d3c50d23219b0b1531d145607a9bc7cd4b4f"
@@ -17541,18 +17380,6 @@ web3-core@1.0.0-beta.35:
    web3-core-requestmanager "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-core@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.55.tgz#26b9abbf1bc1837c9cc90f06ecbc4ed714f89b53"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    "@types/bn.js" "^4.11.4"
-    "@types/node" "^10.12.18"
-    lodash "^4.17.11"
-    web3-core-method "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-eth-abi@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.35.tgz#2eb9c1c7c7233db04010defcb192293e0db250e6"
@@ -17562,15 +17389,6 @@ web3-eth-abi@1.0.0-beta.35:
    web3-core-helpers "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-eth-abi@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.55.tgz#69250420039346105a3d0f899c0a8a53be926f97"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    ethers "^4.0.27"
-    lodash "^4.17.11"
-    web3-utils "1.0.0-beta.55"
-
 web3-eth-abi@^1.0.0-beta.24:
  version "1.0.0-beta.34"
  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.34.tgz#034533e3aa2f7e59ff31793eaea685c0ed5af67a"
@@ -17595,24 +17413,6 @@ web3-eth-accounts@1.0.0-beta.35:
    web3-core-method "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-eth-accounts@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.55.tgz#ba734ffdc1e3cc8ac0ea01de5241323a0c2f69f3"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    browserify-cipher "^1.0.1"
-    eth-lib "0.2.8"
-    lodash "^4.17.11"
-    pbkdf2 "^3.0.17"
-    randombytes "^2.1.0"
-    scrypt.js "0.3.0"
-    uuid "3.3.2"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-eth-contract@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.35.tgz#5276242d8a3358d9f1ce92b71575c74f9015935c"
@@ -17626,39 +17426,6 @@ web3-eth-contract@1.0.0-beta.35:
    web3-eth-abi "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-eth-contract@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.55.tgz#cd9e6727ff73d648ebe7cae17516e8aec5873c65"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    "@types/bn.js" "^4.11.4"
-    lodash "^4.17.11"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-core-subscriptions "1.0.0-beta.55"
-    web3-eth-abi "1.0.0-beta.55"
-    web3-eth-accounts "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
-web3-eth-ens@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.55.tgz#4341434a3406728212d411ae7f22d4cf5b8642fe"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    eth-ens-namehash "2.0.8"
-    lodash "^4.17.11"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-eth-abi "1.0.0-beta.55"
-    web3-eth-accounts "1.0.0-beta.55"
-    web3-eth-contract "1.0.0-beta.55"
-    web3-net "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-eth-iban@1.0.0-beta.34:
  version "1.0.0-beta.34"
  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.34.tgz#9af458605867ccf74ea979aaf326b38ba6a5ba0c"
@@ -17673,14 +17440,6 @@ web3-eth-iban@1.0.0-beta.35:
    bn.js "4.11.6"
    web3-utils "1.0.0-beta.35"

-web3-eth-iban@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.55.tgz#15146a69de21addc99e7dbfb2920555b1e729637"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    bn.js "4.11.8"
-    web3-utils "1.0.0-beta.55"
-
 web3-eth-personal@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.35.tgz#ecac95b7a53d04a567447062d5cae5f49879e89f"
@@ -17691,19 +17450,6 @@ web3-eth-personal@1.0.0-beta.35:
    web3-net "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-eth-personal@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.55.tgz#76e9d2da1501ee3c686751e7c7df63cc11793a1d"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-eth-accounts "1.0.0-beta.55"
-    web3-net "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-eth@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.35.tgz#c52c804afb95e6624b6f5e72a9af90fbf5005b68"
@@ -17721,27 +17467,6 @@ web3-eth@1.0.0-beta.35:
    web3-net "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-eth@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.55.tgz#bb52150df0a77bd13511449a53793d4eb23ade6e"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    ethereumjs-tx "^1.3.7"
-    rxjs "^6.4.0"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-core-subscriptions "1.0.0-beta.55"
-    web3-eth-abi "1.0.0-beta.55"
-    web3-eth-accounts "1.0.0-beta.55"
-    web3-eth-contract "1.0.0-beta.55"
-    web3-eth-ens "1.0.0-beta.55"
-    web3-eth-iban "1.0.0-beta.55"
-    web3-eth-personal "1.0.0-beta.55"
-    web3-net "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-net@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.35.tgz#5c6688e0dea71fcd910ee9dc5437b94b7f6b3354"
@@ -17750,18 +17475,6 @@ web3-net@1.0.0-beta.35:
    web3-core-method "1.0.0-beta.35"
    web3-utils "1.0.0-beta.35"

-web3-net@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.55.tgz#daf24323df16a890a0bac6c6eda48b6e8c7e96ef"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    lodash "^4.17.11"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-provider-engine@14.0.6:
  version "14.0.6"
  resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-14.0.6.tgz#cbdd66fe20c0136a3a495cbe40d18b6c4160d5f0"
@@ -17860,22 +17573,6 @@ web3-providers-ws@1.0.0-beta.35:
    web3-core-helpers "1.0.0-beta.35"
    websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"

-web3-providers@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.55.tgz#639503517741b69baaa82f1f940630df6a25992b"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    "@types/node" "^10.12.18"
-    eventemitter3 "3.1.0"
-    lodash "^4.17.11"
-    url-parse "1.4.4"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-    websocket "^1.0.28"
-    xhr2-cookies "1.1.0"
-
 web3-shh@1.0.0-beta.35:
  version "1.0.0-beta.35"
  resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.35.tgz#7e4a585f8beee0c1927390937c6537748a5d1a58"
@@ -17885,19 +17582,6 @@ web3-shh@1.0.0-beta.35:
    web3-core-subscriptions "1.0.0-beta.35"
    web3-net "1.0.0-beta.35"

-web3-shh@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.55.tgz#56f152ebcefb791dab86d2e6f1c296f8c1553644"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    web3-core "1.0.0-beta.55"
-    web3-core-helpers "1.0.0-beta.55"
-    web3-core-method "1.0.0-beta.55"
-    web3-core-subscriptions "1.0.0-beta.55"
-    web3-net "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 web3-typescript-typings@^0.10.2:
  version "0.10.2"
  resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.10.2.tgz#a9903815d2a8a0dbd73fd5db374070de0bd30497"
@@ -17928,21 +17612,6 @@ web3-utils@1.0.0-beta.35:
    underscore "1.8.3"
    utf8 "2.1.1"

-web3-utils@1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.55.tgz#beb40926b7c04208b752d36a9bc959d27a04b308"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    "@types/bn.js" "^4.11.4"
-    "@types/node" "^10.12.18"
-    bn.js "4.11.8"
-    eth-lib "0.2.8"
-    ethjs-unit "^0.1.6"
-    lodash "^4.17.11"
-    number-to-bn "1.7.0"
-    randombytes "^2.1.0"
-    utf8 "2.1.1"
-
 web3@0.20.2:
  version "0.20.2"
  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.2.tgz#c54dac5fc0e377399c04c1a6ecbb12e4513278d6"
@@ -17975,20 +17644,6 @@ web3@^0.18.0:
    xhr2 "*"
    xmlhttprequest "*"

-web3@^1.0.0-beta.55:
-  version "1.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.55.tgz#8845075129299da172c2eb41a748c8a87c2a2b5a"
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    "@types/node" "^10.12.18"
-    web3-core "1.0.0-beta.55"
-    web3-eth "1.0.0-beta.55"
-    web3-eth-personal "1.0.0-beta.55"
-    web3-net "1.0.0-beta.55"
-    web3-providers "1.0.0-beta.55"
-    web3-shh "1.0.0-beta.55"
-    web3-utils "1.0.0-beta.55"
-
 webidl-conversions@^4.0.2:
  version "4.0.2"
  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -18150,7 +17805,7 @@ websocket@1.0.26:
    typedarray-to-buffer "^3.1.2"
    yaeti "^0.0.6"

-websocket@^1.0.25, websocket@^1.0.26, websocket@^1.0.28:
+websocket@^1.0.25, websocket@^1.0.26:
  version "1.0.28"
  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.28.tgz#9e5f6fdc8a3fe01d4422647ef93abdd8d45a78d3"
  dependencies: