Merge pull request #4263 from iron-fish/staging

staging -> master

.github/workflows/rust_ci.yml

@@ -81,7 +81,7 @@ jobs:
           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 --release --out Xml --avoid-cfg-tarpaulin --skip-clean --timeout 180 -- --test-threads 1
+          cargo tarpaulin -p ironfish --release --out Xml --avoid-cfg-tarpaulin --skip-clean --timeout 300 -- --test-threads 1
 
       # Upload code coverage to Codecov
       - name: Upload to codecov.io
@@ -107,7 +107,7 @@ jobs:
           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 --timeout 180 -- --test-threads 1
+          cargo tarpaulin -p ironfish_zkp --release --out Xml --avoid-cfg-tarpaulin --skip-clean --timeout 300 -- --test-threads 1
 
       # Upload code coverage to Codecov
       - name: Upload to codecov.io

ironfish-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "1.8.0",
+  "version": "1.9.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.7.0",
-    "@ironfish/sdk": "1.8.0",
+    "@ironfish/rust-nodejs": "1.8.0",
+    "@ironfish/sdk": "1.9.0",
     "@oclif/core": "1.23.1",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",

ironfish-cli/src/commands/repl.ts

@@ -49,7 +49,8 @@ export default class Repl extends IronfishCommand {
     this.log('\n  List all account names')
     this.log(`  > wallet.listAccounts().map((a) => a.name)`)
     this.log(`\n  Get the balance of an account`)
-    this.log(`  > await wallet.getBalance('default')`)
+    this.log(`  > const account = await wallet.getAccountByName('default')`)
+    this.log(`  > await wallet.getBalances(account)`)
     this.log(`\n  Use the RPC node/getStatus`)
     this.log(`  > (await client.status()).content`)
     this.log('')

ironfish-cli/src/commands/start.ts

@@ -110,6 +110,11 @@ export default class Start extends IronfishCommand {
       description:
         'Path to a JSON file containing the network definition of a custom network to connect to',
     }),
+    wallet: Flags.boolean({
+      allowNo: true,
+      default: true,
+      description: `Enable the node's wallet to scan transactions and decrypt notes from the blockchain`,
+    }),
   }
 
   node: IronfishNode | null = null
