[DDW-106] Wallet import feature

CHANGELOG.md

@@ -1,10 +1,11 @@
 Changelog
 =========
 
-## vNext
+## 1.0.0-FC3
 
 ### Features
 
+- Implemented "Wallet Import" feature ([PR 1956](https://github.com/input-output-hk/daedalus/pull/1956))
 - Force setting spending password on passwordless wallets ([PR 1957](https://github.com/input-output-hk/daedalus/pull/1957))
 
 ### Chores

nix/launcher-config.nix

@@ -191,22 +191,18 @@ let
       ''}
     '';
 
+    legacyStateDir = if network == "mainnet_flight" then mainnetDataDir else dataDir;
+
     legacyWalletDB = let
-      prefix = if network == "mainnet_flight"
-               then "${mainnetDataDir}${dirSep}"
-               else "${dataDir}${dirSep}";
-      path.linux = "${prefix}Wallet";
-      path.macos64 = "${prefix}Wallet-1.0";
-      path.windows = "${prefix}Wallet-1.0";
+      path.linux = "Wallet";
+      path.macos64 = "Wallet-1.0";
+      path.windows = "Wallet-1.0";
     in path.${os};
 
     legacySecretKey = let
-      prefix = if network == "mainnet_flight"
-               then "${mainnetDataDir}${dirSep}"
-               else "${dataDir}${dirSep}";
-      path.linux = "${prefix}Secrets${dirSep}secret.key";
-      path.macos64 = "${prefix}Secrets-1.0${dirSep}secret.key";
-      path.windows = "${prefix}Secrets-1.0${dirSep}secret.key";
+      path.linux = "Secrets${dirSep}secret.key";
+      path.macos64 = "Secrets-1.0${dirSep}secret.key";
+      path.windows = "Secrets-1.0${dirSep}secret.key";
     in path.${os};
 
     launcherConfig = defaultLauncherConfig // {
@@ -216,6 +212,7 @@ let
         walletBin
         exportWalletsBin
         dbConverterBin
+        legacyStateDir
         legacyWalletDB
         legacySecretKey;
       syncTolerance = "300s";

nix/sources.json

@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "input-output-hk",
         "repo": "cardano-sl",
-        "rev": "1702a9eb12953e76a5a8b070e5c6a2bfb02ff160",
-        "sha256": "0x6xlby8wzmvyd24qxpamrhq7gi1nw9xs78rk3c1y3ypq050pmqy",
+        "rev": "c1815b7dce5fb71d997bd3a94c4c5ccf2c9a9a94",
+        "sha256": "1dzfhv7qhv1498sd8jrac39qd8vgpdahv7dskg1hnfs5rw2gipar",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-sl/archive/1702a9eb12953e76a5a8b070e5c6a2bfb02ff160.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-sl/archive/c1815b7dce5fb71d997bd3a94c4c5ccf2c9a9a94.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-wallet": {

package.json

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

source/common/ipc/api.js

@@ -224,7 +224,9 @@ export type DetectSystemLocaleMainResponse = string;
  * Channel where renderer can ask main process to export wallets
  */
 export const EXPORT_WALLETS_CHANNEL = 'EXPORT_WALLETS_CHANNEL';
-export type ExportWalletsRendererRequest = void;
+export type ExportWalletsRendererRequest = {
+  exportSourcePath: string,
+};
 export type ExportWalletsMainResponse = {
   wallets: Array<ExportedByronWallet>,
   errors: string,

source/common/types/logging.types.js

@@ -2,6 +2,7 @@
 import type { CardanoNodeState } from './cardano-node.types';
 import type { SystemInfo } from '../../renderer/app/types/systemInfoTypes';
 import type { CoreSystemInfo } from '../../renderer/app/types/coreSystemInfoTypes';
+import type { WalletImportStatus } from '../../renderer/app/types/walletExportTypes';
 import type { WalletMigrationStatus } from '../../renderer/app/stores/WalletMigrationStore';
 import LocalizableError from '../../renderer/app/i18n/LocalizableError';
 
@@ -81,19 +82,31 @@ export type StateSnapshotLogParams = {
   networkTip: ?Object,
 };
 
+export type ExportedWalletData = {
+  id: string,
+  name: ?string,
+  hasPassword: boolean,
+  import?: {
+    status: WalletImportStatus,
+    error: ?LocalizableError,
+  },
+};
+
+export type RestoredWalletData = {
+  id: string,
+  name: string,
+  hasPassword: boolean,
+};
+
 export type WalletMigrationReportData = {
-  exportedWalletsData: Array<{ name: string }>,
+  exportedWalletsData: Array<ExportedWalletData>,
   exportedWalletsCount: number,
   exportErrors: string,
-  restoredWalletsData: Array<{
-    id: string,
-    name: string,
-    hasPassword: boolean,
-  }>,
+  restoredWalletsData: Array<RestoredWalletData>,
   restoredWalletsCount: number,
   restorationErrors: Array<{
     error: LocalizableError,
-    wallet: { name: string },
+    wallet: ExportedWalletData,
   }>,
   finalMigrationStatus: WalletMigrationStatus,
 };

source/main/cardano/setup.js

@@ -18,6 +18,7 @@ import type {
   CardanoStatus,
   TlsConfig,
 } from '../../common/types/cardano-node.types';
+import type { ExportWalletsRendererRequest } from '../../common/ipc/api';
 import {
   cardanoAwaitUpdateChannel,
   cardanoFaultInjectionChannel,
@@ -184,10 +185,16 @@ export const setupCardanoNode = (
     return cardanoNode.setFault(fault);
   });
 
-  exportWalletsChannel.onRequest(() => {
-    logger.info('ipcMain: Received request from renderer to export wallets');
-    return Promise.resolve(exportWallets(launcherConfig, mainWindow, locale));
-  });
+  exportWalletsChannel.onRequest(
+    ({ exportSourcePath }: ExportWalletsRendererRequest) => {
+      logger.info('ipcMain: Received request from renderer to export wallets', {
+        exportSourcePath,
+      });
+      return Promise.resolve(
+        exportWallets(exportSourcePath, launcherConfig, mainWindow, locale)
+      );
+    }
+  );
 
   return cardanoNode;
 };

source/main/cardano/utils.js

@@ -169,6 +169,7 @@ export const createSelfnodeConfig = async (
 };
 
 export const exportWallets = async (
+  exportSourcePath: string,
   launcherConfig: LauncherConfig,
   mainWindow: BrowserWindow,
   locale: string
@@ -182,7 +183,8 @@ export const exportWallets = async (
     isFlight,
   } = launcherConfig;
 
-  logger.info('ipcMain: Exporting wallets...', {
+  logger.info('ipcMain: Starting wallets export...', {
+    exportSourcePath,
     exportWalletsBin,
     legacySecretKey,
     legacyWalletDB,
@@ -191,19 +193,19 @@ export const exportWallets = async (
     isFlight,
   });
 
-  let legacySecretKeyPath = legacySecretKey;
-  let legacyWalletDBPath = legacyWalletDB;
+  let legacySecretKeyPath = path.join(exportSourcePath, legacySecretKey);
+  let legacyWalletDBPath = path.join(exportSourcePath, legacyWalletDB);
 
   // In case of Daedalus Flight build we need to copy over
-  // legacySecretKey and legacyWalletDB from Mainnet state dir
+  // 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,
-        legacySecretKey,
-        legacyWalletDB,
+        legacySecretKeyPath,
+        legacyWalletDBPath,
         locale
       );
       legacySecretKeyPath = response.legacySecretKeyPath;
@@ -219,26 +221,42 @@ export const exportWallets = async (
     }
   }
 
-  const clusterFlags = [];
+  // Export tool flags
+  const exportWalletsBinFlags = [];
+
+  // Cluster flags
   if (cluster === 'testnet') {
-    clusterFlags.push('--testnet', TESTNET_MAGIC);
+    exportWalletsBinFlags.push('--testnet', TESTNET_MAGIC);
   } else {
-    clusterFlags.push('--mainnet');
+    exportWalletsBinFlags.push('--mainnet');
   }
 
-  const { stdout, stderr } = spawnSync(exportWalletsBin, [
-    ...clusterFlags,
-    '--keyfile',
-    legacySecretKeyPath,
-    '--wallet-db-path',
-    legacyWalletDBPath,
-  ]);
+  // Secret key flags
+  exportWalletsBinFlags.push('--keyfile', legacySecretKeyPath);
+
+  // Wallet DB flags
+  const legacyWalletDBPathExists = await fs.pathExists(
+    `${legacyWalletDBPath}-acid`
+  );
+  if (legacyWalletDBPathExists) {
+    exportWalletsBinFlags.push('--wallet-db-path', legacyWalletDBPath);
+  }
+
+  logger.info('ipcMain: Exporting wallets...', {
+    exportWalletsBin,
+    exportWalletsBinFlags,
+  });
 
+  const { stdout, stderr } = spawnSync(exportWalletsBin, exportWalletsBinFlags);
   const wallets = JSON.parse(stdout.toString() || '[]');
   const errors = stderr.toString();
 
   logger.info(`ipcMain: Exported ${wallets.length} wallets`, {
-    walletsData: wallets.map(w => ({ name: w.name })),
+    walletsData: wallets.map(w => ({
+      name: w.name,
+      id: w.id,
+      hasPassword: w.is_passphrase_empty,
+    })),
     errors,
   });
 

source/main/config.js

@@ -70,6 +70,7 @@ export type LauncherConfig = {
   syncTolerance: string,
   cliBin: string,
   exportWalletsBin: string,
+  legacyStateDir: string,
   legacySecretKey: string,
   legacyWalletDB: string,
   isFlight: boolean,
@@ -114,6 +115,7 @@ export const {
   cluster,
   nodeImplementation,
   stateDir,
+  legacyStateDir,
   logsPrefix,
   isFlight,
 } = launcherConfig;
@@ -169,4 +171,4 @@ export const STAKE_POOL_REGISTRY_URL = {
 };
 
 // Cardano Byron Testnet network magic
-export const TESTNET_MAGIC = 1097911063;
+export const TESTNET_MAGIC = '1097911063';

source/main/preload.js

@@ -6,7 +6,12 @@ import { ipcRenderer as _ipcRenderer, remote as _remote } from 'electron';
 import _electronLog from 'electron-log-daedalus';
 import ElectronStore from 'electron-store';
 import { environment } from './environment';
-import { buildLabel, nodeImplementation, isFlight } from './config';
+import {
+  buildLabel,
+  legacyStateDir,
+  nodeImplementation,
+  isFlight,
+} from './config';
 
 const _process = process;
 const _isIncentivizedTestnet = nodeImplementation === 'jormungandr';
@@ -52,6 +57,7 @@ process.once('loaded', () => {
     },
     isIncentivizedTestnet: _isIncentivizedTestnet,
     isFlight,
+    legacyStateDir,
   });
   // Expose require for Spectron!
   if (_process.env.NODE_ENV === 'test') {

source/renderer/app/actions/index.js

@@ -12,6 +12,7 @@ import StakingActions from './staking-actions';
 import TransactionsActions from './transactions-actions';
 import WalletsActions from './wallets-actions';
 import WalletBackupActions from './wallet-backup-actions';
+import WalletMigrationActions from './wallet-migration-actions';
 import WalletSettingsActions from './wallet-settings-actions';
 import WindowActions from './window-actions';
 
@@ -29,6 +30,7 @@ export type ActionsMap = {
   transactions: TransactionsActions,
   wallets: WalletsActions,
   walletBackup: WalletBackupActions,
+  walletMigration: WalletMigrationActions,
   walletSettings: WalletSettingsActions,
   window: WindowActions,
 };
@@ -47,6 +49,7 @@ const actionsMap: ActionsMap = {
   transactions: new TransactionsActions(),
   wallets: new WalletsActions(),
   walletBackup: new WalletBackupActions(),
+  walletMigration: new WalletMigrationActions(),
   walletSettings: new WalletSettingsActions(),
   window: new WindowActions(),
 };

source/renderer/app/actions/wallet-migration-actions.js

@@ -0,0 +1,11 @@
+// @flow
+import Action from './lib/Action';
+
+export default class WalletMigrationActions {
+  startMigration: Action<any> = new Action();
+  finishMigration: Action<any> = new Action();
+  toggleWalletImportSelection: Action<string> = new Action();
+  updateWalletName: Action<{ id: string, name: string }> = new Action();
+  nextStep: Action<any> = new Action();
+  selectExportSourcePath: Action<any> = new Action();
+}

source/renderer/app/actions/wallet-settings-actions.js

@@ -13,7 +13,6 @@ export default class WalletSettingsActions {
   startEditingWalletField: Action<{ field: string }> = new Action();
   stopEditingWalletField: Action<any> = new Action();
   updateWalletField: Action<{ field: string, value: string }> = new Action();
-  // eslint-disable-next-line max-len
   updateSpendingPassword: Action<{
     walletId: string,
     oldPassword: string,

source/renderer/app/components/wallet/WalletAdd.js

@@ -69,7 +69,8 @@ const messages = defineMessages({
   },
   importDescription: {
     id: 'wallet.add.dialog.import.description',
-    defaultMessage: '!!!Import a wallet from a file',
+    defaultMessage:
+      '!!!Import wallets from an earlier version of Daedalus or the Daedalus state directory',
     description:
       'Description for the "Import" button on the wallet add dialog.',
   },
@@ -96,6 +97,9 @@ type Props = {
   onRestore: Function,
   onImportFile: Function,
   isMaxNumberOfWalletsReached: boolean,
+  isMainnet: boolean,
+  isTestnet: boolean,
+  isProduction: boolean,
 };
 
 @observer
@@ -116,6 +120,9 @@ export default class WalletAdd extends Component<Props> {
       onRestore,
       onImportFile,
       isMaxNumberOfWalletsReached,
+      isMainnet,
+      isTestnet,
+      isProduction,
     } = this.props;
 
     const componentClasses = classnames([styles.component, 'WalletAdd']);
@@ -166,7 +173,7 @@ export default class WalletAdd extends Component<Props> {
               icon={importIcon}
               label={intl.formatMessage(messages.importLabel)}
               description={intl.formatMessage(messages.importDescription)}
-              isDisabled
+              isDisabled={isProduction && !isMainnet && !isTestnet}
             />
           </div>
           {activeNotification ? (