Merge pull request #79 from celo-tools/1.4.0

v1.4.0 - WalletConnect v1, cREAL, tokenlist, chart fixes

Author: jmrossy

FAQ.md

@@ -55,4 +55,4 @@ Note though that currently not all transactions can be parsed by the Celo Ledger
 
 ## Can feature X be added?
 
-Maybe, let's chat about it! Please see the [wallet Discord channel](https://discord.com/channels/600834479145353243/783806028629934110) for open discussion.
+Maybe, let's chat about it! Please see the [wallet Discord channel](https://discord.gg/ht885KmG5A) for open discussion.

README.md

@@ -14,9 +14,10 @@ See the [FAQ](FAQ.md) for more details about common questions.
 
 This wallet uses [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity). Current bundle hashes:
 
-* Main bundle: `bundle.js -> sha256-x9oGHUxFMH+grTV/yqpWYsWnVdmD00PPolTahdB4sUE=`
-* Optional Ledger bundle: `bundle-ledger.js -> sha256-ahGOG1h2KTAtylviHC6GYqCX9Pa2NUleoytU5knhB6E=`
-* Optional WalletConnect bundle: `bundle-walletconnect.js -> sha256-eGLzdWvYcl/9NmhqTvc7j8/jhWAwauOnaGL4wNMs44w=`
+* Main bundle: `bundle.js -> sha256-kVZnRwd7Qa095vApngR7IxDK53ZSFJB86RzMYRpfPSU=`
+* Optional Ledger bundle: `bundle-ledger.js -> sha256-pNndh3uDU7f3K3e4nu05OXTE3Bx3WRMeVtr95liXJTE=`
+* Optional WalletConnect v1 bundle: `bundle-walletconnectv1.js -> sha256-PImYY1hPF519ZjZx2Pei7QsZ7kJyMpdtJgRKHT52ekg=`
+* Optional WalletConnect v2 bundle: `bundle-walletconnectv2.js -> sha256-UHsf1l/tWhpHJk2NMbCH1l372Pm8JoGxLLQqCLnNaLI=`
 
 Advanced users can verify the source integrity by comparing the hashes in their page source to these values.
 
@@ -47,7 +48,7 @@ yarn electron:dev
 ## Contributing
 
 For small contributions such as bug fixes or style tweaks, please open a Pull Request.
-For new features, please create an issue to start a discussion on [Discord](https://discord.com/channels/600834479145353243/812471799585439794).
+For new features, please create an issue to start a discussion on [Discord](https://discord.gg/ht885KmG5A).
 
 ## License
 

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 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'",
+          "default-src 'self'; script-src 'self' 'sha256-a0xx6QQjQFEl3BVHxY4soTXMFurPf9rWKnRLQLOkzg4='; connect-src 'self' https://*.celowallet.app https://*.celo.org wss://walletconnect.celo.org wss://*.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'",
         ],
       },
     })

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 wss://relay.walletconnect.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://*.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

package-electron.json

