Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): downgrade WalletConnect #4406

Merged
merged 12 commits into from
Oct 31, 2023
Merged

fix(deps): downgrade WalletConnect #4406

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
778ac00
fix(deps): downgrade wallet connect
MuckT Oct 27, 2023
257dbf2
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 30, 2023
b7abb81
fix(deps): downgrade wallet connect dependencies
MuckT Oct 30, 2023
dc65a8e
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 30, 2023
4c97245
fix(deps): pin wallet connect dependencies
MuckT Oct 30, 2023
65461db
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 30, 2023
e6a17c9
fix(deps): wallet connect
MuckT Oct 30, 2023
8429d04
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 30, 2023
17cd7b6
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 30, 2023
962c674
fix(deps): deduplicate wallet connect dependencies
MuckT Oct 30, 2023
49214d1
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 31, 2023
10f5d37
Merge branch 'main' into tomm/wc-deps-downgrade
MuckT Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
"@th3rdwave/react-navigation-bottom-sheet": "^0.2.7",
"@toruslabs/fetch-node-details": "^8.1.1",
"@toruslabs/torus.js": "^6.4.1",
"@walletconnect/react-native-compat": "^2.10.2",
"@walletconnect/utils": "^2.10.2",
"@walletconnect/web3wallet": "^1.9.2",
"@walletconnect/react-native-compat": "2.10.0",
"@walletconnect/utils": "2.10.0",
"@walletconnect/web3wallet": "1.9.0",
"Base64": "^1.3.0",
"apollo-boost": "^0.4.9",
"apollo-cache-persist": "^0.1.1",
Expand Down Expand Up @@ -240,9 +240,9 @@
"@typescript-eslint/eslint-plugin": "^5.58.0",
"@valora/eslint-config-typescript": "^1.0.2",
"@valora/resolve-kit": "^1.0.1",
"@walletconnect/legacy-types": "^2.0.0",
"@walletconnect/sign-client": "^2.10.1",
"@walletconnect/types": "^2.10.1",
"@walletconnect/legacy-types": "2.0.0",
"@walletconnect/sign-client": "2.10.0",
"@walletconnect/types": "2.10.0",
"ajv": "^8.10.0",
"babel-jest": "^29.2.1",
"babel-plugin-module-resolver": "^4.1.0",
Expand Down
3 changes: 0 additions & 3 deletions test/RootStateSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4897,9 +4897,6 @@
"verified": {
"additionalProperties": false,
"properties": {
"isScam": {
"type": "boolean"
},
"origin": {
"type": "string"
},
Expand Down
138 changes: 96 additions & 42 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4962,29 +4962,51 @@
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2"
integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==

"@walletconnect/auth-client@2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@walletconnect/auth-client/-/auth-client-2.1.2.tgz#cee304fb0cdca76f6bf4aafac96ef9301862a7e8"
integrity sha512-ubJLn+vGb8sTdBFX6xAh4kjR5idrtS3RBngQWaJJJpEPBQmxMb8pM2q0FIRs8Is4K6jKy+uEhusMV+7ZBmTzjw==
"@walletconnect/auth-client@2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@walletconnect/auth-client/-/auth-client-2.1.1.tgz#45548fc5d5e5ac155503d1b42ac97a96a2cba98d"
integrity sha512-rFGBG3pLkmwCc5DcL9JRCsvOAmPjUcHGxm+KlX31yXNOT1QACT8Gyd8ODSOmtvz5CXZS5dPWBuvO03LUSRbPkw==
dependencies:
"@ethersproject/hash" "^5.7.0"
"@ethersproject/transactions" "^5.7.0"
"@stablelib/random" "^1.0.2"
"@stablelib/sha256" "^1.0.1"
"@walletconnect/core" "^2.10.1"
"@walletconnect/core" "^2.9.0"
"@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "^1.2.1"
"@walletconnect/jsonrpc-utils" "^1.0.8"
"@walletconnect/logger" "^2.0.1"
"@walletconnect/time" "^1.0.2"
"@walletconnect/utils" "^2.10.1"
"@walletconnect/utils" "^2.9.0"
events "^3.3.0"
isomorphic-unfetch "^3.1.0"

"@walletconnect/core@2.10.2", "@walletconnect/core@^2.10.1":
version "2.10.2"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.2.tgz#a1bf6e3e87b33f9df795ce0970d8ddd400fdc8a3"
integrity sha512-JQz/xp3SLEpTeRQctdck2ugSBVEpMxoSE+lFi2voJkZop1hv6P+uqr6E4PzjFluAjeAnKlT1xvra0aFWjPWVcw==
"@walletconnect/core@2.10.0":
version "2.10.0"
MuckT marked this conversation as resolved.
Show resolved Hide resolved
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.0.tgz#b659de4dfb374becd938964abd4f2150d410e617"
integrity sha512-Z8pdorfIMueuiBXLdnf7yloiO9JIiobuxN3j0OTal+MYc4q5/2O7d+jdD1DAXbLi1taJx3x60UXT/FPVkjIqIQ==
dependencies:
"@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-provider" "1.0.13"
"@walletconnect/jsonrpc-types" "1.0.3"
"@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/jsonrpc-ws-connection" "1.0.13"
"@walletconnect/keyvaluestorage" "^1.0.2"
"@walletconnect/logger" "^2.0.1"
"@walletconnect/relay-api" "^1.0.9"
"@walletconnect/relay-auth" "^1.0.4"
"@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.10.0"
"@walletconnect/utils" "2.10.0"
events "^3.3.0"
lodash.isequal "4.5.0"
uint8arrays "^3.1.0"

"@walletconnect/core@^2.9.0":
version "2.10.4"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.4.tgz#da9396b56f63806c165389cbf98d2373d36854df"
integrity sha512-MGdw5a4dIlQFPxVHEw2neIpHPAw3gtrsJYyUqm6rI+1c1SfmZyOPCaYTr6zPU2cnoWQUjv2ePMLeO/JKy3Yh5g==
dependencies:
"@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-provider" "1.0.13"
Expand All @@ -4997,8 +5019,8 @@
"@walletconnect/relay-auth" "^1.0.4"
"@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.10.2"
"@walletconnect/utils" "2.10.2"
"@walletconnect/types" "2.10.4"
"@walletconnect/utils" "2.10.4"
events "^3.3.0"
lodash.isequal "4.5.0"
uint8arrays "^3.1.0"
Expand Down Expand Up @@ -5072,7 +5094,7 @@
safe-json-utils "^1.1.1"
tslib "1.14.1"

"@walletconnect/legacy-types@^2.0.0":
"@walletconnect/legacy-types@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@walletconnect/legacy-types/-/legacy-types-2.0.0.tgz#224278ae2874c6a2ca805c2d1d062a511dcf7227"
integrity sha512-sOVrA7HUdbI1OwKyPOQU0/DdvTSVFlsXWpAk2K2WvP2erTkBWPMTJq6cv2BmKdoJ3p6gLApT7sd+jHi3OF71uw==
Expand All @@ -5087,10 +5109,10 @@
pino "7.11.0"
tslib "1.14.1"

"@walletconnect/react-native-compat@^2.10.2":
version "2.10.2"
resolved "https://registry.yarnpkg.com/@walletconnect/react-native-compat/-/react-native-compat-2.10.2.tgz#079ece15badc415fdd97ce216f5912175d864526"
integrity sha512-g9Be7wEmlvLj40061I+bya/dxcSPzGTt6xGMqZIt324EEX96Er5lJ26JcuFw6qYo4iRmICW8UwLWhXEJ3cqO+Q==
"@walletconnect/react-native-compat@2.10.0":
version "2.10.0"
resolved "https://registry.yarnpkg.com/@walletconnect/react-native-compat/-/react-native-compat-2.10.0.tgz#6254b23a22d371e7890ed957cf7950ee5b9eafc7"
integrity sha512-7u0ykp1gz+7UoYp3miAfm6fTjsDUEHjGB2RXSeYjCX5ikVN6rJl0USMzBmM52pYTtAVFG9QT25Tt2bGk2rHOjw==
dependencies:
events "3.3.0"
fast-text-encoding "^1.0.6"
Expand Down Expand Up @@ -5123,19 +5145,19 @@
dependencies:
tslib "1.14.1"

"@walletconnect/sign-client@2.10.2", "@walletconnect/sign-client@^2.10.1":
version "2.10.2"
resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.2.tgz#33300a9cfe42487473f66b73c99535f6b26f8c54"
integrity sha512-vviSLV3f92I0bReX+OLr1HmbH0uIzYEQQFd1MzIfDk9PkfFT/LLAHhUnDaIAMkIdippqDcJia+5QEtT4JihL3Q==
"@walletconnect/sign-client@2.10.0":
version "2.10.0"
resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.0.tgz#0fee8f12821e37783099f0c7bd64e6efdfbd9d86"
integrity sha512-hbDljDS53kR/It3oXD91UkcOsT6diNnW5+Zzksm0YEfwww5dop/YfNlcdnc8+jKUhWOL/YDPNQCjzsCSNlVzbw==
dependencies:
"@walletconnect/core" "2.10.2"
"@walletconnect/core" "2.10.0"
"@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/logger" "^2.0.1"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.10.2"
"@walletconnect/utils" "2.10.2"
"@walletconnect/types" "2.10.0"
"@walletconnect/utils" "2.10.0"
events "^3.3.0"

"@walletconnect/time@^1.0.2":
Expand All @@ -5145,10 +5167,10 @@
dependencies:
tslib "1.14.1"

"@walletconnect/types@2.10.2", "@walletconnect/types@^2.10.1":
version "2.10.2"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.2.tgz#68e433a29ec2cf42d79d8b50c77bd5c1d91db721"
integrity sha512-luNV+07Wdla4STi9AejseCQY31tzWKQ5a7C3zZZaRK/di+rFaAAb7YW04OP4klE7tw/mJRGPTlekZElmHxO8kQ==
"@walletconnect/types@2.10.0":
version "2.10.0"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.0.tgz#5d63235b49e03d609521402a4b49627dbc4ed514"
integrity sha512-kSTA/WZnbKdEbvbXSW16Ty6dOSzOZCHnGg6JH7q1MuraalD2HuNg00lVVu7QAZ/Rj1Gn9DAkrgP5Wd5a8Xq//Q==
dependencies:
"@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1"
Expand All @@ -5157,10 +5179,22 @@
"@walletconnect/logger" "^2.0.1"
events "^3.3.0"

"@walletconnect/utils@2.10.2", "@walletconnect/utils@^2.10.1", "@walletconnect/utils@^2.10.2":
version "2.10.2"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.2.tgz#1f2c6a2f1bb95bcc4517b1e94aa7164c9286eb46"
integrity sha512-syxXRpc2yhSknMu3IfiBGobxOY7fLfLTJuw+ppKaeO6WUdZpIit3wfuGOcc0Ms3ZPFCrGfyGOoZsCvgdXtptRg==
"@walletconnect/types@2.10.4":
version "2.10.4"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.4.tgz#23f6e4bd785671812dc6ea96848a6bd7ea78f038"
integrity sha512-eQpOElyiwJp3tepuOS3TS9dXTl9jVVlrC3iVA8bytnbLagkAUxmiv/s7PyDFx+ndXwQVh8PFBkWg1oxGwgCSBA==
dependencies:
"@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-types" "1.0.3"
"@walletconnect/keyvaluestorage" "^1.0.2"
"@walletconnect/logger" "^2.0.1"
events "^3.3.0"

"@walletconnect/utils@2.10.0":
version "2.10.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for this one?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to resolve this modifying the lock file directly, but I am not sure that's ideal. I believe @kathaypacific had to do something similar in the past with the WalletConnect dependencies.

resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.0.tgz#6918d12180d797b8bd4a19fb2ff128e394e181d6"
integrity sha512-9GRyEz/7CJW+G04RvrjPET5k7hOEsB9b3fF9cWDk/iDCxSWpbkU/hv/urRB36C+gvQMAZgIZYX3dHfzJWkY/2g==
dependencies:
"@stablelib/chacha20poly1305" "1.0.1"
"@stablelib/hkdf" "1.0.1"
Expand All @@ -5170,26 +5204,46 @@
"@walletconnect/relay-api" "^1.0.9"
"@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.10.2"
"@walletconnect/types" "2.10.0"
"@walletconnect/window-getters" "^1.0.1"
"@walletconnect/window-metadata" "^1.0.1"
detect-browser "5.3.0"
query-string "7.1.3"
uint8arrays "^3.1.0"

"@walletconnect/web3wallet@^1.9.2":
version "1.9.2"
resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.9.2.tgz#f648fa267cc4c9416e9d3c06cb1d7ab93793559d"
integrity sha512-IUEmUWKNErWSIMxyvHmFm8NYinsSybaw2Q2Z+7AJdlP+bTA7jg2eeyOGrJsFmBRrfXD3QT/rS/fRDr/LRIvCGg==
"@walletconnect/utils@2.10.4", "@walletconnect/utils@^2.9.0":
version "2.10.4"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.4.tgz#5f17938e7ea481541ec2dbae0df5cd494c72523f"
integrity sha512-XbrKgnQ0hC9DC9wjFb468MEYMoJxnCVmOj2gi01DA4FSr8fJi7wwNRUnlnZzLWrUWrHuaPReYe4PgBAgIv363g==
dependencies:
"@stablelib/chacha20poly1305" "1.0.1"
"@stablelib/hkdf" "1.0.1"
"@stablelib/random" "^1.0.2"
"@stablelib/sha256" "1.0.1"
"@stablelib/x25519" "^1.0.3"
"@walletconnect/relay-api" "^1.0.9"
"@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.10.4"
"@walletconnect/window-getters" "^1.0.1"
"@walletconnect/window-metadata" "^1.0.1"
detect-browser "5.3.0"
query-string "7.1.3"
uint8arrays "^3.1.0"

"@walletconnect/web3wallet@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.9.0.tgz#ad4094e1e2ed757bc75efa961121b66b2eeb4306"
integrity sha512-3uu6GbOz2uwcmVaIpijkPlReywC1GsFtwJOB1bJZOkc8wjtNmR3jUMwqxWUv8ojbmDVVWQl1HN7Sptkrmq9Xyw==
dependencies:
"@walletconnect/auth-client" "2.1.2"
"@walletconnect/core" "2.10.2"
"@walletconnect/auth-client" "2.1.1"
"@walletconnect/core" "2.10.0"
"@walletconnect/jsonrpc-provider" "1.0.13"
"@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/logger" "2.0.1"
"@walletconnect/sign-client" "2.10.2"
"@walletconnect/types" "2.10.2"
"@walletconnect/utils" "2.10.2"
"@walletconnect/sign-client" "2.10.0"
"@walletconnect/types" "2.10.0"
"@walletconnect/utils" "2.10.0"

"@walletconnect/window-getters@^1.0.1":
version "1.0.1"
Expand Down