feat: Sync from noir (#10483)

Automated pull of development from the [noir](https://github.com/noir-lang/noir) programming language, a dependency of Aztec. BEGIN_COMMIT_OVERRIDE feat: several `nargo test` improvements (noir-lang/noir#6728) chore: Try replace callstack with a linked list (noir-lang/noir#6747) chore: Use `NumericType` not `Type` for casts and numeric constants (noir-lang/noir#6769) chore(ci): Extend compiler memory report to external repos (noir-lang/noir#6768) chore(ci): Handle external libraries in compilation timing report (noir-lang/noir#6750) feat(ssa): Implement missing brillig constraints SSA check (noir-lang/noir#6658) fix: Do not merge expressions that contain output witnesses (noir-lang/noir#6757) fix: parser would hand on function type with colon in it (noir-lang/noir#6764) chore(docs): Update branding (noir-lang/noir#6759) feat(cli): Run command on the package closest to the current directory (noir-lang/noir#6752) chore: lock CI to use ubuntu 22.04 (noir-lang/noir#6755) chore: free memory for silenced warnings early (noir-lang/noir#6748) chore(stdlib)!: Remove Schnorr (noir-lang/noir#6749) fix: Improve type error when indexing a variable of unknown type (noir-lang/noir#6744) fix: println("{{}}") was printing "{{}}" instead of "{}" (noir-lang/noir#6745) feat: `std::hint::black_box` function. (noir-lang/noir#6529) feat(ci): Initial compilation report on test_programs (noir-lang/noir#6731) chore: Cleanup unrolling pass (noir-lang/noir#6743) fix: allow empty loop headers (noir-lang/noir#6736) fix: map entry point indexes after all ssa passes (noir-lang/noir#6740) chore: Update url to 2.5.4 (noir-lang/noir#6741) feat: Order attribute execution by their source ordering (noir-lang/noir#6326) feat(test): Check that `nargo::ops::transform_program` is idempotent (noir-lang/noir#6694) feat: Sync from aztec-packages (noir-lang/noir#6730) END_COMMIT_OVERRIDE --------- Co-authored-by: Tom French <[email protected]> Co-authored-by: thunkar <[email protected]> Co-authored-by: maramihali <[email protected]> Co-authored-by: TomAFrench <[email protected]> Co-authored-by: aakoshh <[email protected]>
AztecProtocol · Dec 12, 2024 · 3166529 · 3166529
1 parent d327da1
commit 3166529
Show file tree

Hide file tree

Showing 165 changed files with 4,304 additions and 1,553 deletions.
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-6d0f86ba389a5b59b1d7fdcadcbce3e40eecaa48
+1b0dd4149d9249f0ea4fb5e2228c688e0135618f
diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
diff --git a/noir-projects/aztec-nr/aztec/src/macros/events/mod.nr b/noir-projects/aztec-nr/aztec/src/macros/events/mod.nr
@@ -1,5 +1,6 @@
 use super::utils::compute_event_selector;
 use protocol_types::meta::flatten_to_fields;
+use std::meta::typ::fresh_type_variable;
 
 comptime fn generate_event_interface(s: StructDefinition) -> Quoted {
     let name = s.name();
@@ -13,7 +14,6 @@ comptime fn generate_event_interface(s: StructDefinition) -> Quoted {
         impl aztec::event::event_interface::EventInterface<$content_len> for $name {
             fn to_be_bytes(self) -> [u8; $content_len * 32 + 32] {
                 let mut buffer: [u8; $content_len * 32 + 32] = [0; $content_len * 32 + 32];
-
                 let event_type_id_bytes: [u8; 32] = $name::get_event_type_id().to_field().to_be_bytes();
 
                 for i in 0..32 {

diff --git a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr
@@ -13,8 +13,8 @@ contract ContractInstanceDeployer {
     };
     use std::meta::derive;
 
-    #[event]
     #[derive(Serialize)]
+    #[event]
     struct ContractInstanceDeployed {
         DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE: Field,
         address: AztecAddress,

diff --git a/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr
@@ -26,8 +26,8 @@ contract Crowdfunding {
     use token::Token;
     // docs:end:all-deps
 
-    #[event]
     #[derive(Serialize)]
+    #[event]
     struct WithdrawalProcessed {
         who: AztecAddress,
         amount: u64,

diff --git a/noir-projects/noir-contracts/contracts/nft_contract/src/main.nr b/noir-projects/noir-contracts/contracts/nft_contract/src/main.nr
@@ -29,12 +29,12 @@ contract NFT {
         utils::comparison::Comparator,
     };
     use dep::compressed_string::FieldCompressedString;
-    use std::{embedded_curve_ops::EmbeddedCurvePoint, meta::derive};
+    use std::meta::derive;
 
     // TODO(#8467): Rename this to Transfer - calling this NFTTransfer to avoid export conflict with the Transfer event
     // in the Token contract.
-    #[event]
     #[derive(Serialize)]
+    #[event]
     struct NFTTransfer {
         from: AztecAddress,
         to: AztecAddress,

diff --git a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr
@@ -107,7 +107,7 @@ contract SchnorrAccount {
             is_infinite: false,
         };
         let valid_in_private =
-            std::schnorr::verify_signature(pub_key, signature, message_hash.to_be_bytes::<32>());
+            schnorr::verify_signature(pub_key, signature, message_hash.to_be_bytes::<32>());
 
         // Compute the nullifier and check if it is spent
         // This will BLINDLY TRUST the oracle, but the oracle is us, and

diff --git a/noir-projects/noir-contracts/contracts/test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_contract/src/main.nr
@@ -39,14 +39,11 @@ contract Test {
         get_mint_to_private_content_hash, get_mint_to_public_content_hash,
     };
     use dep::value_note::value_note::ValueNote;
-    // TODO investigate why the macros require EmbeddedCurvePoint and EmbeddedCurveScalar
-    use std::embedded_curve_ops::{EmbeddedCurvePoint, EmbeddedCurveScalar};
     use std::meta::derive;
 
     use crate::test_note::TestNote;
-
-    #[event]
     #[derive(Serialize)]
+    #[event]
     struct ExampleEvent {
         value0: Field,
         value1: Field,

diff --git a/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_log_contract/src/main.nr
@@ -10,17 +10,15 @@ contract TestLog {
     use dep::value_note::value_note::ValueNote;
     use std::meta::derive;
 
-    use std::embedded_curve_ops::EmbeddedCurveScalar;
-
-    #[event]
     #[derive(Serialize)]
+    #[event]
     struct ExampleEvent0 {
         value0: Field,
         value1: Field,
     }
 
-    #[event]
     #[derive(Serialize)]
+    #[event]
     struct ExampleEvent1 {
         value2: AztecAddress,
         value3: u8,

diff --git a/noir/bb-version b/noir/bb-version
@@ -1 +1 @@
-0.63.1
+0.66.0
diff --git a/noir/noir-repo/.github/scripts/merge-bench-reports.sh b/noir/noir-repo/.github/scripts/merge-bench-reports.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -eu
+
+echo "Merging reports"
+
+REPORT_NAME=$1
+NAME_PLURAL=""$REPORT_NAME"s"
+
+combined_reports="[]"
+
+# Iterate over each report and merge them
+for report in ./reports/*; do
+  # The report is saved under ./$REPORT_NAME_{ matrix_report }/$REPORT_NAME_{ matrix_report }.json
+  FILE_PATH=$(echo $(ls $report)) 
+
+  # Extract the $NAME_PLURAL array from each report and merge it
+  combined_reports=$(jq '[."'"$NAME_PLURAL"'"[]] + '"$combined_reports" <<< "$(cat "$report/$FILE_PATH")")
+done
+
+combined_reports=$(jq '[."'$NAME_PLURAL'"[]] + '"$combined_reports" <<< "$(cat ./$REPORT_NAME.json)")
+
+# Wrap the merged memory reports into a new object as to keep the $NAME_PLURAL key
+final_report="{\"$NAME_PLURAL\": $combined_reports}"
+
+echo "$final_report" > $REPORT_NAME.json
+
+cat $REPORT_NAME.json
diff --git a/noir/noir-repo/.github/workflows/cache-cleanup.yml b/noir/noir-repo/.github/workflows/cache-cleanup.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   cleanup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Cleanup
         run: |

diff --git a/noir/noir-repo/.github/workflows/deny.yml b/noir/noir-repo/.github/workflows/deny.yml
@@ -18,7 +18,7 @@ concurrency: deny-${{ github.head_ref || github.run_id }}
 jobs:
   deny:
     name: deny
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1

diff --git a/noir/noir-repo/.github/workflows/docs-dead-links.yml b/noir/noir-repo/.github/workflows/docs-dead-links.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   markdown-link-check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@master
     - uses: gaurav-nelson/github-action-markdown-link-check@v1

diff --git a/noir/noir-repo/.github/workflows/docs-pr.yml b/noir/noir-repo/.github/workflows/docs-pr.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   add_label:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       has_label: ${{ steps.check-labels.outputs.result }}
     steps:
@@ -49,7 +49,7 @@ jobs:
           }
 
   build_preview:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -93,7 +93,7 @@ jobs:
 
   deploy_preview:
     needs: [build_preview, add_label]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       pull-requests: write
     if: needs.add_label.outputs.has_label == 'true'
@@ -121,7 +121,7 @@ jobs:
 
   add_comment:
     needs: [deploy_preview]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       pull-requests: write
     steps:

diff --git a/noir/noir-repo/.github/workflows/formatting.yml b/noir/noir-repo/.github/workflows/formatting.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   clippy:
     name: cargo clippy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     env:
       RUSTFLAGS: -Dwarnings
@@ -41,7 +41,7 @@ jobs:
 
   rustfmt:
     name: cargo fmt
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     env:
       RUSTFLAGS: -Dwarnings
@@ -67,7 +67,7 @@ jobs:
 
   eslint:
     name: eslint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
 
     steps:
@@ -115,7 +115,7 @@ jobs:
   nargo_fmt:
     needs: [build-nargo]
     name: Nargo fmt
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
 
     steps:

diff --git a/noir/noir-repo/.github/workflows/publish-acvm.yml b/noir/noir-repo/.github/workflows/publish-acvm.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   publish:
     name: Publish in order
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

diff --git a/noir/noir-repo/.github/workflows/publish-docs.yml b/noir/noir-repo/.github/workflows/publish-docs.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   publish-docs:
     name: Publish docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout release branch

diff --git a/noir/noir-repo/.github/workflows/publish-es-packages.yml b/noir/noir-repo/.github/workflows/publish-es-packages.yml
@@ -16,7 +16,7 @@ run-name: Publish ES Packages from ${{ inputs.noir-ref }} under @${{ inputs.npm-
 
 jobs:
   build-noirc_abi_wasm:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Noir repo
         uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
           retention-days: 10
 
   build-noir_wasm:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
           retention-days: 3
 
   build-acvm_js:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -121,7 +121,7 @@ jobs:
           retention-days: 3
 
   publish-es-packages:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [build-acvm_js, build-noirc_abi_wasm, build-noir_wasm]
     steps:
       - name: Checkout sources

diff --git a/noir/noir-repo/.github/workflows/publish-nightly.yml b/noir/noir-repo/.github/workflows/publish-nightly.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   dispatch-publish-es:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Dispatch to publish-nargo
         uses: benc-uk/workflow-dispatch@v1

diff --git a/noir/noir-repo/.github/workflows/pull-request-title.yml b/noir/noir-repo/.github/workflows/pull-request-title.yml
@@ -15,7 +15,7 @@ permissions:
 jobs:
   conventional-title:
     name: Validate PR title is Conventional Commit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check title
         if: github.event_name == 'pull_request_target'
@@ -30,7 +30,7 @@ jobs:
 
   force-push-comment:
     name: Warn external contributors about force-pushing
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != 'noir-lang/noir' }} 
     permissions:
       pull-requests: write

diff --git a/noir/noir-repo/.github/workflows/recrawler.yml b/noir/noir-repo/.github/workflows/recrawler.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   algolia_recrawl:
     name: Algolia Recrawl
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Algolia crawler creation and crawl
         uses: algolia/[email protected]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6d0f86ba389a5b59b1d7fdcadcbce3e40eecaa48
		1b0dd4149d9249f0ea4fb5e2228c688e0135618f