@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.24de95ac

package/dest/msg_validators/tx_validator/allowed_public_setup.js

@@ -0,0 +1,27 @@
+import { FPCContract } from '@aztec/noir-contracts.js/FPC';
+import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+let defaultAllowedSetupFunctions = undefined;
+export async function getDefaultAllowedSetupFunctions() {
+    if (defaultAllowedSetupFunctions === undefined) {
+        defaultAllowedSetupFunctions = [
+            // needed for authwit support
+            {
+                address: ProtocolContractAddress.AuthRegistry
+            },
+            // needed for claiming on the same tx as a spend
+            {
+                address: ProtocolContractAddress.FeeJuice
+            },
+            // needed for private transfers via FPC
+            {
+                classId: (await getContractClassFromArtifact(TokenContractArtifact)).id
+            },
+            {
+                classId: (await getContractClassFromArtifact(FPCContract.artifact)).id
+            }
+        ];
+    }
+    return defaultAllowedSetupFunctions;
+}

package/dest/msg_validators/tx_validator/archive_cache.d.ts

@@ -0,0 +1,14 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { ArchiveSource } from '@aztec/p2p';
+import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+/**
+ * Implements an archive source by checking a DB and an in-memory collection.
+ * Intended for validating transactions as they are added to a block.
+ */
+export declare class ArchiveCache implements ArchiveSource {
+    private db;
+    archives: Map<string, bigint>;
+    constructor(db: MerkleTreeReadOperations);
+    getArchiveIndices(archives: Fr[]): Promise<(bigint | undefined)[]>;
+}
+//# sourceMappingURL=archive_cache.d.ts.map

package/dest/msg_validators/tx_validator/archive_cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"archive_cache.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/archive_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF;;;GAGG;AACH,qBAAa,YAAa,YAAW,aAAa;IAGpC,OAAO,CAAC,EAAE;IAFtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEV,EAAE,EAAE,wBAAwB;IAInC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CAWhF"}

package/dest/msg_validators/tx_validator/archive_cache.js

@@ -0,0 +1,22 @@
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+/**
+ * Implements an archive source by checking a DB and an in-memory collection.
+ * Intended for validating transactions as they are added to a block.
+ */ export class ArchiveCache {
+    db;
+    archives;
+    constructor(db){
+        this.db = db;
+        this.archives = new Map();
+    }
+    async getArchiveIndices(archives) {
+        const toCheckDb = archives.filter((n)=>!this.archives.has(n.toString()));
+        const dbHits = await this.db.findLeafIndices(MerkleTreeId.ARCHIVE, toCheckDb);
+        dbHits.forEach((x, index)=>{
+            if (x !== undefined) {
+                this.archives.set(toCheckDb[index].toString(), x);
+            }
+        });
+        return archives.map((n)=>this.archives.get(n.toString()));
+    }
+}

package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_header_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/block_header_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,KAAK,EAAM,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE7F,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CACxE;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAIhE,aAAa,EAAE,aAAa;IAIlC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAQrD"}
+{"version":3,"file":"block_header_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/block_header_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,KAAK,EAAyB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEhH,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CACxE;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAIhE,aAAa,EAAE,aAAa;IAIlC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAQrD"}

package/dest/msg_validators/tx_validator/block_header_validator.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Tx } from '@aztec/stdlib/tx';
+import { TX_ERROR_BLOCK_HEADER } from '@aztec/stdlib/tx';
 export class BlockHeaderTxValidator {
     #log = createLogger('p2p:tx_validator:tx_block_header');
     #archiveSource;
@@ -8,14 +8,14 @@ export class BlockHeaderTxValidator {
     }
     async validateTx(tx) {
         const [index] = await this.#archiveSource.getArchiveIndices([
-            await tx.data.constants.historicalHeader.hash()
+            await tx.data.constants.anchorBlockHeader.hash()
         ]);
         if (index === undefined) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for referencing an unknown block header`);
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} for referencing an unknown block header`);
             return {
                 result: 'invalid',
                 reason: [
-                    'Block header not found'
+                    TX_ERROR_BLOCK_HEADER
                 ]
             };
         }

