@aztec/sequencer-client 0.69.0-devnet → 0.69.1-devnet

package/src/tx_validator/phases_validator.ts

@@ -3,6 +3,7 @@ import {
   type PublicExecutionRequest,
   Tx,
   TxExecutionPhase,
+  type TxValidationResult,
   type TxValidator,
 } from '@aztec/circuit-types';
 import { type ContractDataSource } from '@aztec/circuits.js';
@@ -17,48 +18,36 @@ export class PhasesTxValidator implements TxValidator<Tx> {
     this.contractDataSource = new ContractsDataSourcePublicDB(contracts);
   }
 
-  async validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]> {
-    const validTxs: Tx[] = [];
-    const invalidTxs: Tx[] = [];
-
-    for (const tx of txs) {
+  async validateTx(tx: Tx): Promise<TxValidationResult> {
+    try {
       // TODO(@spalladino): We add this just to handle public authwit-check calls during setup
       // which are needed for public FPC flows, but fail if the account contract hasnt been deployed yet,
       // which is what we're trying to do as part of the current txs.
       await this.contractDataSource.addNewContracts(tx);
 
-      if (await this.validateTx(tx)) {
-        validTxs.push(tx);
-      } else {
-        invalidTxs.push(tx);
+      if (!tx.data.forPublic) {
+        this.#log.debug(`Tx ${Tx.getHash(tx)} does not contain enqueued public functions. Skipping phases validation.`);
+        return { result: 'valid' };
       }
 
-      await this.contractDataSource.removeNewContracts(tx);
-    }
-
-    return Promise.resolve([validTxs, invalidTxs]);
-  }
-
-  async validateTx(tx: Tx): Promise<boolean> {
-    if (!tx.data.forPublic) {
-      this.#log.debug(`Tx ${Tx.getHash(tx)} does not contain enqueued public functions. Skipping phases validation.`);
-      return true;
-    }
-
-    const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
-    for (const setupFn of setupFns) {
-      if (!(await this.isOnAllowList(setupFn, this.setupAllowList))) {
-        this.#log.warn(
-          `Rejecting tx ${Tx.getHash(tx)} because it calls setup function not on allow list: ${
-            setupFn.callContext.contractAddress
-          }:${setupFn.callContext.functionSelector}`,
-        );
-
-        return false;
+      const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
+      for (const setupFn of setupFns) {
+        if (!(await this.isOnAllowList(setupFn, this.setupAllowList))) {
+          this.#log.warn(
+            `Rejecting tx ${Tx.getHash(tx)} because it calls setup function not on allow list: ${
+              setupFn.callContext.contractAddress
+            }:${setupFn.callContext.functionSelector}`,
+            { allowList: this.setupAllowList },
+          );
+
+          return { result: 'invalid', reason: ['Setup function not on allow list'] };
+        }
       }
-    }
 
-    return true;
+      return { result: 'valid' };
+    } finally {
+      await this.contractDataSource.removeNewContracts(tx);
+    }
   }
 
   async isOnAllowList(publicCall: PublicExecutionRequest, allowList: AllowedElement[]): Promise<boolean> {

package/src/tx_validator/tx_validator_factory.ts

@@ -1,65 +1,114 @@
 import {
   type AllowedElement,
-  MerkleTreeId,
+  type ClientProtocolCircuitVerifier,
   type MerkleTreeReadOperations,
   type ProcessedTx,
   type Tx,
   type TxValidator,
 } from '@aztec/circuit-types';
-import { type ContractDataSource, type GlobalVariables } from '@aztec/circuits.js';
+import { type AztecAddress, type ContractDataSource, Fr, type GasFees, type GlobalVariables } from '@aztec/circuits.js';
 import {
   AggregateTxValidator,
+  BlockHeaderTxValidator,
   DataTxValidator,
   DoubleSpendTxValidator,
   MetadataTxValidator,
-  type NullifierSource,
+  TxProofValidator,
 } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { readPublicState } from '@aztec/simulator';
 
+import { ArchiveCache } from './archive_cache.js';
 import { GasTxValidator, type PublicStateSource } from './gas_validator.js';
+import { NullifierCache } from './nullifier_cache.js';
 import { PhasesTxValidator } from './phases_validator.js';
 
-export class TxValidatorFactory {
-  nullifierSource: NullifierSource;
-  publicStateSource: PublicStateSource;
-  constructor(
-    private committedDb: MerkleTreeReadOperations,
-    private contractDataSource: ContractDataSource,
-    private enforceFees: boolean,
-  ) {
-    this.nullifierSource = {
-      getNullifierIndices: nullifiers =>
-        this.committedDb
-          .findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers)
-          .then(x => x.filter(index => index !== undefined) as bigint[]),
-    };
+export function createValidatorForAcceptingTxs(
+  db: MerkleTreeReadOperations,
+  contractDataSource: ContractDataSource,
+  verifier: ClientProtocolCircuitVerifier | undefined,
+  data: {
+    blockNumber: number;
+    l1ChainId: number;
+    enforceFees: boolean;
+    setupAllowList: AllowedElement[];
+    gasFees: GasFees;
+  },
+): 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)),
+  ];
 
