Merge pull request #4329 from iron-fish/staging

Staging to master version 1.10.0

.gitattributes

@@ -8,3 +8,5 @@
 *.png -text
 *.params -text
 mainnet-parameters/params -text
+
+*.pdf binary

.github/workflows/ci-regenerate-fixtures.yml

@@ -37,3 +37,12 @@ jobs:
 
       - name: Run slow tests
         run: JEST_TIMEOUT=1000000000 yarn test:slow:coverage --maxWorkers=2 --workerIdleMemoryLimit=2000MB
+
+      - name: Report Status
+        if: always()
+        uses: ravsamhq/notify-slack-action@master
+        with:
+          status: ${{ job.status }}
+          notify_when: 'failure'
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.GITHUB_ACTIONS_SLACK_WEBHOOK }}

Cargo.toml

@@ -18,3 +18,6 @@ repository = "https://github.com/iron-fish/ironfish"
 
 [patch.crates-io]
 bellman = { git = "https://github.com/iron-fish/bellman", rev = "1cc52ca33e6db14233f1cbc0c9c5b7c822b229ec" }
+
+[profile.release]
+debug = true

README.md

@@ -2,9 +2,9 @@
 
 # Iron Fish
 
-![Node CI](https://github.com/iron-fish/ironfish/actions/workflows/ci.yml/badge.svg)
-![Rust CI](https://github.com/iron-fish/ironfish/actions/workflows/rust_ci.yml/badge.svg)
-![Node CI Regenerate Fixtures](https://github.com/iron-fish/ironfish/actions/workflows/ci-regenerate-fixtures.yml/badge.svg)
+[![Node CI](https://github.com/iron-fish/ironfish/actions/workflows/ci.yml/badge.svg)](https://github.com/iron-fish/ironfish/actions/workflows/ci.yml)
+[![Rust CI](https://github.com/iron-fish/ironfish/actions/workflows/rust_ci.yml/badge.svg)](https://github.com/iron-fish/ironfish/actions/workflows/rust_ci.yml)
+[![Node CI Regenerate Fixtures](https://github.com/iron-fish/ironfish/actions/workflows/ci-regenerate-fixtures.yml/badge.svg)](https://github.com/iron-fish/ironfish/actions/workflows/ci-regenerate-fixtures.yml)
 [![codecov](https://codecov.io/gh/iron-fish/ironfish/branch/master/graph/badge.svg?token=fOjPFN18xZ)](https://codecov.io/gh/iron-fish/ironfish)
 
 Iron Fish is a Layer 1 blockchain that provides the strongest privacy guarantees on every single transaction. Leveraging zero-knowledge proofs (zk-SNARKs), and the highest industry standards for encryption.

benchmarks/benches/transaction.rs

@@ -3,7 +3,7 @@ use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use ironfish::{
     assets::{asset::Asset, asset_identifier::NATIVE_ASSET},
     test_util::make_fake_witness,
-    transaction::{batch_verify_transactions, verify_transaction},
+    transaction::{batch_verify_transactions, verify_transaction, TransactionVersion},
     Note, ProposedTransaction, SaplingKey, Transaction,
 };
 
@@ -24,7 +24,7 @@ pub fn simple(c: &mut Criterion) {
             },
             // Benchmark
             |(key, spend_note, witness, out_note)| {
-                let mut proposed = ProposedTransaction::new(key);
+                let mut proposed = ProposedTransaction::new(key, TransactionVersion::latest());
 
                 proposed.add_spend(spend_note, &witness).unwrap();
                 proposed.add_output(out_note).unwrap();
@@ -60,7 +60,7 @@ pub fn all_descriptions(c: &mut Criterion) {
             |(key, spend_note, witness, out_note, asset)| {
                 let asset_value = 10;
 
-                let mut proposed = ProposedTransaction::new(key);
+                let mut proposed = ProposedTransaction::new(key, TransactionVersion::latest());
 
                 proposed.add_spend(spend_note, &witness).unwrap();
                 proposed.add_output(out_note).unwrap();
@@ -92,7 +92,7 @@ pub fn verify(c: &mut Criterion) {
 
                 let out_note = Note::new(public_address, 41, "", NATIVE_ASSET, public_address);
 
-                let mut proposed = ProposedTransaction::new(key);
+                let mut proposed = ProposedTransaction::new(key, TransactionVersion::latest());
 
                 proposed.add_spend(spend_note, &witness).unwrap();
                 proposed.add_output(out_note).unwrap();
@@ -127,7 +127,7 @@ pub fn batch_verify(c: &mut Criterion) {
 
                     let out_note = Note::new(public_address, 41, "", NATIVE_ASSET, public_address);
 
-                    let mut proposed = ProposedTransaction::new(key);
+                    let mut proposed = ProposedTransaction::new(key, TransactionVersion::latest());
 
                     proposed.add_spend(spend_note, &witness).unwrap();
                     proposed.add_output(out_note).unwrap();

ironfish-cli/.eslintrc.js

@@ -1,9 +1,14 @@
+/* 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/. */
 module.exports = {
   extends: ['ironfish'],
   parserOptions: {
     tsconfigRootDir: __dirname,
   },
   rules: {
     'jest/no-standalone-expect': 'off',
+    'deprecation/deprecation': 'off', // enable this to warn or error to show deprecated code usage
   },
+  plugins: ['deprecation'],
 }

ironfish-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "1.9.0",
+  "version": "1.10.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",
@@ -31,6 +31,7 @@
     "chai": "4.2.0",
     "cross-env": "7.0.3",
     "eslint-config-ironfish": "*",
+    "eslint-plugin-deprecation": "2.0.0",
     "jest": "29.3.1",
     "jest-jasmine2": "29.3.1",
     "oclif": "2.6.0",
@@ -42,6 +43,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "tsc -b && eslint --ext .ts,.tsx,.js,.jsx src/",
+    "lint:deprecated": "yarn lint --rule \"deprecation/deprecation: warn\"",
     "lint:fix": "tsc -b && eslint --ext .ts,.tsx,.js,.jsx src/ --fix",
     "start:dev": "node start",
     "start": "yarn build && yarn start:js",
@@ -59,8 +61,8 @@
     "@aws-sdk/client-s3": "3",
     "@aws-sdk/client-secrets-manager": "3",
     "@aws-sdk/s3-request-presigner": "3",
-    "@ironfish/rust-nodejs": "1.8.0",
-    "@ironfish/sdk": "1.9.0",
+    "@ironfish/rust-nodejs": "1.9.0",
+    "@ironfish/sdk": "1.10.0",
     "@oclif/core": "1.23.1",
     "@oclif/plugin-help": "5.1.12",
     "@oclif/plugin-not-found": "2.3.1",
@@ -101,4 +103,4 @@
     "url": "https://github.com/iron-fish/ironfish/issues"
   },
   "homepage": "https://ironfish.network"
-}
+}

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

@@ -32,7 +32,8 @@ export default class Asset extends IronfishCommand {
     this.log(`Name: ${BufferUtils.toHuman(Buffer.from(data.content.name, 'hex'))}`)
     this.log(`Metadata: ${BufferUtils.toHuman(Buffer.from(data.content.metadata, 'hex'))}`)
     this.log(`Creator: ${data.content.creator}`)
-    this.log(`Supply: ${data.content.supply}`)
+    this.log(`Owner: ${data.content.owner}`)
+    this.log(`Supply: ${data.content.supply ?? 'N/A'}`)
     this.log(`Identifier: ${data.content.id}`)
     this.log(`Transaction Created: ${data.content.createdTransactionHash}`)
   }