@aztec/bb-prover 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/src/prover/client/bb_private_kernel_prover.ts

@@ -9,22 +9,31 @@ import {
   convertPrivateKernelInit2OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInit3InputsToWitnessMapWithAbi,
   convertPrivateKernelInit3OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInit4InputsToWitnessMapWithAbi,
+  convertPrivateKernelInit4OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInit5InputsToWitnessMapWithAbi,
+  convertPrivateKernelInit5OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInitInputsToWitnessMapWithAbi,
   convertPrivateKernelInitOutputsFromWitnessMapWithAbi,
   convertPrivateKernelInner2InputsToWitnessMapWithAbi,
   convertPrivateKernelInner2OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInner3InputsToWitnessMapWithAbi,
   convertPrivateKernelInner3OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInner4InputsToWitnessMapWithAbi,
+  convertPrivateKernelInner4OutputsFromWitnessMapWithAbi,
+  convertPrivateKernelInner5InputsToWitnessMapWithAbi,
+  convertPrivateKernelInner5OutputsFromWitnessMapWithAbi,
   convertPrivateKernelInnerInputsToWitnessMapWithAbi,
   convertPrivateKernelInnerOutputsFromWitnessMapWithAbi,
   convertPrivateKernelResetInputsToWitnessMapWithAbi,
   convertPrivateKernelResetOutputsFromWitnessMapWithAbi,
+  convertPrivateKernelResetTailInputsToWitnessMapWithAbi,
+  convertPrivateKernelResetTailToPublicInputsToWitnessMapWithAbi,
   convertPrivateKernelTailForPublicOutputsFromWitnessMapWithAbi,
-  convertPrivateKernelTailInputsToWitnessMapWithAbi,
   convertPrivateKernelTailOutputsFromWitnessMapWithAbi,
-  convertPrivateKernelTailToPublicInputsToWitnessMapWithAbi,
   foreignCallHandler,
   getPrivateKernelResetArtifactName,
+  getPrivateKernelResetTailArtifactName,
   updateResetCircuitSampleInputs,
 } from '@aztec/noir-protocol-circuits-types/client';
 import {
@@ -42,13 +51,17 @@ import type {
   PrivateKernelCircuitPublicInputs,
   PrivateKernelInit2CircuitPrivateInputs,
   PrivateKernelInit3CircuitPrivateInputs,
+  PrivateKernelInit4CircuitPrivateInputs,
+  PrivateKernelInit5CircuitPrivateInputs,
   PrivateKernelInitCircuitPrivateInputs,
   PrivateKernelInner2CircuitPrivateInputs,
   PrivateKernelInner3CircuitPrivateInputs,
+  PrivateKernelInner4CircuitPrivateInputs,
+  PrivateKernelInner5CircuitPrivateInputs,
   PrivateKernelInnerCircuitPrivateInputs,
   PrivateKernelResetCircuitPrivateInputs,
+  PrivateKernelResetTailCircuitPrivateInputs,
   PrivateKernelSimulateOutput,
-  PrivateKernelTailCircuitPrivateInputs,
   PrivateKernelTailCircuitPublicInputs,
 } from '@aztec/stdlib/kernel';
 import type { NoirCompiledCircuitWithName } from '@aztec/stdlib/noir';
@@ -135,6 +148,50 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     );
   }
 
