fix: master conflicts

.github/workflows/ci.yml

@@ -363,7 +363,7 @@ jobs:
   noir-format:
     needs: [setup, changes]
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
-    if: ${{ needs.changes.outputs.noir == 'true' }}
+    if: ${{ needs.changes.outputs.noir == 'true' || needs.changes.outputs.noir-projects == 'true' }}
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }

.github/workflows/devnet-deploys.yml

@@ -134,3 +134,9 @@ jobs:
         run: |
           terraform init -input=false -backend-config="key=${{ env.DEPLOY_TAG }}/prover"
           terraform apply -input=false -auto-approve
+
+      - name: Deploy Provers
+        working-directory: ./yarn-project/aztec/terraform/prover
+        run: |
+          terraform init -input=false -backend-config="key=devnet/prover"
+          terraform apply -input=false -auto-approve

.github/workflows/pull-noir.yml

@@ -5,8 +5,11 @@ name: Pull from noir repo
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: false
+
 on:
-  # o
+  schedule:
+    # Run every morning at 8 AM UTC
+    - cron: "0 8 * * *"
   workflow_dispatch: {}
 
 jobs:

.noir-sync-commit

@@ -1 +1 @@
-2e543b40eb83ef2080e4d8f870f525fadd631099
+7b77bbfc19c51829814149e623257a3424d8e8c2

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  ".": "0.43.0",
+  ".": "0.45.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.43.0",
-  "barretenberg": "0.43.0",
-  "barretenberg/ts": "0.43.0"
+  "yarn-project/aztec": "0.45.0",
+  "barretenberg": "0.45.0",
+  "barretenberg/ts": "0.45.0"
 }

.vscode/settings.json

@@ -169,4 +169,5 @@
     "**/noir/noir-repo/docs/versioned_docs/**": true
   },
   "cmake.sourceDirectory": "${workspaceFolder}/barretenberg/cpp",
+  "typescript.tsserver.maxTsServerMemory": 4096,
 }

CODEOWNERS

@@ -12,8 +12,8 @@
 /barretenberg/cpp/pil @Maddiaa0 @jeanmon @IlyasRidhuan @fcarreiro
 # on changes to PIL-generated C++
 /barretenberg/cpp/src/barretenberg/**/generated @jeanmon @IlyasRidhuan @fcarreiro
-# on changes to AVM trace (C++ witness generator)
-/barretenberg/cpp/src/barretenberg/vm/avm_trace @jeanmon @IlyasRidhuan @fcarreiro
+# on changes to AVM C++ code
+/barretenberg/cpp/src/barretenberg/vm @jeanmon @IlyasRidhuan @fcarreiro
 # on changes to public context in aztec-nr
 /noir-projects/aztec-nr/aztec/src/context/inputs/public_context_inputs.nr @fcarreiro @dbanks12
 /noir-projects/aztec-nr/aztec/src/context/public_context.nr @fcarreiro @dbanks12
@@ -24,7 +24,6 @@
 /yarn-project/simulator/src/public/side_effect_trace.test.ts @fcarreiro @dbanks12
 /yarn-project/simulator/src/public/side_effect_trace.ts @fcarreiro @dbanks12
 /yarn-project/simulator/src/public/side_effect_trace_interface.ts @fcarreiro @dbanks12
-/yarn-project/simulator/src/public/transitional_adaptors.ts @fcarreiro @dbanks12
 # on changes to the AVM transpiler
 /avm-transpiler/src @fcarreiro @dbanks12
 #####################################################

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.

avm-transpiler/src/main.rs

