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

package/dest/interfaces/proving-job.d.ts

@@ -1,24 +1,26 @@
-import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, TUBE_PROOF_LENGTH } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH } from '@aztec/constants';
 import type { ZodFor } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 import { AvmCircuitInputs } from '../avm/avm.js';
-import { BaseParityInputs } from '../parity/base_parity_inputs.js';
+import { ParityBasePrivateInputs } from '../parity/parity_base_private_inputs.js';
 import { ParityPublicInputs } from '../parity/parity_public_inputs.js';
-import { RootParityInputs } from '../parity/root_parity_inputs.js';
+import { ParityRootPrivateInputs } from '../parity/parity_root_private_inputs.js';
 import { ProvingRequestType } from '../proofs/proving_request_type.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { BaseOrMergeRollupPublicInputs } from '../rollup/base_or_merge_rollup_public_inputs.js';
-import { BlockMergeRollupInputs } from '../rollup/block_merge_rollup.js';
-import { BlockRootOrBlockMergePublicInputs } from '../rollup/block_root_or_block_merge_public_inputs.js';
-import { BlockRootRollupInputs, SingleTxBlockRootRollupInputs } from '../rollup/block_root_rollup.js';
-import { EmptyBlockRootRollupInputs } from '../rollup/empty_block_root_rollup_inputs.js';
-import { PaddingBlockRootRollupInputs } from '../rollup/index.js';
-import { MergeRollupInputs } from '../rollup/merge_rollup.js';
-import { PrivateBaseRollupInputs } from '../rollup/private_base_rollup_inputs.js';
-import { PublicBaseRollupInputs } from '../rollup/public_base_rollup_inputs.js';
-import { RootRollupInputs, RootRollupPublicInputs } from '../rollup/root_rollup.js';
-import { TubeInputs } from '../rollup/tube_inputs.js';
-import type { ServerCircuitName } from '../stats/index.js';
+import { BlockMergeRollupPrivateInputs } from '../rollup/block_merge_rollup_private_inputs.js';
+import { BlockRollupPublicInputs } from '../rollup/block_rollup_public_inputs.js';
+import { BlockRootEmptyTxFirstRollupPrivateInputs, BlockRootFirstRollupPrivateInputs, BlockRootRollupPrivateInputs, BlockRootSingleTxFirstRollupPrivateInputs, BlockRootSingleTxRollupPrivateInputs } from '../rollup/block_root_rollup_private_inputs.js';
+import { CheckpointMergeRollupPrivateInputs } from '../rollup/checkpoint_merge_rollup_private_inputs.js';
+import { CheckpointRollupPublicInputs } from '../rollup/checkpoint_rollup_public_inputs.js';
+import { CheckpointPaddingRollupPrivateInputs, CheckpointRootRollupPrivateInputs, CheckpointRootSingleBlockRollupPrivateInputs } from '../rollup/checkpoint_root_rollup_private_inputs.js';
+import { PrivateTxBaseRollupPrivateInputs } from '../rollup/private_tx_base_rollup_private_inputs.js';
+import { PublicTubePrivateInputs } from '../rollup/public_tube_private_inputs.js';
+import { PublicTubePublicInputs } from '../rollup/public_tube_public_inputs.js';
+import { PublicTxBaseRollupPrivateInputs } from '../rollup/public_tx_base_rollup_private_inputs.js';
+import { RootRollupPrivateInputs } from '../rollup/root_rollup_private_inputs.js';
+import { RootRollupPublicInputs } from '../rollup/root_rollup_public_inputs.js';
+import { TxMergeRollupPrivateInputs } from '../rollup/tx_merge_rollup_private_inputs.js';
+import { TxRollupPublicInputs } from '../rollup/tx_rollup_public_inputs.js';
 import { VerificationKeyData } from '../vks/verification_key.js';
 export type ProofAndVerificationKey<N extends number> = {
     proof: RecursiveProof<N>;
@@ -31,7 +33,6 @@ export type PublicInputsAndRecursiveProof<T, N extends number = typeof NESTED_RE
     verificationKey: VerificationKeyData;
 };
 export declare function makePublicInputsAndRecursiveProof<T, N extends number = typeof NESTED_RECURSIVE_PROOF_LENGTH>(inputs: T, proof: RecursiveProof<N>, verificationKey: VerificationKeyData): PublicInputsAndRecursiveProof<T, N>;
-export declare function mapProvingRequestTypeToCircuitName(type: ProvingRequestType): ServerCircuitName;
 export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<ProvingRequestType.PUBLIC_VM>;
     inputs: z.ZodEffects<z.ZodObject<{
@@ -442,6 +443,15 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 feePayer?: any;
                 teardownEnqueuedCall?: any;
             }>;
