[DDW-562] Fix the count of packed cardano-wallet logs (#2341)

* [DDW-562] Fix cardano-wallet logs packing

* [DDW-562] Updates CHANGELOG

Author: nikolaglumac

CHANGELOG.md

@@ -11,6 +11,7 @@ Changelog
 
 ### Fixes
 
+- Fixed logging issue with too few `cardano-wallet` logs being packed into logs zip archive ([PR 2341](https://github.com/input-output-hk/daedalus/pull/2341))
 - Fixed misalignment of the "i" icon on the "Set password" dialog ([PR 2337](https://github.com/input-output-hk/daedalus/pull/2337))
 - Removed steps counter from the "Success" wallet restoration dialog step ([PR 2335](https://github.com/input-output-hk/daedalus/pull/2335))
 

source/main/config.js

@@ -145,8 +145,10 @@ export const ALLOWED_LOGS = [
   'node.log',
 ];
 export const ALLOWED_NODE_LOGS = new RegExp(/(node.log-)(\d{14}$)/);
+export const ALLOWED_WALLET_LOGS = new RegExp(/(cardano-wallet.log-)(\d{14}$)/);
 export const ALLOWED_LAUNCHER_LOGS = new RegExp(/(launcher-)(\d{14}$)/);
 export const MAX_NODE_LOGS_ALLOWED = 3;
+export const MAX_WALLET_LOGS_ALLOWED = 3;
 export const MAX_LAUNCHER_LOGS_ALLOWED = 3;
 
 // CardanoNode config

source/main/ipc/get-logs.js

@@ -4,10 +4,12 @@ import fs from 'fs';
 import path from 'path';
 import {
   pubLogsFolderPath,
-  MAX_NODE_LOGS_ALLOWED,
   ALLOWED_LOGS,
   ALLOWED_NODE_LOGS,
+  ALLOWED_WALLET_LOGS,
   ALLOWED_LAUNCHER_LOGS,
+  MAX_NODE_LOGS_ALLOWED,
+  MAX_WALLET_LOGS_ALLOWED,
   MAX_LAUNCHER_LOGS_ALLOWED,
 } from '../config';
 import { MainIpcChannel } from './lib/MainIpcChannel';
@@ -50,6 +52,10 @@ const isFileAllowed = (fileName: string) =>
 const isFileNodeLog = (fileName: string, nodeLogsIncluded: number) =>
   ALLOWED_NODE_LOGS.test(fileName) && nodeLogsIncluded < MAX_NODE_LOGS_ALLOWED;
 
+const isFileWalletLog = (fileName: string, walletLogsIncluded: number) =>
+  ALLOWED_WALLET_LOGS.test(fileName) &&
+  walletLogsIncluded < MAX_WALLET_LOGS_ALLOWED;
+
 const isFileLauncherLog = (fileName: string, nodeLogsIncluded: number) =>
   ALLOWED_LAUNCHER_LOGS.test(fileName) &&
   nodeLogsIncluded < MAX_LAUNCHER_LOGS_ALLOWED;
@@ -62,6 +68,7 @@ export default () => {
       const files = fs.readdirSync(pubLogsFolderPath).sort().reverse();
 
       let nodeLogsIncluded = 0;
+      let walletLogsIncluded = 0;
       let launcherLogsIncluded = 0;
       for (let i = 0; i < files.length; i++) {
         const currentFile = path.join(pubLogsFolderPath, files[i]);
@@ -72,6 +79,9 @@ export default () => {
           } else if (isFileNodeLog(fileName, nodeLogsIncluded)) {
             logFiles.push(fileName);
             nodeLogsIncluded++;
+          } else if (isFileWalletLog(fileName, walletLogsIncluded)) {
+            logFiles.push(fileName);
+            walletLogsIncluded++;
           } else if (isFileLauncherLog(fileName, launcherLogsIncluded)) {
             logFiles.push(fileName);
             launcherLogsIncluded++;