@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.001888fc

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

@@ -1 +1 @@
-{"version":3,"file":"aggregate_tx_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/aggregate_tx_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEzF,qBAAa,oBAAoB,CAAC,CAAC,SAAS,EAAE,GAAG,WAAW,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;gBAEzE,GAAG,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE;IAQrC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmBrD"}
+{"version":3,"file":"aggregate_tx_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/aggregate_tx_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAExE,qBAAa,oBAAoB,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,YAAY,GAAG,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EAM1C;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBnD;CACF"}

package/dest/msg_validators/tx_validator/aggregate_tx_validator.js

@@ -1,17 +1,17 @@
 export class AggregateTxValidator {
-    #validators;
+    validators;
     constructor(...validators){
         if (validators.length === 0) {
             throw new Error('At least one validator must be provided');
         }
-        this.#validators = validators;
+        this.validators = validators;
     }
     async validateTx(tx) {
         const aggregate = {
             result: 'valid',
             reason: []
         };
-        for (const validator of this.#validators){
+        for (const validator of this.validators){
             const result = await validator.validateTx(tx);
             if (result.result === 'invalid') {
                 aggregate.result = 'invalid';

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

@@ -0,0 +1,4 @@
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
+/** Returns the default list of functions allowed to run in the setup phase of a transaction. */
+export declare function getDefaultAllowedSetupFunctions(): Promise<AllowedElement[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZF9wdWJsaWNfc2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy90eF92YWxpZGF0b3IvYWxsb3dlZF9wdWJsaWNfc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsZ0dBQWdHO0FBQ2hHLHdCQUFzQiwrQkFBK0IsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FtQmpGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"allowed_public_setup.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/allowed_public_setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,gGAAgG;AAChG,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAmBjF"}

package/dest/msg_validators/tx_validator/allowed_public_setup.js

@@ -0,0 +1,31 @@
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { AuthRegistryArtifact } from '@aztec/protocol-contracts/auth-registry';
+import { FeeJuiceArtifact } from '@aztec/protocol-contracts/fee-juice';
+import { buildAllowedElement } from './allowed_setup_helpers.js';
+let defaultAllowedSetupFunctions;
+/** Returns the default list of functions allowed to run in the setup phase of a transaction. */ export async function getDefaultAllowedSetupFunctions() {
+    if (defaultAllowedSetupFunctions === undefined) {
+        defaultAllowedSetupFunctions = await Promise.all([
+            // AuthRegistry: needed for authwit support via private path (set_authorized_private enqueues _set_authorized)
+            buildAllowedElement(AuthRegistryArtifact, {
+                address: ProtocolContractAddress.AuthRegistry
+            }, '_set_authorized', {
+                onlySelf: true,
+                rejectNullMsgSender: true
+            }),
+            // AuthRegistry: needed for authwit support via public path (PublicFeePaymentMethod calls set_authorized directly)
+            buildAllowedElement(AuthRegistryArtifact, {
+                address: ProtocolContractAddress.AuthRegistry
+            }, 'set_authorized', {
+                rejectNullMsgSender: true
+            }),
+            // FeeJuice: needed for claiming on the same tx as a spend (claim_and_end_setup enqueues this)
+            buildAllowedElement(FeeJuiceArtifact, {
+                address: ProtocolContractAddress.FeeJuice
+            }, '_increase_public_balance', {
+                onlySelf: true
+            })
+        ]);
+    }
+    return defaultAllowedSetupFunctions;
+}

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

@@ -0,0 +1,17 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
+/**
+ * Builds an AllowedElement from a contract artifact, deriving both the function selector
+ * and calldata length from the artifact instead of hardcoding signature strings.
+ */
+export declare function buildAllowedElement(artifact: ContractArtifact, target: {
+    address: AztecAddress;
+} | {
+    classId: Fr;
+}, functionName: string, opts?: {
+    onlySelf?: boolean;
+    rejectNullMsgSender?: boolean;
+}): Promise<AllowedElement>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZF9zZXR1cF9oZWxwZXJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvdHhfdmFsaWRhdG9yL2FsbG93ZWRfc2V0dXBfaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXRFOzs7R0FHRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsUUFBUSxFQUFFLGdCQUFnQixFQUMxQixNQUFNLEVBQUU7SUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFBO0NBQUUsR0FBRztJQUFFLE9BQU8sRUFBRSxFQUFFLENBQUE7Q0FBRSxFQUNuRCxZQUFZLEVBQUUsTUFBTSxFQUNwQixJQUFJLENBQUMsRUFBRTtJQUFFLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLG1CQUFtQixDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQUUsR0FDM0QsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQWV6QiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"allowed_setup_helpers.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/allowed_setup_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,EACnD,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC3D,OAAO,CAAC,cAAc,CAAC,CAezB"}

package/dest/msg_validators/tx_validator/allowed_setup_helpers.js

@@ -0,0 +1,24 @@
+import { FunctionSelector, countArgumentsSize, getAllFunctionAbis } from '@aztec/stdlib/abi';
+/**
+ * Builds an AllowedElement from a contract artifact, deriving both the function selector
+ * and calldata length from the artifact instead of hardcoding signature strings.
+ */ export async function buildAllowedElement(artifact, target, functionName, opts) {
+    const allFunctions = getAllFunctionAbis(artifact);
+    const fn = allFunctions.find((f)=>f.name === functionName);
+    if (!fn) {
+        throw new Error(`Unknown function ${functionName} in artifact ${artifact.name}`);
+    }
+    const selector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
+    const calldataLength = 1 + countArgumentsSize(fn);
+    return {
+        ...target,
+        selector,
+        calldataLength,
+        ...opts?.onlySelf ? {
+            onlySelf: true
+        } : {},
+        ...opts?.rejectNullMsgSender ? {
+            rejectNullMsgSender: true
+        } : {}
+    };
+}

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

@@ -0,0 +1,14 @@
+import type { ArchiveSource } from '@aztec/p2p';
+import type { BlockHash } from '@aztec/stdlib/block';
+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: BlockHash[]): Promise<(bigint | undefined)[]>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZV9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hcmNoaXZlX2NhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNoRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hGOzs7R0FHRztBQUNILHFCQUFhLFlBQWEsWUFBVyxhQUFhO0lBR3BDLE9BQU8sQ0FBQyxFQUFFO0lBRnRCLFFBQVEsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRTlCLFlBQW9CLEVBQUUsRUFBRSx3QkFBd0IsRUFFL0M7SUFFWSxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsU0FBUyxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FVckY7Q0FDRiJ9

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,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,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;IAE9B,YAAoB,EAAE,EAAE,wBAAwB,EAE/C;IAEY,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAUrF;CACF"}

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())).map((n)=>n.toFr());
+        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

@@ -1,11 +1,25 @@
-import type { Fr } from '@aztec/foundation/fields';
-import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import { type LoggerBindings } from '@aztec/foundation/log';
+import type { BlockHash } from '@aztec/stdlib/block';
+import { type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export interface ArchiveSource {
-    getArchiveIndices: (archives: Fr[]) => Promise<(bigint | undefined)[]>;
+    getArchiveIndices: (archives: BlockHash[]) => Promise<(bigint | undefined)[]>;
 }
-export declare class BlockHeaderTxValidator<T extends AnyTx> implements TxValidator<T> {
+/** Structural interface for block header validation. */
+export interface HasBlockHeaderData {
+    txHash: {
+        toString(): string;
+    };
+    data: {
+        constants: {
+            anchorBlockHeader: {
+                hash(): Promise<BlockHash>;
+            };
+        };
+    };
+}
+export declare class BlockHeaderTxValidator<T extends HasBlockHeaderData> implements TxValidator<T> {
     #private;
-    constructor(archiveSource: ArchiveSource);
+    constructor(archiveSource: ArchiveSource, bindings?: LoggerBindings);
     validateTx(tx: T): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=block_header_validator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGVhZGVyX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9ibG9ja19oZWFkZXJfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRCxPQUFPLEVBQXlCLEtBQUssa0JBQWtCLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVwRyxNQUFNLFdBQVcsYUFBYTtJQUM1QixpQkFBaUIsRUFBRSxDQUFDLFFBQVEsRUFBRSxTQUFTLEVBQUUsS0FBSyxPQUFPLENBQUMsQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0NBQy9FO0FBRUQsd0RBQXdEO0FBQ3hELE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsTUFBTSxFQUFFO1FBQUUsUUFBUSxJQUFJLE1BQU0sQ0FBQTtLQUFFLENBQUM7SUFDL0IsSUFBSSxFQUFFO1FBQ0osU0FBUyxFQUFFO1lBQ1QsaUJBQWlCLEVBQUU7Z0JBQ2pCLElBQUksSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7YUFDNUIsQ0FBQztTQUNILENBQUM7S0FDSCxDQUFDO0NBQ0g7QUFFRCxxQkFBYSxzQkFBc0IsQ0FBQyxDQUFDLFNBQVMsa0JBQWtCLENBQUUsWUFBVyxXQUFXLENBQUMsQ0FBQyxDQUFDOztJQUl6RixZQUFZLGFBQWEsRUFBRSxhQUFhLEVBQUUsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUdsRTtJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQU9uRDtDQUNGIn0=

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,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAyB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpG,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/E;AAED,wDAAwD;AACxD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/B,IAAI,EAAE;QACJ,SAAS,EAAE;YACT,iBAAiB,EAAE;gBACjB,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;aAC5B,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,kBAAkB,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAIzF,YAAY,aAAa,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,EAGlE;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAOnD;CACF"}

package/dest/msg_validators/tx_validator/block_header_validator.js

@@ -1,21 +1,22 @@
 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');
+    #log;
     #archiveSource;
-    constructor(archiveSource){
+    constructor(archiveSource, bindings){
         this.#archiveSource = archiveSource;
+        this.#log = createLogger('p2p:tx_validator:tx_block_header', bindings);
     }
     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 ${tx.txHash} 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

@@ -1,6 +1,8 @@
+import { type LoggerBindings } from '@aztec/foundation/log';
 import { Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export declare class DataTxValidator implements TxValidator<Tx> {
     #private;
+    constructor(bindings?: LoggerBindings);
     validateTx(tx: Tx): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=data_validator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy90eF92YWxpZGF0b3IvZGF0YV92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRXZGLE9BQU8sRUFTTCxFQUFFLEVBQ0YsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxXQUFXLEVBQ2pCLE1BQU0sa0JBQWtCLENBQUM7QUFFMUIscUJBQWEsZUFBZ0IsWUFBVyxXQUFXLENBQUMsRUFBRSxDQUFDOztJQUdyRCxZQUFZLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFFcEM7SUFFSyxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FNcEQ7Q0FtR0YifQ==

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":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EASL,EAAE,EACF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAGrD,YAAY,QAAQ,CAAC,EAAE,cAAc,EAEpC;IAEK,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMpD;CAmGF"}

package/dest/msg_validators/tx_validator/data_validator.js

@@ -1,107 +1,80 @@
-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');
+    #log;
+    constructor(bindings){
+        this.#log = createLogger('p2p:tx_validator:tx_data', bindings);
+    }
     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,12 +1,21 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { type LoggerBindings } from '@aztec/foundation/log';
+import { type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export interface NullifierSource {
     nullifiersExist: (nullifiers: Buffer[]) => Promise<boolean[]>;
 }
-export declare class DoubleSpendTxValidator<T extends AnyTx> implements TxValidator<T> {
+/** Structural interface for double-spend validation. */
+export interface HasNullifierData {
+    txHash: {
+        toString(): string;
+    };
+    data: {
+        getNonEmptyNullifiers(): Fr[];
+    };
+}
+export declare class DoubleSpendTxValidator<T extends HasNullifierData> implements TxValidator<T> {
     #private;
-    constructor(nullifierSource: NullifierSource);
+    constructor(nullifierSource: NullifierSource, bindings?: LoggerBindings);
     validateTx(tx: T): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=double_spend_validator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG91YmxlX3NwZW5kX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9kb3VibGVfc3BlbmRfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RixPQUFPLEVBR0wsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxXQUFXLEVBQ2pCLE1BQU0sa0JBQWtCLENBQUM7QUFFMUIsTUFBTSxXQUFXLGVBQWU7SUFDOUIsZUFBZSxFQUFFLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0NBQy9EO0FBRUQsd0RBQXdEO0FBQ3hELE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsTUFBTSxFQUFFO1FBQUUsUUFBUSxJQUFJLE1BQU0sQ0FBQTtLQUFFLENBQUM7SUFDL0IsSUFBSSxFQUFFO1FBQUUscUJBQXFCLElBQUksRUFBRSxFQUFFLENBQUE7S0FBRSxDQUFDO0NBQ3pDO0FBRUQscUJBQWEsc0JBQXNCLENBQUMsQ0FBQyxTQUFTLGdCQUFnQixDQUFFLFlBQVcsV0FBVyxDQUFDLENBQUMsQ0FBQzs7SUFJdkYsWUFBWSxlQUFlLEVBQUUsZUFBZSxFQUFFLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHdEU7SUFFSyxVQUFVLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FnQm5EO0NBQ0YifQ==

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":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAGL,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,wDAAwD;AACxD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/B,IAAI,EAAE;QAAE,qBAAqB,IAAI,EAAE,EAAE,CAAA;KAAE,CAAC;CACzC;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,gBAAgB,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAIvF,YAAY,eAAe,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,cAAc,EAGtE;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgBnD;CACF"}

package/dest/msg_validators/tx_validator/double_spend_validator.js

@@ -1,38 +1,33 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Tx, hasPublicCalls } from '@aztec/stdlib/tx';
+import { TX_ERROR_DUPLICATE_NULLIFIER_IN_TX, TX_ERROR_EXISTING_NULLIFIER } from '@aztec/stdlib/tx';
 export class DoubleSpendTxValidator {
-    #log = createLogger('p2p:tx_validator:tx_double_spend');
+    #log;
     #nullifierSource;
-    constructor(nullifierSource){
+    constructor(nullifierSource, bindings){
         this.#nullifierSource = nullifierSource;
+        this.#log = createLogger('p2p:tx_validator:tx_double_spend', bindings);
     }
     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.data.getNonEmptyNullifiers();
+        // 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 ${tx.txHash} 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 ${tx.txHash} for repeating a nullifier`);
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_EXISTING_NULLIFIER
+                ]
+            };
         }
         return {
             result: 'valid'