feat: Proving the rollup circuits

cspell.json

@@ -18,6 +18,7 @@
     "bbfree",
     "bbmalloc",
     "benesjan",
+    "Bincode",
     "bleurgh",
     "bodyparser",
     "bootnode",

noir/noir-repo/tooling/acvm_cli/src/cli/execute_cmd.rs

@@ -6,11 +6,10 @@ use bn254_blackbox_solver::Bn254BlackBoxSolver;
 use clap::Args;
 
 use crate::cli::fs::inputs::{read_bytecode_from_file, read_inputs_from_file};
-use crate::cli::fs::witness::save_witness_to_dir;
 use crate::errors::CliError;
 use nargo::ops::{execute_program, DefaultForeignCallExecutor};
 
-use super::fs::witness::create_output_witness_string;
+use super::fs::witness::{create_output_witness_string, save_witness_to_dir};
 
 /// Executes a circuit to calculate its return value
 #[derive(Debug, Clone, Args)]
@@ -46,9 +45,9 @@ fn run_command(args: ExecuteCommand) -> Result<String, CliError> {
     )?;
     if args.output_witness.is_some() {
         save_witness_to_dir(
-            &output_witness_string,
-            &args.working_directory,
+            output_witness,
             &args.output_witness.unwrap(),
+            &args.working_directory,
         )?;
     }
     Ok(output_witness_string)

noir/noir-repo/tooling/acvm_cli/src/cli/fs/witness.rs

@@ -5,24 +5,29 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use acvm::acir::native_types::WitnessMap;
+use acvm::acir::native_types::{WitnessMap, WitnessStack};
 
 use crate::errors::{CliError, FilesystemError};
 
-/// Saves the provided output witnesses to a toml file created at the given location
-pub(crate) fn save_witness_to_dir<P: AsRef<Path>>(
-    output_witness: &String,
-    witness_dir: P,
-    file_name: &String,
-) -> Result<PathBuf, FilesystemError> {
-    let witness_path = witness_dir.as_ref().join(file_name);
+fn create_named_dir(named_dir: &Path, name: &str) -> PathBuf {
+    std::fs::create_dir_all(named_dir)
+        .unwrap_or_else(|_| panic!("could not create the `{name}` directory"));
+
+    PathBuf::from(named_dir)
+}
 
-    let mut file = File::create(&witness_path)
-        .map_err(|_| FilesystemError::OutputWitnessCreationFailed(file_name.clone()))?;
-    write!(file, "{}", output_witness)
-        .map_err(|_| FilesystemError::OutputWitnessWriteFailed(file_name.clone()))?;
+fn write_to_file(bytes: &[u8], path: &Path) -> String {
+    let display = path.display();
 
-    Ok(witness_path)
+    let mut file = match File::create(path) {
+        Err(why) => panic!("couldn't create {display}: {why}"),
+        Ok(file) => file,
+    };
+
+    match file.write_all(bytes) {
+        Err(why) => panic!("couldn't write to {display}: {why}"),
+        Ok(_) => display.to_string(),
+    }
 }
 
 /// Creates a toml representation of the provided witness map
@@ -34,3 +39,19 @@ pub(crate) fn create_output_witness_string(witnesses: &WitnessMap) -> Result<Str
 
     toml::to_string(&witness_map).map_err(|_| CliError::OutputWitnessSerializationFailed())
 }
+
+pub(crate) fn save_witness_to_dir<P: AsRef<Path>>(
+    witnesses: WitnessStack,
+    witness_name: &str,
+    witness_dir: P,
+) -> Result<PathBuf, FilesystemError> {
+    create_named_dir(witness_dir.as_ref(), "witness");
+    let witness_path = witness_dir.as_ref().join(witness_name).with_extension("gz");
+
+    let buf: Vec<u8> = witnesses
+        .try_into()
+        .map_err(|_op| FilesystemError::OutputWitnessCreationFailed(witness_name.to_string()))?;
+    write_to_file(buf.as_slice(), &witness_path);
+
+    Ok(witness_path)
+}

noir/noir-repo/tooling/acvm_cli/src/errors.rs

@@ -20,9 +20,6 @@ pub(crate) enum FilesystemError {
 
     #[error(" Error: failed to create output witness file {0}.")]
     OutputWitnessCreationFailed(String),
-
-    #[error(" Error: failed to write output witness file {0}.")]
-    OutputWitnessWriteFailed(String),
 }
 
 #[derive(Debug, Error)]