@@ -20,29 +20,36 @@ fn main() {
     let args: Vec<String> = env::args().collect();
     let in_contract_artifact_path = &args[1];
     let out_transpiled_artifact_path = &args[2];
+    let json_parse_error = format!(
+        "Unable to parse json for: {in_contract_artifact_path}
+    This is probably a stale json file with a different wire format.
+    You might need to recompile the contract or delete the json file"
+    );
 
     // Parse original (pre-transpile) contract.
-    let contract_json =
-        fs::read_to_string(Path::new(in_contract_artifact_path)).expect("Unable to read file");
+    let contract_json = fs::read_to_string(Path::new(in_contract_artifact_path))
+        .expect(&format!("Unable to read file: {in_contract_artifact_path}"));
     let raw_json_obj: serde_json::Value =
-        serde_json::from_str(&contract_json).expect("Unable to parse json");
+        serde_json::from_str(&contract_json).expect(&json_parse_error);
 
     // Skip if contract has "transpiled: true" flag!
     if let Some(serde_json::Value::Bool(true)) = raw_json_obj.get("transpiled") {
         warn!("Contract already transpiled. Skipping.");
         return;
     }
 
-    // Backup the original file.
-    std::fs::copy(
-        Path::new(in_contract_artifact_path),
-        Path::new(&(in_contract_artifact_path.clone() + ".bak")),
-    )
-    .expect("Unable to backup file");
+    // Backup the output file if it already exists.
+    if Path::new(out_transpiled_artifact_path).exists() {
+        std::fs::copy(
+            Path::new(out_transpiled_artifact_path),
+            Path::new(&(out_transpiled_artifact_path.clone() + ".bak")),
+        )
+        .expect(&format!("Unable to backup file: {out_transpiled_artifact_path}"));
+    }
 
     // Parse json into contract object
     let contract: CompiledAcirContractArtifact =
-        serde_json::from_str(&contract_json).expect("Unable to parse json");
+        serde_json::from_str(&contract_json).expect(&json_parse_error);
 
     // Transpile contract to AVM bytecode
     let transpiled_contract = TranspiledContractArtifact::from(contract);

avm-transpiler/src/opcodes.rs

@@ -23,15 +23,15 @@ pub enum AvmOpcode {
     ADDRESS,
     STORAGEADDRESS,
     SENDER,
-    FEEPERL2GAS,
-    FEEPERDAGAS,
+    FUNCTIONSELECTOR,
     TRANSACTIONFEE,
-    CONTRACTCALLDEPTH,
     CHAINID,
     VERSION,
     BLOCKNUMBER,
     TIMESTAMP,
     COINBASE,
+    FEEPERL2GAS,
+    FEEPERDAGAS,
     BLOCKL2GASLIMIT,
     BLOCKDAGASLIMIT,
     CALLDATACOPY,
@@ -106,16 +106,16 @@ impl AvmOpcode {
             AvmOpcode::ADDRESS => "ADDRESS",
             AvmOpcode::STORAGEADDRESS => "STORAGEADDRESS",
             AvmOpcode::SENDER => "SENDER",
-            AvmOpcode::FEEPERL2GAS => "FEEPERL2GAS",
-            AvmOpcode::FEEPERDAGAS => "FEEPERDAGAS",
+            AvmOpcode::FUNCTIONSELECTOR => "FUNCTIONSELECTOR",
             AvmOpcode::TRANSACTIONFEE => "TRANSACTIONFEE",
-            AvmOpcode::CONTRACTCALLDEPTH => "CONTRACTCALLDEPTH",
             // Execution Environment - Globals
             AvmOpcode::CHAINID => "CHAINID",
             AvmOpcode::VERSION => "VERSION",
             AvmOpcode::BLOCKNUMBER => "BLOCKNUMBER",
             AvmOpcode::TIMESTAMP => "TIMESTAMP",
             AvmOpcode::COINBASE => "COINBASE",
+            AvmOpcode::FEEPERL2GAS => "FEEPERL2GAS",
+            AvmOpcode::FEEPERDAGAS => "FEEPERDAGAS",
             AvmOpcode::BLOCKL2GASLIMIT => "BLOCKL2GASLIMIT",
             AvmOpcode::BLOCKDAGASLIMIT => "BLOCKDAGASLIMIT",
             // Execution Environment - Calldata

avm-transpiler/src/transpile.rs

@@ -247,7 +247,7 @@ fn handle_foreign_call(
         "avmOpcodeStaticCall" => {
             handle_external_call(avm_instrs, destinations, inputs, AvmOpcode::STATICCALL);
         }
-        "amvOpcodeEmitUnencryptedLog" => {
+        "avmOpcodeEmitUnencryptedLog" => {
             handle_emit_unencrypted_log(avm_instrs, destinations, inputs);
         }
         "avmOpcodeNoteHashExists" => handle_note_hash_exists(avm_instrs, destinations, inputs),
@@ -263,8 +263,8 @@ fn handle_foreign_call(
         "avmOpcodeGetContractInstance" => {
             handle_get_contract_instance(avm_instrs, destinations, inputs);
         }
-        "storageRead" => handle_storage_read(avm_instrs, destinations, inputs),
-        "storageWrite" => handle_storage_write(avm_instrs, destinations, inputs),
+        "avmOpcodeStorageRead" => handle_storage_read(avm_instrs, destinations, inputs),
+        "avmOpcodeStorageWrite" => handle_storage_write(avm_instrs, destinations, inputs),
         "debugLog" => handle_debug_log(avm_instrs, destinations, inputs),
         // Getters.
         _ if inputs.is_empty() && destinations.len() == 1 => {
@@ -314,11 +314,9 @@ fn handle_external_call(
         ValueOrArray::HeapVector(HeapVector { pointer, size }) => (pointer.0 as u32, size.0 as u32),
         _ => panic!("Call instruction's args input should be a HeapVector input"),
     };
-    let temporary_function_selector_offset = match &inputs[4] {
+    let function_selector_offset = match &inputs[4] {
         ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
-        _ => panic!(
-            "Call instruction's temporary function selector input should be a basic MemoryAddress",
-        ),
+        _ => panic!("Call instruction's function selector input should be a basic MemoryAddress",),
     };
 
     let ret_offset_maybe = destinations[0];
@@ -351,7 +349,7 @@ fn handle_external_call(
             AvmOperand::U32 { value: ret_offset },
             AvmOperand::U32 { value: ret_size },
             AvmOperand::U32 { value: success_offset },
-            AvmOperand::U32 { value: temporary_function_selector_offset },
+            AvmOperand::U32 { value: function_selector_offset },
         ],
         ..Default::default()
     });
@@ -435,32 +433,25 @@ fn handle_emit_unencrypted_log(
     destinations: &Vec<ValueOrArray>,
     inputs: &Vec<ValueOrArray>,
 ) {
-    if !destinations.is_empty() || inputs.len() != 3 {
+    if !destinations.is_empty() || inputs.len() != 2 {
         panic!(
-            "Transpiler expects ForeignCall::EMITUNENCRYPTEDLOG to have 0 destinations and 3 inputs, got {} and {}",
+            "Transpiler expects ForeignCall::EMITUNENCRYPTEDLOG to have 0 destinations and 2 inputs, got {} and {}",
             destinations.len(),
             inputs.len()
         );
     }
-    let event_offset = match &inputs[0] {
-        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
-        _ => panic!(
-            "Unexpected inputs[0] (event) for ForeignCall::EMITUNENCRYPTEDLOG: {:?}",
-            inputs[0]
-        ),
-    };
+
     // The fields are a slice, and this is represented as a (length: Field, slice: HeapVector).
     // The length field is redundant and we skipt it.
-    let (message_offset, message_size_offset) = match &inputs[2] {
+    let (message_offset, message_size_offset) = match &inputs[1] {
         ValueOrArray::HeapVector(vec) => (vec.pointer.to_usize() as u32, vec.size.0 as u32),
         _ => panic!("Unexpected inputs for ForeignCall::EMITUNENCRYPTEDLOG: {:?}", inputs),
     };
     avm_instrs.push(AvmInstruction {
         opcode: AvmOpcode::EMITUNENCRYPTEDLOG,
         // The message array from Brillig is indirect.
-        indirect: Some(FIRST_OPERAND_INDIRECT),
+        indirect: Some(ZEROTH_OPERAND_INDIRECT),
         operands: vec![
-            AvmOperand::U32 { value: event_offset },
             AvmOperand::U32 { value: message_offset },
             AvmOperand::U32 { value: message_size_offset },
         ],
@@ -657,6 +648,7 @@ fn handle_getter_instruction(
         "avmOpcodeTimestamp" => AvmOpcode::TIMESTAMP,
         "avmOpcodeL2GasLeft" => AvmOpcode::L2GASLEFT,
         "avmOpcodeDaGasLeft" => AvmOpcode::DAGASLEFT,
+        "avmOpcodeFunctionSelector" => AvmOpcode::FUNCTIONSELECTOR,
         // "callStackDepth" => AvmOpcode::CallStackDepth,
         _ => panic!("Transpiler doesn't know how to process ForeignCall function {:?}", function),
     };
@@ -933,7 +925,7 @@ fn handle_storage_write(
     inputs: &Vec<ValueOrArray>,
 ) {
     assert!(inputs.len() == 2);
-    assert!(destinations.len() == 1);
+    assert!(destinations.len() == 0);
 
     let slot_offset_maybe = inputs[0];
     let slot_offset = match slot_offset_maybe {
@@ -999,8 +991,8 @@ fn handle_storage_read(
     inputs: &Vec<ValueOrArray>,
 ) {
     // For the foreign calls we want to handle, we do not want inputs, as they are getters
-    assert!(inputs.len() == 2); // output, len - but we dont use this len - its for the oracle
-    assert!(destinations.len() == 1);
+    assert!(inputs.len() == 2); // output, len. The latter is not used by the AVM, but required in the oracle call so that TXE knows how many slots to read.
+    assert!(destinations.len() == 1); // return values
 
     let slot_offset_maybe = inputs[0];
     let slot_offset = match slot_offset_maybe {

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 947c5552eeb784dad1abb5ecebdb6a80880fec08
-	parent = 94954131ea61bb6b58efe4e9f8b4e1f489f53fa9
+	commit = 6c5e3b6b9170673a3bedbb82f3e6dc4162f457a2
+	parent = d3388d46f0c1c3a4c9f6a15abeae41f764039c10
 	method = merge
 	cmdver = 0.4.6