Merge pull request #2854 from iron-fish/staging

STAGING -> MASTER

.github/workflows/build-ironfish-rust-nodejs.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           cache: yarn
 
       - name: Install
@@ -89,19 +89,19 @@ jobs:
 
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            docker: node:16-slim
+            docker: node:18-slim
 
           - host: ubuntu-latest
             target: x86_64-unknown-linux-musl
-            docker: node:16-alpine
+            docker: node:18-alpine
 
           - host: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16
 
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
-            docker: arm64v8/node:16-alpine
+            docker: arm64v8/node:18-alpine
             platform: linux/arm64/v8
 
     name: Test bindings for ${{ matrix.settings.target }}
@@ -117,7 +117,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
 
       - name: Download artifacts
         uses: actions/download-artifact@v3

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           cache: 'yarn'
 
       - name: Install packages
@@ -50,7 +50,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           cache: 'yarn'
 
       - name: Cache Rust
@@ -79,7 +79,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           cache: 'yarn'
 
       - name: Cache Rust

.github/workflows/deploy-brew.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           cache: 'yarn'
 
       - name: Build Ironfish CLI

.github/workflows/deploy-npm-ironfish-cli.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
 

.github/workflows/deploy-npm-ironfish-rust-nodejs.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
 

.github/workflows/deploy-npm-ironfish.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          node-version: '18.12.1'
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
 

.github/workflows/rust_ci.yml

@@ -31,6 +31,7 @@ jobs:
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2
         with:
+          save-if: false
           shared-key: base
 
       - name: Check that cargo lockfile is up to date
@@ -74,12 +75,13 @@ jobs:
         with:
           shared-key: base
 
-      # Build & Run test & Collect Code coverage
+      # Run tests to collect code coverage
       - name: Run cargo-tarpaulin on ironfish-rust
-        uses: actions-rs/[email protected]
-        with:
-          version: "0.22.0"
-          args: --avoid-cfg-tarpaulin --manifest-path ironfish-rust/Cargo.toml --release -- --test-threads 1
+        run: |
+          wget -O tarpaulin.tar.gz https://github.com/xd009642/tarpaulin/releases/download/0.22.0/cargo-tarpaulin-0.22.0-travis.tar.gz
+          tar -xzf tarpaulin.tar.gz
+          mv cargo-tarpaulin ~/.cargo/bin/
+          cargo tarpaulin -p ironfish_rust --release --out Xml --avoid-cfg-tarpaulin --skip-clean -- --test-threads 1
 
       # Upload code coverage to Codecov
       - name: Upload to codecov.io
@@ -102,12 +104,13 @@ jobs:
         with:
           shared-key: zkp
 
-      # Build & Run test & Collect Code coverage
+      # Run tests to collect code coverage
       - name: Run cargo-tarpaulin on ironfish-zkp
-        uses: actions-rs/[email protected]
-        with:
-          version: "0.22.0"
-          args: --avoid-cfg-tarpaulin --manifest-path ironfish-zkp/Cargo.toml --release -- --test-threads 1
+        run: |
+          wget -O tarpaulin.tar.gz https://github.com/xd009642/tarpaulin/releases/download/0.22.0/cargo-tarpaulin-0.22.0-travis.tar.gz
+          tar -xzf tarpaulin.tar.gz
+          mv cargo-tarpaulin ~/.cargo/bin/
+          cargo tarpaulin -p ironfish_zkp --release --out Xml --avoid-cfg-tarpaulin --skip-clean -- --test-threads 1
 
       # Upload code coverage to Codecov
       - name: Upload to codecov.io

Cargo.toml

@@ -12,5 +12,3 @@ edition = "2021"
 
 [patch.crates-io]
 bellman = { git = "https://github.com/iron-fish/bellman", rev = "1cc52ca33e6db14233f1cbc0c9c5b7c822b229ec" }
-napi = { git = "https://github.com/napi-rs/napi-rs", rev = "26f6c926d30de744146fe54db6a6b399e142e63c" }
-napi-derive-backend = { git = "https://github.com/napi-rs/napi-rs", rev = "26f6c926d30de744146fe54db6a6b399e142e63c" }

README.md

@@ -14,7 +14,7 @@ See https://ironfish.network
 
 The following steps should only be used to install if you are planning on contributing to the Iron Fish codebase. Otherwise, we **strongly** recommend using the installation methods here: https://ironfish.network/docs/onboarding/installation-iron-fish
 
