Merge pull request #1242 from leather-wallet/dev

Copy updates Electron

.github/workflows/debug-build.yml

@@ -44,8 +44,6 @@ jobs:
           - os: windows-latest
             NPM_COMMAND: win
             UPLOAD_ASSETS: release/**/*.exe
-            CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_WINDOWS
-            CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_WINDOWS
 
     steps:
       - name: Cancel Previous Runs
@@ -116,6 +114,7 @@ jobs:
         uses: Saionaro/[email protected]
 
       - name: Build releases
+        if: matrix.os == 'macos-11'
         run: ./node_modules/.bin/cross-env yarn package-${{ matrix.NPM_COMMAND }}
         env:
           DEBUG_PROD: true
@@ -130,6 +129,18 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
 
+      - name: Build releases
+        if: matrix.os != 'macos-11'
+        run: ./node_modules/.bin/cross-env yarn package-${{ matrix.NPM_COMMAND }}
+        env:
+          DEBUG_PROD: true
+          NODE_ENV: production
+          SHA: ${{ github.event.pull_request.head.sha }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PULL_REQUEST: ${{ steps.vars.outputs.pull_request_id }}
+          BRANCH_NAME: ${{ steps.vars.outputs.branch_name }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+
       - run: ls -R release
 
       - uses: actions/upload-artifact@v2

.github/workflows/publish-version.yml

@@ -2,6 +2,8 @@ name: Publish version
 
 on:
   push:
+    tags-ignore:
+      - 'v*dev*'
     tags:
       - 'v*'
 
@@ -32,8 +34,6 @@ jobs:
           - os: windows-latest
             NPM_COMMAND: win
             UPLOAD_ASSETS: release/**/*.exe
-            CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_WINDOWS
-            CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_WINDOWS
 
     steps:
       - name: Cancel Previous Runs
@@ -87,6 +87,7 @@ jobs:
         if: matrix.os == 'windows-latest'
 
       - name: Build releases
+        if: matrix.os == 'macos-11'
         run: ./node_modules/.bin/cross-env yarn package-${{ matrix.NPM_COMMAND }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -98,6 +99,15 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
 
+      - name: Build releases
+        if: matrix.os != 'macos-11'
+        run: ./node_modules/.bin/cross-env yarn package-${{ matrix.NPM_COMMAND }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_ENV: production
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
+
       - uses: actions/upload-artifact@v2
         name: ${{ matrix.os }} upload
         with:

CHANGELOG.md

@@ -1,10 +1,16 @@
-## [4.14.1](https://github.com/leather-wallet/desktop/compare/v4.14.0...v4.14.1) (2023-09-20)
+## [4.14.2-dev.1](https://github.com/leather-wallet/desktop/compare/v4.14.1...v4.14.2-dev.1) (2023-10-25)
 
 
 ### Bug Fixes
 
-* fix typo in leather-wallet, closes [#1221](https://github.com/leather-wallet/desktop/issues/1221) ([66b8efa](https://github.com/leather-wallet/desktop/commit/66b8efa222ac2edbba00b2fd755d3b828c217356))
-* update link to leather-wallet desktop download, closes [#1220](https://github.com/leather-wallet/desktop/issues/1220) ([4cd64ac](https://github.com/leather-wallet/desktop/commit/4cd64ac9a8149a3648e2b80dfebfb92156a3379b))
+* upgrade v22 electron ([f0b1e65](https://github.com/leather-wallet/desktop/commit/f0b1e65a7af93a4afed3d331b3344821662d27b5))
+
+## [4.14.1-dev.2](https://github.com/leather-wallet/desktop/compare/v4.14.1-dev.1...v4.14.1-dev.2) (2023-10-16)
+
+
+### Bug Fixes
+
+* upgrade v22 electron ([f0b1e65](https://github.com/leather-wallet/desktop/commit/f0b1e65a7af93a4afed3d331b3344821662d27b5))
 
 ## [4.14.1-dev.1](https://github.com/leather-wallet/desktop/compare/v4.14.0...v4.14.1-dev.1) (2023-09-19)
 

SECURITY.md

@@ -9,4 +9,4 @@
 
 ## Reporting a Vulnerability
 
-Hiro Systems operates a bug bounty programme on [HackerOne](https://hackerone.com/hiro)
+Trust Machines operates a bug bounty programme on [HackerOne](https://hackerone.com/trustmachines)

app/components/home/transaction-list/transaction-list-error.tsx

@@ -31,7 +31,7 @@ export const TransactionListError: FC<TransactionListErrorProps> = ({ node, erro
         mx="base"
         lineHeight="20px"
       >
-        {usingPbcHostedNode && <>Unable to connect to the Hiro Systems PBC hosted node.</>}
+        {usingPbcHostedNode && <>Unable to connect to the Hiro Systems hosted node.</>}
         {!usingPbcHostedNode && (
           <>
             Make sure you&apos;re connecting to a working Stacks Node

app/components/legal-disclaimer-tooltip.tsx

@@ -5,7 +5,7 @@ import React, { FC } from 'react';
 export const LegalDisclaimerTooltip: FC<BoxProps> = props => (
   <Tooltip
     display="inherit"
-    text="This link will take you to an external third-party website that is not affiliated with Hiro Systems PBC."
+    text="This link will take you to an external third-party website that is not affiliated with Leather."
     {...props}
   />
 );

app/components/request-diagnostics.layout.tsx

@@ -27,8 +27,8 @@ export const AllowDiagnosticsLayout: FC<AllowDiagnosticsLayoutProps> = props =>
   return (
     <>
       <Text maxWidth="520px">
-        We would like to gather de-identified usage data to help improve your experience with Hiro
-        Wallet.
+        We would like to gather de-identified usage data to help improve your experience with
+        Leather.
       </Text>
       <Stack mt="loose" mb="extra-loose" spacing="base-tight" textAlign="left" maxWidth="520px">
         <ReasonToAllowDiagnostics text="Send anonymous data about page views and clicks" />

app/main/get-user-data-path.ts

@@ -2,6 +2,7 @@ import { App } from 'electron';
 import path from 'path';
 
 export function getUserDataPath(app: App) {
+  // DO NOT CHANGE THIS TO LEATHER, WILL CAUSE BREAKING CHANGES
   const appId = 'so.hiro.StacksWallet';
   const appData = app.getPath('appData');
   const network = process.env.STX_NETWORK === 'mainnet' ? '' : 'Testnet';

app/menu.ts

@@ -14,7 +14,7 @@ export default class MenuBuilder {
       {
         label: 'Learn More',
         click() {
-          void shell.openExternal('https://hiro.so');
+          void shell.openExternal('https://leather.io');
         },
       },
       {
@@ -26,7 +26,7 @@ export default class MenuBuilder {
       {
         label: 'Search Issues',
         click() {
-          void shell.openExternal('https://github.com/blockstack/stacks-wallet/issues');
+          void shell.openExternal('https://github.com/leather-wallet/desktop/issues');
         },
       },
     ],

app/package.json

@@ -12,7 +12,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@ledgerhq/hw-transport-node-hid": "6.27.14",
+    "@ledgerhq/hw-transport-node-hid": "6.27.21",
     "@stacks/network": "6.5.2",
     "@stacks/stacking": "6.5.3",
     "@stacks/transactions": "6.5.2",

app/pages/onboarding/00-terms/terms.tsx

@@ -152,7 +152,7 @@ export const Terms: React.FC = () => {
         Terms of Service
       </OnboardingTitle>
       <OnboardingText mb="extra-loose">
-        You must first accept the terms of service before using Leathers
+        You must first accept the terms of service before using Leather
       </OnboardingText>
       {/* Converted from https://gdoc2md.com/ */}
       <ReactMarkdown

app/pages/stacking/delegated-stacking/components/delegated-stacking-terms.tsx

@@ -20,7 +20,7 @@ export const DelegatedStackingTerms: FC<StackProps> = props => (
     </StackingTermItem>
     <StackingTermItem title="Research your pool" icon={StepsIcon}>
       Paying out rewards is at the discretion of the pool. Make sure you&apos;ve researched and
-      trust the pool you’re using. All pools are unaffiliated with Hiro PBC.
+      trust the pool you’re using. All pools are unaffiliated with Leather.
     </StackingTermItem>
   </Stack>
 );

app/routes.tsx

@@ -79,10 +79,6 @@ export const routerConfig = [
     path: routes.SET_PASSWORD,
     component: SetPassword,
   },
-  {
-    path: routes.SET_PASSWORD,
-    component: SetPassword,
-  },
   {
     path: routes.SETTINGS,
     component: Settings,

app/store/stacks-node/stacks-node.reducer.ts

@@ -49,7 +49,7 @@ export const setActiveStacksNode = stacksNodeSlice.actions.setActiveStacksNode;
 
 export const defaultNode: StacksNode = Object.freeze({
   url: DEFAULT_STACKS_NODE_URL,
-  name: 'Hiro Systems PBC node',
+  name: 'Hiro Systems node',
   id: 'default',
 });
 

app/yarn.lock

@@ -2,53 +2,53 @@
 # yarn lockfile v1
 
 
-"@ledgerhq/devices@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.2.tgz#8086e9be0185f4925fa611d4d71dc9c141b9b089"
-  integrity sha512-Qnc9hgGae4YNr/4NUU/5l3xGc5fx6t2k1su6ASu4wsV/p49xmaU/iBO6PtFHqb3QCwsrkieXASU932Ac2WTw0g==
+"@ledgerhq/devices@^8.0.7":
+  version "8.0.7"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.7.tgz#206434dbd8a097529bbfc95f5eef94c2923c7578"
+  integrity sha512-BbPyET52lXnVs7CxJWrGYqmtGdbGzj+XnfCqLsDnA7QYr1CZREysxmie+Rr6BKpNDBRVesAovXjtaVaZOn+upw==
   dependencies:
-    "@ledgerhq/errors" "^6.12.5"
+    "@ledgerhq/errors" "^6.14.0"
     "@ledgerhq/logs" "^6.10.1"
     rxjs "6"
     semver "^7.3.5"
 
-"@ledgerhq/errors@^6.12.5":
-  version "6.12.5"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.5.tgz#f112b548ab3c4f21bb7fbe77e6cb62998a050992"
-  integrity sha512-wQlDyKD2lG4hiFmSPvWfuzhbH8wxWG4ugesM17HdZgxUt8g0SluwaBfFJ7Nx0Ym44VIhbsGMUzyBp0hHyCkVqA==
+"@ledgerhq/errors@^6.14.0":
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.14.0.tgz#0bf253983773ef12eebce2091f463bc719223b37"
+  integrity sha512-ZWJw2Ti6Dq1Ott/+qYqJdDWeZm16qI3VNG5rFlb0TQ3UcAyLIQZbnnzzdcVVwVeZiEp66WIpINd/pBdqsHVyOA==
 
-"@ledgerhq/hw-transport-node-hid-noevents@^6.27.14":
-  version "6.27.14"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.14.tgz#eeb14146e0007163516da73f6dd8afc3ec17bcbf"
-  integrity sha512-zTckColH6+WRi2ZXdgzjwI+fV6Hfo7+Xf+fC2qAjWZBs8H9h288oXnbaNU2hJQqrKGygN5Y9Qne470dhlRiqqQ==
+"@ledgerhq/hw-transport-node-hid-noevents@^6.27.19":
+  version "6.27.19"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.19.tgz#3bbb6b02c7cab30519b1bf8b8e490d27d70d32a2"
+  integrity sha512-zOIB1fBiQH9ZYFzoEpNY4n1lE7bGPgRT+k85fKuLM7cxxm5Sy+TgrdxImvBz0IQUS8EvrtZCm+dVWkb2sH/6OA==
   dependencies:
-    "@ledgerhq/devices" "^8.0.2"
-    "@ledgerhq/errors" "^6.12.5"
-    "@ledgerhq/hw-transport" "^6.28.3"
+    "@ledgerhq/devices" "^8.0.7"
+    "@ledgerhq/errors" "^6.14.0"
+    "@ledgerhq/hw-transport" "^6.28.8"
     "@ledgerhq/logs" "^6.10.1"
     node-hid "^2.1.2"
 
-"@ledgerhq/[email protected].14":
-  version "6.27.14"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.14.tgz#211fccd808c7d28e64ebdbd145846ca0fb79f5a4"
-  integrity sha512-poRHEjvaaMtWhaYKhyGvcRf5D6dCbMRcSStzwZ8pKhrjOJskHcxYmMsnV49YingJOeZo0S7rjLBzus3KSXGZTg==
+"@ledgerhq/[email protected].21":
+  version "6.27.21"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.21.tgz#44bc003a0279296e1d613ddaada5005638aa0217"
+  integrity sha512-8G3Owpa2ex+TkGQSMkKoAbMEGZ7a23g0wZUvVzalQphMqbayebMhuXxue8iPp7F9pulm7uyLxgMYptYyw5i4yQ==
   dependencies:
-    "@ledgerhq/devices" "^8.0.2"
-    "@ledgerhq/errors" "^6.12.5"
-    "@ledgerhq/hw-transport" "^6.28.3"
-    "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.14"
+    "@ledgerhq/devices" "^8.0.7"
+    "@ledgerhq/errors" "^6.14.0"
+    "@ledgerhq/hw-transport" "^6.28.8"
+    "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.19"
     "@ledgerhq/logs" "^6.10.1"
     lodash "^4.17.21"
     node-hid "^2.1.2"
-    usb "^1.7.0"
+    usb "2.9.0"
 
-"@ledgerhq/hw-transport@^6.28.3":
-  version "6.28.3"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.3.tgz#1108ceb8bfb9dc949f6178b17dd1bcb76dba11f0"
-  integrity sha512-YFPh9n51V4TfPZov7iAUbtez0cyNEVR1+49RG8tYvmsmk8ihvya2rR90U8KO2MnrT2jR4k2rlgQ3IcZJO9dBcw==
+"@ledgerhq/hw-transport@^6.28.8":
+  version "6.28.8"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.8.tgz#f99a5c71c5c09591e9bfb1b970c42aafbe81351f"
+  integrity sha512-XxQVl4htd018u/M66r0iu5nlHi+J6QfdPsORzDF6N39jaz+tMqItb7tUlXM/isggcuS5lc7GJo7NOuJ8rvHZaQ==
   dependencies:
-    "@ledgerhq/devices" "^8.0.2"
-    "@ledgerhq/errors" "^6.12.5"
+    "@ledgerhq/devices" "^8.0.7"
+    "@ledgerhq/errors" "^6.14.0"
     events "^3.3.0"
 
 "@ledgerhq/logs@^6.10.1":
@@ -222,6 +222,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.15.tgz#de0e1fbd2b22b962d45971431e2ae696643d3f5d"
   integrity sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==
 
+"@types/w3c-web-usb@^1.0.6":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/w3c-web-usb/-/w3c-web-usb-1.0.8.tgz#c593fef468b6e6051209c8aa89d1ead08005e23d"
+  integrity sha512-ouEoUTyB27wFXUUyl0uKIE6VkeCczDtazWTiZGD1M4onceJnp8KnHDf7CzLbpwzek2ZFWXTC5KrNDRc9q/Jf6Q==
+
 [email protected]:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/argon2-browser/-/argon2-browser-1.18.0.tgz#f35820211e0a431aed7f82b9348477234be69bec"
@@ -454,10 +459,10 @@ node-addon-api@^3.0.2:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
-node-addon-api@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
+node-addon-api@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
+  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
 
 [email protected]:
   version "2.6.7"
@@ -466,10 +471,10 @@ [email protected]:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-gyp-build@^4.3.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
-  integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
+node-gyp-build@^4.5.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
+  integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
 
 node-hid@^2.1.2:
   version "2.1.2"
@@ -649,13 +654,14 @@ uglify-js@^3.1.9:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
-usb@^1.7.0:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/usb/-/usb-1.9.2.tgz#fb6b36f744ecc707a196c45a6ec72442cb6f2b73"
-  integrity sha512-dryNz030LWBPAf6gj8vyq0Iev3vPbCLHCT8dBw3gQRXRzVNsIdeuU+VjPp3ksmSPkeMAl1k+kQ14Ij0QHyeiAg==
+usb@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/usb/-/usb-2.9.0.tgz#8ae3b175f93bee559400bff33491eee63406b6a2"
+  integrity sha512-G0I/fPgfHUzWH8xo2KkDxTTFruUWfppgSFJ+bQxz/kVY2x15EQ/XDB7dqD1G432G4gBG4jYQuF3U7j/orSs5nw==
   dependencies:
-    node-addon-api "^4.2.0"
-    node-gyp-build "^4.3.0"
+    "@types/w3c-web-usb" "^1.0.6"
+    node-addon-api "^6.0.0"
+    node-gyp-build "^4.5.0"
 
 util-deprecate@^1.0.1:
   version "1.0.2"

electron-builder.js

@@ -43,6 +43,7 @@ const baseConfig = {
     ],
   },
   win: {
+    verifyUpdateCodeSignature: false,
     // Don't use `msi` installer issues
     target: [
       {
@@ -56,7 +57,7 @@ const baseConfig = {
         to: '.',
       },
     ],
-    publisherName: 'Hiro Systems PBC',
+    publisherName: 'Leather Wallet, LLC',
   },
   mac: {
     hardenedRuntime: true,

package.json

@@ -1,12 +1,12 @@
 {
   "name": "stacks-wallet",
-  "version": "4.14.1",
+  "version": "4.14.2-dev.1",
   "description": "Leather 2.0 — Stacking",
   "prettier": "@stacks/prettier-config",
-  "homepage": "https://hiro.so/wallet",
+  "homepage": "https://leather.io",
   "author": {
-    "email": "[email protected]",
-    "name": "Hiro Systems PBC"
+    "email": "[email protected]",
+    "name": "Leather Wallet, LLC"
   },
   "scripts": {
     "build": "concurrently \"yarn build-main\" \"yarn build-renderer\" \"yarn build-preload\" ",
@@ -173,7 +173,7 @@
     "crypto-browserify": "3.12.0",
     "csstype": "3.0.7",
     "detect-port": "1.3.0",
-    "electron": "22.0.0",
+    "electron": "22.3.24",
     "electron-builder": "22.10.5",
     "electron-devtools-installer": "3.2.0",
     "electron-notarize": "1.0.0",