+  public async generateInit4Output(
+    inputs: PrivateKernelInit4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInit4Artifact',
+      convertPrivateKernelInit4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInit4(
+    inputs: PrivateKernelInit4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInit4Artifact',
+      convertPrivateKernelInit4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async generateInit5Output(
+    inputs: PrivateKernelInit5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInit5Artifact',
+      convertPrivateKernelInit5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInit5(
+    inputs: PrivateKernelInit5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInit5Artifact',
+      convertPrivateKernelInit5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInit5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
   public async generateInnerOutput(
     inputs: PrivateKernelInnerCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
@@ -201,6 +258,50 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     );
   }
 
+  public async generateInner4Output(
+    inputs: PrivateKernelInner4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInner4Artifact',
+      convertPrivateKernelInner4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInner4(
+    inputs: PrivateKernelInner4CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInner4Artifact',
+      convertPrivateKernelInner4InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner4OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async generateInner5Output(
+    inputs: PrivateKernelInner5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.generateCircuitOutput(
+      inputs,
+      'PrivateKernelInner5Artifact',
+      convertPrivateKernelInner5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
+  public async simulateInner5(
+    inputs: PrivateKernelInner5CircuitPrivateInputs,
+  ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
+    return await this.simulateCircuitOutput(
+      inputs,
+      'PrivateKernelInner5Artifact',
+      convertPrivateKernelInner5InputsToWitnessMapWithAbi,
+      convertPrivateKernelInner5OutputsFromWitnessMapWithAbi,
+    );
+  }
+
   public async generateResetOutput(
     inputs: PrivateKernelResetCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>> {
@@ -228,40 +329,42 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     );
   }
 
-  public async generateTailOutput(
-    inputs: PrivateKernelTailCircuitPrivateInputs,
+  public async generateResetTailOutput(
+    inputs: PrivateKernelResetTailCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>> {
+    const artifactName = getPrivateKernelResetTailArtifactName(inputs.dimensions, inputs.isForPublic());
     if (!inputs.isForPublic()) {
       return await this.generateCircuitOutput(
         inputs,
-        'PrivateKernelTailArtifact',
-        convertPrivateKernelTailInputsToWitnessMapWithAbi,
+        artifactName,
+        convertPrivateKernelResetTailInputsToWitnessMapWithAbi,
         convertPrivateKernelTailOutputsFromWitnessMapWithAbi,
       );
     }
     return await this.generateCircuitOutput(
       inputs,
-      'PrivateKernelTailToPublicArtifact',
-      convertPrivateKernelTailToPublicInputsToWitnessMapWithAbi,
+      artifactName,
+      convertPrivateKernelResetTailToPublicInputsToWitnessMapWithAbi,
       convertPrivateKernelTailForPublicOutputsFromWitnessMapWithAbi,
     );
   }
 
-  public async simulateTail(
-    inputs: PrivateKernelTailCircuitPrivateInputs,
+  public async simulateResetTail(
+    inputs: PrivateKernelResetTailCircuitPrivateInputs,
   ): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>> {
+    const artifactName = getPrivateKernelResetTailArtifactName(inputs.dimensions, inputs.isForPublic());
     if (!inputs.isForPublic()) {
       return await this.simulateCircuitOutput(
         inputs,
-        'PrivateKernelTailArtifact',
-        convertPrivateKernelTailInputsToWitnessMapWithAbi,
+        artifactName,
+        convertPrivateKernelResetTailInputsToWitnessMapWithAbi,
         convertPrivateKernelTailOutputsFromWitnessMapWithAbi,
       );
     }
     return await this.simulateCircuitOutput(
       inputs,
-      'PrivateKernelTailToPublicArtifact',
-      convertPrivateKernelTailToPublicInputsToWitnessMapWithAbi,
+      artifactName,
+      convertPrivateKernelResetTailToPublicInputsToWitnessMapWithAbi,
       convertPrivateKernelTailForPublicOutputsFromWitnessMapWithAbi,
     );
   }
@@ -384,6 +487,7 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
       executionSteps.map(step => ungzip(step.bytecode)),
       barretenberg,
       executionSteps.map(step => step.functionName),
+      executionSteps.map(step => step.kind),
     );
 
     // Use compressed prove path to get both proof fields and compressed proof bytes
@@ -410,13 +514,17 @@ export abstract class BBPrivateKernelProver implements PrivateKernelProver {
     return proofWithPubInputs;
   }
 
-  public async computeGateCountForCircuit(_bytecode: Buffer, _circuitName: string): Promise<number> {
+  public async computeGateCountForCircuit(
+    _bytecode: Buffer,
+    _circuitName: string,
+    _circuitKind: PrivateExecutionStep['kind'],
+  ): Promise<number> {
     // Note we do not pass the vk to the backend. This is unneeded for gate counts.
     const barretenberg = await Barretenberg.initSingleton({
       ...this.options,
       logger: this.options.logger?.[(process.env.LOG_LEVEL as LogLevel) || 'verbose'],
     });
-    const backend = new AztecClientBackend([ungzip(_bytecode)], barretenberg, [_circuitName]);
+    const backend = new AztecClientBackend([ungzip(_bytecode)], barretenberg, [_circuitName], [_circuitKind]);
     const gateCount = await backend.gates();
     return gateCount[0];
   }

package/src/prover/server/bb_prover.ts

@@ -1,5 +1,5 @@
 import {
-  AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
+  AVM_V2_PROOF_LENGTH_IN_FIELDS,
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   PAIRING_POINTS_SIZE,
@@ -177,9 +177,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
   @trackSpan('BBNativeRollupProver.getAvmProof', inputs => ({
     [Attributes.APP_CIRCUIT_NAME]: inputs.hints.tx.hash,
   }))
-  public async getAvmProof(
-    inputs: AvmCircuitInputs,
-  ): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>> {
+  public async getAvmProof(inputs: AvmCircuitInputs): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS>> {
     const proof = await this.createAvmProof(inputs);
     await this.verifyAvmProof(proof.binaryProof, inputs.publicInputs);
     return proof;
@@ -499,7 +497,9 @@ export class BBNativeRollupProver implements ServerCircuitProver {
         getUltraHonkFlavorForCircuit(circuitType),
       );
     } catch (error) {
-      throw new ProvingError(`Failed to generate proof for ${circuitType}: ${error}`);
+      // Preserve retryability of the underlying failure (e.g. a transient bb startup error).
+      const retry = error instanceof ProvingError && error.retry;
+      throw new ProvingError(`Failed to generate proof for ${circuitType}: ${error}`, error, retry);
     }
 
     return {
@@ -508,9 +508,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     };
   }
 
-  private async createAvmProof(
-    input: AvmCircuitInputs,
-  ): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>> {
+  private async createAvmProof(input: AvmCircuitInputs): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS>> {
     logger.info(`Proving avm-circuit for TX ${input.hints.tx.hash}...`);
 
     const inputsBuffer = input.serializeWithMessagePack();
@@ -520,20 +518,14 @@ export class BBNativeRollupProver implements ServerCircuitProver {
     // Convert Uint8Array[] (32-byte field elements) to Fr[]
     const proofFields = proofFieldArrays.map(f => Fr.fromBuffer(Buffer.from(f)));
 
-    // Pad to fixed size (during development the proof length may vary)
-    if (proofFields.length > AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED) {
-      throw new Error(
-        `Proof has ${proofFields.length} fields, expected no more than ${AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED}.`,
-      );
+    if (proofFields.length !== AVM_V2_PROOF_LENGTH_IN_FIELDS) {
+      throw new Error(`Proof has ${proofFields.length} fields, expected exactly ${AVM_V2_PROOF_LENGTH_IN_FIELDS}.`);
     }
-    const proofFieldsPadded = proofFields.concat(
-      Array(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED - proofFields.length).fill(new Fr(0)),
-    );
 
     // Build the binary proof from the raw field data
     const rawProofBuffer = Buffer.concat(proofFieldArrays.map(f => Buffer.from(f)));
     const binaryProof = new Proof(rawProofBuffer, /*numPublicInputs=*/ 0);
-    const avmProof = new RecursiveProof(proofFieldsPadded, binaryProof, true, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
+    const avmProof = new RecursiveProof(proofFields, binaryProof, true, AVM_V2_PROOF_LENGTH_IN_FIELDS);
 
     const circuitType = 'avm-circuit' as const;
     const appCircuitName = 'unknown' as const;
@@ -645,7 +637,9 @@ export class BBNativeRollupProver implements ServerCircuitProver {
         flavor,
       ));
     } catch (error) {
-      throw new ProvingError(`Failed to verify proof for ${circuitType}: ${error}`);
+      // Preserve retryability of the underlying failure (e.g. a transient bb startup error).
+      const retry = error instanceof ProvingError && error.retry;
+      throw new ProvingError(`Failed to verify proof for ${circuitType}: ${error}`, error, retry);
     }
 
     if (!verified) {

package/src/test/test_circuit_prover.ts

@@ -1,5 +1,5 @@
 import {
-  AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
+  AVM_V2_PROOF_LENGTH_IN_FIELDS,
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   RECURSIVE_PROOF_LENGTH,
@@ -402,13 +402,11 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
   }
 
-  public getAvmProof(_inputs: AvmCircuitInputs): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>> {
+  public getAvmProof(_inputs: AvmCircuitInputs): Promise<RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS>> {
     // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
     // We just return an empty proof.
     this.logger.debug('Skipping AVM simulation in TestCircuitProver.');
-    return this.applyDelay(ProvingRequestType.PUBLIC_VM, () =>
-      makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED),
-    );
+    return this.applyDelay(ProvingRequestType.PUBLIC_VM, () => makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS));
   }
 
   private async applyDelay<F extends () => any>(type: ProvingRequestType, fn: F): Promise<Awaited<ReturnType<F>>> {