noir/noir-repo/tooling/noirc_abi_wasm/src/lib.rs

@@ -5,7 +5,7 @@
 // See Cargo.toml for explanation.
 use getrandom as _;
 
-use acvm::acir::native_types::WitnessMap;
+use acvm::acir::native_types::{WitnessMap, WitnessStack};
 use iter_extended::try_btree_map;
 use noirc_abi::{
     errors::InputParserError,
@@ -113,3 +113,12 @@ pub fn abi_decode(abi: JsAbi, witness_map: JsWitnessMap) -> Result<JsValue, JsAb
     <wasm_bindgen::JsValue as JsValueSerdeExt>::from_serde(&return_struct)
         .map_err(|err| err.to_string().into())
 }
+
+#[wasm_bindgen(js_name = serializeWitness)]
+pub fn serialise_witness(witness_map: JsWitnessMap) -> Result<Vec<u8>, JsAbiError> {
+    console_error_panic_hook::set_once();
+    let converted_witness: WitnessMap = witness_map.into();
+    let witness_stack: WitnessStack = converted_witness.into();
+    let output = witness_stack.try_into();
+    output.map_err(|_| JsAbiError::new("Failed to convert to Vec<u8>".to_string()))
+}

yarn-project/circuit-types/src/tx/processed_tx.ts

@@ -12,10 +12,34 @@ import {
   type Header,
   KernelCircuitPublicInputs,
   type Proof,
+  type PublicKernelCircuitPrivateInputs,
   type PublicKernelCircuitPublicInputs,
+  type PublicKernelTailCircuitPrivateInputs,
   makeEmptyProof,
 } from '@aztec/circuits.js';
 
+/**
+ * Used to communicate to the prover which type of circuit to prove
+ */
+export enum PublicKernelType {
+  SETUP,
+  APP_LOGIC,
+  TEARDOWN,
+  TAIL,
+}
+
+export type PublicKernelTailRequest = {
+  type: PublicKernelType.TAIL;
+  inputs: PublicKernelTailCircuitPrivateInputs;
+};
+
+export type PublicKernelNonTailRequest = {
+  type: PublicKernelType.SETUP | PublicKernelType.APP_LOGIC | PublicKernelType.TEARDOWN;
+  inputs: PublicKernelCircuitPrivateInputs;
+};
+
+export type PublicKernelRequest = PublicKernelTailRequest | PublicKernelNonTailRequest;
+
 /**
  * Represents a tx that has been processed by the sequencer public processor,
  * so its kernel circuit public inputs are filled in.
@@ -38,6 +62,11 @@ export type ProcessedTx = Pick<Tx, 'proof' | 'encryptedLogs' | 'unencryptedLogs'
    * Reason the tx was reverted.
    */
   revertReason: SimulationError | undefined;
+
+  /**
+   * The collection of public kernel circuit inputs for simulation/proving
+   */
+  publicKernelRequests: PublicKernelRequest[];
 };
 
 export type RevertedTx = ProcessedTx & {
@@ -90,6 +119,7 @@ export function makeProcessedTx(
   tx: Tx,
   kernelOutput: KernelCircuitPublicInputs,
   proof: Proof,
+  publicKernelRequests: PublicKernelRequest[],
   revertReason?: SimulationError,
 ): ProcessedTx {
   return {
@@ -100,6 +130,7 @@ export function makeProcessedTx(
     unencryptedLogs: revertReason ? UnencryptedTxL2Logs.empty() : tx.unencryptedLogs,
     isEmpty: false,
     revertReason,
+    publicKernelRequests,
   };
 }
 
@@ -123,6 +154,7 @@ export function makeEmptyProcessedTx(header: Header, chainId: Fr, version: Fr):
     proof: emptyProof,
     isEmpty: true,
     revertReason: undefined,
+    publicKernelRequests: [],
   };
 }
 

yarn-project/end-to-end/src/integration_l1_publisher.test.ts

@@ -177,7 +177,7 @@ describe('L1Publisher integration', () => {
       seed + 0x500,
     );
 
-    const processedTx = makeProcessedTx(tx, kernelOutput, makeProof());
+    const processedTx = makeProcessedTx(tx, kernelOutput, makeProof(), []);
 
     processedTx.data.end.newNoteHashes = makeTuple(MAX_NEW_NOTE_HASHES_PER_TX, fr, seed + 0x100);
     processedTx.data.end.newNullifiers = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, fr, seed + 0x200);

