Merge pull request #114 from celo-tools/1.8.0

v1.8.0

Author: jmrossy

.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
+

.yarn/releases/yarn-3.6.1.cjs

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

.yarnrc.yml

@@ -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.

FAQ.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