1.3.4 - Daedalus Master Key restore

app/actions/ada/daedalus-transfer-actions.js

@@ -4,7 +4,9 @@ import Action from '../lib/Action';
 export default class DaedalusTranferActions {
   startTransferFunds: Action<any> = new Action();
   startTransferPaperFunds: Action<any> = new Action();
-  setupTransferFunds: Action<any> = new Action();
+  startTransferMasterKey: Action<any> = new Action();
+  setupTransferFundsWithMnemonic: Action<any> = new Action();
+  setupTransferFundsWithMasterKey: Action<any> = new Action();
   backToUninitialized: Action<any> = new Action();
   transferFunds: Action<any> = new Action();
   cancelTransferFunds: Action<any> = new Action();

app/actions/ada/trezor-connect-actions.js → app/actions/ada/hw-connect-actions.js

@@ -1,12 +1,13 @@
 // @flow
 import Action from '../lib/Action';
 
-// ======= TREZOR CONNECT ACTIONS =======
+// ======= HARDWARE WALLET CONNECT ACTIONS =======
 
-export default class TrezorConnectActions {
+export default class HWConnectActions {
+  init: Action<void> = new Action();
   cancel: Action<void> = new Action();
   submitAbout: Action<void> = new Action();
-  goBacktToAbout: Action<void> = new Action();
+  goBackToAbout: Action<void> = new Action();
   submitConnect: Action<void> = new Action();
   submitSave: Action<string> = new Action();
 }

app/actions/ada/index.js

@@ -4,9 +4,10 @@ import TransactionsActions from './transactions-actions';
 import WalletSettingsActions from './wallet-settings-actions';
 import AddressesActions from './addresses-actions';
 import DaedalusTransferActions from './daedalus-transfer-actions';
-import TrezorConnectActions from './trezor-connect-actions';
+import HWConnectActions from './hw-connect-actions';
 import TrezorSendActions from './trezor-send-actions';
 import AdaRedemptionActions from './ada-redemption-actions';
+import LedgerSendActions from './ledger-send-actions';
 
 export type AdaActionsMap = {
   adaRedemption: AdaRedemptionActions,
@@ -15,8 +16,10 @@ export type AdaActionsMap = {
   walletSettings: WalletSettingsActions,
   addresses: AddressesActions,
   daedalusTransfer: DaedalusTransferActions,
-  trezorConnect: TrezorConnectActions,
+  trezorConnect: HWConnectActions,
   trezorSend: TrezorSendActions,
+  ledgerConnect: HWConnectActions,
+  ledgerSend: LedgerSendActions,
 };
 
 const adaActionsMap: AdaActionsMap = {
@@ -26,8 +29,10 @@ const adaActionsMap: AdaActionsMap = {
   walletSettings: new WalletSettingsActions(),
   addresses: new AddressesActions(),
   daedalusTransfer: new DaedalusTransferActions(),
-  trezorConnect: new TrezorConnectActions(),
+  trezorConnect: new HWConnectActions(),
   trezorSend: new TrezorSendActions(),
+  ledgerConnect: new HWConnectActions(),
+  ledgerSend: new LedgerSendActions(),
 };
 
 export default adaActionsMap;

app/actions/ada/ledger-send-actions.js

@@ -0,0 +1,15 @@
+// @flow
+import Action from '../lib/Action';
+
+export type SendUsingLedgerParams = {
+  receiver: string,
+  amount: string
+};
+
+// ======= Sending ADA using Ledger ACTIONS =======
+
+export default class LedgerSendActions {
+  init: Action<void> = new Action();
+  cancel: Action<void> = new Action();
+  sendUsingLedger: Action<SendUsingLedgerParams> = new Action();
+}

app/actions/wallet-backup-actions.js

@@ -15,4 +15,5 @@ export default class WalletBackupActions {
   restartWalletBackup: Action<any> = new Action();
   cancelWalletBackup: Action<any> = new Action();
   finishWalletBackup: Action<any> = new Action();
+  removeOneMnemonicWord: Action<any> = new Action();
 }

app/api/ada/daedalusTransfer.js

@@ -20,9 +20,6 @@ import {
   NoInputsError,
   GenerateTransferTxError
 } from './errors';
-import {
-  getCryptoDaedalusWalletFromMnemonics
-} from './lib/cardanoCrypto/cryptoWallet';
 import {
   getAllUTXOsForAddresses
 } from './adaTransactions/adaNewTransactions';
@@ -38,14 +35,11 @@ import { getReceiverAddress } from './adaAddress';
  * @param fullUtxo the full utxo of the Cardano blockchain
  */
 export function getAddressesWithFunds(payload: {
-  secretWords: string,
+  checker: CryptoAddressChecker,
   fullUtxo: Array<string>
 }): Array<CryptoDaedalusAddressRestored> {
   try {
-    const { secretWords, fullUtxo } = payload;
-    const checker: CryptoAddressChecker = getResultOrFail(
-      RandomAddressChecker.newCheckerFromMnemonics(secretWords)
-    );
+    const { checker, fullUtxo } = payload;
     const addressesWithFunds: Array<CryptoDaedalusAddressRestored> = getResultOrFail(
       RandomAddressChecker.checkAddresses(checker, fullUtxo)
     );
@@ -58,12 +52,12 @@ export function getAddressesWithFunds(payload: {
 
 /** Generate transaction including all addresses with no change */
 export async function generateTransferTx(payload: {
-  secretWords: string,
+  wallet: CryptoDaedalusWallet,
   addressesWithFunds: Array<CryptoDaedalusAddressRestored>
 }): Promise<TransferTx> {
   try {
 
-    const { secretWords, addressesWithFunds } = payload;
+    const { wallet, addressesWithFunds } = payload;
 
     // fetch data to make transaction
     const senders = addressesWithFunds.map(a => a.address);
@@ -78,8 +72,7 @@ export async function generateTransferTx(payload: {
     // pick which address to send transfer to
     const output = await getReceiverAddress();
 
-    // get wallet and make transaction
-    const wallet = getCryptoDaedalusWalletFromMnemonics(secretWords);
+    // make transaction
     const tx: MoveResponse = getResultOrFail(Wallet.move(wallet, inputs, output));
 
     // return summary of transaction

app/api/ada/hardwareWallet/README.md

@@ -0,0 +1,130 @@
+# newTransaction.js
+This module is responsible for managing hardware wallet device sign transaction, and it's two step process.
+- Prepare the payload data format to be consume by respective hawrdware wallets(Trezor/Ledger).
+- Propagate the hardware wallet signed transaction to the blockchain.
+
+## Prepare the payload data format to be consume by respective hawrdware wallets(Trezor/Ledger).
+For that let's first understand Cardano's format(UnsignedTransactionExt).
+```
+const txExt = {
+  "inputs": [
+       {
+            "ptr": {
+                 "index": 0,
+                 "id": "2610d9fe9af9ac321d631b231edc8433105a2facf2b1b7048d3365458ba0c060"
+            },
+            "value": {
+                 "address": "Ae2tdPwUPEZHEU3j2jSAhuvwrCPvjSBHPjk4xTHEaiVGkrhneAGB6qzZMoD",
+                 "value": "80000"
+            },
+            "addressing": {
+                 "account": 0,
+                 "change": 0,
+                 "index": 1
+            }
+       },
+       {
+            "ptr": {
+                 "index": 1,
+                 "id": "e70f354a69f0e67ac2114ac57e27bd4f15bfa8c66e00603bd8e975d90400bf63"
+            },
+            "value": {
+                 "address": "Ae2tdPwUPEZKVNJCH2CjBFNukyQBSEuq9xiU8hxdA4FxeT9ajY8L3dpevuR",
+                 "value": "1484495"
+            },
+            "addressing": {
+                 "account": 0,
+                 "change": 1,
+                 "index": 23
+            }
+       }
+  ],
+  "outputs": [
+       {
+            "address": "Ae2tdPwUPEZHAQPk7EHHmKXBWWS33QbEWb576v52yHMpPEt7HgjR42coDay",
+            "value": 20004
+       },
+       {
+            "address": "Ae2tdPwUPEZAa8d3kFZEJeSZvHk2EnWsnJ4mCowMD8NX8aStpuryFxunt9m",
+            "value": 1368631,
+            "isChange": true,
+            "fullAddress": {
+                 "cadAmount": {
+                      "getCCoin": 0
+                 },
+                 "cadId": "Ae2tdPwUPEZAa8d3kFZEJeSZvHk2EnWsnJ4mCowMD8NX8aStpuryFxunt9m",
+                 "cadIsUsed": false,
+                 "account": 0,
+                 "change": 1,
+                 "index": 24
+            }
+       }
+  ]
+}
+```
+
+- [Trezor.cardanoSignTransaction(trezorParams)](https://github.com/trezor/connect/blob/develop/docs/methods/cardanoSignTransaction.md)
+```
+  const trezorParams = {
+    "network": 2,
+    "transactions": [
+       "839f8200d81858248258206f9cf4bbad8fd0ac7487419ff7f1ed7ecfe90892f753325aaa74fbee73c227a601ff9f8282d818582183581cccb5b2e6aa52faa4a18e55c7712ee69ddc1bfafebf4c9e9fcb154a1ba0001a59f92a181a000138808282d818582183581c5f616829cd5536ba6b5931bc2aeca6016e6d8dd0a054a2e57650d617a0001a43d762111a001a4022ffa0",
+       "839f8200d81858248258206f9cf4bbad8fd0ac7487419ff7f1ed7ecfe90892f753325aaa74fbee73c227a6008200d81858248258202610d9fe9af9ac321d631b231edc8433105a2facf2b1b7048d3365458ba0c06001ff9f8282d818582183581caae0559f67add7d768b91ef3e55f1ce0e400037a11da3cacd1c101b7a0001a6aefab2c19ea608282d818582183581ce35422b874147b84ab476cf799198f29f1f3dacfac6ec3738f92caffa0001aa6d6ed8c1a0016a6cfffa0"
+    ],
+    "inputs": [
+       {
+            "path": "m/44'/1815'/0'/0/1",
+            "prev_hash": "2610d9fe9af9ac321d631b231edc8433105a2facf2b1b7048d3365458ba0c060",
+            "prev_index": 0,
+            "type": 0
+       },
+       {
+            "path": "m/44'/1815'/0'/1/23",
+            "prev_hash": "e70f354a69f0e67ac2114ac57e27bd4f15bfa8c66e00603bd8e975d90400bf63",
+            "prev_index": 1,
+            "type": 0
+       }
+    ],
+    "outputs": [
+       {
+            "amount": "20004",
+            "address": "Ae2tdPwUPEZHAQPk7EHHmKXBWWS33QbEWb576v52yHMpPEt7HgjR42coDay"
+       },
+       {
+            "amount": "1368631",
+            "path": "m/44'/1815'/0'/1/24"
+       }
+    ]
+  }
+```  
+
+- [Ledger.signTransaction(ledgerParams)](https://github.com/vacuumlabs/ledgerjs/blob/1a85a888f7c2a0494b2dda0451e85916b43e7101/packages/hw-app-ada/src/Ada.js#L291)
+```
+  const ledgerParams = {
+    "inputs" : [
+       {
+         txDataHex: trezorParams.transactions[0],
+         outputIndex: trezorParams.inputs[0].prev_index,
+         path: utils.str_to_path(trezorParams.inputs[0].path)
+       },
+       {
+         txDataHex: trezorParams.transactions[1],
+         outputIndex: trezorParams.inputs[1].prev_index,
+         path: utils.str_to_path(trezorParams.inputs[1].path)
+       }
+    ],
+    "outputs": [
+        {
+          amountStr: trezorParams.outputs[0].amount,
+          address58: trezorParams.outputs[0].address
+        },
+        {
+          amountStr: trezorParams.outputs[1].amount,
+          path: utils.str_to_path(trezorParams.outputs[1].path)
+        }
+    ]
+  }
+```
+
+## Propagate the hardware wallet signed transaction to the blockchain
+TODO

app/api/ada/hardwareWallet/createTrezorWallet.js → app/api/ada/hardwareWallet/createWallet.js

@@ -21,25 +21,26 @@ import { createHardwareWalletAccount } from '../adaAccount';
  * Caches the fetched address results locally (into lovefieldDatabase)
  * @returns a new AdaWallet
  */
-export async function createTrezorWallet({
+export async function createWallet({
   walletInitData
 }: AdaHardwareWalletParams): Promise<AdaWallet> {
   try {
-    Logger.debug('createTrezorWallet::createTrezorWallet called');
+    Logger.debug('hardwareWallet::createWallet called');
 
     // create ada wallet object for hardware wallet
-    const [adaWallet] = createAdaHardwareWallet({ walletInitData });
+    const [hardwareWallet] = createAdaHardwareWallet({ walletInitData });
+
     // create crypto account object for hardware wallet
-    // eslint-disable-next-line max-len
-    const cryptoAccount = createHardwareWalletAccount(walletInitData.cwHardwareInfo.publicMasterKey);
+    const { publicMasterKey } = walletInitData.cwHardwareInfo;
+    const cryptoAccount = createHardwareWalletAccount(publicMasterKey);
 
     // Restore transactions and Save wallet + cryptoAccount to localstorage
-    await restoreTransactionsAndSave(cryptoAccount, adaWallet);
+    await restoreTransactionsAndSave(cryptoAccount, hardwareWallet);
 
-    Logger.debug('createTrezorWallet::createTrezorWallet success');
-    return adaWallet;
+    Logger.debug('hardwareWallet::createWallet success');
+    return hardwareWallet;
   } catch (error) {
-    Logger.error(`createTrezorWallet::createTrezorWallet error: ${stringifyError(error)}`);
+    Logger.error(`hardwareWallet::createWallet error: ${stringifyError(error)}`);
     throw error;
   }
 }