@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.1142ef1

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';
-//# sourceMappingURL=index.d.ts.map
+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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy90eF92YWxpZGF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYywwQkFBMEIsQ0FBQyJ9

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

@@ -1,10 +1,14 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGFfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvdHhfdmFsaWRhdG9yL21ldGFkYXRhX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV6RCxPQUFPLEVBQ0wsS0FBSyxLQUFLLEVBS1YsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxXQUFXLEVBQ2pCLE1BQU0sa0JBQWtCLENBQUM7QUFFMUIscUJBQWEsbUJBQW1CLENBQUMsQ0FBQyxTQUFTLEtBQUssQ0FBRSxZQUFXLFdBQVcsQ0FBQyxDQUFDLENBQUM7O0lBSXZFLE9BQU8sQ0FBQyxNQUFNO0lBRGhCLFlBQ1UsTUFBTSxFQUFFO1FBQ2QsU0FBUyxFQUFFLEVBQUUsQ0FBQztRQUNkLGFBQWEsRUFBRSxFQUFFLENBQUM7UUFDbEIsVUFBVSxFQUFFLEVBQUUsQ0FBQztRQUNmLHFCQUFxQixFQUFFLEVBQUUsQ0FBQztLQUMzQixFQUNDO0lBRUosVUFBVSxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBZTdDO0NBcURGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"metadata_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/metadata_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,qBAAa,mBAAmB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAG7D,OAAO,CAAC,OAAO;IAAM,OAAO,CAAC,WAAW;gBAAhC,OAAO,EAAE,EAAE,EAAU,WAAW,EAAE,EAAE;IAElD,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsCrD"}
+{"version":3,"file":"metadata_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/metadata_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EACL,KAAK,KAAK,EAKV,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,mBAAmB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAIvE,OAAO,CAAC,MAAM;IADhB,YACU,MAAM,EAAE;QACd,SAAS,EAAE,EAAE,CAAC;QACd,aAAa,EAAE,EAAE,CAAC;QAClB,UAAU,EAAE,EAAE,CAAC;QACf,qBAAqB,EAAE,EAAE,CAAC;KAC3B,EACC;IAEJ,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAe7C;CAqDF"}

package/dest/msg_validators/tx_validator/metadata_validator.js

@@ -1,41 +1,60 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Tx } from '@aztec/stdlib/tx';
+import { TX_ERROR_INCORRECT_L1_CHAIN_ID, TX_ERROR_INCORRECT_PROTOCOL_CONTRACTS_HASH, TX_ERROR_INCORRECT_ROLLUP_VERSION, TX_ERROR_INCORRECT_VK_TREE_ROOT } from '@aztec/stdlib/tx';
 export class MetadataTxValidator {
-    chainId;
-    blockNumber;
+    values;
     #log;
-    constructor(chainId, blockNumber){
-        this.chainId = chainId;
-        this.blockNumber = blockNumber;
+    constructor(values){
+        this.values = values;
         this.#log = createLogger('p2p:tx_validator:tx_metadata');
     }
-    async validateTx(tx) {
+    validateTx(tx) {
         const errors = [];
-        if (!await this.#hasCorrectChainId(tx)) {
-            errors.push('Incorrect chain id');
+        if (!this.#hasCorrectL1ChainId(tx)) {
+            errors.push(TX_ERROR_INCORRECT_L1_CHAIN_ID);
         }
-        if (!await this.#isValidForBlockNumber(tx)) {
-            errors.push('Invalid block number');
+        if (!this.#hasCorrectRollupVersion(tx)) {
+            errors.push(TX_ERROR_INCORRECT_ROLLUP_VERSION);
         }
-        return errors.length > 0 ? {
+        if (!this.#hasCorrectVkTreeRoot(tx)) {
+            errors.push(TX_ERROR_INCORRECT_VK_TREE_ROOT);
+        }
+        if (!this.#hasCorrectprotocolContractsHash(tx)) {
+            errors.push(TX_ERROR_INCORRECT_PROTOCOL_CONTRACTS_HASH);
+        }
+        return Promise.resolve(errors.length > 0 ? {
             result: 'invalid',
             reason: errors
         } : {
             result: 'valid'
-        };
+        });
+    }
+    #hasCorrectVkTreeRoot(tx) {
+        // This gets implicitly tested in the proof validator, but we can get a much cheaper check here by looking early at the vk.
+        if (!tx.data.constants.vkTreeRoot.equals(this.values.vkTreeRoot)) {
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} because of incorrect vk tree root ${tx.data.constants.vkTreeRoot.toString()} != ${this.values.vkTreeRoot.toString()}`);
+            return false;
+        } else {
+            return true;
+        }
+    }
+    #hasCorrectprotocolContractsHash(tx) {
+        if (!tx.data.constants.protocolContractsHash.equals(this.values.protocolContractsHash)) {
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} because of incorrect protocol contracts hash ${tx.data.constants.protocolContractsHash.toString()} != ${this.values.protocolContractsHash.toString()}`);
+            return false;
+        }
+        return true;
     }
-    async #hasCorrectChainId(tx) {
-        if (!tx.data.constants.txContext.chainId.equals(this.chainId)) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because of incorrect chain ${tx.data.constants.txContext.chainId.toNumber()} != ${this.chainId.toNumber()}`);
+    #hasCorrectL1ChainId(tx) {
+        if (!tx.data.constants.txContext.chainId.equals(this.values.l1ChainId)) {
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} because of incorrect L1 chain ${tx.data.constants.txContext.chainId.toNumber()} != ${this.values.l1ChainId.toNumber()}`);
             return false;
         } else {
             return true;
         }
     }
