From a6ac8c3cc84500a3780c41296f5e5c1c18694ff4 Mon Sep 17 00:00:00 2001 From: Aztec Bot <49558828+AztecBot@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:47:43 -0400 Subject: [PATCH] feat: Sync from noir (#8619) Automated pull of development from the [noir](https://github.com/noir-lang/noir) programming language, a dependency of Aztec. BEGIN_COMMIT_OVERRIDE feat(perf): Remove unused loads in mem2reg and last stores per function (https://github.com/noir-lang/noir/pull/5925) fix: Correct stack trace order in comptime assertion failures (https://github.com/noir-lang/noir/pull/6066) chore!: removing implicit numeric generics (https://github.com/noir-lang/noir/pull/5837) fix: Always parse all tokens from quoted token streams (https://github.com/noir-lang/noir/pull/6064) fix: Update databus in flattening (https://github.com/noir-lang/noir/pull/6063) fix: Be more lenient with semicolons on interned expressions (https://github.com/noir-lang/noir/pull/6062) feat: check unconstrained trait impl method matches (https://github.com/noir-lang/noir/pull/6057) chore: remove unused TypeVariableKind::Constant (https://github.com/noir-lang/noir/pull/6053) END_COMMIT_OVERRIDE --------- Co-authored-by: TomAFrench --- aztec/src/oracle/get_l1_to_l2_membership_witness.nr | 4 ++-- aztec/src/oracle/get_nullifier_membership_witness.nr | 2 +- aztec/src/oracle/get_public_data_witness.nr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aztec/src/oracle/get_l1_to_l2_membership_witness.nr b/aztec/src/oracle/get_l1_to_l2_membership_witness.nr index 38e81094..0a93fa3f 100644 --- a/aztec/src/oracle/get_l1_to_l2_membership_witness.nr +++ b/aztec/src/oracle/get_l1_to_l2_membership_witness.nr @@ -1,6 +1,6 @@ -use dep::protocol_types::{address::AztecAddress}; +use dep::protocol_types::address::AztecAddress; -global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: u64 = 17; +global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: u32 = 17; // Obtains membership witness (index and sibling path) for a message in the L1 to L2 message tree. #[oracle(getL1ToL2MembershipWitness)] diff --git a/aztec/src/oracle/get_nullifier_membership_witness.nr b/aztec/src/oracle/get_nullifier_membership_witness.nr index 5050988f..986507b1 100644 --- a/aztec/src/oracle/get_nullifier_membership_witness.nr +++ b/aztec/src/oracle/get_nullifier_membership_witness.nr @@ -4,7 +4,7 @@ use dep::protocol_types::{ }; // INDEX_LENGTH + NULLIFIER_LEAF_PREIMAGE_LENGTH + NULLIFIER_TREE_HEIGHT -global NULLIFIER_MEMBERSHIP_WITNESS: Field = 24; +global NULLIFIER_MEMBERSHIP_WITNESS: u32 = 24; struct NullifierMembershipWitness { index: Field, diff --git a/aztec/src/oracle/get_public_data_witness.nr b/aztec/src/oracle/get_public_data_witness.nr index 8c0f76f5..4f567868 100644 --- a/aztec/src/oracle/get_public_data_witness.nr +++ b/aztec/src/oracle/get_public_data_witness.nr @@ -1,7 +1,7 @@ use dep::protocol_types::{constants::PUBLIC_DATA_TREE_HEIGHT, data::PublicDataTreeLeafPreimage, utils::arr_copy_slice}; global LEAF_PREIMAGE_LENGTH: u32 = 4; -global PUBLIC_DATA_WITNESS: Field = 45; +global PUBLIC_DATA_WITNESS: u32 = 45; struct PublicDataWitness { index: Field,