@aztec/p2p 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/msg_validators/tx_validator/data_validator.js

@@ -1,38 +1,47 @@
-var _DataTxValidator_instances, _DataTxValidator_log, _DataTxValidator_hasCorrectExecutionRequests;
-import { __classPrivateFieldGet } from "tslib";
 import { Tx } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
 export class DataTxValidator {
-    constructor() {
-        _DataTxValidator_instances.add(this);
-        _DataTxValidator_log.set(this, createLogger('p2p:tx_validator:tx_data'));
-        // TODO: Check logs.
-    }
+    #log = createLogger('p2p:tx_validator:tx_data');
     validateTx(tx) {
-        return __classPrivateFieldGet(this, _DataTxValidator_instances, "m", _DataTxValidator_hasCorrectExecutionRequests).call(this, tx);
-    }
-}
-_DataTxValidator_log = new WeakMap(), _DataTxValidator_instances = new WeakSet(), _DataTxValidator_hasCorrectExecutionRequests = async function _DataTxValidator_hasCorrectExecutionRequests(tx) {
-    const callRequests = [
-        ...tx.data.getRevertiblePublicCallRequests(),
-        ...tx.data.getNonRevertiblePublicCallRequests(),
-    ];
-    if (callRequests.length !== tx.enqueuedPublicFunctionCalls.length) {
-        __classPrivateFieldGet(this, _DataTxValidator_log, "f").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'] };
+        return this.#hasCorrectExecutionRequests(tx);
     }
-    const invalidExecutionRequestIndex = (await Promise.all(tx.enqueuedPublicFunctionCalls.map(async (execRequest, i) => !(await execRequest.isForCallRequest(callRequests[i]))))).findIndex(Boolean);
-    if (invalidExecutionRequestIndex !== -1) {
-        __classPrivateFieldGet(this, _DataTxValidator_log, "f").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'] };
+    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'
+                ]
+            };
+        }
+        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'
+                ]
+            };
+        }
+        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'
+                ]
+            };
+        }
+        return {
+            result: 'valid'
+        };
     }
-    const teardownCallRequest = tx.data.getTeardownPublicCallRequest();
-    const isInvalidTeardownExecutionRequest = (!teardownCallRequest && !tx.publicTeardownFunctionCall.isEmpty()) ||
-        (teardownCallRequest && !(await tx.publicTeardownFunctionCall.isForCallRequest(teardownCallRequest)));
-    if (isInvalidTeardownExecutionRequest) {
-        __classPrivateFieldGet(this, _DataTxValidator_log, "f").warn(`Rejecting tx ${await Tx.getHash(tx)} because of incorrect teardown execution requests.`);
-        return { result: 'invalid', reason: ['Incorrect teardown execution request'] };
-    }
-    return { result: 'valid' };
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV92YWxpZGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvdHhfdmFsaWRhdG9yL2RhdGFfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLEVBQUUsRUFBNkMsTUFBTSxzQkFBc0IsQ0FBQztBQUNyRixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQsTUFBTSxPQUFPLGVBQWU7SUFBNUI7O1FBQ0UsK0JBQU8sWUFBWSxDQUFDLDBCQUEwQixDQUFDLEVBQUM7UUErQ2hELG9CQUFvQjtJQUN0QixDQUFDO0lBOUNDLFVBQVUsQ0FBQyxFQUFNO1FBQ2YsT0FBTyx1QkFBQSxJQUFJLGdGQUE2QixNQUFqQyxJQUFJLEVBQThCLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0E0Q0Y7aUlBMUNDLEtBQUssdURBQThCLEVBQU07SUFDdkMsTUFBTSxZQUFZLEdBQUc7UUFDbkIsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLCtCQUErQixFQUFFO1FBQzVDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxrQ0FBa0MsRUFBRTtLQUNoRCxDQUFDO0lBQ0YsSUFBSSxZQUFZLENBQUMsTUFBTSxLQUFLLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNsRSx1QkFBQSxJQUFJLDRCQUFLLENBQUMsSUFBSSxDQUNaLGdCQUFnQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxnRkFDNUIsWUFBWSxDQUFDLE1BQ2YsU0FBUyxFQUFFLENBQUMsMkJBQTJCLENBQUMsTUFBTSxHQUFHLENBQ2xELENBQUM7UUFDRixPQUFPLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxxREFBcUQsQ0FBQyxFQUFFLENBQUM7SUFDaEcsQ0FBQztJQUNELE1BQU0sNEJBQTRCLEdBQUcsQ0FDbkMsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNmLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxHQUFHLENBQ2hDLEtBQUssRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxXQUFXLENBQUMsZ0JBQWdCLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDakYsQ0FDRixDQUNGLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3JCLElBQUksNEJBQTRCLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUN4Qyx1QkFBQSxJQUFJLDRCQUFLLENBQUMsSUFBSSxDQUNaLGdCQUFnQixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQzlCLEVBQUUsQ0FDSCxxRUFBcUUsNEJBQTRCLEdBQUcsQ0FDdEcsQ0FBQztRQUNGLE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLDZDQUE2QyxDQUFDLEVBQUUsQ0FBQztJQUN4RixDQUFDO0lBRUQsTUFBTSxtQkFBbUIsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLDRCQUE0QixFQUFFLENBQUM7SUFDbkUsTUFBTSxpQ0FBaUMsR0FDckMsQ0FBQyxDQUFDLG1CQUFtQixJQUFJLENBQUMsRUFBRSxDQUFDLDBCQUEwQixDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xFLENBQUMsbUJBQW1CLElBQUksQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLDBCQUEwQixDQUFDLGdCQUFnQixDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3hHLElBQUksaUNBQWlDLEVBQUUsQ0FBQztRQUN0Qyx1QkFBQSxJQUFJLDRCQUFLLENBQUMsSUFBSSxDQUFDLGdCQUFnQixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLG9EQUFvRCxDQUFDLENBQUM7UUFDekcsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUMsc0NBQXNDLENBQUMsRUFBRSxDQUFDO0lBQ2pGLENBQUM7SUFFRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxDQUFDO0FBQzdCLENBQUMifQ==
+}

