From 396b44b80585a763749108a3a35e437848d4dcb1 Mon Sep 17 00:00:00 2001 From: eggplantzzz Date: Wed, 13 Jul 2022 11:25:46 -0400 Subject: [PATCH 1/3] update ensjs --- packages/contract/package.json | 2 +- yarn.lock | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/contract/package.json b/packages/contract/package.json index 56949d097f5..93eaa5b9939 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -21,7 +21,7 @@ "publish:next": "node ../truffle/scripts/prereleaseVersion.js next next" }, "dependencies": { - "@ensdomains/ensjs": "^2.0.1", + "@ensdomains/ensjs": "^2.1.0", "@truffle/blockchain-utils": "^0.1.3", "@truffle/contract-schema": "^3.4.8", "@truffle/debug-utils": "^6.0.27", diff --git a/yarn.lock b/yarn.lock index dc0f4656567..df36c9ee446 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2370,6 +2370,17 @@ testrpc "0.0.1" web3-utils "^1.0.0-beta.31" +"@ensdomains/ens@0.4.5": + version "0.4.5" + resolved "https://registry.yarnpkg.com/@ensdomains/ens/-/ens-0.4.5.tgz#e0aebc005afdc066447c6e22feb4eda89a5edbfc" + integrity sha512-JSvpj1iNMFjK6K+uVl4unqMoa9rf5jopb8cya5UGBWz23Nw8hSNT7efgUx4BTlAPAgpNlEioUfeTyQ6J9ZvTVw== + dependencies: + bluebird "^3.5.2" + eth-ens-namehash "^2.0.8" + solc "^0.4.20" + testrpc "0.0.1" + web3-utils "^1.0.0-beta.31" + "@ensdomains/ensjs@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@ensdomains/ensjs/-/ensjs-2.0.0.tgz#1ab8f5fe43f291fdd9d059848a65a5dee4748c74" @@ -2399,6 +2410,20 @@ ethers "^5.0.13" js-sha3 "^0.8.0" +"@ensdomains/ensjs@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@ensdomains/ensjs/-/ensjs-2.1.0.tgz#0a7296c1f3d735ef019320d863a7846a0760c460" + integrity sha512-GRbGPT8Z/OJMDuxs75U/jUNEC0tbL0aj7/L/QQznGYKm/tiasp+ndLOaoULy9kKJFC0TBByqfFliEHDgoLhyog== + dependencies: + "@babel/runtime" "^7.4.4" + "@ensdomains/address-encoder" "^0.1.7" + "@ensdomains/ens" "0.4.5" + "@ensdomains/resolver" "0.2.4" + content-hash "^2.5.2" + eth-ens-namehash "^2.0.8" + ethers "^5.0.13" + js-sha3 "^0.8.0" + "@ensdomains/resolver@0.2.4": version "0.2.4" resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" From f53ea2c6b007c559b7ef01d3ecdae906d7810ada Mon Sep 17 00:00:00 2001 From: eggplantzzz Date: Wed, 13 Jul 2022 16:37:22 -0400 Subject: [PATCH 2/3] bump ensjs to 2.1.0 in deployer --- packages/deployer/package.json | 2 +- yarn.lock | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/packages/deployer/package.json b/packages/deployer/package.json index 92fcf73a87a..4e6d4b87310 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -19,7 +19,7 @@ "test": "mocha --no-warnings --timeout 10000 --exit" }, "dependencies": { - "@ensdomains/ensjs": "^2.0.1", + "@ensdomains/ensjs": "^2.1.0", "@truffle/contract": "^4.5.16", "@truffle/expect": "^0.1.1", "debug": "^4.3.1", diff --git a/yarn.lock b/yarn.lock index df36c9ee446..c17da84ee59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2396,20 +2396,6 @@ ethers "^5.0.13" js-sha3 "^0.8.0" -"@ensdomains/ensjs@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@ensdomains/ensjs/-/ensjs-2.0.1.tgz#c27438f9ca074825ddb08430988c7decf2062a91" - integrity sha512-gZLntzE1xqPNkPvaHdJlV5DXHms8JbHBwrXc2xNrL1AylERK01Lj/txCCZyVQqFd3TvUO1laDbfUv8VII0qrjg== - dependencies: - "@babel/runtime" "^7.4.4" - "@ensdomains/address-encoder" "^0.1.7" - "@ensdomains/ens" "0.4.3" - "@ensdomains/resolver" "0.2.4" - content-hash "^2.5.2" - eth-ens-namehash "^2.0.8" - ethers "^5.0.13" - js-sha3 "^0.8.0" - "@ensdomains/ensjs@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@ensdomains/ensjs/-/ensjs-2.1.0.tgz#0a7296c1f3d735ef019320d863a7846a0760c460" From 3015fd72e9c9344e86a9b60ccbe52adb0ac9b4e7 Mon Sep 17 00:00:00 2001 From: eggplantzzz Date: Wed, 13 Jul 2022 17:32:50 -0400 Subject: [PATCH 3/3] update path to version 0.8.x of the compiler --- packages/compile-solidity/test/test_supplier.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/compile-solidity/test/test_supplier.js b/packages/compile-solidity/test/test_supplier.js index 20f181cbf0a..bc008f589ac 100644 --- a/packages/compile-solidity/test/test_supplier.js +++ b/packages/compile-solidity/test/test_supplier.js @@ -118,10 +118,7 @@ describe("CompilerSupplier", function () { it("compiles w/ local path solc when options specify path", async function () { // If multiple child projects have same solc version dependency, then yarn hoists the solc dependency // in the truffle root node_modules folder rather than the local package node_modules folder - const pathToSolc = path.join( - __dirname, - "../../../node_modules/solc/index.js" - ); + const pathToSolc = path.join(__dirname, "../node_modules/solc/index.js"); options.compilers = { solc: {