Merge pull request #3806 from iron-fish/staging

STAGING -> MASTER

Author: dguenther

.github/workflows/deploy-node-docker-image.yml

@@ -72,9 +72,8 @@ jobs:
           docker push ghcr.io/iron-fish/ironfish:latest
 
       # Used if we are deploying a new version (e.g. v1.1)
-      # This is only executed when deploying a new release to mainnet
       - name: Deploy Node Image to GitHub:${{ github.ref_name }}
-        if: ${{ inputs.github_tag_mainnet && github.event.ref_type == 'tag'}}
+        if: ${{ github.ref_type == 'tag'}}
         run: |
           docker tag ironfish ghcr.io/iron-fish/ironfish:${{ github.ref_name }}
           docker push ghcr.io/iron-fish/ironfish:${{ github.ref_name }}

.github/workflows/push-version-to-api.yml

@@ -1,5 +1,15 @@
 name: Push new version number to API
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      push_mainnet:
+        description: "mainnet"
+        type: boolean
+        default: false
+      push_testnet:
+        description: "testnet"
+        type: boolean
+        default: false
 
 jobs:
   Push:
@@ -10,8 +20,16 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
-      - name: Push version string to API
+      - name: Push version string to mainnet API
+        if: ${{ inputs.push_mainnet }}
         run: ./ironfish-cli/scripts/push-version.sh
         env:
           IRON_FISH_API_KEY: ${{ secrets.IRON_FISH_API_KEY }}
           IRON_FISH_API_URL: ${{ secrets.IRON_FISH_API_URL }}
+
+      - name: Push version string to testnet API
+        if: ${{ inputs.push_testnet }}
+        run: ./ironfish-cli/scripts/push-version.sh
+        env:
+          IRON_FISH_API_KEY: ${{ secrets.IRON_FISH_API_KEY_TESTNET }}
+          IRON_FISH_API_URL: ${{ secrets.IRON_FISH_API_URL_TESTNET }}

ironfish-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "0.1.76",
+  "version": "1.0.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",
@@ -60,8 +60,8 @@
     "@aws-sdk/client-s3": "3.127.0",
     "@aws-sdk/client-secrets-manager": "3.276.0",
     "@aws-sdk/s3-request-presigner": "3.127.0",
-    "@ironfish/rust-nodejs": "0.1.31",
-    "@ironfish/sdk": "0.0.53",
+    "@ironfish/rust-nodejs": "1.0.0",
+    "@ironfish/sdk": "1.0.0",
     "@oclif/core": "1.23.1",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",

ironfish-cli/src/commands/mainnet.ts

@@ -0,0 +1,97 @@
+/* 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 { ErrorUtils, HOST_FILE_NAME } from '@ironfish/sdk'
+import { CliUx, Flags } from '@oclif/core'
+import fsAsync from 'fs/promises'
+import { IronfishCommand } from '../command'
+import {
+  ConfigFlag,
+  ConfigFlagKey,
+  DataDirFlag,
+  DataDirFlagKey,
+  VerboseFlag,
+  VerboseFlagKey,
+} from '../flags'
+
+export default class Mainnet extends IronfishCommand {
+  static description = 'Migrate Iron Fish testnet data to mainnet'
+
+  static flags = {
+    [VerboseFlagKey]: VerboseFlag,
+    [ConfigFlagKey]: ConfigFlag,
+    [DataDirFlagKey]: DataDirFlag,
+    confirm: Flags.boolean({
+      default: false,
+      description: 'Confirm without asking',
+    }),
+  }
+
+  async start(): Promise<void> {
+    const { flags } = await this.parse(Mainnet)
+
+    const currentNetworkId = this.sdk.internal.get('networkId')
+    if (currentNetworkId === 1) {
+      this.log(`Data directory is already set up for mainnet.`)
+      this.exit(0)
+    }
+
+    const chainDatabasePath = this.sdk.config.chainDatabasePath
+    const hostFilePath: string = this.sdk.config.files.join(
+      this.sdk.config.dataDir,
+      HOST_FILE_NAME,
+    )
+
+    const message =
+      '\nYou are about to migrate your Iron Fish data to mainnet.' +
+      '\nYour wallet, accounts, and node configuration will be saved.' +
+      `\n\nThis data directory will be migrated: ${this.sdk.config.dataDir}` +
+      `\n\nAre you sure? (Y)es / (N)o`
+
+    const confirmed = flags.confirm || (await CliUx.ux.confirm(message))
+
+    if (!confirmed) {
+      this.log('Migration aborted.')
+      this.exit(0)
+    }
+
+    CliUx.ux.action.start('Migrating data...')
+
+    try {
+      await Promise.all([
+        fsAsync.rm(chainDatabasePath, { recursive: true, force: true }),
+        fsAsync.rm(hostFilePath, { recursive: true, force: true }),
+      ])
+    } catch (error: unknown) {
+      CliUx.ux.action.stop('error')
+      this.log(
+        '\nAn error occurred while migrating to mainnet. Please stop all running Iron Fish nodes and try again.',
+      )
+      this.logger.debug(ErrorUtils.renderError(error, true))
+      this.exit(1)
+    }
+
+    // Reset the telemetry config to allow people to re-opt in
+    if (this.sdk.config.isSet('enableTelemetry') && this.sdk.config.get('enableTelemetry')) {
+      this.sdk.config.clear('enableTelemetry')
+      await this.sdk.config.save()
+    }
+
+    this.sdk.internal.set('networkId', 1)
+    this.sdk.internal.set('isFirstRun', true)
+    this.sdk.internal.clear('telemetryNodeId')
+    await this.sdk.internal.save()
+
+    // Reset walletDb stores containing chain data
+    const node = await this.sdk.node()
+    const walletDb = node.wallet.walletDb
+
+    await walletDb.db.open()
+
+    for (const store of walletDb.cacheStores) {
+      await store.clear()
+    }
+
+    CliUx.ux.action.stop('Data migrated successfully.')
+  }
+}

ironfish-cli/src/commands/reset.ts

@@ -80,6 +80,15 @@ export default class Reset extends IronfishCommand {
     this.sdk.internal.set('isFirstRun', true)
     await this.sdk.internal.save()
 
+    const node = await this.sdk.node()
+    const walletDb = node.wallet.walletDb
+
+    await walletDb.db.open()
+
+    for (const store of walletDb.cacheStores) {
+      await store.clear()
+    }
+
     CliUx.ux.action.stop('Databases deleted successfully')
   }
 }

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

@@ -120,7 +120,8 @@ export class TransactionsCommand extends IronfishCommand {
         }
 
         // exclude the native asset in cli output if no amount was sent/received
-        if (format === Format.cli && amount === 0n) {
+        // and it was not the only asset exchanged
+        if (format === Format.cli && amount === 0n && assetCount > 1) {
           assetCount -= 1
           continue
         }

ironfish-rust-nodejs/npm/darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-darwin-arm64",
-  "version": "0.1.31",
+  "version": "1.0.0",
   "os": [
     "darwin"
   ],

ironfish-rust-nodejs/npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-darwin-x64",
-  "version": "0.1.31",
+  "version": "1.0.0",
   "os": [
     "darwin"
   ],

ironfish-rust-nodejs/npm/linux-arm64-gnu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-linux-arm64-gnu",
-  "version": "0.1.31",
+  "version": "1.0.0",
   "os": [
     "linux"
   ],

ironfish-rust-nodejs/npm/linux-arm64-musl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-linux-arm64-musl",
-  "version": "0.1.31",
+  "version": "1.0.0",
   "os": [
     "linux"
   ],