@aztec/stdlib 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/interfaces/validator.d.ts

@@ -2,12 +2,14 @@ import type { SecretValue } from '@aztec/foundation/config';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
+import { type ZodFor } from '@aztec/foundation/schemas';
 import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
-import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
+import type { StateReference, Tx } from '@aztec/stdlib/tx';
 import type { PeerId } from '@libp2p/interface';
 import { z } from 'zod';
 import type { CommitteeAttestationsAndSigners } from '../block/index.js';
+import type { CheckpointHeader } from '../rollup/checkpoint_header.js';
 /**
  * Validator client configuration
  */
@@ -29,7 +31,13 @@ export interface ValidatorClientConfig {
     /** Whether to always reexecute block proposals, even for non-validator nodes or when out of the currnet committee */
     alwaysReexecuteBlockProposals?: boolean;
 }
-export type ValidatorClientFullConfig = ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowList'> & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'>;
+export type ValidatorClientFullConfig = ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> & Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'> & {
+    /**
+     * Whether transactions are disabled for this node
+     * @remarks This should match the property in P2PConfig. It's not picked from there to avoid circular dependencies.
+     */
+    disableTransactions?: boolean;
+};
 export declare const ValidatorClientConfigSchema: z.ZodObject<{
     validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, any, string>, "many">>;
     disableValidator: z.ZodBoolean;
@@ -55,10 +63,98 @@ export declare const ValidatorClientConfigSchema: z.ZodObject<{
     validatorAddresses?: string[] | undefined;
     alwaysReexecuteBlockProposals?: boolean | undefined;
 }>;
+export declare const ValidatorClientFullConfigSchema: z.ZodObject<{
+    validatorAddresses: z.ZodOptional<z.ZodArray<z.ZodType<EthAddress, any, string>, "many">>;
+    disableValidator: z.ZodBoolean;
+    disabledValidators: z.ZodArray<z.ZodType<EthAddress, any, string>, "many">;
+    attestationPollingIntervalMs: z.ZodNumber;
+    validatorReexecute: z.ZodBoolean;
+    validatorReexecuteDeadlineMs: z.ZodNumber;
+    alwaysReexecuteBlockProposals: z.ZodOptional<z.ZodBoolean>;
+} & {
+    txPublicSetupAllowList: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
+        address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+        selector: ZodFor<import("../abi/function_selector.js").FunctionSelector>;
+    }, "strip", z.ZodTypeAny, {
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        address: import("../aztec-address/index.js").AztecAddress;
+    }, {
+        selector?: any;
+        address?: any;
+    }>, z.ZodObject<{
+        address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+    }, "strip", z.ZodTypeAny, {
+        address: import("../aztec-address/index.js").AztecAddress;
+    }, {
+        address?: any;
+    }>, z.ZodObject<{
+        classId: ZodFor<Fr>;
+        selector: ZodFor<import("../abi/function_selector.js").FunctionSelector>;
+    }, "strip", z.ZodTypeAny, {
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        classId: Fr;
+    }, {
+        selector?: any;
+        classId?: any;
+    }>, z.ZodObject<{
+        classId: ZodFor<Fr>;
+    }, "strip", z.ZodTypeAny, {
+        classId: Fr;
+    }, {
+        classId?: any;
+    }>]>, "many">>;
+    broadcastInvalidBlockProposal: z.ZodOptional<z.ZodBoolean>;
+    slashBroadcastedInvalidBlockPenalty: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    disableTransactions: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    slashBroadcastedInvalidBlockPenalty: bigint;
+    disableValidator: boolean;
+    disabledValidators: EthAddress[];
+    attestationPollingIntervalMs: number;
+    validatorReexecute: boolean;
+    validatorReexecuteDeadlineMs: number;
+    txPublicSetupAllowList?: ({
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        address: import("../aztec-address/index.js").AztecAddress;
+    } | {
+        address: import("../aztec-address/index.js").AztecAddress;
+    } | {
+        selector: import("../abi/function_selector.js").FunctionSelector;
+        classId: Fr;
+    } | {
+        classId: Fr;
+    })[] | undefined;
+    broadcastInvalidBlockProposal?: boolean | undefined;
+    validatorAddresses?: EthAddress[] | undefined;
+    alwaysReexecuteBlockProposals?: boolean | undefined;
+    disableTransactions?: boolean | undefined;
+}, {
+    slashBroadcastedInvalidBlockPenalty: string | number | bigint;
+    disableValidator: boolean;
+    disabledValidators: string[];
+    attestationPollingIntervalMs: number;
+    validatorReexecute: boolean;
+    validatorReexecuteDeadlineMs: number;
+    txPublicSetupAllowList?: ({
+        selector?: any;
+        address?: any;
+    } | {
+        address?: any;
+    } | {
+        selector?: any;
+        classId?: any;
+    } | {
+        classId?: any;
+    })[] | undefined;
+    broadcastInvalidBlockProposal?: boolean | undefined;
+    validatorAddresses?: string[] | undefined;
+    alwaysReexecuteBlockProposals?: boolean | undefined;
+    disableTransactions?: boolean | undefined;
+}>;
 export interface Validator {
     start(): Promise<void>;
     updateConfig(config: Partial<ValidatorClientFullConfig>): void;
-    createBlockProposal(blockNumber: number, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], proposerAddress: EthAddress | undefined, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
+    createBlockProposal(blockNumber: number, header: CheckpointHeader, archive: Fr, stateReference: StateReference, txs: Tx[], proposerAddress: EthAddress | undefined, options: BlockProposalOptions): Promise<BlockProposal | undefined>;
     attestToProposal(proposal: BlockProposal, sender: PeerId): Promise<BlockAttestation[] | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;

package/dest/interfaces/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/interfaces/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,6EAA6E;IAC7E,oBAAoB,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC,CAAC;IAEpD,iEAAiE;IACjE,kBAAkB,CAAC,EAAE,UAAU,EAAE,CAAC;IAElC,+BAA+B;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,6DAA6D;IAC7D,kBAAkB,EAAE,UAAU,EAAE,CAAC;IAEjC,+DAA+D;IAC/D,4BAA4B,EAAE,MAAM,CAAC;IAErC,8EAA8E;IAC9E,kBAAkB,EAAE,OAAO,CAAC;IAE5B,wEAAwE;IACxE,4BAA4B,EAAE,MAAM,CAAC;IAErC,qHAAqH;IACrH,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,MAAM,MAAM,yBAAyB,GAAG,qBAAqB,GAC3D,IAAI,CAAC,eAAe,EAAE,wBAAwB,CAAC,GAC/C,IAAI,CAAC,aAAa,EAAE,qCAAqC,CAAC,CAAC;AAE7D,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;EAQgC,CAAC;AAEzE,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC;IAG/D,mBAAmB,CACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,UAAU,GAAG,SAAS,EACvC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IACtC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC,CAAC;IAEnG,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5G,0BAA0B,CACxB,sBAAsB,EAAE,+BAA+B,EACvD,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,SAAS,CAAC,CAAC;CACvB"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/interfaces/validator.ts"],"names":[],"mappings":"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"}