+            protocolContracts: z.ZodEffects<z.ZodObject<{
+                derivedAddresses: z.ZodArray<ZodFor<import("../aztec-address/index.js").AztecAddress>, "many">;
+            }, "strip", z.ZodTypeAny, {
+                derivedAddresses: import("../aztec-address/index.js").AztecAddress[];
+            }, {
+                derivedAddresses: any[];
+            }>, import("../tx/protocol_contracts.js").ProtocolContracts, {
+                derivedAddresses: any[];
+            }>;
             contractInstances: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
                 salt: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
@@ -472,38 +482,38 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 }>;
             }, "strip", z.ZodTypeAny, {
                 salt: import("@aztec/foundation/schemas").Fr;
-                address: import("../aztec-address/index.js").AztecAddress;
-                publicKeys: import("../keys/public_keys.js").PublicKeys;
                 deployer: import("../aztec-address/index.js").AztecAddress;
                 currentContractClassId: import("@aztec/foundation/schemas").Fr;
                 originalContractClassId: import("@aztec/foundation/schemas").Fr;
                 initializationHash: import("@aztec/foundation/schemas").Fr;
+                publicKeys: import("../keys/public_keys.js").PublicKeys;
+                address: import("../aztec-address/index.js").AztecAddress;
             }, {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }>, import("../avm/avm.js").AvmContractInstanceHint, {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }>, "many">;
             contractClasses: z.ZodArray<z.ZodEffects<z.ZodObject<{
                 classId: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
@@ -2123,6 +2133,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
             globalVariables: import("../tx/global_variables.js").GlobalVariables;
+            protocolContracts: import("../tx/protocol_contracts.js").ProtocolContracts;
             tx: import("../avm/avm.js").AvmTxHint;
             contractInstances: import("../avm/avm.js").AvmContractInstanceHint[];
             contractClasses: import("../avm/avm.js").AvmContractClassHint[];
@@ -2199,6 +2210,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 coinbase?: any;
                 feeRecipient?: any;
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             tx: {
                 hash: string;
                 gasSettings: {
@@ -2256,17 +2270,17 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
             };
             contractInstances: {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }[];
             contractClasses: {
                 classId: string;
@@ -2552,6 +2566,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 coinbase?: any;
                 feeRecipient?: any;
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             tx: {
                 hash: string;
                 gasSettings: {
@@ -2609,17 +2626,17 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
             };
             contractInstances: {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }[];
             contractClasses: {
                 classId: string;
@@ -2948,6 +2965,15 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 coinbase?: any;
                 feeRecipient?: any;
             }>;
+            protocolContracts: z.ZodEffects<z.ZodObject<{
+                derivedAddresses: z.ZodArray<ZodFor<import("../aztec-address/index.js").AztecAddress>, "many">;
+            }, "strip", z.ZodTypeAny, {
+                derivedAddresses: import("../aztec-address/index.js").AztecAddress[];
+            }, {
+                derivedAddresses: any[];
+            }>, import("../tx/protocol_contracts.js").ProtocolContracts, {
+                derivedAddresses: any[];
+            }>;
             startTreeSnapshots: z.ZodEffects<z.ZodObject<{
                 l1ToL2MessageTree: z.ZodEffects<z.ZodObject<{
                     root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
@@ -3161,6 +3187,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 feePerL2Gas: string | number | bigint;
             }>;
             feePayer: ZodFor<import("../aztec-address/index.js").AztecAddress>;
+            proverId: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
             publicCallRequestArrayLengths: z.ZodEffects<z.ZodObject<{
                 setupCalls: z.ZodNumber;
                 appLogicCalls: z.ZodNumber;
@@ -3503,26 +3530,22 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 noteHashes: z.ZodNumber;
                 nullifiers: z.ZodNumber;
                 l2ToL1Msgs: z.ZodNumber;
-                publicLogs: z.ZodNumber;
                 publicDataWrites: z.ZodNumber;
             }, "strip", z.ZodTypeAny, {
                 noteHashes: number;
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             }, {
                 noteHashes: number;
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             }>, import("../avm/avm_accumulated_data.js").AvmAccumulatedDataArrayLengths, {
                 noteHashes: number;
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             }>;
             accumulatedData: z.ZodEffects<z.ZodObject<{
                 noteHashes: z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, "many">;
@@ -3558,7 +3581,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     };
                     contractAddress?: any;
                 }>, "many">;
-                publicLogs: z.ZodArray<ZodFor<import("../logs/public_log.js").PublicLog>, "many">;
+                publicLogs: ZodFor<import("../logs/public_log.js").FlatPublicLogs>;
                 publicDataWrites: z.ZodArray<z.ZodEffects<z.ZodObject<{
                     leafSlot: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
                     value: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
@@ -3577,7 +3600,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 nullifiers: import("@aztec/foundation/schemas").Fr[];
                 l2ToL1Msgs: import("../messaging/l2_to_l1_message.js").ScopedL2ToL1Message[];
                 publicDataWrites: import("../avm/public_data_write.js").PublicDataWrite[];
-                publicLogs: import("../logs/public_log.js").PublicLog[];
+                publicLogs: import("../logs/public_log.js").FlatPublicLogs;
             }, {
                 noteHashes: string[];
                 nullifiers: string[];
@@ -3592,7 +3615,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             }>, import("../avm/avm_accumulated_data.js").AvmAccumulatedData, {
                 noteHashes: string[];
                 nullifiers: string[];
@@ -3607,19 +3630,21 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             }>;
             transactionFee: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
             reverted: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
             globalVariables: import("../tx/global_variables.js").GlobalVariables;
             gasSettings: import("../gas/gas_settings.js").GasSettings;
+            protocolContracts: import("../tx/protocol_contracts.js").ProtocolContracts;
             publicTeardownCallRequest: import("../kernel/public_call_request.js").PublicCallRequest;
             transactionFee: import("@aztec/foundation/schemas").Fr;
             feePayer: import("../aztec-address/index.js").AztecAddress;
             effectiveGasFees: import("../gas/gas_fees.js").GasFees;
             startTreeSnapshots: import("../tx/tree_snapshots.js").TreeSnapshots;
             startGasUsed: import("../gas/gas.js").Gas;
+            proverId: import("@aztec/foundation/schemas").Fr;
             publicCallRequestArrayLengths: import("../kernel/public_call_request.js").PublicCallRequestArrayLengths;
             publicSetupCallRequests: import("../kernel/public_call_request.js").PublicCallRequest[];
             publicAppLogicCallRequests: import("../kernel/public_call_request.js").PublicCallRequest[];
@@ -3664,6 +3689,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     feePerL2Gas: string | number | bigint;
                 };
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             publicTeardownCallRequest: {
                 isStaticCall: boolean;
                 calldataHash: string;
@@ -3697,6 +3725,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 daGas: string | number | bigint;
                 l2Gas: string | number | bigint;
             };
+            proverId: string;
             publicCallRequestArrayLengths: {
                 setupCalls: number;
                 appLogicCalls: number;
@@ -3773,7 +3802,6 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             };
             accumulatedData: {
                 noteHashes: string[];
@@ -3789,7 +3817,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             };
             reverted: boolean;
             feePayer?: any;
@@ -3825,6 +3853,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     feePerL2Gas: string | number | bigint;
                 };
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             publicTeardownCallRequest: {
                 isStaticCall: boolean;
                 calldataHash: string;
@@ -3858,6 +3889,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 daGas: string | number | bigint;
                 l2Gas: string | number | bigint;
             };
+            proverId: string;
             publicCallRequestArrayLengths: {
                 setupCalls: number;
                 appLogicCalls: number;
@@ -3934,7 +3966,6 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             };
             accumulatedData: {
                 noteHashes: string[];
@@ -3950,7 +3981,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             };
             reverted: boolean;
             feePayer?: any;
@@ -3991,6 +4022,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     feePerL2Gas: string | number | bigint;
                 };
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             publicTeardownCallRequest: {
                 isStaticCall: boolean;
                 calldataHash: string;
@@ -4024,6 +4058,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 daGas: string | number | bigint;
                 l2Gas: string | number | bigint;
             };
+            proverId: string;
             publicCallRequestArrayLengths: {
                 setupCalls: number;
                 appLogicCalls: number;
@@ -4100,7 +4135,6 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             };
             accumulatedData: {
                 noteHashes: string[];
@@ -4116,7 +4150,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             };
             reverted: boolean;
             feePayer?: any;
@@ -4135,6 +4169,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 coinbase?: any;
                 feeRecipient?: any;
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             tx: {
                 hash: string;
                 gasSettings: {
@@ -4192,17 +4229,17 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
             };
             contractInstances: {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }[];
             contractClasses: {
                 classId: string;
@@ -4508,6 +4545,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     feePerL2Gas: string | number | bigint;
                 };
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             publicTeardownCallRequest: {
                 isStaticCall: boolean;
                 calldataHash: string;
@@ -4541,6 +4581,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 daGas: string | number | bigint;
                 l2Gas: string | number | bigint;
             };
+            proverId: string;
             publicCallRequestArrayLengths: {
                 setupCalls: number;
                 appLogicCalls: number;
@@ -4617,7 +4658,6 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             };
             accumulatedData: {
                 noteHashes: string[];
@@ -4633,7 +4673,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             };
             reverted: boolean;
             feePayer?: any;
@@ -4652,6 +4692,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 coinbase?: any;
                 feeRecipient?: any;
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             tx: {
                 hash: string;
                 gasSettings: {
@@ -4709,17 +4752,17 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
             };
             contractInstances: {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }[];
             contractClasses: {
                 classId: string;
@@ -5031,6 +5074,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     feePerL2Gas: string | number | bigint;
                 };
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             publicTeardownCallRequest: {
                 isStaticCall: boolean;
                 calldataHash: string;
@@ -5064,6 +5110,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 daGas: string | number | bigint;
                 l2Gas: string | number | bigint;
             };
+            proverId: string;
             publicCallRequestArrayLengths: {
                 setupCalls: number;
                 appLogicCalls: number;
@@ -5140,7 +5187,6 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 nullifiers: number;
                 l2ToL1Msgs: number;
                 publicDataWrites: number;
-                publicLogs: number;
             };
             accumulatedData: {
                 noteHashes: string[];
@@ -5156,7 +5202,7 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                     value: string;
                     leafSlot: string;
                 }[];
-                publicLogs: any[];
+                publicLogs?: any;
             };
             reverted: boolean;
             feePayer?: any;
@@ -5175,6 +5221,9 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
                 coinbase?: any;
                 feeRecipient?: any;
             };
+            protocolContracts: {
+                derivedAddresses: any[];
+            };
             tx: {
                 hash: string;
                 gasSettings: {
@@ -5232,17 +5281,17 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
             };
             contractInstances: {
                 salt: string;
+                currentContractClassId: string;
+                originalContractClassId: string;
+                initializationHash: string;
                 publicKeys: {
                     masterNullifierPublicKey: string;
                     masterIncomingViewingPublicKey: string;
                     masterOutgoingViewingPublicKey: string;
                     masterTaggingPublicKey: string;
                 };
-                currentContractClassId: string;
-                originalContractClassId: string;
-                initializationHash: string;
-                address?: any;
                 deployer?: any;
+                address?: any;
             }[];
             contractClasses: {
                 classId: string;
@@ -5517,130 +5566,180 @@ export declare const ProvingJobInputs: z.ZodDiscriminatedUnion<"type", [z.ZodObj
         };
     };
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.BASE_PARITY>;
-    inputs: z.ZodType<BaseParityInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.PARITY_BASE>;
+    inputs: z.ZodType<ParityBasePrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.BASE_PARITY;
-    inputs: BaseParityInputs;
+    type: ProvingRequestType.PARITY_BASE;
+    inputs: ParityBasePrivateInputs;
 }, {
-    type: ProvingRequestType.BASE_PARITY;
+    type: ProvingRequestType.PARITY_BASE;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.ROOT_PARITY>;
-    inputs: z.ZodType<RootParityInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.PARITY_ROOT>;
+    inputs: z.ZodType<ParityRootPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.ROOT_PARITY;
-    inputs: RootParityInputs;
+    type: ProvingRequestType.PARITY_ROOT;
+    inputs: ParityRootPrivateInputs;
 }, {
-    type: ProvingRequestType.ROOT_PARITY;
+    type: ProvingRequestType.PARITY_ROOT;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.PRIVATE_BASE_ROLLUP>;
-    inputs: z.ZodType<PrivateBaseRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.PUBLIC_TUBE>;
+    inputs: z.ZodType<PublicTubePrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.PRIVATE_BASE_ROLLUP;
-    inputs: PrivateBaseRollupInputs;
+    type: ProvingRequestType.PUBLIC_TUBE;
+    inputs: PublicTubePrivateInputs;
 }, {
-    type: ProvingRequestType.PRIVATE_BASE_ROLLUP;
+    type: ProvingRequestType.PUBLIC_TUBE;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.PUBLIC_BASE_ROLLUP>;
-    inputs: z.ZodType<PublicBaseRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.PRIVATE_TX_BASE_ROLLUP>;
+    inputs: z.ZodType<PrivateTxBaseRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.PUBLIC_BASE_ROLLUP;
-    inputs: PublicBaseRollupInputs;
+    type: ProvingRequestType.PRIVATE_TX_BASE_ROLLUP;
+    inputs: PrivateTxBaseRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.PUBLIC_BASE_ROLLUP;
+    type: ProvingRequestType.PRIVATE_TX_BASE_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.MERGE_ROLLUP>;
-    inputs: z.ZodType<MergeRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.PUBLIC_TX_BASE_ROLLUP>;
+    inputs: z.ZodType<PublicTxBaseRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.MERGE_ROLLUP;
-    inputs: MergeRollupInputs;
+    type: ProvingRequestType.PUBLIC_TX_BASE_ROLLUP;
+    inputs: PublicTxBaseRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.MERGE_ROLLUP;
+    type: ProvingRequestType.PUBLIC_TX_BASE_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_ROLLUP>;
-    inputs: z.ZodType<BlockRootRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.TX_MERGE_ROLLUP>;
+    inputs: z.ZodType<TxMergeRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
-    inputs: BlockRootRollupInputs;
+    type: ProvingRequestType.TX_MERGE_ROLLUP;
+    inputs: TxMergeRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.TX_MERGE_ROLLUP;
+    inputs: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP>;
+    inputs: z.ZodType<BlockRootFirstRollupPrivateInputs, any, string>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP;
+    inputs: BlockRootFirstRollupPrivateInputs;
+}, {
+    type: ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP;
+    inputs: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP>;
+    inputs: z.ZodType<BlockRootSingleTxFirstRollupPrivateInputs, any, string>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP;
+    inputs: BlockRootSingleTxFirstRollupPrivateInputs;
+}, {
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP>;
-    inputs: z.ZodType<SingleTxBlockRootRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP>;
+    inputs: z.ZodType<BlockRootEmptyTxFirstRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP;
-    inputs: SingleTxBlockRootRollupInputs;
+    type: ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP;
+    inputs: BlockRootEmptyTxFirstRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP>;
-    inputs: z.ZodType<EmptyBlockRootRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_ROLLUP>;
+    inputs: z.ZodType<BlockRootRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP;
-    inputs: EmptyBlockRootRollupInputs;
+    type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
+    inputs: BlockRootRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP>;
-    inputs: z.ZodType<PaddingBlockRootRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP>;
+    inputs: z.ZodType<BlockRootSingleTxRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP;
-    inputs: PaddingBlockRootRollupInputs;
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP;
+    inputs: BlockRootSingleTxRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<ProvingRequestType.BLOCK_MERGE_ROLLUP>;
-    inputs: z.ZodType<BlockMergeRollupInputs, any, string>;
+    inputs: z.ZodType<BlockMergeRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
     type: ProvingRequestType.BLOCK_MERGE_ROLLUP;
-    inputs: BlockMergeRollupInputs;
+    inputs: BlockMergeRollupPrivateInputs;
 }, {
     type: ProvingRequestType.BLOCK_MERGE_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.ROOT_ROLLUP>;
-    inputs: z.ZodType<RootRollupInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_ROOT_ROLLUP>;
+    inputs: z.ZodType<CheckpointRootRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.ROOT_ROLLUP;
-    inputs: RootRollupInputs;
+    type: ProvingRequestType.CHECKPOINT_ROOT_ROLLUP;
+    inputs: CheckpointRootRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.ROOT_ROLLUP;
+    type: ProvingRequestType.CHECKPOINT_ROOT_ROLLUP;
+    inputs: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP>;
+    inputs: z.ZodType<CheckpointRootSingleBlockRollupPrivateInputs, any, string>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP;
+    inputs: CheckpointRootSingleBlockRollupPrivateInputs;
+}, {
+    type: ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP;
+    inputs: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_PADDING_ROLLUP>;
+    inputs: z.ZodType<CheckpointPaddingRollupPrivateInputs, any, string>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_PADDING_ROLLUP;
+    inputs: CheckpointPaddingRollupPrivateInputs;
+}, {
+    type: ProvingRequestType.CHECKPOINT_PADDING_ROLLUP;
+    inputs: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_MERGE_ROLLUP>;
+    inputs: z.ZodType<CheckpointMergeRollupPrivateInputs, any, string>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_MERGE_ROLLUP;
+    inputs: CheckpointMergeRollupPrivateInputs;
+}, {
+    type: ProvingRequestType.CHECKPOINT_MERGE_ROLLUP;
     inputs: string;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.TUBE_PROOF>;
-    inputs: z.ZodType<TubeInputs, any, string>;
+    type: z.ZodLiteral<ProvingRequestType.ROOT_ROLLUP>;
+    inputs: z.ZodType<RootRollupPrivateInputs, any, string>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.TUBE_PROOF;
-    inputs: TubeInputs;
+    type: ProvingRequestType.ROOT_ROLLUP;
+    inputs: RootRollupPrivateInputs;
 }, {
-    type: ProvingRequestType.TUBE_PROOF;
+    type: ProvingRequestType.ROOT_ROLLUP;
     inputs: string;
 }>]>;
