chore!: Sequencer no longer proves

Removes the code path where the sequencer would submit proofs for a
given block, so this reponsibility is now exclusive of the prover-node.
This allows us to remove the prover instance from the aztec node
altogether, and drop the `PROVER_DISABLED` and `SEQ_SKIP_SUBMIT_PROOFS`
env vars since are no longer needed.

yarn-project/aztec-node/src/aztec-node/config.ts

@@ -18,12 +18,10 @@ export type AztecNodeConfig = ArchiverConfig &
   SequencerClientConfig &
   ProverClientConfig &
   WorldStateConfig &
+  Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig & {
     /** Whether the sequencer is disabled for this node. */
     disableSequencer: boolean;
-
-    /** Whether the prover is disabled for this node. */
-    disableProver: boolean;
   };
 
 export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
@@ -37,11 +35,6 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
     description: 'Whether the sequencer is disabled for this node.',
     ...booleanConfigHelper(),
   },
-  disableProver: {
-    env: 'PROVER_DISABLED',
-    description: 'Whether the prover is disabled for this node.',
-    ...booleanConfigHelper(),
-  },
 };
 
 /**

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -14,7 +14,6 @@ import {
   LogType,
   MerkleTreeId,
   NullifierMembershipWitness,
-  type ProverClient,
   type ProverConfig,
   PublicDataWitness,
   PublicSimulationOutput,
@@ -59,7 +58,6 @@ import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
 import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
 import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
-import { createProverClient } from '@aztec/prover-client';
 import {
   AggregateTxValidator,
   DataTxValidator,
@@ -105,7 +103,6 @@ export class AztecNodeService implements AztecNode {
     protected readonly version: number,
     protected readonly globalVariableBuilder: GlobalVariableBuilder,
     protected readonly merkleTreesDb: AztecKVStore,
-    private readonly prover: ProverClient | undefined,
     private txValidator: TxValidator,
     private telemetry: TelemetryClient,
     private log = createDebugLogger('aztec:node'),
@@ -169,12 +166,6 @@ export class AztecNodeService implements AztecNode {
 
     const simulationProvider = await createSimulationProvider(config, log);
 
-    const prover = await createProverClient(config, telemetry);
-
-    if (!prover && !config.disableSequencer) {
-      throw new Error("Can't start a sequencer without a prover");
-    }
-
     // now create the sequencer
     const sequencer = config.disableSequencer
       ? undefined
@@ -185,7 +176,6 @@ export class AztecNodeService implements AztecNode {
           archiver,
           archiver,
           archiver,
-          prover!,
           simulationProvider,
           telemetry,
         );
@@ -204,7 +194,6 @@ export class AztecNodeService implements AztecNode {
       config.version,
       getGlobalVariableBuilder(config),
       store,
-      prover,
       txValidator,
       telemetry,
       log,
@@ -219,10 +208,6 @@ export class AztecNodeService implements AztecNode {
     return this.sequencer;
   }
 
-  public getProver(): ProverClient | undefined {
-    return this.prover;
-  }
-
   public getBlockSource(): L2BlockSource {
     return this.blockSource;
   }
@@ -381,7 +366,6 @@ export class AztecNodeService implements AztecNode {
     await this.p2pClient.stop();
     await this.worldStateSynchronizer.stop();
     await this.blockSource.stop();
-    await this.prover?.stop();
     this.log.info(`Stopped`);
   }
 
@@ -771,7 +755,6 @@ export class AztecNodeService implements AztecNode {
   public async setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void> {
     const newConfig = { ...this.config, ...config };
     this.sequencer?.updateSequencerConfig(config);
-    await this.prover?.updateProverConfig(config);
 
     if (newConfig.realProofs !== this.config.realProofs) {
       const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();

yarn-project/aztec/src/cli/cmds/start_node.ts

@@ -3,7 +3,6 @@ import { type PXE } from '@aztec/circuit-types';
 import { NULL_KEY } from '@aztec/ethereum';
 import { type ServerList } from '@aztec/foundation/json-rpc/server';
 import { type LogFn } from '@aztec/foundation/log';
-import { createProvingJobSourceServer } from '@aztec/prover-client/prover-agent';
 import {
   type TelemetryClientConfig,
   createAndStartTelemetryClient,
@@ -33,9 +32,6 @@ export const startNode = async (
   };
 
   if (options.proverNode) {
-    // TODO(palla/prover-node) We need to tweak the semantics of disableProver so that it doesn't inject
-    // a null prover into the sequencer, but instead injects a circuit simulator, which is what the
-    // sequencer ultimately needs.
     userLog(`Running a Prover Node within a Node is not yet supported`);
     process.exit(1);
   }
@@ -87,24 +83,13 @@ export const startNode = async (
     }
   }
 
-  if (!options.prover) {
-    userLog(`Prover is disabled, using mocked proofs`);
-    nodeConfig.disableProver = true;
-  }
-
   if (nodeConfig.p2pEnabled) {
     // ensure bootstrapNodes is an array
     if (nodeConfig.bootstrapNodes && typeof nodeConfig.bootstrapNodes === 'string') {
       nodeConfig.bootstrapNodes = (nodeConfig.bootstrapNodes as string).split(',');
     }
   }
 
-  if (!nodeConfig.disableSequencer && nodeConfig.disableProver) {
-    // TODO(palla/prover-node) Sequencer should not need a prover unless we are running the prover
-    // within it, it should just need a circuit simulator. We need to refactor the sequencer so it can accept either.
-    throw new Error('Cannot run a sequencer without a prover');
-  }
-
   const telemetryConfig = extractRelevantOptions<TelemetryClientConfig>(options, telemetryClientConfigMappings);
   const telemetryClient = createAndStartTelemetryClient(telemetryConfig);
 
@@ -115,11 +100,6 @@ export const startNode = async (
   // Add node to services list
   services.push({ node: nodeServer });
 
-  if (!nodeConfig.disableProver) {
-    const provingJobSource = createProvingJobSourceServer(node.getProver()!.getProvingJobSource());
-    services.push({ provingJobSource });
-  }
-
   // Add node stop function to signal handlers
   signalHandlers.push(node.stop);
 

yarn-project/bb-prover/src/test/test_circuit_prover.ts

@@ -65,8 +65,8 @@ import { SimulatedPublicKernelArtifactMapping } from '../mappings/mappings.js';
 import { mapPublicKernelToCircuitName } from '../stats.js';
 
 /**
- * A class for use in testing situations (e2e, unit test etc)
- * Simulates circuits using the most efficient method and performs no proving
+ * A class for use in testing situations (e2e, unit test, etc) and temporarily for assembling a block in the sequencer.
+ * Simulates circuits using the most efficient method and performs no proving.
  */
 export class TestCircuitProver implements ServerCircuitProver {
   private wasmSimulator = new WASMSimulator();

yarn-project/circuit-types/src/interfaces/block-prover.ts

@@ -23,48 +23,52 @@ export type ProvingTicket = {
   provingPromise: Promise<ProvingResult>;
 };
 
-export type BlockResult = {
+export type SimulationBlockResult = {
   block: L2Block;
+};
+
+export type ProvingBlockResult = SimulationBlockResult & {
   proof: Proof;
   aggregationObject: Fr[];
 };
 
-/**
- * The interface to the block prover.
- * Provides the ability to generate proofs and build rollups.
- */
-export interface BlockProver {
+/** Receives processed txs as part of block simulation or proving. */
+export interface ProcessedTxHandler {
   /**
-   * Cancels any block that is currently being built and prepares for a new one to be built
+   * Add a processed transaction to the current block.
+   * @param tx - The transaction to be added.
+   */
+  addNewTx(tx: ProcessedTx): Promise<void>;
+}
+
+/** The interface to a block simulator. Generates an L2 block out of a set of processed txs by calling into the Aztec circuits. */
+export interface BlockSimulator extends ProcessedTxHandler {
+  /**
+   * Prepares to build a new block.
    * @param numTxs - The complete size of the block, must be a power of 2
    * @param globalVariables - The global variables for this block
    * @param l1ToL2Messages - The set of L1 to L2 messages to be included in this block
-   * @param emptyTx - An instance of an empty transaction to be used in this block
    */
   startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<ProvingTicket>;
 
-  /**
-   * Add a processed transaction to the current block
-   * @param tx - The transaction to be added
-   */
-  addNewTx(tx: ProcessedTx): Promise<void>;
-
-  /**
-   * Cancels the block currently being proven. Proofs already bring built may continue but further proofs should not be started.
-   */
+  /** Cancels the block currently being processed. Processes already in progress built may continue but further proofs should not be started. */
   cancelBlock(): void;
 
-  /**
-   * Performs the final archive tree insertion for this block and returns the L2Block and Proof instances
-   */
-  finaliseBlock(): Promise<BlockResult>;
+  /** Performs the final archive tree insertion for this block and returns the L2Block. */
+  finaliseBlock(): Promise<SimulationBlockResult>;
 
   /**
    * Mark the block as having all the transactions it is going to contain.
-   * Will pad the block to it's complete size with empty transactions and prove all the way to the root rollup.
+   * Will pad the block to its complete size with empty transactions and prove all the way to the root rollup.
    */
   setBlockCompleted(): Promise<void>;
+}
 
+/** The interface to a block prover. Generates a root rollup proof out of a set of processed txs by recursively proving Aztec circuits. */
+export interface BlockProver extends BlockSimulator {
   /** Returns an identifier for the prover or zero if not set. */
   getProverId(): Fr;
+
+  /** Performs the final archive tree insertion for this block and returns the L2Block. */
+  finaliseBlock(): Promise<ProvingBlockResult>;
 }

yarn-project/circuit-types/src/interfaces/configs.ts

@@ -37,6 +37,4 @@ export interface SequencerConfig {
   maxBlockSizeInBytes?: number;
   /** Whether to require every tx to have a fee payer */
   enforceFees?: boolean;
-  /** Temporary flag to skip submitting proofs, so a prover-node takes care of it. */
-  sequencerSkipSubmitProofs?: boolean;
 }

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

@@ -46,8 +46,7 @@ describe('e2e_prover_node', () => {
 
   beforeAll(async () => {
     logger = createDebugLogger('aztec:e2e_prover_node');
-    const config: Partial<SequencerClientConfig> = { sequencerSkipSubmitProofs: true };
-    snapshotManager = createSnapshotManager(`e2e_prover_node`, process.env.E2E_DATA_PATH, config);
+    snapshotManager = createSnapshotManager(`e2e_prover_node`, process.env.E2E_DATA_PATH);
 
     const testContractOpts = { contractAddressSalt: Fr.ONE, universalDeploy: true };
     await snapshotManager.snapshot(

yarn-project/end-to-end/src/fixtures/utils.ts

@@ -303,8 +303,6 @@ export type EndToEndContext = {
   logger: DebugLogger;
   /** The cheat codes. */
   cheatCodes: CheatCodes;
-  /** Proving jobs */
-  prover: ProverClient | undefined;
   /** Function to stop the started services. */
   teardown: () => Promise<void>;
 };
@@ -381,7 +379,6 @@ export async function setup(
   config.l1PublishRetryIntervalMS = 100;
   const aztecNode = await AztecNodeService.createAndSync(config, telemetry);
   const sequencer = aztecNode.getSequencer();
-  const prover = aztecNode.getProver();
 
   logger.verbose('Creating a pxe...');
 
@@ -434,7 +431,6 @@ export async function setup(
     logger,
     cheatCodes,
     sequencer,
-    prover,
     teardown,
   };
 }

yarn-project/prover-client/package.json

@@ -4,7 +4,8 @@
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./prover-agent": "./dest/prover-agent/index.js"
+    "./prover-agent": "./dest/prover-agent/index.js",
+    "./orchestrator": "./dest/orchestrator/index.js"
   },
   "typedocOptions": {
     "entryPoints": [

yarn-project/prover-client/src/config.ts

@@ -1,5 +1,5 @@
 import { type ProverConfig, proverConfigMappings } from '@aztec/circuit-types';
-import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
+import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
 
 /**
  * The prover configuration.
@@ -13,8 +13,6 @@ export type ProverClientConfig = ProverConfig & {
   bbWorkingDirectory: string;
   /** The path to the bb binary */
   bbBinaryPath: string;
-  /** True to disable proving altogether. */
-  disableProver: boolean;
 };
 
 export const proverClientConfigMappings: ConfigMappingsType<ProverClientConfig> = {
@@ -34,11 +32,6 @@ export const proverClientConfigMappings: ConfigMappingsType<ProverClientConfig>
     env: 'BB_BINARY_PATH',
     description: 'The path to the bb binary',
   },
-  disableProver: {
-    env: 'PROVER_DISABLED',
-    description: 'Whether to disable proving.',
-    ...booleanConfigHelper(),
-  },
   ...proverConfigMappings,
 };
 

yarn-project/prover-client/src/orchestrator/index.ts

@@ -0,0 +1 @@
+export { ProvingOrchestrator } from './orchestrator.js';

yarn-project/prover-client/src/orchestrator/orchestrator.ts

@@ -18,8 +18,8 @@ import {
 import {
   BlockProofError,
   type BlockProver,
-  type BlockResult,
   PROVING_STATUS,
+  type ProvingBlockResult,
   type ProvingResult,
   type ProvingTicket,
   type PublicInputsAndRecursiveProof,
@@ -450,7 +450,7 @@ export class ProvingOrchestrator implements BlockProver {
 
       this.provingState.block = l2Block;
 
-      const blockResult: BlockResult = {
+      const blockResult: ProvingBlockResult = {
         proof: this.provingState.finalProof,
         aggregationObject: this.provingState.finalAggregationObject,
         block: l2Block,

yarn-project/prover-client/src/tx-prover/factory.ts

@@ -5,5 +5,5 @@ import { type ProverClientConfig } from '../config.js';
 import { TxProver } from './tx-prover.js';
 
 export function createProverClient(config: ProverClientConfig, telemetry: TelemetryClient = new NoopTelemetryClient()) {
-  return config.disableProver ? undefined : TxProver.new(config, telemetry);
+  return TxProver.new(config, telemetry);
 }

yarn-project/sequencer-client/package.json

@@ -24,6 +24,7 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
+    "@aztec/bb-prover": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
@@ -34,6 +35,7 @@
     "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/p2p": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
+    "@aztec/prover-client": "workspace:^",
     "@aztec/simulator": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/types": "workspace:^",