yarn-project/noir-protocol-circuits-types/src/index.ts

@@ -29,7 +29,7 @@ import {
   createBlackBoxSolver,
   executeCircuitWithBlackBoxSolver,
 } from '@noir-lang/acvm_js';
-import { type Abi, abiDecode, abiEncode } from '@noir-lang/noirc_abi';
+import { type Abi, abiDecode, abiEncode, serializeWitness } from '@noir-lang/noirc_abi';
 import { type WitnessMap } from '@noir-lang/types';
 
 import BaseParityJson from './target/parity_base.json' assert { type: 'json' };
@@ -46,6 +46,7 @@ import PublicKernelAppLogicSimulatedJson from './target/public_kernel_app_logic_
 import PublicKernelSetupSimulatedJson from './target/public_kernel_setup_simulated.json' assert { type: 'json' };
 import PublicKernelTailSimulatedJson from './target/public_kernel_tail_simulated.json' assert { type: 'json' };
 import PublicKernelTeardownSimulatedJson from './target/public_kernel_teardown_simulated.json' assert { type: 'json' };
+import BaseRollupJson from './target/rollup_base.json' assert { type: 'json' };
 import BaseRollupSimulatedJson from './target/rollup_base_simulated.json' assert { type: 'json' };
 import MergeRollupJson from './target/rollup_merge.json' assert { type: 'json' };
 import RootRollupJson from './target/rollup_root.json' assert { type: 'json' };
@@ -126,12 +127,65 @@ export const BaseParityArtifact = BaseParityJson as NoirCompiledCircuit;
 
 export const RootParityArtifact = RootParityJson as NoirCompiledCircuit;
 
-export const BaseRollupArtifact = BaseRollupSimulatedJson as NoirCompiledCircuit;
+export const SimulatedBaseRollupArtifact = BaseRollupSimulatedJson as NoirCompiledCircuit;
+
+export const BaseRollupArtifact = BaseRollupJson as NoirCompiledCircuit;
 
 export const MergeRollupArtifact = MergeRollupJson as NoirCompiledCircuit;
 
 export const RootRollupArtifact = RootRollupJson as NoirCompiledCircuit;
 
