Merge remote-tracking branch 'origin/develop' into fix/ddw-985-missing-character-in-pdf

Author: Marcin Mazurek

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Features
 
+- Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))
+- Improved IPC by reducing the amount of messages from periodic events ([PR 2892](https://github.com/input-output-hk/daedalus/pull/2892))
 - Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
 - Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
 

README.md

@@ -65,6 +65,7 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
 
 1. Run `yarn nix:selfnode` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell` (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`)
+    1. Alternatively: run `yarn nix:selfnode yarn dev` to achieve the same thing in a single command. Note: after `yarn dev` exits, you will still remain in the `nix-shell`.
 3. Once Daedalus has started and has gotten past the loading screen run the following commands from a new terminal window if you wish to import funded wallets:
    - Byron wallets: `yarn byron:wallet:importer`
    - Shelley wallets: `yarn shelley:wallet:importer`
@@ -94,31 +95,37 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
 
 1. Run `yarn nix:mainnet` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
+3. Or in one command: `yarn nix:mainnet yarn dev`
 
 #### Flight
 
 1. Run `yarn nix:flight` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
+3. Or in one command: `yarn nix:flight yarn dev`
 
 #### Testnet
 
 1. Run `yarn nix:testnet` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
+3. Or in one command: `yarn nix:testnet yarn dev`
 
 #### Staging
 
 1. Run `yarn nix:staging` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
+3. Or in one command: `yarn nix:staging yarn dev`
 
 #### Shelley QA
 
 1. Run `yarn nix:shelley_qa` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
+3. Or in one command: `yarn nix:shelley_qa yarn dev`
 
 #### Alonzo Purple
 
 1. Run `yarn nix:alonzo_purple` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
+3. Or in one command: `yarn nix:alonzo_purple yarn dev`
 
 #### Native token metadata server
 

nix/yarn-nix-shell.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# This small wrapper over `nix-shell`, called from package.json
+# (e.g. `yarn nix:testnet`) allows to specify an initial command to be
+# run inside the `nix-shell` once its ready, e.g.:
+#
+# $ yarn nix:testnet yarn dev
+#
+# After the command finishes, you will still be left inside the
+# nix-shell.
+
+if [ $# -lt 2 ] ; then
+   echo >&2 'fatal: usage: '"$0"' <network> <cluster> [<initial command> ...]'
+   exit 1
+fi
+
+NETWORK="$1" ; shift
+cluster="$1" ; shift
+
+# Unfortunately, we need to shell-escape the command:
+# cf. <https://github.com/NixOS/nixpkgs/blob/877eb10cfbdb3e3d54bdc7a7f6fd3c4b4e6396da/lib/strings.nix#L310-L328>
+command=''
+while [ $# -gt 0 ] ; do
+  command="$command '""${1//\'/\'\\\'\'}""'" ; shift
+done
+
+if [ -z "$command" ] ; then
+  command=':'   # no-op, if no command
+fi
+
+export NETWORK
+# `return` will make the user stay in `nix-shell` after the initial command finishes:
+exec nix-shell --argstr nodeImplementation cardano --argstr cluster "$cluster" --command "$command ; return"

package.json

@@ -49,13 +49,13 @@
     "themes:update": "gulp build:themes && ts-node -r esm ./dist/scripts/update.js && yarn prettier --loglevel warn --write source/renderer/app/themes/daedalus/*.ts",
     "themes:copy": "ts-node -r @babel/register -r @babel/polyfill source/renderer/app/themes/utils/copyTheme.ts && yarn prettier --loglevel warn --write source/renderer/app/themes/daedalus/*.ts",
     "clear:cache": "gulp clear:cache",
-    "nix:alonzo_purple": "NETWORK=alonzo_purple nix-shell --argstr nodeImplementation cardano --argstr cluster alonzo_purple",
-    "nix:mainnet": "NETWORK=mainnet nix-shell --argstr nodeImplementation cardano --argstr cluster mainnet",
-    "nix:flight": "NETWORK=mainnet nix-shell --argstr nodeImplementation cardano --argstr cluster mainnet_flight",
-    "nix:selfnode": "NETWORK=selfnode nix-shell --argstr nodeImplementation cardano --argstr cluster selfnode",
-    "nix:shelley_qa": "NETWORK=shelley_qa nix-shell --argstr nodeImplementation cardano --argstr cluster shelley_qa",
-    "nix:staging": "NETWORK=staging nix-shell --argstr nodeImplementation cardano --argstr cluster staging",
-    "nix:testnet": "NETWORK=testnet nix-shell --argstr nodeImplementation cardano --argstr cluster testnet",
+    "nix:alonzo_purple": "./nix/yarn-nix-shell.sh alonzo_purple alonzo_purple",
+    "nix:mainnet": "./nix/yarn-nix-shell.sh mainnet mainnet",
+    "nix:flight": "./nix/yarn-nix-shell.sh mainnet mainnet_flight",
+    "nix:selfnode": "./nix/yarn-nix-shell.sh selfnode selfnode",
+    "nix:shelley_qa": "./nix/yarn-nix-shell.sh shelley_qa shelley_qa",
+    "nix:staging": "./nix/yarn-nix-shell.sh staging staging",
+    "nix:testnet": "./nix/yarn-nix-shell.sh testnet testnet",
     "byron:wallet:importer": "ts-node utils/api-importer/byron-wallet-importer.ts",
     "shelley:wallet:importer": "ts-node utils/api-importer/shelley-wallet-importer.ts",
     "mary:wallet:importer": "ts-node utils/api-importer/mary-wallet-importer.ts",
@@ -271,6 +271,7 @@
     "shasum": "1.0.2",
     "source-map-support": "0.5.19",
     "spectron-fake-dialog": "0.0.1",
+    "tail": "2.2.4",
     "tcp-port-used": "1.0.1",
     "trezor-connect": "8.2.4-extended",
     "unorm": "1.6.0",

source/main/config.ts

@@ -172,8 +172,6 @@ export const DISK_SPACE_RECOMMENDED_PERCENTAGE = 15; // 15% of the total disk sp
 
 export const DISK_SPACE_CHECK_TIMEOUT = 9 * 1000; // Timeout for checking disks pace
 
-export const BLOCK_REPLAY_PROGRESS_CHECK_INTERVAL = 1 * 1000; // 1 seconds | unit: milliseconds
-
 // Used if token metadata server URL is not defined in launcher config
 export const FALLBACK_TOKEN_METADATA_SERVER_URL =
   'https://metadata.cardano-testnet.iohkdev.io';

source/main/index.ts

@@ -248,7 +248,7 @@ const onAppReady = async () => {
   };
 
   mainErrorHandler(onMainError);
-  await handleCheckBlockReplayProgress(mainWindow, launcherConfig.logsPrefix);
+  handleCheckBlockReplayProgress(mainWindow, launcherConfig.logsPrefix);
   await handleCheckDiskSpace();
 
   if (isWatchMode) {

source/main/utils/blockSyncProgressHelpers.ts

@@ -1,8 +1,12 @@
 import moment, { Moment } from 'moment';
 
 export function isItFreshLog(applicationStartDate: Moment, line: string) {
-  const [, logDate] = line.match(
-    /\[(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\.\d+) UTC]/
-  );
+  const [, logDate] =
+    line.match(/\[(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\.\d+) UTC]/) || [];
+
+  if (!logDate) {
+    return false;
+  }
+
   return applicationStartDate.isBefore(moment.utc(logDate));
 }

source/main/utils/handleCheckBlockReplayProgress.ts

@@ -1,11 +1,10 @@
 import { BrowserWindow } from 'electron';
 import fs from 'fs';
-import moment, { Moment } from 'moment';
-import readline from 'readline';
+import moment from 'moment';
 import path from 'path';
+import { Tail } from 'tail';
 import { getBlockSyncProgressChannel } from '../ipc/get-block-sync-progress';
 import type { GetBlockSyncProgressType } from '../../common/ipc/api';
-import { BLOCK_REPLAY_PROGRESS_CHECK_INTERVAL } from '../config';
 import { BlockSyncType } from '../../common/types/cardano-node.types';
 import { isItFreshLog } from './blockSyncProgressHelpers';
 
@@ -48,30 +47,23 @@ export const handleCheckBlockReplayProgress = (
   mainWindow: BrowserWindow,
   logsDirectoryPath: string
 ) => {
-  const checkBlockReplayProgress = async () => {
-    const filename = 'node.log';
-    const logFilePath = `${logsDirectoryPath}/pub/`;
-    const filePath = path.join(logFilePath, filename);
-    if (!fs.existsSync(filePath)) return;
-    const fileStream = fs.createReadStream(filePath);
-    const rl = readline.createInterface({
-      input: fileStream,
-    });
-    const progress = [];
+  const filename = 'node.log';
+  const logFilePath = `${logsDirectoryPath}/pub/`;
+  const filePath = path.join(logFilePath, filename);
+  if (!fs.existsSync(filePath)) return;
 
-    for await (const line of rl) {
-      if (
-        containProgressKeywords(line) &&
-        isItFreshLog(applicationStartDate, line)
-      ) {
-        progress.push(line);
-      }
+  const tail = new Tail(filePath);
+
+  tail.on('line', (line) => {
+    if (
+      !isItFreshLog(applicationStartDate, line) ||
+      !containProgressKeywords(line)
+    ) {
+      return;
     }
 
-    if (!progress.length) return;
-    const finalProgress = progress.slice(-1).pop();
-    const percentage = finalProgress.match(/Progress:([\s\d.,]+)%/)?.[1];
-    const progressType = getProgressType(finalProgress);
+    const percentage = line.match(/Progress:([\s\d.,]+)%/)?.[1];
+    const progressType = getProgressType(line);
     if (!percentage || !progressType) {
       return;
     }
@@ -81,15 +73,5 @@ export const handleCheckBlockReplayProgress = (
       { progress: finalProgressPercentage, type: progressType },
       mainWindow.webContents
     );
-  };
-
-  const setBlockReplayProgressCheckingInterval = () => {
-    setInterval(async () => {
-      checkBlockReplayProgress();
-    }, BLOCK_REPLAY_PROGRESS_CHECK_INTERVAL);
-  };
-
-  // Start default interval
-  setBlockReplayProgressCheckingInterval();
-  return checkBlockReplayProgress;
+  });
 };

source/renderer/app/api/api.ts

@@ -246,10 +246,7 @@ export default class AdaApi {
 
   getWallets = async (): Promise<Array<Wallet>> => {
     logger.debug('AdaApi::getWallets called');
-    const {
-      getHardwareWalletLocalData,
-      getHardwareWalletsLocalData,
-    } = global.daedalus.api.localStorage;
+    const { getHardwareWalletsLocalData } = global.daedalus.api.localStorage;
 
     try {
       const wallets: Array<AdaWallet | LegacyAdaWallet> = await getWallets(
@@ -281,7 +278,9 @@ export default class AdaApi {
       return await Promise.all(
         wallets.map(async (wallet: AdaWallet) => {
           const { id } = wallet;
-          const walletData = await getHardwareWalletLocalData(id);
+
+          const walletData = hwLocalData[id];
+
           return _createWalletFromServerData({
             ...wallet,
             isHardwareWallet:

source/renderer/app/components/assets/Asset.scss

@@ -75,6 +75,10 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+
+  &.ascii {
+    color: var(--theme-tokens-list-header-text-color);
+  }
 }
 
 .metadata {