package/dest/msg_validators/tx_validator/data_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEjF,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG/C,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAkGtD"}
+{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,EAAE,EACF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG/C,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiGtD"}

package/dest/msg_validators/tx_validator/data_validator.js

@@ -1,107 +1,77 @@
-import { MAX_FR_ARGS_TO_ALL_ENQUEUED_CALLS } from '@aztec/constants';
+import { MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
-import { Tx } from '@aztec/stdlib/tx';
+import { computeCalldataHash } from '@aztec/stdlib/hash';
+import { TX_ERROR_CALLDATA_COUNT_MISMATCH, TX_ERROR_CALLDATA_COUNT_TOO_LARGE, TX_ERROR_CONTRACT_CLASS_LOGS, TX_ERROR_CONTRACT_CLASS_LOG_COUNT, TX_ERROR_CONTRACT_CLASS_LOG_LENGTH, TX_ERROR_CONTRACT_CLASS_LOG_SORTING, TX_ERROR_INCORRECT_CALLDATA, TX_ERROR_INCORRECT_HASH, Tx } from '@aztec/stdlib/tx';
 export class DataTxValidator {
     #log = createLogger('p2p:tx_validator:tx_data');
     async validateTx(tx) {
-        const execRequestRes = this.#hasCorrectExecutionRequests(tx);
-        // Note: If we ever skip txs here, must change this return statement to account for them.
-        return (await execRequestRes).result === 'invalid' ? execRequestRes : this.#hasCorrectContractClassLogs(tx);
+        const reason = await this.#hasCorrectHash(tx) ?? await this.#hasCorrectCalldata(tx) ?? await this.#hasCorrectContractClassLogs(tx);
+        return reason ? {
+            result: 'invalid',
+            reason: [
+                reason
+            ]
+        } : {
+            result: 'valid'
+        };
     }
-    async #hasCorrectExecutionRequests(tx) {
-        const callRequests = [
-            ...tx.data.getRevertiblePublicCallRequests(),
-            ...tx.data.getNonRevertiblePublicCallRequests()
-        ];
-        if (callRequests.length !== tx.enqueuedPublicFunctionCalls.length) {
-            this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} because of mismatch number of execution requests for public calls. Expected ${callRequests.length}. Got ${tx.enqueuedPublicFunctionCalls.length}.`);
-            return {
-                result: 'invalid',
-                reason: [
-                    'Wrong number of execution requests for public calls'
-                ]
-            };
+    async #hasCorrectHash(tx) {
+        const expected = await Tx.computeTxHash(tx);
+        if (!tx.getTxHash().equals(expected)) {
+            const reason = TX_ERROR_INCORRECT_HASH;
+            this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()}. Reason: ${reason}. Expected hash ${expected.toString()}. Got ${tx.getTxHash().toString()}.`);
+            return reason;
         }
-        if (tx.getTotalPublicArgsCount() > MAX_FR_ARGS_TO_ALL_ENQUEUED_CALLS) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because the total length of args to public enqueued calls is greater than ${MAX_FR_ARGS_TO_ALL_ENQUEUED_CALLS}`);
-            return {
-                result: 'invalid',
-                reason: [
-                    'Too many args in total to enqueued public calls'
-                ]
-            };
+        return undefined;
+    }
+    async #hasCorrectCalldata(tx) {
+        if (tx.publicFunctionCalldata.length !== tx.numberOfPublicCalls()) {
+            const reason = TX_ERROR_CALLDATA_COUNT_MISMATCH;
+            this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()}. Reason: ${reason}. Expected ${tx.numberOfPublicCalls()}. Got ${tx.publicFunctionCalldata.length}.`);
+            return reason;
         }
-        const invalidExecutionRequestIndex = (await Promise.all(tx.enqueuedPublicFunctionCalls.map(async (execRequest, i)=>!await execRequest.isForCallRequest(callRequests[i])))).findIndex(Boolean);
-        if (invalidExecutionRequestIndex !== -1) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of incorrect execution requests for public call at index ${invalidExecutionRequestIndex}.`);
-            return {
-                result: 'invalid',
-                reason: [
-                    'Incorrect execution request for public call'
-                ]
-            };
+        if (tx.getTotalPublicCalldataCount() > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
+            const reason = TX_ERROR_CALLDATA_COUNT_TOO_LARGE;
+            this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()}. Reason: ${reason}. Expected no greater than ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS} fields. Got ${tx.getTotalPublicCalldataCount()}.`);
+            return reason;
         }
