diff --git a/packages/truffle-artifactor/package.json b/packages/truffle-artifactor/package.json index f9a88f3a52d..9f1dddf8f5c 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.25", - "web3": "1.2.0" + "web3": "^1.2.0" }, "publishConfig": { "access": "public" diff --git a/packages/truffle-contract/package.json b/packages/truffle-contract/package.json index 08fbd818004..c28ccdcc701 100644 --- a/packages/truffle-contract/package.json +++ b/packages/truffle-contract/package.json @@ -25,10 +25,10 @@ "truffle-contract-schema": "^3.0.11", "truffle-error": "^0.0.5", "truffle-interface-adapter": "^0.2.0", - "web3": "1.2.0", - "web3-core-promievent": "1.2.0", - "web3-eth-abi": "1.0.0-beta.37", - "web3-utils": "1.0.0-beta.37" + "web3": "^1.2.0", + "web3-core-promievent": "^1.2.0", + "web3-eth-abi": "^1.2.0", + "web3-utils": "^1.2.0" }, "devDependencies": { "async": "2.6.1", diff --git a/packages/truffle-core/package.json b/packages/truffle-core/package.json index 5f9bf16c451..91f7a6e114c 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.24", "universal-analytics": "^0.4.17", - "web3": "1.2.0", + "web3": "^1.2.0", "xregexp": "^4.2.4", "yargs": "^8.0.2" }, diff --git a/packages/truffle-debugger/package.json b/packages/truffle-debugger/package.json index 69bd00c7a16..a74c6f19869 100644 --- a/packages/truffle-debugger/package.json +++ b/packages/truffle-debugger/package.json @@ -34,8 +34,8 @@ "truffle-decoder": "^3.0.6", "truffle-expect": "^0.0.9", "truffle-solidity-utils": "^1.2.3", - "web3": "1.2.0", - "web3-eth-abi": "1.0.0-beta.37" + "web3": "^1.2.0", + "web3-eth-abi": "^1.2.0" }, "devDependencies": { "async": "2.6.1", diff --git a/packages/truffle-decode-utils/package.json b/packages/truffle-decode-utils/package.json index 0401616a15b..52d421cd6f9 100644 --- a/packages/truffle-decode-utils/package.json +++ b/packages/truffle-decode-utils/package.json @@ -21,7 +21,7 @@ "bn.js": "^4.11.8", "lodash.clonedeep": "^4.5.0", "lodash.escaperegexp": "^4.1.2", - "web3": "1.2.0", + "web3": "^1.2.0", "web3-eth-abi": "1.0.0-beta.52" }, "devDependencies": { diff --git a/packages/truffle-decoder/package.json b/packages/truffle-decoder/package.json index 691be35e612..d54e77af369 100644 --- a/packages/truffle-decoder/package.json +++ b/packages/truffle-decoder/package.json @@ -30,7 +30,7 @@ "lodash.merge": "^4.6.1", "truffle-decode-utils": "^1.0.14", "utf8": "^3.0.0", - "web3": "1.2.0" + "web3": "^1.2.0" }, "peerDependencies": { "truffle": "^5.0.14" diff --git a/packages/truffle-deployer/package.json b/packages/truffle-deployer/package.json index 35f10e0f978..ee97754203f 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.24", - "web3": "1.2.0" + "web3": "^1.2.0" }, "keywords": [ "contracts", diff --git a/packages/truffle-environment/package.json b/packages/truffle-environment/package.json index 6a85014c80b..0dd6a99b113 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.2.0" + "web3": "^1.2.0" }, "devDependencies": { "debug": "^4.1.0" diff --git a/packages/truffle-hdwallet-provider/package.json b/packages/truffle-hdwallet-provider/package.json index 820a16899a0..48a47c86fcb 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.2.0", + "web3": "^1.2.0", "websocket": "^1.0.28" }, "devDependencies": { diff --git a/packages/truffle-interface-adapter/package.json b/packages/truffle-interface-adapter/package.json index 3c33c1377c2..778a273d2f7 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.2.0" + "web3": "^1.2.0" }, "devDependencies": { "@types/bn.js": "^4.11.4", diff --git a/packages/truffle-migrate/package.json b/packages/truffle-migrate/package.json index 1871abcf968..9af70fc5a1d 100644 --- a/packages/truffle-migrate/package.json +++ b/packages/truffle-migrate/package.json @@ -23,7 +23,7 @@ "truffle-interface-adapter": "^0.2.0", "truffle-reporters": "^1.0.10", "truffle-require": "^2.0.15", - "web3": "1.2.0" + "web3": "^1.2.0" }, "devDependencies": { "mocha": "5.2.0", diff --git a/packages/truffle-provider/package.json b/packages/truffle-provider/package.json index 9ac8a8f1445..2438ee005cc 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.2.0" + "web3": "^1.2.0" }, "devDependencies": { "ganache-core": "2.5.7", diff --git a/packages/truffle-require/package.json b/packages/truffle-require/package.json index 3d0c48f618a..0bf87281544 100644 --- a/packages/truffle-require/package.json +++ b/packages/truffle-require/package.json @@ -18,7 +18,7 @@ "truffle-config": "^1.1.15", "truffle-expect": "^0.0.9", "truffle-interface-adapter": "^0.2.0", - "web3": "1.2.0" + "web3": "^1.2.0" }, "devDependencies": { "mocha": "5.2.0" diff --git a/packages/truffle/package.json b/packages/truffle/package.json index 05ea7ae5c4d..de970f5335c 100644 --- a/packages/truffle/package.json +++ b/packages/truffle/package.json @@ -51,7 +51,7 @@ "truffle-contract": "^4.0.25", "truffle-core": "^5.0.28", "truffle-debugger": "^5.0.20", - "web3": "1.2.0", + "web3": "^1.2.0", "webpack": "^2.5.1", "webpack-bundle-analyzer": "^3.0.3", "yargs": "^8.0.2" diff --git a/yarn.lock b/yarn.lock index 2eb05192019..b00c152b9ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5566,22 +5566,6 @@ ethereumjs-wallet@0.6.3, ethereumjs-wallet@^0.6.2: utf8 "^3.0.0" uuid "^3.3.2" -ethers@4.0.0-beta.1: - version "4.0.0-beta.1" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.1.tgz#0648268b83e0e91a961b1af971c662cdf8cbab6d" - integrity sha512-SoYhktEbLxf+fiux5SfCEwdzWENMvgIbMZD90I62s4GZD9nEjgEWy8ZboI3hck193Vs0bDoTohDISx84f2H2tw== - 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.3" - setimmediate "1.0.4" - uuid "2.0.1" - xmlhttprequest "1.8.0" - ethers@4.0.0-beta.3: version "4.0.0-beta.3" resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.3.tgz#15bef14e57e94ecbeb7f9b39dd0a4bd435bc9066" @@ -14599,7 +14583,7 @@ web3-core-promievent@1.0.0-beta.35: any-promise "1.3.0" eventemitter3 "1.1.1" -web3-core-promievent@1.2.0: +web3-core-promievent@1.2.0, web3-core-promievent@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.0.tgz#d6454837a307da5b453fe3077743fe25801a07a1" integrity sha512-9THNYsZka91AX4LZGZvka5hio9+QlOY22hNgCiagmCmYytyKk3cXftL6CWefnNF7XgW8sy/ew5lzWLVsQW61Lw== @@ -14699,15 +14683,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.37: - version "1.0.0-beta.37" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.37.tgz#55592fa9cd2427d9f0441d78f3b8d0c1359a2a24" - integrity sha512-g9DKZGM2OqwKp/tX3W/yihcj7mQCtJ6CXyZXEIZfuDyRBED/iSEIFfieDOd+yo16sokLMig6FG7ADhhu+19hdA== - dependencies: - ethers "4.0.0-beta.1" - underscore "1.8.3" - web3-utils "1.0.0-beta.37" - web3-eth-abi@1.0.0-beta.52: version "1.0.0-beta.52" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.52.tgz#88dc2d36e2f99dfe255f8f64b6f613bad82779d8" @@ -14728,7 +14703,7 @@ web3-eth-abi@1.0.0-beta.55: lodash "^4.17.11" web3-utils "1.0.0-beta.55" -web3-eth-abi@1.2.0: +web3-eth-abi@1.2.0, web3-eth-abi@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.0.tgz#26b22261756ffbb3363bc37c1a6f5143bebb6469" integrity sha512-FDuPq/tFeMg/D/f7cNSmvVYkMYb1z379gUUzSL8ZFtZrdHPkezq+lq/TmWmbCOMLYNXlhGJBzjGdLXRS4Upprg== @@ -15228,7 +15203,7 @@ web3-utils@1.0.0-beta.55: randombytes "^2.1.0" utf8 "2.1.1" -web3-utils@1.2.0: +web3-utils@1.2.0, web3-utils@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.0.tgz#1f11b05d173b757d3f5ba32cb90b375a487d3bf0" integrity sha512-tI1low8ICoaWU2c53cikH0rsksKuIskI2nycH5E5sEXxxl9/BOD3CeDDBFbxgNPQ+bpDevbR7gXNEDB7Ud4G9g== @@ -15254,19 +15229,6 @@ web3@1.0.0-beta.35: web3-shh "1.0.0-beta.35" web3-utils "1.0.0-beta.35" -web3@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.0.tgz#ef9c43a99eac348a85c09179690290d45a96a5f2" - integrity sha512-iFrVAexsopX97x0ofBU/7HrCxzovf624qBkjBUeHZDf/G3Sb4tMQtjkCRc5lgVvzureq5SCqDiFDcqnw7eJ0bA== - dependencies: - web3-bzz "1.2.0" - web3-core "1.2.0" - web3-eth "1.2.0" - web3-eth-personal "1.2.0" - web3-net "1.2.0" - web3-shh "1.2.0" - web3-utils "1.2.0" - web3@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019" @@ -15314,6 +15276,19 @@ web3@^1.0.0-beta.36: web3-shh "1.0.0-beta.55" web3-utils "1.0.0-beta.55" +web3@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.0.tgz#ef9c43a99eac348a85c09179690290d45a96a5f2" + integrity sha512-iFrVAexsopX97x0ofBU/7HrCxzovf624qBkjBUeHZDf/G3Sb4tMQtjkCRc5lgVvzureq5SCqDiFDcqnw7eJ0bA== + dependencies: + web3-bzz "1.2.0" + web3-core "1.2.0" + web3-eth "1.2.0" + web3-eth-personal "1.2.0" + web3-net "1.2.0" + web3-shh "1.2.0" + web3-utils "1.2.0" + webidl-conversions@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"