@aztec/sequencer-client 0.31.0 → 0.32.0

package/dest/sequencer/tx_validator.js

@@ -1,4 +1,4 @@
-var _TxValidator_instances, _TxValidator_log, _TxValidator_globalVariables, _TxValidator_nullifierSource, _TxValidator_publicStateSource, _TxValidator_gasPortalAddress, _TxValidator_validateMetadata, _TxValidator_validateNullifiers, _TxValidator_validateFee, _TxValidator_validateMaxBlockNumber;
+var _TxValidator_instances, _a, _TxValidator_log, _TxValidator_globalVariables, _TxValidator_nullifierSource, _TxValidator_publicStateSource, _TxValidator_contractDataSource, _TxValidator_feeValidationConfig, _TxValidator_validateMetadata, _TxValidator_validateNullifiers, _TxValidator_validateGasBalance, _TxValidator_validateMaxBlockNumber, _TxValidator_validateFee, _TxValidator_extractFeeExecutionCall;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { Tx } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
@@ -14,17 +14,19 @@ const INVALID_TX = Symbol('invalid_tx');
 // the storage slot associated with "storage.balances"
 const GAS_TOKEN_BALANCES_SLOT = new Fr(1);
 export class TxValidator {
-    constructor(nullifierSource, publicStateSource, gasPortalAddress, globalVariables, log = createDebugLogger('aztec:sequencer:tx_validator')) {
+    constructor(nullifierSource, publicStateSource, contractDataSource, globalVariables, feeValidationConfig, log = createDebugLogger('aztec:sequencer:tx_validator')) {
         _TxValidator_instances.add(this);
         _TxValidator_log.set(this, void 0);
         _TxValidator_globalVariables.set(this, void 0);
         _TxValidator_nullifierSource.set(this, void 0);
         _TxValidator_publicStateSource.set(this, void 0);
-        _TxValidator_gasPortalAddress.set(this, void 0);
+        _TxValidator_contractDataSource.set(this, void 0);
+        _TxValidator_feeValidationConfig.set(this, void 0);
         __classPrivateFieldSet(this, _TxValidator_nullifierSource, nullifierSource, "f");
-        __classPrivateFieldSet(this, _TxValidator_globalVariables, globalVariables, "f");
         __classPrivateFieldSet(this, _TxValidator_publicStateSource, publicStateSource, "f");
-        __classPrivateFieldSet(this, _TxValidator_gasPortalAddress, gasPortalAddress, "f");
+        __classPrivateFieldSet(this, _TxValidator_contractDataSource, contractDataSource, "f");
+        __classPrivateFieldSet(this, _TxValidator_globalVariables, globalVariables, "f");
+        __classPrivateFieldSet(this, _TxValidator_feeValidationConfig, feeValidationConfig, "f");
         __classPrivateFieldSet(this, _TxValidator_log, log, "f");
     }
     /**
@@ -46,9 +48,15 @@ export class TxValidator {
                 continue;
             }
             // skip already processed transactions
-            if (tx instanceof Tx && (await __classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateFee).call(this, tx)) === INVALID_TX) {
-                invalidTxs.push(tx);
-                continue;
+            if (tx instanceof Tx) {
+                if ((await __classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateFee).call(this, tx)) === INVALID_TX) {
+                    invalidTxs.push(tx);
+                    continue;
+                }
+                if ((await __classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateGasBalance).call(this, tx)) === INVALID_TX) {
+                    invalidTxs.push(tx);
+                    continue;
+                }
             }
             if (__classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateMaxBlockNumber).call(this, tx) === INVALID_TX) {
                 invalidTxs.push(tx);
@@ -59,7 +67,7 @@ export class TxValidator {
         return [validTxs, invalidTxs];
     }
 }
-_TxValidator_log = new WeakMap(), _TxValidator_globalVariables = new WeakMap(), _TxValidator_nullifierSource = new WeakMap(), _TxValidator_publicStateSource = new WeakMap(), _TxValidator_gasPortalAddress = new WeakMap(), _TxValidator_instances = new WeakSet(), _TxValidator_validateMetadata = function _TxValidator_validateMetadata(tx) {
+_a = TxValidator, _TxValidator_log = new WeakMap(), _TxValidator_globalVariables = new WeakMap(), _TxValidator_nullifierSource = new WeakMap(), _TxValidator_publicStateSource = new WeakMap(), _TxValidator_contractDataSource = new WeakMap(), _TxValidator_feeValidationConfig = new WeakMap(), _TxValidator_instances = new WeakSet(), _TxValidator_validateMetadata = function _TxValidator_validateMetadata(tx) {
     if (!tx.data.constants.txContext.chainId.equals(__classPrivateFieldGet(this, _TxValidator_globalVariables, "f").chainId)) {
         __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because of incorrect chain ${tx.data.constants.txContext.chainId.toString()} != ${__classPrivateFieldGet(this, _TxValidator_globalVariables, "f").chainId.toString()}`);
         return INVALID_TX;
@@ -101,23 +109,14 @@ async function _TxValidator_validateNullifiers(tx, thisBlockNullifiers) {
         return INVALID_TX;
     }
     return VALID_TX;
-}, _TxValidator_validateFee = async function _TxValidator_validateFee(tx) {
+}, _TxValidator_validateGasBalance = async function _TxValidator_validateGasBalance(tx) {
     if (!tx.data.needsTeardown) {
-        // TODO check if fees are mandatory and reject this tx
-        __classPrivateFieldGet(this, _TxValidator_log, "f").debug(`Tx ${Tx.getHash(tx)} doesn't pay for gas`);
         return VALID_TX;
     }
-    const { 
-    // TODO what if there's more than one function call?
-    // if we're to enshrine that teardown = 1 function call, then we should turn this into a single function call
-    [PublicKernelPhase.TEARDOWN]: [teardownFn], } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls);
-    if (!teardownFn) {
-        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has no enqueued teardown function call`);
-        return INVALID_TX;
-    }
+    const teardownFn = __classPrivateFieldGet(_a, _a, "m", _TxValidator_extractFeeExecutionCall).call(_a, tx);
     // TODO(#1204) if a generator index is used for the derived storage slot of a map, update it here as well
-    const slot = pedersenHash([GAS_TOKEN_BALANCES_SLOT.toBuffer(), teardownFn.callContext.msgSender.toBuffer()]);
-    const gasBalance = await __classPrivateFieldGet(this, _TxValidator_publicStateSource, "f").storageRead(getCanonicalGasTokenAddress(__classPrivateFieldGet(this, _TxValidator_gasPortalAddress, "f")), slot);
+    const slot = pedersenHash([GAS_TOKEN_BALANCES_SLOT, teardownFn.callContext.msgSender]);
+    const gasBalance = await __classPrivateFieldGet(this, _TxValidator_publicStateSource, "f").storageRead(getCanonicalGasTokenAddress(__classPrivateFieldGet(this, _TxValidator_feeValidationConfig, "f").gasPortalAddress), slot);
     // TODO(#5004) calculate fee needed based on tx limits and gas prices
     const gasAmountNeeded = new Fr(1);
     if (gasBalance.lt(gasAmountNeeded)) {
@@ -134,5 +133,41 @@ async function _TxValidator_validateNullifiers(tx, thisBlockNullifiers) {
     else {
         return VALID_TX;
     }
+}, _TxValidator_validateFee = async function _TxValidator_validateFee(tx) {
+    if (!tx.data.needsTeardown) {
+        // TODO check if fees are mandatory and reject this tx
+        __classPrivateFieldGet(this, _TxValidator_log, "f").debug(`Tx ${Tx.getHash(tx)} doesn't pay for gas`);
+        return VALID_TX;
+    }
+    const teardownFn = __classPrivateFieldGet(_a, _a, "m", _TxValidator_extractFeeExecutionCall).call(_a, tx);
+    if (!teardownFn) {
+        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has no enqueued teardown function call`);
+        return INVALID_TX;
+    }
+    const fpcAddress = teardownFn.contractAddress;
+    const contractClass = await __classPrivateFieldGet(this, _TxValidator_contractDataSource, "f").getContract(fpcAddress);
+    if (!contractClass) {
+        return INVALID_TX;
+    }
+    if (fpcAddress.equals(getCanonicalGasTokenAddress(__classPrivateFieldGet(this, _TxValidator_feeValidationConfig, "f").gasPortalAddress))) {
+        return VALID_TX;
+    }
+    for (const allowedContract of __classPrivateFieldGet(this, _TxValidator_feeValidationConfig, "f").allowedFeePaymentContractInstances) {
+        if (fpcAddress.equals(allowedContract)) {
+            return VALID_TX;
+        }
+    }
+    for (const allowedContractClass of __classPrivateFieldGet(this, _TxValidator_feeValidationConfig, "f").allowedFeePaymentContractClasses) {
+        if (contractClass.contractClassId.equals(allowedContractClass)) {
+            return VALID_TX;
+        }
+    }
+    return INVALID_TX;
+}, _TxValidator_extractFeeExecutionCall = function _TxValidator_extractFeeExecutionCall(tx) {
+    const { 
+    // TODO what if there's more than one function call?
+    // if we're to enshrine that teardown = 1 function call, then we should turn this into a single function call
+    [PublicKernelPhase.TEARDOWN]: [teardownFn], } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls);
+    return teardownFn;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci90eF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQWUsRUFBRSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkQsT0FBTyxFQUE0QixFQUFFLEVBQW1CLE1BQU0sb0JBQW9CLENBQUM7QUFDbkYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3hELE9BQU8sRUFBVSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRWxGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBWXRGLG1FQUFtRTtBQUNuRSx1REFBdUQ7QUFDdkQsMEVBQTBFO0FBQzFFLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNwQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7QUFJeEMsc0RBQXNEO0FBQ3RELE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFMUMsTUFBTSxPQUFPLFdBQVc7SUFPdEIsWUFDRSxlQUFnQyxFQUNoQyxpQkFBb0MsRUFDcEMsZ0JBQTRCLEVBQzVCLGVBQWdDLEVBQ2hDLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyw4QkFBOEIsQ0FBQzs7UUFYekQsbUNBQWE7UUFDYiwrQ0FBa0M7UUFDbEMsK0NBQWtDO1FBQ2xDLGlEQUFzQztRQUN0QyxnREFBOEI7UUFTNUIsdUJBQUEsSUFBSSxnQ0FBb0IsZUFBZSxNQUFBLENBQUM7UUFDeEMsdUJBQUEsSUFBSSxnQ0FBb0IsZUFBZSxNQUFBLENBQUM7UUFDeEMsdUJBQUEsSUFBSSxrQ0FBc0IsaUJBQWlCLE1BQUEsQ0FB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tx_validator.js","sourceRoot":"","sources":["../../src/sequencer/tx_validator.ts"],"names":[],"mappings":"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"}

package/dest/sequencer/tx_validator_factory.d.ts

@@ -0,0 +1,12 @@
+import { AztecAddress, EthAddress, Fr, GlobalVariables } from '@aztec/circuits.js';
+import { ContractDataSource } from '@aztec/types/contracts';
+import { MerkleTreeOperations } from '@aztec/world-state';
+import { TxValidator } from './tx_validator.js';
+export declare class TxValidatorFactory {
+    private merkleTreeDb;
+    private contractDataSource;
+    private gasPortalAddress;
+    constructor(merkleTreeDb: MerkleTreeOperations, contractDataSource: ContractDataSource, gasPortalAddress: EthAddress);
+    buildTxValidator(globalVariables: GlobalVariables, allowedFeePaymentContractClasses: Fr[], allowedFeePaymentContractInstances: AztecAddress[]): TxValidator;
+}
+//# sourceMappingURL=tx_validator_factory.d.ts.map

package/dest/sequencer/tx_validator_factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/sequencer/tx_validator_factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,gBAAgB;gBAFhB,YAAY,EAAE,oBAAoB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,UAAU;IAGtC,gBAAgB,CACd,eAAe,EAAE,eAAe,EAChC,gCAAgC,EAAE,EAAE,EAAE,EACtC,kCAAkC,EAAE,YAAY,EAAE,GACjD,WAAW;CAaf"}

package/dest/sequencer/tx_validator_factory.js

@@ -0,0 +1,17 @@
+import { WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
+import { TxValidator } from './tx_validator.js';
+export class TxValidatorFactory {
+    constructor(merkleTreeDb, contractDataSource, gasPortalAddress) {
+        this.merkleTreeDb = merkleTreeDb;
+        this.contractDataSource = contractDataSource;
+        this.gasPortalAddress = gasPortalAddress;
+    }
+    buildTxValidator(globalVariables, allowedFeePaymentContractClasses, allowedFeePaymentContractInstances) {
+        return new TxValidator(new WorldStateDB(this.merkleTreeDb), new WorldStatePublicDB(this.merkleTreeDb), this.contractDataSource, globalVariables, {
+            allowedFeePaymentContractClasses,
+            allowedFeePaymentContractInstances,
+            gasPortalAddress: this.gasPortalAddress,
+        });
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yX2ZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL3R4X3ZhbGlkYXRvcl9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsTUFBTSxPQUFPLGtCQUFrQjtJQUM3QixZQUNVLFlBQWtDLEVBQ2xDLGtCQUFzQyxFQUN0QyxnQkFBNEI7UUFGNUIsaUJBQVksR0FBWixZQUFZLENBQXNCO1FBQ2xDLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFZO0lBQ25DLENBQUM7SUFFSixnQkFBZ0IsQ0FDZCxlQUFnQyxFQUNoQyxnQ0FBc0MsRUFDdEMsa0NBQWtEO1FBRWxELE9BQU8sSUFBSSxXQUFXLENBQ3BCLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFDbkMsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQ3pDLElBQUksQ0FBQyxrQkFBa0IsRUFDdkIsZUFBZSxFQUNmO1lBQ0UsZ0NBQWdDO1lBQ2hDLGtDQUFrQztZQUNsQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsZ0JBQWdCO1NBQ3hDLENBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9

package/dest/simulator/public_executor.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { L1ToL2MessageSource, NullifierMembershipWitness, Tx } from '@aztec/circuit-types';
+import { NullifierMembershipWitness, Tx } from '@aztec/circuit-types';
 import { AztecAddress, EthAddress, Fr, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator';
 import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts';
@@ -70,8 +70,7 @@ export declare class WorldStatePublicDB implements PublicStateDB {
  */
 export declare class WorldStateDB implements CommitmentsDB {
     private db;
-    private l1ToL2MessageSource;
-    constructor(db: MerkleTreeOperations, l1ToL2MessageSource: L1ToL2MessageSource);
+    constructor(db: MerkleTreeOperations);
     getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
     getL1ToL2MembershipWitness(contractAddress: AztecAddress, messageHash: Fr, secret: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
     getCommitmentIndex(commitment: Fr): Promise<bigint | undefined>;

package/dest/simulator/public_executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,mBAAmB,EAEnB,0BAA0B,EAC1B,EAAE,EAEH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EAGZ,UAAU,EACV,EAAE,EACF,gBAAgB,EAChB,wBAAwB,EAIzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;IAMvD,OAAO,CAAC,EAAE;IALtB,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,UAAU,CAA0C;IAE5D,OAAO,CAAC,GAAG,CAA8D;gBAErD,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI5F,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAItF,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY3F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAIvF;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,EAAE;IAJtB,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,OAAO,CAAC,qBAAqB,CAA8B;gBAEvC,EAAE,EAAE,oBAAoB;IAE5C;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IA4BvE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvB;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC;AAED;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;IAAwB,OAAO,CAAC,mBAAmB;gBAArD,EAAE,EAAE,oBAAoB,EAAU,mBAAmB,EAAE,mBAAmB;IAEjF,0CAA0C,CACrD,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAqBrC,0BAA0B,CACrC,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,uBAAuB,CAAC,OAAO,wBAAwB,CAAC,CAAC;IA+BvD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG3E"}
+{"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAgB,0BAA0B,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EACL,YAAY,EAGZ,UAAU,EACV,EAAE,EACF,gBAAgB,EAChB,wBAAwB,EAIzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;IAMvD,OAAO,CAAC,EAAE;IALtB,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,UAAU,CAA0C;IAE5D,OAAO,CAAC,GAAG,CAA8D;gBAErD,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI5F,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAItF,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY3F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAIvF;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,EAAE;IAJtB,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,OAAO,CAAC,qBAAqB,CAA8B;gBAEvC,EAAE,EAAE,oBAAoB;IAE5C;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IA4BvE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvB;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC;AAED;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAE/B,0CAA0C,CACrD,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAqBrC,0BAA0B,CACrC,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,uBAAuB,CAAC,OAAO,wBAAwB,CAAC,CAAC;IA2BvD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG3E"}

package/dest/simulator/public_executor.js

@@ -1,4 +1,4 @@
-import { MerkleTreeId, NullifierMembershipWitness, UnencryptedL2Log, } from '@aztec/circuit-types';
+import { MerkleTreeId, NullifierMembershipWitness } from '@aztec/circuit-types';
 import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent, Fr, } from '@aztec/circuits.js';
 import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { createDebugLogger } from '@aztec/foundation/log';
@@ -21,7 +21,7 @@ export class ContractsDataSourcePublicDB {
      */
     addNewContracts(tx) {
         // Extract contract class and instance data from logs and add to cache for this block
-        const logs = tx.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
+        const logs = tx.unencryptedLogs.unrollLogs();
         ContractClassRegisteredEvent.fromLogs(logs, getCanonicalClassRegistererAddress()).forEach(e => {
             this.log(`Adding class ${e.contractClassId.toString()} to public execution contract cache`);
             this.classCache.set(e.contractClassId.toString(), e.toContractClassPublic());
@@ -40,7 +40,7 @@ export class ContractsDataSourcePublicDB {
         // TODO(@spalladino): Can this inadvertently delete a valid contract added by another tx?
         // Let's say we have two txs adding the same contract on the same block. If the 2nd one reverts,
         // wouldn't that accidentally remove the contract added on the first one?
-        const logs = tx.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
+        const logs = tx.unencryptedLogs.unrollLogs();
         ContractClassRegisteredEvent.fromLogs(logs, getCanonicalClassRegistererAddress()).forEach(e => this.classCache.delete(e.contractClassId.toString()));
         ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => this.instanceCache.delete(e.address.toString()));
         return Promise.resolve();
@@ -154,9 +154,8 @@ export class WorldStatePublicDB {
  * Implements WorldState db using a world state database.
  */
 export class WorldStateDB {
-    constructor(db, l1ToL2MessageSource) {
+    constructor(db) {
         this.db = db;
-        this.l1ToL2MessageSource = l1ToL2MessageSource;
     }
     async getNullifierMembershipWitnessAtLatestBlock(nullifier) {
         const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
@@ -178,7 +177,7 @@ export class WorldStateDB {
         // We iterate over messages until we find one whose nullifier is not in the nullifier tree --> we need to check
         // for nullifiers because messages can have duplicates.
         do {
-            messageIndex = (await this.db.findLeafIndexAfter(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageHash.toBuffer(), startIndex));
+            messageIndex = (await this.db.findLeafIndexAfter(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageHash, startIndex));
             if (messageIndex === undefined) {
                 throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
             }
@@ -190,10 +189,10 @@ export class WorldStateDB {
         return new MessageLoadOracleInputs(messageIndex, siblingPath);
     }
     async getCommitmentIndex(commitment) {
-        return await this.db.findLeafIndex(MerkleTreeId.NOTE_HASH_TREE, commitment.toBuffer());
+        return await this.db.findLeafIndex(MerkleTreeId.NOTE_HASH_TREE, commitment);
     }
     async getNullifierIndex(nullifier) {
         return await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_executor.js","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_executor.js","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -21,18 +21,18 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.31.0",
-    "@aztec/circuits.js": "0.31.0",
-    "@aztec/ethereum": "0.31.0",
-    "@aztec/foundation": "0.31.0",
-    "@aztec/l1-artifacts": "0.31.0",
-    "@aztec/merkle-tree": "0.31.0",
-    "@aztec/noir-protocol-circuits-types": "0.31.0",
-    "@aztec/p2p": "0.31.0",
-    "@aztec/protocol-contracts": "0.31.0",
-    "@aztec/simulator": "0.31.0",
-    "@aztec/types": "0.31.0",
-    "@aztec/world-state": "0.31.0",
+    "@aztec/circuit-types": "0.32.0",
+    "@aztec/circuits.js": "0.32.0",
+    "@aztec/ethereum": "0.32.0",
+    "@aztec/foundation": "0.32.0",
+    "@aztec/l1-artifacts": "0.32.0",
+    "@aztec/merkle-tree": "0.32.0",
+    "@aztec/noir-protocol-circuits-types": "0.32.0",
+    "@aztec/p2p": "0.32.0",
+    "@aztec/protocol-contracts": "0.32.0",
+    "@aztec/simulator": "0.32.0",
+    "@aztec/types": "0.32.0",
+    "@aztec/world-state": "0.32.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",

package/src/client/sequencer-client.ts

@@ -10,6 +10,7 @@ import { getGlobalVariableBuilder } from '../global_variable_builder/index.js';
 import { getL1Publisher } from '../publisher/index.js';
 import { Sequencer, SequencerConfig } from '../sequencer/index.js';
 import { PublicProcessorFactory } from '../sequencer/public_processor.js';
+import { TxValidatorFactory } from '../sequencer/tx_validator_factory.js';
 
 /**
  * Encapsulates the full sequencer and publisher.
@@ -43,12 +44,7 @@ export class SequencerClient {
     const globalsBuilder = getGlobalVariableBuilder(config);
     const merkleTreeDb = worldStateSynchronizer.getLatest();
 
-    const publicProcessorFactory = new PublicProcessorFactory(
-      merkleTreeDb,
-      contractDataSource,
-      l1ToL2MessageSource,
-      simulationProvider,
-    );
+    const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, simulationProvider);
 
     const sequencer = new Sequencer(
       publisher,
@@ -59,8 +55,8 @@ export class SequencerClient {
       l2BlockSource,
       l1ToL2MessageSource,
       publicProcessorFactory,
+      new TxValidatorFactory(merkleTreeDb, contractDataSource, config.l1Contracts.gasPortalAddress),
       config,
-      config.l1Contracts.gasPortalAddress,
     );
 
     await sequencer.start();

package/src/config.ts

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/circuits.js';
+import { AztecAddress, Fr } from '@aztec/circuits.js';
 import { L1ContractAddresses, NULL_KEY } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
@@ -40,6 +40,8 @@ export function getConfigEnvVars(): SequencerClientConfig {
     SEQ_TX_POLLING_INTERVAL_MS,
     SEQ_MAX_TX_PER_BLOCK,
     SEQ_MIN_TX_PER_BLOCK,
+    SEQ_FPC_CLASSES,
+    SEQ_FPC_INSTANCES,
     AVAILABILITY_ORACLE_CONTRACT_ADDRESS,
     ROLLUP_CONTRACT_ADDRESS,
     REGISTRY_CONTRACT_ADDRESS,
@@ -88,5 +90,9 @@ export function getConfigEnvVars(): SequencerClientConfig {
     feeRecipient: FEE_RECIPIENT ? AztecAddress.fromString(FEE_RECIPIENT) : undefined,
     acvmWorkingDirectory: ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : undefined,
     acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined,
+    allowedFeePaymentContractClasses: SEQ_FPC_CLASSES ? SEQ_FPC_CLASSES.split(',').map(Fr.fromString) : [],
+    allowedFeePaymentContractInstances: SEQ_FPC_INSTANCES
+      ? SEQ_FPC_INSTANCES.split(',').map(AztecAddress.fromString)
+      : [],
   };
 }

package/src/sequencer/abstract_phase_manager.ts

@@ -1,4 +1,4 @@
-import { FunctionL2Logs, MerkleTreeId, SimulationError, Tx } from '@aztec/circuit-types';
+import { MerkleTreeId, SimulationError, Tx, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
   AztecAddress,
   CallRequest,
@@ -180,7 +180,7 @@ export abstract class AbstractPhaseManager {
     tx: Tx,
     previousPublicKernelOutput: PublicKernelCircuitPublicInputs,
     previousPublicKernelProof: Proof,
-  ): Promise<[PublicKernelCircuitPublicInputs, Proof, FunctionL2Logs[], SimulationError | undefined]> {
+  ): Promise<[PublicKernelCircuitPublicInputs, Proof, UnencryptedFunctionL2Logs[], SimulationError | undefined]> {
     let kernelOutput = previousPublicKernelOutput;
     let kernelProof = previousPublicKernelProof;
 
@@ -190,7 +190,7 @@ export abstract class AbstractPhaseManager {
       return [kernelOutput, kernelProof, [], undefined];
     }
 
-    const newUnencryptedFunctionLogs: FunctionL2Logs[] = [];
+    const newUnencryptedFunctionLogs: UnencryptedFunctionL2Logs[] = [];
 
     // TODO(#1684): Should multiple separately enqueued public calls be treated as
     // separate public callstacks to be proven by separate public kernel sequences

package/src/sequencer/public_processor.ts

@@ -1,12 +1,12 @@
 import {
   FailedTx,
-  L1ToL2MessageSource,
   ProcessedTx,
   SimulationError,
   Tx,
   getPreviousOutputAndProof,
   makeEmptyProcessedTx,
   makeProcessedTx,
+  toTxEffect,
   validateProcessedTx,
 } from '@aztec/circuit-types';
 import { TxSequencerProcessingStats } from '@aztec/circuit-types/stats';
@@ -30,7 +30,6 @@ export class PublicProcessorFactory {
   constructor(
     private merkleTree: MerkleTreeOperations,
     private contractDataSource: ContractDataSource,
-    private l1Tol2MessagesDataSource: L1ToL2MessageSource,
     private simulator: SimulationProvider,
   ) {}
 
@@ -49,7 +48,7 @@ export class PublicProcessorFactory {
 
     const publicContractsDB = new ContractsDataSourcePublicDB(this.contractDataSource);
     const worldStatePublicDB = new WorldStatePublicDB(this.merkleTree);
-    const worldStateDB = new WorldStateDB(this.merkleTree, this.l1Tol2MessagesDataSource);
+    const worldStateDB = new WorldStateDB(this.merkleTree);
     const publicExecutor = new PublicExecutor(worldStatePublicDB, publicContractsDB, worldStateDB, historicalHeader);
     return new PublicProcessor(
       this.merkleTree,
@@ -133,6 +132,7 @@ export class PublicProcessor {
         this.log(`Processed public part of ${tx.data.endNonRevertibleData.newNullifiers[0].value}`, {
           eventName: 'tx-sequencer-processing',
           duration: timer.ms(),
+          effectsSize: toTxEffect(processedTransaction).toBuffer().length,
           publicDataUpdateRequests:
             processedTransaction.data.combinedData.publicDataUpdateRequests.filter(x => !x.leafSlot.isZero()).length ??
             0,

package/src/sequencer/sequencer.ts

@@ -1,4 +1,4 @@
-import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, ProcessedTx, Tx } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2Block, L2BlockSource, ProcessedTx, Tx } from '@aztec/circuit-types';
 import { BlockProver, PROVING_STATUS } from '@aztec/circuit-types/interfaces';
 import { L2BlockBuiltStats } from '@aztec/circuit-types/stats';
 import { AztecAddress, EthAddress, GlobalVariables } from '@aztec/circuits.js';
@@ -11,10 +11,10 @@ import { WorldStateStatus, WorldStateSynchronizer } from '@aztec/world-state';
 
 import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { L1Publisher } from '../publisher/l1-publisher.js';
-import { WorldStatePublicDB } from '../simulator/public_executor.js';
 import { SequencerConfig } from './config.js';
 import { PublicProcessorFactory } from './public_processor.js';
 import { TxValidator } from './tx_validator.js';
+import { TxValidatorFactory } from './tx_validator_factory.js';
 
 /**
  * Sequencer client
@@ -35,6 +35,8 @@ export class Sequencer {
   private _feeRecipient = AztecAddress.ZERO;
   private lastPublishedBlock = 0;
   private state = SequencerState.STOPPED;
+  private allowedFeePaymentContractClasses: Fr[] = [];
+  private allowedFeePaymentContractInstances: AztecAddress[] = [];
 
   constructor(
     private publisher: L1Publisher,
@@ -45,8 +47,8 @@ export class Sequencer {
     private l2BlockSource: L2BlockSource,
     private l1ToL2MessageSource: L1ToL2MessageSource,
     private publicProcessorFactory: PublicProcessorFactory,
+    private txValidatorFactory: TxValidatorFactory,
     config: SequencerConfig = {},
-    private gasPortalAddress = EthAddress.ZERO,
     private log = createDebugLogger('aztec:sequencer'),
   ) {
     this.updateConfig(config);
@@ -73,6 +75,12 @@ export class Sequencer {
     if (config.feeRecipient) {
       this._feeRecipient = config.feeRecipient;
     }
+    if (config.allowedFeePaymentContractClasses) {
+      this.allowedFeePaymentContractClasses = config.allowedFeePaymentContractClasses;
+    }
+    if (config.allowedFeePaymentContractInstances) {
+      this.allowedFeePaymentContractInstances = config.allowedFeePaymentContractInstances;
+    }
   }
 
   /**
@@ -170,17 +178,10 @@ export class Sequencer {
         this._feeRecipient,
       );
 
-      // Filter out invalid txs
-      const trees = this.worldState.getLatest();
-      const txValidator = new TxValidator(
-        {
-          getNullifierIndex(nullifier: Fr): Promise<bigint | undefined> {
-            return trees.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
-          },
-        },
-        new WorldStatePublicDB(trees),
-        this.gasPortalAddress,
+      const txValidator = this.txValidatorFactory.buildTxValidator(
         newGlobalVariables,
+        this.allowedFeePaymentContractClasses,
+        this.allowedFeePaymentContractInstances,
       );
 
       // TODO: It should be responsibility of the P2P layer to validate txs before passing them on here