-        const teardownCallRequest = tx.data.getTeardownPublicCallRequest();
-        const isInvalidTeardownExecutionRequest = !teardownCallRequest && !tx.publicTeardownFunctionCall.isEmpty() || teardownCallRequest && !await tx.publicTeardownFunctionCall.isForCallRequest(teardownCallRequest);
-        if (isInvalidTeardownExecutionRequest) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of incorrect teardown execution requests.`);
-            return {
-                result: 'invalid',
-                reason: [
-                    'Incorrect teardown execution request'
-                ]
-            };
+        const callRequests = tx.getPublicCallRequestsWithCalldata();
+        for(let i = 0; i < callRequests.length; i++){
+            const { request, calldata } = callRequests[i];
+            const hash = await computeCalldataHash(calldata);
+            if (!hash.equals(request.calldataHash)) {
+                const reason = TX_ERROR_INCORRECT_CALLDATA;
+                this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()}. Reason: ${reason}. Call request index: ${i}.`);
+                return reason;
+            }
         }
-        return {
-            result: 'valid'
-        };
+        return undefined;
     }
     async #hasCorrectContractClassLogs(tx) {
         const contractClassLogsHashes = tx.data.getNonEmptyContractClassLogsHashes();
-        const hashedContractClasslogs = await Promise.all(tx.contractClassLogs.map((l)=>l.hash()));
-        if (contractClassLogsHashes.length !== hashedContractClasslogs.length) {
-            this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} because of mismatched number of contract class logs. Expected ${contractClassLogsHashes.length}. Got ${hashedContractClasslogs.length}.`);
-            return {
-                result: 'invalid',
-                reason: [
-                    'Mismatched number of contract class logs'
-                ]
-            };
+        if (contractClassLogsHashes.length !== tx.contractClassLogFields.length) {
+            this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()} because of mismatched number of contract class logs. Expected ${contractClassLogsHashes.length}. Got ${tx.contractClassLogFields.length}.`);
+            return TX_ERROR_CONTRACT_CLASS_LOG_COUNT;
         }
+        const expectedHashes = await Promise.all(tx.contractClassLogFields.map((l)=>l.hash()));
         for (const [i, logHash] of contractClassLogsHashes.entries()){
-            const hashedLog = hashedContractClasslogs[i];
-            if (!logHash.value.equals(hashedLog)) {
-                if (hashedContractClasslogs.some((l)=>logHash.value.equals(l))) {
-                    const matchingLogIndex = hashedContractClasslogs.findIndex((l)=>logHash.value.equals(l));
-                    this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} because of mismatched contract class logs indices. Expected ${i} from the kernel's log hashes. Got ${matchingLogIndex} in the tx.`);
-                    return {
-                        result: 'invalid',
-                        reason: [
-                            'Incorrectly sorted contract class logs'
-                        ]
-                    };
+            const hash = expectedHashes[i];
+            if (!logHash.value.equals(hash)) {
+                if (expectedHashes.some((h)=>logHash.value.equals(h))) {
+                    const matchingLogIndex = expectedHashes.findIndex((l)=>logHash.value.equals(l));
+                    this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()} because of mismatched contract class logs indices. Expected ${i} from the kernel's log hashes. Got ${matchingLogIndex} in the tx.`);
+                    return TX_ERROR_CONTRACT_CLASS_LOG_SORTING;
                 } else {
-                    this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} because of mismatched contract class logs. Expected hash ${logHash.value} from the kernels. Got ${hashedLog} in the tx.`);
-                    return {
-                        result: 'invalid',
-                        reason: [
-                            'Mismatched contract class logs'
-                        ]
-                    };
+                    this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()} because of mismatched contract class logs. Expected hash ${logHash.value} from the kernels. Got ${hash} in the tx.`);
+                    return TX_ERROR_CONTRACT_CLASS_LOGS;
                 }
             }
