Merge pull request #3638 from iron-fish/staging

STAGING -> MASTER

Author: danield9tqh

ironfish-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "0.1.71",
+  "version": "0.1.72",
   "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.127.0",
     "@aws-sdk/client-secrets-manager": "3.276.0",
     "@aws-sdk/s3-request-presigner": "3.127.0",
-    "@ironfish/rust-nodejs": "0.1.28",
-    "@ironfish/sdk": "0.0.48",
+    "@ironfish/rust-nodejs": "0.1.29",
+    "@ironfish/sdk": "0.0.49",
     "@oclif/core": "1.23.1",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",

ironfish-cli/src/commands/faucet.ts

@@ -11,7 +11,7 @@ import { ONE_FISH_IMAGE, TWO_FISH_IMAGE } from '../images'
 const FAUCET_DISABLED = false
 
 export class FaucetCommand extends IronfishCommand {
-  static description = `Receive coins from the Iron Fish official Faucet`
+  static description = `Receive coins from the Iron Fish official testnet Faucet`
 
   static flags = {
     ...RemoteFlags,
@@ -33,10 +33,16 @@ export class FaucetCommand extends IronfishCommand {
       this.exit(1)
     }
 
-    this.log(ONE_FISH_IMAGE)
-
     const client = await this.sdk.connectRpc()
+    const networkInfoResponse = await client.getNetworkInfo()
+
+    if (networkInfoResponse.content === null || networkInfoResponse.content.networkId !== 0) {
+      // not testnet
+      this.log(`The faucet is only available for testnet.`)
+      this.exit(1)
+    }
 
+    this.log(ONE_FISH_IMAGE)
     let email = flags.email
 
     if (!email) {

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

@@ -34,6 +34,7 @@ export class PostCommand extends IronfishCommand {
     }),
     broadcast: Flags.boolean({
       default: true,
+      allowNo: true,
       description: 'Broadcast the transaction after posting',
     }),
   }

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-darwin-x64",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "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.28",
+  "version": "0.1.29",
   "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.28",
+  "version": "0.1.29",
   "os": [
     "linux"
   ],

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

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-linux-x64-gnu",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "os": [
     "linux"
   ],

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

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-linux-x64-musl",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "os": [
     "linux"
   ],

ironfish-rust-nodejs/npm/win32-x64-msvc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs-win32-x64-msvc",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "os": [
     "win32"
   ],