@aztec/stdlib 5.0.0-private.20260318 → 5.0.0-rc.1

package/dest/interfaces/archiver.d.ts

@@ -1,4 +1,3 @@
-import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import type { ApiSchemaFor } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 import { type L2BlockSource } from '../block/l2_block_source.js';
@@ -15,47 +14,36 @@ export type ArchiverSpecificConfig = {
     archiverBatchSize?: number;
     /** The polling interval viem uses in ms */
     viemPollingIntervalMS?: number;
-    /** The deployed L1 contract addresses */
-    l1Contracts: L1ContractAddresses;
-    /** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
-    maxLogs?: number;
     /** The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb. */
     archiverStoreMapSizeKb?: number;
     /** Maximum allowed drift in seconds between the Ethereum client and current time. */
     maxAllowedEthClientDriftSeconds?: number;
     /** Whether to allow starting the archiver without debug/trace method support on Ethereum hosts */
     ethereumAllowNoDebugHosts?: boolean;
+    /** Skip the startup check that probes the L1 RPC for historical logs on the Rollup contract. */
+    archiverSkipHistoricalLogsCheck?: boolean;
     /** Skip validating checkpoint attestations (for testing purposes only) */
     skipValidateCheckpointAttestations?: boolean;
+    /** Skip promoting proposed checkpoints during L1 sync (for testing purposes only) */
+    skipPromoteProposedCheckpointDuringL1Sync?: boolean;
+    /** Local tolerance in seconds before pruning an orphan block when no checkpoint proposal was received. */
+    orphanPruneNoProposalTolerance?: number;
+    /** Skip pruning orphan proposed blocks that have no matching proposed checkpoint. */
+    skipOrphanProposedBlockPruning?: boolean;
 };
 export declare const ArchiverSpecificConfigSchema: z.ZodObject<{
-    archiverPollingIntervalMS: z.ZodOptional<z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>>;
-    archiverBatchSize: z.ZodOptional<z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>>;
-    viemPollingIntervalMS: z.ZodOptional<z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>>;
-    maxLogs: z.ZodOptional<z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>>;
-    archiverStoreMapSizeKb: z.ZodOptional<z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>>;
-    maxAllowedEthClientDriftSeconds: z.ZodOptional<z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>>;
+    archiverPollingIntervalMS: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>>;
+    archiverBatchSize: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>>;
+    viemPollingIntervalMS: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>>;
+    archiverStoreMapSizeKb: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>>;
+    maxAllowedEthClientDriftSeconds: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>>;
     ethereumAllowNoDebugHosts: z.ZodOptional<z.ZodBoolean>;
+    archiverSkipHistoricalLogsCheck: z.ZodOptional<z.ZodBoolean>;
     skipValidateCheckpointAttestations: z.ZodOptional<z.ZodBoolean>;
-}, "strip", z.ZodTypeAny, {
-    archiverPollingIntervalMS?: number | undefined;
-    archiverBatchSize?: number | undefined;
-    viemPollingIntervalMS?: number | undefined;
-    maxLogs?: number | undefined;
-    archiverStoreMapSizeKb?: number | undefined;
-    maxAllowedEthClientDriftSeconds?: number | undefined;
-    ethereumAllowNoDebugHosts?: boolean | undefined;
-    skipValidateCheckpointAttestations?: boolean | undefined;
-}, {
-    archiverPollingIntervalMS?: string | number | bigint | undefined;
-    archiverBatchSize?: string | number | bigint | undefined;
-    viemPollingIntervalMS?: string | number | bigint | undefined;
-    maxLogs?: string | number | bigint | undefined;
-    archiverStoreMapSizeKb?: string | number | bigint | undefined;
-    maxAllowedEthClientDriftSeconds?: string | number | bigint | undefined;
-    ethereumAllowNoDebugHosts?: boolean | undefined;
-    skipValidateCheckpointAttestations?: boolean | undefined;
-}>;
-export type ArchiverApi = Omit<L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource, 'start' | 'stop'>;
+    skipPromoteProposedCheckpointDuringL1Sync: z.ZodOptional<z.ZodBoolean>;
+    orphanPruneNoProposalTolerance: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>>;
+    skipOrphanProposedBlockPruning: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
+export type ArchiverApi = Omit<L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource, 'start' | 'stop' | 'getGenesisBlockHash'>;
 export declare const ArchiverApiSchema: ApiSchemaFor<ArchiverApi>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFakYsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQU14QixPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQWdCLE1BQU0sNkJBQTZCLENBQUM7QUFLL0UsT0FBTyxFQUVMLEtBQUssa0JBQWtCLEVBRXhCLE1BQU0sc0JBQXNCLENBQUM7QUFNOUIsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQU9uRixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV4RDs7R0FFRztBQUNILE1BQU0sTUFBTSxzQkFBc0IsR0FBRztJQUNuQyxrRkFBa0Y7SUFDbEYseUJBQXlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFbkMsK0VBQStFO0lBQy9FLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTNCLDJDQUEyQztJQUMzQyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUvQix5Q0FBeUM7SUFDekMsV0FBVyxFQUFFLG1CQUFtQixDQUFDO0lBRWpDLDZFQUE2RTtJQUM3RSxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFakIscUdBQXFHO0lBQ3JHLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRWhDLHFGQUFxRjtJQUNyRiwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUV6QyxrR0FBa0c7SUFDbEcseUJBQXlCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFFcEMsMEVBQTBFO0lBQzFFLGtDQUFrQyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQzlDLENBQUM7QUFFRixlQUFPLE1BQU0sNEJBQTRCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFTdkMsQ0FBQztBQUVILE1BQU0sTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUM1QixhQUFhLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixHQUFHLG1CQUFtQixFQUN2RSxPQUFPLEdBQUcsTUFBTSxDQUNqQixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxXQUFXLENBeUV2RCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzL2FyY2hpdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTlELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFJeEIsT0FBTyxFQUtMLEtBQUssYUFBYSxFQUduQixNQUFNLDZCQUE2QixDQUFDO0FBSXJDLE9BQU8sRUFFTCxLQUFLLGtCQUFrQixFQUV4QixNQUFNLHNCQUFzQixDQUFDO0FBSTlCLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFLbkYsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLE1BQU0sc0JBQXNCLEdBQUc7SUFDbkMsa0ZBQWtGO0lBQ2xGLHlCQUF5QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRW5DLCtFQUErRTtJQUMvRSxpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUzQiwyQ0FBMkM7SUFDM0MscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFL0IscUdBQXFHO0lBQ3JHLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRWhDLHFGQUFxRjtJQUNyRiwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUV6QyxrR0FBa0c7SUFDbEcseUJBQXlCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFFcEMsZ0dBQWdHO0lBQ2hHLCtCQUErQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBRTFDLDBFQUEwRTtJQUMxRSxrQ0FBa0MsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUU3QyxxRkFBcUY7SUFDckYseUNBQXlDLENBQUMsRUFBRSxPQUFPLENBQUM7SUFFcEQsMEdBQTBHO0lBQzFHLDhCQUE4QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRXhDLHFGQUFxRjtJQUNyRiw4QkFBOEIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUMxQyxDQUFDO0FBRUYsZUFBTyxNQUFNLDRCQUE0Qjs7Ozs7Ozs7Ozs7O2lCQVl2QyxDQUFDO0FBRUgsTUFBTSxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQzVCLGFBQWEsR0FBRyxZQUFZLEdBQUcsa0JBQWtCLEdBQUcsbUJBQW1CLEVBQ3ZFLE9BQU8sR0FBRyxNQUFNLEdBQUcscUJBQXFCLENBQ3pDLENBQUM7QUFFRixlQUFPLE1BQU0saUJBQWlCLEVBQUUsWUFBWSxDQUFDLFdBQVcsQ0EyRHZELENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/interfaces/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,EAAE,KAAK,aAAa,EAAgB,MAAM,6BAA6B,CAAC;AAK/E,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAOnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qGAAqG;IACrG,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qFAAqF;IACrF,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,kGAAkG;IAClG,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC,0EAA0E;IAC1E,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;EASvC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,EACvE,OAAO,GAAG,MAAM,CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAyEvD,CAAC"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/interfaces/archiver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAKL,KAAK,aAAa,EAGnB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAKnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,qGAAqG;IACrG,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qFAAqF;IACrF,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,kGAAkG;IAClG,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC,gGAAgG;IAChG,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAE1C,0EAA0E;IAC1E,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAE7C,qFAAqF;IACrF,yCAAyC,CAAC,EAAE,OAAO,CAAC;IAEpD,0GAA0G;IAC1G,8BAA8B,CAAC,EAAE,MAAM,CAAC;IAExC,qFAAqF;IACrF,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;iBAYvC,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,EACvE,OAAO,GAAG,MAAM,GAAG,qBAAqB,CACzC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CA2DvD,CAAC"}