-            if (logHash.logHash.length !== tx.contractClassLogs[i].getEmittedLength()) {
-                this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} because of mismatched contract class logs length. Expected ${logHash.logHash.length} from the kernel's log hashes. Got ${tx.contractClassLogs[i].getEmittedLength()} in the tx.`);
-                return {
-                    result: 'invalid',
-                    reason: [
-                        'Mismatched contract class logs length'
-                    ]
-                };
+            const expectedMinLength = 1 + tx.contractClassLogFields[i].fields.findLastIndex((f)=>!f.isZero());
+            if (logHash.logHash.length < expectedMinLength) {
+                this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()} because of incorrect contract class log length. Expected the length to be at least ${expectedMinLength}. Got ${logHash.logHash.length}.`);
+                return TX_ERROR_CONTRACT_CLASS_LOG_LENGTH;
             }
         }
-        return {
-            result: 'valid'
-        };
+        return undefined;
     }
 }

package/dest/msg_validators/tx_validator/double_spend_validator.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export interface NullifierSource {
     nullifiersExist: (nullifiers: Buffer[]) => Promise<boolean[]>;

package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"double_spend_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/double_spend_validator.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,KAAK,KAAK,EAAM,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAkB,MAAM,kBAAkB,CAAC;AAE7G,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAIhE,eAAe,EAAE,eAAe;IAItC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsBrD"}
+{"version":3,"file":"double_spend_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/double_spend_validator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,KAAK,EAIV,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAIhE,eAAe,EAAE,eAAe;IAItC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiBrD"}

package/dest/msg_validators/tx_validator/double_spend_validator.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Tx, hasPublicCalls } from '@aztec/stdlib/tx';
+import { TX_ERROR_DUPLICATE_NULLIFIER_IN_TX, TX_ERROR_EXISTING_NULLIFIER, Tx } from '@aztec/stdlib/tx';
 export class DoubleSpendTxValidator {
     #log = createLogger('p2p:tx_validator:tx_double_spend');
     #nullifierSource;
@@ -7,32 +7,26 @@ export class DoubleSpendTxValidator {
         this.#nullifierSource = nullifierSource;
     }
     async validateTx(tx) {
-        // Don't need to check for duplicate nullifiers if the tx has public calls
-        // because the AVM will perform merkle insertions as it goes and will fail on
-        // duplicate nullifier. In fact we CANNOT check here because the nullifiers
-        // have already been inserted, and so they will exist in nullifierSource.
-        if (!hasPublicCalls(tx)) {
-            const nullifiers = tx instanceof Tx ? tx.data.getNonEmptyNullifiers() : tx.txEffect.nullifiers;
-            // Ditch this tx if it has repeated nullifiers
-            const uniqueNullifiers = new Set(nullifiers);
-            if (uniqueNullifiers.size !== nullifiers.length) {
-                this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
-                return {
-                    result: 'invalid',
-                    reason: [
-                        'Duplicate nullifier in tx'
-                    ]
-                };
-            }
-            if ((await this.#nullifierSource.nullifiersExist(nullifiers.map((n)=>n.toBuffer()))).some(Boolean)) {
-                this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for repeating a nullifier`);
-                return {
-                    result: 'invalid',
-                    reason: [
-                        'Existing nullifier'
-                    ]
-                };
-            }
+        const nullifiers = tx instanceof Tx ? tx.data.getNonEmptyNullifiers() : tx.txEffect.nullifiers;
+        // Ditch this tx if it has repeated nullifiers
+        const uniqueNullifiers = new Set(nullifiers.map((n)=>n.toBigInt()));
+        if (uniqueNullifiers.size !== nullifiers.length) {
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} for emitting duplicate nullifiers`);
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_DUPLICATE_NULLIFIER_IN_TX
+                ]
+            };
+        }
+        if ((await this.#nullifierSource.nullifiersExist(nullifiers.map((n)=>n.toBuffer()))).some(Boolean)) {
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} for repeating a nullifier`);
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_EXISTING_NULLIFIER
+                ]
+            };
         }
         return {
             result: 'valid'

package/dest/msg_validators/tx_validator/factory.d.ts

@@ -0,0 +1,15 @@
+import { Fr } from '@aztec/foundation/fields';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { GasFees } from '@aztec/stdlib/gas';
+import type { AllowedElement, ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import type { Tx, TxValidationResult } from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+export interface MessageValidator {
+    validator: {
+        validateTx(tx: Tx): Promise<TxValidationResult>;
+    };
+    severity: PeerErrorSeverity;
+}
+export declare function createTxMessageValidators(timestamp: UInt64, blockNumber: number, worldStateSynchronizer: WorldStateSynchronizer, gasFees: GasFees, l1ChainId: number, rollupVersion: number, protocolContractsHash: Fr, contractDataSource: ContractDataSource, proofVerifier: ClientProtocolCircuitVerifier, txsPermitted: boolean, allowedInSetup?: AllowedElement[]): Record<string, MessageValidator>[];
+//# sourceMappingURL=factory.d.ts.map

package/dest/msg_validators/tx_validator/factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,EAAE,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAalD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE;QACT,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;KACjD,CAAC;IACF,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,qBAAqB,EAAE,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,6BAA6B,EAC5C,YAAY,EAAE,OAAO,EACrB,cAAc,GAAE,cAAc,EAAO,GACpC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,CA+DpC"}

package/dest/msg_validators/tx_validator/factory.js

@@ -0,0 +1,74 @@
+import { Fr } from '@aztec/foundation/fields';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { DatabasePublicStateSource, MerkleTreeId } from '@aztec/stdlib/trees';
+import { ArchiveCache } from './archive_cache.js';
+import { BlockHeaderTxValidator } from './block_header_validator.js';
+import { DataTxValidator } from './data_validator.js';
+import { DoubleSpendTxValidator } from './double_spend_validator.js';
+import { GasTxValidator } from './gas_validator.js';
+import { MetadataTxValidator } from './metadata_validator.js';
+import { PhasesTxValidator } from './phases_validator.js';
+import { TimestampTxValidator } from './timestamp_validator.js';
+import { TxPermittedValidator } from './tx_permitted_validator.js';
+import { TxProofValidator } from './tx_proof_validator.js';
+export function createTxMessageValidators(timestamp, blockNumber, worldStateSynchronizer, gasFees, l1ChainId, rollupVersion, protocolContractsHash, contractDataSource, proofVerifier, txsPermitted, allowedInSetup = []) {
+    const merkleTree = worldStateSynchronizer.getCommitted();
+    return [
+        {
+            txsPermittedValidator: {
+                validator: new TxPermittedValidator(txsPermitted),
+                severity: PeerErrorSeverity.MidToleranceError
+            },
+            dataValidator: {
+                validator: new DataTxValidator(),
+                severity: PeerErrorSeverity.HighToleranceError
+            },
+            metadataValidator: {
+                validator: new MetadataTxValidator({
+                    l1ChainId: new Fr(l1ChainId),
+                    rollupVersion: new Fr(rollupVersion),
+                    protocolContractsHash,
+                    vkTreeRoot: getVKTreeRoot()
+                }),
+                severity: PeerErrorSeverity.HighToleranceError
+            },
+            timestampValidator: {
+                validator: new TimestampTxValidator({
+                    timestamp,
+                    blockNumber
+                }),
+                severity: PeerErrorSeverity.MidToleranceError
+            },
+            doubleSpendValidator: {
+                validator: new DoubleSpendTxValidator({
+                    nullifiersExist: async (nullifiers)=>{
+                        const merkleTree = worldStateSynchronizer.getCommitted();
+                        const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
+                        return indices.map((index)=>index !== undefined);
+                    }
+                }),
+                severity: PeerErrorSeverity.HighToleranceError
+            },
+            gasValidator: {
+                validator: new GasTxValidator(new DatabasePublicStateSource(merkleTree), ProtocolContractAddress.FeeJuice, gasFees),
+                severity: PeerErrorSeverity.HighToleranceError
+            },
+            phasesValidator: {
+                validator: new PhasesTxValidator(contractDataSource, allowedInSetup, timestamp),
+                severity: PeerErrorSeverity.MidToleranceError
+            },
+            blockHeaderValidator: {
+                validator: new BlockHeaderTxValidator(new ArchiveCache(merkleTree)),
+                severity: PeerErrorSeverity.HighToleranceError
+            }
+        },
+        {
+            proofValidator: {
+                validator: new TxProofValidator(proofVerifier),
+                severity: PeerErrorSeverity.MidToleranceError
+            }
+        }
+    ];
+}

package/dest/msg_validators/tx_validator/gas_validator.d.ts

@@ -0,0 +1,11 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { GasFees } from '@aztec/stdlib/gas';
+import type { PublicStateSource } from '@aztec/stdlib/trees';
+import { type Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+export declare class GasTxValidator implements TxValidator<Tx> {
+    #private;
+    constructor(publicDataSource: PublicStateSource, feeJuiceAddress: AztecAddress, gasFees: GasFees);
+    validateTx(tx: Tx): Promise<TxValidationResult>;
+    validateTxFee(tx: Tx): Promise<TxValidationResult>;
+}
+//# sourceMappingURL=gas_validator.d.ts.map

package/dest/msg_validators/tx_validator/gas_validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAO,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAKL,KAAK,EAAE,EAEP,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,cAAe,YAAW,WAAW,CAAC,EAAE,CAAC;;gBAMxC,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAM1F,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA4DxC,aAAa,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0ChE"}

package/dest/msg_validators/tx_validator/gas_validator.js

@@ -0,0 +1,115 @@
+import { AVM_MAX_PROCESSABLE_L2_GAS, FIXED_DA_GAS, FIXED_L2_GAS } from '@aztec/constants';
+import { createLogger } from '@aztec/foundation/log';
+import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
+import { getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import { Gas } from '@aztec/stdlib/gas';
+import { TX_ERROR_GAS_LIMIT_TOO_HIGH, TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE, TX_ERROR_INSUFFICIENT_FEE_PER_GAS, TX_ERROR_INSUFFICIENT_GAS_LIMIT, TxExecutionPhase } from '@aztec/stdlib/tx';
+export class GasTxValidator {
+    #log = createLogger('sequencer:tx_validator:tx_gas');
+    #publicDataSource;
+    #feeJuiceAddress;
+    #gasFees;
+    constructor(publicDataSource, feeJuiceAddress, gasFees){
+        this.#publicDataSource = publicDataSource;
+        this.#feeJuiceAddress = feeJuiceAddress;
+        this.#gasFees = gasFees;
+    }
+    async validateTx(tx) {
+        const gasLimitValidation = this.#validateGasLimit(tx);
+        if (gasLimitValidation.result === 'invalid') {
+            return Promise.resolve(gasLimitValidation);
+        }
+        if (this.#shouldSkip(tx)) {
+            return Promise.resolve({
+                result: 'skipped',
+                reason: [
+                    TX_ERROR_INSUFFICIENT_FEE_PER_GAS
+                ]
+            });
+        }
+        return await this.validateTxFee(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 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) {
+        const gasSettings = tx.data.constants.txContext.gasSettings;
+        // Skip the tx if its max fees are not enough for the current block's gas fees.
+        const maxFeesPerGas = gasSettings.maxFeesPerGas;
+        const notEnoughMaxFees = maxFeesPerGas.feePerDaGas < this.#gasFees.feePerDaGas || maxFeesPerGas.feePerL2Gas < this.#gasFees.feePerL2Gas;
+        if (notEnoughMaxFees) {
+            this.#log.verbose(`Skipping transaction ${tx.getTxHash().toString()} due to insufficient fee per gas`, {
+                txMaxFeesPerGas: maxFeesPerGas.toInspect(),
+                currentGasFees: this.#gasFees.toInspect()
+            });
+        }
+        return notEnoughMaxFees;
+    }
+    /**
+   * Check whether the tx's gas limit is above the minimum amount.
+   */ #validateGasLimit(tx) {
+        const gasLimits = tx.data.constants.txContext.gasSettings.gasLimits;
+        const minGasLimits = new Gas(FIXED_DA_GAS, FIXED_L2_GAS);
+        if (minGasLimits.gtAny(gasLimits)) {
+            this.#log.verbose(`Rejecting transaction due to the gas limit(s) not being above the minimum gas limit`, {
+                gasLimits,
+                minGasLimits
+            });
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_INSUFFICIENT_GAS_LIMIT
+                ]
+            };
+        }
+        if (gasLimits.l2Gas > AVM_MAX_PROCESSABLE_L2_GAS) {
+            this.#log.verbose(`Rejecting transaction due to the gas limit(s) being higher than the maximum processable gas`, {
+                gasLimits,
+                minGasLimits
+            });
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_GAS_LIMIT_TOO_HIGH
+                ]
+            };
+        }
+        return {
+            result: 'valid'
+        };
+    }
+    async validateTxFee(tx) {
+        const feePayer = tx.data.feePayer;
+        // Compute the maximum fee that this tx may pay, based on its gasLimits and maxFeePerGas
+        const feeLimit = tx.data.constants.txContext.gasSettings.getFeeLimit();
+        // Read current balance of the feePayer
+        const initialBalance = await this.#publicDataSource.storageRead(this.#feeJuiceAddress, await computeFeePayerBalanceStorageSlot(feePayer));
+        // If there is a claim in this tx that increases the fee payer balance in Fee Juice, add it to balance
+        const setupFns = getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP);
+        const increasePublicBalanceSelector = await FunctionSelector.fromSignature('_increase_public_balance((Field),u128)');
+        // Arguments of the claim function call:
+        // - args[0]: Amount recipient.
+        // - args[1]: Amount being claimed.
+        const claimFunctionCall = setupFns.find((fn)=>fn.request.contractAddress.equals(this.#feeJuiceAddress) && fn.request.msgSender.equals(this.#feeJuiceAddress) && fn.calldata.length > 2 && fn.functionSelector.equals(increasePublicBalanceSelector) && fn.args[0].equals(feePayer.toField()) && !fn.request.isStaticCall);
+        const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[1]) : initialBalance;
+        if (balance.lt(feeLimit)) {
+            this.#log.verbose(`Rejecting transaction due to not enough fee payer balance`, {
+                feePayer,
+                balance: balance.toBigInt(),
+                feeLimit: feeLimit.toBigInt()
+            });
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE
+                ]
+            };
+        }
+        return {
+            result: 'valid'
+        };
+    }
+}

