@aztec/sequencer-client 0.30.1 → 0.32.0

package/src/client/sequencer-client.ts

@@ -1,45 +1,16 @@
 import { L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { BlockProver } from '@aztec/circuit-types/interfaces';
 import { P2P } from '@aztec/p2p';
+import { SimulationProvider } from '@aztec/simulator';
 import { ContractDataSource } from '@aztec/types/contracts';
 import { WorldStateSynchronizer } from '@aztec/world-state';
 
-import * as fs from 'fs/promises';
-
-import { SoloBlockBuilder } from '../block_builder/solo_block_builder.js';
 import { SequencerClientConfig } from '../config.js';
 import { getGlobalVariableBuilder } from '../global_variable_builder/index.js';
-import { getVerificationKeys } from '../mocks/verification_keys.js';
-import { EmptyRollupProver } from '../prover/empty.js';
 import { getL1Publisher } from '../publisher/index.js';
 import { Sequencer, SequencerConfig } from '../sequencer/index.js';
 import { PublicProcessorFactory } from '../sequencer/public_processor.js';
-import { NativeACVMSimulator } from '../simulator/acvm_native.js';
-import { WASMSimulator } from '../simulator/acvm_wasm.js';
-import { RealRollupCircuitSimulator } from '../simulator/rollup.js';
-import { SimulationProvider } from '../simulator/simulation_provider.js';
-
-const logger = createDebugLogger('aztec:sequencer-client');
-
-/**
- * Factory function to create a simulation provider. Will attempt to use native binary simulation falling back to WASM if unavailable.
- * @param config - The provided sequencer client configuration
- * @returns The constructed simulation provider
- */
-async function getSimulationProvider(config: SequencerClientConfig): Promise<SimulationProvider> {
-  if (config.acvmBinaryPath && config.acvmWorkingDirectory) {
-    try {
-      await fs.access(config.acvmBinaryPath, fs.constants.R_OK);
-      await fs.mkdir(config.acvmWorkingDirectory, { recursive: true });
-      logger(`Using native ACVM at ${config.acvmBinaryPath}`);
-      return new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath);
-    } catch {
-      logger(`Failed to access ACVM at ${config.acvmBinaryPath}, falling back to WASM`);
-    }
-  }
-  logger('Using WASM ACVM simulation');
-  return new WASMSimulator();
-}
+import { TxValidatorFactory } from '../sequencer/tx_validator_factory.js';
 
 /**
  * Encapsulates the full sequencer and publisher.
@@ -55,6 +26,8 @@ export class SequencerClient {
    * @param contractDataSource - Provides access to contract bytecode for public executions.
    * @param l2BlockSource - Provides information about the previously published blocks.
    * @param l1ToL2MessageSource - Provides access to L1 to L2 messages.
+   * @param prover - An instance of a block prover
+   * @param simulationProvider - An instance of a simulation provider
    * @returns A new running instance.
    */
   public static async new(
@@ -64,38 +37,26 @@ export class SequencerClient {
     contractDataSource: ContractDataSource,
     l2BlockSource: L2BlockSource,
     l1ToL2MessageSource: L1ToL2MessageSource,
+    prover: BlockProver,
+    simulationProvider: SimulationProvider,
   ) {
     const publisher = getL1Publisher(config);
     const globalsBuilder = getGlobalVariableBuilder(config);
     const merkleTreeDb = worldStateSynchronizer.getLatest();
 
-    const simulationProvider = await getSimulationProvider(config);
-
-    const blockBuilder = new SoloBlockBuilder(
-      merkleTreeDb,
-      getVerificationKeys(),
-      new RealRollupCircuitSimulator(simulationProvider),
-      new EmptyRollupProver(),
-    );
-
-    const publicProcessorFactory = new PublicProcessorFactory(
-      merkleTreeDb,
-      contractDataSource,
-      l1ToL2MessageSource,
-      simulationProvider,
-    );
+    const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, simulationProvider);
 
     const sequencer = new Sequencer(
       publisher,
       globalsBuilder,
       p2pClient,
       worldStateSynchronizer,
-      blockBuilder,
+      prover,
       l2BlockSource,
       l1ToL2MessageSource,
       publicProcessorFactory,
+      new TxValidatorFactory(merkleTreeDb, contractDataSource, config.l1Contracts.gasPortalAddress),
       config,
-      config.l1Contracts.gasPortalAddress,
     );
 
     await sequencer.start();

package/src/config.ts

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/circuits.js';
+import { AztecAddress, Fr } from '@aztec/circuits.js';
 import { L1ContractAddresses, NULL_KEY } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
@@ -40,6 +40,8 @@ export function getConfigEnvVars(): SequencerClientConfig {
     SEQ_TX_POLLING_INTERVAL_MS,
     SEQ_MAX_TX_PER_BLOCK,
     SEQ_MIN_TX_PER_BLOCK,
+    SEQ_FPC_CLASSES,
+    SEQ_FPC_INSTANCES,
     AVAILABILITY_ORACLE_CONTRACT_ADDRESS,
     ROLLUP_CONTRACT_ADDRESS,
     REGISTRY_CONTRACT_ADDRESS,
@@ -88,5 +90,9 @@ export function getConfigEnvVars(): SequencerClientConfig {
     feeRecipient: FEE_RECIPIENT ? AztecAddress.fromString(FEE_RECIPIENT) : undefined,
     acvmWorkingDirectory: ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : undefined,
     acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined,
+    allowedFeePaymentContractClasses: SEQ_FPC_CLASSES ? SEQ_FPC_CLASSES.split(',').map(Fr.fromString) : [],
+    allowedFeePaymentContractInstances: SEQ_FPC_INSTANCES
+      ? SEQ_FPC_INSTANCES.split(',').map(AztecAddress.fromString)
+      : [],
   };
 }

package/src/index.ts

@@ -1,17 +1,8 @@
 export * from './client/index.js';
 export * from './config.js';
-export * from './mocks/verification_keys.js';
 export * from './publisher/index.js';
 export * from './sequencer/index.js';
 
 // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
 export * from './global_variable_builder/index.js';
 export * from './sequencer/public_processor.js';
-
-// Used by publisher test in e2e
-export { SoloBlockBuilder } from './block_builder/solo_block_builder.js';
-export { EmptyRollupProver } from './prover/empty.js';
-export { makeEmptyProcessedTx, makeProcessedTx, partitionReverts } from './sequencer/processed_tx.js';
-export { WASMSimulator } from './simulator/acvm_wasm.js';
-export { RealRollupCircuitSimulator } from './simulator/rollup.js';
-export { SimulationProvider } from './simulator/simulation_provider.js';

package/src/publisher/viem-tx-sender.ts

@@ -77,7 +77,7 @@ export class ViemTxSender implements L1PublisherTxSender {
   }
 
   checkIfTxsAreAvailable(block: L2Block): Promise<boolean> {
-    const args = [`0x${block.body.getTxsEffectsHash().toString('hex')}`] as const;
+    const args = [`0x${block.body.getTxsEffectsHash().toString('hex').padStart(64, '0')}`] as const;
     return this.availabilityOracleContract.read.isAvailable(args);
   }
 
@@ -145,7 +145,6 @@ export class ViemTxSender implements L1PublisherTxSender {
     const args = [
       `0x${encodedData.header.toString('hex')}`,
       `0x${encodedData.archive.toString('hex')}`,
-      `0x${encodedData.body.toString('hex')}`,
       `0x${encodedData.proof.toString('hex')}`,
     ] as const;
 

package/src/sequencer/abstract_phase_manager.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs, MerkleTreeId, SimulationError, Tx } from '@aztec/circuit-types';
+import { MerkleTreeId, SimulationError, Tx, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
   AztecAddress,
   CallRequest,
@@ -34,14 +34,17 @@ import {
   PublicKernelTailCircuitPrivateInputs,
   RETURN_VALUES_LENGTH,
   ReadRequest,
+  RevertCode,
   SideEffect,
   SideEffectLinkedToNoteHash,
   VK_TREE_HEIGHT,
+  VerificationKey,
+  makeEmptyProof,
 } from '@aztec/circuits.js';
 import { computeVarArgsHash } from '@aztec/circuits.js/hash';
 import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
-import { Tuple, to2Fields } from '@aztec/foundation/serialize';
+import { Tuple } from '@aztec/foundation/serialize';
 import {
   PublicExecution,
   PublicExecutionResult,
@@ -52,10 +55,6 @@ import {
 } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { env } from 'process';
-
-import { getVerificationKeys } from '../mocks/verification_keys.js';
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { HintsBuilder } from './hints_builder.js';
 import { lastSideEffectCounter } from './utils.js';
@@ -81,7 +80,6 @@ export abstract class AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     public phase: PublicKernelPhase,
@@ -182,7 +180,7 @@ export abstract class AbstractPhaseManager {
     tx: Tx,
     previousPublicKernelOutput: PublicKernelCircuitPublicInputs,
     previousPublicKernelProof: Proof,
-  ): Promise<[PublicKernelCircuitPublicInputs, Proof, FunctionL2Logs[], SimulationError | undefined]> {
+  ): Promise<[PublicKernelCircuitPublicInputs, Proof, UnencryptedFunctionL2Logs[], SimulationError | undefined]> {
     let kernelOutput = previousPublicKernelOutput;
     let kernelProof = previousPublicKernelProof;
 
@@ -192,7 +190,7 @@ export abstract class AbstractPhaseManager {
       return [kernelOutput, kernelProof, [], undefined];
     }
 
-    const newUnencryptedFunctionLogs: FunctionL2Logs[] = [];
+    const newUnencryptedFunctionLogs: UnencryptedFunctionL2Logs[] = [];
 
     // TODO(#1684): Should multiple separately enqueued public calls be treated as
     // separate public callstacks to be proven by separate public kernel sequences
@@ -209,9 +207,9 @@ export abstract class AbstractPhaseManager {
         const isExecutionRequest = !isPublicExecutionResult(current);
 
         const sideEffectCounter = lastSideEffectCounter(tx) + 1;
-        // NOTE: temporary glue to incorporate avm execution calls
+        // NOTE: temporary glue to incorporate avm execution calls.
         const simulator = (execution: PublicExecution, globalVariables: GlobalVariables) =>
-          env.AVM_ENABLED
+          execution.functionData.isTranspiled
             ? this.publicExecutor.simulateAvm(execution, globalVariables, sideEffectCounter)
             : this.publicExecutor.simulate(execution, globalVariables, sideEffectCounter);
 
@@ -240,7 +238,7 @@ export abstract class AbstractPhaseManager {
         // sanity check. Note we can't expect them to just be equal, because e.g.
         // if the simulator reverts in app logic, it "resets" and result.reverted will be false when we run teardown,
         // but the kernel carries the reverted flag forward. But if the simulator reverts, so should the kernel.
-        if (result.reverted && !kernelOutput.reverted) {
+        if (result.reverted && kernelOutput.endNonRevertibleData.revertCode.isOK()) {
           throw new Error(
             `Public kernel circuit did not revert on ${result.execution.contractAddress.toString()}:${functionSelector}, but simulator did.`,
           );
@@ -278,8 +276,7 @@ export abstract class AbstractPhaseManager {
     callData?: PublicCallData,
   ): Promise<[PublicKernelCircuitPublicInputs, Proof]> {
     const output = await this.getKernelCircuitOutput(previousOutput, previousProof, callData);
-    const proof = await this.publicProver.getPublicKernelCircuitProof(output);
-    return [output, proof];
+    return [output, makeEmptyProof()];
   }
 
   protected async getKernelCircuitOutput(
@@ -330,7 +327,8 @@ export abstract class AbstractPhaseManager {
     previousOutput: PublicKernelCircuitPublicInputs,
     previousProof: Proof,
   ): PublicKernelData {
-    const vk = getVerificationKeys().publicKernelCircuit;
+    // TODO(@PhilWindle) Fix once we move this to prover-client
+    const vk = VerificationKey.makeFake();
     const vkIndex = 0;
     const vkSiblingPath = MembershipWitness.random(VK_TREE_HEIGHT).siblingPath;
     return new PublicKernelData(previousOutput, previousProof, vk, vkIndex, vkSiblingPath);
@@ -348,7 +346,7 @@ export abstract class AbstractPhaseManager {
     );
 
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165) --> set this in Noir
-    const unencryptedLogsHash = to2Fields(result.unencryptedLogs.hash());
+    const unencryptedLogsHash = Fr.fromBuffer(result.unencryptedLogs.hash());
     const unencryptedLogPreimagesLength = new Fr(result.unencryptedLogs.getSerializedLength());
 
     return PublicCircuitPublicInputs.from({
@@ -385,7 +383,8 @@ export abstract class AbstractPhaseManager {
       unencryptedLogsHash,
       unencryptedLogPreimagesLength,
       historicalHeader: this.historicalHeader,
-      reverted: result.reverted,
+      // TODO(@just-mitch): need better mapping from simulator to revert code.
+      revertCode: result.reverted ? RevertCode.REVERTED : RevertCode.OK,
     });
   }
 
@@ -432,8 +431,7 @@ export abstract class AbstractPhaseManager {
     );
     const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
     const portalContractAddress = result.execution.callContext.portalContractAddress.toField();
-    const proof = await this.publicProver.getPublicCircuitProof(callStackItem.publicInputs);
-    return new PublicCallData(callStackItem, publicCallStack, proof, portalContractAddress, bytecodeHash);
+    return new PublicCallData(callStackItem, publicCallStack, makeEmptyProof(), portalContractAddress, bytecodeHash);
   }
 }
 

package/src/sequencer/app_logic_phase_manager.ts

@@ -3,7 +3,6 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
@@ -16,14 +15,13 @@ export class AppLogicPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public phase: PublicKernelPhase = PublicKernelPhase.APP_LOGIC,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
   override async handle(

package/src/sequencer/phase_manager_factory.ts

@@ -3,7 +3,6 @@ import { GlobalVariables, Header, PublicKernelCircuitPublicInputs } from '@aztec
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
@@ -30,7 +29,6 @@ export class PhaseManagerFactory {
     db: MerkleTreeOperations,
     publicExecutor: PublicExecutor,
     publicKernel: PublicKernelCircuitSimulator,
-    publicProver: PublicProver,
     globalVariables: GlobalVariables,
     historicalHeader: Header,
     publicContractsDB: ContractsDataSourcePublicDB,
@@ -41,7 +39,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -52,7 +49,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -63,7 +59,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -80,7 +75,6 @@ export class PhaseManagerFactory {
     db: MerkleTreeOperations,
     publicExecutor: PublicExecutor,
     publicKernel: PublicKernelCircuitSimulator,
-    publicProver: PublicProver,
     globalVariables: GlobalVariables,
     historicalHeader: Header,
     publicContractsDB: ContractsDataSourcePublicDB,
@@ -96,7 +90,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -110,7 +103,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -121,7 +113,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,

package/src/sequencer/public_processor.ts

@@ -1,28 +1,27 @@
-import { L1ToL2MessageSource, SimulationError, Tx } from '@aztec/circuit-types';
+import {
+  FailedTx,
+  ProcessedTx,
+  SimulationError,
+  Tx,
+  getPreviousOutputAndProof,
+  makeEmptyProcessedTx,
+  makeProcessedTx,
+  toTxEffect,
+  validateProcessedTx,
+} from '@aztec/circuit-types';
 import { TxSequencerProcessingStats } from '@aztec/circuit-types/stats';
 import { GlobalVariables, Header } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
+import { PublicExecutor, PublicStateDB, SimulationProvider } from '@aztec/simulator';
 import { ContractDataSource } from '@aztec/types/contracts';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { EmptyPublicProver } from '../prover/empty.js';
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB, WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
 import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
-import { SimulationProvider } from '../simulator/simulation_provider.js';
 import { AbstractPhaseManager } from './abstract_phase_manager.js';
 import { PhaseManagerFactory } from './phase_manager_factory.js';
-import {
-  FailedTx,
-  ProcessedTx,
-  getPreviousOutputAndProof,
-  makeEmptyProcessedTx,
-  makeProcessedTx,
-  validateProcessedTx,
-} from './processed_tx.js';
 
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
@@ -31,7 +30,6 @@ export class PublicProcessorFactory {
   constructor(
     private merkleTree: MerkleTreeOperations,
     private contractDataSource: ContractDataSource,
-    private l1Tol2MessagesDataSource: L1ToL2MessageSource,
     private simulator: SimulationProvider,
   ) {}
 
@@ -50,13 +48,12 @@ export class PublicProcessorFactory {
 
     const publicContractsDB = new ContractsDataSourcePublicDB(this.contractDataSource);
     const worldStatePublicDB = new WorldStatePublicDB(this.merkleTree);
-    const worldStateDB = new WorldStateDB(this.merkleTree, this.l1Tol2MessagesDataSource);
+    const worldStateDB = new WorldStateDB(this.merkleTree);
     const publicExecutor = new PublicExecutor(worldStatePublicDB, publicContractsDB, worldStateDB, historicalHeader);
     return new PublicProcessor(
       this.merkleTree,
       publicExecutor,
       new RealPublicKernelCircuitSimulator(this.simulator),
-      new EmptyPublicProver(),
       globalVariables,
       historicalHeader,
       publicContractsDB,
@@ -74,7 +71,6 @@ export class PublicProcessor {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
@@ -100,7 +96,6 @@ export class PublicProcessor {
         this.db,
         this.publicExecutor,
         this.publicKernel,
-        this.publicProver,
         this.globalVariables,
         this.historicalHeader,
         this.publicContractsDB,
@@ -122,7 +117,6 @@ export class PublicProcessor {
             this.db,
             this.publicExecutor,
             this.publicKernel,
-            this.publicProver,
             this.globalVariables,
             this.historicalHeader,
             this.publicContractsDB,
@@ -138,6 +132,7 @@ export class PublicProcessor {
         this.log(`Processed public part of ${tx.data.endNonRevertibleData.newNullifiers[0].value}`, {
           eventName: 'tx-sequencer-processing',
           duration: timer.ms(),
+          effectsSize: toTxEffect(processedTransaction).toBuffer().length,
           publicDataUpdateRequests:
             processedTransaction.data.combinedData.publicDataUpdateRequests.filter(x => !x.leafSlot.isZero()).length ??
             0,

package/src/sequencer/sequencer.ts

@@ -1,7 +1,7 @@
-import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, Tx } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2Block, L2BlockSource, ProcessedTx, Tx } from '@aztec/circuit-types';
+import { BlockProver, PROVING_STATUS } from '@aztec/circuit-types/interfaces';
 import { L2BlockBuiltStats } from '@aztec/circuit-types/stats';
 import { AztecAddress, EthAddress, GlobalVariables } from '@aztec/circuits.js';
-import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -9,15 +9,12 @@ import { Timer, elapsed } from '@aztec/foundation/timer';
 import { P2P } from '@aztec/p2p';
 import { WorldStateStatus, WorldStateSynchronizer } from '@aztec/world-state';
 
-import { BlockBuilder } from '../block_builder/index.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { L1Publisher } from '../publisher/l1-publisher.js';
-import { WorldStatePublicDB } from '../simulator/public_executor.js';
-import { ceilPowerOfTwo } from '../utils.js';
 import { SequencerConfig } from './config.js';
-import { ProcessedTx } from './processed_tx.js';
 import { PublicProcessorFactory } from './public_processor.js';
 import { TxValidator } from './tx_validator.js';
+import { TxValidatorFactory } from './tx_validator_factory.js';
 
 /**
  * Sequencer client
@@ -38,18 +35,20 @@ export class Sequencer {
   private _feeRecipient = AztecAddress.ZERO;
   private lastPublishedBlock = 0;
   private state = SequencerState.STOPPED;
+  private allowedFeePaymentContractClasses: Fr[] = [];
+  private allowedFeePaymentContractInstances: AztecAddress[] = [];
 
   constructor(
     private publisher: L1Publisher,
     private globalsBuilder: GlobalVariableBuilder,
     private p2pClient: P2P,
     private worldState: WorldStateSynchronizer,
-    private blockBuilder: BlockBuilder,
+    private prover: BlockProver,
     private l2BlockSource: L2BlockSource,
     private l1ToL2MessageSource: L1ToL2MessageSource,
     private publicProcessorFactory: PublicProcessorFactory,
+    private txValidatorFactory: TxValidatorFactory,
     config: SequencerConfig = {},
-    private gasPortalAddress = EthAddress.ZERO,
     private log = createDebugLogger('aztec:sequencer'),
   ) {
     this.updateConfig(config);
@@ -76,6 +75,12 @@ export class Sequencer {
     if (config.feeRecipient) {
       this._feeRecipient = config.feeRecipient;
     }
+    if (config.allowedFeePaymentContractClasses) {
+      this.allowedFeePaymentContractClasses = config.allowedFeePaymentContractClasses;
+    }
+    if (config.allowedFeePaymentContractInstances) {
+      this.allowedFeePaymentContractInstances = config.allowedFeePaymentContractInstances;
+    }
   }
 
   /**
@@ -173,17 +178,10 @@ export class Sequencer {
         this._feeRecipient,
       );
 
-      // Filter out invalid txs
-      const trees = this.worldState.getLatest();
-      const txValidator = new TxValidator(
-        {
-          getNullifierIndex(nullifier: Fr): Promise<bigint | undefined> {
-            return trees.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
-          },
-        },
-        new WorldStatePublicDB(trees),
-        this.gasPortalAddress,
+      const txValidator = this.txValidatorFactory.buildTxValidator(
         newGlobalVariables,
+        this.allowedFeePaymentContractClasses,
+        this.allowedFeePaymentContractInstances,
       );
 
       // TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
@@ -305,15 +303,17 @@ export class Sequencer {
     emptyTx: ProcessedTx,
     globalVariables: GlobalVariables,
   ) {
-    // Pad the txs array with empty txs to be a power of two, at least 2
-    const txsTargetSize = Math.max(ceilPowerOfTwo(txs.length), 2);
-    const emptyTxCount = txsTargetSize - txs.length;
+    const blockTicket = await this.prover.startNewBlock(txs.length, globalVariables, l1ToL2Messages, emptyTx);
 
-    const allTxs = [...txs, ...times(emptyTxCount, () => emptyTx)];
-    this.log(`Building block ${globalVariables.blockNumber.toBigInt()}`);
+    for (const tx of txs) {
+      await this.prover.addNewTx(tx);
+    }
 
-    const [block] = await this.blockBuilder.buildL2Block(globalVariables, allTxs, l1ToL2Messages);
-    return block;
+    const result = await blockTicket.provingPromise;
+    if (result.status === PROVING_STATUS.FAILURE) {
+      throw new Error(`Block proving failed, reason: ${result.reason}`);
+    }
+    return result.block;
   }
 
   get coinbase(): EthAddress {

package/src/sequencer/setup_phase_manager.ts

@@ -3,7 +3,6 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
@@ -16,14 +15,13 @@ export class SetupPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public phase: PublicKernelPhase = PublicKernelPhase.SETUP,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
   override async handle(

package/src/sequencer/tail_phase_manager.ts

@@ -3,7 +3,6 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
@@ -13,14 +12,13 @@ export class TailPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public readonly phase: PublicKernelPhase = PublicKernelPhase.TAIL,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
   async handle(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs, previousPublicKernelProof: Proof) {

package/src/sequencer/teardown_phase_manager.ts

@@ -3,7 +3,6 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
@@ -16,14 +15,13 @@ export class TeardownPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public phase: PublicKernelPhase = PublicKernelPhase.TEARDOWN,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
   override async handle(