Merge branch 'master' into sync-noir

noir-projects/Earthfile

@@ -10,6 +10,12 @@ test-protocol-circuits:
   # TODO(#10754): Remove --skip-brillig-constraints-check
   RUN cd /usr/src/noir-projects/noir-protocol-circuits && nargo test --silence-warnings --skip-brillig-constraints-check
 
+  # Also execute circuits to ensure that `Prover.toml` files are in sync.
+  LET circuits = "private-kernel-init private-kernel-inner private-kernel-reset private-kernel-tail-to-public private-kernel-tail  rollup-base-private rollup-base-public rollup-block-root rollup-block-merge rollup-merge rollup-root"
+  FOR circuit IN $circuits
+      RUN cd /usr/src/noir-projects/noir-protocol-circuits/crates/$circuit && nargo execute --silence-warnings --skip-brillig-constraints-check
+  END
+
 test-aztec-nr:
   FROM ../+bootstrap
   ENV PATH="/usr/src/noir/noir-repo/target/release:${PATH}"
@@ -69,4 +75,4 @@ public-functions-report:
 
   RUN cd noir-contracts && node ./scripts/publicFunctionsSizeReport.js ./target/
 
-  SAVE ARTIFACT ./noir-contracts/public_functions_report.json public_functions_report.json
+  SAVE ARTIFACT ./noir-contracts/public_functions_report.json public_functions_report.json

noir-projects/noir-protocol-circuits/.gitignore

@@ -3,4 +3,4 @@ target
 crates/autogenerated
 /Nargo.toml
 /private_kernel_reset_dimensions.json
-install-state.gz
+install-state.gz

yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts

@@ -23,6 +23,7 @@ import {
   convertPrivateKernelTailOutputsFromWitnessMapWithAbi,
   convertPrivateKernelTailToPublicInputsToWitnessMapWithAbi,
   getPrivateKernelResetArtifactName,
+  updateResetCircuitSampleInputs,
 } from '@aztec/noir-protocol-circuits-types/client';
 import { type ArtifactProvider, type ClientProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types';
 import { ClientCircuitVks } from '@aztec/noir-protocol-circuits-types/vks';
@@ -98,6 +99,7 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
   public async simulateReset(
     inputs: PrivateKernelResetCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    updateResetCircuitSampleInputs(inputs);
     const variantInputs = inputs.trimToSizes();
     const artifactName = getPrivateKernelResetArtifactName(inputs.dimensions);
     return await this.simulateCircuitOutput(

yarn-project/noir-protocol-circuits-types/src/entrypoint/client/common.ts

@@ -11,7 +11,7 @@ export {
   convertPrivateKernelTailToPublicInputsToWitnessMapWithAbi,
 } from '../../execution/client.js';
 
-export { getPrivateKernelResetArtifactName } from '../../utils/private_kernel_reset.js';
+export { getPrivateKernelResetArtifactName, updateResetCircuitSampleInputs } from '../../utils/private_kernel_reset.js';
 export {
   maxPrivateKernelResetDimensions,
   privateKernelResetDimensionsConfig,

yarn-project/noir-protocol-circuits-types/src/execution/client.ts

@@ -113,7 +113,6 @@ export function convertPrivateKernelResetInputsToWitnessMapWithAbi<
     ),
     hints: mapPrivateKernelResetHintsToNoir(privateKernelResetCircuitPrivateInputs.hints),
   };
-  pushTestData('private-kernel-reset', mapped);
   const initialWitnessMap = abiEncode(resetAbi, mapped);
   return initialWitnessMap;
 }

yarn-project/noir-protocol-circuits-types/src/utils/private_kernel_reset.ts

@@ -1,5 +1,15 @@
-import { type PrivateKernelResetDimensions, privateKernelResetDimensionNames } from '@aztec/circuits.js';
+import {
+  type PrivateKernelResetCircuitPrivateInputs,
+  type PrivateKernelResetDimensions,
+  privateKernelResetDimensionNames,
+} from '@aztec/circuits.js';
+import { pushTestData } from '@aztec/foundation/testing';
 
+import {
+  mapPrivateKernelCircuitPublicInputsToNoir,
+  mapPrivateKernelDataToNoir,
+  mapPrivateKernelResetHintsToNoir,
+} from '../conversion/client.js';
 import { PrivateKernelResetArtifactFileNames, type PrivateResetArtifact } from '../private_kernel_reset_types.js';
 
 export function createPrivateKernelResetTag(dimensions: PrivateKernelResetDimensions) {
@@ -14,3 +24,22 @@ export function getPrivateKernelResetArtifactName(dimensions: PrivateKernelReset
   }
   return name;
 }
+
+/**
+ * TODO: This is a hack so we can write full reset inputs to a Prover.toml.
+ * Ideally we remove it in favour of adding a test that runs a full reset.
+ */
+export function updateResetCircuitSampleInputs(
+  privateKernelResetCircuitPrivateInputs: PrivateKernelResetCircuitPrivateInputs,
+) {
+  /* eslint-disable camelcase */
+  const inputs = {
+    previous_kernel: mapPrivateKernelDataToNoir(privateKernelResetCircuitPrivateInputs.previousKernel),
+    previous_kernel_public_inputs: mapPrivateKernelCircuitPublicInputsToNoir(
+      privateKernelResetCircuitPrivateInputs.previousKernel.publicInputs,
+    ),
+    hints: mapPrivateKernelResetHintsToNoir(privateKernelResetCircuitPrivateInputs.hints),
+  };
+
+  pushTestData('private-kernel-reset', inputs);
+}