Merge branch 'master' into tf/pull-out-get-all-contracts

* master:
  chore: add timeouts to CI (#7725)
  chore: Resolve various rustdoc warnings (#7724)
  chore: encapsulate `Index` within `LocalModuleId` (#7719)
  fix: doc comments on functions warn unexpectedly (#7721)
  chore: update docusaurus config to correct trailing slash issue (#7720)
  feat: allow `fn` returning `()` without having to write `-> ()` (#7717)
  fix: allow omitting ';' after last block statement if it's an assignment (#7718)
  chore: fix rustdoc issues (#7712)
  chore: check test program execution success output (#7713)
  chore: remove ultraplonk tests (#7680)
  chore(docs): Document BlackBoxFuncCall enum (#7702)

Author: TomAFrench

.github/workflows/reports.yml

@@ -10,6 +10,7 @@ jobs:
   benchmark-projects-list:
     name: Load benchmark projects list
     runs-on: ubuntu-22.04
+    timeout-minutes: 5
     outputs:
       projects: ${{ steps.get_bench_projects.outputs.projects }}
 
@@ -26,6 +27,7 @@ jobs:
 
   build-nargo:
     runs-on: ubuntu-22.04
+    timeout-minutes: 15
 
     steps:
       - name: Checkout Noir repo
@@ -61,6 +63,7 @@ jobs:
     name: Circuit sizes
     needs: [build-nargo]
     runs-on: ubuntu-24.04
+    timeout-minutes: 20
     permissions:
       pull-requests: write
 
@@ -101,6 +104,7 @@ jobs:
     name: Brillig bytecode sizes
     needs: [build-nargo]
     runs-on: ubuntu-22.04
+    timeout-minutes: 20
     permissions:
       pull-requests: write
 
@@ -150,6 +154,7 @@ jobs:
     name: Brillig execution trace sizes
     needs: [build-nargo]
     runs-on: ubuntu-22.04
+    timeout-minutes: 20
     permissions:
       pull-requests: write
 
@@ -199,6 +204,7 @@ jobs:
     name: Peak memory usage
     needs: [build-nargo]
     runs-on: ubuntu-22.04
+    timeout-minutes: 20
     permissions:
       pull-requests: write
 
@@ -240,6 +246,7 @@ jobs:
     name: Compilation and execution time
     needs: [build-nargo]
     runs-on: ubuntu-22.04
+    timeout-minutes: 20
     permissions:
       pull-requests: write
 
@@ -507,6 +514,7 @@ jobs:
   upload_compilation_report:
     name: Upload compilation report
     needs: [generate_compilation_and_execution_report, external_repo_compilation_and_execution_report]
+    timeout-minutes: 5
     # We want this job to run even if one variation of the matrix in `external_repo_compilation_and_execution_report` fails
     if: always()
     runs-on: ubuntu-22.04
@@ -558,6 +566,7 @@ jobs:
   upload_compilation_memory_report:
     name: Upload compilation memory report
     needs: [generate_memory_report, external_repo_memory_report]
+    timeout-minutes: 5
     # We want this job to run even if one variation of the matrix in `external_repo_memory_report` fails
     if: always()
     runs-on: ubuntu-22.04
@@ -608,6 +617,7 @@ jobs:
   upload_execution_memory_report:
     name: Upload execution memory report
     needs: [generate_memory_report, external_repo_memory_report]
+    timeout-minutes: 5
     # We want this job to run even if one variation of the matrix in `external_repo_memory_report` fails
     if: always()
     runs-on: ubuntu-22.04
@@ -655,10 +665,10 @@ jobs:
           alert-comment-cc-users: "@TomAFrench"
           max-items-in-chart: 50
 
-
   upload_execution_report:
     name: Upload execution report
     needs: [generate_compilation_and_execution_report, external_repo_compilation_and_execution_report]
+    timeout-minutes: 5
     # We want this job to run even if one variation of the matrix in `external_repo_compilation_and_execution_report` fails
     if: always()
     runs-on: ubuntu-22.04
@@ -711,6 +721,7 @@ jobs:
   reports-end:
     name: End
     runs-on: ubuntu-22.04
+    timeout-minutes: 5
     # We want this job to always run (even if the dependant jobs fail) as we want this job to fail rather than skipping.
     if: ${{ always() }}
     needs:

acvm-repo/acir/README.md

@@ -211,27 +211,29 @@ The black box functions supported by ACIR are:
 **Sha256Compression**: SHA256 compression function
 
 **RecursiveAggregation**: verify a proof inside the circuit.
-**Warning: this opcode is subject to change.**
 
-This black box function does not fully verify a proof, what it does is verify
-that the provided `key_hash` is indeed a hash of `verification_key`, allowing
-the user to use the verification key as private inputs and only have the
-`key_hash` as public input, which is more performant.
+Computes a recursive aggregation object internally when verifying a proof inside
+another circuit.
+The outputted aggregation object will then be either checked in a
+top-level verifier or aggregated upon again.
+The aggregation object should be maintained by the backend implementer.
 
-Another thing that it does is preparing the verification of the proof. In order
-to fully verify a proof, some operations may still be required to be done by the
-final verifier. This is why this black box function does not say if verification
-is passing or not.
+This opcode prepares the verification of the final proof.
+In order to fully verify a recursive proof, some operations may still be required
+to be done by the final verifier (e.g. a pairing check).
+This is why this black box function does not say if verification is passing or not.
+It delays the expensive part of verification out of the SNARK
+and leaves it to the final verifier outside of the SNARK circuit.
 
-If you have several proofs to verify in one ACIR program, you would call
-`RecursiveAggregation()` multiple times while passing the
-`output_aggregation_object` as `input_aggregation_object` to the next
-`RecursiveAggregation()` call, except for the first call where you do not have
-any `input_aggregation_object`.
+This opcode also verifies that the key_hash is indeed a hash of verification_key,
+allowing the user to use the verification key as private inputs and only
+have the key_hash as public input, which is more performant.
 
-If one of the proof you verify with the black box function does not verify, then
-the verification of the proof of the main ACIR program will ultimately fail.
+**Warning: the key hash logic does not need to be part of the black box and subject to be removed.**
 
+If one of the recursive proofs you verify with the black box function fails to
+verify, then the verification of the final proof of the main ACIR program will
+ultimately fail.
 
 ### Brillig
 

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

@@ -6,155 +6,51 @@
 use serde::{Deserialize, Serialize};
 use strum_macros::EnumIter;
 
+/// Representation of available black box function names.
+/// This enum should be used to represent a black box before we have set up the
+/// appropriate inputs and outputs. At which point it should be converted to a [crate::circuit::opcodes::BlackBoxFuncCall]
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Clone, Debug, Hash, Copy, PartialEq, Eq, Serialize, Deserialize, EnumIter)]
 pub enum BlackBoxFunc {
-    /// Ciphers (encrypts) the provided plaintext using AES128 in CBC mode,
-    /// padding the input using PKCS#7.
-    /// - inputs: byte array `[u8; N]`
-    /// - iv: initialization vector `[u8; 16]`
-    /// - key: user key `[u8; 16]`
-    /// - outputs: byte vector `[u8]` of length `input.len() + (16 - input.len() % 16)`
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::AES128Encrypt]
     AES128Encrypt,
-
-    /// Performs the bitwise AND of `lhs` and `rhs`. `bit_size` must be the same for
-    /// both inputs.
-    /// - lhs: (witness, bit_size)
-    /// - rhs: (witness, bit_size)
-    /// - output: a witness whose value is constrained to be lhs AND rhs, as
-    ///   bit_size bit integers
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::AND]
     AND,
-
-    /// Performs the bitwise XOR of `lhs` and `rhs`. `bit_size` must be the same for
-    /// both inputs.
-    /// - lhs: (witness, bit_size)
-    /// - rhs: (witness, bit_size)
-    /// - output: a witness whose value is constrained to be lhs XOR rhs, as
-    ///   bit_size bit integers
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::XOR]
     XOR,
-
-    /// Range constraint to ensure that a witness
-    /// can be represented in the specified number of bits.
-    /// - input: (witness, bit_size)
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::RANGE]
     RANGE,
-
-    /// Computes the Blake2s hash of the inputs, as specified in
-    /// https://tools.ietf.org/html/rfc7693
-    /// - inputs are a byte array, i.e a vector of (witness, 8)
-    /// - output is a byte array of length 32, i.e. an array of 32
-    ///   (witness, 8), constrained to be the blake2s of the inputs.
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::Blake2s]
     Blake2s,
-
-    /// Computes the Blake3 hash of the inputs
-    /// - inputs are a byte array, i.e a vector of (witness, 8)
-    /// - output is a byte array of length 32, i.e an array of 32
-    ///   (witness, 8), constrained to be the blake3 of the inputs.
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::Blake3]
     Blake3,
-
-    /// Verifies a ECDSA signature over the secp256k1 curve.
-    /// - inputs:
-    ///     - x coordinate of public key as 32 bytes
-    ///     - y coordinate of public key as 32 bytes
-    ///     - the signature, as a 64 bytes array
-    ///     - the hash of the message, as a vector of bytes
-    /// - output: 0 for failure and 1 for success
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::EcdsaSecp256k1]
     EcdsaSecp256k1,
-
-    /// Verifies a ECDSA signature over the secp256r1 curve.
-    ///
-    /// Same as EcdsaSecp256k1, but done over another curve.
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::EcdsaSecp256r1]
     EcdsaSecp256r1,
-
-    /// Multiple scalar multiplication (MSM) with a variable base/input point
-    /// (P) of the embedded curve. An MSM multiplies the points and scalars and
-    /// sums the results.
-    /// - input:
-    ///     points (witness, N) a vector of x and y coordinates of input
-    ///     points `[x1, y1, x2, y2,...]`.
-    ///     scalars (witness, N) a vector of low and high limbs of input
-    ///     scalars `[s1_low, s1_high, s2_low, s2_high, ...]`. (witness, N)
-    ///     For Barretenberg, they must both be less than 128 bits.
-    /// - output:
-    ///     a tuple of `x` and `y` coordinates of output.
-    ///     Points computed as `s_low*P+s_high*2^{128}*P`
-    ///
-    /// Because the Grumpkin scalar field is bigger than the ACIR field, we
-    /// provide 2 ACIR fields representing the low and high parts of the Grumpkin
-    /// scalar $a$: `a=low+high*2^{128}`, with `low, high < 2^{128}`
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::MultiScalarMul]
     MultiScalarMul,