-    this.publicStateSource = {
-      storageRead: (contractAddress, slot) => {
-        return readPublicState(this.committedDb, contractAddress, slot);
-      },
-    };
+  if (verifier) {
+    validators.push(new TxProofValidator(verifier));
   }
 
-  validatorForNewTxs(globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): TxValidator<Tx> {
-    return new AggregateTxValidator(
-      new DataTxValidator(),
-      new MetadataTxValidator(globalVariables.chainId, globalVariables.blockNumber),
-      new DoubleSpendTxValidator(this.nullifierSource),
-      new PhasesTxValidator(this.contractDataSource, setupAllowList),
-      new GasTxValidator(
-        this.publicStateSource,
-        ProtocolContractAddress.FeeJuice,
-        this.enforceFees,
-        globalVariables.gasFees,
-      ),
-    );
-  }
+  return new AggregateTxValidator(...validators);
+}
+
+export function createValidatorsForBlockBuilding(
+  db: MerkleTreeReadOperations,
+  contractDataSource: ContractDataSource,
+  globalVariables: GlobalVariables,
+  enforceFees: boolean,
+  setupAllowList: AllowedElement[],
+): {
+  preprocessValidator: TxValidator<Tx>;
+  postprocessValidator: TxValidator<ProcessedTx>;
+  nullifierCache: NullifierCache;
+} {
+  const nullifierCache = new NullifierCache(db);
+  const archiveCache = new ArchiveCache(db);
+  const publicStateSource = new DatabasePublicStateSource(db);
+
+  return {
+    preprocessValidator: preprocessValidator(
+      nullifierCache,
+      archiveCache,
+      publicStateSource,
+      contractDataSource,
+      enforceFees,
+      globalVariables,
+      setupAllowList,
+    ),
+    postprocessValidator: postprocessValidator(nullifierCache),
+    nullifierCache,
+  };
+}
 
-  validatorForProcessedTxs(fork: MerkleTreeReadOperations): TxValidator<ProcessedTx> {
-    return new DoubleSpendTxValidator({
-      getNullifierIndices: nullifiers => fork.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers),
-    });
+class DatabasePublicStateSource implements PublicStateSource {
+  constructor(private db: MerkleTreeReadOperations) {}
+
+  storageRead(contractAddress: AztecAddress, slot: Fr): Promise<Fr> {
+    return readPublicState(this.db, contractAddress, slot);
   }
 }
+
+function preprocessValidator(
+  nullifierCache: NullifierCache,
+  archiveCache: ArchiveCache,
+  publicStateSource: PublicStateSource,
+  contractDataSource: ContractDataSource,
+  enforceFees: boolean,
+  globalVariables: GlobalVariables,
+  setupAllowList: AllowedElement[],
+): TxValidator<Tx> {
+  // We don't include the TxProofValidator nor the DataTxValidator here because they are already checked by the time we get to block building.
+  return new AggregateTxValidator(
+    new MetadataTxValidator(globalVariables.chainId, globalVariables.blockNumber),
+    new DoubleSpendTxValidator(nullifierCache),
+    new PhasesTxValidator(contractDataSource, setupAllowList),
+    new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, enforceFees, globalVariables.gasFees),
+    new BlockHeaderTxValidator(archiveCache),
+  );
+}
+
+function postprocessValidator(nullifierCache: NullifierCache): TxValidator<ProcessedTx> {
+  return new DoubleSpendTxValidator(nullifierCache);
+}

