From 8e62bf6b46847e1a3d2761d463864e9e3b5d494c Mon Sep 17 00:00:00 2001 From: Franck Date: Fri, 24 Dec 2021 12:19:26 +1100 Subject: [PATCH] Bump ethers, @usedapp/core and waffle to working version Trying to have one version of ethers across the board to avoid type conflicts. As ethers 5.5 and 5.4 are not compatible. --- packages/contracts/package.json | 5 ++--- packages/core/package.json | 2 +- packages/mainnet-poll-example/package.json | 4 ++-- packages/poll-example/package.json | 4 ++-- packages/poll-react-components/package.json | 2 +- packages/poll-react-hooks/package.json | 4 ++-- packages/react-components/package.json | 2 +- packages/vote-example/package.json | 4 ++-- packages/vote-react-components/package.json | 2 +- packages/vote-react-hooks/package.json | 2 +- yarn.lock | 13 +++++++------ 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index f76d15f..89ab26a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -24,7 +24,7 @@ "@types/mocha": "^8.2.2", "chai": "^4.3.4", "eslint": "^7.28.0", - "ethereum-waffle": "^3.3.0", + "ethereum-waffle": "^3.4.0", "mocha": "^9.0.0", "prettier": "^2.3.1", "prettier-plugin-solidity": "^1.0.0-beta.13", @@ -35,7 +35,6 @@ "typescript": "^4.3.3" }, "dependencies": { - "eth-sig-util": "^3.0.1", - "ethers": "5.4.1" + "eth-sig-util": "^3.0.1" } } diff --git a/packages/core/package.json b/packages/core/package.json index 5146f79..40d5d97 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -46,7 +46,7 @@ "dependencies": { "@waku/vote-sdk-contracts": "^0.1.0", "eth-sig-util": "^3.0.1", - "ethers": "^5.4.4", + "ethers": "5.4.6", "js-waku": "^0.11.0", "protons": "^2.0.1" } diff --git a/packages/mainnet-poll-example/package.json b/packages/mainnet-poll-example/package.json index 0c906a9..c20f30f 100644 --- a/packages/mainnet-poll-example/package.json +++ b/packages/mainnet-poll-example/package.json @@ -15,11 +15,11 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@usedapp/core": "^0.4.7", + "@usedapp/core": "0.5.5", "@waku/poll-sdk-react-components": "^0.1.0", "@waku/poll-sdk-react-hooks": "^0.1.0", "@waku/vote-poll-sdk-react-components": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.2.0", diff --git a/packages/poll-example/package.json b/packages/poll-example/package.json index af5c2c3..c36d46c 100644 --- a/packages/poll-example/package.json +++ b/packages/poll-example/package.json @@ -33,11 +33,11 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@usedapp/core": "^0.4.7", + "@usedapp/core": "0.5.5", "@waku/poll-sdk-react-components": "^0.1.0", "@waku/poll-sdk-react-hooks": "^0.1.0", "@waku/vote-poll-sdk-react-components": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.2.0", diff --git a/packages/poll-react-components/package.json b/packages/poll-react-components/package.json index 2fd7f4d..f7c3490 100644 --- a/packages/poll-react-components/package.json +++ b/packages/poll-react-components/package.json @@ -36,7 +36,7 @@ "@waku/poll-sdk-react-hooks": "^0.1.0", "@waku/vote-poll-sdk-core": "^0.1.0", "@waku/vote-poll-sdk-react-components": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "styled-components": "^5.3.0" }, diff --git a/packages/poll-react-hooks/package.json b/packages/poll-react-hooks/package.json index 5331e6d..2e8a519 100644 --- a/packages/poll-react-hooks/package.json +++ b/packages/poll-react-hooks/package.json @@ -29,9 +29,9 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@usedapp/core": "^0.4.7", + "@usedapp/core": "0.5.5", "@waku/vote-poll-sdk-core": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "styled-components": "^5.3.0" }, diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 14bbd65..d47406b 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@waku/vote-poll-sdk-core": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "styled-components": "^5.3.0" }, diff --git a/packages/vote-example/package.json b/packages/vote-example/package.json index e1a8256..1389c16 100644 --- a/packages/vote-example/package.json +++ b/packages/vote-example/package.json @@ -33,12 +33,12 @@ "lint:prettier": "yarn prettier './{src,test}/**/*.{ts,tsx}'" }, "dependencies": { - "@usedapp/core": "^0.4.7", + "@usedapp/core": "0.5.5", "@waku/vote-poll-sdk-core": "^0.1.0", "@waku/vote-poll-sdk-react-components": "^0.1.0", "@waku/vote-sdk-react-components": "^0.1.0", "@waku/vote-sdk-react-hooks": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "styled-components": "^5.3.0" }, diff --git a/packages/vote-react-components/package.json b/packages/vote-react-components/package.json index 27d5ee6..1de4253 100644 --- a/packages/vote-react-components/package.json +++ b/packages/vote-react-components/package.json @@ -36,7 +36,7 @@ "@waku/vote-poll-sdk-core": "^0.1.0", "@waku/vote-poll-sdk-react-components": "^0.1.0", "@waku/vote-sdk-react-hooks": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "humanize-duration": "^3.27.0", "react": "^17.0.2", "react-countup": "^5.2.0", diff --git a/packages/vote-react-hooks/package.json b/packages/vote-react-hooks/package.json index 906d480..6d27645 100644 --- a/packages/vote-react-hooks/package.json +++ b/packages/vote-react-hooks/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@waku/vote-poll-sdk-core": "^0.1.0", - "ethers": "^5.4.4", + "ethers": "5.4.6", "react": "^17.0.2", "styled-components": "^5.3.0" }, diff --git a/yarn.lock b/yarn.lock index 4545c64..483caf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1450,16 +1450,17 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@usedapp/core@^0.4.7": - version "0.4.7" - resolved "https://registry.yarnpkg.com/@usedapp/core/-/core-0.4.7.tgz#87964abf14ba87edd4fe068ee73fe0cb9fcdee2d" - integrity sha512-0JpzUPUHFgmq8GWTl9EGZKR5nS8HQ2e5wwaIG8GBE2VUS40uKwlNhlqkIwD2mkFhpMj8EssMArzcZRzLqZmEPA== +"@usedapp/core@0.5.5": + version "0.5.5" + resolved "https://registry.yarnpkg.com/@usedapp/core/-/core-0.5.5.tgz#651d8b4e2fc85a19935e0b3ec1495a103b8b75b6" + integrity sha512-2a/ttaD0fY1Ui7ubB0pVEzi15euuKr8a/oiXs4rWH8qrth+jW38QyImvl7xQVO63Ikq2pKqmBOJbSFVubdHNDw== dependencies: "@types/react" "17.0.1" "@web3-react/core" "6.1.1" "@web3-react/injected-connector" "6.0.7" "@web3-react/network-connector" "6.1.5" ethers "5.4.1" + lodash.merge "^4.6.2" nanoid "3.1.22" "@vascosantos/moving-average@^1.1.0": @@ -4896,7 +4897,7 @@ ethereum-cryptography@^0.1.3: secp256k1 "^4.0.1" setimmediate "^1.0.5" -ethereum-waffle@^3.3.0, ethereum-waffle@^3.4.0: +ethereum-waffle@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ethereum-waffle/-/ethereum-waffle-3.4.0.tgz#990b3c6c26db9c2dd943bf26750a496f60c04720" integrity sha512-ADBqZCkoSA5Isk486ntKJVjFEawIiC+3HxNqpJqONvh3YXBTNiRfXvJtGuAFLXPG91QaqkGqILEHANAo7j/olQ== @@ -5150,7 +5151,7 @@ ethers@5.4.1: "@ethersproject/web" "5.4.0" "@ethersproject/wordlists" "5.4.0" -ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2, ethers@^5.4.4: +ethers@5.4.6, ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2: version "5.4.6" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.4.6.tgz#fe0a023956b5502c947f58e82fbcf9a73e5e75b6" integrity sha512-F7LXARyB/Px3AQC6/QKedWZ8eqCkgOLORqL4B/F0Mag/K+qJSFGqsR36EaOZ6fKg3ZonI+pdbhb4A8Knt/43jQ==