From bee15b6e07f1478e0e756f4cef9979aa4f5cdcfc Mon Sep 17 00:00:00 2001 From: Aztec Bot <49558828+AztecBot@users.noreply.github.com> Date: Fri, 2 Aug 2024 09:00:51 -0400 Subject: [PATCH] feat: Sync from noir (#7743) Automated pull of development from the [noir](https://github.com/noir-lang/noir) programming language, a dependency of Aztec. BEGIN_COMMIT_OVERRIDE feat: let LSP work will with code generated by macros (https://github.com/noir-lang/noir/pull/5665) chore(docs): Update web app page to use nargo v 0.31 (https://github.com/noir-lang/noir/pull/5652) feat: add `std::meta::type_of` and `impl Eq for Type` (https://github.com/noir-lang/noir/pull/5669) fix: speed up LSP (https://github.com/noir-lang/noir/pull/5650) feat: don't eagerly error on cast expressions (https://github.com/noir-lang/noir/pull/5635) fix: error on unbound generics in structs (https://github.com/noir-lang/noir/pull/5619) fix: allow using Self for function calls (https://github.com/noir-lang/noir/pull/5629) feat: let filenames in errors be relative to the current dir if possible (https://github.com/noir-lang/noir/pull/5642) feat: LSP inlay type hints on lambda parameters (https://github.com/noir-lang/noir/pull/5639) feat: Sync from aztec-packages (https://github.com/noir-lang/noir/pull/5598) fix!: parse block and if statements independently of expressions in statements (https://github.com/noir-lang/noir/pull/5634) chore: test blackbox binary op instructions (https://github.com/noir-lang/noir/pull/5484) chore(docs): add Writing Noir doc (https://github.com/noir-lang/noir/pull/5456) chore(github): Switch to organization-wide Issue templates (https://github.com/noir-lang/noir/pull/5622) chore: Switch `Value::TraitConstraint` to a resolved trait constraint (https://github.com/noir-lang/noir/pull/5618) fix: error on incorrect generic count for impl and type alias (https://github.com/noir-lang/noir/pull/5623) feat: allow inserting LSP inlay type hints (https://github.com/noir-lang/noir/pull/5620) feat: turbofish in struct pattern (https://github.com/noir-lang/noir/pull/5616) fix: correct span for prefix operator (https://github.com/noir-lang/noir/pull/5624) fix: `NoMatchingImplFound` in comptime code only (https://github.com/noir-lang/noir/pull/5617) feat: Remove 'comptime or separate crate' restriction on comptime code (https://github.com/noir-lang/noir/pull/5609) chore(docs): Update proving backend related docs (https://github.com/noir-lang/noir/pull/5601) feat: turbofish operator in struct constructor (https://github.com/noir-lang/noir/pull/5607) feat: add parameter to call_data attribute (https://github.com/noir-lang/noir/pull/5599) feat: turbofish operator on path segments (https://github.com/noir-lang/noir/pull/5603) fix: Filter comptime globals (https://github.com/noir-lang/noir/pull/5538) chore: Display comptime assertion errors, not Debug (https://github.com/noir-lang/noir/pull/5605) chore: add array and slice control flow tests (https://github.com/noir-lang/noir/pull/5558) fix: let trait calls work in globals (https://github.com/noir-lang/noir/pull/5602) feat: Implement format strings in the comptime interpreter (https://github.com/noir-lang/noir/pull/5596) feat: Implement `Value::Type` in comptime interpreter (https://github.com/noir-lang/noir/pull/5593) chore(docs): nasty linky (https://github.com/noir-lang/noir/pull/5600) feat(acir_gen): Width aware ACIR gen addition (https://github.com/noir-lang/noir/pull/5493) fix: lookup trait constraints methods in composite types (https://github.com/noir-lang/noir/pull/5595) fix: allow trailing comma when parsing where clauses (https://github.com/noir-lang/noir/pull/5594) fix: let std::unsafe::zeroed() work for slices (https://github.com/noir-lang/noir/pull/5592) fix: error on duplicate struct field (https://github.com/noir-lang/noir/pull/5585) END_COMMIT_OVERRIDE --------- Co-authored-by: sirasistant --- aztec/src/keys/constants.nr | 8 ++++---- aztec/src/keys/public_keys.nr | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aztec/src/keys/constants.nr b/aztec/src/keys/constants.nr index 24444f5..6914fb4 100644 --- a/aztec/src/keys/constants.nr +++ b/aztec/src/keys/constants.nr @@ -12,8 +12,8 @@ global TAGGING_INDEX = 3; global NUM_KEY_TYPES = 4; global sk_generators = [ - GENERATOR_INDEX__NSK_M, - GENERATOR_INDEX__IVSK_M, - GENERATOR_INDEX__OVSK_M, - GENERATOR_INDEX__TSK_M + GENERATOR_INDEX__NSK_M as Field, + GENERATOR_INDEX__IVSK_M as Field, + GENERATOR_INDEX__OVSK_M as Field, + GENERATOR_INDEX__TSK_M as Field ]; diff --git a/aztec/src/keys/public_keys.nr b/aztec/src/keys/public_keys.nr index ac53b76..6e46ea2 100644 --- a/aztec/src/keys/public_keys.nr +++ b/aztec/src/keys/public_keys.nr @@ -53,7 +53,7 @@ impl PublicKeys { self.tpk_m.x, self.tpk_m.y, self.tpk_m.is_infinite as Field, - GENERATOR_INDEX__PUBLIC_KEYS_HASH + GENERATOR_INDEX__PUBLIC_KEYS_HASH as Field ] ) }