@aztec/sequencer-client 0.76.4-devnet-test-rc3 → 0.77.0-testnet-ignition.17

package/src/sequencer/sequencer.ts

@@ -1,47 +1,47 @@
+import type { L2Block } from '@aztec/aztec.js';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { omit } from '@aztec/foundation/collection';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { Signature } from '@aztec/foundation/eth-signature';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/running-promise';
+import { type DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
+import type { P2P } from '@aztec/p2p';
+import type { BlockBuilderFactory } from '@aztec/prover-client/block-builder';
+import type { PublicProcessorFactory } from '@aztec/simulator/server';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { Gas } from '@aztec/stdlib/gas';
 import {
-  type EpochProofQuote,
-  type L1RollupConstants,
-  type L1ToL2MessageSource,
-  type L2Block,
-  type L2BlockSource,
+  type AllowedElement,
   SequencerConfigSchema,
-  Tx,
-  type TxHash,
   type WorldStateSynchronizer,
-} from '@aztec/circuit-types';
-import type { AllowedElement, Signature, WorldStateSynchronizerStatus } from '@aztec/circuit-types/interfaces';
-import { type L2BlockBuiltStats } from '@aztec/circuit-types/stats';
+  type WorldStateSynchronizerStatus,
+} from '@aztec/stdlib/interfaces/server';
+import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import { pickFromSchema } from '@aztec/stdlib/schemas';
+import type { L2BlockBuiltStats } from '@aztec/stdlib/stats';
+import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
 import {
-  AppendOnlyTreeSnapshot,
   BlockHeader,
   ContentCommitment,
-  type ContractDataSource,
-  GENESIS_ARCHIVE_ROOT,
-  Gas,
   type GlobalVariables,
-  INITIAL_L2_BLOCK_NUM,
   StateReference,
-} from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { omit } from '@aztec/foundation/collection';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
-import { pickFromSchema } from '@aztec/foundation/schemas';
-import { type DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
-import { type P2P } from '@aztec/p2p';
-import { type BlockBuilderFactory } from '@aztec/prover-client/block-builder';
-import { type PublicProcessorFactory } from '@aztec/simulator/server';
+  Tx,
+  type TxHash,
+} from '@aztec/stdlib/tx';
 import { Attributes, type TelemetryClient, type Tracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
-import { type ValidatorClient } from '@aztec/validator-client';
+import type { ValidatorClient } from '@aztec/validator-client';
 
-import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
+import type { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { type SequencerPublisher, VoteType } from '../publisher/sequencer-publisher.js';
-import { type SlasherClient } from '../slasher/slasher_client.js';
+import type { SlasherClient } from '../slasher/slasher_client.js';
 import { createValidatorsForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
 import { getDefaultAllowedSetupFunctions } from './allowed.js';
-import { type SequencerConfig } from './config.js';
+import type { SequencerConfig } from './config.js';
 import { SequencerMetrics } from './metrics.js';
 import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
 import { SequencerState, orderAttestations } from './utils.js';
@@ -272,9 +272,6 @@ export class Sequencer {
       VoteType.SLASHING,
     );
 
-    // Start collecting proof quotes for the previous epoch if needed in the background
-    const createProofQuotePromise = this.createProofClaimForPreviousEpoch(slot);
-
     this.setState(SequencerState.INITIALIZING_PROPOSAL, slot);
     this.log.verbose(`Preparing proposal for block ${newBlockNumber} at slot ${slot}`, {
       chainTipArchive,
@@ -315,11 +312,6 @@ export class Sequencer {
     await enqueueSlashingVotePromise.catch(err => {
       this.log.error(`Error enqueuing slashing vote`, err, { blockNumber: newBlockNumber, slot });
     });
-    await createProofQuotePromise
-      .then(quote => (quote ? this.publisher.enqueueClaimEpochProofRight(quote) : undefined))
-      .catch(err => {
-        this.log.error(`Error creating proof quote`, err, { blockNumber: newBlockNumber, slot });
-      });
 
     await this.publisher.sendRequests();
 
@@ -460,7 +452,6 @@ export class Sequencer {
         publicProcessorFork,
         this.contractDataSource,
         newGlobalVariables,
-        !!this.config.enforceFees,
         this.allowedInSetup,
       );
 
@@ -658,54 +649,6 @@ export class Sequencer {
     return orderAttestations(attestations, committee);
   }
 
-  protected async createProofClaimForPreviousEpoch(slotNumber: bigint): Promise<EpochProofQuote | undefined> {
-    try {
-      // Find out which epoch we are currently in
-      const epochToProve = await this.publisher.getClaimableEpoch();
-
-      if (epochToProve === undefined) {
-        this.log.trace(`No epoch to claim at slot ${slotNumber}`);
-        return undefined;
-      }
-
-      // Get quotes for the epoch to be proven
-      this.log.debug(`Collecting proof quotes for epoch ${epochToProve}`);
-      const p2pQuotes = await this.p2pClient
-        .getEpochProofQuotes(epochToProve)
-        .then(quotes =>
-          quotes
-            .filter(x => x.payload.validUntilSlot >= slotNumber)
-            .filter(x => x.payload.epochToProve === epochToProve),
-        );
-      this.log.verbose(`Retrieved ${p2pQuotes.length} quotes for slot ${slotNumber} epoch ${epochToProve}`, {
-        epochToProve,
-        slotNumber,
-        quotes: p2pQuotes.map(q => q.payload),
-      });
-      if (!p2pQuotes.length) {
-        return undefined;
-      }
-
-      // ensure these quotes are still valid for the slot and have the contract validate them
-      const validQuotes = await this.publisher.filterValidQuotes(p2pQuotes);
-
-      if (!validQuotes.length) {
-        this.log.warn(`Failed to find any valid proof quotes`);
-        return undefined;
-      }
-      // pick the quote with the lowest fee
-      const sortedQuotes = validQuotes.sort(
-        (a: EpochProofQuote, b: EpochProofQuote) => a.payload.basisPointFee - b.payload.basisPointFee,
-      );
-      const quote = sortedQuotes[0];
-      this.log.info(`Selected proof quote for proof claim`, { quote: quote.toInspect() });
-      return quote;
-    } catch (err) {
-      this.log.error(`Failed to create proof claim for previous epoch`, err, { slotNumber });
-      return undefined;
-    }
-  }
-
   /**
    * Publishes the L2Block to the rollup contract.
    * @param block - The L2Block to be published.
@@ -734,29 +677,6 @@ export class Sequencer {
     }
   }
 
-  @trackSpan(
-    'Sequencer.claimEpochProofRightIfAvailable',
-    slotNumber => ({ [Attributes.SLOT_NUMBER]: Number(slotNumber) }),
-    epoch => ({ [Attributes.EPOCH_NUMBER]: Number(epoch) }),
-  )
-  /** Collects an epoch proof quote if there is an epoch to prove, and submits it to the L1 contract. */
-  protected async claimEpochProofRightIfAvailable(slotNumber: bigint) {
-    const proofQuote = await this.createProofClaimForPreviousEpoch(slotNumber);
-    if (proofQuote === undefined) {
-      return;
-    }
-
-    const epoch = proofQuote.payload.epochToProve;
-    const ctx = { slotNumber, epoch, quote: proofQuote.toInspect() };
-    this.log.verbose(`Claiming proof right for epoch ${epoch}`, ctx);
-    const enqueued = this.publisher.enqueueClaimEpochProofRight(proofQuote);
-    if (!enqueued) {
-      throw new Error(`Failed to enqueue claim of proof right for epoch ${epoch}`);
-    }
-    this.log.info(`Enqueued claim of proof right for epoch ${epoch}`, ctx);
-    return epoch;
-  }
-
   /**
    * Returns whether all dependencies have caught up.
    * We don't check against the previous block submitted since it may have been reorg'd out.
@@ -764,7 +684,12 @@ export class Sequencer {
    */
   protected async getChainTip(): Promise<{ blockNumber: number; archive: Fr } | undefined> {
     const syncedBlocks = await Promise.all([
-      this.worldState.status().then((s: WorldStateSynchronizerStatus) => s.syncedToL2Block),
+      this.worldState.status().then((s: WorldStateSynchronizerStatus) => {
+        return {
+          number: s.syncSummary.latestBlockNumber,
+          hash: s.syncSummary.latestBlockHash,
+        };
+      }),
       this.l2BlockSource.getL2Tips().then(t => t.latest),
       this.p2pClient.getStatus().then(p2p => p2p.syncedToL2Block),
       this.l1ToL2MessageSource.getBlockNumber(),
@@ -806,7 +731,8 @@ export class Sequencer {
 
       return { blockNumber: block.number, archive: block.archive.root };
     } else {
-      return { blockNumber: INITIAL_L2_BLOCK_NUM - 1, archive: new Fr(GENESIS_ARCHIVE_ROOT) };
+      const archive = new Fr((await this.worldState.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
+      return { blockNumber: INITIAL_L2_BLOCK_NUM - 1, archive };
     }
   }
 

package/src/sequencer/timetable.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/aztec.js';
 
-import { type SequencerMetrics } from './metrics.js';
+import type { SequencerMetrics } from './metrics.js';
 import { SequencerState } from './utils.js';
 
 export class SequencerTimetable {

package/src/sequencer/utils.ts

@@ -1,5 +1,6 @@
-import type { BlockAttestation, EthAddress } from '@aztec/circuit-types';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
+import type { BlockAttestation } from '@aztec/stdlib/p2p';
 
 export enum SequencerState {
   /**

package/src/slasher/factory.ts

@@ -1,13 +1,13 @@
-import type { L2BlockSource } from '@aztec/circuit-types';
-import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
+import type { L1ContractsConfig, L1ReaderConfig } from '@aztec/ethereum';
 import { createLogger } from '@aztec/foundation/log';
-import { type AztecAsyncKVStore } from '@aztec/kv-store';
-import { type DataStoreConfig } from '@aztec/kv-store/config';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
+import type { L2BlockSource } from '@aztec/stdlib/block';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { SlasherClient } from './slasher_client.js';
-import { type SlasherConfig } from './slasher_client.js';
+import type { SlasherConfig } from './slasher_client.js';
 
 export const createSlasherClient = async (
   _config: SlasherConfig & DataStoreConfig & L1ContractsConfig & L1ReaderConfig,

package/src/slasher/slasher_client.ts

@@ -1,3 +1,14 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import {
+  type L1ContractsConfig,
+  type L1ReaderConfig,
+  type ViemPublicClient,
+  createEthereumChain,
+} from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
+import { SlashFactoryAbi } from '@aztec/l1-artifacts';
 import {
   type L2Block,
   type L2BlockId,
@@ -5,25 +16,10 @@ import {
   L2BlockStream,
   type L2BlockStreamEvent,
   type L2Tips,
-} from '@aztec/circuit-types';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
-import { type L1ContractsConfig, type L1ReaderConfig, createEthereumChain } from '@aztec/ethereum';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { createLogger } from '@aztec/foundation/log';
-import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
-import { SlashFactoryAbi } from '@aztec/l1-artifacts';
+} from '@aztec/stdlib/block';
 import { type TelemetryClient, WithTracer, getTelemetryClient } from '@aztec/telemetry-client';
 
-import {
-  type Chain,
-  type GetContractReturnType,
-  type HttpTransport,
-  type PublicClient,
-  createPublicClient,
-  getAddress,
-  getContract,
-  http,
-} from 'viem';
+import { type GetContractReturnType, createPublicClient, fallback, getAddress, getContract, http } from 'viem';
 
 /**
  * Enum defining the possible states of the Slasher client.
@@ -100,8 +96,7 @@ export class SlasherClient extends WithTracer {
 
   private slashEvents: SlashEvent[] = [];
 
-  protected slashFactoryContract?: GetContractReturnType<typeof SlashFactoryAbi, PublicClient<HttpTransport, Chain>> =
-    undefined;
+  protected slashFactoryContract?: GetContractReturnType<typeof SlashFactoryAbi, ViemPublicClient> = undefined;
 
   // The amount to slash for a prune.
   // Note that we set it to 0, such that no actual slashing will happen, but the event will be fired,
@@ -127,10 +122,10 @@ export class SlasherClient extends WithTracer {
     this.synchedProvenBlockNumber = store.openSingleton('slasher_last_proven_l2_block');
 
     if (config.l1Contracts.slashFactoryAddress && config.l1Contracts.slashFactoryAddress !== EthAddress.ZERO) {
-      const chain = createEthereumChain(config.l1RpcUrl, config.l1ChainId);
+      const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
       const publicClient = createPublicClient({
         chain: chain.chainInfo,
-        transport: http(chain.rpcUrl),
+        transport: fallback(chain.rpcUrls.map(url => http(url))),
         pollingInterval: config.viemPollingIntervalMS,
       });
 

package/src/test/index.ts

@@ -1,9 +1,9 @@
-import { type PublicProcessorFactory } from '@aztec/simulator/server';
+import type { PublicProcessorFactory } from '@aztec/simulator/server';
 
 import { SequencerClient } from '../client/sequencer-client.js';
-import { type SequencerPublisher } from '../publisher/sequencer-publisher.js';
+import type { SequencerPublisher } from '../publisher/sequencer-publisher.js';
 import { Sequencer } from '../sequencer/sequencer.js';
-import { type SequencerTimetable } from '../sequencer/timetable.js';
+import type { SequencerTimetable } from '../sequencer/timetable.js';
 
 class TestSequencer_ extends Sequencer {
   public override publicProcessorFactory!: PublicProcessorFactory;

package/src/tx_validator/archive_cache.ts

@@ -1,6 +1,7 @@
-import { MerkleTreeId, type MerkleTreeReadOperations } from '@aztec/circuit-types';
-import { type Fr } from '@aztec/circuits.js';
-import { type ArchiveSource } from '@aztec/p2p';
+import type { Fr } from '@aztec/foundation/fields';
+import type { ArchiveSource } from '@aztec/p2p';
+import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
 
 /**
  * Implements an archive source by checking a DB and an in-memory collection.

package/src/tx_validator/gas_validator.ts

@@ -1,8 +1,11 @@
-import { type Tx, TxExecutionPhase, type TxValidationResult, type TxValidator } from '@aztec/circuit-types';
-import { type AztecAddress, Fr, FunctionSelector, type GasFees } from '@aztec/circuits.js';
-import { U128 } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { computeFeePayerBalanceStorageSlot, getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
+import { getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasFees } from '@aztec/stdlib/gas';
+import { type Tx, TxExecutionPhase, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 
 /** Provides a view into public contract state */
 export interface PublicStateSource {
@@ -13,23 +16,16 @@ export class GasTxValidator implements TxValidator<Tx> {
   #log = createLogger('sequencer:tx_validator:tx_gas');
   #publicDataSource: PublicStateSource;
   #feeJuiceAddress: AztecAddress;
-  #enforceFees: boolean;
   #gasFees: GasFees;
 
-  constructor(
-    publicDataSource: PublicStateSource,
-    feeJuiceAddress: AztecAddress,
-    enforceFees: boolean,
-    gasFees: GasFees,
-  ) {
+  constructor(publicDataSource: PublicStateSource, feeJuiceAddress: AztecAddress, gasFees: GasFees) {
     this.#publicDataSource = publicDataSource;
     this.#feeJuiceAddress = feeJuiceAddress;
-    this.#enforceFees = enforceFees;
     this.#gasFees = gasFees;
   }
 
-  validateTx(tx: Tx): Promise<TxValidationResult> {
-    if (this.#shouldSkip(tx)) {
+  async validateTx(tx: Tx): Promise<TxValidationResult> {
+    if (await this.#shouldSkip(tx)) {
       return Promise.resolve({ result: 'skipped', reason: ['Insufficient fee per gas'] });
     }
     return this.#validateTxFee(tx);
@@ -37,11 +33,11 @@ export class GasTxValidator implements TxValidator<Tx> {
 
   /**
    * Check whether the tx's max fees are valid for the current block, and skip if not.
-   * We skip instead of invalidating since the tx may become elligible later.
+   * We skip instead of invalidating since the tx may become eligible later.
    * Note that circuits check max fees even if fee payer is unset, so we
    * keep this validation even if the tx does not pay fees.
    */
-  #shouldSkip(tx: Tx): boolean {
+  async #shouldSkip(tx: Tx): Promise<boolean> {
     const gasSettings = tx.data.constants.txContext.gasSettings;
 
     // Skip the tx if its max fees are not enough for the current block's gas fees.
@@ -51,22 +47,16 @@ export class GasTxValidator implements TxValidator<Tx> {
       maxFeesPerGas.feePerL2Gas.lt(this.#gasFees.feePerL2Gas);
 
     if (notEnoughMaxFees) {
-      this.#log.warn(`Skipping transaction ${tx.getTxHash()} due to insufficient fee per gas`);
+      this.#log.warn(`Skipping transaction ${await tx.getTxHash()} due to insufficient fee per gas`, {
+        txMaxFeesPerGas: maxFeesPerGas.toInspect(),
+        currentGasFees: this.#gasFees.toInspect(),
+      });
     }
     return notEnoughMaxFees;
   }
 
   async #validateTxFee(tx: Tx): Promise<TxValidationResult> {
     const feePayer = tx.data.feePayer;
-    // TODO(@spalladino) Eventually remove the is_zero condition as we should always charge fees to every tx
-    if (feePayer.isZero()) {
-      if (this.#enforceFees) {
-        this.#log.warn(`Rejecting transaction ${tx.getTxHash()} due to missing fee payer`);
-        return { result: 'invalid', reason: ['Missing fee payer'] };
-      } else {
-        return { result: 'valid' };
-      }
-    }
 
     // Compute the maximum fee that this tx may pay, based on its gasLimits and maxFeePerGas
     const feeLimit = tx.data.constants.txContext.gasSettings.getFeeLimit();
@@ -80,7 +70,7 @@ export class GasTxValidator implements TxValidator<Tx> {
     // If there is a claim in this tx that increases the fee payer balance in Fee Juice, add it to balance
     const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
     const increasePublicBalanceSelector = await FunctionSelector.fromSignature(
-      '_increase_public_balance((Field),(Field,Field))',
+      '_increase_public_balance((Field),u128)',
     );
     const claimFunctionCall = setupFns.find(
       fn =>
@@ -93,10 +83,11 @@ export class GasTxValidator implements TxValidator<Tx> {
         !fn.callContext.isStaticCall,
     );
 
-    // `amount` in the claim function call arguments occupies 2 fields as it is represented as U128.
-    const balance = claimFunctionCall
-      ? initialBalance.add(new Fr(U128.fromFields(claimFunctionCall.args.slice(2, 4)).toInteger()))
-      : initialBalance;
+    // The claim amount is at index 2 in the args array because:
+    // - Index 0: Target function selector (due to dispatch routing)
+    // - Index 1: Amount recipient
+    // - Index 2: Amount being claimed
+    const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[2]) : initialBalance;
     if (balance.lt(feeLimit)) {
       this.#log.warn(`Rejecting transaction due to not enough fee payer balance`, {
         feePayer,

package/src/tx_validator/nullifier_cache.ts

@@ -1,5 +1,6 @@
-import { MerkleTreeId, type MerkleTreeReadOperations } from '@aztec/circuit-types';
-import { type NullifierSource } from '@aztec/p2p';
+import type { NullifierSource } from '@aztec/p2p';
+import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
 
 /**
  * Implements a nullifier source by checking a DB and an in-memory collection.

package/src/tx_validator/phases_validator.ts

@@ -1,14 +1,14 @@
+import { createLogger } from '@aztec/foundation/log';
+import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
 import {
-  type AllowedElement,
   type PublicExecutionRequest,
   Tx,
   TxExecutionPhase,
   type TxValidationResult,
   type TxValidator,
-} from '@aztec/circuit-types';
-import { type ContractDataSource } from '@aztec/circuits.js';
-import { createLogger } from '@aztec/foundation/log';
-import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator/server';
+} from '@aztec/stdlib/tx';
 
 export class PhasesTxValidator implements TxValidator<Tx> {
   #log = createLogger('sequencer:tx_validator:tx_phases');
@@ -78,14 +78,14 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       }
 
       if ('classId' in entry && !('selector' in entry)) {
-        if (contractClass.contractClassId.equals(entry.classId)) {
+        if (contractClass.currentContractClassId.equals(entry.classId)) {
           return true;
         }
       }
 
       if ('classId' in entry && 'selector' in entry) {
         if (
-          contractClass.contractClassId.equals(entry.classId) &&
+          contractClass.currentContractClassId.equals(entry.classId) &&
           (entry.selector === undefined || entry.selector.equals(functionSelector))
         ) {
           return true;

package/src/tx_validator/test_utils.ts

@@ -1,6 +1,8 @@
-import { type Tx } from '@aztec/circuit-types';
-import { type AztecAddress, type Fr, type FunctionSelector } from '@aztec/circuits.js';
-import { computeVarArgsHash } from '@aztec/circuits.js/hash';
+import type { Fr } from '@aztec/foundation/fields';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { computeVarArgsHash } from '@aztec/stdlib/hash';
+import type { Tx } from '@aztec/stdlib/tx';
 
 export function patchNonRevertibleFn(
   tx: Tx,

package/src/tx_validator/tx_validator_factory.ts

@@ -1,12 +1,4 @@
-import {
-  type AllowedElement,
-  type ClientProtocolCircuitVerifier,
-  type MerkleTreeReadOperations,
-  type ProcessedTx,
-  type Tx,
-  type TxValidator,
-} from '@aztec/circuit-types';
-import { type AztecAddress, type ContractDataSource, Fr, type GasFees, type GlobalVariables } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
 import {
   AggregateTxValidator,
   BlockHeaderTxValidator,
@@ -17,6 +9,15 @@ import {
 } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { readPublicState } from '@aztec/simulator/server';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { GasFees } from '@aztec/stdlib/gas';
+import type {
+  AllowedElement,
+  ClientProtocolCircuitVerifier,
+  MerkleTreeReadOperations,
+} from '@aztec/stdlib/interfaces/server';
+import { GlobalVariables, type ProcessedTx, type Tx, type TxValidator } from '@aztec/stdlib/tx';
 
 import { ArchiveCache } from './archive_cache.js';
 import { GasTxValidator, type PublicStateSource } from './gas_validator.js';
@@ -27,24 +28,32 @@ export function createValidatorForAcceptingTxs(
   db: MerkleTreeReadOperations,
   contractDataSource: ContractDataSource,
   verifier: ClientProtocolCircuitVerifier | undefined,
-  data: {
+  {
+    blockNumber,
+    l1ChainId,
+    setupAllowList,
+    gasFees,
+    skipFeeEnforcement,
+  }: {
     blockNumber: number;
     l1ChainId: number;
-    enforceFees: boolean;
     setupAllowList: AllowedElement[];
     gasFees: GasFees;
+    skipFeeEnforcement?: boolean;
   },
 ): TxValidator<Tx> {
-  const { blockNumber, l1ChainId, enforceFees, setupAllowList, gasFees } = data;
   const validators: TxValidator<Tx>[] = [
     new DataTxValidator(),
     new MetadataTxValidator(new Fr(l1ChainId), new Fr(blockNumber)),
     new DoubleSpendTxValidator(new NullifierCache(db)),
     new PhasesTxValidator(contractDataSource, setupAllowList),
-    new GasTxValidator(new DatabasePublicStateSource(db), ProtocolContractAddress.FeeJuice, enforceFees, gasFees),
     new BlockHeaderTxValidator(new ArchiveCache(db)),
   ];
 
+  if (!skipFeeEnforcement) {
+    validators.push(new GasTxValidator(new DatabasePublicStateSource(db), ProtocolContractAddress.FeeJuice, gasFees));
+  }
+
   if (verifier) {
     validators.push(new TxProofValidator(verifier));
   }
@@ -56,7 +65,6 @@ export function createValidatorsForBlockBuilding(
   db: MerkleTreeReadOperations,
   contractDataSource: ContractDataSource,
   globalVariables: GlobalVariables,
-  enforceFees: boolean,
   setupAllowList: AllowedElement[],
 ): {
   preprocessValidator: TxValidator<Tx>;
@@ -73,7 +81,6 @@ export function createValidatorsForBlockBuilding(
       archiveCache,
       publicStateSource,
       contractDataSource,
-      enforceFees,
       globalVariables,
       setupAllowList,
     ),
@@ -95,7 +102,6 @@ function preprocessValidator(
   archiveCache: ArchiveCache,
   publicStateSource: PublicStateSource,
   contractDataSource: ContractDataSource,
-  enforceFees: boolean,
   globalVariables: GlobalVariables,
   setupAllowList: AllowedElement[],
 ): TxValidator<Tx> {
@@ -104,7 +110,7 @@ function preprocessValidator(
     new MetadataTxValidator(globalVariables.chainId, globalVariables.blockNumber),
     new DoubleSpendTxValidator(nullifierCache),
     new PhasesTxValidator(contractDataSource, setupAllowList),
-    new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, enforceFees, globalVariables.gasFees),
+    new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees),
     new BlockHeaderTxValidator(archiveCache),
   );
 }