diff --git a/SECURITY.md b/SECURITY.md index 8ba66f947..ebdf39873 100644 --- a/SECURITY.md +++ b/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) diff --git a/app/components/home/transaction-list/transaction-list-error.tsx b/app/components/home/transaction-list/transaction-list-error.tsx index 62f31d7e9..1cae0624d 100644 --- a/app/components/home/transaction-list/transaction-list-error.tsx +++ b/app/components/home/transaction-list/transaction-list-error.tsx @@ -31,7 +31,7 @@ export const TransactionListError: FC = ({ 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're connecting to a working Stacks Node diff --git a/app/components/legal-disclaimer-tooltip.tsx b/app/components/legal-disclaimer-tooltip.tsx index a71b968f9..70b653fa2 100644 --- a/app/components/legal-disclaimer-tooltip.tsx +++ b/app/components/legal-disclaimer-tooltip.tsx @@ -5,7 +5,7 @@ import React, { FC } from 'react'; export const LegalDisclaimerTooltip: FC = props => ( ); diff --git a/app/components/request-diagnostics.layout.tsx b/app/components/request-diagnostics.layout.tsx index 8498718bb..0752d89cb 100644 --- a/app/components/request-diagnostics.layout.tsx +++ b/app/components/request-diagnostics.layout.tsx @@ -27,8 +27,8 @@ export const AllowDiagnosticsLayout: FC = props => return ( <> - 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. diff --git a/app/main/get-user-data-path.ts b/app/main/get-user-data-path.ts index 5f362204d..bbad8f935 100644 --- a/app/main/get-user-data-path.ts +++ b/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'; diff --git a/app/menu.ts b/app/menu.ts index c21042422..e79c159d4 100644 --- a/app/menu.ts +++ b/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'); }, }, ], diff --git a/app/package.json b/app/package.json index ec25fd160..81b0334a5 100644 --- a/app/package.json +++ b/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", diff --git a/app/pages/stacking/delegated-stacking/components/delegated-stacking-terms.tsx b/app/pages/stacking/delegated-stacking/components/delegated-stacking-terms.tsx index 05afe6746..1c6b11eba 100644 --- a/app/pages/stacking/delegated-stacking/components/delegated-stacking-terms.tsx +++ b/app/pages/stacking/delegated-stacking/components/delegated-stacking-terms.tsx @@ -20,7 +20,7 @@ export const DelegatedStackingTerms: FC = props => ( Paying out rewards is at the discretion of the pool. Make sure you'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. ); diff --git a/app/routes.tsx b/app/routes.tsx index c9eb32da7..771db69cf 100644 --- a/app/routes.tsx +++ b/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, diff --git a/app/store/stacks-node/stacks-node.reducer.ts b/app/store/stacks-node/stacks-node.reducer.ts index ec422857a..cfd009498 100644 --- a/app/store/stacks-node/stacks-node.reducer.ts +++ b/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', }); diff --git a/app/yarn.lock b/app/yarn.lock index 9d7aa655b..bacb20441 100644 --- a/app/yarn.lock +++ b/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/hw-transport-node-hid@6.27.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/hw-transport-node-hid@6.27.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== + argon2-browser@1.18.0: 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== node-fetch@2.6.7: version "2.6.7" @@ -466,10 +471,10 @@ node-fetch@2.6.7: 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" diff --git a/electron-builder.js b/electron-builder.js index 746f43f5b..8b20c6abb 100644 --- a/electron-builder.js +++ b/electron-builder.js @@ -56,7 +56,7 @@ const baseConfig = { to: '.', }, ], - publisherName: 'Hiro Systems PBC', + publisherName: 'Leather Wallet, LLC', }, mac: { hardenedRuntime: true, diff --git a/package.json b/package.json index 957ddc5fa..428a2261f 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "version": "4.14.1-dev.1", "description": "Leather 2.0 — Stacking", "prettier": "@stacks/prettier-config", - "homepage": "https://hiro.so/wallet", + "homepage": "https://leather.io", "author": { - "email": "info@hiro.so", - "name": "Hiro Systems PBC" + "email": "contact@leather.io", + "name": "Leather Wallet, LLC" }, "scripts": { "build": "concurrently \"yarn build-main\" \"yarn build-renderer\" \"yarn build-preload\" ",