Merge branch 'release/2.41.x'

* release/2.41.x: (56 commits) v2.41.3 Fix NFT send making the app crash in prod (again) (#4958) v2.41.2 Update to LLC 22.0.3 FIX LIVE-2186 - Fix NFT crashing the app on send (#4953) Remove @ledgerhq/ledger-core again after bad merge (#4951) Update to temp LLC dependency + @LedgerHQ libs FIX LIVE-2176 - Fix NFT Crumb (#4950) v2.41.1 Update LLC dependency LIVE-2080 Fixing Flowtype issues being wrongly ignored (#4938) v2.41.0 update screenshots (windows) update screenshots (linux) New Crowdin updates (#4913) Add LLC#22.0.1 dependency Update links to use the new explorer from metadata (#4912) Bugfix: Solana linting (#4902) [LIVE-1911] Feature - Add collection name resolver to eth familly (#4899) LIVE-1751 Solana staking (#4884) ...
LedgerHQ · May 3, 2022 · c2ce96d · c2ce96d
2 parents 369f03b + 0e6dfb2
commit c2ce96d
Show file tree

Hide file tree

Showing 253 changed files with 7,416 additions and 1,123 deletions.
diff --git a/.env.production b/.env.production
@@ -0,0 +1,6 @@
+FIREBASE_API_KEY="AIzaSyAzrQM75b6VXVwRzEDAM12ijfeOHlXvhA8"
+FIREBASE_AUTH_DOMAIN="ledger-live-production.firebaseapp.com"
+FIREBASE_PROJECT_ID="ledger-live-production"
+FIREBASE_STORAGE_BUCKET="ledger-live-production.appspot.com"
+FIREBASE_MESSAGING_SENDER_ID="212042068804"
+FIREBASE_APP_ID="1:212042068804:web:268d6f11671689c0b51d11"
diff --git a/.env.staging b/.env.staging
@@ -0,0 +1,6 @@
+FIREBASE_API_KEY="AIzaSyCqosqFLVHMsMi3uOFFbCJItOby7i6Y4T8"
+FIREBASE_AUTH_DOMAIN="ledger-live-staging.firebaseapp.com"
+FIREBASE_PROJECT_ID="ledger-live-staging"
+FIREBASE_STORAGE_BUCKET="ledger-live-staging.appspot.com"
+FIREBASE_MESSAGING_SENDER_ID="1008987457941"
+FIREBASE_APP_ID="1:1008987457941:web:14f6fbee631e0438d6ce9c"
diff --git a/.env.testing b/.env.testing
@@ -0,0 +1,6 @@
+FIREBASE_API_KEY="AIzaSyC_VaGrLWspK6OHTOY_EZxjnAYTdw2k7tg"
+FIREBASE_AUTH_DOMAIN="ledger-live-testing.firebaseapp.com"
+FIREBASE_PROJECT_ID="ledger-live-testing"
+FIREBASE_STORAGE_BUCKET="ledger-live-testing.appspot.com"
+FIREBASE_MESSAGING_SENDER_ID="677185650562"
+FIREBASE_APP_ID="1:677185650562:web:763cd3f1fa0b67781c199b"
diff --git a/.github/workflows/generate-screenshots.yml b/.github/workflows/generate-screenshots.yml
@@ -117,7 +117,7 @@ jobs:
       - name: install operating system dependencies
         run: npx playwright install-deps
       - name: build electron app
-        run: yarn build
+        run: yarn build:testing
       - name: generate new screenshots (Linux)
         run: xvfb-run --auto-servernum -- yarn playwright-update-snapshots --retries 0
       - name: status
@@ -175,7 +175,7 @@ jobs:
       - name: install operating system dependencies
         run: npx playwright install-deps
       - name: build electron app
-        run: yarn build
+        run: yarn build:testing
       - name: generate new screenshots (windows)
         run: yarn playwright-update-snapshots --retries 0
       - name: status
@@ -218,7 +218,7 @@ jobs:
   #     - name: install operating system dependencies
   #       run: npx playwright install-deps
   #     - name: build electron app
-  #       run: yarn build
+  #       run: yarn build:testing
   #     - name: generate new screenshots (macOS)
   #       run: yarn playwright-update-snapshots --retries 0
   #     - name: status

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -162,7 +162,7 @@ jobs:
       - name: build electron app
         env:
           INSTRUMENT_BUILD: true
-        run: yarn build
+        run: yarn build:testing
       - name: run ui tests (Linux)
         if: always()
         run: xvfb-run --auto-servernum -- yarn playwright
@@ -293,7 +293,7 @@ jobs:
       - name: build electron app
         env:
           INSTRUMENT_BUILD: true
-        run: yarn build
+        run: yarn build:testing
       - name: run ui tests (windows)
         run: yarn playwright
       - name: upload diffs to imgur
@@ -344,7 +344,7 @@ jobs:
   #     - name: build electron app
   #       env:
   #         INSTRUMENT_BUILD: true
-  #       run: yarn build
+  #       run: yarn build:testing
   #     - name: run ui tests (macos)
   #       run: yarn playwright
   #     - name: upload diffs to imgur

diff --git a/cryptoassets.md b/cryptoassets.md
diff --git a/package.json b/package.json
@@ -10,11 +10,12 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.40.4",
+  "version": "2.41.3",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",
     "build": "cross-env NODE_ENV=production node ./tools/main.js build",
+    "build:testing": "cross-env NODE_ENV=production TESTING=1 node ./tools/main.js build",
     "lint": "eslint src tools static --ext .js,.json,.ts,.tsx",
     "prettier": "prettier --write \"{src,tools}/**/*.{js,json}\"",
     "prettier:check": "prettier -c \"{src,tools}/**/*.{js,json}\"",
@@ -30,7 +31,7 @@
     "draft-nightly-release": "node ./tools/dist draft --nightly -v",
     "nightly": "node ./tools/dist --nightly --publish -v",
     "nightly-build": "node ./tools/dist --nightly -v",
-    "build-ci": "node ./tools/dist --ci -v",
+    "build-ci": "cross-env STAGING=1 node ./tools/dist --ci -v",
     "draft-release": "node ./tools/dist draft",
     "release": "node ./tools/dist --publish -v",
     "ci": "node ./tools/ci.js",
@@ -42,16 +43,15 @@
   "dependencies": {
     "@electron/remote": "^1.2.1",
     "@hot-loader/react-dom": "^17.0.1",
-    "@ledgerhq/devices": "6.24.1",
+    "@ledgerhq/devices": "6.27.1",
     "@ledgerhq/electron-updater": "^4.2.2",
     "@ledgerhq/errors": "6.10.0",
-    "@ledgerhq/hw-transport": "6.24.1",
-    "@ledgerhq/hw-transport-http": "6.26.0",
-    "@ledgerhq/hw-transport-node-hid-singleton": "6.26.0",
-    "@ledgerhq/ledger-core": "6.14.5",
-    "@ledgerhq/live-common": "21.35.1",
+    "@ledgerhq/hw-transport": "6.27.1",
+    "@ledgerhq/hw-transport-http": "6.27.1",
+    "@ledgerhq/hw-transport-node-hid-singleton": "6.27.1",
+    "@ledgerhq/live-common": "22.0.3",
     "@ledgerhq/logs": "6.10.0",
-    "@ledgerhq/react-ui": "^0.7.4",
+    "@ledgerhq/react-ui": "^0.7.5",
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
     "@polkadot/react-identicon": "0.89.2",
     "@tippyjs/react": "^4.2.6",
@@ -172,6 +172,7 @@
     "copy-webpack-plugin": "^6.1.0",
     "cross-env": "^7.0.3",
     "css-loader": "^3.5.3",
+    "dotenv-webpack": "^7.1.0",
     "electron": "13.5.2",
     "electron-builder": "22.13.1",
     "electron-devtools-installer": "^3.2.0",

diff --git a/renderer.webpack.config.js b/renderer.webpack.config.js
@@ -3,6 +3,7 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const HardSourceWebpackPlugin = require("hard-source-webpack-plugin");
 const babelPlugins = require("./babel.plugins");
 const UnusedWebpackPlugin = require("unused-webpack-plugin");
+const Dotenv = require("dotenv-webpack");
 
 const packagesToTranspile = [
   /@polkadot[\\/]api/,
@@ -25,9 +26,9 @@ const packagesToTranspile = [
   /@polkadot[\\/]x-textencoder/,
   /@polkadot[\\/]x-ws/,
   /@polkadot[\\/]react-identicon/,
-]
+];
 
-const exceptionToTranspile = (path_ruled) => {
+const exceptionToTranspile = path_ruled => {
   // DO transpile these packages
   if (packagesToTranspile.some(pkg => path_ruled.match(pkg))) {
     return false;
@@ -36,19 +37,17 @@ const exceptionToTranspile = (path_ruled) => {
   // Ignore all other modules that are in node_modules
   if (path_ruled.match(/node_modules/)) {
     return true;
-  }
-
-  else return false;
-}
+  } else return false;
+};
 
-const includeToTranspile = (path_ruled) => {
+const includeToTranspile = path_ruled => {
   // DO transpile these packages
   if (packagesToTranspile.some(pkg => path_ruled.match(pkg))) {
     return true;
   }
 
   return false;
-}
+};
 
 const babelConfig = {
   presets: [
@@ -100,6 +99,18 @@ const babelTsConfig = {
   ],
 };
 
+function getDotenvPathFromEnv() {
+  if (process.env.TESTING) {
+    return ".env.testing";
+  } else if (process.env.STAGING) {
+    return ".env.staging";
+  } else if (process.env.NODE_ENV === "production") {
+    return ".env.production";
+  }
+
+  return ".env";
+}
+
 module.exports = {
   target: "electron-renderer",
   entry: ["./src/renderer/index.js"],
@@ -111,6 +122,9 @@ module.exports = {
     minimize: false,
   },
   plugins: [
+    new Dotenv({
+      path: getDotenvPathFromEnv(),
+    }),
     new HtmlWebpackPlugin({
       template: "./src/renderer/index.html",
       filename: "index.html",
@@ -146,7 +160,7 @@ module.exports = {
       },
       {
         test: /\.js$/i,
-        loader: require.resolve('@open-wc/webpack-import-meta-loader'),
+        loader: require.resolve("@open-wc/webpack-import-meta-loader"),
         include: includeToTranspile,
       },
       {

diff --git a/src/config/urls.js b/src/config/urls.js
@@ -209,6 +209,8 @@ export const urls = {
     website: "https://elrond.com",
   },
   solana: {
+    staking: "https://support.ledger.com/hc/en-us/articles/4731749170461?docs=true",
     recipient_info: "https://support.ledger.com",
+    ledgerByFigmentTC: "https://drive.google.com/file/d/1vlIh2gTwtbMon8_bzFQGjCLhTUqS5uQc",
   },
 };
diff --git a/src/firebase-setup.js b/src/firebase-setup.js
@@ -1,36 +1,21 @@
-export const firebaseDevelopmentConfig = {
-  apiKey: "AIzaSyDh7WKaA5cvXV1C554Djyd68vy_1LrXxhk",
-  authDomain: "ledger-live-development.firebaseapp.com",
-  projectId: "ledger-live-development",
-  storageBucket: "ledger-live-development.appspot.com",
-  messagingSenderId: "750497694072",
-  appId: "1:750497694072:web:d2fc719100b45405bac88d",
-};
-
-// We don't have the concept of staging on desktop but the
-// Firebase project still exists
-export const firebaseStagingConfig = {
-  apiKey: "AIzaSyCqosqFLVHMsMi3uOFFbCJItOby7i6Y4T8",
-  authDomain: "ledger-live-staging.firebaseapp.com",
-  projectId: "ledger-live-staging",
-  storageBucket: "ledger-live-staging.appspot.com",
-  messagingSenderId: "1008987457941",
-  appId: "1:1008987457941:web:14f6fbee631e0438d6ce9c",
-};
-
-export const firebaseProductionConfig = {
-  apiKey: "AIzaSyAzrQM75b6VXVwRzEDAM12ijfeOHlXvhA8",
-  authDomain: "ledger-live-production.firebaseapp.com",
-  projectId: "ledger-live-production",
-  storageBucket: "ledger-live-production.appspot.com",
-  messagingSenderId: "212042068804",
-  appId: "1:212042068804:web:268d6f11671689c0b51d11",
-};
-
 export function getFirebaseConfig() {
-  if (__DEV__) {
-    return firebaseDevelopmentConfig;
+  if (process.env.FIREBASE_API_KEY) {
+    return {
+      apiKey: process.env.FIREBASE_API_KEY,
+      authDomain: process.env.FIREBASE_AUTH_DOMAIN,
+      projectId: process.env.FIREBASE_PROJECT_ID,
+      storageBucket: process.env.FIREBASE_STORAGE_BUCKET,
+      messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID,
+      appId: process.env.FIREBASE_APP_ID,
+    };
+  } else {
+    return {
+      apiKey: "AIzaSyDh7WKaA5cvXV1C554Djyd68vy_1LrXxhk",
+      authDomain: "ledger-live-development.firebaseapp.com",
+      projectId: "ledger-live-development",
+      storageBucket: "ledger-live-development.appspot.com",
+      messagingSenderId: "750497694072",
+      appId: "1:750497694072:web:d2fc719100b45405bac88d",
+    };
   }
-
-  return firebaseProductionConfig;
 }
diff --git a/src/index.js b/src/index.js
@@ -9,6 +9,6 @@ if (!process.env.IS_INTERNAL_PROCESS) {
   // Main electron thread
   require("./main");
 } else {
-  // Internal thread (libcore, hardware)
+  // Internal thread (coins, hardware)
   require("./internal");
 }
diff --git a/src/internal/commands/index.js b/src/internal/commands/index.js
@@ -7,8 +7,6 @@ import flushDevice from "./flushDevice";
 import firmwareUpdating from "./firmwareUpdating";
 import getLatestFirmwareForDevice from "./getLatestFirmwareForDevice";
 import getSatStackStatus from "./getSatStackStatus";
-import libcoreGetVersion from "./libcoreGetVersion";
-import libcoreReset from "./libcoreReset";
 import listenDevices from "./listenDevices";
 import listApps from "./listApps";
 import signMessage from "./signMessage";
@@ -40,8 +38,6 @@ export const commandsById = {
   firmwareUpdating,
   getLatestFirmwareForDevice,
   getSatStackStatus,
-  libcoreGetVersion,
-  libcoreReset,
   listenDevices,
   connectApp,
   connectManager,

diff --git a/src/internal/commands/libcoreGetVersion.js b/src/internal/commands/libcoreGetVersion.js
diff --git a/src/internal/commands/libcoreReset.js b/src/internal/commands/libcoreReset.js
diff --git a/src/internal/implement-libcore.js b/src/internal/implement-libcore.js
diff --git a/src/internal/live-common-setup.js b/src/internal/live-common-setup.js
@@ -1,7 +1,5 @@
 // @flow
 import "~/live-common-setup";
-import "./implement-libcore";
-
 import { throwError } from "rxjs";
 import usbDetect from "usb-detection";
 import throttle from "lodash/throttle";

diff --git a/src/live-common-set-supported-currencies.js b/src/live-common-set-supported-currencies.js
@@ -39,5 +39,6 @@ setSupportedCurrencies([
   "stakenet",
   "bitcoin_testnet",
   "ethereum_ropsten",
+  "ethereum_goerli",
   "cosmos_testnet",
 ]);
diff --git a/src/main/internal-lifecycle.js b/src/main/internal-lifecycle.js
@@ -123,7 +123,6 @@ function handleGlobalInternalMessage(payload) {
       // captureException(err)
       break;
     }
-    case "setLibcoreBusy":
     case "setDeviceBusy": {
       const win = getMainWindow && getMainWindow();
       if (!win) {

diff --git a/src/renderer/Default.js b/src/renderer/Default.js
@@ -31,7 +31,6 @@ import OnboardingOrElse from "~/renderer/components/OnboardingOrElse";
 import AppRegionDrag from "~/renderer/components/AppRegionDrag";
 import IsNewVersion from "~/renderer/components/IsNewVersion";
 import IsSystemLanguageAvailable from "~/renderer/components/IsSystemLanguageAvailable";
-import LibcoreBusyIndicator from "~/renderer/components/LibcoreBusyIndicator";
 import DeviceBusyIndicator from "~/renderer/components/DeviceBusyIndicator";
 import KeyboardContent from "~/renderer/components/KeyboardContent";
 import PerfIndicator from "~/renderer/components/PerfIndicator";
@@ -232,7 +231,6 @@ export default function Default() {
 
                   {__NIGHTLY__ ? <NightlyLayer /> : null}
 
-                  <LibcoreBusyIndicator />
                   <DeviceBusyIndicator />
                   <KeyboardContent sequence="BJBJBJ">
                     <PerfIndicator />