package/dest/interfaces/validator.js

@@ -1,5 +1,6 @@
 import { schemas } from '@aztec/foundation/schemas';
 import { z } from 'zod';
+import { AllowedElementSchema } from './allowed_element.js';
 export const ValidatorClientConfigSchema = z.object({
     validatorAddresses: z.array(schemas.EthAddress).optional(),
     disableValidator: z.boolean(),
@@ -9,3 +10,9 @@ export const ValidatorClientConfigSchema = z.object({
     validatorReexecuteDeadlineMs: z.number().min(0),
     alwaysReexecuteBlockProposals: z.boolean().optional()
 });
+export const ValidatorClientFullConfigSchema = ValidatorClientConfigSchema.extend({
+    txPublicSetupAllowList: z.array(AllowedElementSchema).optional(),
+    broadcastInvalidBlockProposal: z.boolean().optional(),
+    slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
+    disableTransactions: z.boolean().optional()
+});

package/dest/kernel/hints/build_nullifier_read_request_hints.d.ts

@@ -1,6 +1,7 @@
 import { type MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, type NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
 import type { Fr } from '@aztec/foundation/fields';
-import { type IndexedTreeLeafPreimage, MembershipWitness } from '@aztec/foundation/trees';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import type { NullifierLeafPreimage } from '../../trees/nullifier_leaf.js';
 import type { ClaimedLengthArray } from '../claimed_length_array.js';
 import type { ScopedNullifier } from '../nullifier.js';
 import { ScopedReadRequest } from './read_request.js';
@@ -8,7 +9,7 @@ import { ReadRequestResetActions } from './read_request_hints.js';
 export declare function isValidNullifierReadRequest(readRequest: ScopedReadRequest, nullifier: ScopedNullifier): boolean;
 interface NullifierMembershipWitnessWithPreimage {
     membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
-    leafPreimage: IndexedTreeLeafPreimage;
+    leafPreimage: NullifierLeafPreimage;
 }
 export declare function getNullifierReadRequestResetActions(nullifierReadRequests: ClaimedLengthArray<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiers: ClaimedLengthArray<ScopedNullifier, typeof MAX_NULLIFIERS_PER_TX>, futureNullifiers: ScopedNullifier[]): ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>;
 export declare function buildNullifierReadRequestHintsFromResetActions<PENDING extends number, SETTLED extends number>(oracle: {

package/dest/kernel/hints/build_nullifier_read_request_hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/build_nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,qBAAqB,EAC1B,kCAAkC,EAClC,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG1F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAA0C,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAG1G,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,WAMrG;AAED,UAAU,sCAAsC;IAC9C,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC;IACnE,YAAY,EAAE,uBAAuB,CAAC;CACvC;AAED,wBAAgB,mCAAmC,CACjD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,gBAAgB,EAAE,eAAe,EAAE,GAClC,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,CAgCpE;AAED,wBAAsB,8CAA8C,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjH,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,YAAY,EAAE,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,EAChF,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,EACnE,MAAM,UAAQ,oGAwBf;AAED,wBAAsB,8BAA8B,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjG,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,gBAAgB,EAAE,eAAe,EAAE,EACnC,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,EACnE,MAAM,UAAQ,oGAWf"}
+{"version":3,"file":"build_nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/build_nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,qBAAqB,EAC1B,kCAAkC,EAClC,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAA0C,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAG1G,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,eAAe,WAMrG;AAED,UAAU,sCAAsC;IAC9C,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC;IACnE,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,wBAAgB,mCAAmC,CACjD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,gBAAgB,EAAE,eAAe,EAAE,GAClC,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,CAgCpE;AAED,wBAAsB,8CAA8C,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjH,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,YAAY,EAAE,uBAAuB,CAAC,OAAO,kCAAkC,CAAC,EAChF,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,EACnE,MAAM,UAAQ,oGAwBf;AAED,wBAAsB,8BAA8B,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EACjG,MAAM,EAAE;IACN,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;CAC/F,EACD,qBAAqB,EAAE,kBAAkB,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EACvG,UAAU,EAAE,kBAAkB,CAAC,eAAe,EAAE,OAAO,qBAAqB,CAAC,EAC7E,gBAAgB,EAAE,eAAe,EAAE,EACnC,UAAU,GAAE,OAAuD,EACnE,UAAU,GAAE,OAAuD,EACnE,MAAM,UAAQ,oGAWf"}

package/dest/kernel/hints/nullifier_read_request_hints.d.ts

@@ -1,8 +1,9 @@
 import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT } from '@aztec/constants';
 import type { BufferReader } from '@aztec/foundation/serialize';
-import type { MembershipWitness, TreeLeafPreimage } from '@aztec/foundation/trees';
+import type { MembershipWitness } from '@aztec/foundation/trees';
+import { NullifierLeafPreimage } from '../../trees/index.js';
 import { ReadRequestResetHints } from './read_request_hints.js';
-export type NullifierReadRequestHints<PENDING extends number, SETTLED extends number> = ReadRequestResetHints<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX, PENDING, SETTLED, typeof NULLIFIER_TREE_HEIGHT, TreeLeafPreimage>;
+export type NullifierReadRequestHints<PENDING extends number, SETTLED extends number> = ReadRequestResetHints<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX, PENDING, SETTLED, typeof NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage>;
 export declare function nullifierReadRequestHintsFromBuffer<PENDING extends number, SETTLED extends number>(buffer: Buffer | BufferReader, numPendingReads: PENDING, numSettledReads: SETTLED): NullifierReadRequestHints<PENDING, SETTLED>;
 export declare class NullifierReadRequestHintsBuilder<PENDING extends number, SETTLED extends number> {
     readonly maxPending: PENDING;
@@ -13,7 +14,7 @@ export declare class NullifierReadRequestHintsBuilder<PENDING extends number, SE
     constructor(maxPending: PENDING, maxSettled: SETTLED);
     static empty<PENDING extends number, SETTLED extends number>(maxPending: PENDING, maxSettled: SETTLED): NullifierReadRequestHints<PENDING, SETTLED>;
     addPendingReadRequest(readRequestIndex: number, nullifierIndex: number): void;
-    addSettledReadRequest(readRequestIndex: number, membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>, leafPreimage: TreeLeafPreimage): void;
+    addSettledReadRequest(readRequestIndex: number, membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>, leafPreimage: NullifierLeafPreimage): void;
     toHints(): NullifierReadRequestHints<PENDING, SETTLED>;
 }
 //# sourceMappingURL=nullifier_read_request_hints.d.ts.map

package/dest/kernel/hints/nullifier_read_request_hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGnF,OAAO,EAAsC,qBAAqB,EAAmB,MAAM,yBAAyB,CAAC;AAErH,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,IAAI,qBAAqB,CAC3G,OAAO,kCAAkC,EACzC,OAAO,EACP,OAAO,EACP,OAAO,qBAAqB,EAC5B,gBAAgB,CACjB,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAChG,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,GACvB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAS7C;AAED,qBAAa,gCAAgC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM;aAMxE,UAAU,EAAE,OAAO;aACnB,UAAU,EAAE,OAAO;IANrC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,mBAAmB,CAAK;gBAGd,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO;IAWrC,MAAM,CAAC,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAIrG,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAUtE,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,YAAY,EAAE,gBAAgB;IAchC,OAAO;CAGR"}
+{"version":3,"file":"nullifier_read_request_hints.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/nullifier_read_request_hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAsC,qBAAqB,EAAmB,MAAM,yBAAyB,CAAC;AAErH,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,IAAI,qBAAqB,CAC3G,OAAO,kCAAkC,EACzC,OAAO,EACP,OAAO,EACP,OAAO,qBAAqB,EAC5B,qBAAqB,CACtB,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAChG,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,GACvB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAS7C;AAED,qBAAa,gCAAgC,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM;aAMxE,UAAU,EAAE,OAAO;aACnB,UAAU,EAAE,OAAO;IANrC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,mBAAmB,CAAK;gBAGd,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO;IAWrC,MAAM,CAAC,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAIrG,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAUtE,qBAAqB,CACnB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,EAClE,YAAY,EAAE,qBAAqB;IAcrC,OAAO;CAGR"}

package/dest/kernel/nullifier.d.ts

@@ -4,9 +4,9 @@ import { AztecAddress } from '../aztec-address/index.js';
 import type { Ordered } from './utils/interfaces.js';
 export declare class Nullifier implements Ordered {
     value: Fr;
-    counter: number;
     noteHash: Fr;
-    constructor(value: Fr, counter: number, noteHash: Fr);
+    counter: number;
+    constructor(value: Fr, noteHash: Fr, counter: number);
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): Nullifier;
     isEmpty(): boolean;

package/dest/kernel/nullifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier.d.ts","sourceRoot":"","sources":["../../src/kernel/nullifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,SAAU,YAAW,OAAO;IAE9B,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,EAAE;gBAFZ,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,EAAE;IAGrB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ,IAAI,MAAM;IAIlB,KAAK,CAAC,eAAe,EAAE,YAAY;CAGpC;AAED,qBAAa,eAAgB,YAAW,OAAO;IAEpC,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,YAAY;gBAD7B,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY;IAGtC,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,OAER;IAED,IAAI,iBAAiB,OAEpB;IAED,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"nullifier.d.ts","sourceRoot":"","sources":["../../src/kernel/nullifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,SAAU,YAAW,OAAO;IAE9B,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,MAAM;gBAFf,KAAK,EAAE,EAAE,EACT,QAAQ,EAAE,EAAE,EACZ,OAAO,EAAE,MAAM;IAGxB,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ,IAAI,MAAM;IAIlB,KAAK,CAAC,eAAe,EAAE,YAAY;CAGpC;AAED,qBAAa,eAAgB,YAAW,OAAO;IAEpC,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,YAAY;gBAD7B,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY;IAGtC,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,OAER;IAED,IAAI,iBAAiB,OAEpB;IAED,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,QAAQ,IAAI,MAAM;CAGnB"}

package/dest/kernel/nullifier.js

@@ -3,39 +3,39 @@ import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/
 import { AztecAddress } from '../aztec-address/index.js';
 export class Nullifier {
     value;
-    counter;
     noteHash;
-    constructor(value, counter, noteHash){
+    counter;
+    constructor(value, noteHash, counter){
         this.value = value;
-        this.counter = counter;
         this.noteHash = noteHash;
+        this.counter = counter;
     }
     toFields() {
         return [
             this.value,
-            new Fr(this.counter),
-            this.noteHash
+            this.noteHash,
+            new Fr(this.counter)
         ];
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new Nullifier(reader.readField(), reader.readU32(), reader.readField());
+        return new Nullifier(reader.readField(), reader.readField(), reader.readU32());
     }
     isEmpty() {
-        return this.value.isZero() && !this.counter && this.noteHash.isZero();
+        return this.value.isZero() && this.noteHash.isZero() && !this.counter;
     }
     static empty() {
-        return new Nullifier(Fr.zero(), 0, Fr.zero());
+        return new Nullifier(Fr.zero(), Fr.zero(), 0);
     }
     toBuffer() {
-        return serializeToBuffer(this.value, this.counter, this.noteHash);
+        return serializeToBuffer(this.value, this.noteHash, this.counter);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new Nullifier(Fr.fromBuffer(reader), reader.readNumber(), Fr.fromBuffer(reader));
+        return new Nullifier(Fr.fromBuffer(reader), Fr.fromBuffer(reader), reader.readNumber());
     }
     toString() {
-        return `value=${this.value} counter=${this.counter} noteHash=${this.noteHash}`;
+        return `value=${this.value} noteHash=${this.noteHash} counter=${this.counter}`;
     }
     scope(contractAddress) {
         return new ScopedNullifier(this, contractAddress);

package/dest/kernel/private_call_data.d.ts

@@ -1,11 +1,11 @@
-import { FUNCTION_TREE_HEIGHT, PROTOCOL_CONTRACT_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
+import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { DelayedPublicMutableValues } from '../delayed_public_mutable/delayed_public_mutable_values.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import { ProtocolContractLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
+import { PublicDataTreeLeafPreimage } from '../trees/index.js';
 import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
 /**
@@ -77,16 +77,6 @@ export declare class PrivateVerificationKeyHints {
      * The membership witness for the function leaf corresponding to the function being invoked.
      */
     functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>;
-    /**
-     * The membership witness for the protocolContractLeaf.
-     */
-    protocolContractMembershipWitness: MembershipWitness<typeof PROTOCOL_CONTRACT_TREE_HEIGHT>;
-    /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */
-    protocolContractLeaf: ProtocolContractLeafPreimage;
     updatedClassIdHints: UpdatedClassIdHints;
     constructor(
     /**
@@ -108,23 +98,13 @@ export declare class PrivateVerificationKeyHints {
     /**
      * The membership witness for the function leaf corresponding to the function being invoked.
      */
-    functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>, 
-    /**
-     * The membership witness for the protocolContractLeaf.
-     */
-    protocolContractMembershipWitness: MembershipWitness<typeof PROTOCOL_CONTRACT_TREE_HEIGHT>, 
-    /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */
-    protocolContractLeaf: ProtocolContractLeafPreimage, updatedClassIdHints: UpdatedClassIdHints);
+    functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>, updatedClassIdHints: UpdatedClassIdHints);
     /**
      * Serialize into a field array. Low-level utility.
      * @param fields - Object with fields.
      * @returns The array.
      */
-    static getFields(fields: FieldsOf<PrivateVerificationKeyHints>): readonly [Fr, Fr, PublicKeys, Fr, MembershipWitness<5>, MembershipWitness<3>, ProtocolContractLeafPreimage, UpdatedClassIdHints];
+    static getFields(fields: FieldsOf<PrivateVerificationKeyHints>): readonly [Fr, Fr, PublicKeys, Fr, MembershipWitness<7>, UpdatedClassIdHints];
     static from(fields: FieldsOf<PrivateVerificationKeyHints>): PrivateVerificationKeyHints;
     /**
      * Serialize this as a buffer.

package/dest/kernel/private_call_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_call_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_call_data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private_call_data.d.ts","sourceRoot":"","sources":["../../src/kernel/private_call_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAsB,MAAM,kBAAkB,CAAC;AACrG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4DAA4D,CAAC;AACxG,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF;;GAEG;AACH,qBAAa,eAAe;IAExB;;OAEG;IACI,YAAY,EAAE,0BAA0B;IAE/C;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAElC;;OAEG;IACI,oBAAoB,EAAE,2BAA2B;;IAbxD;;OAEG;IACI,YAAY,EAAE,0BAA0B;IAE/C;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAElC;;OAEG;IACI,oBAAoB,EAAE,2BAA2B;IAG1D;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IAIlD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,eAAe;IAI/D;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe;CAQlE;AAED,qBAAa,2BAA2B;IAEpC;;OAEG;IACI,yBAAyB,EAAE,EAAE;IACpC;;OAEG;IACI,qCAAqC,EAAE,EAAE;IAChD;;OAEG;IACI,UAAU,EAAE,UAAU;IAC7B;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC;;OAEG;IACI,6BAA6B,EAAE,iBAAiB,CAAC,OAAO,oBAAoB,CAAC;IAE7E,mBAAmB,EAAE,mBAAmB;;IArB/C;;OAEG;IACI,yBAAyB,EAAE,EAAE;IACpC;;OAEG;IACI,qCAAqC,EAAE,EAAE;IAChD;;OAEG;IACI,UAAU,EAAE,UAAU;IAC7B;;OAEG;IACI,wBAAwB,EAAE,EAAE;IACnC;;OAEG;IACI,6BAA6B,EAAE,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,EAE7E,mBAAmB,EAAE,mBAAmB;IAGjD;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,2BAA2B,CAAC;IAW9D,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,2BAA2B,CAAC,GAAG,2BAA2B;IAIvF;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,2BAA2B;CAW9E;AAED,qBAAa,mBAAmB;IAErB,qBAAqB,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC;IACxE,kBAAkB,EAAE,0BAA0B;IAC9C,oBAAoB,EAAE,0BAA0B;gBAFhD,qBAAqB,EAAE,iBAAiB,CAAC,OAAO,uBAAuB,CAAC,EACxE,kBAAkB,EAAE,0BAA0B,EAC9C,oBAAoB,EAAE,0BAA0B;IAGzD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;IAItD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,GAAG,mBAAmB;IAIvE;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB;CAYtE"}

package/dest/kernel/private_call_data.js

@@ -1,10 +1,10 @@
-import { FUNCTION_TREE_HEIGHT, PROTOCOL_CONTRACT_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE } from '@aztec/constants';
+import { FUNCTION_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import { DelayedPublicMutableValues } from '../delayed_public_mutable/delayed_public_mutable_values.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import { ProtocolContractLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js';
+import { PublicDataTreeLeafPreimage } from '../trees/index.js';
 import { VerificationKeyAsFields } from '../vks/verification_key.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
 /**
@@ -59,8 +59,6 @@ export class PrivateVerificationKeyHints {
     publicKeys;
     saltedInitializationHash;
     functionLeafMembershipWitness;
-    protocolContractMembershipWitness;
-    protocolContractLeaf;
     updatedClassIdHints;
     constructor(/**
      * Artifact hash of the contract class for this private call.
@@ -72,20 +70,12 @@ export class PrivateVerificationKeyHints {
      * Salted initialization hash of the contract instance.
      */ saltedInitializationHash, /**
      * The membership witness for the function leaf corresponding to the function being invoked.
-     */ functionLeafMembershipWitness, /**
-     * The membership witness for the protocolContractLeaf.
-     */ protocolContractMembershipWitness, /**
-     * The leaf of the protocol contract tree, of either:
-     *  The protocol contract being called.
-     *  The low leaf showing that the address of the contract being called is not in the tree.
-     */ protocolContractLeaf, updatedClassIdHints){
+     */ functionLeafMembershipWitness, updatedClassIdHints){
         this.contractClassArtifactHash = contractClassArtifactHash;
         this.contractClassPublicBytecodeCommitment = contractClassPublicBytecodeCommitment;
         this.publicKeys = publicKeys;
         this.saltedInitializationHash = saltedInitializationHash;
         this.functionLeafMembershipWitness = functionLeafMembershipWitness;
-        this.protocolContractMembershipWitness = protocolContractMembershipWitness;
-        this.protocolContractLeaf = protocolContractLeaf;
         this.updatedClassIdHints = updatedClassIdHints;
     }
     /**
@@ -99,8 +89,6 @@ export class PrivateVerificationKeyHints {
             fields.publicKeys,
             fields.saltedInitializationHash,
             fields.functionLeafMembershipWitness,
-            fields.protocolContractMembershipWitness,
-            fields.protocolContractLeaf,
             fields.updatedClassIdHints
         ];
     }
@@ -119,7 +107,7 @@ export class PrivateVerificationKeyHints {
    * @returns The deserialized instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateVerificationKeyHints(reader.readObject(Fr), reader.readObject(Fr), reader.readObject(PublicKeys), reader.readObject(Fr), reader.readObject(MembershipWitness.deserializer(FUNCTION_TREE_HEIGHT)), reader.readObject(MembershipWitness.deserializer(PROTOCOL_CONTRACT_TREE_HEIGHT)), reader.readObject(ProtocolContractLeafPreimage), reader.readObject(UpdatedClassIdHints));
+        return new PrivateVerificationKeyHints(reader.readObject(Fr), reader.readObject(Fr), reader.readObject(PublicKeys), reader.readObject(Fr), reader.readObject(MembershipWitness.deserializer(FUNCTION_TREE_HEIGHT)), reader.readObject(UpdatedClassIdHints));
     }
 }
 export class UpdatedClassIdHints {

package/dest/kernel/private_circuit_public_inputs.d.ts

@@ -99,11 +99,11 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
      */
-    historicalHeader: BlockHeader;
+    anchorBlockHeader: BlockHeader;
     /**
      * Transaction context.
      *
-     * Note: The chainId and version in the txContext are not redundant to the values in self.historical_header.global_variables because
+     * Note: The chainId and version in the txContext are not redundant to the values in self.anchor_block_header.global_variables because
      * they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
      * before the upgrade took place but be using the updated protocol to execute and prove the transaction.
      */
@@ -188,11 +188,11 @@ export declare class PrivateCircuitPublicInputs {
     /**
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
      */
-    historicalHeader: BlockHeader, 
+    anchorBlockHeader: BlockHeader, 
     /**
      * Transaction context.
      *
-     * Note: The chainId and version in the txContext are not redundant to the values in self.historical_header.global_variables because
+     * Note: The chainId and version in the txContext are not redundant to the values in self.anchor_block_header.global_variables because
      * they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
      * before the upgrade took place but be using the updated protocol to execute and prove the transaction.
      */
@@ -221,7 +221,7 @@ export declare class PrivateCircuitPublicInputs {
      * @param fields - Object with fields.
      * @returns The array.
      */
-    static getFields(fields: FieldsOf<PrivateCircuitPublicInputs>): readonly [CallContext, Fr, Fr, Fr, boolean, bigint, ClaimedLengthArray<ReadRequest, 16>, ClaimedLengthArray<ReadRequest, 16>, ClaimedLengthArray<KeyValidationRequestAndGenerator, 16>, ClaimedLengthArray<NoteHash, 16>, ClaimedLengthArray<Nullifier, 16>, ClaimedLengthArray<PrivateCallRequest, 5>, ClaimedLengthArray<CountedPublicCallRequest, 16>, PublicCallRequest, ClaimedLengthArray<CountedL2ToL1Message, 2>, ClaimedLengthArray<PrivateLogData, 16>, ClaimedLengthArray<CountedLogHash, 1>, Fr, Fr, BlockHeader, TxContext];
+    static getFields(fields: FieldsOf<PrivateCircuitPublicInputs>): readonly [CallContext, Fr, Fr, Fr, boolean, bigint, ClaimedLengthArray<ReadRequest, 16>, ClaimedLengthArray<ReadRequest, 16>, ClaimedLengthArray<KeyValidationRequestAndGenerator, 16>, ClaimedLengthArray<NoteHash, 16>, ClaimedLengthArray<Nullifier, 16>, ClaimedLengthArray<PrivateCallRequest, 8>, ClaimedLengthArray<CountedPublicCallRequest, 32>, PublicCallRequest, ClaimedLengthArray<CountedL2ToL1Message, 8>, ClaimedLengthArray<PrivateLogData, 16>, ClaimedLengthArray<CountedLogHash, 1>, Fr, Fr, BlockHeader, TxContext];
     /**
      * Serialize this as a buffer.
      * @returns The buffer.

package/dest/kernel/private_circuit_public_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_circuit_public_inputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private_circuit_public_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_circuit_public_inputs.ts"],"names":[],"mappings":"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"}

package/dest/kernel/private_circuit_public_inputs.js

@@ -37,7 +37,7 @@ import { CountedPublicCallRequest, PublicCallRequest } from './public_call_reque
     contractClassLogsHashes;
     startSideEffectCounter;
     endSideEffectCounter;
-    historicalHeader;
+    anchorBlockHeader;
     txContext;
     constructor(/**
      * Context of the call corresponding to this private circuit execution.
@@ -79,10 +79,10 @@ import { CountedPublicCallRequest, PublicCallRequest } from './public_call_reque
      * The end side effect counter for this call.
      */ endSideEffectCounter, /**
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
-     */ historicalHeader, /**
+     */ anchorBlockHeader, /**
      * Transaction context.
      *
-     * Note: The chainId and version in the txContext are not redundant to the values in self.historical_header.global_variables because
+     * Note: The chainId and version in the txContext are not redundant to the values in self.anchor_block_header.global_variables because
      * they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
      * before the upgrade took place but be using the updated protocol to execute and prove the transaction.
      */ txContext){
@@ -105,7 +105,7 @@ import { CountedPublicCallRequest, PublicCallRequest } from './public_call_reque
         this.contractClassLogsHashes = contractClassLogsHashes;
         this.startSideEffectCounter = startSideEffectCounter;
         this.endSideEffectCounter = endSideEffectCounter;
-        this.historicalHeader = historicalHeader;
+        this.anchorBlockHeader = anchorBlockHeader;
         this.txContext = txContext;
     }
     /**
@@ -134,7 +134,7 @@ import { CountedPublicCallRequest, PublicCallRequest } from './public_call_reque
         return new PrivateCircuitPublicInputs(CallContext.empty(), Fr.ZERO, Fr.ZERO, Fr.ZERO, false, 0n, ClaimedLengthArray.empty(ReadRequest, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL), ClaimedLengthArray.empty(ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL), ClaimedLengthArray.empty(KeyValidationRequestAndGenerator, MAX_KEY_VALIDATION_REQUESTS_PER_CALL), ClaimedLengthArray.empty(NoteHash, MAX_NOTE_HASHES_PER_CALL), ClaimedLengthArray.empty(Nullifier, MAX_NULLIFIERS_PER_CALL), ClaimedLengthArray.empty(PrivateCallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL), ClaimedLengthArray.empty(CountedPublicCallRequest, MAX_ENQUEUED_CALLS_PER_CALL), PublicCallRequest.empty(), ClaimedLengthArray.empty(CountedL2ToL1Message, MAX_L2_TO_L1_MSGS_PER_CALL), ClaimedLengthArray.empty(PrivateLogData, MAX_PRIVATE_LOGS_PER_CALL), ClaimedLengthArray.empty(CountedLogHash, MAX_CONTRACT_CLASS_LOGS_PER_CALL), Fr.ZERO, Fr.ZERO, BlockHeader.empty(), TxContext.empty());
     }
     isEmpty() {
-        return this.callContext.isEmpty() && this.argsHash.isZero() && this.returnsHash.isZero() && this.minRevertibleSideEffectCounter.isZero() && !this.isFeePayer && !this.includeByTimestamp && this.noteHashReadRequests.isEmpty() && this.nullifierReadRequests.isEmpty() && this.keyValidationRequestsAndGenerators.isEmpty() && this.noteHashes.isEmpty() && this.nullifiers.isEmpty() && this.privateCallRequests.isEmpty() && this.publicCallRequests.isEmpty() && this.publicTeardownCallRequest.isEmpty() && this.l2ToL1Msgs.isEmpty() && this.privateLogs.isEmpty() && this.contractClassLogsHashes.isEmpty() && this.startSideEffectCounter.isZero() && this.endSideEffectCounter.isZero() && this.historicalHeader.isEmpty() && this.txContext.isEmpty();
+        return this.callContext.isEmpty() && this.argsHash.isZero() && this.returnsHash.isZero() && this.minRevertibleSideEffectCounter.isZero() && !this.isFeePayer && !this.includeByTimestamp && this.noteHashReadRequests.isEmpty() && this.nullifierReadRequests.isEmpty() && this.keyValidationRequestsAndGenerators.isEmpty() && this.noteHashes.isEmpty() && this.nullifiers.isEmpty() && this.privateCallRequests.isEmpty() && this.publicCallRequests.isEmpty() && this.publicTeardownCallRequest.isEmpty() && this.l2ToL1Msgs.isEmpty() && this.privateLogs.isEmpty() && this.contractClassLogsHashes.isEmpty() && this.startSideEffectCounter.isZero() && this.endSideEffectCounter.isZero() && this.anchorBlockHeader.isEmpty() && this.txContext.isEmpty();
     }
     /**
    * Serialize into a field array. Low-level utility.
@@ -161,7 +161,7 @@ import { CountedPublicCallRequest, PublicCallRequest } from './public_call_reque
             fields.contractClassLogsHashes,
             fields.startSideEffectCounter,
             fields.endSideEffectCounter,
-            fields.historicalHeader,
+            fields.anchorBlockHeader,
             fields.txContext
         ];
     }
@@ -191,7 +191,7 @@ import { CountedPublicCallRequest, PublicCallRequest } from './public_call_reque
             this.contractClassLogsHashes,
             this.startSideEffectCounter,
             this.endSideEffectCounter,
-            this.historicalHeader,
+            this.anchorBlockHeader,
             this.txContext
         ]);
     }

package/dest/kernel/private_context_inputs.d.ts

@@ -4,10 +4,10 @@ import { CallContext } from '../tx/call_context.js';
 import { TxContext } from '../tx/tx_context.js';
 export declare class PrivateContextInputs {
     callContext: CallContext;
-    historicalHeader: BlockHeader;
+    anchorBlockHeader: BlockHeader;
     txContext: TxContext;
     startSideEffectCounter: number;
-    constructor(callContext: CallContext, historicalHeader: BlockHeader, txContext: TxContext, startSideEffectCounter: number);
+    constructor(callContext: CallContext, anchorBlockHeader: BlockHeader, txContext: TxContext, startSideEffectCounter: number);
     static empty(): PrivateContextInputs;
     toFields(): Fr[];
 }

package/dest/kernel/private_context_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_context_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_context_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,qBAAa,oBAAoB;IAEtB,WAAW,EAAE,WAAW;IACxB,gBAAgB,EAAE,WAAW;IAC7B,SAAS,EAAE,SAAS;IACpB,sBAAsB,EAAE,MAAM;gBAH9B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,WAAW,EAC7B,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,MAAM;WAGzB,KAAK,IAAI,oBAAoB;IAIpC,QAAQ,IAAI,EAAE,EAAE;CAGxB"}
+{"version":3,"file":"private_context_inputs.d.ts","sourceRoot":"","sources":["../../src/kernel/private_context_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,qBAAa,oBAAoB;IAEtB,WAAW,EAAE,WAAW;IACxB,iBAAiB,EAAE,WAAW;IAC9B,SAAS,EAAE,SAAS;IACpB,sBAAsB,EAAE,MAAM;gBAH9B,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,WAAW,EAC9B,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,MAAM;WAGzB,KAAK,IAAI,oBAAoB;IAIpC,QAAQ,IAAI,EAAE,EAAE;CAGxB"}

package/dest/kernel/private_context_inputs.js

@@ -4,12 +4,12 @@ import { CallContext } from '../tx/call_context.js';
 import { TxContext } from '../tx/tx_context.js';
 export class PrivateContextInputs {
     callContext;
-    historicalHeader;
+    anchorBlockHeader;
     txContext;
     startSideEffectCounter;
-    constructor(callContext, historicalHeader, txContext, startSideEffectCounter){
+    constructor(callContext, anchorBlockHeader, txContext, startSideEffectCounter){
         this.callContext = callContext;
-        this.historicalHeader = historicalHeader;
+        this.anchorBlockHeader = anchorBlockHeader;
         this.txContext = txContext;
         this.startSideEffectCounter = startSideEffectCounter;
     }
@@ -19,7 +19,7 @@ export class PrivateContextInputs {
     toFields() {
         return serializeToFields([
             this.callContext,
-            this.historicalHeader,
+            this.anchorBlockHeader,
             this.txContext,
             this.startSideEffectCounter
         ]);

package/dest/kernel/private_kernel_circuit_public_inputs.d.ts

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';
-import { TxConstantData } from '../tx/tx_constant_data.js';
+import { PrivateTxConstantData } from '../tx/private_tx_constant_data.js';
 import type { UInt64 } from '../types/shared.js';
 import { PrivateAccumulatedData } from './private_accumulated_data.js';
 import { PrivateValidationRequests } from './private_validation_requests.js';
@@ -13,7 +13,7 @@ export declare class PrivateKernelCircuitPublicInputs {
     /**
      * Data which is not modified by the circuits.
      */
-    constants: TxConstantData;
+    constants: PrivateTxConstantData;
     /**
      * The side effect counter that non-revertible side effects are all beneath.
      */
@@ -50,7 +50,7 @@ export declare class PrivateKernelCircuitPublicInputs {
     /**
      * Data which is not modified by the circuits.
      */
-    constants: TxConstantData, 
+    constants: PrivateTxConstantData, 
     /**
      * The side effect counter that non-revertible side effects are all beneath.
      */