package/dest/msg_validators/tx_validator/index.d.ts

@@ -4,4 +4,11 @@ export * from './double_spend_validator.js';
 export * from './metadata_validator.js';
 export * from './tx_proof_validator.js';
 export * from './block_header_validator.js';
+export * from './gas_validator.js';
+export * from './phases_validator.js';
+export * from './test_utils.js';
+export * from './allowed_public_setup.js';
+export * from './archive_cache.js';
+export * from './tx_permitted_validator.js';
+export * from './timestamp_validator.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/msg_validators/tx_validator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC"}

package/dest/msg_validators/tx_validator/index.js

@@ -4,3 +4,10 @@ export * from './double_spend_validator.js';
 export * from './metadata_validator.js';
 export * from './tx_proof_validator.js';
 export * from './block_header_validator.js';
+export * from './gas_validator.js';
+export * from './phases_validator.js';
+export * from './test_utils.js';
+export * from './allowed_public_setup.js';
+export * from './archive_cache.js';
+export * from './tx_permitted_validator.js';
+export * from './timestamp_validator.js';

package/dest/msg_validators/tx_validator/metadata_validator.d.ts

@@ -2,9 +2,13 @@ import type { Fr } from '@aztec/foundation/fields';
 import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export declare class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
     #private;
-    private chainId;
-    private blockNumber;
-    constructor(chainId: Fr, blockNumber: Fr);
+    private values;
+    constructor(values: {
+        l1ChainId: Fr;
+        rollupVersion: Fr;
+        vkTreeRoot: Fr;
+        protocolContractsHash: Fr;
+    });
     validateTx(tx: T): Promise<TxValidationResult>;
 }
 //# sourceMappingURL=metadata_validator.d.ts.map