@@ -1,6 +1,6 @@
 {
   "name": "celo-web-wallet",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "description": "A lightweight web and desktop wallet for the Celo network",
   "main": "main.js",
   "keywords": [
@@ -15,7 +15,7 @@
   "homepage": "https://celowallet.app",
   "license": "MIT",
   "dependencies": {
-    "electron-updater": "^4.3.9",
+    "electron-updater": "^4.6.1",
     "@ledgerhq/hw-transport-node-hid-noevents": "^5.51.1"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "celo-web-wallet",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "description": "A lightweight web and desktop wallet for the Celo network",
   "keywords": [
     "Celo",
@@ -20,7 +20,7 @@
     "build:staging": "./scripts/build.sh -n Alfajores",
     "build:prod": "./scripts/build.sh -n Mainnet",
     "clean": "rm -rf dist dist-electron",
-    "lint": "eslint src/**/*.ts src/**/*.tsx",
+    "lint": "eslint src",
     "test": "NODE_ENV=test jasmine",
     "electron:postinstall": "electron-builder install-app-deps",
     "electron:build": "./scripts/build.sh -n Mainnet -e",
@@ -29,73 +29,79 @@
     "electron:prod": "yarn electron:build && DEBUG=electron-builder electron-builder --publish never"
   },
   "dependencies": {
-    "@celo-tools/celo-ethers-wrapper": "^0.0.5",
-    "@emotion/react": "^11.4.1",
+    "@celo-tools/celo-ethers-wrapper": "^0.1.0",
+    "@emotion/react": "^11.7.0",
     "@ledgerhq/hw-app-eth": "^5.51.1",
     "@ledgerhq/hw-transport-node-hid-noevents": "^5.51.1",
     "@ledgerhq/hw-transport-u2f": "5.36.0-deprecated",
     "@ledgerhq/hw-transport-webhid": "^5.51.1",
     "@ledgerhq/hw-transport-webusb": "^5.51.1",
     "@metamask/jazzicon": "https://github.com/jmrossy/jazzicon#7a8df28",
-    "@reduxjs/toolkit": "^1.6.1",
-    "@walletconnect/client": "2.0.0-beta.19",
+    "@reduxjs/toolkit": "^1.6.2",
     "buffer": "^6.0.3",
-    "electron-updater": "^4.3.9",
-    "ethers": "^5.3.0",
+    "electron-updater": "^4.6.1",
+    "ethers": "^5.5.1",
     "frappe-charts": "^1.6.2",
-    "history": "^5.0.1",
-    "idb-keyval": "^6.0.1",
+    "history": "^5.1.0",
+    "idb-keyval": "^6.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-redux": "^7.2.5",
-    "react-router": "^6.0.0-beta.4",
-    "react-router-dom": "^6.0.0-beta.4",
+    "react-redux": "^7.2.6",
+    "react-router": "^6.0.2",
+    "react-router-dom": "^6.0.2",
     "react-window": "^1.8.6",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
-    "typed-redux-saga": "^1.3.1"
+    "typed-redux-saga": "^1.3.1",
+    "wcv1/client": "npm:@walletconnect/client@1.6.6",
+    "wcv2/client": "npm:@walletconnect/client@2.0.0-beta.20.3",
+    "wcv2/types": "npm:@walletconnect/types@2.0.0-beta.20.3",
+    "wcv2/utils": "npm:@walletconnect/utils@2.0.0-beta.20.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.6",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.15.0",
-    "@babel/register": "^7.15.3",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-react": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.0",
+    "@babel/register": "^7.16.0",
     "@emotion/babel-plugin": "^11.3.0",
-    "@testing-library/react": "^12.1.0",
-    "@types/jasmine": "^3.9.1",
-    "@types/react": "^17.0.21",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-redux": "^7.1.18",
+    "@types/jasmine": "^3.10.2",
+    "@types/react": "^17.0.37",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-redux": "^7.1.20",
     "@types/react-window": "^1.8.5",
     "@types/redux-mock-store": "^1.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.31.1",
-    "@typescript-eslint/parser": "^4.31.1",
-    "babel-loader": "^8.2.2",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "babel-loader": "^8.2.3",
     "babel-plugin-module-name-mapper": "^1.2.0",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^6.2.0",
-    "electron": "^14.0.1",
-    "electron-builder": "^22.11.7",
+    "copy-webpack-plugin": "^10.0.0",
+    "css-loader": "^6.5.1",
+    "electron": "^16.0.2",
+    "electron-builder": "^22.14.5",
     "electron-notarize": "^1.1.1",
-    "eslint": "^7.32.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-react": "^7.25.1",
-    "jasmine": "^3.9.0",
-    "jsdom": "^17.0.0",
-    "node-fetch": "^2.6.5",
-    "prettier": "^2.4.1",
+    "eslint": "^8.3.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-react": "^7.27.1",
+    "eslint-webpack-plugin": "^3.1.1",
+    "jasmine": "^3.10.0",
+    "node-fetch": "^2.6.6",
+    "prettier": "^2.5.0",
     "redux-mock-store": "^1.5.4",
-    "style-loader": "^3.2.1",
-    "ts-loader": "^9.2.5",
-    "typescript": "^4.4.3",
-    "webpack": "^5.53.0",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.2.1"
+    "style-loader": "^3.3.1",
+    "ts-loader": "^9.2.6",
+    "typescript": "^4.5.2",
+    "webpack": "^5.64.4",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.6.0"
   },
   "resolutions": {
-    "pbkdf2": "^3.1.2"
+    "pbkdf2": "^3.1.2",
+    "wcv2/client": "npm:@walletconnect/client@2.0.0-beta.20.3",
+    "wcv2/types": "npm:@walletconnect/types@2.0.0-beta.20.3",
+    "wcv2/utils": "npm:@walletconnect/utils@2.0.0-beta.20.3",
+    "wcv2/**/@walletconnect/types": "npm:@walletconnect/types@2.0.0-beta.20.3",
+    "wcv2/**/@walletconnect/utils": "npm:@walletconnect/utils@2.0.0-beta.20.3"
   }
 }

scripts/build.sh

@@ -42,8 +42,10 @@ export BUNDLE_HASH=`shasum -b -a 256 dist/bundle.js | awk '{ print $1 }' | xxd -
 echo "Bundle hash ${BUNDLE_HASH}"
 export LEDGER_BUNDLE_HASH=`shasum -b -a 256 dist/bundle-ledger.js | awk '{ print $1 }' | xxd -r -p | base64`
 echo "Ledger bundle hash ${LEDGER_BUNDLE_HASH}"
-export WC_BUNDLE_HASH=`shasum -b -a 256 dist/bundle-walletconnect.js | awk '{ print $1 }' | xxd -r -p | base64`
-echo "WalletConnect bundle hash ${WC_BUNDLE_HASH}"
+export WC1_BUNDLE_HASH=`shasum -b -a 256 dist/bundle-walletconnectv1.js | awk '{ print $1 }' | xxd -r -p | base64`
+echo "WalletConnect v1 bundle hash ${WC1_BUNDLE_HASH}"
+export WC2_BUNDLE_HASH=`shasum -b -a 256 dist/bundle-walletconnectv2.js | awk '{ print $1 }' | xxd -r -p | base64`
+echo "WalletConnect v2 bundle hash ${WC2_BUNDLE_HASH}"
 
 echo "Updating index.html bundle hash"
 xplat_sed "s|sha256-%BUNDLE_HASH%|sha256-${BUNDLE_HASH}|g" dist/index.html
@@ -56,7 +58,8 @@ if [ "$ELECTRON" = false ]; then
   echo "Updating Readme"
   xplat_sed "s|bundle.js -> sha256-.*\`|bundle.js -> sha256-${BUNDLE_HASH}\`|g" README.md
   xplat_sed "s|bundle-ledger.js -> sha256-.*\`|bundle-ledger.js -> sha256-${LEDGER_BUNDLE_HASH}\`|g" README.md
-  xplat_sed "s|bundle-walletconnect.js -> sha256-.*\`|bundle-walletconnect.js -> sha256-${WC_BUNDLE_HASH}\`|g" README.md
+  xplat_sed "s|bundle-walletconnectv1.js -> sha256-.*\`|bundle-walletconnectv1.js -> sha256-${WC1_BUNDLE_HASH}\`|g" README.md
+  xplat_sed "s|bundle-walletconnectv2.js -> sha256-.*\`|bundle-walletconnectv2.js -> sha256-${WC2_BUNDLE_HASH}\`|g" README.md
 else
   echo "Prepping index.html for electron" 
   # Trim title down 

spec/helpers/global.js

@@ -2,3 +2,18 @@ global.__DEBUG__ = true
 global.__IS_ELECTRON__ = false
 global.__VERSION__ = '1.0.0'
 global.fetch = require('node-fetch')
+
+var localStorage = {}
+localStorage.setItem = function (key, val) {
+  this[key] = val + ''
+}
+localStorage.getItem = function (key) {
+  return this[key]
+}
+Object.defineProperty(localStorage, 'length', {
+  get: function () {
+    return Object.keys(this).length - 2
+  },
+})
+global.localStorage = localStorage
+global.navigator = {}

spec/helpers/jsdom.js

@@ -48,6 +48,7 @@ function getContractAbi(c: CeloContract) {
       return EscrowAbi
     case CeloContract.Exchange:
     case CeloContract.ExchangeEUR:
+    case CeloContract.ExchangeBRL:
       return ExchangeAbi
     case CeloContract.GoldToken:
       return GoldTokenAbi
@@ -59,6 +60,7 @@ function getContractAbi(c: CeloContract) {
       return SortedOraclesAbi
     case CeloContract.StableToken:
     case CeloContract.StableTokenEUR:
+    case CeloContract.StableTokenBRL:
       return StableTokenAbi
     case CeloContract.Validators:
       return ValidatorsAbi