Merge pull request #114 from celo-tools/1.8.0

v1.8.0

.github/workflows/bundle-desktop.yml

@@ -12,8 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # os: [macos-latest, windows-latest, ubuntu-latest]
-        os: [windows-2019, ubuntu-latest]
+        os: [macos-11, windows-2019, ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,11 +21,8 @@ jobs:
           node-version: '14'
           check-latest: true
 
-      - name: Adjust yarn timeout
-        run: yarn config set network-timeout 1800000 -g
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --immutable
 
       - name: Run linter
         run:  yarn lint
@@ -43,21 +39,20 @@ jobs:
           ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
           WALLET_CONNECT_KEY: ${{ secrets.WALLET_CONNECT_KEY }}
 
-      # Mac builds on Github are very flaky, disabling for now as they're easy to make locally anyway
-      # - name: Build on Mac
-      #   run: yarn electron-builder --mac --publish never
-      #   env:
-      #     CSC_LINK: ${{ secrets.MAC_CSC_LINK2 }}
-      #     CSC_KEY_PASSWORD: ${{ secrets.MAC_CSC_KEY_PASSWORD }}
-      #     DISABLE_MULTIPART_DOWNLOADING: true
-      #   if: runner.os == 'macOS'
+      - name: Build on Mac
+        run: yarn electron-builder --mac --publish never
+        env:
+          CSC_LINK: ${{ secrets.MAC_CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.MAC_CSC_KEY_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+        if: runner.os == 'macOS'
 
       - name: Build on Windows
-        run: yarn electron-builder --win --publish never || yarn electron-builder --win --publish never
-        env:
-          # CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK2 }}
+        run: yarn electron-builder --win --publish never
+        # env:
+          # CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
           # CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
-          DISABLE_MULTIPART_DOWNLOADING: true
         if: runner.os == 'Windows'
 
       - name: Install deps for Linux

.github/workflows/publish-desktop.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-2019, ubuntu-latest]
+        os: [macos-11, windows-2019, ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -15,11 +15,8 @@ jobs:
           node-version: '14'
           check-latest: true
 
-      - name: Adjust yarn timeout
-        run: yarn config set network-timeout 600000 -g
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --immutable
 
       - name: Run linter
         run:  yarn lint

.github/workflows/publish-mac.yml

@@ -12,11 +12,8 @@ jobs:
           node-version: '14'
           check-latest: true
 
-      - name: Adjust yarn timeout
-        run: yarn config set network-timeout 600000 -g
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --immutable
 
       - name: Build with webpack for electron
         shell: bash

.github/workflows/publish-ubuntu.yml

@@ -12,11 +12,8 @@ jobs:
           node-version: '14'
           check-latest: true
 
-      - name: Adjust yarn timeout
-        run: yarn config set network-timeout 600000 -g
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --immutable
 
       - name: Build with webpack for electron
         shell: bash

.github/workflows/publish-windows.yml

@@ -12,11 +12,8 @@ jobs:
           node-version: '14'
           check-latest: true
 
-      - name: Adjust yarn timeout
-        run: yarn config set network-timeout 600000 -g
-
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --immutable
 
       - name: Build with webpack for electron
         shell: bash

.gitignore

@@ -1,8 +1,19 @@
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 .cache/
 coverage/
 dist/
 dist-electron/
-node_modules/
 *.log
 
 # OS generated files
@@ -13,3 +24,4 @@ node_modules/
 .Trashes
 ehthumbs.db
 Thumbs.db
+

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

FAQ.md

@@ -52,7 +52,3 @@ Your seed phrases, from which you keys are derived, are encrypted using your pas
 Yes, Ledger hardware is supported on both the web and desktop versions. Due to browser limitations, Ledger has been found to work best in Chrome.
 
 Note though that currently not all transactions can be parsed by the Celo Ledger app. Simple payments (like CELO or cUSD transfers) will show transaction details on the Ledger itself but transfers with comments or token exchanges will not yet show details.
-
-## Can feature X be added?
-
-Maybe, let's chat about it! Please see the [wallet Discord channel](https://discord.gg/ht885KmG5A) for open discussion.

README.md

@@ -16,7 +16,6 @@ This wallet uses [Subresource Integrity](https://developer.mozilla.org/en-US/doc
 
 * Main bundle: `bundle.js -> sha256-mKlBK5sVilEAlbFWUFdhTsCB8Gn833r/J7y+kERB368=`
 * Optional Ledger bundle: `bundle-ledger.js -> sha256-TIQHOQhHK0Nlw5+LcUVxb8jBwGmoCHFkPfihIy42d9Y=`
-* Optional WalletConnect v1 bundle: `bundle-walletconnectv1.js -> sha256-drWkNcYufDCGAFcjfOsETtWH8H1ODgV4fEcd1ktfA2o=`
 * Optional WalletConnect v2 bundle: `bundle-walletconnectv2.js -> sha256-FijbSmdr+Dyizc5+HDlB8vI6tLPxyYhiHI36dCYmOCI=`
 
 Advanced users can verify the source integrity by comparing the hashes in their page source to these values.
@@ -48,7 +47,6 @@ 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.gg/ht885KmG5A).
 
 ## License
 

package-electron.json

@@ -1,6 +1,6 @@
 {
   "name": "celo-web-wallet",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "A lightweight web and desktop wallet for the Celo network",
   "main": "main.js",
   "keywords": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "celo-web-wallet",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "A lightweight web and desktop wallet for the Celo network",
   "keywords": [
     "Celo",
@@ -29,7 +29,7 @@
     "electron:prod": "yarn electron:build && DEBUG=electron-builder electron-builder --publish never"
   },
   "dependencies": {
-    "@celo-tools/celo-ethers-wrapper": "^0.1.0",
+    "@celo-tools/celo-ethers-wrapper": "^0.4.0",
     "@emotion/react": "^11.7.1",
     "@ledgerhq/hw-app-eth": "^5.51.1",
     "@ledgerhq/hw-transport-node-hid-noevents": "^5.51.1",
@@ -52,11 +52,7 @@
     "react-window": "^1.8.6",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
-    "typed-redux-saga": "^1.4.0",
-    "wcv1/client": "npm:@walletconnect/[email protected]",
-    "wcv2/client": "npm:@walletconnect/[email protected]",
-    "wcv2/types": "npm:@walletconnect/[email protected]",
-    "wcv2/utils": "npm:@walletconnect/[email protected]"
+    "typed-redux-saga": "^1.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.5",
@@ -78,7 +74,7 @@
     "babel-plugin-module-name-mapper": "^1.2.0",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.6.0",
-    "electron": "^17.1.0",
+    "electron": "^17.4.11",
     "electron-builder": "^22.14.13",
     "electron-notarize": "^1.1.1",
     "eslint": "^8.10.0",
@@ -96,11 +92,7 @@
     "webpack-dev-server": "^4.7.4"
   },
   "resolutions": {
-    "pbkdf2": "^3.1.2",
-    "wcv2/client": "npm:@walletconnect/[email protected]",
-    "wcv2/types": "npm:@walletconnect/[email protected]",
-    "wcv2/utils": "npm:@walletconnect/[email protected]",
-    "wcv2/**/@walletconnect/types": "npm:@walletconnect/[email protected]",
-    "wcv2/**/@walletconnect/utils": "npm:@walletconnect/[email protected]"
-  }
+    "pbkdf2": "^3.1.2"
+  },
+  "packageManager": "[email protected]"
 }

scripts/build.sh

@@ -42,8 +42,6 @@ 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 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}"
 
@@ -58,7 +56,6 @@ 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-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" 

src/app/FailScreen.tsx

@@ -1,7 +1,6 @@
 import { Component } from 'react'
 import { TextLink } from 'src/components/buttons/TextLink'
 import SadFace from 'src/components/icons/sad_face.svg'
-import { config } from 'src/config'
 import { OnboardingScreenFrame } from 'src/features/onboarding/OnboardingScreenFrame'
 import { Font } from 'src/styles/fonts'
 import { Stylesheet } from 'src/styles/types'
@@ -43,7 +42,7 @@ export function FailScreen({ details }: { details?: string }) {
       <img width="180em" src={SadFace} alt="Sad Face" css={style.img} />
       <h3 css={style.h3}>
         Please refresh the page. If the problem persists, you can{' '}
-        <TextLink link={config.discordUrl}>ask for help here</TextLink>.
+        <TextLink link="https://github.com/celo-tools/celo-web-wallet">report an issue.</TextLink>.
       </h3>
       {details && <p css={style.details}>{details}</p>}
     </OnboardingScreenFrame>

src/app/rootSaga.ts

@@ -136,7 +136,6 @@ import {
   unlockWalletSaga,
   unlockWalletSagaName,
 } from 'src/features/wallet/unlockWallet'
-import { watchWalletConnect } from 'src/features/walletConnect/init'
 import { SagaActions, SagaState } from 'src/utils/saga'
 
 // Things that should happen before other sagas start go here
@@ -145,7 +144,7 @@ function* init() {
 }
 
 // All regular sagas must be included here
-const sagas = [walletStatusPoller, watchWalletConnect, fetchNftImagesSaga]
+const sagas = [walletStatusPoller, fetchNftImagesSaga]
 
 // All monitored sagas must be included here
 export const monitoredSagas: {

src/blockchain/provider.ts

@@ -30,7 +30,7 @@ async function connectToJsonRpcProvider(url: string) {
   try {
     logger.info(`Connecting to json rpc provider: ${url}`)
     provider = new StaticCeloProvider(url, {
-      name: 'Celo',
+      name: config.chainName,
       chainId: config.chainId,
       ensAddress: config.nomspaceRegistry,
     })

src/components/footer/AboutWallet.tsx

@@ -30,18 +30,15 @@ function AboutWalletModal() {
     <Box direction="column" align="center" styles={style.container}>
       <p css={style.text}>
         The Celo Wallet is a free, open source wallet for the Celo network. It was created by{' '}
-        <TextLink link="https://twitter.com/RossyWrote">J M Rossy</TextLink> and{' '}
-        <TextLink link="https://www.linkedin.com/in/brianschwalm/">Brian Schwalm</TextLink>.
+        <TextLink link="https://twitter.com/RossyWrote">J M Rossy</TextLink>
       </p>
       <p css={style.text}>
         The source code for the wallet can be found{' '}
         <TextLink link="https://github.com/celo-tools/celo-web-wallet">on Github</TextLink> and
         includes answers to{' '}
         <TextLink link="https://github.com/celo-tools/celo-web-wallet/blob/master/FAQ.md">
-          Frequently Asked Questions
+          Frequently Asked Questions.
         </TextLink>
-        . For other help, try asking in the{' '}
-        <TextLink link={config.discordUrl}>Discord chat</TextLink>.
       </p>
       <p css={style.version}>{`Version: ${config.version}`}</p>
     </Box>

src/components/footer/Help.tsx

@@ -1,9 +1,7 @@
 import { TextButton } from 'src/components/buttons/TextButton'
-import Discord from 'src/components/icons/logos/discord.svg'
 import Github from 'src/components/icons/logos/github.svg'
 import { ModalLinkGrid } from 'src/components/modal/ModalLinkGrid'
 import { useModal } from 'src/components/modal/useModal'
-import { config } from 'src/config'
 import { Styles } from 'src/styles/types'
 
 export function HelpButton({ styles }: { styles: Styles }) {
@@ -12,8 +10,7 @@ export function HelpButton({ styles }: { styles: Styles }) {
     showModalWithContent({
       head: 'Need some help?',
       content: <HelpModal />,
-      subHead:
-        'See the Frequently Asked Questions (FAQ) on Github or join Discord to chat with the Celo community.',
+      subHead: 'See the Frequently Asked Questions (FAQ) on Github.',
     })
   }
   return (
@@ -31,12 +28,6 @@ function HelpModal() {
       text: 'FAQ on Github',
       altText: 'Github',
     },
-    {
-      url: config.discordUrl,
-      imgSrc: Discord,
-      text: 'Chat on Discord',
-      altText: 'Discord',
-    },
   ]
   return <ModalLinkGrid links={links} />
 }