From 3ff5a6f6e491b0843fe0d4a8c4fd01330b0bc360 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 11:48:57 -0400 Subject: [PATCH 01/10] Add link script for testing web3 --- .travis.yml | 1 + scripts/test-web3.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100755 scripts/test-web3.sh diff --git a/.travis.yml b/.travis.yml index fa2b9b930a0..f76cddbcff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ matrix: install: - yarn bootstrap - truffle obtain --solc=0.5.8 + - ./scripts/test-web3.sh cache: directories: diff --git a/scripts/test-web3.sh b/scripts/test-web3.sh new file mode 100755 index 00000000000..a7d2319a18d --- /dev/null +++ b/scripts/test-web3.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# Exit script as soon as a command fails. +set -o errexit + +link_web3() { + git clone git@github.com:ethereum/web3.js.git ../web3.js + pushd ../web3.js + git checkout release/1.0 + npm install + npm run build + pushd packages/web3 + yarn link + + popd + popd + + for $pkg in packages/* + do + cd $pkg + yarn link web3 + cd .. + done +} + +link_web3 From 49afaaaaae069de1ebc95ad613147fb38b6f1833 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 11:55:08 -0400 Subject: [PATCH 02/10] Use https --- scripts/test-web3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-web3.sh b/scripts/test-web3.sh index a7d2319a18d..d23e4836129 100755 --- a/scripts/test-web3.sh +++ b/scripts/test-web3.sh @@ -4,7 +4,7 @@ set -o errexit link_web3() { - git clone git@github.com:ethereum/web3.js.git ../web3.js + git clone https://github.com/ethereum/web3.js.git ../web3.js pushd ../web3.js git checkout release/1.0 npm install From 29bd8c8ba6fa995bcd56871112306d2d16b0e5e8 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 12:02:37 -0400 Subject: [PATCH 03/10] Remember how to write a for loop --- scripts/test-web3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-web3.sh b/scripts/test-web3.sh index d23e4836129..c3ba024dcbd 100755 --- a/scripts/test-web3.sh +++ b/scripts/test-web3.sh @@ -15,7 +15,7 @@ link_web3() { popd popd - for $pkg in packages/* + for pkg in packages/* do cd $pkg yarn link web3 From eb14ba984754638d498838e74f5367ce964e401d Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 12:24:20 -0400 Subject: [PATCH 04/10] Stop being so careless --- scripts/test-web3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-web3.sh b/scripts/test-web3.sh index c3ba024dcbd..02076e43079 100755 --- a/scripts/test-web3.sh +++ b/scripts/test-web3.sh @@ -19,7 +19,7 @@ link_web3() { do cd $pkg yarn link web3 - cd .. + cd ../.. done } From 93cb9fb3710aecb99d0c084875045259bf146950 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 13:16:00 -0400 Subject: [PATCH 05/10] Perform extra bootstrap --- scripts/test-web3.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/test-web3.sh b/scripts/test-web3.sh index 02076e43079..12b432fb3be 100755 --- a/scripts/test-web3.sh +++ b/scripts/test-web3.sh @@ -24,3 +24,6 @@ link_web3() { } link_web3 + +# bootstrap again to rebuild with linked +yarn bootstrap From 976f101ebf91ef45fa02c8be6fa319947e60a222 Mon Sep 17 00:00:00 2001 From: CruzMolina <7537712+CruzMolina@users.noreply.github.com> Date: Fri, 12 Jul 2019 12:46:24 -0700 Subject: [PATCH 06/10] just make it work --- packages/truffle-artifactor/package.json | 2 +- packages/truffle-contract/package.json | 2 +- packages/truffle-core/package.json | 2 +- packages/truffle-debugger/package.json | 2 +- packages/truffle-decode-utils/package.json | 3 +- packages/truffle-decoder/package.json | 2 +- packages/truffle-deployer/package.json | 2 +- packages/truffle-environment/package.json | 2 +- .../truffle-hdwallet-provider/package.json | 3 +- .../truffle-interface-adapter/package.json | 2 +- packages/truffle-migrate/package.json | 2 +- packages/truffle-provider/package.json | 2 +- packages/truffle-require/package.json | 2 +- packages/truffle/package.json | 2 +- yarn.lock | 211 +----------------- 15 files changed, 27 insertions(+), 214 deletions(-) diff --git a/packages/truffle-artifactor/package.json b/packages/truffle-artifactor/package.json index 96156e8aa0e..b1b4bc6b7c0 100644 --- a/packages/truffle-artifactor/package.json +++ b/packages/truffle-artifactor/package.json @@ -23,7 +23,7 @@ "require-nocache": "^1.0.0", "temp": "^0.8.3", "truffle-contract": "^4.0.24", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "publishConfig": { "access": "public" diff --git a/packages/truffle-contract/package.json b/packages/truffle-contract/package.json index 585b4664742..e9e219d36f7 100644 --- a/packages/truffle-contract/package.json +++ b/packages/truffle-contract/package.json @@ -25,7 +25,7 @@ "truffle-contract-schema": "^3.0.11", "truffle-error": "^0.0.5", "truffle-interface-adapter": "^0.2.0", - "web3": "1.0.0-beta.37", + "web3": "https://github.com/ethereum/web3.js#release/1.0", "web3-core-promievent": "1.0.0-beta.37", "web3-eth-abi": "1.0.0-beta.37", "web3-utils": "1.0.0-beta.37" diff --git a/packages/truffle-core/package.json b/packages/truffle-core/package.json index 45b500969a3..5a996ed591c 100644 --- a/packages/truffle-core/package.json +++ b/packages/truffle-core/package.json @@ -64,7 +64,7 @@ "truffle-solidity-utils": "^1.2.3", "truffle-workflow-compile": "^2.0.23", "universal-analytics": "^0.4.17", - "web3": "1.0.0-beta.37", + "web3": "https://github.com/ethereum/web3.js#release/1.0", "xregexp": "^4.2.4", "yargs": "^8.0.2" }, diff --git a/packages/truffle-debugger/package.json b/packages/truffle-debugger/package.json index 9e02d6fcb55..285863d6f2d 100644 --- a/packages/truffle-debugger/package.json +++ b/packages/truffle-debugger/package.json @@ -34,7 +34,7 @@ "truffle-decoder": "^3.0.6", "truffle-expect": "^0.0.9", "truffle-solidity-utils": "^1.2.3", - "web3": "1.0.0-beta.37", + "web3": "https://github.com/ethereum/web3.js#release/1.0", "web3-eth-abi": "1.0.0-beta.37" }, "devDependencies": { diff --git a/packages/truffle-decode-utils/package.json b/packages/truffle-decode-utils/package.json index eb584abac00..56cee166af9 100644 --- a/packages/truffle-decode-utils/package.json +++ b/packages/truffle-decode-utils/package.json @@ -3,10 +3,11 @@ "version": "1.0.14", "description": "Utilities for decoding data from the EVM", "dependencies": { + "@types/web3": "^1.0.19", "bn.js": "^4.11.8", "lodash.clonedeep": "^4.5.0", "lodash.escaperegexp": "^4.1.2", - "web3": "1.0.0-beta.37", + "web3": "https://github.com/ethereum/web3.js#release/1.0", "web3-eth-abi": "1.0.0-beta.52" }, "main": "dist/index.js", diff --git a/packages/truffle-decoder/package.json b/packages/truffle-decoder/package.json index 3604638d269..ef9c96fb251 100644 --- a/packages/truffle-decoder/package.json +++ b/packages/truffle-decoder/package.json @@ -49,7 +49,7 @@ "lodash.merge": "^4.6.1", "truffle-decode-utils": "^1.0.14", "utf8": "^3.0.0", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "peerDependencies": { "truffle": "^5.0.14" diff --git a/packages/truffle-deployer/package.json b/packages/truffle-deployer/package.json index f036ecf6fdc..06eecaa19e5 100644 --- a/packages/truffle-deployer/package.json +++ b/packages/truffle-deployer/package.json @@ -23,7 +23,7 @@ "mocha": "5.2.0", "truffle-reporters": "^1.0.10", "truffle-workflow-compile": "^2.0.23", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "keywords": [ "contracts", diff --git a/packages/truffle-environment/package.json b/packages/truffle-environment/package.json index df8ff4caf44..7adde4551b4 100644 --- a/packages/truffle-environment/package.json +++ b/packages/truffle-environment/package.json @@ -19,7 +19,7 @@ "truffle-expect": "^0.0.9", "truffle-interface-adapter": "^0.2.0", "truffle-resolver": "^5.0.14", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "devDependencies": { "debug": "^4.1.0" diff --git a/packages/truffle-hdwallet-provider/package.json b/packages/truffle-hdwallet-provider/package.json index c0fc733c7e5..cab68607a0f 100644 --- a/packages/truffle-hdwallet-provider/package.json +++ b/packages/truffle-hdwallet-provider/package.json @@ -17,7 +17,7 @@ "dependencies": { "any-promise": "^1.3.0", "bindings": "^1.3.1", - "web3": "1.0.0-beta.37", + "web3": "https://github.com/ethereum/web3.js#release/1.0", "websocket": "^1.0.28" }, "devDependencies": { @@ -29,7 +29,6 @@ "ganache-core": "2.5.7", "js-scrypt": "^0.2.0", "mocha": "5.2.0", - "web3": "1.0.0-beta.37", "web3-provider-engine": "https://github.com/trufflesuite/provider-engine#web3-one", "webpack": "^4.24.0", "webpack-cli": "^3.1.2" diff --git a/packages/truffle-interface-adapter/package.json b/packages/truffle-interface-adapter/package.json index 7929f830947..822aa6ac5dd 100644 --- a/packages/truffle-interface-adapter/package.json +++ b/packages/truffle-interface-adapter/package.json @@ -20,7 +20,7 @@ "dependencies": { "bn.js": "^4.11.8", "ethers": "^4.0.32", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "devDependencies": { "@types/bn.js": "^4.11.4", diff --git a/packages/truffle-migrate/package.json b/packages/truffle-migrate/package.json index 6f89fe29ca6..f0bbe0aa837 100644 --- a/packages/truffle-migrate/package.json +++ b/packages/truffle-migrate/package.json @@ -29,7 +29,7 @@ "truffle-interface-adapter": "^0.2.0", "truffle-reporters": "^1.0.10", "truffle-require": "^2.0.14", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "devDependencies": { "mocha": "5.2.0", diff --git a/packages/truffle-provider/package.json b/packages/truffle-provider/package.json index b0fd9b19cb7..d5d7a2a05c1 100644 --- a/packages/truffle-provider/package.json +++ b/packages/truffle-provider/package.json @@ -16,7 +16,7 @@ "dependencies": { "truffle-error": "^0.0.5", "truffle-interface-adapter": "^0.2.0", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "devDependencies": { "ganache-core": "2.5.7", diff --git a/packages/truffle-require/package.json b/packages/truffle-require/package.json index ac2b9b662ce..8dc99581f2c 100644 --- a/packages/truffle-require/package.json +++ b/packages/truffle-require/package.json @@ -27,7 +27,7 @@ "truffle-config": "^1.1.14", "truffle-expect": "^0.0.9", "truffle-interface-adapter": "^0.2.0", - "web3": "1.0.0-beta.37" + "web3": "https://github.com/ethereum/web3.js#release/1.0" }, "publishConfig": { "access": "public" diff --git a/packages/truffle/package.json b/packages/truffle/package.json index 99dcb139575..5a0277017bd 100644 --- a/packages/truffle/package.json +++ b/packages/truffle/package.json @@ -51,7 +51,7 @@ "truffle-contract": "^4.0.24", "truffle-core": "^5.0.27", "truffle-debugger": "^5.0.19", - "web3": "1.0.0-beta.37", + "web3": "https://github.com/ethereum/web3.js#release/1.0", "webpack": "^2.5.1", "webpack-bundle-analyzer": "^3.0.3", "yargs": "^8.0.2" diff --git a/yarn.lock b/yarn.lock index 19ea0655e11..3079e7182d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1082,6 +1082,14 @@ "@types/bn.js" "*" "@types/underscore" "*" +"@types/web3@^1.0.19": + version "1.0.19" + resolved "https://registry.yarnpkg.com/@types/web3/-/web3-1.0.19.tgz#46b85d91d398ded9ab7c85a5dd57cb33ac558924" + integrity sha512-fhZ9DyvDYDwHZUp5/STa9XW2re0E8GxoioYJ4pEUZ13YHpApSagixj7IAdoYH5uAK+UalGq6Ml8LYzmgRA/q+A== + dependencies: + "@types/bn.js" "*" + "@types/underscore" "*" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -14327,15 +14335,6 @@ web3-bzz@1.0.0-beta.35: swarm-js "0.1.37" underscore "1.8.3" -web3-bzz@1.0.0-beta.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.37.tgz#59e3e4f5a9d732731008fe9165c3ec8bf85d502f" - integrity sha512-E+dho49Nsm/QpQvYWOF35YDsQrMvLB19AApENxhlQsu6HpWQt534DQul0t3Y/aAh8rlKD6Kanxt8LhHDG3vejQ== - dependencies: - got "7.1.0" - swarm-js "0.1.37" - underscore "1.8.3" - web3-core-helpers@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.35.tgz#d681d218a0c6e3283ee1f99a078ab9d3eef037f1" @@ -14345,15 +14344,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.37.tgz#04ec354b7f5c57234c309eea2bda9bf1f2fe68ba" - integrity sha512-efaLOzN28RMnbugnyelgLwPWWaSwElQzcAJ/x3PZu+uPloM/lE5x0YuBKvIh7/PoSMlHqtRWj1B8CpuQOUQ5Ew== - dependencies: - underscore "1.8.3" - web3-eth-iban "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14376,17 +14366,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.37.tgz#53d148e63f818b23461b26307afdfbdaa9457744" - integrity sha512-pKWFUeqnVmzx3VrZg+CseSdrl/Yrk2ioid/HzolNXZE6zdoITZL0uRjnsbqXGEzgRRd1Oe/pFndpTlRsnxXloA== - dependencies: - underscore "1.8.3" - web3-core-helpers "1.0.0-beta.37" - web3-core-promievent "1.0.0-beta.37" - web3-core-subscriptions "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14428,17 +14407,6 @@ web3-core-requestmanager@1.0.0-beta.35: web3-providers-ipc "1.0.0-beta.35" web3-providers-ws "1.0.0-beta.35" -web3-core-requestmanager@1.0.0-beta.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.37.tgz#721a75df5920621bff42d9d74f7a64413675d56b" - integrity sha512-66VUqye5BGp1Zz1r8psCxdNH+GtTjaFwroum2Osx+wbC5oRjAiXkkadiitf6wRb+edodjEMPn49u7B6WGNuewQ== - dependencies: - underscore "1.8.3" - web3-core-helpers "1.0.0-beta.37" - web3-providers-http "1.0.0-beta.37" - web3-providers-ipc "1.0.0-beta.37" - web3-providers-ws "1.0.0-beta.37" - web3-core-subscriptions@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.35.tgz#c1b76a2ad3c6e80f5d40b8ba560f01e0f4628758" @@ -14448,15 +14416,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.37.tgz#40de5e2490cc05b15faa8f935c97fd48d670cd9a" - integrity sha512-FdXl8so9kwkRRWziuCSpFsAuAdg9KvpXa1fQlT16uoGcYYfxwFO/nkwyBGQzkZt7emShI2IRugcazyPCZDwkOA== - dependencies: - eventemitter3 "1.1.1" - underscore "1.8.3" - web3-core-helpers "1.0.0-beta.37" - 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" @@ -14476,16 +14435,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.37.tgz#66c2c7000772c9db36d737ada31607ace09b7e90" - integrity sha512-cIwEqCj7OJyefQNauI0HOgW4sSaOQ98V99H2/HEIlnCZylsDzfw7gtQUdwnRFiIyIxjbWy3iWsjwDPoXNPZBYg== - dependencies: - web3-core-helpers "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-core-requestmanager "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14554,22 +14503,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.37.tgz#0a5a9f14a6c3bd285e001c15eb3bb38ffa4b5204" - integrity sha512-uvbHL62/zwo4GDmwKdqH9c/EgYd8QVnAfpVw8D3epSISpgbONNY7Hr4MRMSd/CqAP12l2Ls9JVQGLhhC83bW6g== - dependencies: - any-promise "1.3.0" - crypto-browserify "3.12.0" - eth-lib "0.2.7" - scrypt.js "0.2.0" - underscore "1.8.3" - uuid "2.0.1" - web3-core "1.0.0-beta.37" - web3-core-helpers "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14603,20 +14536,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.37.tgz#87f93c95ed16f320ba54943b7886890de6766013" - integrity sha512-h1B3A8Z/C7BlnTCHkrWbXZQTViDxfR12lKMeTkT8Sqj5phFmxrBlPE4ORy4lf1Dk5b23mZYE0r/IRACx4ThCrQ== - dependencies: - underscore "1.8.3" - web3-core "1.0.0-beta.37" - web3-core-helpers "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-core-promievent "1.0.0-beta.37" - web3-core-subscriptions "1.0.0-beta.37" - web3-eth-abi "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14634,20 +14553,6 @@ web3-eth-contract@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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.37.tgz#714ecb01eb447ee3eb39b2b20a10ae96edb1f01f" - integrity sha512-dR3UkrVzdRrJhfP57xBPx0CMiVnCcYFvh+u2XMkGydrhHgupSUkjqGr89xry/j1T0BkuN9mikpbyhdCVMXqMbg== - dependencies: - eth-ens-namehash "2.0.8" - underscore "1.8.3" - web3-core "1.0.0-beta.37" - web3-core-helpers "1.0.0-beta.37" - web3-core-promievent "1.0.0-beta.37" - web3-eth-abi "1.0.0-beta.37" - web3-eth-contract "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14674,14 +14579,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.37.tgz#313a3f18ae2ab00ba98678ea1156b09ef32a3655" - integrity sha512-WQRniGJFxH/XCbd7miO6+jnUG+6bvuzfeufPIiOtCbeIC1ypp1kSqER8YVBDrTyinU1xnf1U5v0KBZ2yiWBJxQ== - dependencies: - bn.js "4.11.6" - web3-utils "1.0.0-beta.37" - 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" @@ -14702,17 +14599,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.37.tgz#187472f51861e2b6d45da43411801bc91a859f9a" - integrity sha512-B4dZpGbD+nGnn48i6nJBqrQ+HB7oDmd+Q3wGRKOsHSK5HRWO/KwYeA7wgwamMAElkut50lIsT9EJl4Apfk3G5Q== - dependencies: - web3-core "1.0.0-beta.37" - web3-core-helpers "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-net "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14745,25 +14631,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.37.tgz#0e8ffcd857a5f85ae4b5f052ad831ca5c56f4f74" - integrity sha512-Eb3aGtkz3G9q+Z9DKgSQNbn/u8RtcZQQ0R4sW9hy5KK47GoT6vab5c6DiD3QWzI0BzitHzR5Ji+3VHf/hPUGgw== - dependencies: - underscore "1.8.3" - web3-core "1.0.0-beta.37" - web3-core-helpers "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-core-subscriptions "1.0.0-beta.37" - web3-eth-abi "1.0.0-beta.37" - web3-eth-accounts "1.0.0-beta.37" - web3-eth-contract "1.0.0-beta.37" - web3-eth-ens "1.0.0-beta.37" - web3-eth-iban "1.0.0-beta.37" - web3-eth-personal "1.0.0-beta.37" - web3-net "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14795,15 +14662,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.37.tgz#b494136043f3c6ba84fe4a47d4c028c2a63c9a8e" - integrity sha512-xG/uBtMdDa1UMXw9KjDUgf3fXA/fDEJUYUS0TDn+U9PMgngA+UVECHNNvQTrVVDxEky38V3sahwIDiopNsQdsw== - dependencies: - web3-core "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - 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" @@ -14876,14 +14734,6 @@ web3-providers-http@1.0.0-beta.35: web3-core-helpers "1.0.0-beta.35" xhr2-cookies "1.1.0" -web3-providers-http@1.0.0-beta.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.37.tgz#c06efd60e16e329e25bd268d2eefc68d82d13651" - integrity sha512-FM/1YDB1jtZuTo78habFj7S9tNHoqt0UipdyoQV29b8LkGKZV9Vs3is8L24hzuj1j/tbwkcAH+ewIseHwu0DTg== - dependencies: - web3-core-helpers "1.0.0-beta.37" - xhr2-cookies "1.1.0" - web3-providers-ipc@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.35.tgz#031afeb10fade2ebb0ef2fb82f5e58c04be842d9" @@ -14893,15 +14743,6 @@ web3-providers-ipc@1.0.0-beta.35: underscore "1.8.3" web3-core-helpers "1.0.0-beta.35" -web3-providers-ipc@1.0.0-beta.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.37.tgz#55d247e7197257ca0c3e4f4b0fe1561311b9d5b9" - integrity sha512-NdRPRxYMIU0C3u18NI8u4bwbhI9pCg5nRgDGYcmSAx5uOBxiYcQy+hb0WkJRRhBoyIXJmy+s26FoH8904+UnPg== - dependencies: - oboe "2.1.3" - underscore "1.8.3" - web3-core-helpers "1.0.0-beta.37" - web3-providers-ws@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.35.tgz#5d38603fd450243a26aae0ff7f680644e77fa240" @@ -14911,15 +14752,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-ws@1.0.0-beta.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.37.tgz#77c15aebc00b75d760d22d063ac2e415bdbef72f" - integrity sha512-8p6ZLv+1JYa5Vs8oBn33Nn3VGFBbF+wVfO+b78RJS1Qf1uIOzjFVDk3XwYDD7rlz9G5BKpxhaQw+6EGQ7L02aw== - dependencies: - underscore "1.8.3" - web3-core-helpers "1.0.0-beta.37" - 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" @@ -14947,16 +14779,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.37.tgz#3246ce5229601b525020828a56ee283307057105" - integrity sha512-h5STG/xqZNQWtCLYOu7NiMqwqPea8SfkKQUPUFxXKIPVCFVKpHuQEwW1qcPQRJMLhlQIv17xuoUe1A+RzDNbrw== - dependencies: - web3-core "1.0.0-beta.37" - web3-core-method "1.0.0-beta.37" - web3-core-subscriptions "1.0.0-beta.37" - web3-net "1.0.0-beta.37" - 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" @@ -15042,19 +14864,6 @@ web3@1.0.0-beta.35: web3-shh "1.0.0-beta.35" web3-utils "1.0.0-beta.35" -web3@1.0.0-beta.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.37.tgz#b42c30e67195f816cd19d048fda872f70eca7083" - integrity sha512-8XLgUspdzicC/xHG82TLrcF/Fxzj2XYNJ1KTYnepOI77bj5rvpsxxwHYBWQ6/JOjk0HkZqoBfnXWgcIHCDhZhQ== - dependencies: - web3-bzz "1.0.0-beta.37" - web3-core "1.0.0-beta.37" - web3-eth "1.0.0-beta.37" - web3-eth-personal "1.0.0-beta.37" - web3-net "1.0.0-beta.37" - web3-shh "1.0.0-beta.37" - web3-utils "1.0.0-beta.37" - web3@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" @@ -15102,6 +14911,10 @@ web3@^1.0.0-beta.36: web3-shh "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +"web3@https://github.com/ethereum/web3.js#release/1.0": + version "1.0.0" + resolved "https://github.com/ethereum/web3.js#963e5c5df134e22c7c83ba4cc3cd42488b29f252" + webidl-conversions@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506" From 226c1b44685d3e67036916a65a7ca322c4932acd Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 17:31:05 -0400 Subject: [PATCH 07/10] Try using yalc instead of yarn link --- scripts/test-web3.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/test-web3.sh b/scripts/test-web3.sh index 12b432fb3be..860b8b20b6a 100755 --- a/scripts/test-web3.sh +++ b/scripts/test-web3.sh @@ -10,7 +10,7 @@ link_web3() { npm install npm run build pushd packages/web3 - yarn link + yalc publish popd popd @@ -18,11 +18,15 @@ link_web3() { for pkg in packages/* do cd $pkg - yarn link web3 + yalc add web3 cd ../.. done } + +# use yalc instead of yarn link +npm install -g yalc + link_web3 # bootstrap again to rebuild with linked From f93f085b2058e6e0c8b67088573cce21c2ee0c82 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 17:37:11 -0400 Subject: [PATCH 08/10] Revert "just make it work" This reverts commit 976f101ebf91ef45fa02c8be6fa319947e60a222. --- packages/truffle-artifactor/package.json | 2 +- packages/truffle-contract/package.json | 2 +- packages/truffle-core/package.json | 2 +- packages/truffle-debugger/package.json | 2 +- packages/truffle-decode-utils/package.json | 3 +- packages/truffle-decoder/package.json | 2 +- packages/truffle-deployer/package.json | 2 +- packages/truffle-environment/package.json | 2 +- .../truffle-hdwallet-provider/package.json | 3 +- .../truffle-interface-adapter/package.json | 2 +- packages/truffle-migrate/package.json | 2 +- packages/truffle-provider/package.json | 2 +- packages/truffle-require/package.json | 2 +- packages/truffle/package.json | 2 +- yarn.lock | 211 +++++++++++++++++- 15 files changed, 214 insertions(+), 27 deletions(-) diff --git a/packages/truffle-artifactor/package.json b/packages/truffle-artifactor/package.json index b1b4bc6b7c0..96156e8aa0e 100644 --- a/packages/truffle-artifactor/package.json +++ b/packages/truffle-artifactor/package.json @@ -23,7 +23,7 @@ "require-nocache": "^1.0.0", "temp": "^0.8.3", "truffle-contract": "^4.0.24", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "publishConfig": { "access": "public" diff --git a/packages/truffle-contract/package.json b/packages/truffle-contract/package.json index e9e219d36f7..585b4664742 100644 --- a/packages/truffle-contract/package.json +++ b/packages/truffle-contract/package.json @@ -25,7 +25,7 @@ "truffle-contract-schema": "^3.0.11", "truffle-error": "^0.0.5", "truffle-interface-adapter": "^0.2.0", - "web3": "https://github.com/ethereum/web3.js#release/1.0", + "web3": "1.0.0-beta.37", "web3-core-promievent": "1.0.0-beta.37", "web3-eth-abi": "1.0.0-beta.37", "web3-utils": "1.0.0-beta.37" diff --git a/packages/truffle-core/package.json b/packages/truffle-core/package.json index 5a996ed591c..45b500969a3 100644 --- a/packages/truffle-core/package.json +++ b/packages/truffle-core/package.json @@ -64,7 +64,7 @@ "truffle-solidity-utils": "^1.2.3", "truffle-workflow-compile": "^2.0.23", "universal-analytics": "^0.4.17", - "web3": "https://github.com/ethereum/web3.js#release/1.0", + "web3": "1.0.0-beta.37", "xregexp": "^4.2.4", "yargs": "^8.0.2" }, diff --git a/packages/truffle-debugger/package.json b/packages/truffle-debugger/package.json index 285863d6f2d..9e02d6fcb55 100644 --- a/packages/truffle-debugger/package.json +++ b/packages/truffle-debugger/package.json @@ -34,7 +34,7 @@ "truffle-decoder": "^3.0.6", "truffle-expect": "^0.0.9", "truffle-solidity-utils": "^1.2.3", - "web3": "https://github.com/ethereum/web3.js#release/1.0", + "web3": "1.0.0-beta.37", "web3-eth-abi": "1.0.0-beta.37" }, "devDependencies": { diff --git a/packages/truffle-decode-utils/package.json b/packages/truffle-decode-utils/package.json index 56cee166af9..eb584abac00 100644 --- a/packages/truffle-decode-utils/package.json +++ b/packages/truffle-decode-utils/package.json @@ -3,11 +3,10 @@ "version": "1.0.14", "description": "Utilities for decoding data from the EVM", "dependencies": { - "@types/web3": "^1.0.19", "bn.js": "^4.11.8", "lodash.clonedeep": "^4.5.0", "lodash.escaperegexp": "^4.1.2", - "web3": "https://github.com/ethereum/web3.js#release/1.0", + "web3": "1.0.0-beta.37", "web3-eth-abi": "1.0.0-beta.52" }, "main": "dist/index.js", diff --git a/packages/truffle-decoder/package.json b/packages/truffle-decoder/package.json index ef9c96fb251..3604638d269 100644 --- a/packages/truffle-decoder/package.json +++ b/packages/truffle-decoder/package.json @@ -49,7 +49,7 @@ "lodash.merge": "^4.6.1", "truffle-decode-utils": "^1.0.14", "utf8": "^3.0.0", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "peerDependencies": { "truffle": "^5.0.14" diff --git a/packages/truffle-deployer/package.json b/packages/truffle-deployer/package.json index 06eecaa19e5..f036ecf6fdc 100644 --- a/packages/truffle-deployer/package.json +++ b/packages/truffle-deployer/package.json @@ -23,7 +23,7 @@ "mocha": "5.2.0", "truffle-reporters": "^1.0.10", "truffle-workflow-compile": "^2.0.23", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "keywords": [ "contracts", diff --git a/packages/truffle-environment/package.json b/packages/truffle-environment/package.json index 7adde4551b4..df8ff4caf44 100644 --- a/packages/truffle-environment/package.json +++ b/packages/truffle-environment/package.json @@ -19,7 +19,7 @@ "truffle-expect": "^0.0.9", "truffle-interface-adapter": "^0.2.0", "truffle-resolver": "^5.0.14", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "devDependencies": { "debug": "^4.1.0" diff --git a/packages/truffle-hdwallet-provider/package.json b/packages/truffle-hdwallet-provider/package.json index cab68607a0f..c0fc733c7e5 100644 --- a/packages/truffle-hdwallet-provider/package.json +++ b/packages/truffle-hdwallet-provider/package.json @@ -17,7 +17,7 @@ "dependencies": { "any-promise": "^1.3.0", "bindings": "^1.3.1", - "web3": "https://github.com/ethereum/web3.js#release/1.0", + "web3": "1.0.0-beta.37", "websocket": "^1.0.28" }, "devDependencies": { @@ -29,6 +29,7 @@ "ganache-core": "2.5.7", "js-scrypt": "^0.2.0", "mocha": "5.2.0", + "web3": "1.0.0-beta.37", "web3-provider-engine": "https://github.com/trufflesuite/provider-engine#web3-one", "webpack": "^4.24.0", "webpack-cli": "^3.1.2" diff --git a/packages/truffle-interface-adapter/package.json b/packages/truffle-interface-adapter/package.json index 822aa6ac5dd..7929f830947 100644 --- a/packages/truffle-interface-adapter/package.json +++ b/packages/truffle-interface-adapter/package.json @@ -20,7 +20,7 @@ "dependencies": { "bn.js": "^4.11.8", "ethers": "^4.0.32", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "devDependencies": { "@types/bn.js": "^4.11.4", diff --git a/packages/truffle-migrate/package.json b/packages/truffle-migrate/package.json index f0bbe0aa837..6f89fe29ca6 100644 --- a/packages/truffle-migrate/package.json +++ b/packages/truffle-migrate/package.json @@ -29,7 +29,7 @@ "truffle-interface-adapter": "^0.2.0", "truffle-reporters": "^1.0.10", "truffle-require": "^2.0.14", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "devDependencies": { "mocha": "5.2.0", diff --git a/packages/truffle-provider/package.json b/packages/truffle-provider/package.json index d5d7a2a05c1..b0fd9b19cb7 100644 --- a/packages/truffle-provider/package.json +++ b/packages/truffle-provider/package.json @@ -16,7 +16,7 @@ "dependencies": { "truffle-error": "^0.0.5", "truffle-interface-adapter": "^0.2.0", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "devDependencies": { "ganache-core": "2.5.7", diff --git a/packages/truffle-require/package.json b/packages/truffle-require/package.json index 8dc99581f2c..ac2b9b662ce 100644 --- a/packages/truffle-require/package.json +++ b/packages/truffle-require/package.json @@ -27,7 +27,7 @@ "truffle-config": "^1.1.14", "truffle-expect": "^0.0.9", "truffle-interface-adapter": "^0.2.0", - "web3": "https://github.com/ethereum/web3.js#release/1.0" + "web3": "1.0.0-beta.37" }, "publishConfig": { "access": "public" diff --git a/packages/truffle/package.json b/packages/truffle/package.json index 5a0277017bd..99dcb139575 100644 --- a/packages/truffle/package.json +++ b/packages/truffle/package.json @@ -51,7 +51,7 @@ "truffle-contract": "^4.0.24", "truffle-core": "^5.0.27", "truffle-debugger": "^5.0.19", - "web3": "https://github.com/ethereum/web3.js#release/1.0", + "web3": "1.0.0-beta.37", "webpack": "^2.5.1", "webpack-bundle-analyzer": "^3.0.3", "yargs": "^8.0.2" diff --git a/yarn.lock b/yarn.lock index 3079e7182d7..19ea0655e11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1082,14 +1082,6 @@ "@types/bn.js" "*" "@types/underscore" "*" -"@types/web3@^1.0.19": - version "1.0.19" - resolved "https://registry.yarnpkg.com/@types/web3/-/web3-1.0.19.tgz#46b85d91d398ded9ab7c85a5dd57cb33ac558924" - integrity sha512-fhZ9DyvDYDwHZUp5/STa9XW2re0E8GxoioYJ4pEUZ13YHpApSagixj7IAdoYH5uAK+UalGq6Ml8LYzmgRA/q+A== - dependencies: - "@types/bn.js" "*" - "@types/underscore" "*" - "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -14335,6 +14327,15 @@ web3-bzz@1.0.0-beta.35: swarm-js "0.1.37" underscore "1.8.3" +web3-bzz@1.0.0-beta.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.37.tgz#59e3e4f5a9d732731008fe9165c3ec8bf85d502f" + integrity sha512-E+dho49Nsm/QpQvYWOF35YDsQrMvLB19AApENxhlQsu6HpWQt534DQul0t3Y/aAh8rlKD6Kanxt8LhHDG3vejQ== + dependencies: + got "7.1.0" + swarm-js "0.1.37" + underscore "1.8.3" + web3-core-helpers@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.35.tgz#d681d218a0c6e3283ee1f99a078ab9d3eef037f1" @@ -14344,6 +14345,15 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.37.tgz#04ec354b7f5c57234c309eea2bda9bf1f2fe68ba" + integrity sha512-efaLOzN28RMnbugnyelgLwPWWaSwElQzcAJ/x3PZu+uPloM/lE5x0YuBKvIh7/PoSMlHqtRWj1B8CpuQOUQ5Ew== + dependencies: + underscore "1.8.3" + web3-eth-iban "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14366,6 +14376,17 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.37.tgz#53d148e63f818b23461b26307afdfbdaa9457744" + integrity sha512-pKWFUeqnVmzx3VrZg+CseSdrl/Yrk2ioid/HzolNXZE6zdoITZL0uRjnsbqXGEzgRRd1Oe/pFndpTlRsnxXloA== + dependencies: + underscore "1.8.3" + web3-core-helpers "1.0.0-beta.37" + web3-core-promievent "1.0.0-beta.37" + web3-core-subscriptions "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14407,6 +14428,17 @@ web3-core-requestmanager@1.0.0-beta.35: web3-providers-ipc "1.0.0-beta.35" web3-providers-ws "1.0.0-beta.35" +web3-core-requestmanager@1.0.0-beta.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.37.tgz#721a75df5920621bff42d9d74f7a64413675d56b" + integrity sha512-66VUqye5BGp1Zz1r8psCxdNH+GtTjaFwroum2Osx+wbC5oRjAiXkkadiitf6wRb+edodjEMPn49u7B6WGNuewQ== + dependencies: + underscore "1.8.3" + web3-core-helpers "1.0.0-beta.37" + web3-providers-http "1.0.0-beta.37" + web3-providers-ipc "1.0.0-beta.37" + web3-providers-ws "1.0.0-beta.37" + web3-core-subscriptions@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.35.tgz#c1b76a2ad3c6e80f5d40b8ba560f01e0f4628758" @@ -14416,6 +14448,15 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.37.tgz#40de5e2490cc05b15faa8f935c97fd48d670cd9a" + integrity sha512-FdXl8so9kwkRRWziuCSpFsAuAdg9KvpXa1fQlT16uoGcYYfxwFO/nkwyBGQzkZt7emShI2IRugcazyPCZDwkOA== + dependencies: + eventemitter3 "1.1.1" + underscore "1.8.3" + web3-core-helpers "1.0.0-beta.37" + 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" @@ -14435,6 +14476,16 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.37.tgz#66c2c7000772c9db36d737ada31607ace09b7e90" + integrity sha512-cIwEqCj7OJyefQNauI0HOgW4sSaOQ98V99H2/HEIlnCZylsDzfw7gtQUdwnRFiIyIxjbWy3iWsjwDPoXNPZBYg== + dependencies: + web3-core-helpers "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-core-requestmanager "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14503,6 +14554,22 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.37.tgz#0a5a9f14a6c3bd285e001c15eb3bb38ffa4b5204" + integrity sha512-uvbHL62/zwo4GDmwKdqH9c/EgYd8QVnAfpVw8D3epSISpgbONNY7Hr4MRMSd/CqAP12l2Ls9JVQGLhhC83bW6g== + dependencies: + any-promise "1.3.0" + crypto-browserify "3.12.0" + eth-lib "0.2.7" + scrypt.js "0.2.0" + underscore "1.8.3" + uuid "2.0.1" + web3-core "1.0.0-beta.37" + web3-core-helpers "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14536,6 +14603,20 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.37.tgz#87f93c95ed16f320ba54943b7886890de6766013" + integrity sha512-h1B3A8Z/C7BlnTCHkrWbXZQTViDxfR12lKMeTkT8Sqj5phFmxrBlPE4ORy4lf1Dk5b23mZYE0r/IRACx4ThCrQ== + dependencies: + underscore "1.8.3" + web3-core "1.0.0-beta.37" + web3-core-helpers "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-core-promievent "1.0.0-beta.37" + web3-core-subscriptions "1.0.0-beta.37" + web3-eth-abi "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14553,6 +14634,20 @@ web3-eth-contract@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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.37.tgz#714ecb01eb447ee3eb39b2b20a10ae96edb1f01f" + integrity sha512-dR3UkrVzdRrJhfP57xBPx0CMiVnCcYFvh+u2XMkGydrhHgupSUkjqGr89xry/j1T0BkuN9mikpbyhdCVMXqMbg== + dependencies: + eth-ens-namehash "2.0.8" + underscore "1.8.3" + web3-core "1.0.0-beta.37" + web3-core-helpers "1.0.0-beta.37" + web3-core-promievent "1.0.0-beta.37" + web3-eth-abi "1.0.0-beta.37" + web3-eth-contract "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14579,6 +14674,14 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.37.tgz#313a3f18ae2ab00ba98678ea1156b09ef32a3655" + integrity sha512-WQRniGJFxH/XCbd7miO6+jnUG+6bvuzfeufPIiOtCbeIC1ypp1kSqER8YVBDrTyinU1xnf1U5v0KBZ2yiWBJxQ== + dependencies: + bn.js "4.11.6" + web3-utils "1.0.0-beta.37" + 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" @@ -14599,6 +14702,17 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.37.tgz#187472f51861e2b6d45da43411801bc91a859f9a" + integrity sha512-B4dZpGbD+nGnn48i6nJBqrQ+HB7oDmd+Q3wGRKOsHSK5HRWO/KwYeA7wgwamMAElkut50lIsT9EJl4Apfk3G5Q== + dependencies: + web3-core "1.0.0-beta.37" + web3-core-helpers "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-net "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14631,6 +14745,25 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.37.tgz#0e8ffcd857a5f85ae4b5f052ad831ca5c56f4f74" + integrity sha512-Eb3aGtkz3G9q+Z9DKgSQNbn/u8RtcZQQ0R4sW9hy5KK47GoT6vab5c6DiD3QWzI0BzitHzR5Ji+3VHf/hPUGgw== + dependencies: + underscore "1.8.3" + web3-core "1.0.0-beta.37" + web3-core-helpers "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-core-subscriptions "1.0.0-beta.37" + web3-eth-abi "1.0.0-beta.37" + web3-eth-accounts "1.0.0-beta.37" + web3-eth-contract "1.0.0-beta.37" + web3-eth-ens "1.0.0-beta.37" + web3-eth-iban "1.0.0-beta.37" + web3-eth-personal "1.0.0-beta.37" + web3-net "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14662,6 +14795,15 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.37.tgz#b494136043f3c6ba84fe4a47d4c028c2a63c9a8e" + integrity sha512-xG/uBtMdDa1UMXw9KjDUgf3fXA/fDEJUYUS0TDn+U9PMgngA+UVECHNNvQTrVVDxEky38V3sahwIDiopNsQdsw== + dependencies: + web3-core "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + 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" @@ -14734,6 +14876,14 @@ web3-providers-http@1.0.0-beta.35: web3-core-helpers "1.0.0-beta.35" xhr2-cookies "1.1.0" +web3-providers-http@1.0.0-beta.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.37.tgz#c06efd60e16e329e25bd268d2eefc68d82d13651" + integrity sha512-FM/1YDB1jtZuTo78habFj7S9tNHoqt0UipdyoQV29b8LkGKZV9Vs3is8L24hzuj1j/tbwkcAH+ewIseHwu0DTg== + dependencies: + web3-core-helpers "1.0.0-beta.37" + xhr2-cookies "1.1.0" + web3-providers-ipc@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.35.tgz#031afeb10fade2ebb0ef2fb82f5e58c04be842d9" @@ -14743,6 +14893,15 @@ web3-providers-ipc@1.0.0-beta.35: underscore "1.8.3" web3-core-helpers "1.0.0-beta.35" +web3-providers-ipc@1.0.0-beta.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.37.tgz#55d247e7197257ca0c3e4f4b0fe1561311b9d5b9" + integrity sha512-NdRPRxYMIU0C3u18NI8u4bwbhI9pCg5nRgDGYcmSAx5uOBxiYcQy+hb0WkJRRhBoyIXJmy+s26FoH8904+UnPg== + dependencies: + oboe "2.1.3" + underscore "1.8.3" + web3-core-helpers "1.0.0-beta.37" + web3-providers-ws@1.0.0-beta.35: version "1.0.0-beta.35" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.35.tgz#5d38603fd450243a26aae0ff7f680644e77fa240" @@ -14752,6 +14911,15 @@ 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-ws@1.0.0-beta.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.37.tgz#77c15aebc00b75d760d22d063ac2e415bdbef72f" + integrity sha512-8p6ZLv+1JYa5Vs8oBn33Nn3VGFBbF+wVfO+b78RJS1Qf1uIOzjFVDk3XwYDD7rlz9G5BKpxhaQw+6EGQ7L02aw== + dependencies: + underscore "1.8.3" + web3-core-helpers "1.0.0-beta.37" + 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" @@ -14779,6 +14947,16 @@ 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.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.37.tgz#3246ce5229601b525020828a56ee283307057105" + integrity sha512-h5STG/xqZNQWtCLYOu7NiMqwqPea8SfkKQUPUFxXKIPVCFVKpHuQEwW1qcPQRJMLhlQIv17xuoUe1A+RzDNbrw== + dependencies: + web3-core "1.0.0-beta.37" + web3-core-method "1.0.0-beta.37" + web3-core-subscriptions "1.0.0-beta.37" + web3-net "1.0.0-beta.37" + 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" @@ -14864,6 +15042,19 @@ web3@1.0.0-beta.35: web3-shh "1.0.0-beta.35" web3-utils "1.0.0-beta.35" +web3@1.0.0-beta.37: + version "1.0.0-beta.37" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.37.tgz#b42c30e67195f816cd19d048fda872f70eca7083" + integrity sha512-8XLgUspdzicC/xHG82TLrcF/Fxzj2XYNJ1KTYnepOI77bj5rvpsxxwHYBWQ6/JOjk0HkZqoBfnXWgcIHCDhZhQ== + dependencies: + web3-bzz "1.0.0-beta.37" + web3-core "1.0.0-beta.37" + web3-eth "1.0.0-beta.37" + web3-eth-personal "1.0.0-beta.37" + web3-net "1.0.0-beta.37" + web3-shh "1.0.0-beta.37" + web3-utils "1.0.0-beta.37" + web3@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" @@ -14911,10 +15102,6 @@ web3@^1.0.0-beta.36: web3-shh "1.0.0-beta.55" web3-utils "1.0.0-beta.55" -"web3@https://github.com/ethereum/web3.js#release/1.0": - version "1.0.0" - resolved "https://github.com/ethereum/web3.js#963e5c5df134e22c7c83ba4cc3cd42488b29f252" - webidl-conversions@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506" From dc8cd1ac4486163d634ba951b6f6bf25c0916f32 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 18:22:51 -0400 Subject: [PATCH 09/10] Add missing dependencies --- packages/truffle-decode-utils/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/truffle-decode-utils/package.json b/packages/truffle-decode-utils/package.json index eb584abac00..f4057cb7f0e 100644 --- a/packages/truffle-decode-utils/package.json +++ b/packages/truffle-decode-utils/package.json @@ -6,8 +6,10 @@ "bn.js": "^4.11.8", "lodash.clonedeep": "^4.5.0", "lodash.escaperegexp": "^4.1.2", + "truffle-contract-schema": "^3.0.11", "web3": "1.0.0-beta.37", - "web3-eth-abi": "1.0.0-beta.52" + "web3-eth-abi": "1.0.0-beta.52", + "web3-utils": "1.0.0-beta.37" }, "main": "dist/index.js", "types": "src/index.ts", From 736c4d23133a8c097eb818bd94724207904fd940 Mon Sep 17 00:00:00 2001 From: "g. nicholas d'andrea" Date: Fri, 12 Jul 2019 18:47:29 -0400 Subject: [PATCH 10/10] Remove AbiItem type, use any --- packages/truffle-decode-utils/src/contexts.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/truffle-decode-utils/src/contexts.ts b/packages/truffle-decode-utils/src/contexts.ts index 5e1aa362759..87d7d141006 100644 --- a/packages/truffle-decode-utils/src/contexts.ts +++ b/packages/truffle-decode-utils/src/contexts.ts @@ -3,7 +3,6 @@ const debug = debugModule("decode-utils:contexts"); import { Abi } from "truffle-contract-schema/spec"; import { AbiCoder } from "web3-eth-abi"; -import { AbiItem } from "web3-utils"; const abiCoder = new AbiCoder(); import escapeRegExp from "lodash.escaperegexp"; @@ -97,7 +96,7 @@ export namespace Contexts { debug("signature read: %s", signature); //if not, compute it ourselves if(signature === undefined) { - signature = abiCoder.encodeFunctionSignature(abiEntry); + signature = abiCoder.encodeFunctionSignature(abiEntry); //Notice the type coercion -- web3 and our schema describe things a little //differently, and TypeScript complains. I think we just have to force it, //sorry.