Skip to content

I
interface
Commit 1304acd8 authored by Moody Salem's avatar Moody Salem Committed by GitHub
Browse files
Options

fix: walletconnect on L2 issues with Rainbow (#2242) 

* fix: remove the walletconnect bridge url

* fix: use the latest ethereum provider which fixes the optimism rainbow issue
parent 8112e48e
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 67 deletions
.env
View file @ 1304acd8
REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847" REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
REACT_APP_WALLETCONNECT_BRIDGE_URL="https://uniswap.bridge.walletconnect.org"
package.json
View file @ 1304acd8
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"workbox-strategies": "^6.1.0" "workbox-strategies": "^6.1.0"
}, },
"resolutions": { "resolutions": {
"@walletconnect/ethereum-provider": "1.6.2" "@walletconnect/ethereum-provider": "1.6.4"
}, },
"scripts": { "scripts": {
"compile-contract-types": "yarn compile-external-abi-types && yarn compile-v3-contract-types", "compile-contract-types": "yarn compile-external-abi-types && yarn compile-v3-contract-types",
......
src/connectors/index.ts
View file @ 1304acd8
...@@ -13,7 +13,6 @@ import { NetworkConnector } from './NetworkConnector' ...@@ -13,7 +13,6 @@ import { NetworkConnector } from './NetworkConnector'
const INFURA_KEY = process.env.REACT_APP_INFURA_KEY const INFURA_KEY = process.env.REACT_APP_INFURA_KEY
const FORMATIC_KEY = process.env.REACT_APP_FORTMATIC_KEY const FORMATIC_KEY = process.env.REACT_APP_FORTMATIC_KEY
const PORTIS_ID = process.env.REACT_APP_PORTIS_ID const PORTIS_ID = process.env.REACT_APP_PORTIS_ID
const WALLETCONNECT_BRIDGE_URL = process.env.REACT_APP_WALLETCONNECT_BRIDGE_URL
if (typeof INFURA_KEY === 'undefined') { if (typeof INFURA_KEY === 'undefined') {
throw new Error(`REACT_APP_INFURA_KEY must be a defined environment variable`) throw new Error(`REACT_APP_INFURA_KEY must be a defined environment variable`)
...@@ -50,7 +49,6 @@ export const gnosisSafe = new SafeAppConnector() ...@@ -50,7 +49,6 @@ export const gnosisSafe = new SafeAppConnector()
export const walletconnect = new WalletConnectConnector({ export const walletconnect = new WalletConnectConnector({
supportedChainIds: ALL_SUPPORTED_CHAIN_IDS, supportedChainIds: ALL_SUPPORTED_CHAIN_IDS,
rpc: NETWORK_URLS, rpc: NETWORK_URLS,
bridge: WALLETCONNECT_BRIDGE_URL,
qrcode: true, qrcode: true,
}) })
......
yarn.lock
View file @ 1304acd8
...@@ -4444,35 +4444,35 @@ ...@@ -4444,35 +4444,35 @@
tiny-invariant "^1.1.0" tiny-invariant "^1.1.0"
tiny-warning "^1.0.3" tiny-warning "^1.0.3"
"@walletconnect/browser-utils@^1.6.2": "@walletconnect/browser-utils@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.6.2.tgz#f86312d712f43e9a3688b58eea16fd792c840702" resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.6.4.tgz#9a489aa680370c7071e603b02c5c94298d1c5d41"
integrity sha512-8+Yc9iXe2VD7C5I2iZjXKBvzTqDBse7yC9PrCWFJdUYW2rInk7BSqw/9NFhBk41sPonm2dklzwaMJApoW7V5bw== integrity sha512-pvUVr53Ydt+dvPLLd8HaEW3V/87y8VaHYQLOo59ULQ7s6sezIm6Be6Xws3d5wkV54UiXd9ZzGYPugZfQR1CUqg==
dependencies: dependencies:
"@walletconnect/safe-json" "1.0.0" "@walletconnect/safe-json" "1.0.0"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
"@walletconnect/window-getters" "1.0.0" "@walletconnect/window-getters" "1.0.0"
"@walletconnect/window-metadata" "1.0.0" "@walletconnect/window-metadata" "1.0.0"
detect-browser "5.2.0" detect-browser "5.2.0"
"@walletconnect/client@^1.6.2": "@walletconnect/client@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.6.2.tgz#bbb2511ee44311c8a82d63382c2d30204a05ae7d" resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.6.4.tgz#6121081b8ad419ec36cfeae34f43d44a6b750440"
integrity sha512-ETeYAczgES2jlo5FuZyAfJmrRX38S7uy48zy89C7Rr4P0ZUy4fHXpnHGy0k7vI1tgikQXXQ0dv7DoLOST3V3Fg== integrity sha512-DcycY6PS2/Ejehtero43PSxdGz+kVoRZnQRVGVerwuY2khzggcvQgZ5pFIkYMgBJ6T6XUsjVPFEgd4qdNS4YGw==
dependencies: dependencies:
"@walletconnect/core" "^1.6.2" "@walletconnect/core" "^1.6.4"
"@walletconnect/iso-crypto" "^1.6.2" "@walletconnect/iso-crypto" "^1.6.4"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
"@walletconnect/utils" "^1.6.2" "@walletconnect/utils" "^1.6.4"
"@walletconnect/core@^1.6.2": "@walletconnect/core@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.6.2.tgz#5ac59d7c882fd8a95f3286346667e9b6c558a448" resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-1.6.4.tgz#cdfbcd8958fa73d4cfcf67580384c0725f0d9653"
integrity sha512-XQLcHXVA2SWFnwQz6y8AAhRV2P2q7qoWfhz9vV1ZJgKJ3i8mi9Dp9zZsYRKDl+T5bRpGpdxv/PZ3JpQvr1IDgQ== integrity sha512-vnpWSo6N3Jnb4KxMjAqko2h4zjCVHpVg4IzA0oFL8IRVEy4+6TVoZQUep3W1FVcogWm80+krmo8NvAI7Rk4/8Q==
dependencies: dependencies:
"@walletconnect/socket-transport" "^1.6.2" "@walletconnect/socket-transport" "^1.6.4"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
"@walletconnect/utils" "^1.6.2" "@walletconnect/utils" "^1.6.4"
"@walletconnect/crypto@^1.0.1": "@walletconnect/crypto@^1.0.1":
version "1.0.1" version "1.0.1"
...@@ -4498,28 +4498,28 @@ ...@@ -4498,28 +4498,28 @@
resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034" resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034"
integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ== integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ==
"@walletconnect/ethereum-provider@1.6.2", "@walletconnect/ethereum-provider@^1.5.4": "@walletconnect/ethereum-provider@1.6.4", "@walletconnect/ethereum-provider@^1.5.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-1.6.2.tgz#603227a4a06a949386fca3f9e16d6e19d1033dad" resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-1.6.4.tgz#ffe3fee5aab7d0d7f02da2d31e7125e82de1ab53"
integrity sha512-BhBjbz7Scw3WxDcyvbPjsB9GUeV00aCOTCwjlTKdywTNhxy6RFPdmWE0npbMTp011BiFzWkKIionEqQrKYvDcg== integrity sha512-QhrBcAv/XJKz+UGRChjOl/SSJfbf0+QL86KjHzPufSTIGazusjNRtXc60QdFMy3Nh5u3xLODUbjXeSYIUR9UHQ==
dependencies: dependencies:
"@walletconnect/client" "^1.6.2" "@walletconnect/client" "^1.6.4"
"@walletconnect/jsonrpc-http-connection" "^1.0.0" "@walletconnect/jsonrpc-http-connection" "^1.0.0"
"@walletconnect/jsonrpc-provider" "^1.0.0" "@walletconnect/jsonrpc-provider" "^1.0.0"
"@walletconnect/signer-connection" "^1.6.2" "@walletconnect/signer-connection" "^1.6.4"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
"@walletconnect/utils" "^1.6.2" "@walletconnect/utils" "^1.6.4"
eip1193-provider "1.0.1" eip1193-provider "1.0.1"
eventemitter3 "4.0.7" eventemitter3 "4.0.7"
"@walletconnect/iso-crypto@^1.6.2": "@walletconnect/iso-crypto@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.6.2.tgz#39cfc1143e29805d3137ac3402f981d4200dc505" resolved "https://registry.yarnpkg.com/@walletconnect/iso-crypto/-/iso-crypto-1.6.4.tgz#608a4dd6bcf561b1e9eafc198030c7701240bc16"
integrity sha512-hznvNn3FojyRNrA5QWfkK5kyzlVbeE8gFZ7hETtSPpt24xjPi0WYo9yPxMJuMBXw2hbwSRVPkxjR354D4miZmQ== integrity sha512-DQ+he/bLUHMMcQvTrD1VA9yYfZ/M1GwIyldPDXRbA3MaMNTOLBNjISjeW26391fsTxFuKx8JGiRL8ipWG0uNdg==
dependencies: dependencies:
"@walletconnect/crypto" "^1.0.1" "@walletconnect/crypto" "^1.0.1"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
"@walletconnect/utils" "^1.6.2" "@walletconnect/utils" "^1.6.4"
"@walletconnect/jsonrpc-http-connection@^1.0.0": "@walletconnect/jsonrpc-http-connection@^1.0.0":
version "1.0.0" version "1.0.0"
...@@ -4558,14 +4558,14 @@ ...@@ -4558,14 +4558,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/qrcode-modal@^1.6.2": "@walletconnect/qrcode-modal@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.6.2.tgz#a5e8c5c19c177322cd22dba462ae9253df06057e" resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.6.4.tgz#1c2f657940a93c4c5dd0beffe6df7368a4e11ebf"
integrity sha512-+d1SsUvLzFUWY60X+OKumejzQj1BYkZGPdIHNlm2sjsDhsGTMrID7fVL+FlHq/I63bT/9Bsv08dt7FeG7y+p/Q== integrity sha512-AaqFi3gN0biZ+gPTQVXttBujiXNPmBQdFOFM2YSRlyyPf9LsnZFb9OhMP70U2fcEjLvmxPVPN/IxGeS10WH0kQ==
dependencies: dependencies:
"@walletconnect/browser-utils" "^1.6.2" "@walletconnect/browser-utils" "^1.6.4"
"@walletconnect/mobile-registry" "^1.4.0" "@walletconnect/mobile-registry" "^1.4.0"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
copy-to-clipboard "^3.3.1" copy-to-clipboard "^3.3.1"
preact "10.4.1" preact "10.4.1"
qrcode "1.4.4" qrcode "1.4.4"
...@@ -4584,41 +4584,41 @@ ...@@ -4584,41 +4584,41 @@
resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2" resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.0.tgz#12eeb11d43795199c045fafde97e3c91646683b2"
integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg== integrity sha512-QJzp/S/86sUAgWY6eh5MKYmSfZaRpIlmCJdi5uG4DJlKkZrHEF7ye7gA+VtbVzvTtpM/gRwO2plQuiooIeXjfg==
"@walletconnect/signer-connection@^1.6.2": "@walletconnect/signer-connection@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/signer-connection/-/signer-connection-1.6.2.tgz#ea0d10606c800ece06a0822425b70fa987f33361" resolved "https://registry.yarnpkg.com/@walletconnect/signer-connection/-/signer-connection-1.6.4.tgz#c26c91eb10a8333d3899fae4854fd453301c3d22"
integrity sha512-eXruIQuR4wWdlnyJWc2RQjRSYCG8h0Z1CiAv+zl062zn05TLPg/sgczhS0FgScchr2f1JEAO3COI8i1My2oq1A== integrity sha512-Ghd/srkbf5A5txLIKBEs8WA9+7t/rbUrfTRffA6RnDyfC0UxOrApbOKAtlG0l/s4zDL70IdX/GP5GjBsMGmX+g==
dependencies: dependencies:
"@walletconnect/client" "^1.6.2" "@walletconnect/client" "^1.6.4"
"@walletconnect/jsonrpc-types" "^1.0.0" "@walletconnect/jsonrpc-types" "^1.0.0"
"@walletconnect/jsonrpc-utils" "^1.0.0" "@walletconnect/jsonrpc-utils" "^1.0.0"
"@walletconnect/qrcode-modal" "^1.6.2" "@walletconnect/qrcode-modal" "^1.6.4"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
eventemitter3 "4.0.7" eventemitter3 "4.0.7"
"@walletconnect/socket-transport@^1.6.2": "@walletconnect/socket-transport@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.6.2.tgz#0667abc12cfe619199ee9ce84efd58c2827b1df4" resolved "https://registry.yarnpkg.com/@walletconnect/socket-transport/-/socket-transport-1.6.4.tgz#397ea4984c85ffe9fb4b9d7625837654a9b9843c"
integrity sha512-G07Iqt2WkkqS8Q5M+ERNjeUV1A2MEBpiYOn6H9xmv7dkoXWQbTxd4qJbIgP3jAcVX0yYyLaf/gSFWFg7tpp8dw== integrity sha512-33xb3ncAGBUWzNhbGQw13NpgW8sQZPlANNgVdqpTfgtpsfRuohD6UipBsXjEosrg/mmFk4l36PXX0l2kgozChw==
dependencies: dependencies:
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
"@walletconnect/utils" "^1.6.2" "@walletconnect/utils" "^1.6.4"
ws "7.5.3" ws "7.5.3"
"@walletconnect/types@^1.6.2": "@walletconnect/types@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.6.2.tgz#81b0a7dfa3b5cab9240530667e19439663e99d6f" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.6.4.tgz#7bcde39da7d647fcd40aac62bd45fab3f9d1a483"
integrity sha512-21jvvnUcbdcH6cSe/8B/KoeU+foNbvNsBOYY3AWW0LMuD/N5CnGZHGYcbEq0R0z7Gj4lp9IFvDIBLM7WaG1IiQ== integrity sha512-qxzdDe2LX7WSxUXjRzFWK8ueusN0GfIPphGDGoObO/oAQqzRRRBXUW5sKhWtAqbgk2Y52Zk/rPt50pOO6qQggg==
"@walletconnect/utils@^1.6.2": "@walletconnect/utils@^1.6.4":
version "1.6.2" version "1.6.4"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.6.2.tgz#b8313dcb09ed8edb5d55bd332caec590a8684955" resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-1.6.4.tgz#e9cb463a3b45800e848742198b9c5bc943e79293"
integrity sha512-/J5xO0qzGYw/gwpIYZ72ml0TASGClRJ/siFG+5QDghXvRgQKYiQKPq7nBDbtcUd3pjbuGKTOeTLm01S4urGvTQ== integrity sha512-PClc40tqwCc6pZBdrJGsOPD9gFZ0F4JcREJ1hg2d5DGqCTkmRKME4WmFkt8MULmyrF1PZkyxgVnS+8cxannnLw==
dependencies: dependencies:
"@walletconnect/browser-utils" "^1.6.2" "@walletconnect/browser-utils" "^1.6.4"
"@walletconnect/encoding" "^1.0.0" "@walletconnect/encoding" "^1.0.0"
"@walletconnect/jsonrpc-utils" "^1.0.0" "@walletconnect/jsonrpc-utils" "^1.0.0"
"@walletconnect/types" "^1.6.2" "@walletconnect/types" "^1.6.4"
bn.js "4.11.8" bn.js "4.11.8"
js-sha3 "0.8.0" js-sha3 "0.8.0"
query-string "6.13.5" query-string "6.13.5"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment