Cleanup DKG identity creation

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

@@ -9,7 +9,6 @@ import {
 import {
   ACCOUNT_SCHEMA_VERSION,
   AccountFormat,
-  Assert,
   encodeAccountImport,
   PromiseUtils,
   RpcClient,
@@ -117,16 +116,11 @@ export class DkgCreateCommand extends IronfishCommand {
       }
     }
 
-    const { name: participantName, identity } = ledger
-      ? await ui.retryStep(
-          () => {
-            Assert.isNotUndefined(ledger)
-            return this.getIdentityFromLedger(ledger, client, accountName)
-          },
-          this.logger,
-          true,
-        )
-      : await this.getParticipant(client, accountName)
+    const { name: participantName, identity } = await this.getOrCreateIdentity(
+      client,
+      ledger,
+      accountName,
+    )
 
     this.log(`Identity for ${participantName}: \n${identity} \n`)
 
@@ -207,6 +201,53 @@ export class DkgCreateCommand extends IronfishCommand {
     multisigClient?.stop()
   }
 
+  private async getOrCreateIdentity(
+    client: RpcClient,
+    ledger: LedgerMultiSigner | undefined,
+    name: string,
+  ): Promise<{
+    identity: string
+    name: string
+  }> {
+    const identities = await client.wallet.multisig.getIdentities()
+
+    if (ledger) {
+      const ledgerIdentity = await ledger.dkgGetIdentity(0)
+
+      const foundIdentity = identities.content.identities.find(
+        (i) => i.identity === ledgerIdentity.toString('hex'),
+      )
+
+      if (foundIdentity) {
+        this.debug('Identity from ledger already exists')
+        return foundIdentity
+      }
+
+      // We must use the ledger's identity
+      while (identities.content.identities.find((i) => i.name === name)) {
+        this.log('An identity with the same name already exists')
+        name = await ui.inputPrompt('Enter a new name for the identity', true)
+      }
+
+      const created = await client.wallet.multisig.importParticipant({
+        name,
+        identity: ledgerIdentity.toString('hex'),
+      })
+
+      return { name, identity: created.content.identity }
+    }
+
+    const foundIdentity = identities.content.identities.find((i) => i.name === name)
+
+    if (foundIdentity) {
+      this.debug(`Identity already exists with name: ${foundIdentity.name}`)
+      return foundIdentity
+    }
+
+    const created = await client.wallet.multisig.createParticipant({ name })
+    return { name, identity: created.content.identity }
+  }
+
   private async getParticipant(client: RpcClient, name: string) {
     const identities = await client.wallet.multisig.getIdentities()
     const foundIdentity = identities.content.identities.find((i) => i.name === name)