mac/windows: rename install/data dir to contain Mainnet (#1986)

* mac/windows: rename install/data dir to contain Mainnet

* mainnet installer: fix linux application names

* also removes creating `daedalus` without a cluster bin

* Update Daedalus Mainnet handling

* db-converter: remove from bridge as it is not used

* fix missing reference to db-converter

Co-authored-by: Nikola Glumac <niglumac@gmail.com>

Author: disassembler

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## 1.0.0
+
+### Chores
+
+- Rename "Daedalus" to "Daedalus Mainnet" and update state directory path ([PR 1986](https://github.com/input-output-hk/daedalus/pull/1986))
+
 ## 1.0.0-FC5
 
 ### Fixes

default.nix

@@ -50,7 +50,6 @@ let
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
     export-wallets = self.cardano-sl.nix-tools.cexes.cardano-wallet.export-wallets;
-    db-converter = self.cardano-wallet.db-converter;
 
     nodejs = pkgs.nodejs-12_x;
     yarnInfo = {
@@ -342,9 +341,9 @@ let
       fi
     '';
     desktopItem = pkgs.makeDesktopItem {
-      name = "Daedalus${if cluster != "mainnet" then "-${self.linuxClusterBinName}" else ""}";
+      name = "Daedalus-${self.linuxClusterBinName}";
       exec = "INSERT_PATH_HERE";
-      desktopName = "Daedalus${if cluster != "mainnet" then " ${self.linuxClusterBinName}" else ""}";
+      desktopName = "Daedalus ${self.linuxClusterBinName}";
       genericName = "Crypto-Currency Wallet";
       categories = "Application;Network;";
       icon = "INSERT_ICON_PATH_HERE";
@@ -367,13 +366,12 @@ let
       cp -f ${self.iconPath.small} $DAEDALUS_DIR/icon.png
       cp -Lf ${self.namespaceHelper}/bin/namespaceHelper $DAEDALUS_DIR/namespaceHelper
       mkdir -pv ~/.local/bin ''${XDG_DATA_HOME}/applications
-      ${pkgs.lib.optionalString (cluster == "mainnet") "cp -Lf ${self.namespaceHelper}/bin/namespaceHelper ~/.local/bin/daedalus"}
       cp -Lf ${self.namespaceHelper}/bin/namespaceHelper ~/.local/bin/daedalus-${self.linuxClusterBinName}
 
       cat ${self.desktopItem}/share/applications/Daedalus*.desktop | sed \
         -e "s+INSERT_PATH_HERE+''${DAEDALUS_DIR}/namespaceHelper+g" \
         -e "s+INSERT_ICON_PATH_HERE+''${DAEDALUS_DIR}/icon_large.png+g" \
-        > "''${XDG_DATA_HOME}/applications/Daedalus${if cluster != "mainnet" then "-${self.linuxClusterBinName}" else ""}.desktop"
+        > "''${XDG_DATA_HOME}/applications/Daedalus-${self.linuxClusterBinName}.desktop"
     '';
     xdg-open = pkgs.writeScriptBin "xdg-open" ''
       #!${pkgs.stdenv.shell}

installers/common/MacInstaller.hs

@@ -261,7 +261,7 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
     Cardano bridge -> do
       common bridge
       -- Executables (from daedalus-bridge)
-      forM_ ["cardano-wallet-byron", "cardano-node", "cardano-cli", "export-wallets", "db-converter" ] $ \f ->
+      forM_ ["cardano-wallet-byron", "cardano-node", "cardano-cli", "export-wallets" ] $ \f ->
         cp (bridge </> "bin" </> f) (dir </> f)
       forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
@@ -275,7 +275,7 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       rmtree $ dataDir </> "app/installers"
 
       -- Rewrite libs paths and bundle them
-      void $ chain (encodeString dir) $ fmap tt [dir </> "cardano-launcher", dir </> "cardano-wallet-byron", dir </> "cardano-node", dir </> "cardano-cli", dir </> "export-wallets", dir </> "db-converter" ]
+      void $ chain (encodeString dir) $ fmap tt [dir </> "cardano-launcher", dir </> "cardano-wallet-byron", dir </> "cardano-node", dir </> "cardano-cli", dir </> "export-wallets" ]
     Jormungandr bridge -> do
       common bridge
       -- Executables (from daedalus-bridge)

installers/common/WindowsInstaller.hs

@@ -193,7 +193,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{hasBlock0,inst
                     file [] "cardano-node.exe"
                     file [] "cardano-wallet-byron.exe"
                     file [] "export-wallets.exe"
-                    file [] "db-converter.exe"
                     file [] "cardano-cli.exe"
                     file [] "config.yaml"
                     file [] "topology.yaml"

nix/cardano-bridge.nix

@@ -1,4 +1,4 @@
-{ target, pkgs, runCommand, cardano-wallet, cardano-node, cardano-shell, export-wallets, db-converter, cardano-cli }:
+{ target, pkgs, runCommand, cardano-wallet, cardano-node, cardano-shell, export-wallets, cardano-cli }:
 
 let
   commonLib = import ../lib.nix {};
@@ -16,15 +16,8 @@ in runCommand "daedalus-cardano-bridge" {
   cp ${cardano-shell.nix-tools.cexes.cardano-launcher.cardano-launcher}/bin/cardano-launcher* .
   cp ${cardano-node}/bin/cardano-node* .
   cp ${export-wallets}/bin/export-wallets* .
-  cp ${db-converter}/bin/db-converter* .
   cp ${cardano-cli}/bin/cardano-cli* .
   ${pkgs.lib.optionalString (target == "x86_64-windows") ''
     cp ${pkgsCross.libffi}/bin/libffi-6.dll .
   ''}
 ''
-  #${pkgs.lib.optionalString (target == "x86_64-linux") ''
-  #  for bin in cardano-launcher cardano-wallet-byron cardano-node export-wallets db-converter; do
-  #    ${pkgs.binutils-unwrapped}/bin/strip $bin
-  #    ${pkgs.patchelf}/bin/patchelf --shrink-rpath $bin
-  #  done
-  #''}

nix/launcher-config.nix

@@ -27,7 +27,7 @@ let
 
   isDevOrLinux = devShell || os == "linux";
 
-  mkSpacedName = network: if network == "mainnet" then "Daedalus" else "Daedalus ${installDirectorySuffix}";
+  mkSpacedName = network: "Daedalus ${installDirectorySuffix}";
   spacedName = mkSpacedName network;
 
   frontendBinPath = let
@@ -57,6 +57,7 @@ let
 
   installDirectorySuffix = let
     supportedNetworks = {
+      mainnet = "Mainnet";
       mainnet_flight = "Flight";
       qa = "QA";
       selfnode = "Selfnode";
@@ -86,10 +87,10 @@ let
   in path.${os};
 
   # Used for flight builds to find legacy paths for migration
-  mainnetDataDir = let
+  legacyDataDir = let
     path.linux = "\${XDG_DATA_HOME}/Daedalus/mainnet";
-    path.macos64 = "\${HOME}/Library/Application Support/${mkSpacedName "mainnet"}";
-    path.windows = "\${APPDATA}\\${mkSpacedName "mainnet"}";
+    path.macos64 = "\${HOME}/Library/Application Support/Daedalus";
+    path.windows = "\${APPDATA}\\Daedalus";
   in path.${os};
 
   logsPrefix = let
@@ -159,7 +160,6 @@ let
   mkConfigByron = let
     filterMonitoring = config: if devShell then config else builtins.removeAttrs config [ "hasPrometheus" "hasEKG" ];
     exportWalletsBin = mkBinPath "export-wallets";
-    dbConverterBin = mkBinPath "db-converter";
     walletBin = mkBinPath "cardano-wallet-byron";
     nodeBin = mkBinPath "cardano-node";
     cliBin = mkBinPath "cardano-cli";
@@ -191,7 +191,7 @@ let
       ''}
     '';
 
-    legacyStateDir = if network == "mainnet_flight" then mainnetDataDir else dataDir;
+    legacyStateDir = if (network == "mainnet_flight") || (network == "mainnet") then legacyDataDir else dataDir;
 
     legacyWalletDB = let
       path.linux = "Wallet";
@@ -211,7 +211,6 @@ let
         cliBin
         walletBin
         exportWalletsBin
-        dbConverterBin
         legacyStateDir
         legacyWalletDB
         legacySecretKey;
@@ -238,7 +237,7 @@ let
       macPackageName = "Daedalus${network}";
       dataDir = dataDir;
       hasBlock0 = false;
-      installerWinBinaries = [ "cardano-launcher.exe" "cardano-node.exe" "cardano-wallet-byron.exe" "export-wallets.exe" "db-converter.exe" "cardano-cli.exe" ];
+      installerWinBinaries = [ "cardano-launcher.exe" "cardano-node.exe" "cardano-wallet-byron.exe" "export-wallets.exe" "cardano-cli.exe" ];
     };
 
   in {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "1.0.0-FC5",
+  "version": "1.0.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

release.nix

@@ -67,5 +67,4 @@ in {
   };
   cardano-node = [ "x86_64-linux" "x86_64-darwin" "x86_64-windows" ];
   export-wallets = [ "x86_64-linux" "x86_64-darwin" "x86_64-windows" ];
-  db-converter = [ "x86_64-linux" "x86_64-darwin" "x86_64-windows" ];
 })

source/common/utils/environmentCheckers.js

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

source/main/cardano/utils.js

@@ -202,28 +202,24 @@ export const exportWallets = async (
     legacyWalletDBPath = path.join(exportSourcePath, legacyWalletDB);
   }
 
-  // In case of Daedalus Flight build we need to copy over
-  // legacySecretKey and legacyWalletDB from mainnet state dir
-  // into Daedalus Flight state dir before extracting the wallets
-  if (isFlight) {
-    try {
-      const response = await prepareMigrationData(
-        mainWindow,
-        stateDir,
-        legacySecretKeyPath,
-        legacyWalletDBPath,
-        locale
-      );
-      legacySecretKeyPath = response.legacySecretKeyPath;
-      legacyWalletDBPath = response.legacyWalletDBPath;
-    } catch (error) {
-      const { code } = error || {};
-      if (code === 'EBUSY') {
-        logger.info('ipcMain: Exporting wallets failed', {
-          errors: error,
-        });
-        return Promise.resolve({ wallets: [], errors: error });
-      }
+  // Prepare Daedalus migration data
+  try {
+    const response = await prepareMigrationData(
+      mainWindow,
+      stateDir,
+      legacySecretKeyPath,
+      legacyWalletDBPath,
+      locale
+    );
+    legacySecretKeyPath = response.legacySecretKeyPath;
+    legacyWalletDBPath = response.legacyWalletDBPath;
+  } catch (error) {
+    const { code } = error || {};
+    if (code === 'EBUSY') {
+      logger.info('ipcMain: Exporting wallets failed', {
+        errors: error,
+      });
+      return Promise.resolve({ wallets: [], errors: error });
     }
   }
 
@@ -266,10 +262,8 @@ export const exportWallets = async (
     errors,
   });
 
-  // Remove Daedalus Flight migration data
-  if (isFlight) {
-    await removeMigrationData(stateDir);
-  }
+  // Remove Daedalus migration data
+  await removeMigrationData(stateDir);
 
   return Promise.resolve({ wallets, errors });
 };