Merge branch 'master' into gd/issue_7272

Author: guipublic

.github/workflows/formatting.yml

@@ -65,6 +65,32 @@ jobs:
       - name: Run `cargo fmt`
         run: cargo fmt --all --check
 
+  rustdoc:
+    name: cargo doc
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    env:
+      RUSTDOCFLAGS: -Dwarnings
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup toolchain
+        uses: dtolnay/rust-toolchain@1.85.0
+        with:
+          targets: x86_64-unknown-linux-gnu
+          components: clippy, rustfmt
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: x86_64-unknown-linux-gnu
+          cache-on-failure: true
+          save-if: ${{ github.event_name != 'merge_group' }}
+
+      - name: Run `cargo doc`
+        run: cargo doc --no-deps --document-private-items --workspace
+
   eslint:
     name: eslint
     runs-on: ubuntu-22.04
@@ -143,6 +169,7 @@ jobs:
     needs:
       - clippy
       - rustfmt
+      - rustdoc
       - eslint
       - nargo_fmt
 

acvm-repo/acir/src/circuit/mod.rs

@@ -123,28 +123,6 @@ impl<'de> Deserialize<'de> for ErrorSelector {
     }
 }
 
-#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
-pub struct RawAssertionPayload<F> {
-    pub selector: ErrorSelector,
-    pub data: Vec<F>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub enum ResolvedAssertionPayload<F> {
-    String(String),
-    Raw(RawAssertionPayload<F>),
-}
-
-#[derive(Debug, Copy, Clone)]
-/// The opcode location for a call to a separate ACIR circuit
-/// This includes the function index of the caller within a [program][Program]
-/// and the index in the callers ACIR to the specific call opcode.
-/// This is only resolved and set during circuit execution.
-pub struct ResolvedOpcodeLocation {
-    pub acir_function_index: usize,
-    pub opcode_location: OpcodeLocation,
-}
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 #[cfg_attr(feature = "arb", derive(proptest_derive::Arbitrary))]
 /// Opcodes are locatable so that callers can

acvm-repo/acvm/src/pwg/brillig.rs

@@ -4,7 +4,7 @@ use acir::{
     AcirField,
     brillig::{ForeignCallParam, ForeignCallResult, Opcode as BrilligOpcode},
     circuit::{
-        ErrorSelector, OpcodeLocation, RawAssertionPayload, ResolvedAssertionPayload,
+        OpcodeLocation,
         brillig::{BrilligFunctionId, BrilligInputs, BrilligOutputs},
         opcodes::BlockId,
     },
@@ -16,7 +16,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{OpcodeResolutionError, pwg::OpcodeNotSolvable};
 
-use super::{get_value, insert_value, memory_op::MemoryOpSolver};
+use super::{
+    ErrorSelector, RawAssertionPayload, ResolvedAssertionPayload, get_value, insert_value,
+    memory_op::MemoryOpSolver,
+};
 
 #[derive(Debug)]
 pub enum BrilligSolverStatus<F> {

acvm-repo/acvm/src/pwg/mod.rs

@@ -7,7 +7,6 @@ use acir::{
     brillig::ForeignCallResult,
     circuit::{
         AssertionPayload, ErrorSelector, ExpressionOrMemory, Opcode, OpcodeLocation,
-        RawAssertionPayload, ResolvedAssertionPayload,
         brillig::{BrilligBytecode, BrilligFunctionId},
         opcodes::{
             AcirFunctionId, BlockId, ConstantOrWitnessEnum, FunctionInput, InvalidInputBitSize,
@@ -34,6 +33,7 @@ mod memory_op;
 
 pub use self::brillig::{BrilligSolver, BrilligSolverStatus};
 pub use brillig::ForeignCallWaitInfo;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum ACVMStatus<F> {
@@ -117,6 +117,18 @@ impl std::fmt::Display for ErrorLocation {
     }
 }
 
+#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
+pub struct RawAssertionPayload<F> {
+    pub selector: ErrorSelector,
+    pub data: Vec<F>,
+}
+
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum ResolvedAssertionPayload<F> {
+    String(String),
+    Raw(RawAssertionPayload<F>),
+}
+
 #[derive(Clone, PartialEq, Eq, Debug, Error)]
 pub enum OpcodeResolutionError<F> {
     #[error("Cannot solve opcode: {0}")]

acvm-repo/acvm_js/src/execute.rs

@@ -1,12 +1,11 @@
 use std::{future::Future, pin::Pin};
 
-use acvm::acir::circuit::ResolvedAssertionPayload;
 use acvm::acir::circuit::brillig::BrilligBytecode;
 use acvm::{BlackBoxFunctionSolver, FieldElement};
 use acvm::{
     acir::circuit::{Circuit, Program},
     acir::native_types::{WitnessMap, WitnessStack},
-    pwg::{ACVM, ACVMStatus, ErrorLocation, OpcodeResolutionError},
+    pwg::{ACVM, ACVMStatus, ErrorLocation, OpcodeResolutionError, ResolvedAssertionPayload},
 };
 use bn254_blackbox_solver::Bn254BlackBoxSolver;
 

acvm-repo/acvm_js/src/js_execution_error.rs

@@ -1,6 +1,7 @@
 use acvm::{
     FieldElement,
-    acir::circuit::{OpcodeLocation, RawAssertionPayload, brillig::BrilligFunctionId},
+    acir::circuit::{OpcodeLocation, brillig::BrilligFunctionId},
+    pwg::RawAssertionPayload,
 };
 use gloo_utils::format::JsValueSerdeExt;
 use js_sys::{Array, Error, JsString, Reflect};

compiler/integration-tests/package.json

@@ -13,7 +13,7 @@
     "lint": "NODE_NO_WARNINGS=1 eslint . --max-warnings 0"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.77.1",
+    "@aztec/bb.js": "0.81.0",
     "@noir-lang/noir_js": "workspace:*",
     "@noir-lang/noir_wasm": "workspace:*",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",

compiler/noirc_evaluator/src/acir/mod.rs

@@ -1392,22 +1392,21 @@ impl<'a> Context<'a> {
         // Get operations to call-data parameters are replaced by a get to the call-data-bus array
         let call_data =
             self.data_bus.call_data.iter().find(|cd| cd.index_map.contains_key(&array)).cloned();
-        if let Some(call_data) = call_data {
+        let mut value = if let Some(call_data) = call_data {
             let call_data_block = self.ensure_array_is_initialized(call_data.array_id, dfg)?;
             let bus_index = self
                 .acir_context
                 .add_constant(FieldElement::from(call_data.index_map[&array] as i128));
             let mut current_index = self.acir_context.add_var(bus_index, var_index)?;
-            let result = self.get_from_call_data(&mut current_index, call_data_block, &res_typ)?;
-            self.define_result(dfg, instruction, result.clone());
-            return Ok(result);
-        }
-        // Compiler sanity check
-        assert!(
-            !res_typ.contains_slice_element(),
-            "ICE: Nested slice result found during ACIR generation"
-        );
-        let mut value = self.array_get_value(&res_typ, block_id, &mut var_index)?;
+            self.get_from_call_data(&mut current_index, call_data_block, &res_typ)?
+        } else {
+            // Compiler sanity check
+            assert!(
+                !res_typ.contains_slice_element(),
+                "ICE: Nested slice result found during ACIR generation"
+            );
+            self.array_get_value(&res_typ, block_id, &mut var_index)?
+        };
 
         if let AcirValue::Var(value_var, typ) = &value {
             let array_typ = dfg.type_of_value(array);

examples/recursion/generate_recursive_proof.sh

@@ -16,8 +16,8 @@ FULL_PROOF_AS_FIELDS="$($BACKEND prove -b ./target/sum.json -w ./target/sum_witn
 
 echo $FULL_PROOF_AS_FIELDS | jq 'length'
 # sum has 3 public inputs
-PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[3:6]')
-PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:3] + .[6:]')
+PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:3]')
+PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[3:]')
 
 RECURSE_LEAF_PROVER_TOML=./recurse_leaf/Prover.toml
 echo -n "" > $RECURSE_LEAF_PROVER_TOML
@@ -46,8 +46,8 @@ VK_AS_FIELDS=$(jq -r '.[0:]' ./target/recurse_leaf_vk_as_fields)
 
 FULL_PROOF_AS_FIELDS="$($BACKEND prove -b ./target/recurse_leaf.json -w ./target/recurse_leaf_witness.gz --honk_recursion 1 --init_kzg_accumulator --output_format fields -o -)"
 # recurse_leaf has 4 public inputs (excluding aggregation object)
-PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[3:7]')
-PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:3] + .[7:]')
+PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:4]')
+PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[4:]')
 
 RECURSE_NODE_PROVER_TOML=./recurse_node/Prover.toml
 echo -n "" > $RECURSE_NODE_PROVER_TOML

examples/recursion/recurse_leaf/src/main.nr

@@ -1,5 +1,5 @@
 global ULTRA_HONK_VK_SIZE: u32 = 128;
-global ULTRA_HONK_PROOF_SIZE: u32 = 459;
+global ULTRA_HONK_PROOF_SIZE: u32 = 456;
 global NUM_NON_ACCUMULATOR_PUBLIC_INPUTS: u32 = 3;
 global HONK_IDENTIFIER: u32 = 1;
 

examples/recursion/recurse_node/src/main.nr

@@ -1,5 +1,5 @@
 global ULTRA_HONK_VK_SIZE: u32 = 128;
-global ULTRA_HONK_PROOF_SIZE: u32 = 459; // Number of fields when recursion is enabled
+global ULTRA_HONK_PROOF_SIZE: u32 = 456; // Number of fields when recursion is enabled
 global NUM_NON_ACCUMULATOR_PUBLIC_INPUTS: u32 = 4;
 global HONK_IDENTIFIER: u32 = 1;
 

examples/solidity_verifier/solidity_verifier.sh

@@ -23,17 +23,14 @@ PROOF_HEX=$(cat $PROOF_PATH | od -An -v -t x1 | tr -d $' \n' | sed 's/^.\{8\}//'
 
 NUM_PUBLIC_INPUTS=2
 PUBLIC_INPUT_HEX_CHARS=$((32 * $NUM_PUBLIC_INPUTS * 2)) # Each public input is 32 bytes, 2 chars per byte
-PUBLIC_INPUT_OFFSET_CHARS=$((96 * 2)) # First 96 bytes are the proof header
 
-# Extract public inputs from proof - from 96th byte to 96 + 32 * NUM_PUBLIC_INPUTS bytes
-HEX_PUBLIC_INPUTS=${PROOF_HEX:$PUBLIC_INPUT_OFFSET_CHARS:$PUBLIC_INPUT_HEX_CHARS}
+# Extract public inputs from proof - first 32 * NUM_PUBLIC_INPUTS bytes
+HEX_PUBLIC_INPUTS=${PROOF_HEX:0:$PUBLIC_INPUT_HEX_CHARS}
 # Split public inputs into strings where each string represents a `bytes32`.
 SPLIT_HEX_PUBLIC_INPUTS=$(sed -e 's/.\{64\}/0x&,/g' <<<$HEX_PUBLIC_INPUTS)
 
-# Extract proof without public inputs - from 0 to 96 bytes + the part after public inputs
-PROOF_WITHOUT_PUBLIC_INPUTS_START=${PROOF_HEX:0:$PUBLIC_INPUT_OFFSET_CHARS} 
-PROOF_WITHOUT_PUBLIC_INPUTS_END=${PROOF_HEX:$(($PUBLIC_INPUT_OFFSET_CHARS + $PUBLIC_INPUT_HEX_CHARS))}
-PROOF_WITHOUT_PUBLIC_INPUTS="${PROOF_WITHOUT_PUBLIC_INPUTS_START}${PROOF_WITHOUT_PUBLIC_INPUTS_END}"
+# Extract proof without public inputs
+PROOF_WITHOUT_PUBLIC_INPUTS=${PROOF_HEX:$PUBLIC_INPUT_HEX_CHARS}
 
 # Spin up an anvil node to deploy the contract to
 anvil &

scripts/install_bb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="0.77.1"
+VERSION="0.81.0"
 
 BBUP_PATH=~/.bb/bbup
 

test_programs/execution_success/regression_7612/Nargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "regression_7612"
+type = "bin"
+authors = [""]
+
+[dependencies]

test_programs/execution_success/regression_7612/Prover.toml

@@ -0,0 +1,2 @@
+array = [{ counter = 8, fields = ["0x200000000"] }]
+x = true

test_programs/execution_success/regression_7612/src/main.nr

@@ -0,0 +1,11 @@
+pub struct Data {
+    fields: [Field; 1],
+    counter: u32,
+}
+
+fn main(array: call_data(0) [Data; 1], x: bool) {
+    let index = if x { 0 } else { 1 };
+    if index != 0 {
+        assert(array[index - 1].counter < 3);
+    }
+}

tooling/nargo/src/errors.rs

@@ -2,11 +2,8 @@ use std::collections::BTreeMap;
 
 use acvm::{
     AcirField, FieldElement,
-    acir::circuit::{
-        ErrorSelector, OpcodeLocation, RawAssertionPayload, ResolvedAssertionPayload,
-        ResolvedOpcodeLocation, brillig::BrilligFunctionId,
-    },
-    pwg::{ErrorLocation, OpcodeResolutionError},
+    acir::circuit::{ErrorSelector, OpcodeLocation, brillig::BrilligFunctionId},
+    pwg::{ErrorLocation, OpcodeResolutionError, RawAssertionPayload, ResolvedAssertionPayload},
 };
 use noirc_abi::{Abi, AbiErrorType, display_abi_error};
 use noirc_errors::{CustomDiagnostic, debug_info::DebugInfo, reporter::ReportedErrors};
@@ -86,6 +83,16 @@ impl<F: AcirField> NargoError<F> {
     }
 }
 
+#[derive(Debug, Copy, Clone)]
+/// The opcode location for a call to a separate ACIR circuit
+/// This includes the function index of the caller within a [program][acvm::acir::circuit::Program]
+/// and the index in the callers ACIR to the specific call opcode.
+/// This is only resolved and set during circuit execution.
+pub struct ResolvedOpcodeLocation {
+    pub acir_function_index: usize,
+    pub opcode_location: OpcodeLocation,
+}
+
 #[derive(Debug, Error)]
 pub enum ExecutionError<F: AcirField> {
     #[error("Failed assertion")]

tooling/nargo/src/ops/execute.rs

@@ -1,16 +1,15 @@
 use acvm::acir::circuit::brillig::BrilligBytecode;
-use acvm::acir::circuit::{
-    OpcodeLocation, Program, ResolvedAssertionPayload, ResolvedOpcodeLocation,
-};
+use acvm::acir::circuit::{OpcodeLocation, Program};
 use acvm::acir::native_types::WitnessStack;
 use acvm::pwg::{
     ACVM, ACVMStatus, ErrorLocation, OpcodeNotSolvable, OpcodeResolutionError, ProfilingSamples,
+    ResolvedAssertionPayload,
 };
 use acvm::{AcirField, BlackBoxFunctionSolver};
 use acvm::{acir::circuit::Circuit, acir::native_types::WitnessMap};
 
 use crate::NargoError;
-use crate::errors::ExecutionError;
+use crate::errors::{ExecutionError, ResolvedOpcodeLocation};
 use crate::foreign_calls::ForeignCallExecutor;
 
 struct ProgramExecutor<'a, F: AcirField, B: BlackBoxFunctionSolver<F>, E: ForeignCallExecutor<F>> {

tooling/nargo_cli/build.rs

@@ -261,8 +261,12 @@ fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path)
                 String::new()
             };
 
+            // Remove any trailing newlines added by some editors
+            let stdout = stdout.trim();
+            let expected_stdout = expected_stdout.trim();
+
             if stdout != expected_stdout {
-                println!("stdout does not match expected output. Expected:\n{}\n\nActual:\n{}", stdout, expected_stdout);
+                println!("stdout does not match expected output. Expected:\n{expected_stdout}\n\nActual:\n{stdout}");
                 assert_eq!(stdout, expected_stdout);
             }
             "#

tooling/noirc_abi_wasm/src/lib.rs

@@ -7,10 +7,8 @@ use getrandom as _;
 
 use acvm::{
     FieldElement,
-    acir::{
-        circuit::RawAssertionPayload,
-        native_types::{WitnessMap, WitnessStack},
-    },
+    acir::native_types::{WitnessMap, WitnessStack},
+    pwg::RawAssertionPayload,
 };
 use iter_extended::try_btree_map;
 use noirc_abi::{

yarn.lock

@@ -238,9 +238,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aztec/bb.js@npm:0.77.1":
-  version: 0.77.1
-  resolution: "@aztec/bb.js@npm:0.77.1"
+"@aztec/bb.js@npm:0.81.0":
+  version: 0.81.0
+  resolution: "@aztec/bb.js@npm:0.81.0"
   dependencies:
     comlink: "npm:^4.4.1"
     commander: "npm:^12.1.0"
@@ -250,7 +250,7 @@ __metadata:
     tslib: "npm:^2.4.0"
   bin:
     bb.js: dest/node/main.js
-  checksum: 10/fdfb27a52b326d5fc9c5119ce70bc8277fdccc8c7e5edcc7d4100904af25de3fffb59eb61cb3d0edbab9eac51555b86a81638946f1288d3b227566c7e6ad83a2
+  checksum: 10/0ef05d95590f4126d1deca033f7443e89a66c3cd8985b93fe71a2c90a570e54085deb1ab67379de1c2c7ec32e9e75532f45b7e1df194fd056a4f070cfe822acd
   languageName: node
   linkType: hard
 
@@ -18699,7 +18699,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "integration-tests@workspace:compiler/integration-tests"
   dependencies:
-    "@aztec/bb.js": "npm:0.77.1"
+    "@aztec/bb.js": "npm:0.81.0"
     "@noir-lang/noir_js": "workspace:*"
     "@noir-lang/noir_wasm": "workspace:*"
     "@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.8"