-1. Install [Node.js 16.x](https://nodejs.org/download/release/latest-v16.x/)
+1. Install [Node.js 18.x](https://nodejs.org/en/download/)
 1. Install [Rust](https://www.rust-lang.org/learn/get-started).
 1. Install [Yarn](https://classic.yarnpkg.com/en/docs/install).
 1. Windows:

ironfish-cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.15.1-bullseye as build
+FROM node:18.12.1-bullseye as build
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 RUN \
@@ -13,7 +13,7 @@ COPY ./ ./
 
 RUN ./ironfish-cli/scripts/build.sh
 
-FROM node:16.15.1-bullseye-slim
+FROM node:18.12.1-bullseye-slim
 EXPOSE 8020:8020
 EXPOSE 9033:9033
 VOLUME /root/.ironfish

ironfish-cli/bin/run

@@ -7,8 +7,8 @@ if (process.platform !== 'win32') {
   require('segfault-handler').registerHandler('segfault.log')
 }
 
-if(process.versions.node.split('.')[0] !== '16') {
-  console.log('NodeJS version ' +  process.versions.node + ' is not compatible. Must have node v16.x installed: https://nodejs.org/en/blog/release/v16.16.0')
+if(process.versions.node.split('.')[0] !== '18') {
+  console.log('NodeJS version ' +  process.versions.node + ' is not compatible. Must have node v18.x installed: https://nodejs.org/en/download/')
   process.exit(1)
 }
 

ironfish-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "description": "CLI for running and interacting with an Iron Fish node",
   "author": "Iron Fish <[email protected]> (https://ironfish.network)",
   "main": "build/src/index.js",
@@ -20,12 +20,12 @@
     "/oclif.manifest.json"
   ],
   "engines": {
-    "node": "16.x"
+    "node": "18.x"
   },
   "devDependencies": {
     "@oclif/test": "2.1.0",
     "@types/blessed": "0.1.17",
-    "@types/node": "16.11.1",
+    "@types/node": "18.11.16",
     "@types/tar": "6.1.1",
     "@types/ws": "7.4.5",
     "chai": "4.2.0",
@@ -57,9 +57,9 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity": "3.215.0",
     "@aws-sdk/client-s3": "3.127.0",
-    "@ironfish/rust-nodejs": "0.1.18",
-    "@ironfish/sdk": "0.0.32",
-    "@oclif/core": "1.16.1",
+    "@ironfish/rust-nodejs": "0.1.19",
+    "@ironfish/sdk": "0.0.33",
+    "@oclif/core": "1.23.1",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",
     "@types/tar": "6.1.1",

ironfish-cli/src/commands/chain/asset.ts

@@ -0,0 +1,40 @@
+/* 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 { Assert, BufferUtils } from '@ironfish/sdk'
+import { IronfishCommand } from '../../command'
+import { RemoteFlags } from '../../flags'
+
+export default class Asset extends IronfishCommand {
+  static description = 'Get the asset info'
+
+  static args = [
+    {
+      name: 'identifier',
+      parse: (input: string): Promise<string> => Promise.resolve(input.trim()),
+      required: true,
+      description: 'The identifier of the asset',
+    },
+  ]
+
+  static flags = {
+    ...RemoteFlags,
+  }
+
+  async start(): Promise<void> {
+    const { args } = await this.parse(Asset)
+    Assert.isString(args.id)
+    const assetId = args.id
+
+    const client = await this.sdk.connectRpc()
+    const data = await client.getAsset({ id: assetId })
+
+    this.log(`Name: ${BufferUtils.toHuman(Buffer.from(data.content.name, 'hex'))}`)
+    this.log(`Metadata: ${BufferUtils.toHuman(Buffer.from(data.content.metadata, 'hex'))}`)
+    this.log(`Owner: ${data.content.owner}`)
+    this.log(`Supply: ${data.content.supply}`)
+    this.log(`Nonce: ${data.content.nonce}`)
+    this.log(`Identifier: ${data.content.id}`)
+    this.log(`Transaction Created: ${data.content.createdTransactionHash}`)
+  }
+}

ironfish-cli/src/commands/chain/benchmark.ts

@@ -11,8 +11,6 @@ import { LocalFlags } from '../../flags'
 import { IronfishCliPKG } from '../../package'
 
 export default class Benchmark extends IronfishCommand {
-  static aliases = ['chain:benchmark']
-
   static description =
     'Test the performance of the chain by re-importing data from an existing chain'
 

ironfish-cli/src/commands/chain/readd-block.ts

@@ -6,8 +6,6 @@ import { IronfishCommand } from '../../command'
 import { LocalFlags } from '../../flags'
 
 export default class ReAddBlock extends IronfishCommand {
-  static aliases = ['chain:readdblock']
-
   static description =
     'Remove and readd a block on the chain if it has no other blocks after it'
 

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

@@ -8,7 +8,6 @@ import { ColorFlag, ColorFlagKey } from '../../flags'
 import { RemoteFlags } from '../../flags'
 
 export class ShowCommand extends IronfishCommand {
-  static aliases = ['config:show']
   static description = `Print out the entire config`
 
   static flags = {