Merge pull request #2465 from iron-fish/staging

STAGING -> MASTER
iron-fish · Oct 31, 2022 · 02939ae · 02939ae
2 parents ec57ed3 + 9048cb2
commit 02939ae
Show file tree

Hide file tree

Showing 192 changed files with 8,246 additions and 5,615 deletions.
diff --git a/.github/workflows/build-ironfish-rust-nodejs.yml b/.github/workflows/build-ironfish-rust-nodejs.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-11
             target: x86_64-apple-darwin
             architecture: x64
             build: |
@@ -39,7 +39,7 @@ jobs:
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust@sha256:749e81d2fa2fdcda2732e284069fdd8469702da007eb6088df426cdb813b3ecc
             build: cd ironfish-rust-nodejs && yarn build && strip *.node
 
-          - host: macos-latest
+          - host: macos-11
             target: aarch64-apple-darwin
             build: |
               cd ironfish-rust-nodejs
@@ -71,10 +71,10 @@ jobs:
     runs-on: ${{ matrix.settings.host }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         if: ${{ !matrix.settings.docker }}
         with:
           node-version: '16.13.0'
@@ -124,7 +124,7 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-11
             target: x86_64-apple-darwin
 
           - host: windows-latest
@@ -151,14 +151,14 @@ jobs:
     runs-on: ${{ matrix.settings.host }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU for Docker
         if: ${{ matrix.settings.docker }}
         run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.13.0'
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.13.0'
           cache: 'yarn'
@@ -36,19 +36,19 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '16.13.0'
+          # Using 16.10 to fix https://github.com/facebook/jest/issues/11956
+          node-version: '16.10.0'
           cache: 'yarn'
 
       - name: Cache Rust
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: nodejs
-          working-directory: ironfish-rust-nodejs
+          shared-key: nodejs
 
       - name: Install packages
         run: yarn --non-interactive --frozen-lockfile
@@ -66,19 +66,18 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.13.0'
           cache: 'yarn'
 
       - name: Cache Rust
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: nodejs
-          working-directory: ironfish-rust-nodejs
+          shared-key: nodejs
 
       - name: Install packages
         run: yarn --non-interactive --frozen-lockfile

diff --git a/.github/workflows/deploy-brew.yml b/.github/workflows/deploy-brew.yml
@@ -8,13 +8,12 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache Rust
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: nodejs
-          working-directory: ironfish-rust-nodejs
+          shared-key: nodejs
 
       - name: Cache Ironfish CLI Build
         id: cache-ironfish-cli-build
@@ -24,7 +23,7 @@ jobs:
           key: ${{ github.sha }}
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.13.0'
           cache: 'yarn'

diff --git a/.github/workflows/deploy-node-aws.yml b/.github/workflows/deploy-node-aws.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1

diff --git a/.github/workflows/deploy-node-github-beta.yml b/.github/workflows/deploy-node-github-beta.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to Github Registry
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_USER} --password-stdin ghcr.io

diff --git a/.github/workflows/deploy-node-github.yml b/.github/workflows/deploy-node-github.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to Github Registry
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_USER} --password-stdin ghcr.io

diff --git a/.github/workflows/deploy-npm-ironfish-cli.yml b/.github/workflows/deploy-npm-ironfish-cli.yml
@@ -21,10 +21,9 @@ jobs:
           cache: yarn
 
       - name: Cache Rust
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: nodejs
-          working-directory: ironfish-rust-nodejs
+          shared-key: nodejs
 
       - name: Insert Git hash into ironfish-cli/package.json as gitHash
         run: |

diff --git a/.github/workflows/deploy-npm-ironfish-rust-nodejs.yml b/.github/workflows/deploy-npm-ironfish-rust-nodejs.yml
@@ -21,10 +21,10 @@ jobs:
         working-directory: ./ironfish-rust-nodejs
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.13.0'
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/push-version-to-api.yml b/.github/workflows/push-version-to-api.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Push version string to API
         run: ./ironfish-cli/scripts/push-version.sh

diff --git a/.github/workflows/rust_ci.yml b/.github/workflows/rust_ci.yml
@@ -3,14 +3,18 @@ on:
     paths:
       - "ironfish-rust/**"
       - "ironfish-rust-nodejs/**"
+      - "ironfish-zkp/**"
       - "rust-toolchain"
+      - ".github/workflows/rust_ci.yml"
   push:
     branches:
       - master
     paths:
       - "ironfish-rust/**"
       - "ironfish-rust-nodejs/**"
+      - "ironfish-zkp/**"
       - "rust-toolchain"
