feat: Sync from noir

.noir-sync-commit

@@ -1 +1 @@
-2e543b40eb83ef2080e4d8f870f525fadd631099
+4c4ea2df0163d4989c922c6a1377e04c2cd0540c

avm-transpiler/scripts/compile_then_transpile.sh

@@ -18,7 +18,7 @@ fi
 shift # remove the compile arg so we can inject --show-artifact-paths
 
 # Forward all arguments to nargo, tee output to console
-artifacts_to_transpile=$($NARGO compile --show-artifact-paths $@ | tee /dev/tty | grep -oP 'Saved contract artifact to: \K.*')
+artifacts_to_transpile=$($NARGO compile --use-legacy --show-artifact-paths $@ | tee /dev/tty | grep -oP 'Saved contract artifact to: \K.*')
 
 # NOTE: the output that is teed to /dev/tty will normally not be redirectable by the caller.
 # If the script is run via docker, however, the user will see this output on stdout and will be able to redirect.

noir-projects/aztec-nr/aztec/src/context/unconstrained_context.nr

@@ -8,7 +8,7 @@ struct UnconstrainedContext {
 }
 
 impl UnconstrainedContext {
-    fn new() -> Self {
+    unconstrained fn new() -> Self {
         // We could call these oracles on the getters instead of at creation, which makes sense given that they might
         // not even be accessed. However any performance gains are minimal, and we'd rather fail early if a user
         // incorrectly attempts to create an UnconstrainedContext in an environment in which these oracles are not

noir-projects/noir-contracts/bootstrap.sh

@@ -17,7 +17,7 @@ fi
 
 echo "Compiling contracts..."
 NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
-$NARGO compile --silence-warnings
+$NARGO compile --silence-warnings --use-legacy
 
 echo "Transpiling contracts..."
 scripts/transpile.sh

noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr

@@ -3,18 +3,17 @@ mod dapp_payload;
 
 contract AppSubscription {
     use crate::{dapp_payload::DAppPayload, subscription_note::{SubscriptionNote, SUBSCRIPTION_NOTE_LEN}};
-    use dep::{
-        aztec::{
+    use aztec::{
         prelude::{
         AztecAddress, FunctionSelector, PrivateContext, NoteHeader, Map, PrivateMutable, PublicMutable,
         SharedImmutable
     },
         encrypted_logs::encrypted_note_emission::encode_and_encrypt,
         protocol_types::{traits::is_empty, grumpkin_point::GrumpkinPoint}
-    },
-        authwit::{auth_witness::get_auth_witness, auth::assert_current_call_valid_authwit},
-        gas_token::GasToken, token::Token
     };
+    use authwit::{auth_witness::get_auth_witness, auth::assert_current_call_valid_authwit};
+    use gas_token::GasToken;
+    use token::Token;
 
     #[aztec(storage)]
     struct Storage {

noir-projects/noir-protocol-circuits/bootstrap.sh

@@ -20,4 +20,4 @@ node ./index.js
 
 echo "Compiling protocol circuits..."
 NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
-$NARGO compile --silence-warnings
+$NARGO compile --silence-warnings --use-legacy

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr

@@ -2,9 +2,8 @@ use crate::{
     abis::{previous_rollup_data::PreviousRollupData, constant_rollup_data::ConstantRollupData},
     components, root::{root_rollup_public_inputs::RootRollupPublicInputs}
 };
-use dep::{
-    std, parity_lib::{root::root_rollup_parity_input::RootRollupParityInput, ParityPublicInputs},
-    types::{
+use parity_lib::{root::root_rollup_parity_input::RootRollupParityInput, ParityPublicInputs};
+use types::{
     abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, nullifier_leaf_preimage::NullifierLeafPreimage},
     constants::{
     NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, L1_TO_L2_MSG_SUBTREE_HEIGHT,
@@ -13,7 +12,6 @@ use dep::{
     header::Header, content_commitment::ContentCommitment,
     merkle_tree::{append_only_tree, calculate_subtree_root, calculate_empty_tree_root},
     state_reference::StateReference, traits::Empty
-}
 };
 
 struct RootRollupInputs {

noir/noir-repo/.aztec-sync-commit

@@ -1 +1 @@
-58e15edf7fd3d32267b0aed883fc84f6cee327c9
+12af650f0d27c37dca06bb329bf76a5574534d78

noir/noir-repo/.github/scripts/cargo-binstall-install.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 set -eu
 
-curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+if [ command -v cargo-binstall  &> /dev/null ]; then
+  cargo-binstall cargo-binstall -y
+else
+  curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+fi
+

noir/noir-repo/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/noir-lang/noir
 	branch = master
-	commit = a6016b46abf6da6de4566cf6d35a675d805dd9b5
-	parent = 6c7062443ae23cc75ac06b7ac1492d12f803d0e5
+	commit = f2f8ecc833d4725d0829f9c339389c90d1a4fbcd
+	parent = 180b49b51759eb0caf7f49efe3d4a2d54c43ae59
 	method = merge
 	cmdver = 0.4.6

noir/noir-repo/.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  ".": "0.30.0",
-  "acvm-repo": "0.46.0"
+  ".": "0.31.0",
+  "acvm-repo": "0.47.0"
 }