-
-    /// Keccak Permutation function of width 1600
-    /// - inputs: An array of 25 64-bit Keccak lanes that represent a keccak sponge of 1600 bits
-    /// - outputs: The result of a keccak f1600 permutation on the input state. Also an array of 25 Keccak lanes.
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::Keccakf1600]
     Keccakf1600,
-
-    /// Compute a recursive aggregation object when verifying a proof inside
-    /// another circuit.
-    /// This outputted aggregation object will then be either checked in a
-    /// top-level verifier or aggregated upon again.
-    ///
-    /// **Warning: this opcode is subject to change.**
-    /// Note that the `254` in `(witness, 254)` refers to the upper bound of
-    /// the `witness`.
-    /// - verification_key: Vector of (witness, 254) representing the
-    ///   verification key of the circuit being verified
-    /// - public_inputs: Vector of (witness, 254)  representing the public
-    ///   inputs corresponding to the proof being verified
-    /// - key_hash: one (witness, 254). It should be the hash of the
-    ///   verification key. Barretenberg expects the Pedersen hash of the
-    ///   verification key
-    ///
-    /// Another thing that it does is preparing the verification of the proof.
-    /// In order to fully verify a proof, some operations may still be required
-    /// to be done by the final verifier. This is why this black box function
-    /// does not say if verification is passing or not.
-    ///
-    /// This black box function does not fully verify a proof, what it does is
-    /// verifying that the key_hash is indeed a hash of verification_key,
-    /// allowing the user to use the verification key as private inputs and only
-    /// have the key_hash as public input, which is more performant.
-    ///
-    /// If one of the recursive proofs you verify with the black box function does not
-    /// verify, then the verification of the proof of the main ACIR program will
-    /// ultimately fail.
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::RecursiveAggregation]
     RecursiveAggregation,
