Fix walletconnect issues

jmrossy · jmrossy · commit ac051ab859a1 · 2021-09-24T15:40:43.000-04:00
diff --git a/electron/main.js b/electron/main.js
@@ -67,7 +67,7 @@ function setCspHeader() {
         ...details.responseHeaders,
         // Should match header in /netlify/_headers and build.sh
         'Content-Security-Policy': [
-          "default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org https://api.github.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; base-uri 'self'; form-action 'self'",
+          "default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org wss://relay.walletconnect.org https://api.github.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; base-uri 'self'; form-action 'self'",
         ],
       },
     })
diff --git a/netlify/_headers b/netlify/_headers
@@ -1,6 +1,6 @@
 # Configure Netlify custom headers
 # CSP header should match electron copy in /electron/main.js
 /*
-  Content-Security-Policy: default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; base-uri 'self'; form-action 'self'
+  Content-Security-Policy: default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org wss://relay.walletconnect.org; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; base-uri 'self'; form-action 'self'
   X-Frame-Options: DENY
   X-Content-Type-Options: nosniff
diff --git a/src/features/walletConnect/walletConnect.ts b/src/features/walletConnect/walletConnect.ts
@@ -43,7 +43,14 @@ const APP_METADATA = {
 }
 
 // alfajores, mainnet, baklava
-const SUPPORTED_CHAINS = ['celo:44787', 'celo:42220', 'celo:62320']
+const SUPPORTED_CHAINS = [
+  'celo:44787',
+  'celo:42220',
+  'celo:62320',
+  'eip155:44787',
+  'eip155:42220',
+  'eip155:62320',
+]
 
 const SESSION_INIT_TIMEOUT = 15000 // 15 seconds
 const SESSION_PROPOSAL_TIMEOUT = 180000 // 3 minutes
@@ -243,7 +250,7 @@ function approveClientSession(
 
   const response: ClientTypes.ResponseInput = {
     state: {
-      accounts: [`${account}@celo:${config.chainId}`],
+      accounts: [`celo:${config.chainId}:${account}`],
     },
     metadata: APP_METADATA,
   }
diff --git a/src/index.html b/src/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org https://api.github.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; base-uri 'self'; form-action 'self'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org wss://relay.walletconnect.org https://api.github.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; base-uri 'self'; form-action 'self'">
     <title>Celo Wallet | Use Celo on the web or on your desktop</title>
 
     <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png" />
diff --git a/webpack.config.js b/webpack.config.js
@@ -26,6 +26,7 @@ const config = {
   },
   externals: {
     'node-hid': 'commonjs node-hid',
+    ws: 'ws', // Exclude WS to work around walletconnect client bundling issue
   },
   // https://github.com/webpack/webpack-dev-server/issues/2758
   // TODO remove when fixed, should be in v4 upgrade
