[DDW-197] Merge and fix conflicts

CHANGELOG.md

@@ -15,6 +15,8 @@ Changelog
 
 ### Chores
 
+- Updated `cardano-launcher` to version `0.20201014.0` ([PR 2205](https://github.com/input-output-hk/daedalus/pull/2205))
+- Updated `cardano-wallet` to version `2020-10-13` ([PR 2205](https://github.com/input-output-hk/daedalus/pull/2205))
 - Update Nix installation instructions ([PR 2200](https://github.com/input-output-hk/daedalus/pull/2200))
 - Updated `cardano-wallet` to revision `be40d5f2` which includes `cardano-node` 1.21.1 ([PR 2200](https://github.com/input-output-hk/daedalus/pull/2200))
 - Dependency update ([PR 2190](https://github.com/input-output-hk/daedalus/pull/2190))
@@ -43,7 +45,7 @@ Changelog
 
 - Fixed the "Retirement" label on Stake Pools for yellow theme ([PR 2189](https://github.com/input-output-hk/daedalus/pull/2189))
 - Fixed stake pool tooltip "Delegate to this pool" button background colors ([PR 2181](https://github.com/input-output-hk/daedalus/pull/2181))
-- Removed one second delay on changing wallet selection and selecting delegating stake slider value on the "Stake pools" screen ([PR 2179](https://github.com/input-output-hk/daedalus/pull/2179))
+- Removed one second delay on changing wallet selection and selecting delegating stake slider value on the "Stake pools" screen ([PR 2180](https://github.com/input-output-hk/daedalus/pull/2180))
 - Improved rendering performance of the stake pools on the "Stake pools" screen ([PR 2177](https://github.com/input-output-hk/daedalus/pull/2177))
 
 ### Chores

gulpfile.js

@@ -43,7 +43,7 @@ const buildMain = () => () =>
     .pipe(webpackStream(mainWebpackConfig, webpack))
     .pipe(mainOutputDestination());
 
-const buildMainWatch = () => done =>
+const buildMainWatch = () => (done) =>
   mainInputSource()
     .pipe(
       webpackStream(mainWebpackWatchConfig, webpack, () => {
@@ -59,7 +59,7 @@ const buildRenderer = () => () =>
     .pipe(webpackStream(rendererWebpackConfig, webpack))
     .pipe(rendererOutputDestination());
 
-const buildRendererWatch = () => done =>
+const buildRendererWatch = () => (done) =>
   rendererInputSource()
     .pipe(
       webpackStream(rendererWebpackWatchConfig, webpack, () => {
@@ -79,17 +79,17 @@ gulp.task(
 
 gulp.task('clean:dist', shell.task('rimraf ./dist'));
 
-gulp.task('server:start', done => {
+gulp.task('server:start', (done) => {
   electronServer.start();
   done();
 });
 
-gulp.task('server:create:dev', done => {
+gulp.task('server:create:dev', (done) => {
   createElectronServer({ NODE_ENV: process.env.NODE_ENV || 'development' });
   done();
 });
 
-gulp.task('server:create:debug', done => {
+gulp.task('server:create:debug', (done) => {
   createElectronServer({ NODE_ENV: process.env.NODE_ENV || 'development' }, [
     '--inspect',
     '--inspect-brk',

nix/sources.json

@@ -29,12 +29,12 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "53d31285b72320d5066b334f2df5d70c7a5f6b49",
-        "sha256": "148mpn78lpwrrjz1x304jk45g5lzcjvnzplcfp9dfdsahhs3x1fg",
+        "rev": "77e04fc0f0c226f27ea2e293666bb8311ba0daa1",
+        "sha256": "0kc1ddidp1vip8rfnm7vp5avx46xr9nvyzn7q9r3yn50ylhx0i0j",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/53d31285b72320d5066b334f2df5d70c7a5f6b49.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/77e04fc0f0c226f27ea2e293666bb8311ba0daa1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "v2020-04-28"
+        "version": "v2020-10-13"
     },
     "gitignore": {
         "branch": "master",

package.json

@@ -176,11 +176,11 @@
     "bip39": "2.3.0",
     "blake2b": "2.1.3",
     "blakejs": "1.1.0",
-    "borc": "^2.1.2",
+    "borc": "2.1.2",
     "bs58": "4.0.1",
-    "cardano-crypto.js": "^5.3.6-rc.6",
+    "cardano-crypto.js": "5.3.6-rc.6",
     "cardano-js": "0.4.5",
-    "cardano-launcher": "0.20200813.0",
+    "cardano-launcher": "0.20201014.0",
     "cbor": "5.0.2",
     "check-disk-space": "2.1.0",
     "chroma-js": "2.1.0",

source/common/ipc/lib/IpcChannel.js

@@ -142,7 +142,7 @@ export class IpcChannel<Incoming, Outgoing> {
    * Sets up a permanent handler for receiving request from the other side.
    */
   onRequest(
-    handler: Incoming => Promise<Outgoing>,
+    handler: (Incoming) => Promise<Outgoing>,
     receiver: IpcReceiver
   ): void {
     receiver.on(

source/common/ipc/lib/IpcConversation.js

@@ -95,7 +95,7 @@ export class IpcConversation<Incoming, Outgoing> {
    * from the other side.
    */
   onRequest(
-    handler: Incoming => Promise<Outgoing>,
+    handler: (Incoming) => Promise<Outgoing>,
     receiver: IpcReceiver
   ): void {
     receiver.on(

source/main/cardano/CardanoNode.js

@@ -311,7 +311,7 @@ export class CardanoNode {
 
     return new Promise(async (resolve, reject) => {
       const nodeLogFile = rfs(
-        time => {
+        (time) => {
           // The module works by writing to the one file name before it is rotated out.
           if (!time) return 'node.log';
           const timestamp = moment.utc().format('YYYYMMDDHHmmss');
@@ -326,7 +326,7 @@ export class CardanoNode {
       this._cardanoNodeLogFile = nodeLogFile;
 
       const walletLogFile = rfs(
-        time => {
+        (time) => {
           // The module works by writing to the one file name before it is rotated out.
           if (!time) return 'cardano-wallet.log';
           const timestamp = moment.utc().format('YYYYMMDDHHmmss');
@@ -367,7 +367,7 @@ export class CardanoNode {
 
         node
           .start()
-          .then(api => {
+          .then((api) => {
             const processes: {
               wallet: ChildProcess,
               node: ChildProcess,
@@ -377,7 +377,7 @@ export class CardanoNode {
             };
 
             // Setup event handling
-            node.walletBackend.events.on('exit', exitStatus => {
+            node.walletBackend.events.on('exit', (exitStatus) => {
               _log.info('CardanoNode#exit', { exitStatus });
               const { code, signal } = exitStatus.wallet;
               this._handleCardanoNodeExit(code, signal);
@@ -399,7 +399,7 @@ export class CardanoNode {
             });
             resolve();
           })
-          .catch(exitStatus => {
+          .catch((exitStatus) => {
             _log.error('CardanoNode#start: Error while spawning cardano-node', {
               exitStatus,
             });

source/main/cardano/CardanoWalletLauncher.js

@@ -131,9 +131,10 @@ export async function CardanoWalletLauncher(walletOpts: WalletOpts): Launcher {
         logger.info('Launching Wallet with --testnet flag');
       }
       if (smashUrl) {
-        logger.info('Launching Wallet with --smash-url flag', { smashUrl });
-        // @TODO - remove comment once WBE fixed
-        // merge(launcherConfig, { smashUrl });
+        logger.info('Launching Wallet with --pool-metadata-fetching flag', {
+          poolMetadataSource: { smashUrl },
+        });
+        merge(launcherConfig, { poolMetadataSource: { smashUrl } });
       }
       merge(launcherConfig, { nodeConfig, tlsConfiguration });
       break;

source/main/cardano/setup.js

@@ -120,7 +120,7 @@ export const setupCardanoNode = (
       onStopped: () => {},
       onUpdating: () => {},
       onUpdated: () => {},
-      onCrashed: code => {
+      onCrashed: (code) => {
         const restartTimeout = cardanoNode.startupTries > 0 ? 30000 : 1000;
         logger.info(
           `CardanoNode crashed with code ${code}. Restarting in ${restartTimeout}ms...`,
@@ -180,7 +180,7 @@ export const setupCardanoNode = (
     return cardanoNode.restart(true); // forced restart
   });
 
-  cardanoFaultInjectionChannel.onReceive(fault => {
+  cardanoFaultInjectionChannel.onReceive((fault) => {
     logger.info(
       'ipcMain: Received request to inject a fault into cardano node',
       { fault }

source/main/cardano/utils.js

@@ -257,7 +257,7 @@ export const exportWallets = async (
   const errors = stderr.toString();
 
   logger.info(`ipcMain: Exported ${wallets.length} wallets`, {
-    walletsData: wallets.map(w => ({
+    walletsData: wallets.map((w) => ({
       name: w.name,
       id: w.id,
       hasPassword: w.is_passphrase_empty,

source/main/index.js

@@ -192,11 +192,11 @@ const onAppReady = async () => {
     client.create(mainWindow);
   }
 
-  setStateSnapshotLogChannel.onReceive(data => {
+  setStateSnapshotLogChannel.onReceive((data) => {
     return Promise.resolve(logStateSnapshot(data));
   });
 
-  generateWalletMigrationReportChannel.onReceive(data => {
+  generateWalletMigrationReportChannel.onReceive((data) => {
     return Promise.resolve(generateWalletMigrationReport(data));
   });
 
@@ -210,7 +210,7 @@ const onAppReady = async () => {
 
   getSystemLocaleChannel.onRequest(() => Promise.resolve(systemLocale));
 
-  mainWindow.on('close', async event => {
+  mainWindow.on('close', async (event) => {
     logger.info(
       'mainWindow received <close> event. Safe exiting Daedalus now.'
     );
@@ -221,8 +221,8 @@ const onAppReady = async () => {
   buildAppMenus(mainWindow, cardanoNode, locale, { isUpdateAvailable: false });
 
   await rebuildApplicationMenu.onReceive(
-    data =>
-      new Promise(resolve => {
+    (data) =>
+      new Promise((resolve) => {
         locale = getLocale(network);
         buildAppMenus(mainWindow, cardanoNode, locale, {
           isUpdateAvailable: data.isUpdateAvailable,
@@ -245,7 +245,7 @@ const onAppReady = async () => {
   });
 
   // Wait for controlled cardano-node shutdown before quitting the app
-  app.on('before-quit', async event => {
+  app.on('before-quit', async (event) => {
     logger.info('app received <before-quit> event. Safe exiting Daedalus now.');
     event.preventDefault(); // prevent Daedalus from quitting immediately
     await safeExit();

source/main/ipc/bugReportRequestChannel.js

@@ -44,19 +44,19 @@ export const handleBugReportRequests = () => {
 
         logger.info('Sending bug report request with options', { options });
         const httpRequest = http.request(options);
-        httpRequest.on('response', response => {
+        httpRequest.on('response', (response) => {
           if (response.statusCode !== 200) {
             return reject();
           }
           response.on('data', () => {});
-          response.on('error', error => {
+          response.on('error', (error) => {
             reject(error);
           });
           response.on('end', () => {
             resolve();
           });
         });
-        httpRequest.on('error', error => reject(error));
+        httpRequest.on('error', (error) => reject(error));
 
         // Attach form-data and trigger the request
         formData.pipe(httpRequest);

source/main/ipc/compress-logs.js

@@ -32,7 +32,7 @@ export default () => {
           resolve(outputPath);
         });
 
-        archive.on('error', error => {
+        archive.on('error', (error) => {
           logger.error('COMPRESS_LOGS.ERROR', { error });
           reject(error);
         });
@@ -48,7 +48,7 @@ export default () => {
           archive.append(stream, { name: logFiles[i] });
         }
 
-        archive.finalize(error => {
+        archive.finalize((error) => {
           if (error) {
             logger.error('COMPRESS_LOGS.ERROR', { error });
             reject(error);

source/main/ipc/download-logs.js

@@ -13,7 +13,7 @@ export const downloadLogsChannel: MainIpcChannel<
 > = new MainIpcChannel(DOWNLOAD_LOGS_CHANNEL);
 
 export default () => {
-  downloadLogsChannel.onRequest(request => {
+  downloadLogsChannel.onRequest((request) => {
     const { compressedLogsFilePath, destinationPath } = request;
 
     if (!fs.existsSync(compressedLogsFilePath)) {

source/main/ipc/downloadManagerChannel.js

@@ -107,7 +107,7 @@ const requestDownload = async (
 
   download.on('start', eventActions.start);
   download.on('download', eventActions.download);
-  download.on(progressType, evt => {
+  download.on(progressType, (evt) => {
     if (!evt || parseInt(evt.progress, 10) === currentDownloadData) return;
     currentDownloadData++;
     eventActions.progress(evt);

source/main/ipc/generateAddressPDFChannel.js

@@ -40,7 +40,7 @@ export const handleAddressPDFRequests = () => {
           author,
         } = request;
 
-        const readAssetSync = p => fs.readFileSync(path.join(__dirname, p));
+        const readAssetSync = (p) => fs.readFileSync(path.join(__dirname, p));
         let fontRegular;
         let fontMedium;
 
@@ -90,13 +90,10 @@ export const handleAddressPDFRequests = () => {
           }).fillColor(textColor);
 
           // Title
-          doc
-            .font(fontBufferMedium)
-            .fontSize(18)
-            .text(title.toUpperCase(), {
-              align: 'center',
-              characterSpacing: 2,
-            });
+          doc.font(fontBufferMedium).fontSize(18).text(title.toUpperCase(), {
+            align: 'center',
+            characterSpacing: 2,
+          });
 
           // Creation date
           doc
@@ -118,21 +115,15 @@ export const handleAddressPDFRequests = () => {
           doc.moveDown();
 
           // Address
-          doc
-            .font(fontBufferMono)
-            .fontSize(19)
-            .text(address, {
-              align: 'center',
-              characterSpacing: 1.5,
-            });
+          doc.font(fontBufferMono).fontSize(19).text(address, {
+            align: 'center',
+            characterSpacing: 1.5,
+          });
 
           if (note) {
             doc.moveDown();
             // Note title
-            doc
-              .font(fontBufferRegular)
-              .fontSize(14)
-              .text(noteLabel);
+            doc.font(fontBufferRegular).fontSize(14).text(noteLabel);
 
             // Note
             doc.font(fontBufferUnicode).text(note);

source/main/ipc/generatePaperWalletChannel.js

@@ -38,8 +38,8 @@ export const handlePaperWalletRequests = () => {
         } = request;
 
         // Helpers
-        const printMnemonic = index => `${index + 1}. ${mnemonics[index]}`;
-        const readAssetSync = p => fs.readFileSync(path.join(__dirname, p));
+        const printMnemonic = (index) => `${index + 1}. ${mnemonics[index]}`;
+        const readAssetSync = (p) => fs.readFileSync(path.join(__dirname, p));
 
         // Generate QR image for wallet address
         const qrCodeImage = qr.imageSync(address, {

source/main/ipc/generateRewardsCsvChannel.js

@@ -25,7 +25,7 @@ export const handleRewardsCsvRequests = () => {
             return reject(csvErr);
           }
 
-          return fs.writeFile(filePath, output, fileErr => {
+          return fs.writeFile(filePath, output, (fileErr) => {
             if (fileErr) {
               return reject(fileErr);
             }

source/main/ipc/get-logs.js

@@ -59,10 +59,7 @@ export default () => {
     // check if pub folder exists and create array of log file names
     const logFiles: Array<string> = [];
     if (fs.existsSync(pubLogsFolderPath)) {
-      const files = fs
-        .readdirSync(pubLogsFolderPath)
-        .sort()
-        .reverse();
+      const files = fs.readdirSync(pubLogsFolderPath).sort().reverse();
 
       let nodeLogsIncluded = 0;
       let launcherLogsIncluded = 0;

source/main/ipc/getHardwareWalletChannel.js

@@ -1,7 +1,7 @@
 // @flow
 /* eslint-disable no-console */
 // @TODO - enable console once connecting logic refined
-import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
+//import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
 import AppAda, { cardano } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import { BrowserWindow } from 'electron';
 // $FlowFixMe

source/main/ipc/lib/MainIpcChannel.js

@@ -37,7 +37,7 @@ export class MainIpcChannel<Incoming, Outgoing> extends IpcChannel<
   }
 
   onRequest(
-    handler: Incoming => Promise<Outgoing>,
+    handler: (Incoming) => Promise<Outgoing>,
     receiver: IpcReceiver = ipcMain
   ): void {
     super.onRequest(handler, receiver);