Rahul/ifl 3115 add ledger flag to account store

ironfish-cli/src/commands/wallet/account.ts

@@ -53,6 +53,7 @@ export class AccountsCommand extends IronfishCommand {
         Scanning: response.content.account.scanningEnabled ? chalk.green('✓') : '',
         Sequence: response.content.account.head?.sequence,
         Head: response.content.account.head?.hash,
+        Ledger: response.content.account.isLedger ? chalk.green('✓') : '',
       }
 
       this.log(ui.card(status))

ironfish-cli/src/commands/wallet/burn.ts

@@ -87,10 +87,6 @@ This will destroy tokens and decrease supply for a given asset.`
       default: false,
       description: 'Wait for the transaction to be confirmed',
     }),
-    ledger: Flags.boolean({
-      default: false,
-      description: 'Burn a transaction using a Ledger device',
-    }),
   }
 
   async start(): Promise<void> {
@@ -109,6 +105,7 @@ This will destroy tokens and decrease supply for a given asset.`
     }
 
     const account = await useAccount(client, flags.account)
+    const accountStatus = (await client.wallet.getAccountStatus({ account })).content.account
 
     let assetId = flags.assetId
 
@@ -225,7 +222,7 @@ This will destroy tokens and decrease supply for a given asset.`
 
     await this.confirm(assetData, amount, raw.fee, account, flags.confirm)
 
-    if (flags.ledger) {
+    if (accountStatus.isLedger) {
       await ui.sendTransactionWithLedger(
         client,
         raw,

ironfish-cli/src/commands/wallet/chainport/send.ts

@@ -79,10 +79,6 @@ export class BridgeCommand extends IronfishCommand {
       description:
         'Return a serialized UnsignedTransaction. Use it to create a transaction and build proofs but not post to the network',
     }),
-    ledger: Flags.boolean({
-      default: false,
-      description: 'Send a transaction using a Ledger device',
-    }),
   }
 
   async start(): Promise<void> {
@@ -107,7 +103,7 @@ export class BridgeCommand extends IronfishCommand {
       }
     }
 
-    const { targetToken, from, to, amount, asset, assetData, expiration } =
+    const { targetToken, from, to, amount, asset, assetData, expiration, isLedger } =
       await this.getAndValidateInputs(client, networkId)
 
     const rawTransaction = await this.constructBridgeTransaction(
@@ -132,7 +128,7 @@ export class BridgeCommand extends IronfishCommand {
       this.exit(0)
     }
 
-    if (flags.ledger) {
+    if (isLedger) {
       await ui.sendTransactionWithLedger(
         client,
         rawTransaction,
@@ -305,7 +301,20 @@ export class BridgeCommand extends IronfishCommand {
         },
       })
     }
-    return { targetToken, from, to, amount, asset, assetData, expiration }
+
+    const accountStatus = (await client.wallet.getAccountStatus({ account: from })).content
+      .account
+
+    return {
+      targetToken,
+      from,
+      to,
+      amount,
+      asset,
+      assetData,
+      expiration,
+      isLedger: accountStatus.isLedger,
+    }
   }
 
   private async constructBridgeTransaction(

ironfish-cli/src/commands/wallet/import.ts

@@ -6,8 +6,8 @@ import { Args, Flags, ux } from '@oclif/core'
 import { IronfishCommand } from '../../command'
 import { RemoteFlags } from '../../flags'
 import { LedgerError, LedgerMultiSigner, LedgerSingleSigner } from '../../ledger'
-import { checkWalletUnlocked, inputPrompt } from '../../ui'
 import * as ui from '../../ui'
+import { checkWalletUnlocked, inputPrompt } from '../../ui'
 import { importFile, importPipe, longPrompt } from '../../ui/longPrompt'
 import { importAccount } from '../../utils'
 

ironfish-cli/src/commands/wallet/index.ts

@@ -73,6 +73,11 @@ export class AccountsCommand extends IronfishCommand {
           header: 'Head',
           extended: true,
         },
+        isLedger: {
+          get: (row) => (row.isLedger ? chalk.green('✓') : ''),
+          header: 'Ledger',
+          extended: true,
+        },
       },
       {
         ...flags,

ironfish-cli/src/commands/wallet/mint.ts

@@ -108,10 +108,6 @@ This will create tokens and increase supply for a given asset.`
         'Return a serialized UnsignedTransaction. Use it to create a transaction and build proofs but not post to the network',
       exclusive: ['rawTransaction'],
     }),
-    ledger: Flags.boolean({
-      default: false,
-      description: 'Mint a transaction using a Ledger device',
-    }),
   }
 
   async start(): Promise<void> {
@@ -130,6 +126,7 @@ This will create tokens and increase supply for a given asset.`
     }
 
     const account = await useAccount(client, flags.account)
+    const accountStatus = (await client.wallet.getAccountStatus({ account })).content.account
 
     const publicKeyResponse = await client.wallet.getAccountPublicKey({ account })
     const accountPublicKey = publicKeyResponse.content.publicKey
@@ -311,7 +308,7 @@ This will create tokens and increase supply for a given asset.`
       assetData,
     )
 
