ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update web3-react (#6749)

Browse Source 
* fix: update web3-react

* update flakey snapshot test and add required config var

* revert snapshot change

* allow ^

* update lockfile with permissive version

* add newly required explicit options for @web3modal
This commit is contained in:
Jordan Frankfurt 2023-06-15 10:55:19 -05:00 committed by GitHub
parent f10ba73529
commit 9e213fc396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -196,7 +196,7 @@
"@web3-react/types": "^8.2.0", "@web3-react/types": "^8.2.0",
"@web3-react/url": "^8.2.0", "@web3-react/url": "^8.2.0",
"@web3-react/walletconnect": "^8.2.0", "@web3-react/walletconnect": "^8.2.0",
"@web3-react/walletconnect-v2": "8.3.2", "@web3-react/walletconnect-v2": "^8.3.3",
"ajv": "^8.11.0", "ajv": "^8.11.0",
"ajv-formats": "^2.1.1", "ajv-formats": "^2.1.1",
"array.prototype.flat": "^1.2.4", "array.prototype.flat": "^1.2.4",

10
src/connection/WalletConnectV2.ts
View File

@ -33,11 +33,21 @@ export class WalletConnectV2Popup extends WalletConnect {
showQrModal: qrcode, showQrModal: qrcode,
rpcMap: RPC_URLS_WITHOUT_FALLBACKS, rpcMap: RPC_URLS_WITHOUT_FALLBACKS,
qrModalOptions: { qrModalOptions: {
chainImages: undefined,
desktopWallets: undefined,
enableExplorer: true,
explorerExcludedWalletIds: undefined,
explorerRecommendedWalletIds: undefined,
mobileWallets: undefined,
privacyPolicyUrl: undefined,
termsOfServiceUrl: undefined,
themeMode: darkmode ? 'dark' : 'light', themeMode: darkmode ? 'dark' : 'light',
themeVariables: { themeVariables: {
'--w3m-font-family': '"Inter custom", sans-serif', '--w3m-font-family': '"Inter custom", sans-serif',
'--w3m-z-index': Z_INDEX.modal.toString(), '--w3m-z-index': Z_INDEX.modal.toString(),
}, },
tokenImages: undefined,
walletImages: undefined,
}, },
}, },
onError, onError,

120
yarn.lock
View File

