@aztec/sequencer-client 0.31.0 → 0.32.1

package/src/publisher/l1-publisher.ts

@@ -1,12 +1,12 @@
-import { L2Block } from '@aztec/circuit-types';
-import { L1PublishStats } from '@aztec/circuit-types/stats';
+import { type L2Block } from '@aztec/circuit-types';
+import { type L1PublishStats } from '@aztec/circuit-types/stats';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { InterruptibleSleep } from '@aztec/foundation/sleep';
 
 import pick from 'lodash.pick';
 
-import { L2BlockReceiver } from '../receiver.js';
-import { PublisherConfig } from './config.js';
+import { type L2BlockReceiver } from '../receiver.js';
+import { type PublisherConfig } from './config.js';
 
 /**
  * Stats for a sent transaction.

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

@@ -1,14 +1,14 @@
-import { L2Block } from '@aztec/circuit-types';
+import { type L2Block } from '@aztec/circuit-types';
 import { createEthereumChain } from '@aztec/ethereum';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AvailabilityOracleAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import {
-  GetContractReturnType,
-  Hex,
-  HttpTransport,
-  PublicClient,
-  WalletClient,
+  type GetContractReturnType,
+  type Hex,
+  type HttpTransport,
+  type PublicClient,
+  type WalletClient,
   createPublicClient,
   createWalletClient,
   getAddress,
@@ -16,15 +16,15 @@ import {
   hexToBytes,
   http,
 } from 'viem';
-import { PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts';
+import { type PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts';
 import * as chains from 'viem/chains';
 
-import { TxSenderConfig } from './config.js';
+import { type TxSenderConfig } from './config.js';
 import {
-  L1PublisherTxSender,
-  MinimalTransactionReceipt,
-  L1ProcessArgs as ProcessTxArgs,
-  TransactionStats,
+  type L1PublisherTxSender,
+  type MinimalTransactionReceipt,
+  type L1ProcessArgs as ProcessTxArgs,
+  type TransactionStats,
 } from './l1-publisher.js';
 
 /**

package/src/receiver.ts

@@ -1,4 +1,4 @@
-import { L2Block } from '@aztec/circuit-types';
+import { type L2Block } from '@aztec/circuit-types';
 
 /**
  * Given the necessary rollup data, verifies it, and updates the underlying state accordingly to advance the state of the system.

package/src/sequencer/abstract_phase_manager.ts

@@ -1,12 +1,12 @@
-import { FunctionL2Logs, MerkleTreeId, SimulationError, Tx } from '@aztec/circuit-types';
+import { MerkleTreeId, type SimulationError, type Tx, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
   AztecAddress,
   CallRequest,
   ContractStorageRead,
   ContractStorageUpdateRequest,
   Fr,
-  GlobalVariables,
-  Header,
+  type GlobalVariables,
+  type Header,
   L2ToL1Message,
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_NOTE_HASHES_PER_CALL,
@@ -20,16 +20,16 @@ import {
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
   MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MembershipWitness,
-  PrivateKernelTailCircuitPublicInputs,
-  Proof,
+  type PrivateKernelTailCircuitPublicInputs,
+  type Proof,
   PublicCallData,
-  PublicCallRequest,
+  type PublicCallRequest,
   PublicCallStackItem,
   PublicCircuitPublicInputs,
   PublicDataRead,
   PublicDataUpdateRequest,
   PublicKernelCircuitPrivateInputs,
-  PublicKernelCircuitPublicInputs,
+  type PublicKernelCircuitPublicInputs,
   PublicKernelData,
   PublicKernelTailCircuitPrivateInputs,
   RETURN_VALUES_LENGTH,
@@ -43,19 +43,19 @@ import {
 } 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 } from '@aztec/foundation/serialize';
+import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type Tuple } from '@aztec/foundation/serialize';
 import {
-  PublicExecution,
-  PublicExecutionResult,
-  PublicExecutor,
+  type PublicExecution,
+  type PublicExecutionResult,
+  type PublicExecutor,
   collectPublicDataReads,
   collectPublicDataUpdateRequests,
   isPublicExecutionResult,
 } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { HintsBuilder } from './hints_builder.js';
 import { lastSideEffectCounter } from './utils.js';
 
@@ -180,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;
 
@@ -190,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

package/src/sequencer/app_logic_phase_manager.ts

@@ -1,10 +1,15 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type Tx } from '@aztec/circuit-types';
+import {
+  type GlobalVariables,
+  type Header,
+  type Proof,
+  type PublicKernelCircuitPublicInputs,
+} from '@aztec/circuits.js';
+import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 
 /**

package/src/sequencer/hints_builder.ts

@@ -1,21 +1,21 @@
 import { MerkleTreeId } from '@aztec/circuit-types';
 import {
-  Fr,
+  type Fr,
   MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
-  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
-  MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+  type MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
+  type MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  type MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  type MAX_REVERTIBLE_NULLIFIERS_PER_TX,
   MembershipWitness,
   NULLIFIER_TREE_HEIGHT,
-  ReadRequestContext,
-  SideEffectLinkedToNoteHash,
+  type ReadRequestContext,
+  type SideEffectLinkedToNoteHash,
   buildNullifierNonExistentReadRequestHints,
   buildNullifierReadRequestHints,
   concatAccumulatedData,
 } from '@aztec/circuits.js';
-import { Tuple } from '@aztec/foundation/serialize';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type Tuple } from '@aztec/foundation/serialize';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
 export class HintsBuilder {
   constructor(private db: MerkleTreeOperations) {}

package/src/sequencer/phase_manager_factory.ts

@@ -1,11 +1,11 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type Tx } from '@aztec/circuit-types';
+import { type GlobalVariables, type Header, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
+import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
-import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
+import { type AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 import { AppLogicPhaseManager } from './app_logic_phase_manager.js';
 import { SetupPhaseManager } from './setup_phase_manager.js';
 import { TailPhaseManager } from './tail_phase_manager.js';

package/src/sequencer/public_processor.ts

@@ -1,26 +1,26 @@
 import {
-  FailedTx,
-  L1ToL2MessageSource,
-  ProcessedTx,
-  SimulationError,
+  type FailedTx,
+  type ProcessedTx,
+  type 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 { type TxSequencerProcessingStats } from '@aztec/circuit-types/stats';
+import { type GlobalVariables, type Header } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { PublicExecutor, PublicStateDB, SimulationProvider } from '@aztec/simulator';
-import { ContractDataSource } from '@aztec/types/contracts';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { PublicExecutor, type PublicStateDB, type SimulationProvider } from '@aztec/simulator';
+import { type ContractDataSource } from '@aztec/types/contracts';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB, WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
 import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
+import { type AbstractPhaseManager } from './abstract_phase_manager.js';
 import { PhaseManagerFactory } from './phase_manager_factory.js';
 
 /**
@@ -30,7 +30,6 @@ export class PublicProcessorFactory {
   constructor(
     private merkleTree: MerkleTreeOperations,
     private contractDataSource: ContractDataSource,
-    private l1Tol2MessagesDataSource: L1ToL2MessageSource,
     private simulator: SimulationProvider,
   ) {}
 
@@ -49,7 +48,7 @@ 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,
@@ -133,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,20 +1,20 @@
-import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, 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 { type L1ToL2MessageSource, type L2Block, type L2BlockSource, type ProcessedTx, Tx } from '@aztec/circuit-types';
+import { type BlockProver, PROVING_STATUS } from '@aztec/circuit-types/interfaces';
+import { type L2BlockBuiltStats } from '@aztec/circuit-types/stats';
+import { AztecAddress, EthAddress, type GlobalVariables } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer, elapsed } from '@aztec/foundation/timer';
-import { P2P } from '@aztec/p2p';
-import { WorldStateStatus, WorldStateSynchronizer } from '@aztec/world-state';
+import { type P2P } from '@aztec/p2p';
+import { type WorldStateStatus, type WorldStateSynchronizer } from '@aztec/world-state';
 
-import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
-import { L1Publisher } from '../publisher/l1-publisher.js';
-import { WorldStatePublicDB } from '../simulator/public_executor.js';
-import { SequencerConfig } from './config.js';
-import { PublicProcessorFactory } from './public_processor.js';
-import { TxValidator } from './tx_validator.js';
+import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
+import { type L1Publisher } from '../publisher/l1-publisher.js';
+import { type SequencerConfig } from './config.js';
+import { type PublicProcessorFactory } from './public_processor.js';
+import { type TxValidator } from './tx_validator.js';
+import { type TxValidatorFactory } from './tx_validator_factory.js';
 
 /**
  * Sequencer client
@@ -35,6 +35,8 @@ export class Sequencer {
   private _feeRecipient = AztecAddress.ZERO;
   private lastPublishedBlock = 0;
   private state = SequencerState.STOPPED;
+  private allowedFeePaymentContractClasses: Fr[] = [];
+  private allowedFeePaymentContractInstances: AztecAddress[] = [];
 
   constructor(
     private publisher: L1Publisher,
@@ -45,8 +47,8 @@ export class Sequencer {
     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);
@@ -73,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;
+    }
   }
 
   /**
@@ -170,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

package/src/sequencer/setup_phase_manager.ts

@@ -1,10 +1,15 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type Tx } from '@aztec/circuit-types';
+import {
+  type GlobalVariables,
+  type Header,
+  type Proof,
+  type PublicKernelCircuitPublicInputs,
+} from '@aztec/circuits.js';
+import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 
 /**

package/src/sequencer/tail_phase_manager.ts

@@ -1,10 +1,15 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type Tx } from '@aztec/circuit-types';
+import {
+  type GlobalVariables,
+  type Header,
+  type Proof,
+  type PublicKernelCircuitPublicInputs,
+} from '@aztec/circuits.js';
+import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 
 export class TailPhaseManager extends AbstractPhaseManager {

package/src/sequencer/teardown_phase_manager.ts

@@ -1,10 +1,15 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
+import { type Tx } from '@aztec/circuit-types';
+import {
+  type GlobalVariables,
+  type Header,
+  type Proof,
+  type PublicKernelCircuitPublicInputs,
+} from '@aztec/circuits.js';
+import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
+import { type MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
+import { type PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 
 /**

package/src/sequencer/tx_validator.ts

@@ -1,8 +1,15 @@
-import { ProcessedTx, Tx } from '@aztec/circuit-types';
-import { AztecAddress, EthAddress, Fr, GlobalVariables } from '@aztec/circuits.js';
+import { type ProcessedTx, Tx } from '@aztec/circuit-types';
+import {
+  type AztecAddress,
+  type EthAddress,
+  Fr,
+  type GlobalVariables,
+  type PublicCallRequest,
+} from '@aztec/circuits.js';
 import { pedersenHash } from '@aztec/foundation/crypto';
-import { Logger, createDebugLogger } from '@aztec/foundation/log';
+import { type Logger, createDebugLogger } from '@aztec/foundation/log';
 import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { type ContractDataSource } from '@aztec/types/contracts';
 
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 
@@ -27,25 +34,33 @@ type TxValidationStatus = typeof VALID_TX | typeof INVALID_TX;
 // the storage slot associated with "storage.balances"
 const GAS_TOKEN_BALANCES_SLOT = new Fr(1);
 
+type FeeValidationConfig = {
+  gasPortalAddress: EthAddress;
+  allowedFeePaymentContractClasses: Fr[];
+  allowedFeePaymentContractInstances: AztecAddress[];
+};
+
 export class TxValidator {
   #log: Logger;
   #globalVariables: GlobalVariables;
   #nullifierSource: NullifierSource;
   #publicStateSource: PublicStateSource;
-  #gasPortalAddress: EthAddress;
+  #contractDataSource: ContractDataSource;
+  #feeValidationConfig: FeeValidationConfig;
 
   constructor(
     nullifierSource: NullifierSource,
     publicStateSource: PublicStateSource,
-    gasPortalAddress: EthAddress,
+    contractDataSource: ContractDataSource,
     globalVariables: GlobalVariables,
+    feeValidationConfig: FeeValidationConfig,
     log = createDebugLogger('aztec:sequencer:tx_validator'),
   ) {
     this.#nullifierSource = nullifierSource;
-    this.#globalVariables = globalVariables;
     this.#publicStateSource = publicStateSource;
-    this.#gasPortalAddress = gasPortalAddress;
-
+    this.#contractDataSource = contractDataSource;
+    this.#globalVariables = globalVariables;
+    this.#feeValidationConfig = feeValidationConfig;
     this.#log = log;
   }
 
@@ -71,9 +86,15 @@ export class TxValidator {
       }
 
       // skip already processed transactions
-      if (tx instanceof Tx && (await this.#validateFee(tx)) === INVALID_TX) {
-        invalidTxs.push(tx);
-        continue;
+      if (tx instanceof Tx) {
+        if ((await this.#validateFee(tx)) === INVALID_TX) {
+          invalidTxs.push(tx);
+          continue;
+        }
+        if ((await this.#validateGasBalance(tx)) === INVALID_TX) {
+          invalidTxs.push(tx);
+          continue;
+        }
       }
 
       if (this.#validateMaxBlockNumber(tx) === INVALID_TX) {
@@ -150,30 +171,17 @@ export class TxValidator {
     return VALID_TX;
   }
 
-  async #validateFee(tx: Tx): Promise<TxValidationStatus> {
+  async #validateGasBalance(tx: Tx): Promise<TxValidationStatus> {
     if (!tx.data.needsTeardown) {
-      // TODO check if fees are mandatory and reject this tx
-      this.#log.debug(`Tx ${Tx.getHash(tx)} doesn't pay for gas`);
       return VALID_TX;
     }
 
-    const {
-      // TODO what if there's more than one function call?
-      // if we're to enshrine that teardown = 1 function call, then we should turn this into a single function call
-      [PublicKernelPhase.TEARDOWN]: [teardownFn],
-    } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls);
-
-    if (!teardownFn) {
-      this.#log.warn(
-        `Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has no enqueued teardown function call`,
-      );
-      return INVALID_TX;
-    }
+    const teardownFn = TxValidator.#extractFeeExecutionCall(tx)!;
 
     // TODO(#1204) if a generator index is used for the derived storage slot of a map, update it here as well
-    const slot = pedersenHash([GAS_TOKEN_BALANCES_SLOT.toBuffer(), teardownFn.callContext.msgSender.toBuffer()]);
+    const slot = pedersenHash([GAS_TOKEN_BALANCES_SLOT, teardownFn.callContext.msgSender]);
     const gasBalance = await this.#publicStateSource.storageRead(
-      getCanonicalGasTokenAddress(this.#gasPortalAddress),
+      getCanonicalGasTokenAddress(this.#feeValidationConfig.gasPortalAddress),
       slot,
     );
 
@@ -201,4 +209,55 @@ export class TxValidator {
       return VALID_TX;
     }
   }
+
+  async #validateFee(tx: Tx): Promise<TxValidationStatus> {
+    if (!tx.data.needsTeardown) {
+      // TODO check if fees are mandatory and reject this tx
+      this.#log.debug(`Tx ${Tx.getHash(tx)} doesn't pay for gas`);
+      return VALID_TX;
+    }
+
+    const teardownFn = TxValidator.#extractFeeExecutionCall(tx);
+    if (!teardownFn) {
+      this.#log.warn(
+        `Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has no enqueued teardown function call`,
+      );
+      return INVALID_TX;
+    }
+
+    const fpcAddress = teardownFn.contractAddress;
+    const contractClass = await this.#contractDataSource.getContract(fpcAddress);
+
+    if (!contractClass) {
+      return INVALID_TX;
+    }
+
+    if (fpcAddress.equals(getCanonicalGasTokenAddress(this.#feeValidationConfig.gasPortalAddress))) {
+      return VALID_TX;
+    }
+
+    for (const allowedContract of this.#feeValidationConfig.allowedFeePaymentContractInstances) {
+      if (fpcAddress.equals(allowedContract)) {
+        return VALID_TX;
+      }
+    }
+
+    for (const allowedContractClass of this.#feeValidationConfig.allowedFeePaymentContractClasses) {
+      if (contractClass.contractClassId.equals(allowedContractClass)) {
+        return VALID_TX;
+      }
+    }
+
+    return INVALID_TX;
+  }
+
+  static #extractFeeExecutionCall(tx: Tx): PublicCallRequest | undefined {
+    const {
+      // TODO what if there's more than one function call?
+      // if we're to enshrine that teardown = 1 function call, then we should turn this into a single function call
+      [PublicKernelPhase.TEARDOWN]: [teardownFn],
+    } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls);
+
+    return teardownFn;
+  }
 }

package/src/sequencer/tx_validator_factory.ts

@@ -0,0 +1,32 @@
+import { type AztecAddress, type EthAddress, type Fr, type GlobalVariables } from '@aztec/circuits.js';
+import { type ContractDataSource } from '@aztec/types/contracts';
+import { type MerkleTreeOperations } from '@aztec/world-state';
+
+import { WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
+import { TxValidator } from './tx_validator.js';
+
+export class TxValidatorFactory {
+  constructor(
+    private merkleTreeDb: MerkleTreeOperations,
+    private contractDataSource: ContractDataSource,
+    private gasPortalAddress: EthAddress,
+  ) {}
+
+  buildTxValidator(
+    globalVariables: GlobalVariables,
+    allowedFeePaymentContractClasses: Fr[],
+    allowedFeePaymentContractInstances: AztecAddress[],
+  ): TxValidator {
+    return new TxValidator(
+      new WorldStateDB(this.merkleTreeDb),
+      new WorldStatePublicDB(this.merkleTreeDb),
+      this.contractDataSource,
+      globalVariables,
+      {
+        allowedFeePaymentContractClasses,
+        allowedFeePaymentContractInstances,
+        gasPortalAddress: this.gasPortalAddress,
+      },
+    );
+  }
+}

package/src/sequencer/utils.ts

@@ -1,4 +1,4 @@
-import { Tx } from '@aztec/circuit-types';
+import { type Tx } from '@aztec/circuit-types';
 import { CallRequest } from '@aztec/circuits.js';
 
 /**

package/src/simulator/index.ts

@@ -1,7 +1,7 @@
 import {
-  PublicKernelCircuitPrivateInputs,
-  PublicKernelCircuitPublicInputs,
-  PublicKernelTailCircuitPrivateInputs,
+  type PublicKernelCircuitPrivateInputs,
+  type PublicKernelCircuitPublicInputs,
+  type PublicKernelTailCircuitPrivateInputs,
 } from '@aztec/circuits.js';
 
 /**