fix(ironfish): Use CLI flag option for name (#4903)

iron-fish · Apr 17, 2024 · 60beae3 · 60beae3
1 parent 1ec3e61
commit 60beae3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/ironfish/src/rpc/routes/wallet/importAccount.test.ts b/ironfish/src/rpc/routes/wallet/importAccount.test.ts
@@ -390,13 +390,14 @@ describe('Route wallet/importAccount', () => {
             name: testCaseFile,
           })
 
+          const name = 'new-account-name'
           const response = await routeTest.client.wallet.importAccount({
             account: testCase,
-            name: testCaseFile,
+            name,
           })
 
           expect(response.status).toBe(200)
-          expect(response.content.name).not.toBeNull()
+          expect(response.content.name).toEqual(name)
         }
       })
     })

diff --git a/ironfish/src/rpc/routes/wallet/importAccount.ts b/ironfish/src/rpc/routes/wallet/importAccount.ts
@@ -57,6 +57,7 @@ routes.register<typeof ImportAccountRequestSchema, ImportResponse>(
           accountImport = await tryDecodeAccountWithMultisigSecrets(
             context.wallet,
             request.data.account,
+            { name },
           )
         }
 

diff --git a/ironfish/src/rpc/routes/wallet/utils.ts b/ironfish/src/rpc/routes/wallet/utils.ts
@@ -284,12 +284,13 @@ export async function serializeRpcAccountStatus(
 export async function tryDecodeAccountWithMultisigSecrets(
   wallet: Wallet,
   value: string,
+  options?: { name?: string },
 ): Promise<AccountImport | undefined> {
   const encoder = new Base64JsonEncoder()
 
   for await (const { name, secret } of wallet.walletDb.getMultisigSecrets()) {
     try {
-      return encoder.decode(value, { name, multisigSecret: secret })
+      return encoder.decode(value, { name: options?.name ?? name, multisigSecret: secret })
     } catch (e: unknown) {
       continue
     }

diff --git a/ironfish/src/wallet/wallet.ts b/ironfish/src/wallet/wallet.ts
@@ -1526,7 +1526,7 @@ export class Wallet {
 
   async importAccount(accountValue: AccountImport): Promise<Account> {
     let multisigKeys = accountValue.multisigKeys
-    let name = accountValue.name
+    const name = accountValue.name
 
     if (
       accountValue.multisigKeys &&
@@ -1539,7 +1539,6 @@ export class Wallet {
         throw new Error('Cannot import identity without a corresponding multisig secret')
       }
 
-      name = multisigSecret.name
       multisigKeys = {
         keyPackage: accountValue.multisigKeys.keyPackage,
         publicKeyPackage: accountValue.multisigKeys.publicKeyPackage,