[DDW-158] Update Cardano node / Cardano wallet info shown on the "Diagnostics" screen (#1980)

* [DDW-158] Update node/walelt info on the Diagnostics screen

* [DDW-158] Adds cardano wallet version to System info log

* [DDW-158] Expose Daedalus build number on the 'Diagnostics' screen

Author: nikolaglumac

CHANGELOG.md

@@ -5,6 +5,7 @@ Changelog
 
 ### Fixes
 
+- Fixed `cardano-node` / `jormungandr` and `cardano-wallet` info on the "Diagnostics" screen ([PR 1980](https://github.com/input-output-hk/daedalus/pull/1980))
 - Persist "Blank screen fix" / "--safe-mode" flag between Daedalus restarts ([PR 1979](https://github.com/input-output-hk/daedalus/pull/1979))
 - Track `cardano-node` / `jormungandr` PID and use it for safe shutdowns and improve cardano-launcher error handling ([PR 1972](https://github.com/input-output-hk/daedalus/pull/1972))
 - Fixed "Wallet import" UI/UX issues ([PR 1968](https://github.com/input-output-hk/daedalus/pull/1968))

source/common/types/cardano-node.types.js

@@ -123,5 +123,6 @@ export type CardanoStatus = {
   isNodeSyncing: boolean,
   isNodeInSync: boolean,
   hasBeenConnected: boolean,
-  cardanoNodeID: number,
+  cardanoNodePID: number,
+  cardanoWalletPID: number,
 };

source/common/types/logging.types.js

@@ -53,7 +53,8 @@ export type ElectronLoggerMessage = {
 };
 
 export type LogSystemInfoParams = {
-  cardanoVersion: string,
+  cardanoNodeVersion: string,
+  cardanoWalletVersion: string,
   cpu: Array<Object>,
   daedalusVersion: string,
   isBlankScreenFixActive: boolean,

source/common/utils/environmentCheckers.js

@@ -35,7 +35,7 @@ export const evaluateNetwork = (network: ?string) => {
 };
 
 export const getBuildLabel = (
-  buildNumber: string,
+  build: string,
   network: string,
   currentNodeEnv: string,
   isFlight: boolean,
@@ -45,7 +45,7 @@ export const getBuildLabel = (
   const networkLabel = checkIsMainnet(network)
     ? ''
     : ` ${networkPrettyNames[network]}`;
-  let buildLabel = `Daedalus${flightLabel}${networkLabel} (${version}#${buildNumber})`;
+  let buildLabel = `Daedalus${flightLabel}${networkLabel} (${version}#${build})`;
   if (!checkIsProduction(currentNodeEnv))
     buildLabel += ` ${upperFirst(currentNodeEnv)}`;
   return buildLabel;

source/main/cardano/CardanoNode.js

@@ -4,7 +4,7 @@ import { spawn, exec } from 'child_process';
 import type { ChildProcess } from 'child_process';
 import type { WriteStream } from 'fs';
 import type { Launcher } from 'cardano-launcher';
-import { toInteger } from 'lodash';
+import { get, toInteger } from 'lodash';
 import moment from 'moment';
 import rfs from 'rotating-file-stream';
 import { environment } from '../environment';
@@ -203,7 +203,7 @@ export class CardanoNode {
    * @returns {TlsConfig} // I think this returns a number...
    */
   get pid(): ?number {
-    return this._node ? this._node.pid : null;
+    return get(this, '_node.pid', null);
   }
 
   /**
@@ -220,7 +220,8 @@ export class CardanoNode {
    */
   get status(): ?CardanoStatus {
     return Object.assign({}, this._status, {
-      cardanoNodeID: this._node ? this._node.pid : 0,
+      cardanoNodePID: get(this, '_node.pid', 0),
+      cardanoWalletPID: get(this, '_node.wpid', 0),
     });
   }
 
@@ -373,7 +374,8 @@ export class CardanoNode {
               this._handleCardanoNodeExit(code, signal);
             });
 
-            node.pid = processes.node.pid; // TODO: expose wallet pid too
+            node.pid = processes.node.pid;
+            node.wpid = processes.wallet.pid;
             node.connected = true; // TODO: use processes.wallet.connected here
             _log.info(
               `CardanoNode#start: cardano-node child process spawned with PID ${processes.node.pid}`,

source/main/config.js

@@ -11,7 +11,7 @@ const {
   isProduction,
   isBlankScreenFixActive,
   current,
-  buildNumber,
+  build,
   network,
   version,
 } = environment;
@@ -124,7 +124,7 @@ export const pubLogsFolderPath = path.join(appLogsFolderPath, 'pub');
 export const stateDirectoryPath = stateDir;
 export const stateDrive = isWindows ? stateDirectoryPath.slice(0, 2) : '/';
 export const buildLabel = getBuildLabel(
-  buildNumber,
+  build,
   network,
   current,
   isFlight,

source/main/index.js

@@ -50,7 +50,8 @@ const {
   network,
   os: osName,
   version: daedalusVersion,
-  buildNumber: cardanoVersion,
+  nodeVersion: cardanoNodeVersion,
+  apiVersion: cardanoWalletVersion,
 } = environment;
 
 if (isBlankScreenFixActive) {
@@ -99,7 +100,8 @@ const onAppReady = async () => {
   const systemLocale = detectSystemLocale();
 
   const systemInfo = logSystemInfo({
-    cardanoVersion,
+    cardanoNodeVersion,
+    cardanoWalletVersion,
     cpu,
     daedalusVersion,
     isBlankScreenFixActive,

source/main/utils/setupLogging.js

@@ -116,10 +116,12 @@ export const logStateSnapshot = (
     daedalusProcessID,
     daedalusMainProcessID,
     isBlankScreenFixActive,
-    cardanoVersion,
+    cardanoNodeVersion,
     cardanoNetwork,
-    cardanoProcessID,
-    cardanoAPIPort,
+    cardanoNodePID,
+    cardanoWalletVersion,
+    cardanoWalletPID,
+    cardanoWalletApiPort,
     daedalusStateDirectoryPath,
   } = coreInfo;
   const env = `${cardanoNetwork}:${platform}:${platformVersion}`;
@@ -140,10 +142,12 @@ export const logStateSnapshot = (
     daedalusProcessID,
     daedalusMainProcessID,
     isBlankScreenFixActive,
-    cardanoVersion,
     cardanoNetwork,
-    cardanoProcessID,
-    cardanoAPIPort,
+    cardanoNodeVersion,
+    cardanoNodePID,
+    cardanoWalletVersion,
+    cardanoWalletPID,
+    cardanoWalletApiPort,
     daedalusStateDirectoryPath,
     data,
   };

source/renderer/app/components/status/DaedalusDiagnostics.js

@@ -76,6 +76,11 @@ const messages = defineMessages({
     defaultMessage: '!!!Daedalus version',
     description: 'Daedalus version',
   },
+  daedalusBuildNumber: {
+    id: 'daedalus.diagnostics.dialog.daedalusBuildNumber',
+    defaultMessage: '!!!Daedalus build number',
+    description: 'Daedalus build number',
+  },
   daedalusMainProcessID: {
     id: 'daedalus.diagnostics.dialog.daedalusMainProcessID',
     defaultMessage: '!!!Daedalus main process ID',
@@ -91,20 +96,35 @@ const messages = defineMessages({
     defaultMessage: "!!!Daedalus 'Blank Screen Fix' active",
     description: "Daedalus 'Blank Screen Fix' active",
   },
-  cardanoVersion: {
-    id: 'daedalus.diagnostics.dialog.cardanoVersion',
+  cardanoNodeVersion: {
+    id: 'daedalus.diagnostics.dialog.cardanoNodeVersion',
     defaultMessage: '!!!Cardano node version',
     description: 'Cardano node version',
   },
-  cardanoProcessID: {
-    id: 'daedalus.diagnostics.dialog.cardanoProcessID',
+  cardanoNodePID: {
+    id: 'daedalus.diagnostics.dialog.cardanoNodePID',
     defaultMessage: '!!!Cardano node process ID',
     description: 'Cardano node process ID',
   },
-  cardanoApiPort: {
-    id: 'daedalus.diagnostics.dialog.cardanoApiPort',
-    defaultMessage: '!!!Cardano node API port',
-    description: 'Cardano node API port',
+  cardanoNodeApiPort: {
+    id: 'daedalus.diagnostics.dialog.cardanoNodeApiPort',
+    defaultMessage: '!!!Cardano node port',
+    description: 'Cardano node port',
+  },
+  cardanoWalletPID: {
+    id: 'daedalus.diagnostics.dialog.cardanoWalletPID',
+    defaultMessage: '!!!Cardano wallet process ID',
+    description: 'Cardano wallet process ID',
+  },
+  cardanoWalletVersion: {
+    id: 'daedalus.diagnostics.dialog.cardanoWalletVersion',
+    defaultMessage: '!!!Cardano wallet version',
+    description: 'Cardano wallet version',
+  },
+  cardanoWalletApiPort: {
+    id: 'daedalus.diagnostics.dialog.cardanoWalletApiPort',
+    defaultMessage: '!!!Cardano wallet port',
+    description: 'Cardano wallet port',
   },
   cardanoNetwork: {
     id: 'daedalus.diagnostics.dialog.cardanoNetwork',
@@ -454,12 +474,15 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
 
     const {
       daedalusVersion,
+      daedalusBuildNumber,
       daedalusProcessID,
       daedalusMainProcessID,
       isBlankScreenFixActive,
-      cardanoVersion,
-      cardanoProcessID,
-      cardanoAPIPort,
+      cardanoNodeVersion,
+      cardanoNodePID,
+      cardanoWalletVersion,
+      cardanoWalletPID,
+      cardanoWalletApiPort,
       cardanoRawNetwork,
       cardanoNetwork,
       daedalusStateDirectoryPath,
@@ -534,6 +557,7 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
             <div>
               {getSectionRow('coreInfo')}
               {getRow('daedalusVersion', daedalusVersion)}
+              {getRow('daedalusBuildNumber', daedalusBuildNumber)}
               {getRow('daedalusMainProcessID', daedalusMainProcessID)}
               {getRow('daedalusProcessID', daedalusProcessID)}
               {getRow(
@@ -575,10 +599,12 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
                   </CopyToClipboard>
                 </Fragment>
               )}
-              {getRow('cardanoVersion', cardanoVersion)}
-              {getRow('cardanoProcessID', cardanoProcessID || '-')}
-              {getRow('cardanoApiPort', cardanoAPIPort || '-')}
-              {getRow('cardanoNetwork', cardanoNetworkValue)}
+              {getRow('cardanoNodeVersion', cardanoNodeVersion)}
+              {getRow('cardanoNodePID', cardanoNodePID || '-')}
+              {/* getRow('cardanoNodeApiPort', '-') */}
+              {getRow('cardanoWalletVersion', cardanoWalletVersion)}
+              {getRow('cardanoWalletPID', cardanoWalletPID || '-')}
+              {getRow('cardanoWalletApiPort', cardanoWalletApiPort || '-')}
             </div>
             {isConnected && nodeConnectionError ? (
               <div>
@@ -599,6 +625,7 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
           <div className={styles.table}>
             <div>
               {getSectionRow('daedalusStatus')}
+              {getRow('cardanoNetwork', cardanoNetworkValue)}
               {getRow('connected', isConnected)}
               {getRow('synced', isSynced)}
               {getRow(

source/renderer/app/containers/status/DaedalusDiagnosticsDialog.js

@@ -50,7 +50,8 @@ export default class DaedalusDiagnosticsDialog extends Component<Props> {
       environment,
       diskSpaceAvailable,
       tlsConfig,
-      cardanoNodeID,
+      cardanoNodePID,
+      cardanoWalletPID,
       stateDirectoryPath,
       getNetworkClockRequest,
     } = networkStatus;
@@ -71,17 +72,22 @@ export default class DaedalusDiagnosticsDialog extends Component<Props> {
       mainProcessID,
       isBlankScreenFixActive,
       nodeVersion,
+      apiVersion,
+      build,
     } = environment;
 
     const coreInfo = {
       daedalusVersion: version,
+      daedalusBuildNumber: build,
       daedalusProcessID: rendererProcessID,
       daedalusMainProcessID: mainProcessID,
       daedalusStateDirectoryPath: stateDirectoryPath,
       isBlankScreenFixActive,
-      cardanoVersion: nodeVersion,
-      cardanoProcessID: cardanoNodeID,
-      cardanoAPIPort: tlsConfig ? tlsConfig.port : 0,
+      cardanoNodeVersion: nodeVersion,
+      cardanoNodePID,
+      cardanoWalletVersion: apiVersion,
+      cardanoWalletPID,
+      cardanoWalletApiPort: tlsConfig ? tlsConfig.port : 0,
       cardanoNetwork: network,
       cardanoRawNetwork: rawNetwork,
     };