package/dest/interfaces/archiver.js

@@ -1,91 +1,236 @@
 import { BlockNumberSchema, CheckpointNumberSchema, EpochNumberSchema } from '@aztec/foundation/branded-types';
 import { z } from 'zod';
 import { BlockDataSchema } from '../block/block_data.js';
-import { BlockHash } from '../block/block_hash.js';
-import { CheckpointedL2Block } from '../block/checkpointed_l2_block.js';
 import { L2Block } from '../block/l2_block.js';
-import { L2TipsSchema } from '../block/l2_block_source.js';
+import { BlockQuerySchema, BlocksQuerySchema, CheckpointQuerySchema, CheckpointsQuerySchema, L2TipsSchema, ProposedCheckpointQuerySchema } from '../block/l2_block_source.js';
 import { ValidateCheckpointResultSchema } from '../block/validate_block_result.js';
-import { Checkpoint } from '../checkpoint/checkpoint.js';
-import { CheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
+import { CheckpointDataSchema, ProposedCheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
 import { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import { ContractClassPublicSchema, ContractInstanceWithAddressSchema } from '../contract/index.js';
 import { L1RollupConstantsSchema } from '../epoch-helpers/index.js';
-import { LogFilterSchema } from '../logs/log_filter.js';
-import { SiloedTag } from '../logs/siloed_tag.js';
-import { Tag } from '../logs/tag.js';
-import { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js';
+import { LogResultSchema } from '../logs/log_result.js';
+import { PrivateLogsQuerySchema, PublicLogsQuerySchema } from '../logs/logs_query.js';
+import { L2ToL1MembershipWitnessSchema } from '../messaging/l2_to_l1_membership.js';
 import { optional, schemas } from '../schemas/schemas.js';
-import { BlockHeader } from '../tx/block_header.js';
 import { indexedTxSchema } from '../tx/indexed_tx_effect.js';
 import { TxHash } from '../tx/tx_hash.js';
-import { TxReceipt } from '../tx/tx_receipt.js';
-import { GetContractClassLogsResponseSchema, GetPublicLogsResponseSchema } from './get_logs_response.js';
 export const ArchiverSpecificConfigSchema = z.object({
     archiverPollingIntervalMS: schemas.Integer.optional(),
     archiverBatchSize: schemas.Integer.optional(),
     viemPollingIntervalMS: schemas.Integer.optional(),
-    maxLogs: schemas.Integer.optional(),
     archiverStoreMapSizeKb: schemas.Integer.optional(),
     maxAllowedEthClientDriftSeconds: schemas.Integer.optional(),
     ethereumAllowNoDebugHosts: z.boolean().optional(),
-    skipValidateCheckpointAttestations: z.boolean().optional()
+    archiverSkipHistoricalLogsCheck: z.boolean().optional(),
+    skipValidateCheckpointAttestations: z.boolean().optional(),
+    skipPromoteProposedCheckpointDuringL1Sync: z.boolean().optional(),
+    orphanPruneNoProposalTolerance: schemas.Integer.optional(),
+    skipOrphanProposedBlockPruning: z.boolean().optional()
 });
 export const ArchiverApiSchema = {
-    getRollupAddress: z.function().args().returns(schemas.EthAddress),
-    getRegistryAddress: z.function().args().returns(schemas.EthAddress),
-    getBlockNumber: z.function().args().returns(BlockNumberSchema),
-    getProvenBlockNumber: z.function().args().returns(BlockNumberSchema),
-    getCheckpointedL2BlockNumber: z.function().args().returns(BlockNumberSchema),
-    getCheckpointNumber: z.function().args().returns(CheckpointNumberSchema),
-    getFinalizedL2BlockNumber: z.function().args().returns(BlockNumberSchema),
-    getBlock: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
-    getBlockHeader: z.function().args(z.union([
-        BlockNumberSchema,
-        z.literal('latest')
-    ])).returns(BlockHeader.schema.optional()),
-    getCheckpointedBlock: z.function().args(BlockNumberSchema).returns(CheckpointedL2Block.schema.optional()),
-    getCheckpointedBlocks: z.function().args(BlockNumberSchema, schemas.Integer).returns(z.array(CheckpointedL2Block.schema)),
-    getBlocks: z.function().args(BlockNumberSchema, schemas.Integer).returns(z.array(L2Block.schema)),
-    getCheckpoints: z.function().args(CheckpointNumberSchema, schemas.Integer).returns(z.array(PublishedCheckpoint.schema)),
-    getCheckpointedBlockByHash: z.function().args(BlockHash.schema).returns(CheckpointedL2Block.schema.optional()),
-    getCheckpointedBlockByArchive: z.function().args(schemas.Fr).returns(CheckpointedL2Block.schema.optional()),
-    getBlockHeaderByHash: z.function().args(BlockHash.schema).returns(BlockHeader.schema.optional()),
-    getBlockHeaderByArchive: z.function().args(schemas.Fr).returns(BlockHeader.schema.optional()),
-    getBlockData: z.function().args(BlockNumberSchema).returns(BlockDataSchema.optional()),
-    getBlockDataByArchive: z.function().args(schemas.Fr).returns(BlockDataSchema.optional()),
-    getL2Block: z.function().args(BlockNumberSchema).returns(L2Block.schema.optional()),
-    getL2BlockByHash: z.function().args(BlockHash.schema).returns(L2Block.schema.optional()),
-    getL2BlockByArchive: z.function().args(schemas.Fr).returns(L2Block.schema.optional()),
-    getTxEffect: z.function().args(TxHash.schema).returns(indexedTxSchema().optional()),
-    getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
-    getSyncedL2SlotNumber: z.function().args().returns(schemas.SlotNumber.optional()),
-    getSyncedL2EpochNumber: z.function().args().returns(EpochNumberSchema.optional()),
-    getCheckpointsForEpoch: z.function().args(EpochNumberSchema).returns(z.array(Checkpoint.schema)),
-    getCheckpointsDataForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointDataSchema)),
-    getCheckpointedBlocksForEpoch: z.function().args(EpochNumberSchema).returns(z.array(CheckpointedL2Block.schema)),
-    getBlocksForSlot: z.function().args(schemas.SlotNumber).returns(z.array(L2Block.schema)),
-    getCheckpointedBlockHeadersForEpoch: z.function().args(EpochNumberSchema).returns(z.array(BlockHeader.schema)),
-    isEpochComplete: z.function().args(EpochNumberSchema).returns(z.boolean()),
-    getL2Tips: z.function().args().returns(L2TipsSchema),
-    getPrivateLogsByTags: z.function().args(z.array(SiloedTag.schema), optional(z.number().gte(0))).returns(z.array(z.array(TxScopedL2Log.schema))),
-    getPublicLogsByTagsFromContract: z.function().args(schemas.AztecAddress, z.array(Tag.schema), optional(z.number().gte(0))).returns(z.array(z.array(TxScopedL2Log.schema))),
-    getPublicLogs: z.function().args(LogFilterSchema).returns(GetPublicLogsResponseSchema),
-    getContractClassLogs: z.function().args(LogFilterSchema).returns(GetContractClassLogsResponseSchema),
-    getContractClass: z.function().args(schemas.Fr).returns(ContractClassPublicSchema.optional()),
-    getBytecodeCommitment: z.function().args(schemas.Fr).returns(schemas.Fr),
-    getContract: z.function().args(schemas.AztecAddress, optional(schemas.BigInt)).returns(ContractInstanceWithAddressSchema.optional()),
-    getContractClassIds: z.function().args().returns(z.array(schemas.Fr)),
-    registerContractFunctionSignatures: z.function().args(z.array(z.string())).returns(z.void()),
-    getL1ToL2Messages: z.function().args(CheckpointNumberSchema).returns(z.array(schemas.Fr)),
-    getL1ToL2MessageIndex: z.function().args(schemas.Fr).returns(schemas.BigInt.optional()),
-    getDebugFunctionName: z.function().args(schemas.AztecAddress, schemas.FunctionSelector).returns(optional(z.string())),
-    getL1Constants: z.function().args().returns(L1RollupConstantsSchema),
-    getGenesisValues: z.function().args().returns(z.object({
-        genesisArchiveRoot: schemas.Fr
-    })),
-    getL1Timestamp: z.function().args().returns(schemas.BigInt.optional()),
-    syncImmediate: z.function().args().returns(z.void()),
-    isPendingChainInvalid: z.function().args().returns(z.boolean()),
-    getPendingChainValidationStatus: z.function().args().returns(ValidateCheckpointResultSchema)
+    getRollupAddress: z.function({
+        input: z.tuple([]),
+        output: schemas.EthAddress
+    }),
+    getRegistryAddress: z.function({
+        input: z.tuple([]),
+        output: schemas.EthAddress
+    }),
+    getBlockNumber: z.function({
+        input: z.tuple([
+            optional(BlockQuerySchema)
+        ]),
+        output: BlockNumberSchema.optional()
+    }),
+    getCheckpointNumber: z.function({
+        input: z.tuple([]),
+        output: CheckpointNumberSchema
+    }),
+    getCheckpoint: z.function({
+        input: z.tuple([
+            CheckpointQuerySchema
+        ]),
+        output: PublishedCheckpoint.schema.optional()
+    }),
+    getCheckpoints: z.function({
+        input: z.tuple([
+            CheckpointsQuerySchema
+        ]),
+        output: z.array(PublishedCheckpoint.schema)
+    }),
+    getCheckpointData: z.function({
+        input: z.tuple([
+            CheckpointQuerySchema
+        ]),
+        output: CheckpointDataSchema.optional()
+    }),
+    getCheckpointsData: z.function({
+        input: z.tuple([
+            CheckpointsQuerySchema
+        ]),
+        output: z.array(CheckpointDataSchema)
+    }),
+    getTxEffect: z.function({
+        input: z.tuple([
+            TxHash.schema
+        ]),
+        output: indexedTxSchema().optional()
+    }),
+    // Reads Outbox roots lazily, pinned to the node's synced L1 block. Caveat: cached roots that are
+    // sealed and L1-finalized are not re-validated, so a reorg deeper than L1 finality could leave the
+    // node serving a witness against a no-longer-canonical root.
+    getL2ToL1MembershipWitness: z.function({
+        input: z.tuple([
+            TxHash.schema,
+            schemas.Fr,
+            optional(schemas.Integer)
+        ]),
+        output: L2ToL1MembershipWitnessSchema.optional()
+    }),
+    getSyncedL2SlotNumber: z.function({
+        input: z.tuple([]),
+        output: schemas.SlotNumber.optional()
+    }),
+    getSyncedL2EpochNumber: z.function({
+        input: z.tuple([]),
+        output: EpochNumberSchema.optional()
+    }),
+    getBlocksForSlot: z.function({
+        input: z.tuple([
+            schemas.SlotNumber
+        ]),
+        output: z.array(L2Block.schema)
+    }),
+    isEpochComplete: z.function({
+        input: z.tuple([
+            EpochNumberSchema
+        ]),
+        output: z.boolean()
+    }),
+    getL2Tips: z.function({
+        input: z.tuple([]),
+        output: L2TipsSchema
+    }),
+    getPrivateLogsByTags: z.function({
+        input: z.tuple([
+            PrivateLogsQuerySchema
+        ]),
+        output: z.array(z.array(LogResultSchema))
+    }),
+    getPublicLogsByTags: z.function({
+        input: z.tuple([
+            PublicLogsQuerySchema
+        ]),
+        output: z.array(z.array(LogResultSchema))
+    }),
+    getContractClass: z.function({
+        input: z.tuple([
+            schemas.Fr
+        ]),
+        output: ContractClassPublicSchema.optional()
+    }),
+    getBytecodeCommitment: z.function({
+        input: z.tuple([
+            schemas.Fr
+        ]),
+        output: schemas.Fr
+    }),
+    getContract: z.function({
+        input: z.tuple([
+            schemas.AztecAddress,
+            optional(schemas.BigInt)
+        ]),
+        output: ContractInstanceWithAddressSchema.optional()
+    }),
+    getContractClassIds: z.function({
+        input: z.tuple([]),
+        output: z.array(schemas.Fr)
+    }),
+    registerContractFunctionSignatures: z.function({
+        input: z.tuple([
+            z.array(z.string())
+        ]),
+        output: z.void()
+    }),
+    getL1ToL2Messages: z.function({
+        input: z.tuple([
+            CheckpointNumberSchema
+        ]),
+        output: z.array(schemas.Fr)
+    }),
+    getL1ToL2MessageIndex: z.function({
+        input: z.tuple([
+            schemas.Fr
+        ]),
+        output: schemas.BigInt.optional()
+    }),
+    getDebugFunctionName: z.function({
+        input: z.tuple([
+            schemas.AztecAddress,
+            schemas.FunctionSelector
+        ]),
+        output: optional(z.string())
+    }),
+    getL1Constants: z.function({
+        input: z.tuple([]),
+        output: L1RollupConstantsSchema
+    }),
+    isPruneDueAtSlot: z.function({
+        input: z.tuple([
+            schemas.SlotNumber
+        ]),
+        output: z.boolean()
+    }),
+    getGenesisValues: z.function({
+        input: z.tuple([]),
+        output: z.object({
+            genesisArchiveRoot: schemas.Fr
+        })
+    }),
+    getL1Timestamp: z.function({
+        input: z.tuple([]),
+        output: schemas.BigInt.optional()
+    }),
+    getProposedCheckpointData: z.function({
+        input: z.tuple([
+            optional(ProposedCheckpointQuerySchema)
+        ]),
+        output: ProposedCheckpointDataSchema.optional()
+    }),
+    syncImmediate: z.function({
+        input: z.tuple([]),
+        output: z.void()
+    }),
+    isPendingChainInvalid: z.function({
+        input: z.tuple([]),
+        output: z.boolean()
+    }),
+    getPendingChainValidationStatus: z.function({
+        input: z.tuple([]),
+        output: ValidateCheckpointResultSchema
+    }),
+    getBlock: z.function({
+        input: z.tuple([
+            BlockQuerySchema
+        ]),
+        output: L2Block.schema.optional()
+    }),
+    getBlocks: z.function({
+        input: z.tuple([
+            BlocksQuerySchema
+        ]),
+        output: z.array(L2Block.schema)
+    }),
+    getBlockData: z.function({
+        input: z.tuple([
+            BlockQuerySchema
+        ]),
+        output: BlockDataSchema.optional()
+    }),
+    getBlocksData: z.function({
+        input: z.tuple([
+            BlocksQuerySchema
+        ]),
+        output: z.array(BlockDataSchema)
+    })
 };