@aztec/stdlib 3.0.0-nightly.20250924 → 3.0.0-nightly.20250926

package/dest/interfaces/pxe.js

@@ -1,13 +1,6 @@
 import { z } from 'zod';
-import { AbiTypeSchema, ContractArtifactSchema } from '../abi/abi.js';
-import { AuthWitness } from '../auth_witness/auth_witness.js';
-import { CompleteAddress, ContractClassWithIdSchema, ContractInstanceWithAddressSchema, ProtocolContractAddressesSchema } from '../contract/index.js';
-import { UniqueNote } from '../note/extended_note.js';
-import { NotesFilterSchema } from '../note/notes_filter.js';
-import { AbiDecodedSchema, optional, schemas } from '../schemas/schemas.js';
-import { SimulationOverrides, TxExecutionRequest, TxSimulationResult } from '../tx/index.js';
-import { TxProfileResult, UtilitySimulationResult } from '../tx/profiling.js';
-import { TxProvingResult } from '../tx/proven_tx.js';
+import { AbiTypeSchema } from '../abi/abi.js';
+import { schemas } from '../schemas/schemas.js';
 export const EventMetadataDefinitionSchema = z.object({
     eventSelector: schemas.EventSelector,
     abiType: AbiTypeSchema,
@@ -18,53 +11,3 @@ export const EventMetadataDefinitionSchema = z.object({
     EventType["Unencrypted"] = "Unencrypted";
     return EventType;
 }({});
-export const ContractMetadataSchema = z.object({
-    contractInstance: z.union([
-        ContractInstanceWithAddressSchema,
-        z.undefined()
-    ]),
-    isContractInitialized: z.boolean(),
-    isContractPublished: z.boolean()
-});
-export const ContractClassMetadataSchema = z.object({
-    contractClass: z.union([
-        ContractClassWithIdSchema,
-        z.undefined()
-    ]),
-    isContractClassPubliclyRegistered: z.boolean(),
-    artifact: z.union([
-        ContractArtifactSchema,
-        z.undefined()
-    ])
-});
-const PXEInfoSchema = z.object({
-    pxeVersion: z.string(),
-    protocolContractAddresses: ProtocolContractAddressesSchema
-});
-export const PXESchema = {
-    registerAccount: z.function().args(schemas.Fr, schemas.Fr).returns(CompleteAddress.schema),
-    getRegisteredAccounts: z.function().returns(z.array(CompleteAddress.schema)),
-    registerSender: z.function().args(schemas.AztecAddress).returns(schemas.AztecAddress),
-    getSenders: z.function().returns(z.array(schemas.AztecAddress)),
-    removeSender: z.function().args(schemas.AztecAddress).returns(z.void()),
-    registerContractClass: z.function().args(ContractArtifactSchema).returns(z.void()),
-    registerContract: z.function().args(z.object({
-        instance: ContractInstanceWithAddressSchema,
-        artifact: z.optional(ContractArtifactSchema)
-    })).returns(z.void()),
-    updateContract: z.function().args(schemas.AztecAddress, ContractArtifactSchema).returns(z.void()),
-    getContracts: z.function().returns(z.array(schemas.AztecAddress)),
-    proveTx: z.function().args(TxExecutionRequest.schema).returns(TxProvingResult.schema),
-    profileTx: z.function().args(TxExecutionRequest.schema, z.union([
-        z.literal('gates'),
-        z.literal('full'),
-        z.literal('execution-steps')
-    ]), optional(z.boolean()), optional(schemas.AztecAddress)).returns(TxProfileResult.schema),
-    simulateTx: z.function().args(TxExecutionRequest.schema, z.boolean(), optional(z.boolean()), optional(z.boolean()), optional(SimulationOverrides.schema), optional(z.array(schemas.AztecAddress))).returns(TxSimulationResult.schema),
-    getNotes: z.function().args(NotesFilterSchema).returns(z.array(UniqueNote.schema)),
-    simulateUtility: z.function().args(z.string(), z.array(z.any()), schemas.AztecAddress, optional(z.array(AuthWitness.schema)), optional(schemas.AztecAddress), optional(z.array(schemas.AztecAddress))).returns(UtilitySimulationResult.schema),
-    getPXEInfo: z.function().returns(PXEInfoSchema),
-    getContractMetadata: z.function().args(schemas.AztecAddress).returns(ContractMetadataSchema),
-    getContractClassMetadata: z.function().args(schemas.Fr, optional(z.boolean())).returns(ContractClassMetadataSchema),
-    getPrivateEvents: z.function().args(schemas.AztecAddress, EventMetadataDefinitionSchema, z.number(), z.number(), z.array(schemas.AztecAddress)).returns(z.array(AbiDecodedSchema))
-};

package/dest/interfaces/slasher.d.ts

@@ -20,6 +20,7 @@ export interface SlasherConfig {
     slashOffenseExpirationRounds: number;
     slashMaxPayloadSize: number;
     slashGracePeriodL2Slots: number;
+    slashExecuteRoundsLookBack: number;
 }
 export declare const SlasherConfigSchema: z.ZodObject<{
     slashOverridePayload: z.ZodOptional<z.ZodType<EthAddress, any, string>>;
@@ -39,6 +40,7 @@ export declare const SlasherConfigSchema: z.ZodObject<{
     slashMaxPayloadSize: z.ZodNumber;
     slashGracePeriodL2Slots: z.ZodNumber;
     slashBroadcastedInvalidBlockPenalty: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+    slashExecuteRoundsLookBack: z.ZodNumber;
     slashSelfAllowed: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     slashMinPenaltyPercentage: number;
@@ -57,6 +59,7 @@ export declare const SlasherConfigSchema: z.ZodObject<{
     slashMaxPayloadSize: number;
     slashGracePeriodL2Slots: number;
     slashBroadcastedInvalidBlockPenalty: bigint;
+    slashExecuteRoundsLookBack: number;
     slashOverridePayload?: EthAddress | undefined;
     slashSelfAllowed?: boolean | undefined;
 }, {
@@ -76,6 +79,7 @@ export declare const SlasherConfigSchema: z.ZodObject<{
     slashMaxPayloadSize: number;
     slashGracePeriodL2Slots: number;
     slashBroadcastedInvalidBlockPenalty: string | number | bigint;
+    slashExecuteRoundsLookBack: number;
     slashOverridePayload?: string | undefined;
     slashSelfAllowed?: boolean | undefined;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"slasher.d.ts","sourceRoot":"","sources":["../../src/interfaces/slasher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,UAAU,EAAE,CAAC;IACpC,oBAAoB,EAAE,UAAU,EAAE,CAAC;IACnC,+BAA+B,EAAE,MAAM,CAAC;IACxC,wCAAwC,EAAE,MAAM,CAAC;IACjD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mCAAmC,EAAE,MAAM,CAAC;IAC5C,sCAAsC,EAAE,MAAM,CAAC;IAC/C,qCAAqC,EAAE,MAAM,CAAC;IAC9C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,4BAA4B,EAAE,MAAM,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmBE,CAAC"}
+{"version":3,"file":"slasher.d.ts","sourceRoot":"","sources":["../../src/interfaces/slasher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,UAAU,EAAE,CAAC;IACpC,oBAAoB,EAAE,UAAU,EAAE,CAAC;IACnC,+BAA+B,EAAE,MAAM,CAAC;IACxC,wCAAwC,EAAE,MAAM,CAAC;IACjD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,CAAC;IACpC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mCAAmC,EAAE,MAAM,CAAC;IAC5C,sCAAsC,EAAE,MAAM,CAAC;IAC/C,qCAAqC,EAAE,MAAM,CAAC;IAC9C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,4BAA4B,EAAE,MAAM,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAChC,0BAA0B,EAAE,MAAM,CAAC;CACpC;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoBE,CAAC"}

package/dest/interfaces/slasher.js

@@ -18,5 +18,6 @@ export const SlasherConfigSchema = z.object({
     slashMaxPayloadSize: z.number(),
     slashGracePeriodL2Slots: z.number(),
     slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
+    slashExecuteRoundsLookBack: z.number(),
     slashSelfAllowed: z.boolean().optional()
 });

package/dest/interfaces/validator.d.ts

@@ -23,10 +23,12 @@ export interface ValidatorClientConfig {
     disabledValidators: EthAddress[];
     /** Interval between polling for new attestations from peers */
     attestationPollingIntervalMs: number;
-    /** Re-execute transactions before attesting */
+    /** Whether to re-execute transactions in a block proposal before attesting */
     validatorReexecute: boolean;
     /** Will re-execute until this many milliseconds are left in the slot */
     validatorReexecuteDeadlineMs: number;
+    /** 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 declare const ValidatorClientConfigSchema: z.ZodObject<{
@@ -36,6 +38,7 @@ export declare const ValidatorClientConfigSchema: z.ZodObject<{
     attestationPollingIntervalMs: z.ZodNumber;
     validatorReexecute: z.ZodBoolean;
     validatorReexecuteDeadlineMs: z.ZodNumber;
+    alwaysReexecuteBlockProposals: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     disableValidator: boolean;
     disabledValidators: EthAddress[];
@@ -43,6 +46,7 @@ export declare const ValidatorClientConfigSchema: z.ZodObject<{
     validatorReexecute: boolean;
     validatorReexecuteDeadlineMs: number;
     validatorAddresses?: EthAddress[] | undefined;
+    alwaysReexecuteBlockProposals?: boolean | undefined;
 }, {
     disableValidator: boolean;
     disabledValidators: string[];
@@ -50,6 +54,7 @@ export declare const ValidatorClientConfigSchema: z.ZodObject<{
     validatorReexecute: boolean;
     validatorReexecuteDeadlineMs: number;
     validatorAddresses?: string[] | undefined;
+    alwaysReexecuteBlockProposals?: boolean | undefined;
 }>;
 export interface Validator {
     start(): Promise<void>;

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,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3D,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;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE;;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,+CAA+C;IAC/C,kBAAkB,EAAE,OAAO,CAAC;IAE5B,wEAAwE;IACxE,4BAA4B,EAAE,MAAM,CAAC;CACtC;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;;;;;;;;;;;;;;;;;;;;;EAOgC,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,gBAAgB,EACxB,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":"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,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3D,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;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE;;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,gBAAgB,EACxB,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"}

package/dest/interfaces/validator.js

@@ -6,5 +6,6 @@ export const ValidatorClientConfigSchema = z.object({
     disabledValidators: z.array(schemas.EthAddress),
     attestationPollingIntervalMs: z.number().min(0),
     validatorReexecute: z.boolean(),
-    validatorReexecuteDeadlineMs: z.number().min(0)
+    validatorReexecuteDeadlineMs: z.number().min(0),
+    alwaysReexecuteBlockProposals: z.boolean().optional()
 });

package/dest/rollup/avm_proof_data.d.ts

@@ -1,17 +1,7 @@
 import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
-import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/vk_data.js';
-export declare class AvmProofData {
-    publicInputs: AvmCircuitPublicInputs;
-    proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
-    vkData: VkData;
-    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>, vkData: VkData);
-    static fromBuffer(buffer: Buffer | BufferReader): AvmProofData;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    static empty(): AvmProofData;
-}
+import type { ProofData } from '../proofs/proof_data.js';
+export type AvmProofData = ProofData<AvmCircuitPublicInputs, typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
 export declare function enhanceProofWithPiValidationFlag(proof: Fr[], skipPublicInputsValidation: boolean): Fr[];
 //# sourceMappingURL=avm_proof_data.d.ts.map

package/dest/rollup/avm_proof_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC;IAClE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC,EAClE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb;AAGD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}
+{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,sBAAsB,EAAE,OAAO,oCAAoC,CAAC,CAAC;AAG1G,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}

package/dest/rollup/avm_proof_data.js

@@ -1,29 +1,5 @@
 import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
-import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/vk_data.js';
-export class AvmProofData {
-    publicInputs;
-    proof;
-    vkData;
-    constructor(publicInputs, proof, vkData){
-        this.publicInputs = publicInputs;
-        this.proof = proof;
-        this.vkData = vkData;
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
-    }
-    toBuffer() {
-        return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
-    }
-    static empty() {
-        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED), VkData.empty());
-    }
-}
 // TODO(#14234)[Unconditional PIs validation]: remove this function.
 export function enhanceProofWithPiValidationFlag(proof, skipPublicInputsValidation) {
     const skipPublicInputsField = skipPublicInputsValidation ? new Fr(1) : new Fr(0);

package/dest/rollup/base_rollup_hints.d.ts

@@ -2,14 +2,13 @@ import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, MAX_CONTRACT_CLASS_LOGS_PER_TX } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { PublicDataHint } from '../avm/public_data_hint.js';
 import { ContractClassLogFields } from '../logs/index.js';
-import { AppendOnlyTreeSnapshot } from '../trees/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 export type BaseRollupHints = PrivateBaseRollupHints | PublicBaseRollupHints;
 export declare class PrivateBaseRollupHints {
     /**
@@ -23,15 +22,15 @@ export declare class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    stateDiffHints: PrivateBaseStateDiffHints;
+    treeSnapshotDiffHints: TreeSnapshotDiffHints;
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    feePayerFeeJuiceBalanceReadHint: PublicDataHint;
+    feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage;
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>;
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -52,15 +51,15 @@ export declare class PrivateBaseRollupHints {
     /**
      * Hints used while proving state diff validity.
      */
-    stateDiffHints: PrivateBaseStateDiffHints, 
+    treeSnapshotDiffHints: TreeSnapshotDiffHints, 
     /**
-     * Public data read hint for accessing the balance of the fee payer.
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
      */
-    feePayerFeeJuiceBalanceReadHint: PublicDataHint, 
+    feePayerBalanceLeafPreimage: PublicDataTreeLeafPreimage, 
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>, 
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, 
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -70,7 +69,7 @@ export declare class PrivateBaseRollupHints {
      */
     constants: BlockConstantData);
     static from(fields: FieldsOf<PrivateBaseRollupHints>): PrivateBaseRollupHints;
-    static getFields(fields: FieldsOf<PrivateBaseRollupHints>): readonly [PartialStateReference, SpongeBlob, PrivateBaseStateDiffHints, PublicDataHint, MembershipWitness<29>, [ContractClassLogFields], BlockConstantData];
+    static getFields(fields: FieldsOf<PrivateBaseRollupHints>): readonly [PartialStateReference, SpongeBlob, TreeSnapshotDiffHints, PublicDataTreeLeafPreimage, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [ContractClassLogFields], BlockConstantData];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.
@@ -97,7 +96,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>;
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -118,7 +117,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */
-    archiveRootMembershipWitness: MembershipWitness<typeof ARCHIVE_HEIGHT>, 
+    anchorBlockArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, 
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
@@ -128,7 +127,7 @@ export declare class PublicBaseRollupHints {
      */
     proverId: Fr);
     static from(fields: FieldsOf<PublicBaseRollupHints>): PublicBaseRollupHints;
-    static getFields(fields: FieldsOf<PublicBaseRollupHints>): readonly [SpongeBlob, AppendOnlyTreeSnapshot, MembershipWitness<29>, [ContractClassLogFields], Fr];
+    static getFields(fields: FieldsOf<PublicBaseRollupHints>): readonly [SpongeBlob, AppendOnlyTreeSnapshot, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [ContractClassLogFields], Fr];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.

package/dest/rollup/base_rollup_hints.d.ts.map

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

package/dest/rollup/base_rollup_hints.js

@@ -4,19 +4,18 @@ import { makeTuple } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { MembershipWitness } from '@aztec/foundation/trees';
-import { PublicDataHint } from '../avm/public_data_hint.js';
 import { ContractClassLogFields } from '../logs/index.js';
-import { AppendOnlyTreeSnapshot } from '../trees/index.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { BlockConstantData } from './block_constant_data.js';
-import { PrivateBaseStateDiffHints } from './state_diff_hints.js';
+import { TreeSnapshotDiffHints } from './tree_snapshot_diff_hints.js';
 export class PrivateBaseRollupHints {
     start;
     startSpongeBlob;
-    stateDiffHints;
-    feePayerFeeJuiceBalanceReadHint;
-    archiveRootMembershipWitness;
+    treeSnapshotDiffHints;
+    feePayerBalanceLeafPreimage;
+    anchorBlockArchiveSiblingPath;
     contractClassLogsFields;
     constants;
     constructor(/**
@@ -25,20 +24,20 @@ export class PrivateBaseRollupHints {
      * Sponge state to absorb blob inputs at the start of the rollup.
      */ startSpongeBlob, /**
      * Hints used while proving state diff validity.
-     */ stateDiffHints, /**
-     * Public data read hint for accessing the balance of the fee payer.
-     */ feePayerFeeJuiceBalanceReadHint, /**
+     */ treeSnapshotDiffHints, /**
+     * Public data tree leaf preimage for accessing the balance of the fee payer.
+     */ feePayerBalanceLeafPreimage, /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
-     */ archiveRootMembershipWitness, /**
+     */ anchorBlockArchiveSiblingPath, /**
      * Preimages to the kernel's contractClassLogsHashes.
      */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.start = start;
         this.startSpongeBlob = startSpongeBlob;
-        this.stateDiffHints = stateDiffHints;
-        this.feePayerFeeJuiceBalanceReadHint = feePayerFeeJuiceBalanceReadHint;
-        this.archiveRootMembershipWitness = archiveRootMembershipWitness;
+        this.treeSnapshotDiffHints = treeSnapshotDiffHints;
+        this.feePayerBalanceLeafPreimage = feePayerBalanceLeafPreimage;
+        this.anchorBlockArchiveSiblingPath = anchorBlockArchiveSiblingPath;
         this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
@@ -49,9 +48,9 @@ export class PrivateBaseRollupHints {
         return [
             fields.start,
             fields.startSpongeBlob,
-            fields.stateDiffHints,
-            fields.feePayerFeeJuiceBalanceReadHint,
-            fields.archiveRootMembershipWitness,
+            fields.treeSnapshotDiffHints,
+            fields.feePayerBalanceLeafPreimage,
+            fields.anchorBlockArchiveSiblingPath,
             fields.contractClassLogsFields,
             fields.constants
         ];
@@ -70,19 +69,19 @@ export class PrivateBaseRollupHints {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateBaseRollupHints(reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(PrivateBaseStateDiffHints), reader.readObject(PublicDataHint), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(BlockConstantData));
+        return new PrivateBaseRollupHints(reader.readObject(PartialStateReference), reader.readObject(SpongeBlob), reader.readObject(TreeSnapshotDiffHints), reader.readObject(PublicDataTreeLeafPreimage), reader.readArray(ARCHIVE_HEIGHT, Fr), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(BlockConstantData));
     }
     static fromString(str) {
         return PrivateBaseRollupHints.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PrivateBaseRollupHints(PartialStateReference.empty(), SpongeBlob.empty(), PrivateBaseStateDiffHints.empty(), PublicDataHint.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), BlockConstantData.empty());
+        return new PrivateBaseRollupHints(PartialStateReference.empty(), SpongeBlob.empty(), TreeSnapshotDiffHints.empty(), PublicDataTreeLeafPreimage.empty(), makeTuple(ARCHIVE_HEIGHT, Fr.zero), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), BlockConstantData.empty());
     }
 }
 export class PublicBaseRollupHints {
     startSpongeBlob;
     lastArchive;
-    archiveRootMembershipWitness;
+    anchorBlockArchiveSiblingPath;
     contractClassLogsFields;
     proverId;
     constructor(/**
@@ -91,14 +90,14 @@ export class PublicBaseRollupHints {
      * Archive tree snapshot at the very beginning of the block containing this base rollup.
      */ lastArchive, /**
      * Membership witnesses of blocks referred by each of the 2 kernels.
-     */ archiveRootMembershipWitness, /**
+     */ anchorBlockArchiveSiblingPath, /**
      * Preimages to the kernel's contractClassLogsHashes.
      */ contractClassLogsFields, /**
      * Identifier of the prover.
      */ proverId){
         this.startSpongeBlob = startSpongeBlob;
         this.lastArchive = lastArchive;
-        this.archiveRootMembershipWitness = archiveRootMembershipWitness;
+        this.anchorBlockArchiveSiblingPath = anchorBlockArchiveSiblingPath;
         this.contractClassLogsFields = contractClassLogsFields;
         this.proverId = proverId;
     }
@@ -109,7 +108,7 @@ export class PublicBaseRollupHints {
         return [
             fields.startSpongeBlob,
             fields.lastArchive,
-            fields.archiveRootMembershipWitness,
+            fields.anchorBlockArchiveSiblingPath,
             fields.contractClassLogsFields,
             fields.proverId
         ];
@@ -128,12 +127,12 @@ export class PublicBaseRollupHints {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PublicBaseRollupHints(reader.readObject(SpongeBlob), reader.readObject(AppendOnlyTreeSnapshot), MembershipWitness.fromBuffer(reader, ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(Fr));
+        return new PublicBaseRollupHints(reader.readObject(SpongeBlob), reader.readObject(AppendOnlyTreeSnapshot), reader.readArray(ARCHIVE_HEIGHT, Fr), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ()=>reader.readObject(ContractClassLogFields)), reader.readObject(Fr));
     }
     static fromString(str) {
         return PublicBaseRollupHints.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new PublicBaseRollupHints(SpongeBlob.empty(), AppendOnlyTreeSnapshot.empty(), MembershipWitness.empty(ARCHIVE_HEIGHT), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), Fr.ZERO);
+        return new PublicBaseRollupHints(SpongeBlob.empty(), AppendOnlyTreeSnapshot.empty(), makeTuple(ARCHIVE_HEIGHT, Fr.zero), makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLogFields.empty), Fr.ZERO);
     }
 }

package/dest/rollup/block_root_rollup_private_inputs.d.ts

@@ -1,5 +1,5 @@
 import { SpongeBlob } from '@aztec/blob-lib/types';
-import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH } from '@aztec/constants';
+import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -24,9 +24,9 @@ export declare class BlockRootFirstRollupPrivateInputs {
      */
     previousL1ToL2: AppendOnlyTreeSnapshot;
     /**
-     * Hint for inserting the new l1 to l2 message subtree into `previousL1ToL2`.
+     * Hint for inserting the new l1 to l2 message subtree root into `previousL1ToL2`.
      */
-    newL1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>;
+    newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>;
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -45,9 +45,9 @@ export declare class BlockRootFirstRollupPrivateInputs {
      */
     previousL1ToL2: AppendOnlyTreeSnapshot, 
     /**
-     * Hint for inserting the new l1 to l2 message subtree into `previousL1ToL2`.
+     * Hint for inserting the new l1 to l2 message subtree root into `previousL1ToL2`.
      */
-    newL1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, 
+    newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, 
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -73,9 +73,9 @@ export declare class BlockRootSingleTxFirstRollupPrivateInputs {
      */
     previousL1ToL2: AppendOnlyTreeSnapshot;
     /**
-     * Hint for inserting the new l1 to l2 message subtree.
+     * Hint for inserting the new l1 to l2 message subtree root.
      */
-    newL1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>;
+    newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>;
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -94,9 +94,9 @@ export declare class BlockRootSingleTxFirstRollupPrivateInputs {
      */
     previousL1ToL2: AppendOnlyTreeSnapshot, 
     /**
-     * Hint for inserting the new l1 to l2 message subtree.
+     * Hint for inserting the new l1 to l2 message subtree root.
      */
-    newL1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, 
+    newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, 
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -135,9 +135,9 @@ export declare class BlockRootEmptyTxFirstRollupPrivateInputs {
      */
     timestamp: UInt64;
     /**
-     * Hint for inserting the new l1 to l2 message subtree.
+     * Hint for inserting the new l1 to l2 message subtree root.
      */
-    newL1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>;
+    newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>;
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -169,9 +169,9 @@ export declare class BlockRootEmptyTxFirstRollupPrivateInputs {
      */
     timestamp: UInt64, 
     /**
-     * Hint for inserting the new l1 to l2 message subtree.
+     * Hint for inserting the new l1 to l2 message subtree root.
      */
-    newL1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, 
+    newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, 
     /**
      * Hint for inserting the new block hash to the last archive.
      */

package/dest/rollup/block_root_rollup_private_inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_root_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/block_root_rollup_private_inputs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"block_root_rollup_private_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/block_root_rollup_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,6CAA6C,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAuC,MAAM,6BAA6B,CAAC;AAC5G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAa,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,qBAAa,iCAAiC;IAE1C;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,sCAAsC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,6CAA6C,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAnB9D;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,sCAAsC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,6CAA6C,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iCAAiC,CAAC;IAI/D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iCAAiC,CAAC;IAUpE,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,MAAM;IAIN,MAAM,KAAK,MAAM,0EAEhB;CACF;AAED,qBAAa,yCAAyC;IAElD;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,sCAAsC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,6CAA6C,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAnB9D;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,cAAc,EAAE,sBAAsB;IAC7C;;OAEG;IACI,sCAAsC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,6CAA6C,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,yCAAyC,CAAC;IAMvE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,yCAAyC,CAAC;IAU5E,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,MAAM;IAIN,MAAM,KAAK,MAAM,kFAEhB;CACF;AAED,qBAAa,wCAAwC;IAEjD;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,aAAa,EAAE,cAAc;IACpC;;OAEG;IACI,SAAS,EAAE,sBAAsB;IACxC;;;OAGG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,SAAS,EAAE,MAAM;IACxB;;OAEG;IACI,sCAAsC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,6CAA6C,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAhC9D;;OAEG;IACI,WAAW,EAAE,kBAAkB,CAAC,kBAAkB,CAAC;IAC1D;;OAEG;IACI,eAAe,EAAE,sBAAsB;IAC9C;;OAEG;IACI,aAAa,EAAE,cAAc;IACpC;;OAEG;IACI,SAAS,EAAE,sBAAsB;IACxC;;;OAGG;IACI,eAAe,EAAE,UAAU;IAClC;;OAEG;IACI,SAAS,EAAE,MAAM;IACxB;;OAEG;IACI,sCAAsC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,6CAA6C,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAItE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,wCAAwC,CAAC;IAa3E,QAAQ;IAaR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAc/C,MAAM;IAIN,MAAM,KAAK,MAAM,iFAEhB;CACF;AAED,qBAAa,4BAA4B;IAErC;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAP9D;;OAEG;IACI,eAAe,EAAE,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC9G;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,4BAA4B,CAAC;IAI1D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,4BAA4B,CAAC;IAI/D,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C,MAAM;IAIN,MAAM,KAAK,MAAM,qEAEhB;CACF;AAED,qBAAa,oCAAoC;IAE7C;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;;IAP9D;;OAEG;IACI,cAAc,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;IAChE;;OAEG;IACI,qBAAqB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGhE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,oCAAoC,CAAC;IAIlE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,oCAAoC,CAAC;IAIvE,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAQ/C,MAAM;IAIN,MAAM,KAAK,MAAM,6EAEhB;CACF"}