-export declare function getProvingJobInputClassFor(type: ProvingRequestType): typeof AvmCircuitInputs | typeof BaseParityInputs | typeof RootParityInputs | typeof BlockMergeRollupInputs | typeof BlockRootRollupInputs | typeof SingleTxBlockRootRollupInputs | typeof EmptyBlockRootRollupInputs | typeof MergeRollupInputs | typeof PaddingBlockRootRollupInputs | typeof PrivateBaseRollupInputs | typeof PublicBaseRollupInputs | typeof TubeInputs;
+export declare function getProvingJobInputClassFor(type: ProvingRequestType): typeof AvmCircuitInputs | typeof ParityBasePrivateInputs | typeof ParityRootPrivateInputs | typeof BlockMergeRollupPrivateInputs | typeof BlockRootFirstRollupPrivateInputs | typeof BlockRootSingleTxFirstRollupPrivateInputs | typeof BlockRootEmptyTxFirstRollupPrivateInputs | typeof BlockRootRollupPrivateInputs | typeof BlockRootSingleTxRollupPrivateInputs | typeof PrivateTxBaseRollupPrivateInputs | typeof PublicTxBaseRollupPrivateInputs | typeof TxMergeRollupPrivateInputs | typeof CheckpointMergeRollupPrivateInputs | typeof CheckpointRootRollupPrivateInputs | typeof CheckpointRootSingleBlockRollupPrivateInputs | typeof CheckpointPaddingRollupPrivateInputs | typeof PublicTubePrivateInputs;
 export type ProvingJobInputs = z.infer<typeof ProvingJobInputs>;
 export type ProvingJobInputsMap = {
     [ProvingRequestType.PUBLIC_VM]: AvmCircuitInputs;
-    [ProvingRequestType.PRIVATE_BASE_ROLLUP]: PrivateBaseRollupInputs;
-    [ProvingRequestType.PUBLIC_BASE_ROLLUP]: PublicBaseRollupInputs;
-    [ProvingRequestType.MERGE_ROLLUP]: MergeRollupInputs;
-    [ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP]: EmptyBlockRootRollupInputs;
-    [ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP]: PaddingBlockRootRollupInputs;
-    [ProvingRequestType.BLOCK_ROOT_ROLLUP]: BlockRootRollupInputs;
-    [ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP]: SingleTxBlockRootRollupInputs;
-    [ProvingRequestType.BLOCK_MERGE_ROLLUP]: BlockMergeRollupInputs;
-    [ProvingRequestType.ROOT_ROLLUP]: RootRollupInputs;
-    [ProvingRequestType.BASE_PARITY]: BaseParityInputs;
-    [ProvingRequestType.ROOT_PARITY]: RootParityInputs;
-    [ProvingRequestType.TUBE_PROOF]: TubeInputs;
+    [ProvingRequestType.PUBLIC_TUBE]: PublicTubePrivateInputs;
+    [ProvingRequestType.PRIVATE_TX_BASE_ROLLUP]: PrivateTxBaseRollupPrivateInputs;
+    [ProvingRequestType.PUBLIC_TX_BASE_ROLLUP]: PublicTxBaseRollupPrivateInputs;
+    [ProvingRequestType.TX_MERGE_ROLLUP]: TxMergeRollupPrivateInputs;
+    [ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP]: BlockRootFirstRollupPrivateInputs;
+    [ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP]: BlockRootSingleTxFirstRollupPrivateInputs;
+    [ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP]: BlockRootEmptyTxFirstRollupPrivateInputs;
+    [ProvingRequestType.BLOCK_ROOT_ROLLUP]: BlockRootRollupPrivateInputs;
+    [ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP]: BlockRootSingleTxRollupPrivateInputs;
+    [ProvingRequestType.BLOCK_MERGE_ROLLUP]: BlockMergeRollupPrivateInputs;
+    [ProvingRequestType.CHECKPOINT_ROOT_ROLLUP]: CheckpointRootRollupPrivateInputs;
+    [ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP]: CheckpointRootSingleBlockRollupPrivateInputs;
+    [ProvingRequestType.CHECKPOINT_PADDING_ROLLUP]: CheckpointPaddingRollupPrivateInputs;
+    [ProvingRequestType.CHECKPOINT_MERGE_ROLLUP]: CheckpointMergeRollupPrivateInputs;
+    [ProvingRequestType.ROOT_ROLLUP]: RootRollupPrivateInputs;
+    [ProvingRequestType.PARITY_BASE]: ParityBasePrivateInputs;
+    [ProvingRequestType.PARITY_ROOT]: ParityRootPrivateInputs;
 };
 export declare const ProvingJobResult: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<ProvingRequestType.PUBLIC_VM>;
