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

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),
   );
 }