@aztec/p2p 0.0.1-commit.d431d1c → 0.0.1-commit.db765a8

package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js

@@ -1,12 +1,15 @@
+import { NoCommitteeError } from '@aztec/ethereum/contracts';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { jest } from '@jest/globals';
 export function sharedProposalValidatorTests(params) {
     const { validatorFactory, makeProposal, makeHeader, getSigner, getAddress, getSlot, getTxHashes, epochCacheMock } = params;
     describe('shared proposal validation logic', ()=>{
         let epochCache;
         let validator;
+        const previousSlot = getSlot(99);
         const currentSlot = getSlot(100);
         const nextSlot = getSlot(101);
-        function mockGetProposer(currentProposer, nextProposer) {
+        function mockGetProposer(currentProposer, nextProposer, previousProposer) {
             epochCache.getProposerAttesterAddressInSlot.mockImplementation((slot)=>{
                 if (slot === currentSlot) {
                     return Promise.resolve(currentProposer);
@@ -14,6 +17,9 @@ export function sharedProposalValidatorTests(params) {
                 if (slot === nextSlot) {
                     return Promise.resolve(nextProposer);
                 }
+                if (slot === previousSlot && previousProposer) {
+                    return Promise.resolve(previousProposer);
+                }
                 throw new Error('Unexpected argument');
             });
         }
@@ -27,18 +33,68 @@ export function sharedProposalValidatorTests(params) {
                 nextSlot: nextSlot
             });
         });
-        it('returns high tolerance error if slot number is not current or next slot', async ()=>{
+        it('returns high tolerance error if slot number is not current or next slot (outside clock tolerance)', async ()=>{
             const header = makeHeader(1, 99, 99);
             const mockProposal = await makeProposal({
                 blockHeader: header,
                 lastBlockHeader: header
             });
+            // Mock getEpochAndSlotNow to return time OUTSIDE clock tolerance (1000ms elapsed)
+            epochCache.getEpochAndSlotNow.mockReturnValue({
+                epoch: 1,
+                slot: currentSlot,
+                ts: 1000n,
+                nowMs: 1001000n
+            });
             epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(getAddress());
             const result = await validator.validate(mockProposal);
-            expect(result).toBe(PeerErrorSeverity.HighToleranceError);
+            expect(result).toEqual({
+                result: 'reject',
+                severity: PeerErrorSeverity.HighToleranceError
+            });
             // Should not try to resolve proposers if base validation fails
             expect(epochCache.getProposerAttesterAddressInSlot).not.toHaveBeenCalled();
         });
+        it('returns ignore if previous slot proposal is within clock tolerance', async ()=>{
+            const previousProposer = getSigner();
+            const header = makeHeader(1, 99, 99);
+            const mockProposal = await makeProposal({
+                blockHeader: header,
+                lastBlockHeader: header,
+                signer: previousProposer
+            });
+            // Mock getEpochAndSlotNow to return time WITHIN clock tolerance (100ms elapsed)
+            epochCache.getEpochAndSlotNow.mockReturnValue({
+                epoch: 1,
+                slot: currentSlot,
+                ts: 1000n,
+                nowMs: 1000100n
+            });
+            mockGetProposer(getAddress(), getAddress(), getAddress(previousProposer));
+            const result = await validator.validate(mockProposal);
+            expect(result).toEqual({
+                result: 'ignore'
+            });
+        });
+        it('returns mid tolerance error if proposal has invalid signature', async ()=>{
+            const currentProposer = getSigner();
+            const header = makeHeader(1, 100, 100);
+            const mockProposal = await makeProposal({
+                blockHeader: header,
+                lastBlockHeader: header,
+                signer: currentProposer
+            });
+            // Override getSender to return undefined (invalid signature)
+            jest.spyOn(mockProposal, 'getSender').mockReturnValue(undefined);
+            mockGetProposer(getAddress(currentProposer), getAddress());
+            const result = await validator.validate(mockProposal);
+            expect(result).toEqual({
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            });
+            // Should not try to resolve proposer if signature is invalid
+            expect(epochCache.getProposerAttesterAddressInSlot).not.toHaveBeenCalled();
+        });
         it('returns mid tolerance error if proposer is not current proposer for current slot', async ()=>{
             const currentProposer = getSigner();
             const nextProposer = getSigner();
@@ -51,7 +107,10 @@ export function sharedProposalValidatorTests(params) {
             });
             mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
             const result = await validator.validate(mockProposal);
-            expect(result).toBe(PeerErrorSeverity.MidToleranceError);
+            expect(result).toEqual({
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            });
         });
         it('returns mid tolerance error if proposer is not next proposer for next slot', async ()=>{
             const currentProposer = getSigner();
@@ -65,7 +124,10 @@ export function sharedProposalValidatorTests(params) {
             });
             mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
             const result = await validator.validate(mockProposal);
-            expect(result).toBe(PeerErrorSeverity.MidToleranceError);
+            expect(result).toEqual({
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            });
         });
         it('returns mid tolerance error if proposer is current proposer but proposal is for next slot', async ()=>{
             const currentProposer = getSigner();
@@ -78,7 +140,39 @@ export function sharedProposalValidatorTests(params) {
             });
             mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
             const result = await validator.validate(mockProposal);
-            expect(result).toBe(PeerErrorSeverity.MidToleranceError);
+            expect(result).toEqual({
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            });
+        });
+        it('accepts proposal when proposer is undefined (open committee)', async ()=>{
+            const currentProposer = getSigner();
+            const header = makeHeader(1, 100, 100);
+            const mockProposal = await makeProposal({
+                blockHeader: header,
+                lastBlockHeader: header,
+                signer: currentProposer
+            });
+            epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(undefined);
+            const result = await validator.validate(mockProposal);
+            expect(result).toEqual({
+                result: 'accept'
+            });
+        });
+        it('returns low tolerance error when getProposerAttesterAddressInSlot throws NoCommitteeError', async ()=>{
+            const currentProposer = getSigner();
+            const header = makeHeader(1, 100, 100);
+            const mockProposal = await makeProposal({
+                blockHeader: header,
+                lastBlockHeader: header,
+                signer: currentProposer
+            });
+            epochCache.getProposerAttesterAddressInSlot.mockRejectedValue(new NoCommitteeError());
+            const result = await validator.validate(mockProposal);
+            expect(result).toEqual({
+                result: 'reject',
+                severity: PeerErrorSeverity.LowToleranceError
+            });
         });
         it('returns undefined if proposal is valid for current slot and proposer', async ()=>{
             const currentProposer = getSigner();
@@ -91,7 +185,9 @@ export function sharedProposalValidatorTests(params) {
             });
             mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
             const result = await validator.validate(mockProposal);
-            expect(result).toBeUndefined();
+            expect(result).toEqual({
+                result: 'accept'
+            });
         });
         it('returns undefined if proposal is valid for next slot and proposer', async ()=>{
             const currentProposer = getSigner();
@@ -104,7 +200,9 @@ export function sharedProposalValidatorTests(params) {
             });
             mockGetProposer(getAddress(currentProposer), getAddress(nextProposer));
             const result = await validator.validate(mockProposal);
-            expect(result).toBeUndefined();
+            expect(result).toEqual({
+                result: 'accept'
+            });
         });
         describe('transaction permission validation', ()=>{
             it('returns mid tolerance error if txs not permitted and proposal contains txHashes', async ()=>{
@@ -121,7 +219,10 @@ export function sharedProposalValidatorTests(params) {
                 });
                 mockGetProposer(getAddress(currentProposer), getAddress());
                 const result = await validatorWithTxsDisabled.validate(mockProposal);
-                expect(result).toBe(PeerErrorSeverity.MidToleranceError);
+                expect(result).toEqual({
+                    result: 'reject',
+                    severity: PeerErrorSeverity.MidToleranceError
+                });
             });
             it('returns undefined if txs not permitted but proposal has no txHashes', async ()=>{
                 const currentProposer = getSigner();
@@ -137,7 +238,9 @@ export function sharedProposalValidatorTests(params) {
                 });
                 mockGetProposer(getAddress(currentProposer), getAddress());
                 const result = await validatorWithTxsDisabled.validate(mockProposal);
-                expect(result).toBeUndefined();
+                expect(result).toEqual({
+                    result: 'accept'
+                });
             });
             it('returns undefined if txs permitted and proposal contains txHashes', async ()=>{
                 const currentProposer = getSigner();
@@ -150,7 +253,125 @@ export function sharedProposalValidatorTests(params) {
                 });
                 mockGetProposer(getAddress(currentProposer), getAddress());
                 const result = await validator.validate(mockProposal);
-                expect(result).toBeUndefined();
+                expect(result).toEqual({
+                    result: 'accept'
+                });
+            });
+        });
+        describe('embedded tx validation', ()=>{
+            it('returns mid tolerance error if embedded txs are not listed in txHashes', async ()=>{
+                const currentProposer = getSigner();
+                const txHashes = getTxHashes(2);
+                const header = makeHeader(1, 100, 100);
+                const mockProposal = await makeProposal({
+                    blockHeader: header,
+                    lastBlockHeader: header,
+                    signer: currentProposer,
+                    txHashes
+                });
+                // Create a fake tx whose hash is NOT in txHashes
+                const fakeTxHash = getTxHashes(1)[0];
+                const fakeTx = {
+                    getTxHash: ()=>fakeTxHash,
+                    validateTxHash: ()=>Promise.resolve(true)
+                };
+                Object.defineProperty(mockProposal, 'txs', {
+                    get: ()=>[
+                            fakeTx
+                        ],
+                    configurable: true
+                });
+                mockGetProposer(getAddress(currentProposer), getAddress());
+                const result = await validator.validate(mockProposal);
+                expect(result).toEqual({
+                    result: 'reject',
+                    severity: PeerErrorSeverity.MidToleranceError
+                });
+            });
+            it('returns low tolerance error if embedded tx has invalid tx hash', async ()=>{
+                const currentProposer = getSigner();
+                const txHashes = getTxHashes(2);
+                const header = makeHeader(1, 100, 100);
+                const mockProposal = await makeProposal({
+                    blockHeader: header,
+                    lastBlockHeader: header,
+                    signer: currentProposer,
+                    txHashes
+                });
+                // Create a fake tx whose hash IS in txHashes but validateTxHash returns false
+                const fakeTx = {
+                    getTxHash: ()=>txHashes[0],
+                    validateTxHash: ()=>Promise.resolve(false)
+                };
+                Object.defineProperty(mockProposal, 'txs', {
+                    get: ()=>[
+                            fakeTx
+                        ],
+                    configurable: true
+                });
+                mockGetProposer(getAddress(currentProposer), getAddress());
+                const result = await validator.validate(mockProposal);
+                expect(result).toEqual({
+                    result: 'reject',
+                    severity: PeerErrorSeverity.LowToleranceError
+                });
+            });
+        });
+        describe('maxTxsPerBlock validation', ()=>{
+            it('rejects proposal when txHashes exceed maxTxsPerBlock', async ()=>{
+                const validatorWithMaxTxs = validatorFactory(epochCache, {
+                    txsPermitted: true,
+                    maxTxsPerBlock: 2
+                });
+                const currentProposer = getSigner();
+                const header = makeHeader(1, 100, 100);
+                const mockProposal = await makeProposal({
+                    blockHeader: header,
+                    lastBlockHeader: header,
+                    signer: currentProposer,
+                    txHashes: getTxHashes(3)
+                });
+                mockGetProposer(getAddress(currentProposer), getAddress());
+                const result = await validatorWithMaxTxs.validate(mockProposal);
+                expect(result).toEqual({
+                    result: 'reject',
+                    severity: PeerErrorSeverity.MidToleranceError
+                });
+            });
+            it('accepts proposal when txHashes count equals maxTxsPerBlock', async ()=>{
+                const validatorWithMaxTxs = validatorFactory(epochCache, {
+                    txsPermitted: true,
+                    maxTxsPerBlock: 2
+                });
+                const currentProposer = getSigner();
+                const header = makeHeader(1, 100, 100);
+                const mockProposal = await makeProposal({
+                    blockHeader: header,
+                    lastBlockHeader: header,
+                    signer: currentProposer,
+                    txHashes: getTxHashes(2)
+                });
+                mockGetProposer(getAddress(currentProposer), getAddress());
+                const result = await validatorWithMaxTxs.validate(mockProposal);
+                expect(result).toEqual({
+                    result: 'accept'
+                });
+            });
+            it('accepts proposal when maxTxsPerBlock is not set (unlimited)', async ()=>{
+                // Default validator has no maxTxsPerBlock
+                const currentProposer = getSigner();
+                const header = makeHeader(1, 100, 100);
+                const mockProposal = await makeProposal({
+                    blockHeader: header,
+                    lastBlockHeader: header,
+                    signer: currentProposer,
+                    txHashes: getTxHashes(10)
+                });
+                mockGetProposer(getAddress(currentProposer), getAddress());
+                const result = await validator.validate(mockProposal);
+                expect(result).toEqual({
+                    result: 'accept'
+                });
             });
         });
     });

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

