@aztec/sequencer-client 0.40.1 → 0.42.0

package/src/tx_validator/phases_validator.ts

@@ -1,24 +1,34 @@
 import { type AllowedFunction, Tx, type TxValidator } from '@aztec/circuit-types';
 import { type PublicCallRequest } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AbstractPhaseManager, PublicKernelPhase } from '@aztec/simulator';
+import { AbstractPhaseManager, ContractsDataSourcePublicDB, PublicKernelPhase } 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(private contractDataSource: ContractDataSource, private setupAllowList: AllowedFunction[]) {}
+  constructor(contracts: ContractDataSource, private setupAllowList: AllowedFunction[]) {
+    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) {
+      // 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);
       }
+
+      await this.contractDataSource.removeNewContracts(tx);
     }
 
     return Promise.resolve([validTxs, invalidTxs]);
@@ -37,7 +47,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
         this.#log.warn(
           `Rejecting tx ${Tx.getHash(tx)} because it calls setup function not on allow list: ${
             setupFn.contractAddress
-          }:${setupFn.functionData.selector}`,
+          }:${setupFn.functionSelector}`,
         );
 
         return false;
@@ -52,10 +62,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       return true;
     }
 
-    const {
-      contractAddress,
-      functionData: { selector },
-    } = publicCall;
+    const { contractAddress, functionSelector } = publicCall;
 
     // do these checks first since they don't require the contract class
     for (const entry of allowList) {
@@ -63,12 +70,12 @@ export class PhasesTxValidator implements TxValidator<Tx> {
         continue;
       }
 
-      if (contractAddress.equals(entry.address) && entry.selector.equals(selector)) {
+      if (contractAddress.equals(entry.address) && entry.selector.equals(functionSelector)) {
         return true;
       }
     }
 
-    const contractClass = await this.contractDataSource.getContract(contractAddress);
+    const contractClass = await this.contractDataSource.getContractInstance(contractAddress);
     if (!contractClass) {
       throw new Error(`Contract not found: ${publicCall.contractAddress.toString()}`);
     }
@@ -78,7 +85,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
         continue;
       }
 
-      if (contractClass.contractClassId.equals(entry.classId) && entry.selector.equals(selector)) {
+      if (contractClass.contractClassId.equals(entry.classId) && entry.selector.equals(functionSelector)) {
         return true;
       }
     }

package/src/tx_validator/test_utils.ts

@@ -0,0 +1,37 @@
+import { type Tx } from '@aztec/circuit-types';
+import { type AztecAddress, type Fr, type FunctionSelector } from '@aztec/circuits.js';
+
+export function patchNonRevertibleFn(
+  tx: Tx,
+  index: number,
+  overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
+): { address: AztecAddress; selector: FunctionSelector } {
+  return patchFn('endNonRevertibleData', tx, index, overrides);
+}
+
+export function patchRevertibleFn(
+  tx: Tx,
+  index: number,
+  overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
+): { address: AztecAddress; selector: FunctionSelector } {
+  return patchFn('end', tx, index, overrides);
+}
+
+function patchFn(
+  where: 'end' | 'endNonRevertibleData',
+  tx: Tx,
+  index: number,
+  overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
+): { address: AztecAddress; selector: FunctionSelector } {
+  const fn = tx.enqueuedPublicFunctionCalls.at(-1 * index - 1)!;
+  fn.contractAddress = overrides.address ?? fn.contractAddress;
+  fn.functionSelector = overrides.selector;
+  fn.args = overrides.args ?? fn.args;
+  fn.callContext.msgSender = overrides.msgSender ?? fn.callContext.msgSender;
+  tx.data.forPublic![where].publicCallStack[index] = fn.toCallRequest();
+
+  return {
+    address: fn.contractAddress,
+    selector: fn.functionSelector,
+  };
+}

package/src/tx_validator/tx_validator_factory.ts

@@ -1,6 +1,6 @@
 import { type AllowedFunction, type ProcessedTx, type Tx, type TxValidator } from '@aztec/circuit-types';
-import { type EthAddress, type GlobalVariables } from '@aztec/circuits.js';
-import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { type GlobalVariables } from '@aztec/circuits.js';
+import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 import { WorldStateDB, WorldStatePublicDB } from '@aztec/simulator';
 import { type ContractDataSource } from '@aztec/types/contracts';
 import { type MerkleTreeOperations } from '@aztec/world-state';
@@ -12,18 +12,14 @@ import { MetadataTxValidator } from './metadata_validator.js';
 import { PhasesTxValidator } from './phases_validator.js';
 
 export class TxValidatorFactory {
-  constructor(
-    private merkleTreeDb: MerkleTreeOperations,
-    private contractDataSource: ContractDataSource,
-    private gasPortalAddress: EthAddress,
-  ) {}
+  constructor(private merkleTreeDb: MerkleTreeOperations, private contractDataSource: ContractDataSource) {}
 
   validatorForNewTxs(globalVariables: GlobalVariables, setupAllowList: AllowedFunction[]): 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), getCanonicalGasTokenAddress(this.gasPortalAddress)),
+      new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), GasTokenAddress),
     );
   }