+export type ServerProtocolArtifact =
+  | 'PublicKernelSetupArtifact'
+  | 'PublicKernelAppLogicArtifact'
+  | 'PublicKernelTeardownArtifact'
+  | 'PublicKernelTailArtifact'
+  | 'BaseParityArtifact'
+  | 'RootParityArtifact'
+  | 'BaseRollupArtifact'
+  | 'MergeRollupArtifact'
+  | 'RootRollupArtifact';
+
+export type ClientProtocolArtifact =
+  | 'PrivateKernelInitArtifact'
+  | 'PrivateKernelInnerArtifact'
+  | 'PrivateKernelTailArtifact';
+
+export type ProtocolArtifact = ServerProtocolArtifact | ClientProtocolArtifact;
+
+export const ServerCircuitArtifacts: Record<ServerProtocolArtifact, NoirCompiledCircuit> = {
+  PublicKernelSetupArtifact: PublicKernelSetupArtifact,
+  PublicKernelAppLogicArtifact: PublicKernelAppLogicArtifact,
+  PublicKernelTeardownArtifact: PublicKernelTeardownArtifact,
+  PublicKernelTailArtifact: PublicKernelTailArtifact,
+  BaseParityArtifact: BaseParityArtifact,
+  RootParityArtifact: RootParityArtifact,
+  BaseRollupArtifact: BaseRollupArtifact,
+  MergeRollupArtifact: MergeRollupArtifact,
+  RootRollupArtifact: RootRollupArtifact,
+};
+
+export const ClientCircuitArtifacts: Record<ClientProtocolArtifact, NoirCompiledCircuit> = {
+  PrivateKernelInitArtifact: PrivateKernelInitArtifact,
+  PrivateKernelInnerArtifact: PrivateKernelInnerArtifact,
+  PrivateKernelTailArtifact: PrivateKernelTailArtifact,
+};
+
+export const ProtocolCircuitArtifacts: Record<ProtocolArtifact, NoirCompiledCircuit> = {
+  PrivateKernelInitArtifact: PrivateKernelInitArtifact,
+  PrivateKernelInnerArtifact: PrivateKernelInnerArtifact,
+  PrivateKernelTailArtifact: PrivateKernelTailArtifact,
+  PublicKernelSetupArtifact: PublicKernelSetupArtifact,
+  PublicKernelAppLogicArtifact: PublicKernelAppLogicArtifact,
+  PublicKernelTeardownArtifact: PublicKernelTeardownArtifact,
+  PublicKernelTailArtifact: PublicKernelTailArtifact,
+  BaseParityArtifact: BaseParityArtifact,
+  RootParityArtifact: RootParityArtifact,
+  BaseRollupArtifact: BaseRollupArtifact,
+  MergeRollupArtifact: MergeRollupArtifact,
+  RootRollupArtifact: RootRollupArtifact,
+};
+
 let solver: Promise<WasmBlackBoxFunctionSolver>;
 
 const getSolver = (): Promise<WasmBlackBoxFunctionSolver> => {
@@ -141,6 +195,10 @@ const getSolver = (): Promise<WasmBlackBoxFunctionSolver> => {
   return solver;
 };
 
+export function serializeInputWitness(witness: WitnessMap) {
+  return serializeWitness(witness);
+}
+
 /**
  * Executes the init private kernel.
  * @param privateKernelInitCircuitPrivateInputs - The private inputs to the initial private kernel.
@@ -236,6 +294,17 @@ export function convertRootParityInputsToWitnessMap(inputs: RootParityInputs): W
  * @returns The witness map
  */
 export function convertBaseRollupInputsToWitnessMap(inputs: BaseRollupInputs): WitnessMap {
+  const mapped = mapBaseRollupInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(BaseRollupJson.abi as Abi, { inputs: mapped as any });
+  return initialWitnessMap;
+}
+
+/**
+ * Converts the inputs of the simulated base rollup circuit into a witness map.
+ * @param inputs - The base rollup inputs.
+ * @returns The witness map
+ */
+export function convertSimulatedBaseRollupInputsToWitnessMap(inputs: BaseRollupInputs): WitnessMap {
   const mapped = mapBaseRollupInputsToNoir(inputs);
   const initialWitnessMap = abiEncode(BaseRollupSimulatedJson.abi as Abi, { inputs: mapped as any });
   return initialWitnessMap;
@@ -306,14 +375,29 @@ export function convertPublicTailInputsToWitnessMap(inputs: PublicKernelTailCirc
   return initialWitnessMap;
 }
 
+/**
+ * Converts the outputs of the simulated base rollup circuit from a witness map.
+ * @param outputs - The base rollup outputs as a witness map.
+ * @returns The public inputs.
+ */
+export function convertSimulatedBaseRollupOutputsFromWitnessMap(outputs: WitnessMap): BaseOrMergeRollupPublicInputs {
+  // Decode the witness map into two fields, the return values and the inputs
+  const decodedInputs: DecodedInputs = abiDecode(BaseRollupSimulatedJson.abi as Abi, outputs);
+
+  // Cast the inputs as the return type
+  const returnType = decodedInputs.return_value as BaseRollupReturnType;
+
+  return mapBaseOrMergeRollupPublicInputsFromNoir(returnType);
+}
+
 /**
  * Converts the outputs of the base rollup circuit from a witness map.
  * @param outputs - The base rollup outputs as a witness map.
  * @returns The public inputs.
  */
 export function convertBaseRollupOutputsFromWitnessMap(outputs: WitnessMap): BaseOrMergeRollupPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(BaseRollupSimulatedJson.abi as Abi, outputs);
+  const decodedInputs: DecodedInputs = abiDecode(BaseRollupJson.abi as Abi, outputs);
 
   // Cast the inputs as the return type
   const returnType = decodedInputs.return_value as BaseRollupReturnType;

yarn-project/prover-client/package.json

@@ -3,6 +3,9 @@
   "version": "0.1.0",
   "type": "module",
   "exports": "./dest/index.js",
+  "bin": {
+    "bb-cli": "./dest/bb/index.js"
+  },
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts"
@@ -16,6 +19,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
+    "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
   },
   "inherits": [
@@ -44,14 +48,17 @@
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/simulator": "workspace:^",
     "@aztec/world-state": "workspace:^",
+    "commander": "^9.0.0",
     "lodash.chunk": "^4.2.0",
+    "source-map-support": "^0.5.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/memdown": "^3.0.0",
     "@types/node": "^18.7.23",
+    "@types/source-map-support": "^0.5.10",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
     "ts-node": "^10.9.1",