package/dest/msg_validators/tx_validator/double_spend_validator.js

@@ -1,27 +1,35 @@
-var _DoubleSpendTxValidator_log, _DoubleSpendTxValidator_nullifierSource;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { Tx } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
 export class DoubleSpendTxValidator {
-    constructor(nullifierSource) {
-        _DoubleSpendTxValidator_log.set(this, createLogger('p2p:tx_validator:tx_double_spend'));
-        _DoubleSpendTxValidator_nullifierSource.set(this, void 0);
-        __classPrivateFieldSet(this, _DoubleSpendTxValidator_nullifierSource, nullifierSource, "f");
+    #log = createLogger('p2p:tx_validator:tx_double_spend');
+    #nullifierSource;
+    constructor(nullifierSource){
+        this.#nullifierSource = nullifierSource;
     }
     async validateTx(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) {
-            __classPrivateFieldGet(this, _DoubleSpendTxValidator_log, "f").warn(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
-            return { result: 'invalid', reason: ['Duplicate nullifier in tx'] };
+            this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} for emitting duplicate nullifiers`);
+            return {
+                result: 'invalid',
+                reason: [
+                    'Duplicate nullifier in tx'
+                ]
+            };
         }
-        if ((await __classPrivateFieldGet(this, _DoubleSpendTxValidator_nullifierSource, "f").nullifiersExist(nullifiers.map(n => n.toBuffer()))).some(Boolean)) {
-            __classPrivateFieldGet(this, _DoubleSpendTxValidator_log, "f").warn(`Rejecting tx ${await Tx.getHash(tx)} for repeating a nullifier`);
-            return { result: 'invalid', reason: ['Existing nullifier'] };
+        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: 'valid' };
+        return {
+            result: 'valid'
+        };
     }
 }
-_DoubleSpendTxValidator_log = new WeakMap(), _DoubleSpendTxValidator_nullifierSource = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG91YmxlX3NwZW5kX3ZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy90eF92YWxpZGF0b3IvZG91YmxlX3NwZW5kX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBYyxFQUFFLEVBQTZDLE1BQU0sc0JBQXNCLENBQUM7QUFDakcsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBTXJELE1BQU0sT0FBTyxzQkFBc0I7SUFJakMsWUFBWSxlQUFnQztRQUg1QyxzQ0FBTyxZQUFZLENBQUMsa0NBQWtDLENBQUMsRUFBQztRQUN4RCwwREFBa0M7UUFHaEMsdUJBQUEsSUFBSSwyQ0FBb0IsZUFBZSxNQUFBLENBQUM7SUFDMUMsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsRUFBSztRQUNwQixNQUFNLFVBQVUsR0FBRyxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO1FBRS9GLDhDQUE4QztRQUM5QyxNQUFNLGdCQUFnQixHQUFHLElBQUksR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQzdDLElBQUksZ0JBQWdCLENBQUMsSUFBSSxLQUFLLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNoRCx1QkFBQSxJQUFJLG1DQUFLLENBQUMsSUFBSSxDQUFDLGdCQUFnQixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLG9DQUFvQyxDQUFDLENBQUM7WUFDekYsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDO1FBQ3RFLENBQUM7UUFFRCxJQUFJLENBQUMsTUFBTSx1QkFBQSxJQUFJLCtDQUFpQixDQUFDLGVBQWUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ25HLHVCQUFBLElBQUksbUNBQUssQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLE1BQU0sRUFBRSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsNEJBQTRCLENBQUMsQ0FBQztZQUNqRixPQUFPLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxFQUFFLENBQUM7UUFDL0QsQ0FBQztRQUVELE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUM7SUFDN0IsQ0FBQztDQUNGIn0=

package/dest/msg_validators/tx_validator/index.js

@@ -4,4 +4,3 @@ export * from './double_spend_validator.js';
 export * from './metadata_validator.js';
 export * from './tx_proof_validator.js';
 export * from './block_header_validator.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvdHhfdmFsaWRhdG9yL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLDZCQUE2QixDQUFDIn0=

package/dest/msg_validators/tx_validator/metadata_validator.js

@@ -1,41 +1,44 @@
-var _MetadataTxValidator_instances, _MetadataTxValidator_log, _MetadataTxValidator_hasCorrectChainId, _MetadataTxValidator_isValidForBlockNumber;
-import { __classPrivateFieldGet } from "tslib";
 import { Tx } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
 export class MetadataTxValidator {
-    constructor(chainId, blockNumber) {
-        _MetadataTxValidator_instances.add(this);
+    chainId;
+    blockNumber;
+    #log;
+    constructor(chainId, blockNumber){
         this.chainId = chainId;
         this.blockNumber = blockNumber;
-        _MetadataTxValidator_log.set(this, createLogger('p2p:tx_validator:tx_metadata'));
+        this.#log = createLogger('p2p:tx_validator:tx_metadata');
     }
     async validateTx(tx) {
         const errors = [];
-        if (!(await __classPrivateFieldGet(this, _MetadataTxValidator_instances, "m", _MetadataTxValidator_hasCorrectChainId).call(this, tx))) {
+        if (!await this.#hasCorrectChainId(tx)) {
             errors.push('Incorrect chain id');
         }
-        if (!(await __classPrivateFieldGet(this, _MetadataTxValidator_instances, "m", _MetadataTxValidator_isValidForBlockNumber).call(this, tx))) {
+        if (!await this.#isValidForBlockNumber(tx)) {
             errors.push('Invalid block number');
         }
-        return errors.length > 0 ? { result: 'invalid', reason: errors } : { result: 'valid' };
+        return errors.length > 0 ? {
+            result: 'invalid',
+            reason: errors
+        } : {
+            result: 'valid'
+        };
     }
-}
-_MetadataTxValidator_log = new WeakMap(), _MetadataTxValidator_instances = new WeakSet(), _MetadataTxValidator_hasCorrectChainId = async function _MetadataTxValidator_hasCorrectChainId(tx) {
-    if (!tx.data.constants.txContext.chainId.equals(this.chainId)) {
-        __classPrivateFieldGet(this, _MetadataTxValidator_log, "f").warn(`Rejecting tx ${await Tx.getHash(tx)} because of incorrect chain ${tx.data.constants.txContext.chainId.toNumber()} != ${this.chainId.toNumber()}`);
-        return false;
-    }
-    else {
-        return true;
-    }
-}, _MetadataTxValidator_isValidForBlockNumber = async function _MetadataTxValidator_isValidForBlockNumber(tx) {
-    const maxBlockNumber = tx.data.rollupValidationRequests.maxBlockNumber;
-    if (maxBlockNumber.isSome && maxBlockNumber.value < this.blockNumber) {
-        __classPrivateFieldGet(this, _MetadataTxValidator_log, "f").warn(`Rejecting tx ${await Tx.getHash(tx)} for low max block number. Tx max block number: ${maxBlockNumber.value}, current block number: ${this.blockNumber}.`);
-        return false;
+    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()}`);
+            return false;
+        } else {
+            return true;
+        }
     }
