Merge pull request #5071 from iron-fish/staging

Staging to master v2.4.0

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

@@ -72,7 +72,7 @@ jobs:
         working-directory: ./ironfish-rust-nodejs
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ matrix.settings.target }}
           path: ironfish-rust-nodejs/*.node
@@ -85,9 +85,12 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-13
             target: x86_64-apple-darwin
 
+          - host: macos-latest
+            target: aarch64-apple-darwin
+
           - host: windows-latest
             target: x86_64-pc-windows-msvc
 
@@ -124,7 +127,7 @@ jobs:
           node-version: 18
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-${{ matrix.settings.target }}
           path: ./ironfish-rust-nodejs

.github/workflows/ci.yml

@@ -82,7 +82,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js
         uses: actions/setup-node@v4

.github/workflows/deploy-brew.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   Deploy:
     name: Deploy
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
       - name: Check out Git repository

.github/workflows/publish-binaries.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-13
             arch: x86_64
             system: apple
 
@@ -29,7 +29,7 @@ jobs:
             arch: x86_64
             system: linux
 
-          - host: macos-latest-xlarge
+          - host: macos-latest
             arch: arm64
             system: apple
 

ironfish-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "2.3.0",
+  "version": "2.4.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",
@@ -34,7 +34,7 @@
     "eslint-plugin-deprecation": "2.0.0",
     "jest": "29.7.0",
     "jest-jasmine2": "29.7.0",
-    "oclif": "2.6.0",
+    "oclif": "3.7.2",
     "rimraf": "^3.0.2",
     "ts-jest": "29.1.1",
     "tsc-watch": "4.2.9",
@@ -58,26 +58,25 @@
     "oclif:version": "oclif readme && git add README.md"
   },
   "dependencies": {
-    "@aws-sdk/client-cognito-identity": "3",
-    "@aws-sdk/client-s3": "3",
-    "@aws-sdk/client-secrets-manager": "3",
-    "@aws-sdk/s3-request-presigner": "3",
-    "@ironfish/rust-nodejs": "2.3.0",
-    "@ironfish/sdk": "2.3.0",
-    "@oclif/core": "1.23.1",
+    "@ironfish/rust-nodejs": "2.4.0",
+    "@ironfish/sdk": "2.4.0",
+    "@oclif/core": "3.27.0",
+    "@oclif/plugin-autocomplete": "1.3.10",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",
     "@oclif/plugin-warn-if-update-available": "2.0.40",
-    "@oclif/plugin-autocomplete": "1.3.10",
+    "@types/keccak": "3.0.4",
     "@types/tar": "6.1.1",
-    "axios": "0.21.4",
+    "axios": "1.7.2",
     "bech32": "2.0.0",
     "blessed": "0.1.81",
     "blru": "0.1.6",
     "buffer-map": "0.0.7",
     "chalk": "4.1.2",
+    "cli-progress": "3.12.0",
     "inquirer": "8.2.5",
     "json-colorizer": "2.2.2",
+    "keccak": "3.0.4",
     "supports-hyperlinks": "2.2.0",
     "tar": "6.1.11",
     "uuid": "8.3.2"
@@ -97,7 +96,11 @@
       "@oclif/plugin-warn-if-update-available",
       "@oclif/plugin-autocomplete"
     ],
-    "topics": {}
+    "topics": {
+      "wallet:scanning": {
+        "description": "Turn on or off scanning for accounts"
+      }
+    }
   },
   "bin": {
     "ironfish": "./bin/run"

ironfish-cli/src/args.ts

@@ -2,7 +2,24 @@
  * 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/. */
 
-export function parseNumber(input: string): number | null {
-  const parsed = Number(input)
-  return isNaN(parsed) ? null : parsed
+import { parseUrl as parseUrlSdk } from '@ironfish/sdk'
+import { Args } from '@oclif/core'
+
+type Url = {
+  protocol: string | null
+  hostname: string
+  port: number | null
+}
+
+export function parseUrl(input: string): Promise<Url> {
+  const parsed = parseUrlSdk(input)
+  if (parsed.hostname != null) {
+    return Promise.resolve(parsed as Url)
+  } else {
+    return Promise.reject(new Error(`Invalid URL: ${input}`))
+  }
 }
+
+export const UrlArg = Args.custom<Url>({
+  parse: async (input: string) => parseUrl(input),
+})