-
-    /// Addition over the embedded curve on which the witness is defined
-    /// The opcode makes the following assumptions but does not enforce them because
-    /// it is more efficient to do it only when required. For instance, adding two
-    /// points that are on the curve it guarantee to give a point on the curve.
-    ///
-    /// It assumes that the points are on the curve.
-    /// If the inputs are the same witnesses index, it will perform a doubling,
-    /// If not, it assumes that the points' x-coordinates are not equal.
-    /// It also assumes neither point is the infinity point.
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::EmbeddedCurveAdd]
     EmbeddedCurveAdd,
-
-    /// BigInt addition
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::BigIntAdd]
     BigIntAdd,
-
-    /// BigInt subtraction
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::BigIntSub]
     BigIntSub,
-
-    /// BigInt multiplication
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::BigIntMul]
     BigIntMul,
-
-    /// BigInt division
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::BigIntDiv]
     BigIntDiv,
-
-    /// BigInt from le bytes
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::BigIntFromLeBytes]
     BigIntFromLeBytes,
-
-    /// BigInt to le bytes
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::BigIntToLeBytes]
     BigIntToLeBytes,
-
-    /// Permutation function of Poseidon2
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::Poseidon2Permutation]
     Poseidon2Permutation,
-
-    /// SHA256 compression function
-    /// - input: [(witness, 32); 16]
-    /// - state: [(witness, 32); 8]
-    /// - output: [(witness, 32); 8]
+    /// More details can be found at [crate::circuit::opcodes::BlackBoxFuncCall::Sha256Compression]
     Sha256Compression,
 }
 

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

@@ -24,7 +24,7 @@ pub enum BrilligOutputs {
 
 /// This is purely a wrapper struct around a list of Brillig opcode's which represents
 /// a full Brillig function to be executed by the Brillig VM.
-/// This is stored separately on a program and accessed through a [BrilligPointer].
+/// This is stored separately on a program and accessed through a [BrilligFunctionId].
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Default, Debug, Hash)]
 #[cfg_attr(feature = "arb", derive(proptest_derive::Arbitrary))]
 pub struct BrilligBytecode<F> {