-    if (flags.ledger) {
+    if (accountStatus.isLedger) {
       await ui.sendTransactionWithLedger(
         client,
         raw,

ironfish-cli/src/commands/wallet/multisig/commitment/create.ts

@@ -38,10 +38,6 @@ export class CreateSigningCommitmentCommand extends IronfishCommand {
     path: Flags.string({
       description: 'Path to a JSON file containing multisig transaction data',
     }),
-    ledger: Flags.boolean({
-      default: false,
-      description: 'Create signing commitment using a Ledger device',
-    }),
   }
 
   async start(): Promise<void> {
@@ -58,6 +54,9 @@ export class CreateSigningCommitmentCommand extends IronfishCommand {
       participantName = await ui.multisigSecretPrompt(client)
     }
 
+    const accountStatus = (await client.wallet.getAccountStatus({ account: participantName }))
+      .content.account
+
     let identities = options.identity
     if (!identities || identities.length < 2) {
       const input = await ui.longPrompt(
@@ -94,7 +93,7 @@ export class CreateSigningCommitmentCommand extends IronfishCommand {
 
     await ui.confirmOrQuit('Confirm signing commitment creation', flags.confirm)
 
-    if (flags.ledger) {
+    if (accountStatus.isLedger) {
       await this.createSigningCommitmentWithLedger(
         client,
         participantName,

ironfish-cli/src/commands/wallet/multisig/dealer/create.ts

@@ -98,6 +98,7 @@ export class MultisigCreateDealer extends IronfishCommand {
         multisigKeys: {
           publicKeyPackage: response.content.publicKeyPackage,
         },
+        isLedger: false,
       }
 
       await client.wallet.importAccount({

ironfish-cli/src/commands/wallet/multisig/dkg/create.ts

@@ -527,6 +527,7 @@ export class DkgCreateCommand extends IronfishCommand {
       },
       version: ACCOUNT_SCHEMA_VERSION,
       name: accountName,
+      isLedger: true,
       createdAt: null,
       spendingKey: null,
     }

ironfish-cli/src/commands/wallet/multisig/dkg/round3.ts

@@ -235,6 +235,7 @@ export class DkgRound3Command extends IronfishCommand {
       },
       version: ACCOUNT_SCHEMA_VERSION,
       name: participantName,
+      isLedger: true,
       spendingKey: null,
       createdAt: null,
     }

ironfish-cli/src/commands/wallet/multisig/sign.ts

@@ -44,10 +44,6 @@ export class SignMultisigTransactionCommand extends IronfishCommand {
       char: 'a',
       description: 'Name of the account to use for signing the transaction',
     }),
-    ledger: Flags.boolean({
-      default: false,
-      description: 'Perform operation with a ledger device',
-    }),
     server: Flags.boolean({
       description: 'connect to a multisig broker server',
     }),
@@ -78,12 +74,6 @@ export class SignMultisigTransactionCommand extends IronfishCommand {
     const client = await this.connectRpc()
     await ui.checkWalletUnlocked(client)
 
-    let ledger: LedgerMultiSigner | undefined = undefined
-
-    if (flags.ledger) {
-      ledger = new LedgerMultiSigner()
-    }
-
     let multisigAccountName: string
     if (!flags.account) {
       multisigAccountName = await ui.accountPrompt(client)
@@ -97,6 +87,18 @@ export class SignMultisigTransactionCommand extends IronfishCommand {
       }
     }
 
+    const accountStatus = (
+      await client.wallet.getAccountStatus({
+        account: multisigAccountName,
+      })
+    ).content.account
+
+    let ledger: LedgerMultiSigner | undefined = undefined
+
+    if (accountStatus.isLedger) {
+      ledger = new LedgerMultiSigner()
+    }
+
     const accountIdentities = (
       await client.wallet.multisig.getAccountIdentities({ account: multisigAccountName })
     ).content.identities
@@ -149,7 +151,10 @@ export class SignMultisigTransactionCommand extends IronfishCommand {
     )
 
     // Prompt for confirmation before broker automates signing
-    if (!flags.ledger && sessionManager instanceof MultisigClientSigningSessionManager) {
+    if (
+      !accountStatus.isLedger &&
+      sessionManager instanceof MultisigClientSigningSessionManager
+    ) {
       await ui.confirmOrQuit('Sign this transaction?')
     }
 

ironfish-cli/src/commands/wallet/send.ts

@@ -103,10 +103,6 @@ export class Send extends IronfishCommand {
       description: 'The note hashes to include in the transaction',
       multiple: true,
     }),
-    ledger: Flags.boolean({
-      default: false,
-      description: 'Send a transaction using a Ledger device',
-    }),
   }
 
   async start(): Promise<void> {
@@ -128,6 +124,8 @@ export class Send extends IronfishCommand {
     }
 
     const from = await useAccount(client, flags.account, 'Select an account to send from')
+    const accountStatus = (await client.wallet.getAccountStatus({ account: from })).content
+      .account
 
     if (assetId == null) {
       const asset = await ui.assetPrompt(client, from, {
@@ -255,7 +253,7 @@ export class Send extends IronfishCommand {
       this.exit(0)
     }
 
-    if (flags.ledger) {
+    if (accountStatus.isLedger) {
       await ui.sendTransactionWithLedger(
         client,
         raw,

ironfish-cli/src/ledger/ledgerMultiSigner.ts

@@ -178,6 +178,7 @@ export class LedgerMultiSigner extends Ledger {
         publicKeyPackage: publicKeyPackage.toString('hex'),
         identity: identity.toString('hex'),
       },
+      isLedger: true,
       version: ACCOUNT_SCHEMA_VERSION,
       spendingKey: null,
       createdAt: null,

ironfish-cli/src/ledger/ledgerSingleSigner.ts

@@ -50,6 +50,7 @@ export class LedgerSingleSigner extends Ledger {
       outgoingViewKey: responseViewKey.ovk.toString('hex'),
       proofAuthorizingKey: responsePGK.nsk.toString('hex'),
       spendingKey: null,
+      isLedger: true,
       createdAt: null,
     }
 

ironfish/src/rpc/routes/wallet/importAccount.test.ts

@@ -43,6 +43,7 @@ describe('Route wallet/importAccount', () => {
       proofAuthorizingKey: null,
       version: 1,
       createdAt: null,
+      isLedger: false,
     }
 
     const response = await routeTest.client.wallet.importAccount({
@@ -69,6 +70,7 @@ describe('Route wallet/importAccount', () => {
       publicAddress: trustedDealerPackages.publicAddress,
       spendingKey: null,
       createdAt: null,
+      isLedger: false,
       proofAuthorizingKey: trustedDealerPackages.proofAuthorizingKey,
       multisigKeys: {
         publicKeyPackage: trustedDealerPackages.publicKeyPackage,
@@ -102,6 +104,7 @@ describe('Route wallet/importAccount', () => {
         proofAuthorizingKey: null,
         version: 1,
         createdAt: null,
+        isLedger: false,
       }),
       rescan: false,
     })
@@ -129,6 +132,7 @@ describe('Route wallet/importAccount', () => {
         proofAuthorizingKey: null,
         version: 1,
         createdAt: null,
+        isLedger: false,
       }),
       name: overriddenAccountName,
       rescan: false,
@@ -172,6 +176,7 @@ describe('Route wallet/importAccount', () => {
         proofAuthorizingKey: null,
         version: 1,
         createdAt: null,
+        isLedger: false,
       }
 
       const response = await routeTest.client.wallet.importAccount({
@@ -203,6 +208,7 @@ describe('Route wallet/importAccount', () => {
         version: 1,
         createdAt: null,
         proofAuthorizingKey: key.proofAuthorizingKey,
+        isLedger: false,
       }
     }
 
@@ -500,6 +506,7 @@ describe('Route wallet/importAccount', () => {
         keyPackage: trustedDealerPackages.keyPackages[1].keyPackage.toString(),
         secret: secrets[1].serialize().toString('hex'),
       },
+      isLedger: false,
     }
 
     try {
@@ -582,6 +589,7 @@ describe('Route wallet/importAccount', () => {
         publicKeyPackage: trustedDealerPackages.publicKeyPackage,
         identity: nextIdentity,
       },
+      isLedger: false,
     }
 
     try {
@@ -625,6 +633,7 @@ describe('Route wallet/importAccount', () => {
         publicKeyPackage: trustedDealerPackages.publicKeyPackage,
         identity: identity,
       },
+      isLedger: false,
     }
 
     const response = await routeTest.client.wallet.importAccount({

ironfish/src/rpc/routes/wallet/multisig/createSignatureShare.test.ts

@@ -34,6 +34,7 @@ describe('Route wallt/multisig/createSignatureShare', () => {
       version: ACCOUNT_SCHEMA_VERSION,
       spendingKey: null,
       createdAt: null,
+      isLedger: false,
     }
 
     const account = await routeTest.wallet.importAccount(accountImport)

ironfish/src/rpc/routes/wallet/multisig/createSigningCommitment.test.ts

@@ -53,6 +53,7 @@ describe('Route wallet/multisig/createSigningCommitment', () => {
         publicKeyPackage: trustedDealerPackage.publicKeyPackage,
       },
       proofAuthorizingKey: null,
+      isLedger: false,
     }
 
     const importAccountRequest = {

ironfish/src/rpc/routes/wallet/multisig/createTrustedDealerKeyPackage.ts

@@ -101,6 +101,7 @@ routes.register<
           keyPackage,
           publicKeyPackage,
         },
+        isLedger: false,
       }
 
       const encoder = new JsonEncoder()

ironfish/src/rpc/routes/wallet/multisig/dkg/round3.ts

@@ -92,6 +92,7 @@ routes.register<typeof DkgRound3RequestSchema, DkgRound3Response>(
         keyPackage,
         publicKeyPackage,
       },
+      isLedger: false,
     }
 
     const account = await node.wallet.importAccount(accountImport, {