@@ -140,6 +145,7 @@ export default class Start extends IronfishCommand {
       upgrade,
       networkId,
       customNetwork,
+      wallet,
     } = flags
 
     if (bootstrap !== undefined) {
@@ -169,6 +175,9 @@ export default class Start extends IronfishCommand {
     if (forceMining !== undefined && forceMining !== this.sdk.config.get('miningForce')) {
       this.sdk.config.setOverride('miningForce', forceMining)
     }
+    if (wallet !== undefined && wallet !== this.sdk.config.get('enableWallet')) {
+      this.sdk.config.setOverride('enableWallet', wallet)
+    }
     if (
       logPeerMessages !== undefined &&
       logPeerMessages !== this.sdk.config.get('logPeerMessages')
@@ -210,6 +219,7 @@ export default class Start extends IronfishCommand {
     const blockGraffiti = this.sdk.config.get('blockGraffiti').trim() || null
     const peerPort = this.sdk.config.get('peerPort')
     const bootstraps = this.sdk.config.getArray('bootstrapNodes')
+    const walletEnabled = this.sdk.config.get('enableWallet')
 
     this.log(`\n${ONE_FISH_IMAGE}`)
     this.log(`Version       ${node.pkg.version} @ ${node.pkg.git}`)
@@ -218,6 +228,7 @@ export default class Start extends IronfishCommand {
     this.log(`Peer Identity ${node.peerNetwork.localPeer.publicIdentity}`)
     this.log(`Peer Agent    ${node.peerNetwork.localPeer.agent}`)
     this.log(`Peer Port     ${peerPort}`)
+    this.log(`Wallet        ${walletEnabled ? 'ENABLED' : 'DISABLED'}`)
     this.log(`Bootstrap     ${bootstraps.join(',') || 'NONE'}`)
     if (inspector.url()) {
       this.log(`Inspector     ${String(inspector.url())}`)
@@ -296,7 +307,9 @@ export default class Start extends IronfishCommand {
    */
   async setDefaultAccount(node: IronfishNode): Promise<void> {
     if (!node.wallet.accountExists(DEFAULT_ACCOUNT_NAME)) {
-      const account = await node.wallet.createAccount(DEFAULT_ACCOUNT_NAME, true)
+      const account = await node.wallet.createAccount(DEFAULT_ACCOUNT_NAME, {
+        setDefault: true,
+      })
 
       this.log(`New default account created: ${account.name}`)
       this.log(`Account's public address: ${account.publicAddress}`)

ironfish-cli/src/commands/status.ts

@@ -2,13 +2,13 @@
  * 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,
   defaultNetworkName,
   FileUtils,
   GetNodeStatusResponse,
   PromiseUtils,
   TimeUtils,
 } from '@ironfish/sdk'
-import { Assert } from '@ironfish/sdk'
 import { Flags } from '@oclif/core'
 import blessed from 'blessed'
 import { IronfishCommand } from '../command'
@@ -192,6 +192,10 @@ function renderStatus(content: GetNodeStatusResponse, debugOutput: boolean): str
     }
   }
 
+  if (!content.accounts.enabled) {
+    accountStatus += accountStatus.length === 0 ? `DISABLED` : ` (DISABLED)`
+  }
+
   const cores = `Cores: ${content.cpu.cores}`
   const current = `Current: ${content.cpu.percentCurrent.toFixed(1)}%`
   const rollingAvg = `Rolling Avg: ${content.cpu.percentRollingAvg.toFixed(1)}%`

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

@@ -80,6 +80,7 @@ export class TransactionsCommand extends IronfishCommand {
     const columns = this.getColumns(flags.extended, flags.notes, format)
 
     let showHeader = !flags['no-header']
+    let hasTransactions = false
 
     for await (const transaction of response.contentStream()) {
       const transactionRows = flags.notes
@@ -93,6 +94,11 @@ export class TransactionsCommand extends IronfishCommand {
       })
 
       showHeader = false
+      hasTransactions = true
+    }
+
+    if (!hasTransactions) {
+      this.log('No transactions found')
     }
   }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ironfish-rust-nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironfish/rust-nodejs",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Node.js bindings for Rust code required by the Iron Fish SDK",
   "main": "index.js",
   "types": "index.d.ts",

ironfish-rust-nodejs/src/structs/transaction.rs

@@ -147,10 +147,13 @@ impl NativeTransactionPosted {
     }
 
     #[napi]
-    pub fn hash(&self) -> Buffer {
-        let hash = self.transaction.transaction_signature_hash();
+    pub fn hash(&self) -> Result<Buffer> {
+        let hash = self
+            .transaction
+            .transaction_signature_hash()
+            .map_err(to_napi_err)?;
 
-        Buffer::from(hash.as_ref())
+        Ok(Buffer::from(hash.as_ref()))
     }
 
     #[napi]

ironfish-rust-nodejs/tests/transaction.test.slow.ts

@@ -0,0 +1,29 @@
+/* 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 { Asset, Transaction, generateKey } from ".."
+
+describe('Transaction', () => {
+  describe('post', () => {
+    it('throws an error when posting an invalid transaction version', () => {
+      const key = generateKey()
+      const asset = new Asset(key.publicAddress, 'testcoin', '')
+      // Version 1 transactions cannot have an ownership transfer
+      const proposedTx = new Transaction(key.spendingKey, 1)
+      proposedTx.mint(asset, 5n, key.publicAddress)
+
+      expect(() => { proposedTx.post(null, 0n)}).toThrow('InvalidTransactionVersion')
+    })
+
+    it('can post a valid transaction', () => {
+      const key = generateKey()
+      const asset = new Asset(key.publicAddress, 'testcoin', '')
+      const proposedTx = new Transaction(key.spendingKey, 1)
+      proposedTx.mint(asset, 5n)
+
+      expect(() => { proposedTx.post(null, 0n)}).not.toThrow()
+
+    })
+  })
+})