-    async #isValidForBlockNumber(tx) {
-        const maxBlockNumber = tx.data.rollupValidationRequests.maxBlockNumber;
-        if (maxBlockNumber.isSome && maxBlockNumber.value < this.blockNumber) {
-            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for low max block number. Tx max block number: ${maxBlockNumber.value}, current block number: ${this.blockNumber}.`);
+    #hasCorrectRollupVersion(tx) {
+        if (!tx.data.constants.txContext.version.equals(this.values.rollupVersion)) {
+            this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} because of incorrect rollup version ${tx.data.constants.txContext.version.toNumber()} != ${this.values.rollupVersion.toNumber()}`);
             return false;
         } else {
             return true;

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

@@ -0,0 +1,14 @@
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
+import { Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+export declare class PhasesTxValidator implements TxValidator<Tx> {
+    #private;
+    private setupAllowList;
+    private timestamp;
+    private contractsDB;
+    constructor(contracts: ContractDataSource, setupAllowList: AllowedElement[], timestamp: UInt64);
+    validateTx(tx: Tx): Promise<TxValidationResult>;
+    private isOnAllowList;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGhhc2VzX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9waGFzZXNfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUlMLEVBQUUsRUFFRixLQUFLLGtCQUFrQixFQUN2QixLQUFLLFdBQVcsRUFDakIsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxxQkFBYSxpQkFBa0IsWUFBVyxXQUFXLENBQUMsRUFBRSxDQUFDOztJQU1yRCxPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsU0FBUztJQUxuQixPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUV2QyxZQUNFLFNBQVMsRUFBRSxrQkFBa0IsRUFDckIsY0FBYyxFQUFFLGNBQWMsRUFBRSxFQUNoQyxTQUFTLEVBQUUsTUFBTSxFQUcxQjtJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQXFDcEQ7WUFFYSxhQUFhO0NBaUQ1QiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"phases_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/phases_validator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAIL,EAAE,EAEF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,qBAAa,iBAAkB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAMrD,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IALnB,OAAO,CAAC,WAAW,CAAoB;IAEvC,YACE,SAAS,EAAE,kBAAkB,EACrB,cAAc,EAAE,cAAc,EAAE,EAChC,SAAS,EAAE,MAAM,EAG1B;IAEK,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqCpD;YAEa,aAAa;CAiD5B"}

package/dest/msg_validators/tx_validator/phases_validator.js

@@ -0,0 +1,93 @@
+import { createLogger } from '@aztec/foundation/log';
+import { PublicContractsDB, getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
+import { TX_ERROR_DURING_VALIDATION, TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED, TxExecutionPhase } from '@aztec/stdlib/tx';
+export class PhasesTxValidator {
+    setupAllowList;
+    timestamp;
+    #log;
+    contractsDB;
+    constructor(contracts, setupAllowList, timestamp){
+        this.setupAllowList = setupAllowList;
+        this.timestamp = timestamp;
+        this.#log = createLogger('sequencer:tx_validator:tx_phases');
+        this.contractsDB = new PublicContractsDB(contracts);
+    }
+    async validateTx(tx) {
+        this.contractsDB.createCheckpoint();
+        try {
+            // TODO(@spalladino): We add this just to handle public authwit-check calls during setup
+            // which are needed for public FPC flows, but fail if the account contract hasnt been deployed yet,
+            // which is what we're trying to do as part of the current txs.
+            // We only need to create/revert checkpoint here because of this addNewContracts call.
+            await this.contractsDB.addNewContracts(tx);
+            if (!tx.data.forPublic) {
+                this.#log.debug(`Tx ${tx.getTxHash().toString()} does not contain enqueued public functions. Skipping phases validation.`);
+                return {
+                    result: 'valid'
+                };
+            }
+            const setupFns = getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP);
+            for (const setupFn of setupFns){
+                if (!await this.isOnAllowList(setupFn, this.setupAllowList)) {
+                    this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()} because it calls setup function not on allow list: ${setupFn.request.contractAddress}:${setupFn.functionSelector}`, {
+                        allowList: this.setupAllowList
+                    });
+                    return {
+                        result: 'invalid',
+                        reason: [
+                            TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED
+                        ]
+                    };
+                }
+            }
+            return {
+                result: 'valid'
+            };
+        } catch (err) {
+            this.#log.error(`Error validating phases for tx`, err);
+            return {
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_DURING_VALIDATION
+                ]
+            };
+        } finally{
+            this.contractsDB.revertCheckpoint();
+        }
+    }
+    async isOnAllowList(publicCall, allowList) {
+        if (publicCall.isEmpty()) {
+            return true;
+        }
+        const contractAddress = publicCall.request.contractAddress;
+        const functionSelector = publicCall.functionSelector;
+        // do these checks first since they don't require the contract class
+        for (const entry of allowList){
+            if ('address' in entry && !('selector' in entry)) {
+                if (contractAddress.equals(entry.address)) {
+                    return true;
+                }
+            }
+            if ('address' in entry && 'selector' in entry) {
+                if (contractAddress.equals(entry.address) && entry.selector.equals(functionSelector)) {
+                    return true;
+                }
+            }
+            const contractClass = await this.contractsDB.getContractInstance(contractAddress, this.timestamp);
+            if (!contractClass) {
+                throw new Error(`Contract not found: ${contractAddress}`);
+            }
+            if ('classId' in entry && !('selector' in entry)) {
+                if (contractClass.currentContractClassId.equals(entry.classId)) {
+                    return true;
+                }
+            }
+            if ('classId' in entry && 'selector' in entry) {
+                if (contractClass.currentContractClassId.equals(entry.classId) && (entry.selector === undefined || entry.selector.equals(functionSelector))) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,17 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type Tx } from '@aztec/stdlib/tx';
+export declare function patchNonRevertibleFn(tx: Tx, index: number, overrides: {
+    address?: AztecAddress;
+    selector: FunctionSelector;
+    args?: Fr[];
+    msgSender?: AztecAddress;
+}): Promise<AztecAddress>;
+export declare function patchRevertibleFn(tx: Tx, index: number, overrides: {
+    address?: AztecAddress;
+    selector: FunctionSelector;
+    args?: Fr[];
+    msgSender?: AztecAddress;
+}): Promise<AztecAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci90ZXN0X3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFnQixLQUFLLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXpELHdCQUFnQixvQkFBb0IsQ0FDbEMsRUFBRSxFQUFFLEVBQUUsRUFDTixLQUFLLEVBQUUsTUFBTSxFQUNiLFNBQVMsRUFBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUFDLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQUMsU0FBUyxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQUUsR0FDdkcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUV2QjtBQUVELHdCQUFnQixpQkFBaUIsQ0FDL0IsRUFBRSxFQUFFLEVBQUUsRUFDTixLQUFLLEVBQUUsTUFBTSxFQUNiLFNBQVMsRUFBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUFDLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQUMsU0FBUyxDQUFDLEVBQUUsWUFBWSxDQUFBO0NBQUUsR0FDdkcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUV2QiJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/test_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAgB,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEzD,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,SAAS,EAAE;IAAE,OAAO,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAE,GACvG,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,SAAS,EAAE;IAAE,OAAO,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAE,GACvG,OAAO,CAAC,YAAY,CAAC,CAEvB"}

package/dest/msg_validators/tx_validator/test_utils.js

@@ -0,0 +1,22 @@
+import { HashedValues } from '@aztec/stdlib/tx';
+export function patchNonRevertibleFn(tx, index, overrides) {
+    return patchFn('nonRevertibleAccumulatedData', tx, index, overrides);
+}
+export function patchRevertibleFn(tx, index, overrides) {
+    return patchFn('revertibleAccumulatedData', tx, index, overrides);
+}
+async function patchFn(where, tx, index, overrides) {
+    const calldataIndex = where === 'nonRevertibleAccumulatedData' ? index : index + tx.data.forPublic.nonRevertibleAccumulatedData.publicCallRequests.length;
+    const calldata = [
+        overrides.selector.toField(),
+        ...overrides.args ?? []
+    ];
+    const hashedCalldata = await HashedValues.fromCalldata(calldata);
+    tx.publicFunctionCalldata[calldataIndex] = hashedCalldata;
+    const request = tx.data.forPublic[where].publicCallRequests[index];
+    request.contractAddress = overrides.address ?? request.contractAddress;
+    request.msgSender = overrides.msgSender ?? request.msgSender;
+    request.calldataHash = hashedCalldata.hash;
+    tx.data.forPublic[where].publicCallRequests[index] = request;
+    return request.contractAddress;
+}

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

@@ -0,0 +1,13 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+export declare class TimestampTxValidator<T extends AnyTx> implements TxValidator<T> {
+    #private;
+    private values;
+    constructor(values: {
+        timestamp: UInt64;
+        blockNumber: BlockNumber;
+    });
+    validateTx(tx: T): Promise<TxValidationResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZXN0YW1wX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci90aW1lc3RhbXBfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsS0FBSyxLQUFLLEVBRVYsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxXQUFXLEVBRWpCLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbEQscUJBQWEsb0JBQW9CLENBQUMsQ0FBQyxTQUFTLEtBQUssQ0FBRSxZQUFXLFdBQVcsQ0FBQyxDQUFDLENBQUM7O0lBSXhFLE9BQU8sQ0FBQyxNQUFNO0lBRGhCLFlBQ1UsTUFBTSxFQUFFO1FBR2QsU0FBUyxFQUFFLE1BQU0sQ0FBQztRQUVsQixXQUFXLEVBQUUsV0FBVyxDQUFDO0tBQzFCLEVBQ0M7SUFFSixVQUFVLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0F1QjdDO0NBQ0YifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"timestamp_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/timestamp_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EACL,KAAK,KAAK,EAEV,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,qBAAa,oBAAoB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAIxE,OAAO,CAAC,MAAM;IADhB,YACU,MAAM,EAAE;QAGd,SAAS,EAAE,MAAM,CAAC;QAElB,WAAW,EAAE,WAAW,CAAC;KAC1B,EACC;IAEJ,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuB7C;CACF"}

package/dest/msg_validators/tx_validator/timestamp_validator.js

@@ -0,0 +1,32 @@
+import { createLogger } from '@aztec/foundation/log';
+import { TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP, getTxHash } from '@aztec/stdlib/tx';
+export class TimestampTxValidator {
+    values;
+    #log;
+    constructor(values){
+        this.values = values;
+        this.#log = createLogger('p2p:tx_validator:timestamp');
+    }
+    validateTx(tx) {
+        const includeByTimestamp = tx.data.includeByTimestamp;
+        // If building block 1, we skip the expiration check. For details on why see the `validate_include_by_timestamp`
+        // function in `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
+        const buildingBlock1 = this.values.blockNumber === 1;
+        if (!buildingBlock1 && includeByTimestamp < this.values.timestamp) {
+            if (tx.data.constants.anchorBlockHeader.globalVariables.blockNumber === 0) {
+                this.#log.warn(`A tx built against a genesis block failed to be included in block 1 which is the only block in which txs built against a genesis block are allowed to be included.`);
+            }
+            this.#log.verbose(`Rejecting tx ${getTxHash(tx)} for low expiration timestamp. Tx expiration timestamp: ${includeByTimestamp}, timestamp: ${this.values.timestamp}.`);
+            return Promise.resolve({
+                result: 'invalid',
+                reason: [
+                    TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP
+                ]
+            });
+        } else {
+            return Promise.resolve({
+                result: 'valid'
+            });
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+import type { Tx, TxValidationResult, TxValidator } from '@aztec/stdlib/tx';
+export declare class TxPermittedValidator implements TxValidator<Tx> {
+    #private;
+    private permitted;
+    constructor(permitted: boolean);
+    validateTx(tx: Tx): Promise<TxValidationResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcGVybWl0dGVkX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci90eF9wZXJtaXR0ZWRfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RSxxQkFBYSxvQkFBcUIsWUFBVyxXQUFXLENBQUMsRUFBRSxDQUFDOztJQUc5QyxPQUFPLENBQUMsU0FBUztJQUE3QixZQUFvQixTQUFTLEVBQUUsT0FBTyxFQUFJO0lBRTFDLFVBQVUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQU85QztDQUNGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"tx_permitted_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/tx_permitted_validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE5E,qBAAa,oBAAqB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG9C,OAAO,CAAC,SAAS;IAA7B,YAAoB,SAAS,EAAE,OAAO,EAAI;IAE1C,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAO9C;CACF"}

package/dest/msg_validators/tx_validator/tx_permitted_validator.js

@@ -0,0 +1,24 @@
+import { createLogger } from '@aztec/foundation/log';
+export class TxPermittedValidator {
+    permitted;
+    #log;
+    constructor(permitted){
+        this.permitted = permitted;
+        this.#log = createLogger('p2p:tx_validator:tx_permitted');
+    }
+    validateTx(tx) {
+        if (!this.permitted) {
+            const txHash = tx.getTxHash();
+            this.#log.verbose(`Rejecting tx ${txHash.toString()}. Reason: Transactions are not permitted`);
+            return Promise.resolve({
+                result: 'invalid',
+                reason: [
+                    'Transactions are not permitted'
+                ]
+            });
+        }
+        return Promise.resolve({
+            result: 'valid'
+        });
+    }
+}

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

@@ -6,4 +6,4 @@ export declare class TxProofValidator implements TxValidator<Tx> {
     constructor(verifier: ClientProtocolCircuitVerifier);
     validateTx(tx: Tx): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=tx_proof_validator.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvb2ZfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvdHhfdmFsaWRhdG9yL3R4X3Byb29mX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JGLE9BQU8sRUFBMEIsRUFBRSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV6RyxxQkFBYSxnQkFBaUIsWUFBVyxXQUFXLENBQUMsRUFBRSxDQUFDOztJQUcxQyxPQUFPLENBQUMsUUFBUTtJQUE1QixZQUFvQixRQUFRLEVBQUUsNkJBQTZCLEVBQUk7SUFFekQsVUFBVSxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBUXBEO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"tx_proof_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/tx_proof_validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,EAAE,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEjF,qBAAa,gBAAiB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG1C,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,6BAA6B;IAErD,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAQtD"}
+{"version":3,"file":"tx_proof_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/tx_proof_validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAA0B,EAAE,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEzG,qBAAa,gBAAiB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG1C,OAAO,CAAC,QAAQ;IAA5B,YAAoB,QAAQ,EAAE,6BAA6B,EAAI;IAEzD,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQpD;CACF"}

package/dest/msg_validators/tx_validator/tx_proof_validator.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Tx } from '@aztec/stdlib/tx';
+import { TX_ERROR_INVALID_PROOF } from '@aztec/stdlib/tx';
 export class TxProofValidator {
     verifier;
     #log;
@@ -8,16 +8,17 @@ export class TxProofValidator {
         this.#log = createLogger('p2p:tx_validator:private_proof');
     }
     async validateTx(tx) {
-        if (!await this.verifier.verifyProof(tx)) {
-            this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
+        const result = await this.verifier.verifyProof(tx);
+        if (!result.valid) {
+            this.#log.verbose(`Rejecting tx ${tx.getTxHash().toString()} for invalid proof`);
             return {
                 result: 'invalid',
                 reason: [
-                    'Invalid proof'
+                    TX_ERROR_INVALID_PROOF
                 ]
             };
         }
-        this.#log.trace(`Accepted ${Tx.getHash(tx)} with valid proof`);
+        this.#log.trace(`Accepted ${tx.getTxHash().toString()} with valid proof`);
         return {
             result: 'valid'
         };

package/dest/services/data_store.d.ts

@@ -24,4 +24,4 @@ export declare class AztecDatastore implements Datastore {
      */
     private pruneMemoryDatastore;
 }
-//# sourceMappingURL=data_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL2RhdGFfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFFLEtBQUssU0FBUyxFQUFFLEdBQUcsRUFBRSxLQUFLLFFBQVEsRUFBRSxLQUFLLElBQUksRUFBRSxLQUFLLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzVHLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBcUJyRCxxQkFBYSxjQUFlLFlBQVcsU0FBUzs7SUFNOUMsT0FBTyxDQUFDLGNBQWMsQ0FBUztJQUUvQixZQUFZLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxFQUFFLGNBQWMsRUFBRTs7S0FBeUIsRUFLN0U7SUFFSyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRXBDO0lBRUssR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQWN2QztJQUVELEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUUzQztJQUVNLE9BQU8sQ0FBQyxNQUFNLEVBQUUsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FLOUQ7SUFFTSxPQUFPLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxHQUFHLENBQUMsR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFDLENBTzlEO0lBRU0sVUFBVSxDQUFDLE1BQU0sRUFBRSxhQUFhLENBQUMsR0FBRyxDQUFDLEdBQUcsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUtoRTtJQUVLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHcEM7SUFFRCxLQUFLLElBQUksS0FBSyxDQTBCYjtJQUVELEtBQUssQ0FBQyxDQUFDLEVBQUUsS0FBSyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0EwQm5DO0lBRUQsU0FBUyxDQUFDLENBQUMsRUFBRSxRQUFRLEdBQUcsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQXlCekM7WUFFYSxJQUFJO1lBcUJILEdBQUc7SUFrQmxCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLG9CQUFvQjtDQWlCN0IifQ==

package/dest/services/data_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_store.d.ts","sourceRoot":"","sources":["../../src/services/data_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,GAAG,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAqBrD,qBAAa,cAAe,YAAW,SAAS;;IAM9C,OAAO,CAAC,cAAc,CAAS;gBAEnB,EAAE,EAAE,iBAAiB,EAAE,EAAE,cAAc,EAAE;;KAAyB;IAOxE,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAI/B,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAgBxC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;IAIrC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC;IAOxD,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;IASxD,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC;IAO3D,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrC,KAAK,IAAI,KAAK;IA4Bd,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC;IA4BpC,SAAS,CAAC,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC;YA2B5B,IAAI;YAqBH,GAAG;IAkBlB;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAiB7B"}
+{"version":3,"file":"data_store.d.ts","sourceRoot":"","sources":["../../src/services/data_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,GAAG,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAqBrD,qBAAa,cAAe,YAAW,SAAS;;IAM9C,OAAO,CAAC,cAAc,CAAS;IAE/B,YAAY,EAAE,EAAE,iBAAiB,EAAE,EAAE,cAAc,EAAE;;KAAyB,EAK7E;IAEK,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpC;IAEK,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAcvC;IAED,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAE3C;IAEM,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAK9D;IAEM,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,CAO9D;IAEM,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAKhE;IAEK,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpC;IAED,KAAK,IAAI,KAAK,CA0Bb;IAED,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CA0BnC;IAED,SAAS,CAAC,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAyBzC;YAEa,IAAI;YAqBH,GAAG;IAkBlB;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAiB7B"}

package/dest/services/discv5/discV5_service.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="node" resolution-mode="require"/>
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import { ENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
+import { type IDiscv5CreateOptions } from '@nethermindeth/discv5';
+import { ENR } from '@nethermindeth/enr';
 import EventEmitter from 'events';
 import type { P2PConfig } from '../../config.js';
 import { type PeerDiscoveryService, PeerDiscoveryState } from '../service.js';
@@ -11,6 +11,7 @@ import { type PeerDiscoveryService, PeerDiscoveryState } from '../service.js';
 export declare class DiscV5Service extends EventEmitter implements PeerDiscoveryService {
     private peerId;
     private config;
+    private readonly packageVersion;
     private logger;
     /** The Discv5 instance */
     private discv5;
@@ -18,17 +19,17 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     private enr;
     /** Version identifiers. */
     private versions;
-    /** UDP listen addr */
-    private listenMultiAddrUdp;
     private currentState;
-    readonly bootstrapNodes: string[];
     private bootstrapNodePeerIds;
-    private bootstrapNodeEnrs;
+    bootstrapNodeEnrs: ENR[];
+    private trustedPeerEnrs;
     private startTime;
-    constructor(peerId: PeerId, config: P2PConfig, telemetry?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger);
+    private handlers;
+    constructor(peerId: PeerId, config: P2PConfig, packageVersion: string, telemetry?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger, configOverrides?: Partial<IDiscv5CreateOptions>);
+    private onMultiaddrUpdated;
     start(): Promise<void>;
     runRandomNodesQuery(): Promise<void>;
-    getAllPeers(): ENR[];
+    getKadValues(): ENR[];
     getEnr(): ENR;
     getPeerId(): PeerId;
     getStatus(): PeerDiscoveryState;
@@ -39,4 +40,4 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     private onDiscovered;
     private validateEnr;
 }
-//# sourceMappingURL=discV5_service.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY1Y1X3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9kaXNjdjUvZGlzY1Y1X3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFzQixLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEVBQW1DLEtBQUssb0JBQW9CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRyxPQUFPLEVBQUUsR0FBRyxFQUFlLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxZQUFZLE1BQU0sUUFBUSxDQUFDO0FBRWxDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSWpELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBSTlFOztHQUVHO0FBQ0gscUJBQWEsYUFBYyxTQUFRLFlBQWEsWUFBVyxvQkFBb0I7SUF5QjNFLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUE1QmhCLDBCQUEwQjtJQUMxQixPQUFPLENBQUMsTUFBTSxDQUFxQjtJQUVuQywwQkFBMEI7SUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBYztJQUV6QiwyQkFBMkI7SUFDM0IsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFFckMsT0FBTyxDQUFDLFlBQVksQ0FBOEI7SUFFbEQsT0FBTyxDQUFDLG9CQUFvQixDQUFnQjtJQUNyQyxpQkFBaUIsRUFBRSxHQUFHLEVBQUUsQ0FBTTtJQUNyQyxPQUFPLENBQUMsZUFBZSxDQUFhO0lBRXBDLE9BQU8sQ0FBQyxTQUFTLENBQUs7SUFFdEIsT0FBTyxDQUFDLFFBQVEsQ0FJZDtJQUVGLFlBQ1UsTUFBTSxFQUFFLE1BQU0sRUFDZCxNQUFNLEVBQUUsU0FBUyxFQUNSLGNBQWMsRUFBRSxNQUFNLEVBQ3ZDLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxNQUFNLHlDQUFxQyxFQUNuRCxlQUFlLEdBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFNLEVBMEVwRDtJQUVELE9BQU8sQ0FBQyxrQkFBa0I7SUFRYixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQXFEbEM7SUFFWSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUJoRDtJQUVNLFlBQVksSUFBSSxHQUFHLEVBQUUsQ0FFM0I7SUFFTSxNQUFNLElBQUksR0FBRyxDQUVuQjtJQUVNLFNBQVMsSUFBSSxNQUFNLENBRXpCO0lBRU0sU0FBUyxJQUFJLGtCQUFrQixDQUVyQztJQUVNLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFOUM7SUFFWSxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVdqQztZQUVhLFVBQVU7SUFPeEIsT0FBTyxDQUFDLGFBQWE7SUFJckIsT0FBTyxDQUFDLFlBQVk7SUFxQnBCLE9BQU8sQ0FBQyxXQUFXO0NBMEJwQiJ9