+      - ".github/workflows/rust_ci.yml"
 
 name: Rust CI
 
@@ -19,25 +23,21 @@ jobs:
     name: ironfish-rust
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           components: rustfmt, clippy
 
       - name: Cache Rust
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          sharedKey: base
-          working-directory: ironfish-rust
-
-      - name: Check for license headers
-        run: ./ci/lintHeaders.sh ./ironfish-rust/src *.rs
+          shared-key: base
 
       # Build & Run test & Collect Code coverage
       - name: Run cargo-tarpaulin on ironfish-rust
         uses: actions-rs/[email protected]
         with:
-          version: "0.20.0"
+          version: "0.22.0"
           args: --avoid-cfg-tarpaulin --manifest-path ironfish-rust/Cargo.toml --release -- --test-threads 1
 
       # Upload code coverage to Codecov
@@ -47,6 +47,9 @@ jobs:
           token: ${{secrets.CODECOV_TOKEN}}
           flags: ironfish-rust
 
+      - name: Check for license headers
+        run: ./ci/lintHeaders.sh ./ironfish-rust/src *.rs
+
       # fmt
       - uses: actions-rs/cargo@v1
         name: "`cargo fmt` check on ironfish-rust"
@@ -65,43 +68,78 @@ jobs:
     name: ironfish-rust-nodejs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           components: rustfmt, clippy
 
       - name: Cache Rust
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: nodejs
+
+      # Check
+      - name: Run cargo check on ironfish-rust-nodejs
+        uses: actions-rs/cargo@v1
         with:
-          sharedKey: nodejs
-          working-directory: ironfish-rust-nodejs
+          command: "check"
+          args: --manifest-path ironfish-rust-nodejs/Cargo.toml
 
       - name: Check for license headers
         run: ./ci/lintHeaders.sh ./ironfish-rust-nodejs/src *.rs
 
+      # fmt
+      - uses: actions-rs/cargo@v1
+        name: "`cargo fmt` check on ironfish-rust-nodejs"
+        with:
+          command: fmt
+          args: --manifest-path ironfish-rust-nodejs/Cargo.toml --all -- --check
+
+      # clippy
+      - uses: actions-rs/cargo@v1
+        name: "Clippy check on ironfish-rust-nodejs"
+        with:
+          command: clippy
+          args: --manifest-path ironfish-rust-nodejs/Cargo.toml -- -D warnings
+
+  ironfish_zkp:
+    name: ironfish-zkp
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          components: rustfmt, clippy
+
+      - name: Cache Rust
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: zkp
+
       # Build & Run test & Collect Code coverage
-      - name: Run cargo-tarpaulin on ironfish-rust-nodejs
+      - name: Run cargo-tarpaulin on ironfish-zkp
         uses: actions-rs/[email protected]
         with:
-          version: "0.20.0"
-          args: --avoid-cfg-tarpaulin --manifest-path ironfish-rust-nodejs/Cargo.toml --release -- --test-threads 1
+          version: "0.22.0"
+          args: --avoid-cfg-tarpaulin --manifest-path ironfish-zkp/Cargo.toml --release -- --test-threads 1
 
-      # upload code coverage to Codecov
+      # Upload code coverage to Codecov
       - name: Upload to codecov.io
         uses: codecov/[email protected]
         with:
-          flags: ironfish-rust-nodejs
+          token: ${{secrets.CODECOV_TOKEN}}
+          flags: ironfish-zkp
 
       # fmt
       - uses: actions-rs/cargo@v1
-        name: "`cargo fmt` check on ironfish-rust-nodejs"
+        name: "`cargo fmt` check on ironfish-zkp"
         with:
           command: fmt
-          args: --manifest-path ironfish-rust-nodejs/Cargo.toml --all -- --check
+          args: --manifest-path ironfish-zkp/Cargo.toml --all -- --check
 
       # clippy
       - uses: actions-rs/cargo@v1
-        name: "Clippy check on ironfish-rust-nodejs"
+        name: "Clippy check on ironfish-zkp"
         with:
           command: clippy
-          args: --manifest-path ironfish-rust-nodejs/Cargo.toml -- -D warnings
+          args: --manifest-path ironfish-zkp/Cargo.toml -- -D warnings
diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,7 @@ lerna-debug.log*
 .pnp.*
 
 # rust build artifacts
-**/*/target/*
+**/target/*
 *.node
 
 # ironfish-cli

diff --git a/ironfish-rust-nodejs/Cargo.lock → Cargo.lock b/ironfish-rust-nodejs/Cargo.lock → Cargo.lock