@aztec/sequencer-client 0.42.0 → 0.43.0

package/src/tx_validator/phases_validator.ts

@@ -1,14 +1,14 @@
-import { type AllowedFunction, Tx, type TxValidator } from '@aztec/circuit-types';
+import { type AllowedElement, PublicKernelType, Tx, type TxValidator } from '@aztec/circuit-types';
 import { type PublicCallRequest } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AbstractPhaseManager, ContractsDataSourcePublicDB, PublicKernelPhase } from '@aztec/simulator';
+import { AbstractPhaseManager, ContractsDataSourcePublicDB } from '@aztec/simulator';
 import { type ContractDataSource } from '@aztec/types/contracts';
 
 export class PhasesTxValidator implements TxValidator<Tx> {
   #log = createDebugLogger('aztec:sequencer:tx_validator:tx_phases');
   private contractDataSource: ContractsDataSourcePublicDB;
 
-  constructor(contracts: ContractDataSource, private setupAllowList: AllowedFunction[]) {
+  constructor(contracts: ContractDataSource, private setupAllowList: AllowedElement[]) {
     this.contractDataSource = new ContractsDataSourcePublicDB(contracts);
   }
 
@@ -40,7 +40,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       return true;
     }
 
-    const { [PublicKernelPhase.SETUP]: setupFns } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx);
+    const { [PublicKernelType.SETUP]: setupFns } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx);
 
     for (const setupFn of setupFns) {
       if (!(await this.isOnAllowList(setupFn, this.setupAllowList))) {
@@ -57,7 +57,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
     return true;
   }
 
-  async isOnAllowList(publicCall: PublicCallRequest, allowList: AllowedFunction[]): Promise<boolean> {
+  async isOnAllowList(publicCall: PublicCallRequest, allowList: AllowedElement[]): Promise<boolean> {
     if (publicCall.isEmpty()) {
       return true;
     }
@@ -66,27 +66,37 @@ export class PhasesTxValidator implements TxValidator<Tx> {
 
     // do these checks first since they don't require the contract class
     for (const entry of allowList) {
-      if (!('address' in entry)) {
-        continue;
+      if ('address' in entry && !('selector' in entry)) {
+        if (contractAddress.equals(entry.address)) {
+          return true;
+        }
       }
 
-      if (contractAddress.equals(entry.address) && entry.selector.equals(functionSelector)) {
-        return true;
+      if ('address' in entry && 'selector' in entry) {
+        if (contractAddress.equals(entry.address) && entry.selector.equals(functionSelector)) {
+          return true;
+        }
       }
-    }
 
-    const contractClass = await this.contractDataSource.getContractInstance(contractAddress);
-    if (!contractClass) {
-      throw new Error(`Contract not found: ${publicCall.contractAddress.toString()}`);
-    }
+      const contractClass = await this.contractDataSource.getContractInstance(contractAddress);
 
-    for (const entry of allowList) {
-      if (!('classId' in entry)) {
-        continue;
+      if (!contractClass) {
+        throw new Error(`Contract not found: ${publicCall.contractAddress.toString()}`);
+      }
+
+      if ('classId' in entry && !('selector' in entry)) {
+        if (contractClass.contractClassId.equals(entry.classId)) {
+          return true;
+        }
       }
 
-      if (contractClass.contractClassId.equals(entry.classId) && entry.selector.equals(functionSelector)) {
-        return true;
+      if ('classId' in entry && 'selector' in entry) {
+        if (
+          contractClass.contractClassId.equals(entry.classId) &&
+          (entry.selector === undefined || entry.selector.equals(functionSelector))
+        ) {
+          return true;
+        }
       }
     }
 

package/src/tx_validator/tx_validator_factory.ts

@@ -1,4 +1,4 @@
-import { type AllowedFunction, type ProcessedTx, type Tx, type TxValidator } from '@aztec/circuit-types';
+import { type AllowedElement, type ProcessedTx, type Tx, type TxValidator } from '@aztec/circuit-types';
 import { type GlobalVariables } from '@aztec/circuits.js';
 import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 import { WorldStateDB, WorldStatePublicDB } from '@aztec/simulator';
@@ -12,14 +12,18 @@ import { MetadataTxValidator } from './metadata_validator.js';
 import { PhasesTxValidator } from './phases_validator.js';
 
 export class TxValidatorFactory {
-  constructor(private merkleTreeDb: MerkleTreeOperations, private contractDataSource: ContractDataSource) {}
+  constructor(
+    private merkleTreeDb: MerkleTreeOperations,
+    private contractDataSource: ContractDataSource,
+    private enforceFees: boolean,
+  ) {}
 
-  validatorForNewTxs(globalVariables: GlobalVariables, setupAllowList: AllowedFunction[]): TxValidator<Tx> {
+  validatorForNewTxs(globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): TxValidator<Tx> {
     return new AggregateTxValidator(
       new MetadataTxValidator(globalVariables),
       new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb)),
       new PhasesTxValidator(this.contractDataSource, setupAllowList),
-      new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), GasTokenAddress),
+      new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), GasTokenAddress, this.enforceFees),
     );
   }