Merge branch 'master' into tf/use-setup-node

.github/workflows/docs-pr.yml

@@ -74,12 +74,6 @@ jobs:
       - name: Install Yarn dependencies
         uses: ./.github/actions/setup
 
-      - name: Remove pre-releases
-        working-directory: docs
-        env: 
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn setStable
-
       - name: Build docs
         working-directory: docs
         run: 

.github/workflows/publish-docs.yml

@@ -0,0 +1,57 @@
+name: Publish documentation
+
+on:
+  workflow_dispatch:
+    inputs:
+      noir-ref:
+        description: The noir reference to checkout
+        required: false
+        default: 'master'
+
+jobs:
+  publish-docs:
+    name: Publish docs
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout release branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.noir-ref }}
+          token: ${{ secrets.NOIR_RELEASES_TOKEN }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install wasm-bindgen-cli
+        uses: taiki-e/install-action@v2
+        with:
+          tool: [email protected]
+
+      - name: Install wasm-opt
+        run: |
+          npm i wasm-opt -g
+      
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
+
+      - name: Build docs for deploying
+        working-directory: docs
+        run: 
+          yarn workspaces foreach -Rt run build
+
+      - name: Deploy to Netlify
+        uses: nwtgck/[email protected]
+        with:
+          publish-dir: './docs/build'
+          production-branch: master
+          production-deploy: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          enable-github-deployment: false
+          deploy-message: "Deploy from GitHub Actions for tag ${{ inputs.noir-ref }}"
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+        timeout-minutes: 1

.github/workflows/release.yml

@@ -50,6 +50,42 @@ jobs:
           git commit -m 'chore: Update lockfile'
           git push
 
+  
+  update-docs:
+    name: Update docs
+    needs: [release-please, update-lockfile]
+    if: ${{ needs.release-please.outputs.release-pr }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout release branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ fromJSON(needs.release-please.outputs.release-pr).headBranchName }}
+          token: ${{ secrets.NOIR_RELEASES_TOKEN }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install Yarn dependencies
+        uses: ./.github/actions/setup
+
+      - name: Cut a new version
+        working-directory: ./docs
+        run: yarn docusaurus docs:version ${{ needs.release-please.outputs.tag-name }}
+
+      - name: Configure git
+        run: |
+          git config --local user.name 'signorecello'
+          git config --local user.email '[email protected]'
+
+      - name: Commit new documentation version
+        run: |
+          git add .
+          git commit -m "chore(docs): cut new docs version for tag ${{ needs.release-please.outputs.tag-name }}"
+          git push
+
   build-binaries:
     name: Build binaries
     needs: [release-please]
@@ -78,19 +114,18 @@ jobs:
           ref: master
           token: ${{ secrets.NOIR_REPO_TOKEN }}
           inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}", "npm-tag": "latest" }'
-
 
   publish-docs:
     name: Publish docs
     needs: [release-please]
     if: ${{ needs.release-please.outputs.tag-name }}
     runs-on: ubuntu-latest
+
     steps:
-      - name: Dispatch to publish workflow
+      - name: Dispatch to publish-docs
         uses: benc-uk/workflow-dispatch@v1
         with:
-          workflow: docs-new-version.yml
-          repo: noir-lang/noir
+          workflow: publish-docs.yml
           ref: master
-          token: ${{ secrets.GITHUB_TOKEN }}
-          inputs: '{ "tag": "${{ needs.release-please.outputs.tag-name }}"}'
+          token: ${{ secrets.NOIR_REPO_TOKEN }}
+          inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'

Cargo.toml

@@ -50,14 +50,14 @@ repository = "https://github.com/noir-lang/noir/"
 [workspace.dependencies]
 
 # ACVM workspace dependencies
-acir = { path = "acvm-repo/acir", default-features = false }
-acvm = { path = "acvm-repo/acvm" }
-acir_field = { path = "acvm-repo/acir_field", default-features = false }
-stdlib = { package = "acvm_stdlib", path = "acvm-repo/stdlib", default-features = false }
-brillig = { path = "acvm-repo/brillig", default-features = false }
-brillig_vm = { path = "acvm-repo/brillig_vm", default-features = false }
-acvm_blackbox_solver = { path = "acvm-repo/blackbox_solver", default-features = false }
-barretenberg_blackbox_solver = { path = "acvm-repo/barretenberg_blackbox_solver", default-features = false }
+acir_field = { version = "0.35.0", path = "acvm-repo/acir_field", default-features = false }
+acir = { version = "0.35.0", path = "acvm-repo/acir", default-features = false }
+acvm = { version = "0.35.0", path = "acvm-repo/acvm" }
+stdlib = { version = "0.35.0", package = "acvm_stdlib", path = "acvm-repo/stdlib", default-features = false }
+brillig = { version = "0.35.0", path = "acvm-repo/brillig", default-features = false }
+brillig_vm = { version = "0.35.0", path = "acvm-repo/brillig_vm", default-features = false }
+acvm_blackbox_solver = { version = "0.35.0", path = "acvm-repo/blackbox_solver", default-features = false }
+barretenberg_blackbox_solver = { version = "0.35.0", path = "acvm-repo/barretenberg_blackbox_solver", default-features = false }
 
 # Noir compiler workspace dependencies
 arena = { path = "compiler/utils/arena" }

acvm-repo/acir_field/src/generic_ark.rs

@@ -143,6 +143,12 @@ impl<F: PrimeField> From<u128> for FieldElement<F> {
     }
 }
 
+impl<F: PrimeField> From<usize> for FieldElement<F> {
+    fn from(a: usize) -> FieldElement<F> {
+        FieldElement::from(a as u128)
+    }
+}
+
 impl<F: PrimeField> From<bool> for FieldElement<F> {
     fn from(boolean: bool) -> FieldElement<F> {
         if boolean {

compiler/integration-tests/circuits/recursion/src/main.nr

@@ -1,14 +1,17 @@
 use dep::std;
 
 fn main(
-    verification_key: [Field; 114],
-    proof: [Field; 94],
-    public_inputs: [Field; 1],
-    key_hash: Field,
-    input_aggregation_object: [Field; 16]
-) -> pub [Field; 16] {
-    let vk : [Field] = verification_key;
-    let p : [Field] = proof;
-    let pi : [Field] = public_inputs;
-    std::verify_proof(vk, p, pi, key_hash, input_aggregation_object)
+    verification_key : [Field; 114], 
+    proof : [Field; 94], 
+    public_inputs : [Field; 1], 
+    key_hash : Field, 
+) -> pub [Field;16]{
+    let input_aggregation_object = [0; 16];
+    std::verify_proof(
+        verification_key.as_slice(), 
+        proof.as_slice(), 
+        public_inputs.as_slice(), 
+        key_hash, 
+        input_aggregation_object
+    )
 }

compiler/integration-tests/hardhat.config.ts

@@ -12,6 +12,9 @@ const config: HardhatUserConfig = {
       },
     },
   },
+  mocha: {
+    timeout: 5 * 60 * 1000,
+  },
 };
 
 export default config;