@ -6157,10 +6157,10 @@
"@walletconnect/types" "^1.8.0" "@walletconnect/types" "^1.8.0"
"@walletconnect/utils" "^1.8.0" "@walletconnect/utils" "^1.8.0"
"@walletconnect/core@2.7.8": "@walletconnect/core@2.8.0":
version "2.7.8" version "2.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.7.8.tgz#e75329379cc61dc124c85619998a65eecabe4f53" resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.8.0.tgz#f694e1562413c4eb700f6b3a83fa7964342100c0"
integrity sha512-Ptp1Jo9hv5mtrQMF/iC/RF/KHmYfO79DBLj77AV4PnJ5z6J0MRYepPKXKFEirOXR4OKCT5qCrPOiRtGvtNI+sg== integrity sha512-pl7x4sq1nuU0ixA9wF2ecjDecUzIauKr7ZwC29rs9qTcmDpxgJbbOdZwaSl+dJlf1bHC87adVLf5KAkwwo9PzQ==
dependencies: dependencies:
"@walletconnect/heartbeat" "1.2.1" "@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-provider" "1.0.13"
@ -6173,8 +6173,8 @@
"@walletconnect/relay-auth" "^1.0.4" "@walletconnect/relay-auth" "^1.0.4"
"@walletconnect/safe-json" "^1.0.2" "@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2" "@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.7.8" "@walletconnect/types" "2.8.0"
"@walletconnect/utils" "2.7.8" "@walletconnect/utils" "2.8.0"
events "^3.3.0" events "^3.3.0"
lodash.isequal "4.5.0" lodash.isequal "4.5.0"
uint8arrays "^3.1.0" uint8arrays "^3.1.0"
@ -6228,19 +6228,19 @@
eip1193-provider "1.0.1" eip1193-provider "1.0.1"
eventemitter3 "4.0.7" eventemitter3 "4.0.7"
"@walletconnect/ethereum-provider@^2.7.8": "@walletconnect/ethereum-provider@^2.8.0":
version "2.7.8" version "2.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.7.8.tgz#1df2fd50eb3cf5a700da571aafb7d24d22c6c3ee" resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.8.0.tgz#15e9efa37b7c2455cd30c883f5698c89e481b163"
integrity sha512-HueJtdhkIu+1U6jOlsFc9F8uZbleiFwZxAGROf7ARhwsPUz9Yd+E0Ct5aNwPwsSDCzUvNpw5/LogFbCVQWWHcA== integrity sha512-nVVJtZUpoeurFjoEPYlrUHkT3YleCpEC9YAMKJyEIB3MZZInttcGxGyi0vwFQ+trCfuX8RrdKUPQ952NvxvCvw==
dependencies: dependencies:
"@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-http-connection" "^1.0.7"
"@walletconnect/jsonrpc-provider" "^1.0.13" "@walletconnect/jsonrpc-provider" "^1.0.13"
"@walletconnect/jsonrpc-types" "^1.0.3" "@walletconnect/jsonrpc-types" "^1.0.3"
"@walletconnect/jsonrpc-utils" "^1.0.8" "@walletconnect/jsonrpc-utils" "^1.0.8"
"@walletconnect/sign-client" "2.7.8" "@walletconnect/sign-client" "2.8.0"
"@walletconnect/types" "2.7.8" "@walletconnect/types" "2.8.0"
"@walletconnect/universal-provider" "2.7.8" "@walletconnect/universal-provider" "2.8.0"
"@walletconnect/utils" "2.7.8" "@walletconnect/utils" "2.8.0"
events "^3.3.0" events "^3.3.0"
"@walletconnect/events@^1.0.1": "@walletconnect/events@^1.0.1":
@ -6337,6 +6337,14 @@
resolved "https://registry.npmjs.org/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz" resolved "https://registry.npmjs.org/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz"
integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw== integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw==
"@walletconnect/modal@^2.4.5":
version "2.4.5"
resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.4.5.tgz#bfdf6110a7f09c709fc5af19e576a28e6bba1d6e"
integrity sha512-t+sII7GIMsKDr0wvSJxzlpcbxw35WthuVpAqPlzMS7roSPmQZT18KO8Iu4ccLkNZF+ioptRTpBUKtk2eeuaqlQ==
dependencies:
"@web3modal/core" "2.4.5"
"@web3modal/ui" "2.4.5"
"@walletconnect/qrcode-modal@^1.8.0": "@walletconnect/qrcode-modal@^1.8.0":
version "1.8.0" version "1.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.8.0.tgz#ddd6f5c9b7ee52c16adf9aacec2a3eac4994caea" resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.8.0.tgz#ddd6f5c9b7ee52c16adf9aacec2a3eac4994caea"
@ -6390,19 +6398,19 @@
dependencies: dependencies:
tslib "1.14.1" tslib "1.14.1"
"@walletconnect/sign-client@2.7.8": "@walletconnect/sign-client@2.8.0":
version "2.7.8" version "2.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.7.8.tgz#02a4030080d585bbc7772d77b102e3b6fa78e19b" resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.8.0.tgz#735dc8bf120242584fb2ff22c6a3d672c1fae1a1"
integrity sha512-na7VeXiOwM83w69s4kA5IeuL2SezwIbHfJsitmbtmsTLaX8Hnf7HwaJrNzrdhKpnEw8a+uG/xDTq+RYY50zf+A== integrity sha512-+l9qwvVeUGk0fBQsgx6yb6hdGYt8uQ3a9jR9GgsJvm8FjFh1oUzTKqFnG7XdhCBnzFnbSoLr41Xe8PbN8qoUSw==
dependencies: dependencies:
"@walletconnect/core" "2.7.8" "@walletconnect/core" "2.8.0"
"@walletconnect/events" "^1.0.1" "@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1" "@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-utils" "1.0.8" "@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/logger" "^2.0.1" "@walletconnect/logger" "^2.0.1"
"@walletconnect/time" "^1.0.2" "@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.7.8" "@walletconnect/types" "2.8.0"
"@walletconnect/utils" "2.7.8" "@walletconnect/utils" "2.8.0"
events "^3.3.0" events "^3.3.0"
"@walletconnect/signer-connection@^1.8.0": "@walletconnect/signer-connection@^1.8.0":
@ -6433,10 +6441,10 @@
dependencies: dependencies:
tslib "1.14.1" tslib "1.14.1"
"@walletconnect/types@2.7.8": "@walletconnect/types@2.8.0":
version "2.7.8" version "2.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.7.8.tgz#681bd2a3c0e80fcda877a6b6aba09567b938c7a6" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.8.0.tgz#f8a5f09ee2b31abed231966e7e1eebd22be058a2"
integrity sha512-1ZucKd5F4Ws+O84Yl4tCzd+hcD3A9vnaimKyC753b7Jdtwg2dm21E6H9t34kOVsFjVdKt9qFrZ1LaVL7SZp59g== integrity sha512-FMeGK3lGXFDwcs5duoN74xL1aLrkgYqnavWE0DnFPt2i1QmSUITU9c8f88EDh8uPXANd2WIYOItm0DVCNxLGGA==
dependencies: dependencies:
"@walletconnect/events" "^1.0.1" "@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1" "@walletconnect/heartbeat" "1.2.1"
@ -6450,26 +6458,26 @@
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg== integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==
"@walletconnect/universal-provider@2.7.8": "@walletconnect/universal-provider@2.8.0":
version "2.7.8" version "2.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.7.8.tgz#f7ba6830aeb19fc094f63f6c2fe7f3b04499c88d" resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.8.0.tgz#134f6873742f672c2424969335f9cc75d1532d17"
integrity sha512-T/0U1o6uewyz2KUQF3Gt57RtuYFKJhJHwH3m4sSTKeEwwzsU83+M/D2v5Pa6Vhy2ynzkKB84pRG9mwm1oaQbLQ== integrity sha512-BMsGiINI3rT7DRyDJM7miuWG6vDVE0PV6zMcCXIMDYYPay7zFvJxv2VHEx9an4MutrvQR76NTRyG//i1K84VOQ==
dependencies: dependencies:
"@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-http-connection" "^1.0.7"
"@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-provider" "1.0.13"
"@walletconnect/jsonrpc-types" "^1.0.2" "@walletconnect/jsonrpc-types" "^1.0.2"
"@walletconnect/jsonrpc-utils" "^1.0.7" "@walletconnect/jsonrpc-utils" "^1.0.7"
"@walletconnect/logger" "^2.0.1" "@walletconnect/logger" "^2.0.1"
"@walletconnect/sign-client" "2.7.8" "@walletconnect/sign-client" "2.8.0"
"@walletconnect/types" "2.7.8" "@walletconnect/types" "2.8.0"
"@walletconnect/utils" "2.7.8" "@walletconnect/utils" "2.8.0"
eip1193-provider "1.0.1" eip1193-provider "1.0.1"
events "^3.3.0" events "^3.3.0"
"@walletconnect/utils@2.7.8": "@walletconnect/utils@2.8.0":
version "2.7.8" version "2.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.7.8.tgz#494647eb5ed1fa30363c6a127e1a76356e2780a5" resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.8.0.tgz#c219e78fd2c35062cf3e37f84961afde8da9b9a1"
integrity sha512-W3GudJNZUlSdKJ7fyMqeDoM02Ffd7jmK6mxxmRGkxF6mf9ciIxEPDWl18JGkanp+EDK06PXLm4/64fraLkbJVQ== integrity sha512-Q8OwMtUevIn1+64LXyTMLlhH58k3UOAjU5b3smYZ7CEEmwEGpOTfTDAWrB3v+ZDIhjyqP94+8fuvKIbcVLKLWA==
dependencies: dependencies:
"@stablelib/chacha20poly1305" "1.0.1" "@stablelib/chacha20poly1305" "1.0.1"
"@stablelib/hkdf" "1.0.1" "@stablelib/hkdf" "1.0.1"
@ -6479,7 +6487,7 @@
"@walletconnect/relay-api" "^1.0.9" "@walletconnect/relay-api" "^1.0.9"
"@walletconnect/safe-json" "^1.0.2" "@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2" "@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.7.8" "@walletconnect/types" "2.8.0"
"@walletconnect/window-getters" "^1.0.1" "@walletconnect/window-getters" "^1.0.1"
"@walletconnect/window-metadata" "^1.0.1" "@walletconnect/window-metadata" "^1.0.1"
detect-browser "5.3.0" detect-browser "5.3.0"
@ -6608,14 +6616,14 @@
"@ethersproject/providers" "^5" "@ethersproject/providers" "^5"
"@web3-react/types" "^8.2.0" "@web3-react/types" "^8.2.0"
"@web3-react/walletconnect-v2@8.3.2": "@web3-react/walletconnect-v2@^8.3.3":
version "8.3.2" version "8.3.3"
resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-v2/-/walletconnect-v2-8.3.2.tgz#898aa2eaf68ae69ae32c0700922308c3b297336b" resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-v2/-/walletconnect-v2-8.3.3.tgz#c5c7be5f7717e273d8b113351b16f44e424f542f"
integrity sha512-QmSBHWNkdCxzl9GXe1lL7IJ2gB9QHdnJEB9LEgid1oZh6n00LxY92QAl0ouwWkkDmDFLxQiec2qNgYcLuU5oow== integrity sha512-qSLlfen4xnFLkMnZXbzsxtXIFRuM/6ASMcyOyUg6SVE1vfbTAWjeitSbyhgd1keVlVz5Uu8aeui2TemMKmQvtw==
dependencies: dependencies:
"@walletconnect/ethereum-provider" "^2.7.8" "@walletconnect/ethereum-provider" "^2.8.0"
"@walletconnect/modal" "^2.4.5"
"@web3-react/types" "^8.2.0" "@web3-react/types" "^8.2.0"
"@web3modal/standalone" "^2.4.3"
eventemitter3 "^4.0.7" eventemitter3 "^4.0.7"
"@web3-react/walletconnect@^8.2.0": "@web3-react/walletconnect@^8.2.0":
@ -6627,28 +6635,20 @@
"@web3-react/types" "^8.2.0" "@web3-react/types" "^8.2.0"
eventemitter3 "^4.0.7" eventemitter3 "^4.0.7"
"@web3modal/core@2.4.3": "@web3modal/core@2.4.5":
version "2.4.3" version "2.4.5"
resolved "https://registry.yarnpkg.com/@web3modal/core/-/core-2.4.3.tgz#ea6d3911e52a132c70defb7584f869d09a8af974" resolved "https://registry.yarnpkg.com/@web3modal/core/-/core-2.4.5.tgz#506161e37b8431fc8d605aed7a73d93e3f8ee7b4"
integrity sha512-7Z/sDe9RIYQ2k9ITcxgEa/u7FvlI76vcVVZn9UY4ISivefqrH4JAS3GX4JmVNUUlovwuiZdyqBv4llAQOMK6Rg== integrity sha512-iulOIW2irVaq+xWTzzM2xbRI4TCR0yTnV2Yz+ifIFl+r3OF3ZOC1jsy4jJnKL7/6e7p4NmmKJk0/w951KzCF5g==
dependencies: dependencies:
buffer "6.0.3" buffer "6.0.3"
valtio "1.10.5" valtio "1.10.5"
"@web3modal/standalone@^2.4.3": "@web3modal/ui@2.4.5":
version "2.4.3" version "2.4.5"
resolved "https://registry.yarnpkg.com/@web3modal/standalone/-/standalone-2.4.3.tgz#98aaa65eba725c34d5be9078ef04b4e9b769d0f3" resolved "https://registry.yarnpkg.com/@web3modal/ui/-/ui-2.4.5.tgz#bd388faeafd9abf72abffc85613b3d7038adcf14"
integrity sha512-5ATXBoa4GGm+TIUSsKWsfWCJunv1XevOizpgTFhqyeGgRDmWhqsz9UIPzH/1mk+g0iJ/xqMKs5F6v9D2QeKxag== integrity sha512-LvGjGL7vyQrUrrQOtFAK0SyxJs1yozOnJjP7s7gWXJa7wFWCE+kVjrhE8VrKbwx7nHe78IFA1rs7V1ncCirqVQ==
dependencies: dependencies:
"@web3modal/core" "2.4.3" "@web3modal/core" "2.4.5"
"@web3modal/ui" "2.4.3"
"@web3modal/ui@2.4.3":
version "2.4.3"
resolved "https://registry.yarnpkg.com/@web3modal/ui/-/ui-2.4.3.tgz#986c6bed528dccab679c734ff531e42f6605c5b2"
integrity sha512-J989p8CdtEhI9gZHf/rZ/WFqYlrAHWw9GmAhFoiNODwjAp0BoG/uoaPiijJMchXdngihZOjLGCQwDXU16DHiKg==
dependencies:
"@web3modal/core" "2.4.3"
lit "2.7.5" lit "2.7.5"
motion "10.16.2" motion "10.16.2"
qrcode "1.5.3" qrcode "1.5.3"