Merge pull request #4074 from iron-fish/staging

Merge staging into master (1.6.0 release)
iron-fish · Jul 17, 2023 · e5551dc · e5551dc
2 parents e27a127 + 7676c8b
commit e5551dc
Show file tree

Hide file tree

Showing 141 changed files with 3,129 additions and 1,189 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ironfish-cli/package.json b/ironfish-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "CLI for running and interacting with an Iron Fish node",
   "author": "Iron Fish <[email protected]> (https://ironfish.network)",
   "main": "build/src/index.js",
@@ -59,8 +59,8 @@
     "@aws-sdk/client-s3": "3",
     "@aws-sdk/client-secrets-manager": "3",
     "@aws-sdk/s3-request-presigner": "3",
-    "@ironfish/rust-nodejs": "1.4.0",
-    "@ironfish/sdk": "1.5.0",
+    "@ironfish/rust-nodejs": "1.5.0",
+    "@ironfish/sdk": "1.6.0",
     "@oclif/core": "1.23.1",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",

diff --git a/ironfish-cli/scripts/import-export-test/README b/ironfish-cli/scripts/import-export-test/README
diff --git a/ironfish-cli/src/commands/chain/broadcast.ts b/ironfish-cli/src/commands/chain/broadcast.ts
@@ -26,7 +26,7 @@ export class BroadcastCommand extends IronfishCommand {
 
     CliUx.ux.action.start(`Broadcasting transaction`)
     const client = await this.sdk.connectRpc()
-    const response = await client.broadcastTransaction({ transaction })
+    const response = await client.chain.broadcastTransaction({ transaction })
     if (response.content) {
       CliUx.ux.action.stop(`Transaction broadcasted: ${response.content.hash}`)
     }

diff --git a/ironfish-cli/src/commands/wallet/export.ts b/ironfish-cli/src/commands/wallet/export.ts
@@ -1,11 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-import { spendingKeyToWords } from '@ironfish/rust-nodejs'
-import { Assert, Bech32m, ErrorUtils, LanguageKey, LanguageUtils } from '@ironfish/sdk'
+import { AccountFormat, ErrorUtils, LanguageUtils } from '@ironfish/sdk'
 import { CliUx, Flags } from '@oclif/core'
 import fs from 'fs'
-import inquirer from 'inquirer'
 import jsonColorizer from 'json-colorizer'
 import path from 'path'
 import { IronfishCommand } from '../../command'
@@ -64,52 +62,23 @@ export class ExportCommand extends IronfishCommand {
       flags.mnemonic = true
     }
 
-    const client = await this.sdk.connectRpc(local)
-    const response = await client.wallet.exportAccount({ account: account, viewOnly: viewOnly })
-    let output
-
-    if (flags.mnemonic) {
-      let languageCode = flags.language ? LanguageUtils.LANGUAGES[flags.language] : null
-
-      if (languageCode == null) {
-        languageCode = LanguageUtils.inferLanguageCode()
-
-        if (languageCode !== null) {
-          CliUx.ux.info(
-            `Detected Language as '${LanguageUtils.languageCodeToKey(
-              languageCode,
-            )}', exporting:`,
-          )
-        }
-      }
+    const format = flags.mnemonic
+      ? AccountFormat.Mnemonic
+      : flags.json
+      ? AccountFormat.JSON
+      : AccountFormat.Bech32
 
-      if (languageCode == null) {
-        CliUx.ux.info(`Could not detect your language, please select language for export`)
-        const response = await inquirer.prompt<{
-          language: LanguageKey
-        }>([
-          {
-            name: 'language',
-            message: `Select your language`,
-            type: 'list',
-            choices: LanguageUtils.LANGUAGE_KEYS,
-          },
-        ])
-        languageCode = LanguageUtils.LANGUAGES[response.language]
-      }
-      Assert.isTruthy(
-        response.content.account.spendingKey,
-        'The account you are trying to export does not have a spending key, therefore a mnemonic cannot be generated for it',
-      )
-      output = spendingKeyToWords(response.content.account.spendingKey, languageCode)
-    } else if (flags.json) {
-      output = JSON.stringify(response.content.account, undefined, '    ')
-
-      if (color && flags.json && !exportPath) {
-        output = jsonColorizer(output)
-      }
-    } else {
-      output = Bech32m.encode(JSON.stringify(response.content.account), 'ironfishaccount00000')
+    const client = await this.sdk.connectRpc(local)
+    const response = await client.wallet.exportAccount({
+      account,
+      viewOnly,
+      format,
+      language: flags.language,
+    })
+
+    let output = response.content.account as string
+    if (color && flags.json && !exportPath) {
+      output = jsonColorizer(output)
     }
 
     if (exportPath) {
@@ -135,7 +104,7 @@ export class ExportCommand extends IronfishCommand {
         }
 
         await fs.promises.writeFile(resolved, output)
-        this.log(`Exported account ${response.content.account.name} to ${resolved}`)
+        this.log(`Exported account ${account} to ${resolved}`)
       } catch (err: unknown) {
         if (ErrorUtils.isNoEntityError(err)) {
           await fs.promises.mkdir(path.dirname(resolved), { recursive: true })