package/dest/publisher/test-l1-publisher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test-l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/test-l1-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,MAAM,CAAC;AAEjG,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,eAAgB,SAAQ,WAAW;IACvC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;cAEjB,kBAAkB,CACnC,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,aAAa,GACnB,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,iBAAiB,CAAC;CAMzD"}

package/dest/publisher/test-l1-publisher.js

@@ -1,11 +0,0 @@
-import { withDelayer } from '@aztec/ethereum/test';
-import { L1Publisher } from './l1-publisher.js';
-export class TestL1Publisher extends L1Publisher {
-    createWalletClient(account, chain) {
-        const baseClient = super.createWalletClient(account, chain);
-        const { client, delayer } = withDelayer(baseClient, { ethereumSlotDuration: this.ethereumSlotDuration });
-        this.delayer = delayer;
-        return client;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC1sMS1wdWJsaXNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3Rlc3QtbDEtcHVibGlzaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBZ0IsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE1BQU0sT0FBTyxlQUFnQixTQUFRLFdBQVc7SUFHM0Isa0JBQWtCLENBQ25DLE9BQTBCLEVBQzFCLEtBQW9CO1FBRXBCLE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDNUQsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxXQUFXLENBQUMsVUFBVSxFQUFFLEVBQUUsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUMsQ0FBQztRQUN6RyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0NBQ0YifQ==

package/dest/publisher/utils.d.ts

@@ -1,2 +0,0 @@
-export declare function prettyLogViemErrorMsg(err: any): any;
-//# sourceMappingURL=utils.d.ts.map

package/dest/publisher/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/publisher/utils.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C"}

package/dest/publisher/utils.js

@@ -1,13 +0,0 @@
-import { BaseError, ContractFunctionRevertedError } from 'viem';
-export function prettyLogViemErrorMsg(err) {
-    if (err instanceof BaseError) {
-        const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
-        if (revertError instanceof ContractFunctionRevertedError) {
-            const errorName = revertError.data?.errorName ?? '';
-            const args = revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
-            return `${errorName}${args}`;
-        }
-    }
-    return err?.message ?? err;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEUsTUFBTSxVQUFVLHFCQUFxQixDQUFDLEdBQVE7SUFDNUMsSUFBSSxHQUFHLFlBQVksU0FBUyxFQUFFLENBQUM7UUFDN0IsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsWUFBWSw2QkFBNkIsQ0FBQyxDQUFDO1FBQ2xGLElBQUksV0FBVyxZQUFZLDZCQUE2QixFQUFFLENBQUM7WUFDekQsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxTQUFTLElBQUksRUFBRSxDQUFDO1lBQ3BELE1BQU0sSUFBSSxHQUNSLFdBQVcsQ0FBQyxZQUFZLElBQUksV0FBVyxDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDbEgsT0FBTyxHQUFHLFNBQVMsR0FBRyxJQUFJLEVBQUUsQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztJQUNELE9BQU8sR0FBRyxFQUFFLE9BQU8sSUFBSSxHQUFHLENBQUM7QUFDN0IsQ0FBQyJ9

package/src/publisher/utils.ts

@@ -1,14 +0,0 @@
-import { BaseError, ContractFunctionRevertedError } from 'viem';
-
-export function prettyLogViemErrorMsg(err: any) {
-  if (err instanceof BaseError) {
-    const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
-    if (revertError instanceof ContractFunctionRevertedError) {
-      const errorName = revertError.data?.errorName ?? '';
-      const args =
-        revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
-      return `${errorName}${args}`;
-    }
-  }
-  return err?.message ?? err;
-}