@@ -5652,77 +5751,131 @@ export declare const ProvingJobResult: z.ZodDiscriminatedUnion<"type", [z.ZodObj
     type: ProvingRequestType.PUBLIC_VM;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.PRIVATE_BASE_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, 535>>;
+    type: z.ZodLiteral<ProvingRequestType.PUBLIC_TUBE>;
+    result: ZodFor<PublicInputsAndRecursiveProof<PublicTubePublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.PRIVATE_BASE_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, 535>;
+    type: ProvingRequestType.PUBLIC_TUBE;
+    result: PublicInputsAndRecursiveProof<PublicTubePublicInputs, 535>;
 }, {
-    type: ProvingRequestType.PRIVATE_BASE_ROLLUP;
+    type: ProvingRequestType.PUBLIC_TUBE;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.PUBLIC_BASE_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, 535>>;
+    type: z.ZodLiteral<ProvingRequestType.PRIVATE_TX_BASE_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<TxRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.PUBLIC_BASE_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, 535>;
+    type: ProvingRequestType.PRIVATE_TX_BASE_ROLLUP;
+    result: PublicInputsAndRecursiveProof<TxRollupPublicInputs, 535>;
 }, {
-    type: ProvingRequestType.PUBLIC_BASE_ROLLUP;
+    type: ProvingRequestType.PRIVATE_TX_BASE_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.MERGE_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, 535>>;
+    type: z.ZodLiteral<ProvingRequestType.PUBLIC_TX_BASE_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<TxRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.MERGE_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, 535>;
+    type: ProvingRequestType.PUBLIC_TX_BASE_ROLLUP;
+    result: PublicInputsAndRecursiveProof<TxRollupPublicInputs, 535>;
 }, {
-    type: ProvingRequestType.MERGE_ROLLUP;
+    type: ProvingRequestType.PUBLIC_TX_BASE_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>>;
+    type: z.ZodLiteral<ProvingRequestType.TX_MERGE_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<TxRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>;
+    type: ProvingRequestType.TX_MERGE_ROLLUP;
+    result: PublicInputsAndRecursiveProof<TxRollupPublicInputs, 535>;
 }, {
-    type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.TX_MERGE_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>>;
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>;
+    type: ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP;
+    result: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>;
 }, {
-    type: ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP;
+    result?: any;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP;
+    result: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>;
+}, {
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP;
+    result?: any;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP;
+    result: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>;
+}, {
+    type: ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
     type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>>;
+    result: ZodFor<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
     type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>;
+    result: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>;
 }, {
     type: ProvingRequestType.BLOCK_ROOT_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>>;
+    type: z.ZodLiteral<ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>;
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP;
+    result: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>;
 }, {
-    type: ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP;
+    type: ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
     type: z.ZodLiteral<ProvingRequestType.BLOCK_MERGE_ROLLUP>;
-    result: ZodFor<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>>;
+    result: ZodFor<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>>;
 }, "strip", z.ZodTypeAny, {
     type: ProvingRequestType.BLOCK_MERGE_ROLLUP;
-    result: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 535>;
+    result: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 535>;
 }, {
     type: ProvingRequestType.BLOCK_MERGE_ROLLUP;
     result?: any;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_ROOT_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_ROOT_ROLLUP;
+    result: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>;
+}, {
+    type: ProvingRequestType.CHECKPOINT_ROOT_ROLLUP;
+    result?: any;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP;
+    result: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>;
+}, {
+    type: ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP;
+    result?: any;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_PADDING_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_PADDING_ROLLUP;
+    result: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>;
+}, {
+    type: ProvingRequestType.CHECKPOINT_PADDING_ROLLUP;
+    result?: any;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<ProvingRequestType.CHECKPOINT_MERGE_ROLLUP>;
+    result: ZodFor<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>>;
+}, "strip", z.ZodTypeAny, {
+    type: ProvingRequestType.CHECKPOINT_MERGE_ROLLUP;
+    result: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, 535>;
+}, {
+    type: ProvingRequestType.CHECKPOINT_MERGE_ROLLUP;
+    result?: any;
 }>, z.ZodObject<{
     type: z.ZodLiteral<ProvingRequestType.ROOT_ROLLUP>;
     result: ZodFor<PublicInputsAndRecursiveProof<RootRollupPublicInputs, 457>>;
@@ -5733,48 +5886,44 @@ export declare const ProvingJobResult: z.ZodDiscriminatedUnion<"type", [z.ZodObj
     type: ProvingRequestType.ROOT_ROLLUP;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.BASE_PARITY>;
+    type: z.ZodLiteral<ProvingRequestType.PARITY_BASE>;
     result: ZodFor<PublicInputsAndRecursiveProof<ParityPublicInputs, 457>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.BASE_PARITY;
+    type: ProvingRequestType.PARITY_BASE;
     result: PublicInputsAndRecursiveProof<ParityPublicInputs, 457>;
 }, {
-    type: ProvingRequestType.BASE_PARITY;
+    type: ProvingRequestType.PARITY_BASE;
     result?: any;
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.ROOT_PARITY>;
+    type: z.ZodLiteral<ProvingRequestType.PARITY_ROOT>;
     result: ZodFor<PublicInputsAndRecursiveProof<ParityPublicInputs, 457>>;
 }, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.ROOT_PARITY;
+    type: ProvingRequestType.PARITY_ROOT;
     result: PublicInputsAndRecursiveProof<ParityPublicInputs, 457>;
 }, {
-    type: ProvingRequestType.ROOT_PARITY;
-    result?: any;
-}>, z.ZodObject<{
-    type: z.ZodLiteral<ProvingRequestType.TUBE_PROOF>;
-    result: ZodFor<ProofAndVerificationKey<535>>;
-}, "strip", z.ZodTypeAny, {
-    type: ProvingRequestType.TUBE_PROOF;
-    result: ProofAndVerificationKey<535>;
-}, {
-    type: ProvingRequestType.TUBE_PROOF;
+    type: ProvingRequestType.PARITY_ROOT;
     result?: any;
 }>]>;
 export type ProvingJobResult = z.infer<typeof ProvingJobResult>;
 export type ProvingJobResultsMap = {
     [ProvingRequestType.PUBLIC_VM]: ProofAndVerificationKey<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
-    [ProvingRequestType.PRIVATE_BASE_ROLLUP]: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.PUBLIC_BASE_ROLLUP]: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.MERGE_ROLLUP]: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP]: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP]: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP]: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.BLOCK_ROOT_ROLLUP]: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    [ProvingRequestType.BLOCK_MERGE_ROLLUP]: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.PUBLIC_TUBE]: PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.PRIVATE_TX_BASE_ROLLUP]: PublicInputsAndRecursiveProof<TxRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.PUBLIC_TX_BASE_ROLLUP]: PublicInputsAndRecursiveProof<TxRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.TX_MERGE_ROLLUP]: PublicInputsAndRecursiveProof<TxRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP]: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP]: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP]: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.BLOCK_ROOT_ROLLUP]: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP]: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.BLOCK_MERGE_ROLLUP]: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.CHECKPOINT_ROOT_ROLLUP]: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP]: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.CHECKPOINT_PADDING_ROLLUP]: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+    [ProvingRequestType.CHECKPOINT_MERGE_ROLLUP]: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
     [ProvingRequestType.ROOT_ROLLUP]: PublicInputsAndRecursiveProof<RootRollupPublicInputs>;
-    [ProvingRequestType.BASE_PARITY]: PublicInputsAndRecursiveProof<ParityPublicInputs, typeof RECURSIVE_PROOF_LENGTH>;
-    [ProvingRequestType.ROOT_PARITY]: PublicInputsAndRecursiveProof<ParityPublicInputs, typeof NESTED_RECURSIVE_PROOF_LENGTH>;
-    [ProvingRequestType.TUBE_PROOF]: ProofAndVerificationKey<typeof TUBE_PROOF_LENGTH>;
+    [ProvingRequestType.PARITY_BASE]: PublicInputsAndRecursiveProof<ParityPublicInputs, typeof RECURSIVE_PROOF_LENGTH>;
+    [ProvingRequestType.PARITY_ROOT]: PublicInputsAndRecursiveProof<ParityPublicInputs, typeof NESTED_RECURSIVE_PROOF_LENGTH>;
 };
 export type ProvingRequestResultFor<T extends ProvingRequestType> = {
     type: T;