@@ -1,7 +1,7 @@
-import type { ProcessedTx, Tx, TxValidationResult, TxValidator } from '@aztec/stdlib/tx';
-export declare class AggregateTxValidator<T extends Tx | ProcessedTx> implements TxValidator<T> {
-    #private;
+import type { TxValidationResult, TxValidator } from '@aztec/stdlib/tx';
+export declare class AggregateTxValidator<T> implements TxValidator<T> {
+    readonly validators: TxValidator<T>[];
     constructor(...validators: TxValidator<T>[]);
     validateTx(tx: T): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdncmVnYXRlX3R4X3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hZ2dyZWdhdGVfdHhfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFekYscUJBQWEsb0JBQW9CLENBQUMsQ0FBQyxTQUFTLEVBQUUsR0FBRyxXQUFXLENBQUUsWUFBVyxXQUFXLENBQUMsQ0FBQyxDQUFDOztJQUVyRixZQUFZLEdBQUcsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQU0xQztJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQWtCbkQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdncmVnYXRlX3R4X3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hZ2dyZWdhdGVfdHhfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXhFLHFCQUFhLG9CQUFvQixDQUFDLENBQUMsQ0FBRSxZQUFXLFdBQVcsQ0FBQyxDQUFDLENBQUM7SUFDNUQsUUFBUSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUN0QyxZQUFZLEdBQUcsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQU0xQztJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQWtCbkQ7Q0FDRiJ9

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

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

package/dest/msg_validators/tx_validator/aggregate_tx_validator.js

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

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

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

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

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

package/dest/msg_validators/tx_validator/allowed_public_setup.js

@@ -1,25 +1,40 @@
-import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { FunctionSelector } from '@aztec/stdlib/abi';
 import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
-let defaultAllowedSetupFunctions = undefined;
-export async function getDefaultAllowedSetupFunctions() {
+let defaultAllowedSetupFunctions;
+/** Returns the default list of functions allowed to run in the setup phase of a transaction. */ export async function getDefaultAllowedSetupFunctions() {
     if (defaultAllowedSetupFunctions === undefined) {
+        const tokenClassId = (await getContractClassFromArtifact(TokenContractArtifact)).id;
+        const setAuthorizedInternalSelector = await FunctionSelector.fromSignature('_set_authorized((Field),Field,bool)');
+        const setAuthorizedSelector = await FunctionSelector.fromSignature('set_authorized(Field,bool)');
+        const increaseBalanceSelector = await FunctionSelector.fromSignature('_increase_public_balance((Field),u128)');
+        const transferInPublicSelector = await FunctionSelector.fromSignature('transfer_in_public((Field),(Field),u128,Field)');
         defaultAllowedSetupFunctions = [
-            // needed for authwit support
+            // AuthRegistry: needed for authwit support via private path (set_authorized_private enqueues _set_authorized)
             {
-                address: ProtocolContractAddress.AuthRegistry
+                address: ProtocolContractAddress.AuthRegistry,
+                selector: setAuthorizedInternalSelector
             },
-            // needed for claiming on the same tx as a spend
+            // AuthRegistry: needed for authwit support via public path (PublicFeePaymentMethod calls set_authorized directly)
             {
-                address: ProtocolContractAddress.FeeJuice
+                address: ProtocolContractAddress.AuthRegistry,
+                selector: setAuthorizedSelector
             },
-            // needed for private transfers via FPC
+            // FeeJuice: needed for claiming on the same tx as a spend (claim_and_end_setup enqueues this)
             {
-                classId: (await getContractClassFromArtifact(TokenContractArtifact)).id
+                address: ProtocolContractAddress.FeeJuice,
+                selector: increaseBalanceSelector
             },
+            // Token: needed for private transfers via FPC (transfer_to_public enqueues this)
             {
-                classId: (await getContractClassFromArtifact(FPCContract.artifact)).id
+                classId: tokenClassId,
+                selector: increaseBalanceSelector
+            },
+            // Token: needed for public transfers via FPC (fee_entrypoint_public enqueues this)
+            {
+                classId: tokenClassId,
+                selector: transferInPublicSelector
             }
         ];
     }

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

@@ -1,5 +1,5 @@
-import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { ArchiveSource } from '@aztec/p2p';
+import type { BlockHash } from '@aztec/stdlib/block';
 import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
 /**
  * Implements an archive source by checking a DB and an in-memory collection.
@@ -9,6 +9,6 @@ export declare class ArchiveCache implements ArchiveSource {
     private db;
     archives: Map<string, bigint>;
     constructor(db: MerkleTreeReadOperations);
-    getArchiveIndices(archives: Fr[]): Promise<(bigint | undefined)[]>;
+    getArchiveIndices(archives: BlockHash[]): Promise<(bigint | undefined)[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZV9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hcmNoaXZlX2NhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNoRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hGOzs7R0FHRztBQUNILHFCQUFhLFlBQWEsWUFBVyxhQUFhO0lBR3BDLE9BQU8sQ0FBQyxFQUFFO0lBRnRCLFFBQVEsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRTlCLFlBQW9CLEVBQUUsRUFBRSx3QkFBd0IsRUFFL0M7SUFFWSxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FVOUU7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZV9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hcmNoaXZlX2NhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNoRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hGOzs7R0FHRztBQUNILHFCQUFhLFlBQWEsWUFBVyxhQUFhO0lBR3BDLE9BQU8sQ0FBQyxFQUFFO0lBRnRCLFFBQVEsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRTlCLFlBQW9CLEVBQUUsRUFBRSx3QkFBd0IsRUFFL0M7SUFFWSxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsU0FBUyxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FVckY7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"archive_cache.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/archive_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF;;;GAGG;AACH,qBAAa,YAAa,YAAW,aAAa;IAGpC,OAAO,CAAC,EAAE;IAFtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE9B,YAAoB,EAAE,EAAE,wBAAwB,EAE/C;IAEY,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAU9E;CACF"}
+{"version":3,"file":"archive_cache.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/archive_cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF;;;GAGG;AACH,qBAAa,YAAa,YAAW,aAAa;IAGpC,OAAO,CAAC,EAAE;IAFtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE9B,YAAoB,EAAE,EAAE,wBAAwB,EAE/C;IAEY,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAUrF;CACF"}

package/dest/msg_validators/tx_validator/archive_cache.js

@@ -10,7 +10,7 @@ import { MerkleTreeId } from '@aztec/stdlib/trees';
         this.archives = new Map();
     }
     async getArchiveIndices(archives) {
-        const toCheckDb = archives.filter((n)=>!this.archives.has(n.toString()));
+        const toCheckDb = archives.filter((n)=>!this.archives.has(n.toString())).map((n)=>n.toFr());
         const dbHits = await this.db.findLeafIndices(MerkleTreeId.ARCHIVE, toCheckDb);
         dbHits.forEach((x, index)=>{
             if (x !== undefined) {

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"block_header_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/block_header_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,KAAK,KAAK,EAAyB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEhH,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CACxE;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,KAAK,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAI5E,YAAY,aAAa,EAAE,aAAa,EAEvC;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAOnD;CACF"}
+{"version":3,"file":"block_header_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/block_header_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAyB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpG,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/E;AAED,wDAAwD;AACxD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/B,IAAI,EAAE;QACJ,SAAS,EAAE;YACT,iBAAiB,EAAE;gBACjB,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;aAC5B,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,kBAAkB,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAIzF,YAAY,aAAa,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,EAGlE;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAOnD;CACF"}

package/dest/msg_validators/tx_validator/block_header_validator.js

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,EAAE,EACF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG/C,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMpD;CAmGF"}
+{"version":3,"file":"data_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/data_validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EASL,EAAE,EACF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,eAAgB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAGrD,YAAY,QAAQ,CAAC,EAAE,cAAc,EAEpC;IAEK,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMpD;CAmGF"}

package/dest/msg_validators/tx_validator/data_validator.js

@@ -3,7 +3,10 @@ import { createLogger } from '@aztec/foundation/log';
 import { computeCalldataHash } from '@aztec/stdlib/hash';
 import { TX_ERROR_CALLDATA_COUNT_MISMATCH, TX_ERROR_CALLDATA_COUNT_TOO_LARGE, TX_ERROR_CONTRACT_CLASS_LOGS, TX_ERROR_CONTRACT_CLASS_LOG_COUNT, TX_ERROR_CONTRACT_CLASS_LOG_LENGTH, TX_ERROR_CONTRACT_CLASS_LOG_SORTING, TX_ERROR_INCORRECT_CALLDATA, TX_ERROR_INCORRECT_HASH, Tx } from '@aztec/stdlib/tx';
 export class DataTxValidator {
-    #log = createLogger('p2p:tx_validator:tx_data');
+    #log;
+    constructor(bindings){
+        this.#log = createLogger('p2p:tx_validator:tx_data', bindings);
+    }
     async validateTx(tx) {
         const reason = await this.#hasCorrectHash(tx) ?? await this.#hasCorrectCalldata(tx) ?? await this.#hasCorrectContractClassLogs(tx);
         return reason ? {

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

@@ -1,10 +1,21 @@
-import { type AnyTx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { type LoggerBindings } from '@aztec/foundation/log';
+import { type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export interface NullifierSource {
     nullifiersExist: (nullifiers: Buffer[]) => Promise<boolean[]>;
 }
-export declare class DoubleSpendTxValidator<T extends AnyTx> implements TxValidator<T> {
+/** Structural interface for double-spend validation. */
+export interface HasNullifierData {
+    txHash: {
+        toString(): string;
+    };
+    data: {
+        getNonEmptyNullifiers(): Fr[];
+    };
+}
+export declare class DoubleSpendTxValidator<T extends HasNullifierData> implements TxValidator<T> {
     #private;
-    constructor(nullifierSource: NullifierSource);
+    constructor(nullifierSource: NullifierSource, bindings?: LoggerBindings);
     validateTx(tx: T): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG91YmxlX3NwZW5kX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9kb3VibGVfc3BlbmRfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFDTCxLQUFLLEtBQUssRUFJVixLQUFLLGtCQUFrQixFQUN2QixLQUFLLFdBQVcsRUFDakIsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQixNQUFNLFdBQVcsZUFBZTtJQUM5QixlQUFlLEVBQUUsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLEtBQUssT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7Q0FDL0Q7QUFFRCxxQkFBYSxzQkFBc0IsQ0FBQyxDQUFDLFNBQVMsS0FBSyxDQUFFLFlBQVcsV0FBVyxDQUFDLENBQUMsQ0FBQzs7SUFJNUUsWUFBWSxlQUFlLEVBQUUsZUFBZSxFQUUzQztJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQWdCbkQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG91YmxlX3NwZW5kX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9kb3VibGVfc3BlbmRfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sRUFBZSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RixPQUFPLEVBR0wsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxXQUFXLEVBQ2pCLE1BQU0sa0JBQWtCLENBQUM7QUFFMUIsTUFBTSxXQUFXLGVBQWU7SUFDOUIsZUFBZSxFQUFFLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0NBQy9EO0FBRUQsd0RBQXdEO0FBQ3hELE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsTUFBTSxFQUFFO1FBQUUsUUFBUSxJQUFJLE1BQU0sQ0FBQTtLQUFFLENBQUM7SUFDL0IsSUFBSSxFQUFFO1FBQUUscUJBQXFCLElBQUksRUFBRSxFQUFFLENBQUE7S0FBRSxDQUFDO0NBQ3pDO0FBRUQscUJBQWEsc0JBQXNCLENBQUMsQ0FBQyxTQUFTLGdCQUFnQixDQUFFLFlBQVcsV0FBVyxDQUFDLENBQUMsQ0FBQzs7SUFJdkYsWUFBWSxlQUFlLEVBQUUsZUFBZSxFQUFFLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHdEU7SUFFSyxVQUFVLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FnQm5EO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"double_spend_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/double_spend_validator.ts"],"names":[],"mappings":"AACA,OAAO,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;;IAI5E,YAAY,eAAe,EAAE,eAAe,EAE3C;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgBnD;CACF"}
+{"version":3,"file":"double_spend_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/double_spend_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CAC/D;AAED,wDAAwD;AACxD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/B,IAAI,EAAE;QAAE,qBAAqB,IAAI,EAAE,EAAE,CAAA;KAAE,CAAC;CACzC;AAED,qBAAa,sBAAsB,CAAC,CAAC,SAAS,gBAAgB,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;;IAIvF,YAAY,eAAe,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,cAAc,EAGtE;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgBnD;CACF"}