@aztec/p2p 0.84.0-alpha-testnet.1 → 0.84.0-nightly.20250405

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,EAA6B,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpH,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, Tx } from '@aztec/stdlib/tx';
 export class BlockHeaderTxValidator {
     #log = createLogger('p2p:tx_validator:tx_block_header');
     #archiveSource;
@@ -15,7 +15,7 @@ export class BlockHeaderTxValidator {
             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":"AAGA,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;CAmFtD"}
+{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AAGA,OAAO,EAQL,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;CAmFtD"}

package/dest/msg_validators/tx_validator/data_validator.js

@@ -1,7 +1,7 @@
 import { MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import { computeCalldataHash } from '@aztec/stdlib/hash';
-import { Tx } from '@aztec/stdlib/tx';
+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 } from '@aztec/stdlib/tx';
 export class DataTxValidator {
     #log = createLogger('p2p:tx_validator:tx_data');
     async validateTx(tx) {
@@ -11,7 +11,7 @@ export class DataTxValidator {
     }
     async #hasCorrectCalldata(tx) {
         if (tx.publicFunctionCalldata.length !== tx.numberOfPublicCalls()) {
-            const reason = 'Wrong number of calldata for public calls';
+            const reason = TX_ERROR_CALLDATA_COUNT_MISMATCH;
             this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected ${tx.numberOfPublicCalls()}. Got ${tx.publicFunctionCalldata.length}.`);
             return {
                 result: 'invalid',
@@ -21,7 +21,7 @@ export class DataTxValidator {
             };
         }
         if (tx.getTotalPublicCalldataCount() > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
-            const reason = 'Total calldata too large for enqueued public calls';
+            const reason = TX_ERROR_CALLDATA_COUNT_TOO_LARGE;
             this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected no greater than ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS} fields. Got ${tx.getTotalPublicCalldataCount()}.`);
             return {
                 result: 'invalid',
@@ -35,7 +35,7 @@ export class DataTxValidator {
             const { request, calldata } = callRequests[i];
             const hash = await computeCalldataHash(calldata);
             if (!hash.equals(request.calldataHash)) {
-                const reason = 'Incorrect calldata for public call';
+                const reason = TX_ERROR_INCORRECT_CALLDATA;
                 this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Call request index: ${i}.`);
                 return {
                     result: 'invalid',
@@ -57,7 +57,7 @@ export class DataTxValidator {
             return {
                 result: 'invalid',
                 reason: [
-                    'Mismatched number of contract class logs'
+                    TX_ERROR_CONTRACT_CLASS_LOG_COUNT
                 ]
             };
         }
@@ -70,7 +70,7 @@ export class DataTxValidator {
                     return {
                         result: 'invalid',
                         reason: [
-                            'Incorrectly sorted contract class logs'
+                            TX_ERROR_CONTRACT_CLASS_LOG_SORTING
                         ]
                     };
                 } else {
@@ -78,7 +78,7 @@ export class DataTxValidator {
                     return {
                         result: 'invalid',
                         reason: [
-                            'Mismatched contract class logs'
+                            TX_ERROR_CONTRACT_CLASS_LOGS
                         ]
                     };
                 }
@@ -88,7 +88,7 @@ export class DataTxValidator {
                 return {
                     result: 'invalid',
                     reason: [
-                        'Mismatched contract class logs length'
+                        TX_ERROR_CONTRACT_CLASS_LOG_LENGTH
                     ]
                 };
             }

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,EAAE,MAAM,kBAAkB,CAAC;AAE7F,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"}
+{"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 } 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;
@@ -15,7 +15,7 @@ export class DoubleSpendTxValidator {
             return {
                 result: 'invalid',
                 reason: [
-                    'Duplicate nullifier in tx'
+                    TX_ERROR_DUPLICATE_NULLIFIER_IN_TX
                 ]
             };
         }
@@ -24,7 +24,7 @@ export class DoubleSpendTxValidator {
             return {
                 result: 'invalid',
                 reason: [
-                    'Existing nullifier'
+                    TX_ERROR_EXISTING_NULLIFIER
                 ]
             };
         }

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

@@ -1 +1 @@
-{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,EAAoB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAExG,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;CAyEtD"}
+{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAGL,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;CAyEtD"}

package/dest/msg_validators/tx_validator/gas_validator.js

@@ -2,7 +2,7 @@ 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 { TxExecutionPhase } from '@aztec/stdlib/tx';
+import { TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE, TX_ERROR_INSUFFICIENT_FEE_PER_GAS, TxExecutionPhase } from '@aztec/stdlib/tx';
 export class GasTxValidator {
     #log = createLogger('sequencer:tx_validator:tx_gas');
     #publicDataSource;
@@ -18,7 +18,7 @@ export class GasTxValidator {
             return Promise.resolve({
                 result: 'skipped',
                 reason: [
-                    'Insufficient fee per gas'
+                    TX_ERROR_INSUFFICIENT_FEE_PER_GAS
                 ]
             });
         }
@@ -65,7 +65,7 @@ export class GasTxValidator {
             return {
                 result: 'invalid',
                 reason: [
-                    'Insufficient fee payer balance'
+                    TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE
                 ]
             };
         }

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,aAAa;IAAM,OAAO,CAAC,WAAW;gBAA3D,OAAO,EAAE,EAAE,EAAU,aAAa,EAAE,EAAE,EAAU,WAAW,EAAE,EAAE;IAE7E,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsDrD"}
+{"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,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;;IAG7D,OAAO,CAAC,OAAO;IAAM,OAAO,CAAC,aAAa;IAAM,OAAO,CAAC,WAAW;gBAA3D,OAAO,EAAE,EAAE,EAAU,aAAa,EAAE,EAAE,EAAU,WAAW,EAAE,EAAE;IAE7E,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsDrD"}

package/dest/msg_validators/tx_validator/metadata_validator.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Tx } from '@aztec/stdlib/tx';
+import { TX_ERROR_INCORRECT_CHAIN_ID, TX_ERROR_INCORRECT_ROLLUP_VERSION, TX_ERROR_INVALID_BLOCK_NUMBER, Tx } from '@aztec/stdlib/tx';
 export class MetadataTxValidator {
     chainId;
     rollupVersion;
@@ -14,13 +14,13 @@ export class MetadataTxValidator {
     async validateTx(tx) {
         const errors = [];
         if (!await this.#hasCorrectChainId(tx)) {
-            errors.push('Incorrect chain id');
+            errors.push(TX_ERROR_INCORRECT_CHAIN_ID);
         }
         if (!await this.#hasCorrectRollupVersion(tx)) {
-            errors.push('Incorrect rollup version');
+            errors.push(TX_ERROR_INCORRECT_ROLLUP_VERSION);
         }
         if (!await this.#isValidForBlockNumber(tx)) {
-            errors.push('Invalid block number');
+            errors.push(TX_ERROR_INVALID_BLOCK_NUMBER);
         }
         return errors.length > 0 ? {
             result: 'invalid',

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

@@ -1 +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,EAEL,EAAE,EAEF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,iBAAkB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAIZ,OAAO,CAAC,cAAc;IAAoB,OAAO,CAAC,WAAW;IAFxG,OAAO,CAAC,WAAW,CAAoB;gBAE3B,SAAS,EAAE,kBAAkB,EAAU,cAAc,EAAE,cAAc,EAAE,EAAU,WAAW,EAAE,MAAM;IAI1G,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAkCvC,aAAa;CAiD5B"}
+{"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;AAE1B,qBAAa,iBAAkB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAIZ,OAAO,CAAC,cAAc;IAAoB,OAAO,CAAC,WAAW;IAFxG,OAAO,CAAC,WAAW,CAAoB;gBAE3B,SAAS,EAAE,kBAAkB,EAAU,cAAc,EAAE,cAAc,EAAE,EAAU,WAAW,EAAE,MAAM;IAI1G,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAqCvC,aAAa;CAiD5B"}

package/dest/msg_validators/tx_validator/phases_validator.js

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { PublicContractsDB, getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
-import { Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
+import { TX_ERROR_DURING_VALIDATION, TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
 export class PhasesTxValidator {
     setupAllowList;
     blockNumber;
@@ -33,7 +33,7 @@ export class PhasesTxValidator {
                     return {
                         result: 'invalid',
                         reason: [
-                            'Setup function not on allow list'
+                            TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED
                         ]
                     };
                 }
@@ -41,6 +41,14 @@ export class PhasesTxValidator {
             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.clearContractsForTx();
         }

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;gBAAR,QAAQ,EAAE,6BAA6B;IAErD,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAQtD"}

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, Tx } from '@aztec/stdlib/tx';
 export class TxProofValidator {
     verifier;
     #log;
@@ -13,7 +13,7 @@ export class TxProofValidator {
             return {
                 result: 'invalid',
                 reason: [
-                    'Invalid proof'
+                    TX_ERROR_INVALID_PROOF
                 ]
             };
         }

package/dest/services/libp2p/libp2p_service.js

@@ -595,7 +595,7 @@ import { ReqResp } from '../reqresp/reqresp.js';
             const { result } = await validator.validateTx(tx);
             return {
                 name,
-                isValid: result === 'valid',
+                isValid: result !== 'invalid',
                 severity
             };
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.84.0-alpha-testnet.1",
+  "version": "0.84.0-nightly.20250405",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -65,16 +65,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.84.0-alpha-testnet.1",
-    "@aztec/epoch-cache": "0.84.0-alpha-testnet.1",
-    "@aztec/foundation": "0.84.0-alpha-testnet.1",
-    "@aztec/kv-store": "0.84.0-alpha-testnet.1",
-    "@aztec/noir-contracts.js": "0.84.0-alpha-testnet.1",
-    "@aztec/noir-protocol-circuits-types": "0.84.0-alpha-testnet.1",
-    "@aztec/protocol-contracts": "0.84.0-alpha-testnet.1",
-    "@aztec/simulator": "0.84.0-alpha-testnet.1",
-    "@aztec/stdlib": "0.84.0-alpha-testnet.1",
-    "@aztec/telemetry-client": "0.84.0-alpha-testnet.1",
+    "@aztec/constants": "0.84.0-nightly.20250405",
+    "@aztec/epoch-cache": "0.84.0-nightly.20250405",
+    "@aztec/foundation": "0.84.0-nightly.20250405",
+    "@aztec/kv-store": "0.84.0-nightly.20250405",
+    "@aztec/noir-contracts.js": "0.84.0-nightly.20250405",
+    "@aztec/noir-protocol-circuits-types": "0.84.0-nightly.20250405",
+    "@aztec/protocol-contracts": "0.84.0-nightly.20250405",
+    "@aztec/simulator": "0.84.0-nightly.20250405",
+    "@aztec/stdlib": "0.84.0-nightly.20250405",
+    "@aztec/telemetry-client": "0.84.0-nightly.20250405",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
@@ -103,7 +103,7 @@
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.84.0-alpha-testnet.1",
+    "@aztec/archiver": "0.84.0-nightly.20250405",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.14.6",

package/src/msg_validators/tx_validator/block_header_validator.ts

@@ -1,6 +1,6 @@
 import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import { type AnyTx, TX_ERROR_BLOCK_HEADER, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 
 export interface ArchiveSource {
   getArchiveIndices: (archives: Fr[]) => Promise<(bigint | undefined)[]>;
@@ -18,7 +18,7 @@ export class BlockHeaderTxValidator<T extends AnyTx> implements TxValidator<T> {
     const [index] = await this.#archiveSource.getArchiveIndices([await tx.data.constants.historicalHeader.hash()]);
     if (index === undefined) {
       this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for referencing an unknown block header`);
-      return { result: 'invalid', reason: ['Block header not found'] };
+      return { result: 'invalid', reason: [TX_ERROR_BLOCK_HEADER] };
     }
     return { result: 'valid' };
   }

package/src/msg_validators/tx_validator/data_validator.ts

@@ -1,7 +1,18 @@
 import { MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import { computeCalldataHash } from '@aztec/stdlib/hash';
-import { Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+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,
+  type TxValidationResult,
+  type TxValidator,
+} from '@aztec/stdlib/tx';
 
 export class DataTxValidator implements TxValidator<Tx> {
   #log = createLogger('p2p:tx_validator:tx_data');
@@ -14,7 +25,7 @@ export class DataTxValidator implements TxValidator<Tx> {
 
   async #hasCorrectCalldata(tx: Tx): Promise<TxValidationResult> {
     if (tx.publicFunctionCalldata.length !== tx.numberOfPublicCalls()) {
-      const reason = 'Wrong number of calldata for public calls';
+      const reason = TX_ERROR_CALLDATA_COUNT_MISMATCH;
       this.#log.warn(
         `Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Expected ${tx.numberOfPublicCalls()}. Got ${
           tx.publicFunctionCalldata.length
@@ -24,7 +35,7 @@ export class DataTxValidator implements TxValidator<Tx> {
     }
 
     if (tx.getTotalPublicCalldataCount() > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
-      const reason = 'Total calldata too large for enqueued public calls';
+      const reason = TX_ERROR_CALLDATA_COUNT_TOO_LARGE;
       this.#log.warn(
         `Rejecting tx ${await Tx.getHash(
           tx,
@@ -38,7 +49,7 @@ export class DataTxValidator implements TxValidator<Tx> {
       const { request, calldata } = callRequests[i];
       const hash = await computeCalldataHash(calldata);
       if (!hash.equals(request.calldataHash)) {
-        const reason = 'Incorrect calldata for public call';
+        const reason = TX_ERROR_INCORRECT_CALLDATA;
         this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)}. Reason: ${reason}. Call request index: ${i}.`);
         return { result: 'invalid', reason: [reason] };
       }
@@ -56,7 +67,7 @@ export class DataTxValidator implements TxValidator<Tx> {
           contractClassLogsHashes.length
         }. Got ${hashedContractClasslogs.length}.`,
       );
-      return { result: 'invalid', reason: ['Mismatched number of contract class logs'] };
+      return { result: 'invalid', reason: [TX_ERROR_CONTRACT_CLASS_LOG_COUNT] };
     }
     for (const [i, logHash] of contractClassLogsHashes.entries()) {
       const hashedLog = hashedContractClasslogs[i];
@@ -68,14 +79,14 @@ export class DataTxValidator implements TxValidator<Tx> {
               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'] };
+          return { result: 'invalid', reason: [TX_ERROR_CONTRACT_CLASS_LOG_SORTING] };
         } else {
           this.#log.warn(
             `Rejecting tx ${await 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'] };
+          return { result: 'invalid', reason: [TX_ERROR_CONTRACT_CLASS_LOGS] };
         }
       }
       if (logHash.logHash.length !== tx.contractClassLogs[i].getEmittedLength()) {
@@ -84,7 +95,7 @@ export class DataTxValidator implements TxValidator<Tx> {
             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'] };
+        return { result: 'invalid', reason: [TX_ERROR_CONTRACT_CLASS_LOG_LENGTH] };
       }
     }
     return { result: 'valid' };

package/src/msg_validators/tx_validator/double_spend_validator.ts

@@ -1,5 +1,12 @@
 import { createLogger } from '@aztec/foundation/log';
-import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import {
+  type AnyTx,
+  TX_ERROR_DUPLICATE_NULLIFIER_IN_TX,
+  TX_ERROR_EXISTING_NULLIFIER,
+  Tx,
+  type TxValidationResult,
+  type TxValidator,
+} from '@aztec/stdlib/tx';
 
 export interface NullifierSource {
   nullifiersExist: (nullifiers: Buffer[]) => Promise<boolean[]>;
@@ -20,12 +27,12 @@ export class DoubleSpendTxValidator<T extends AnyTx> implements TxValidator<T> {
     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'] };
+      return { result: 'invalid', reason: [TX_ERROR_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'] };
+      return { result: 'invalid', reason: [TX_ERROR_EXISTING_NULLIFIER] };
     }
 
     return { result: 'valid' };

package/src/msg_validators/tx_validator/gas_validator.ts

@@ -5,7 +5,14 @@ import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasFees } from '@aztec/stdlib/gas';
 import type { PublicStateSource } from '@aztec/stdlib/trees';
-import { type Tx, TxExecutionPhase, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import {
+  TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE,
+  TX_ERROR_INSUFFICIENT_FEE_PER_GAS,
+  type Tx,
+  TxExecutionPhase,
+  type TxValidationResult,
+  type TxValidator,
+} from '@aztec/stdlib/tx';
 
 export class GasTxValidator implements TxValidator<Tx> {
   #log = createLogger('sequencer:tx_validator:tx_gas');
@@ -21,7 +28,7 @@ export class GasTxValidator implements TxValidator<Tx> {
 
   async validateTx(tx: Tx): Promise<TxValidationResult> {
     if (await this.#shouldSkip(tx)) {
-      return Promise.resolve({ result: 'skipped', reason: ['Insufficient fee per gas'] });
+      return Promise.resolve({ result: 'skipped', reason: [TX_ERROR_INSUFFICIENT_FEE_PER_GAS] });
     }
     return this.#validateTxFee(tx);
   }
@@ -88,7 +95,7 @@ export class GasTxValidator implements TxValidator<Tx> {
         balance: balance.toBigInt(),
         feeLimit: feeLimit.toBigInt(),
       });
-      return { result: 'invalid', reason: ['Insufficient fee payer balance'] };
+      return { result: 'invalid', reason: [TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE] };
     }
     return { result: 'valid' };
   }

package/src/msg_validators/tx_validator/metadata_validator.ts

@@ -1,6 +1,14 @@
 import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import {
+  type AnyTx,
+  TX_ERROR_INCORRECT_CHAIN_ID,
+  TX_ERROR_INCORRECT_ROLLUP_VERSION,
+  TX_ERROR_INVALID_BLOCK_NUMBER,
+  Tx,
+  type TxValidationResult,
+  type TxValidator,
+} from '@aztec/stdlib/tx';
 
 export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
   #log = createLogger('p2p:tx_validator:tx_metadata');
@@ -10,13 +18,13 @@ export class MetadataTxValidator<T extends AnyTx> implements TxValidator<T> {
   async validateTx(tx: T): Promise<TxValidationResult> {
     const errors = [];
     if (!(await this.#hasCorrectChainId(tx))) {
-      errors.push('Incorrect chain id');
+      errors.push(TX_ERROR_INCORRECT_CHAIN_ID);
     }
     if (!(await this.#hasCorrectRollupVersion(tx))) {
-      errors.push('Incorrect rollup version');
+      errors.push(TX_ERROR_INCORRECT_ROLLUP_VERSION);
     }
     if (!(await this.#isValidForBlockNumber(tx))) {
-      errors.push('Invalid block number');
+      errors.push(TX_ERROR_INVALID_BLOCK_NUMBER);
     }
     return errors.length > 0 ? { result: 'invalid', reason: errors } : { result: 'valid' };
   }

package/src/msg_validators/tx_validator/phases_validator.ts

@@ -4,6 +4,8 @@ import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
 import {
   type PublicCallRequestWithCalldata,
+  TX_ERROR_DURING_VALIDATION,
+  TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED,
   Tx,
   TxExecutionPhase,
   type TxValidationResult,
@@ -42,11 +44,14 @@ export class PhasesTxValidator implements TxValidator<Tx> {
             { allowList: this.setupAllowList },
           );
 
-          return { result: 'invalid', reason: ['Setup function not on allow list'] };
+          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.clearContractsForTx();
     }

package/src/msg_validators/tx_validator/tx_proof_validator.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server';
-import { Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import { TX_ERROR_INVALID_PROOF, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 
 export class TxProofValidator implements TxValidator<Tx> {
   #log = createLogger('p2p:tx_validator:private_proof');
@@ -10,7 +10,7 @@ export class TxProofValidator implements TxValidator<Tx> {
   async validateTx(tx: Tx): Promise<TxValidationResult> {
     if (!(await this.verifier.verifyProof(tx))) {
       this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for invalid proof`);
-      return { result: 'invalid', reason: ['Invalid proof'] };
+      return { result: 'invalid', reason: [TX_ERROR_INVALID_PROOF] };
     }
     this.#log.trace(`Accepted ${await Tx.getHash(tx)} with valid proof`);
     return { result: 'valid' };

package/src/services/libp2p/libp2p_service.ts

@@ -792,7 +792,7 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
   ): Promise<ValidationOutcome> {
     const validationPromises = Object.entries(messageValidators).map(async ([name, { validator, severity }]) => {
       const { result } = await validator.validateTx(tx);
-      return { name, isValid: result === 'valid', severity };
+      return { name, isValid: result !== 'invalid', severity };
     });
 
     // A promise that resolves when all validations have been run