-    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}.`);
+            return false;
+        } else {
+            return true;
+        }
     }
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGFfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9tZXRhZGF0YV92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQWMsRUFBRSxFQUE2QyxNQUFNLHNCQUFzQixDQUFDO0FBRWpHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVyRCxNQUFNLE9BQU8sbUJBQW1CO0lBRzlCLFlBQW9CLE9BQVcsRUFBVSxXQUFlOztRQUFwQyxZQUFPLEdBQVAsT0FBTyxDQUFJO1FBQVUsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFGeEQsbUNBQU8sWUFBWSxDQUFDLDhCQUE4QixDQUFDLEVBQUM7SUFFTyxDQUFDO0lBRTVELEtBQUssQ0FBQyxVQUFVLENBQUMsRUFBSztRQUNwQixNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFDbEIsSUFBSSxDQUFDLENBQUMsTUFBTSx1QkFBQSxJQUFJLDhFQUFtQixNQUF2QixJQUFJLEVBQW9CLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUN6QyxNQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUNELElBQUksQ0FBQyxDQUFDLE1BQU0sdUJBQUEsSUFBSSxrRkFBdUIsTUFBM0IsSUFBSSxFQUF3QixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDN0MsTUFBTSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO1FBQ3RDLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQztJQUN6RixDQUFDO0NBNkJGO21JQTNCQyxLQUFLLGlEQUFvQixFQUFLO0lBQzVCLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUM5RCx1QkFBQSxJQUFJLGdDQUFLLENBQUMsSUFBSSxDQUNaLGdCQUFnQixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQzlCLEVBQUUsQ0FDSCwrQkFBK0IsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQy9HLENBQUM7UUFDRixPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0FBQ0gsQ0FBQywrQ0FFRCxLQUFLLHFEQUF3QixFQUFLO0lBQ2hDLE1BQU0sY0FBYyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsd0JBQXdCLENBQUMsY0FBYyxDQUFDO0lBRXZFLElBQUksY0FBYyxDQUFDLE1BQU0sSUFBSSxjQUFjLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNyRSx1QkFBQSxJQUFJLGdDQUFLLENBQUMsSUFBSSxDQUNaLGdCQUFnQixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLG1EQUNsQyxjQUFjLENBQUMsS0FDakIsMkJBQTJCLElBQUksQ0FBQyxXQUFXLEdBQUcsQ0FDL0MsQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDSCxDQUFDIn0=
+}

package/dest/msg_validators/tx_validator/tx_proof_validator.js

@@ -1,20 +1,25 @@
-var _TxProofValidator_log;
-import { __classPrivateFieldGet } from "tslib";
-import { Tx, } from '@aztec/circuit-types';
+import { Tx } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
 export class TxProofValidator {
-    constructor(verifier) {
+    verifier;
+    #log;
+    constructor(verifier){
         this.verifier = verifier;
-        _TxProofValidator_log.set(this, createLogger('p2p:tx_validator:private_proof'));
+        this.#log = createLogger('p2p:tx_validator:private_proof');
     }
     async validateTx(tx) {
-        if (!(await this.verifier.verifyProof(tx))) {
-            __classPrivateFieldGet(this, _TxProofValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
-            return { result: 'invalid', reason: ['Invalid proof'] };
+        if (!await this.verifier.verifyProof(tx)) {
+            this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
+            return {
+                result: 'invalid',
+                reason: [
+                    'Invalid proof'
+                ]
+            };
         }
-        __classPrivateFieldGet(this, _TxProofValidator_log, "f").trace(`Accepted ${Tx.getHash(tx)} with valid proof`);
-        return { result: 'valid' };
+        this.#log.trace(`Accepted ${Tx.getHash(tx)} with valid proof`);
+        return {
+            result: 'valid'
+        };
     }
 }
-_TxProofValidator_log = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvb2ZfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci90eF9wcm9vZl92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBRUwsRUFBRSxHQUdILE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXJELE1BQU0sT0FBTyxnQkFBZ0I7SUFHM0IsWUFBb0IsUUFBdUM7UUFBdkMsYUFBUSxHQUFSLFFBQVEsQ0FBK0I7UUFGM0QsZ0NBQU8sWUFBWSxDQUFDLGdDQUFnQyxDQUFDLEVBQUM7SUFFUSxDQUFDO0lBRS9ELEtBQUssQ0FBQyxVQUFVLENBQUMsRUFBTTtRQUNyQixJQUFJLENBQUMsQ0FBQyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUMzQyx1QkFBQSxJQUFJLDZCQUFLLENBQUMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1lBQ25FLE9BQU8sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUM7UUFDMUQsQ0FBQztRQUNELHVCQUFBLElBQUksNkJBQUssQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBQy9ELE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUM7SUFDN0IsQ0FBQztDQUNGIn0=

package/dest/services/data_store.js

@@ -1,33 +1,35 @@
-var _AztecDatastore_memoryDatastore, _AztecDatastore_dbDatastore, _AztecDatastore_batchOps;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { filter, map, sort, take } from '@aztec/foundation/iterable';
 import { Key } from 'interface-datastore';
 class KeyNotFoundError extends Error {
-    constructor(message) {
+    code;
+    constructor(message){
         super(message);
         this.code = 'ERR_NOT_FOUND';
     }
 }
 export class AztecDatastore {
-    constructor(db, { maxMemoryItems } = { maxMemoryItems: 50 }) {
-        _AztecDatastore_memoryDatastore.set(this, void 0);
-        _AztecDatastore_dbDatastore.set(this, void 0);
-        _AztecDatastore_batchOps.set(this, []);
-        __classPrivateFieldSet(this, _AztecDatastore_memoryDatastore, new Map(), "f");
-        __classPrivateFieldSet(this, _AztecDatastore_dbDatastore, db.openMap('p2p_datastore'), "f");
+    #memoryDatastore;
+    #dbDatastore;
+    #batchOps = [];
+    maxMemoryItems;
+    constructor(db, { maxMemoryItems } = {
+        maxMemoryItems: 50
+    }){
+        this.#memoryDatastore = new Map();
+        this.#dbDatastore = db.openMap('p2p_datastore');
         this.maxMemoryItems = maxMemoryItems;
     }
     async has(key) {
-        return __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").has(key.toString()) || (await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").hasAsync(key.toString()));
+        return this.#memoryDatastore.has(key.toString()) || await this.#dbDatastore.hasAsync(key.toString());
     }
     async get(key) {
         const keyStr = key.toString();
-        const memoryItem = __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").get(keyStr);
+        const memoryItem = this.#memoryDatastore.get(keyStr);
         if (memoryItem) {
             memoryItem.lastAccessedMs = Date.now();
             return memoryItem.data;
         }
-        const dbItem = await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").getAsync(keyStr);
+        const dbItem = await this.#dbDatastore.getAsync(keyStr);
         if (!dbItem) {
             throw new KeyNotFoundError(`Key not found`);
         }
@@ -37,72 +39,71 @@ export class AztecDatastore {
         return this._put(key, val);
     }
     async *putMany(source) {
-        for await (const { key, value } of source) {
+        for await (const { key, value } of source){
             await this.put(key, value);
             yield key;
         }
     }
     async *getMany(source) {
-        for await (const key of source) {
+        for await (const key of source){
             yield {
                 key,
-                value: await this.get(key),
+                value: await this.get(key)
             };
         }
     }
     async *deleteMany(source) {
-        for await (const key of source) {
+        for await (const key of source){
             await this.delete(key);
             yield key;
         }
     }
     async delete(key) {
-        __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").delete(key.toString());
-        await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").delete(key.toString());
+        this.#memoryDatastore.delete(key.toString());
+        await this.#dbDatastore.delete(key.toString());
     }
     batch() {
         return {
-            put: (key, value) => {
-                __classPrivateFieldGet(this, _AztecDatastore_batchOps, "f").push({
+            put: (key, value)=>{
+                this.#batchOps.push({
                     type: 'put',
                     key,
-                    value,
+                    value
                 });
             },
-            delete: key => {
-                __classPrivateFieldGet(this, _AztecDatastore_batchOps, "f").push({
+            delete: (key)=>{
+                this.#batchOps.push({
                     type: 'del',
-                    key,
+                    key
                 });
             },
-            commit: async () => {
-                for (const op of __classPrivateFieldGet(this, _AztecDatastore_batchOps, "f")) {
+            commit: async ()=>{
+                for (const op of this.#batchOps){
                     if (op.type === 'put' && op.value) {
                         await this.put(op.key, op.value);
-                    }
-                    else if (op.type === 'del') {
+                    } else if (op.type === 'del') {
                         await this.delete(op.key);
                     }
                 }
-                __classPrivateFieldSet(this, _AztecDatastore_batchOps, [], "f"); // Clear operations after commit
-            },
+                this.#batchOps = []; // Clear operations after commit
+            }
         };
     }
     query(q) {
         let it = this.all(); //
         const { prefix, filters, orders, offset, limit } = q;
         if (prefix != null) {
-            it = filter(it, e => e.key.toString().startsWith(`${prefix}`));
+            it = filter(it, (e)=>e.key.toString().startsWith(`${prefix}`));
         }
         if (Array.isArray(filters)) {
-            it = filters.reduce((it, f) => filter(it, f), it);
+            it = filters.reduce((it, f)=>filter(it, f), it);
         }
         if (Array.isArray(orders)) {
-            it = orders.reduce((it, f) => sort(it, f), it);
+            it = orders.reduce((it, f)=>sort(it, f), it);
         }
         if (offset != null) {
             let i = 0;
-            it = filter(it, () => i++ >= offset);
+            it = filter(it, ()=>i++ >= offset);
         }
         if (limit != null) {
             it = take(it, limit);
@@ -110,20 +111,20 @@ export class AztecDatastore {
         return it;
     }
     queryKeys(q) {
-        let it = map(this.all(), ({ key }) => key);
+        let it = map(this.all(), ({ key })=>key);
         const { prefix, filters, orders, offset, limit } = q;
         if (prefix != null) {
-            it = filter(it, e => e.toString().startsWith(`${prefix}`));
+            it = filter(it, (e)=>e.toString().startsWith(`${prefix}`));
         }
         if (Array.isArray(filters)) {
-            it = filters.reduce((it, f) => filter(it, f), it);
+            it = filters.reduce((it, f)=>filter(it, f), it);
         }
         if (Array.isArray(orders)) {
-            it = orders.reduce((it, f) => sort(it, f), it);
+            it = orders.reduce((it, f)=>sort(it, f), it);
         }
         if (offset != null) {
             let i = 0;
-            it = filter(it, () => i++ >= offset);
+            it = filter(it, ()=>i++ >= offset);
         }
         if (limit != null) {
             it = take(it, limit);
@@ -132,47 +133,48 @@ export class AztecDatastore {
     }
     async _put(key, val) {
         const keyStr = key.toString();
-        while (__classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").size >= this.maxMemoryItems) {
+        while(this.#memoryDatastore.size >= this.maxMemoryItems){
             this.pruneMemoryDatastore();
         }
-        const memoryItem = __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").get(keyStr);
+        const memoryItem = this.#memoryDatastore.get(keyStr);
         if (memoryItem) {
             // update existing
             memoryItem.lastAccessedMs = Date.now();
             memoryItem.data = val;
-        }
-        else {
+        } else {
             // new entry
-            __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").set(keyStr, { data: val, lastAccessedMs: Date.now() });
+            this.#memoryDatastore.set(keyStr, {
+                data: val,
+                lastAccessedMs: Date.now()
+            });
         }
         // Always add to DB
-        await __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").set(keyStr, val);
+        await this.#dbDatastore.set(keyStr, val);
         return key;
     }
     async *all() {
-        for (const [key, value] of __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").entries()) {
+        for (const [key, value] of this.#memoryDatastore.entries()){
             yield {
                 key: new Key(key),
-                value: value.data,
+                value: value.data
             };
         }
-        for await (const [key, value] of __classPrivateFieldGet(this, _AztecDatastore_dbDatastore, "f").entriesAsync()) {
-            if (!__classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").has(key)) {
+        for await (const [key, value] of this.#dbDatastore.entriesAsync()){
+            if (!this.#memoryDatastore.has(key)) {
                 yield {
                     key: new Key(key),
-                    value,
+                    value
                 };
             }
         }
     }
     /**
-     * Prune memory store
-     */
-    pruneMemoryDatastore() {
+   * Prune memory store
+   */ pruneMemoryDatastore() {
         let oldestAccessedMs = Date.now() + 1000;
         let oldestKey = undefined;
         let oldestValue = undefined;
-        for (const [key, value] of __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f")) {
+        for (const [key, value] of this.#memoryDatastore){
             if (value.lastAccessedMs < oldestAccessedMs) {
                 oldestAccessedMs = value.lastAccessedMs;
                 oldestKey = key;
@@ -180,9 +182,7 @@ export class AztecDatastore {
             }
         }
         if (oldestKey && oldestValue) {
-            __classPrivateFieldGet(this, _AztecDatastore_memoryDatastore, "f").delete(oldestKey);
+            this.#memoryDatastore.delete(oldestKey);
         }
     }
 }
-_AztecDatastore_memoryDatastore = new WeakMap(), _AztecDatastore_dbDatastore = new WeakMap(), _AztecDatastore_batchOps = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_store.js","sourceRoot":"","sources":["../../src/services/data_store.ts"],"names":[],"mappings":"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"}