fix: Properly schedule the tube proof and don't prove it twice

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

@@ -31,7 +31,7 @@ import {
   type RootRollupInputs,
   type RootRollupPublicInputs,
   TUBE_PROOF_LENGTH,
-  TubeInputs,
+  type TubeInputs,
   type VerificationKeyAsFields,
   type VerificationKeyData,
   makeRecursiveProofFromBinary,
@@ -226,16 +226,6 @@ export class BBNativeRollupProver implements ServerCircuitProver {
       kernelRequest.inputs.previousKernel.vk,
     );
 
-    // PUBLIC KERNEL: kernel request should be nonempty at start of public kernel proving but it is not
-    // TODO(#7369): We should properly enqueue the tube in the public kernel lifetime
-    if (!kernelRequest.inputs.previousKernel.clientIvcProof.isEmpty()) {
-      const { tubeVK, tubeProof } = await this.getTubeProof(
-        new TubeInputs(kernelRequest.inputs.previousKernel.clientIvcProof),
-      );
-      kernelRequest.inputs.previousKernel.vk = tubeVK;
-      kernelRequest.inputs.previousKernel.proof = tubeProof;
-    }
-
     await this.verifyWithKey(
       kernelRequest.inputs.previousKernel.vk,
       kernelRequest.inputs.previousKernel.proof.binaryProof,
@@ -289,8 +279,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
   ): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>> {
     // We may need to convert the recursive proof into fields format
     logger.debug(`kernel Data proof: ${baseRollupInput.kernelData.proof}`);
-    logger.info(`in getBaseRollupProof`);
-    logger.info(`Number of public inputs in baseRollupInput: ${baseRollupInput.kernelData.vk.numPublicInputs}`);
+    logger.debug(`Number of public inputs in baseRollupInput: ${baseRollupInput.kernelData.vk.numPublicInputs}`);
     baseRollupInput.kernelData.proof = await this.ensureValidProof(
       baseRollupInput.kernelData.proof,
       'BaseRollupArtifact',

yarn-project/circuit-types/src/stats/stats.ts

@@ -93,7 +93,8 @@ export type CircuitName =
   | 'public-kernel-tail'
   | 'avm-circuit'
   | 'empty-nested'
-  | 'private-kernel-empty';
+  | 'private-kernel-empty'
+  | 'tube-circuit';
 
 /** Stats for circuit simulation. */
 export type CircuitSimulationStats = {

yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_private_inputs.ts

@@ -1,6 +1,5 @@
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { ClientIvcProof } from '../client_ivc_proof.js';
 import { PublicCallData } from './public_call_data.js';
 import { PublicKernelData } from './public_kernel_data.js';
 
@@ -13,8 +12,6 @@ export class PublicKernelCircuitPrivateInputs {
      * Kernels are recursive and this is the data from the previous kernel.
      */
     public readonly previousKernel: PublicKernelData,
-
-    public readonly clientIvcProof: ClientIvcProof,
     /**
      * Public calldata assembled from the execution result and proof.
      */
@@ -26,7 +23,7 @@ export class PublicKernelCircuitPrivateInputs {
    * @returns - Buffer representation of the object.
    */
   toBuffer() {
-    return serializeToBuffer(this.previousKernel, this.clientIvcProof, this.publicCall);
+    return serializeToBuffer(this.previousKernel, this.publicCall);
   }
 
   /**
@@ -45,9 +42,8 @@ export class PublicKernelCircuitPrivateInputs {
   static fromBuffer(buffer: BufferReader | Buffer) {
     const reader = BufferReader.asReader(buffer);
     const previousKernel = reader.readObject(PublicKernelData);
-    const clientIvcProof = reader.readObject(ClientIvcProof);
     const publicCall = reader.readObject(PublicCallData);
-    return new PublicKernelCircuitPrivateInputs(previousKernel, clientIvcProof, publicCall);
+    return new PublicKernelCircuitPrivateInputs(previousKernel, publicCall);
   }
 
   /**

yarn-project/circuits.js/src/tests/factories.ts

@@ -24,7 +24,6 @@ import {
   BaseParityInputs,
   BaseRollupInputs,
   CallContext,
-  ClientIvcProof,
   CombineHints,
   CombinedAccumulatedData,
   CombinedConstantData,
@@ -660,11 +659,7 @@ export function makePublicCallData(seed = 1, full = false): PublicCallData {
  * @returns Public kernel inputs.
  */
 export function makePublicKernelCircuitPrivateInputs(seed = 1): PublicKernelCircuitPrivateInputs {
-  return new PublicKernelCircuitPrivateInputs(
-    makePublicKernelData(seed),
-    ClientIvcProof.empty(),
-    makePublicCallData(seed + 0x1000),
-  );
+  return new PublicKernelCircuitPrivateInputs(makePublicKernelData(seed), makePublicCallData(seed + 0x1000));
 }
 
 export function makeCombineHints(seed = 1): CombineHints {

yarn-project/prover-client/src/orchestrator/block-building-helpers.ts

@@ -37,7 +37,6 @@ import {
   type RootRollupPublicInputs,
   StateDiffHints,
   type StateReference,
-  type TUBE_PROOF_LENGTH,
   VK_TREE_HEIGHT,
   type VerificationKeyAsFields,
   type VerificationKeyData,
@@ -61,7 +60,7 @@ export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
 // Builds the base rollup inputs, updating the contract, nullifier, and data trees in the process
 export async function buildBaseRollupInput(
   tx: ProcessedTx,
-  proof: RecursiveProof<typeof TUBE_PROOF_LENGTH>,
+  proof: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>,
   globalVariables: GlobalVariables,
   db: MerkleTreeOperations,
   kernelVk: VerificationKeyData,