@aztec/stdlib 1.0.0-staging.2 → 1.0.0

package/src/interfaces/client.ts

@@ -3,4 +3,3 @@ export * from './aztec-node.js';
 export * from './aztec-node-admin.js';
 export * from './private_kernel_prover.js';
 export * from './get_logs_response.js';
-export * from './api_limit.js';

package/src/interfaces/proving-job.ts

@@ -21,7 +21,6 @@ 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';
@@ -88,8 +87,6 @@ export function mapProvingRequestTypeToCircuitName(type: ProvingRequestType): Se
       return 'merge-rollup';
     case ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP:
       return 'empty-block-root-rollup';
-    case ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP:
-      return 'padding-block-root-rollup';
     case ProvingRequestType.BLOCK_ROOT_ROLLUP:
       return 'block-root-rollup';
     case ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP:
@@ -124,10 +121,6 @@ export const ProvingJobInputs = z.discriminatedUnion('type', [
     inputs: SingleTxBlockRootRollupInputs.schema,
   }),
   z.object({ type: z.literal(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP), inputs: EmptyBlockRootRollupInputs.schema }),
-  z.object({
-    type: z.literal(ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP),
-    inputs: PaddingBlockRootRollupInputs.schema,
-  }),
   z.object({ type: z.literal(ProvingRequestType.BLOCK_MERGE_ROLLUP), inputs: BlockMergeRollupInputs.schema }),
   z.object({ type: z.literal(ProvingRequestType.ROOT_ROLLUP), inputs: RootRollupInputs.schema }),
   z.object({ type: z.literal(ProvingRequestType.TUBE_PROOF), inputs: TubeInputs.schema }),
@@ -145,8 +138,6 @@ export function getProvingJobInputClassFor(type: ProvingRequestType) {
       return MergeRollupInputs;
     case ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP:
       return EmptyBlockRootRollupInputs;
-    case ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP:
-      return PaddingBlockRootRollupInputs;
     case ProvingRequestType.BLOCK_ROOT_ROLLUP:
       return BlockRootRollupInputs;
     case ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP:
@@ -176,7 +167,6 @@ export type ProvingJobInputsMap = {
   [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;
@@ -219,13 +209,6 @@ export const ProvingJobResult = z.discriminatedUnion('type', [
       NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
     ),
   }),
-  z.object({
-    type: z.literal(ProvingRequestType.PADDING_BLOCK_ROOT_ROLLUP),
-    result: schemaForPublicInputsAndRecursiveProof(
-      BlockRootOrBlockMergePublicInputs.schema,
-      NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-    ),
-  }),
   z.object({
     type: z.literal(ProvingRequestType.BLOCK_ROOT_ROLLUP),
     result: schemaForPublicInputsAndRecursiveProof(
@@ -283,10 +266,6 @@ export type ProvingJobResultsMap = {
     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

package/src/interfaces/server.ts

@@ -19,4 +19,3 @@ export * from './server_circuit_prover.js';
 export * from './service.js';
 export * from './tx-collector.js';
 export * from './world_state.js';
-export * from './api_limit.js';

package/src/interfaces/server_circuit_prover.ts

@@ -15,7 +15,6 @@ import type { BlockMergeRollupInputs } from '../rollup/block_merge_rollup.js';
 import type { BlockRootOrBlockMergePublicInputs } from '../rollup/block_root_or_block_merge_public_inputs.js';
 import type { BlockRootRollupInputs, SingleTxBlockRootRollupInputs } from '../rollup/block_root_rollup.js';
 import type { EmptyBlockRootRollupInputs } from '../rollup/empty_block_root_rollup_inputs.js';
-import type { PaddingBlockRootRollupInputs } from '../rollup/index.js';
 import type { MergeRollupInputs } from '../rollup/merge_rollup.js';
 import type { PrivateBaseRollupInputs } from '../rollup/private_base_rollup_inputs.js';
 import type { PublicBaseRollupInputs } from '../rollup/public_base_rollup_inputs.js';
@@ -122,14 +121,6 @@ export interface ServerCircuitProver {
     PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>
   >;
 
-  getPaddingBlockRootRollupProof(
-    input: PaddingBlockRootRollupInputs,
-    signal?: AbortSignal,
-    epochNumber?: number,
-  ): Promise<
-    PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>
-  >;
-
   /**
    * Creates a proof for the given input.
    * @param input - Input to the circuit.

package/src/kernel/hints/rollup_validation_requests.ts

@@ -4,15 +4,17 @@ import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import type { FieldsOf } from '@aztec/foundation/types';
 
-import { IncludeByTimestamp } from '../../tx/include_by_timestamp.js';
+import { MaxBlockNumber } from '../../tx/max_block_number.js';
 
 /**
  * Validation requests directed at the rollup, accumulated during the execution of the transaction.
  */
 export class RollupValidationRequests {
   constructor(
-    /** The highest timestamp of a block in which this transaction can still be included. */
-    public includeByTimestamp: IncludeByTimestamp,
+    /**
+     * The largest block number in which this transaction can be included.
+     */
+    public maxBlockNumber: MaxBlockNumber,
   ) {}
 
   getSize() {
@@ -20,7 +22,7 @@ export class RollupValidationRequests {
   }
 
   toBuffer() {
-    return serializeToBuffer(this.includeByTimestamp);
+    return serializeToBuffer(this.maxBlockNumber);
   }
 
   toString() {
@@ -28,12 +30,12 @@ export class RollupValidationRequests {
   }
 
   static getFields(fields: FieldsOf<RollupValidationRequests>) {
-    return [fields.includeByTimestamp] as const;
+    return [fields.maxBlockNumber] as const;
   }
 
   static fromFields(fields: Fr[] | FieldReader) {
     const reader = FieldReader.asReader(fields);
-    return new RollupValidationRequests(IncludeByTimestamp.fromFields(reader));
+    return new RollupValidationRequests(MaxBlockNumber.fromFields(reader));
   }
 
   toFields(): Fr[] {
@@ -53,7 +55,7 @@ export class RollupValidationRequests {
    */
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new RollupValidationRequests(reader.readObject(IncludeByTimestamp));
+    return new RollupValidationRequests(reader.readObject(MaxBlockNumber));
   }
 
   /**
@@ -66,6 +68,6 @@ export class RollupValidationRequests {
   }
 
   static empty() {
-    return new RollupValidationRequests(IncludeByTimestamp.empty());
+    return new RollupValidationRequests(MaxBlockNumber.empty());
   }
 }

package/src/kernel/private_circuit_public_inputs.ts

@@ -30,7 +30,7 @@ import { PrivateLogData } from '../kernel/private_log_data.js';
 import { CountedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { CallContext } from '../tx/call_context.js';
-import { IncludeByTimestamp } from '../tx/include_by_timestamp.js';
+import { MaxBlockNumber } from '../tx/max_block_number.js';
 import { TxContext } from '../tx/tx_context.js';
 import { ReadRequest } from './hints/read_request.js';
 import { NoteHash } from './note_hash.js';
@@ -64,9 +64,9 @@ export class PrivateCircuitPublicInputs {
      */
     public isFeePayer: boolean,
     /**
-     * The highest timestamp of a block in which the transaction can still be included.
+     * The maximum block number in which this transaction can be included and be valid.
      */
-    public includeByTimestamp: IncludeByTimestamp,
+    public maxBlockNumber: MaxBlockNumber,
     /**
      * Read requests created by the corresponding function call.
      */
@@ -158,7 +158,7 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readBoolean(),
-      reader.readObject(IncludeByTimestamp),
+      reader.readObject(MaxBlockNumber),
       reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator),
@@ -185,7 +185,7 @@ export class PrivateCircuitPublicInputs {
       reader.readField(),
       reader.readField(),
       reader.readBoolean(),
-      reader.readObject(IncludeByTimestamp),
+      reader.readObject(MaxBlockNumber),
       reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator),
@@ -215,7 +215,7 @@ export class PrivateCircuitPublicInputs {
       Fr.ZERO,
       Fr.ZERO,
       false,
-      IncludeByTimestamp.empty(),
+      MaxBlockNumber.empty(),
       makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, ReadRequest.empty),
       makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest.empty),
       makeTuple(MAX_KEY_VALIDATION_REQUESTS_PER_CALL, KeyValidationRequestAndGenerator.empty),
@@ -241,7 +241,7 @@ export class PrivateCircuitPublicInputs {
       this.returnsHash.isZero() &&
       this.minRevertibleSideEffectCounter.isZero() &&
       !this.isFeePayer &&
-      this.includeByTimestamp.isEmpty() &&
+      this.maxBlockNumber.isEmpty() &&
       isEmptyArray(this.noteHashReadRequests) &&
       isEmptyArray(this.nullifierReadRequests) &&
       isEmptyArray(this.keyValidationRequestsAndGenerators) &&
@@ -272,7 +272,7 @@ export class PrivateCircuitPublicInputs {
       fields.returnsHash,
       fields.minRevertibleSideEffectCounter,
       fields.isFeePayer,
-      fields.includeByTimestamp,
+      fields.maxBlockNumber,
       fields.noteHashReadRequests,
       fields.nullifierReadRequests,
       fields.keyValidationRequestsAndGenerators,

package/src/proofs/proving_request_type.ts

@@ -5,7 +5,6 @@ export enum ProvingRequestType {
   PUBLIC_BASE_ROLLUP,
   MERGE_ROLLUP,
   EMPTY_BLOCK_ROOT_ROLLUP,
-  PADDING_BLOCK_ROOT_ROLLUP,
   BLOCK_ROOT_ROLLUP,
   SINGLE_TX_BLOCK_ROOT_ROLLUP,
   BLOCK_MERGE_ROLLUP,

package/src/rollup/base_or_merge_rollup_public_inputs.ts

@@ -5,6 +5,7 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
 import { PartialStateReference } from '../tx/partial_state_reference.js';
+import { RollupTypes } from '../types/shared.js';
 import { BlockConstantData } from './block_constant_data.js';
 
 /**
@@ -12,6 +13,10 @@ import { BlockConstantData } from './block_constant_data.js';
  */
 export class BaseOrMergeRollupPublicInputs {
   constructor(
+    /**
+     * Specifies from which type of rollup circuit these inputs are from.
+     */
+    public rollupType: RollupTypes,
     /**
      * Number of txs in this rollup.
      */
@@ -54,6 +59,7 @@ export class BaseOrMergeRollupPublicInputs {
   /** Returns an empty instance. */
   static empty() {
     return new BaseOrMergeRollupPublicInputs(
+      RollupTypes.Base,
       0,
       BlockConstantData.empty(),
       PartialStateReference.empty(),
@@ -75,6 +81,7 @@ export class BaseOrMergeRollupPublicInputs {
   static fromBuffer(buffer: Buffer | BufferReader): BaseOrMergeRollupPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new BaseOrMergeRollupPublicInputs(
+      reader.readNumber(),
       reader.readNumber(),
       reader.readObject(BlockConstantData),
       reader.readObject(PartialStateReference),
@@ -93,6 +100,7 @@ export class BaseOrMergeRollupPublicInputs {
    */
   toBuffer() {
     return serializeToBuffer(
+      this.rollupType,
       this.numTxs,
       this.constants,
 

package/src/rollup/empty_block_root_rollup_inputs.ts

@@ -13,6 +13,7 @@ export class EmptyBlockRootRollupInputs {
   constructor(
     public readonly data: BlockRootRollupData,
     public readonly constants: BlockConstantData,
+    public readonly isPadding: boolean,
   ) {}
 
   /**
@@ -46,7 +47,7 @@ export class EmptyBlockRootRollupInputs {
    * @returns An array of fields.
    */
   static getFields(fields: FieldsOf<EmptyBlockRootRollupInputs>) {
-    return [fields.data, fields.constants] as const;
+    return [fields.data, fields.constants, fields.isPadding] as const;
   }
 
   /**
@@ -56,7 +57,11 @@ export class EmptyBlockRootRollupInputs {
    */
   static fromBuffer(buffer: Buffer | BufferReader): EmptyBlockRootRollupInputs {
     const reader = BufferReader.asReader(buffer);
-    return new EmptyBlockRootRollupInputs(reader.readObject(BlockRootRollupData), reader.readObject(BlockConstantData));
+    return new EmptyBlockRootRollupInputs(
+      reader.readObject(BlockRootRollupData),
+      reader.readObject(BlockConstantData),
+      reader.readBoolean(),
+    );
   }
 
   /**

package/src/rollup/index.ts

@@ -8,7 +8,6 @@ export * from './empty_block_root_rollup_inputs.js';
 export * from './epoch_constant_data.js';
 export * from './block_root_rollup.js';
 export * from './merge_rollup.js';
-export * from './padding_block_root_rollup_inputs.js';
 export * from './previous_rollup_block_data.js';
 export * from './previous_rollup_data.js';
 export * from './private_base_rollup_inputs.js';

package/src/shared_mutable/scheduled_delay_change.ts

@@ -1,17 +1,17 @@
-import type { UInt64 } from '../types/shared.js';
+import type { UInt32 } from '../types/shared.js';
 
 export class ScheduledDelayChange {
   constructor(
-    public pre: UInt64 | undefined,
-    public post: UInt64 | undefined,
-    public timestampOfChange: UInt64,
+    public pre: UInt32 | undefined,
+    public post: UInt32 | undefined,
+    public blockOfChange: UInt32,
   ) {}
 
   static empty() {
-    return new this(undefined, undefined, 0n);
+    return new this(undefined, undefined, 0);
   }
 
   isEmpty(): boolean {
-    return this.pre === undefined && this.post === undefined && this.timestampOfChange === 0n;
+    return this.pre === undefined && this.post === undefined && this.blockOfChange === 0;
   }
 }

package/src/shared_mutable/scheduled_value_change.ts

@@ -1,12 +1,10 @@
 import { Fr } from '@aztec/foundation/fields';
 
-import type { UInt64 } from '../types/shared.js';
-
 export class ScheduledValueChange {
   constructor(
     public previous: Fr[],
     public post: Fr[],
-    public timestampOfChange: UInt64,
+    public blockOfChange: number,
   ) {
     if (this.previous.length !== this.post.length) {
       throw new Error('Previous and post must have the same length');
@@ -14,15 +12,15 @@ export class ScheduledValueChange {
   }
 
   static empty(valueSize: number) {
-    return new this(Array(valueSize).fill(new Fr(0)), Array(valueSize).fill(new Fr(0)), 0n);
+    return new this(Array(valueSize).fill(new Fr(0)), Array(valueSize).fill(new Fr(0)), 0);
   }
 
   isEmpty(): boolean {
-    return this.previous.every(v => v.isZero()) && this.post.every(v => v.isZero()) && this.timestampOfChange === 0n;
+    return this.previous.every(v => v.isZero()) && this.post.every(v => v.isZero()) && this.blockOfChange === 0;
   }
 
-  getCurrentAt(timestamp: UInt64) {
-    if (timestamp < this.timestampOfChange) {
+  getCurrentAt(blockNumber: number) {
+    if (blockNumber < this.blockOfChange) {
       return this.previous;
     } else {
       return this.post;

package/src/shared_mutable/shared_mutable_values.ts

@@ -22,20 +22,20 @@ export class SharedMutableValues {
     // Extract fields for ScheduledValueChange
     const svcPre = reader.readFieldArray(UPDATES_VALUE_SIZE);
     const svcPost = reader.readFieldArray(UPDATES_VALUE_SIZE);
-    const svcTimestampOfChange = firstField & 0xffffffffn;
-    const svc = new ScheduledValueChange(svcPre, svcPost, svcTimestampOfChange);
+    const svcBlockOfChange = firstField & 0xffffffffn;
+    const svc = new ScheduledValueChange(svcPre, svcPost, Number(svcBlockOfChange));
 
     // Extract fields for ScheduledDelayChange from first field
-    const sdcTimestampOfChange = (firstField >> 32n) & 0xffffffffn;
+    const sdcBlockOfChange = (firstField >> 32n) & 0xffffffffn;
     const sdcIsPostSome = (firstField >> 64n) & 1n;
     const sdcPost = (firstField >> 72n) & 0xffffffffn;
     const sdcIsPreSome = (firstField >> 104n) & 1n;
     const sdcPre = (firstField >> 112n) & 0xffffffffn;
 
     const sdc = new ScheduledDelayChange(
-      sdcIsPreSome ? sdcPre : undefined,
-      sdcIsPostSome ? sdcPost : undefined,
-      sdcTimestampOfChange,
+      sdcIsPreSome ? Number(sdcPre) : undefined,
+      sdcIsPostSome ? Number(sdcPost) : undefined,
+      Number(sdcBlockOfChange),
     );
 
     return new this(svc, sdc);
@@ -43,9 +43,9 @@ export class SharedMutableValues {
 
   toFields(): Fr[] {
     // Pack format matches Noir implementation:
-    // [ sdc.pre_inner: u32 | sdc.pre_is_some: u8 | sdc.post_inner: u32 | sdc.post_is_some: u8 | sdc.timestamp_of_change: u32 | svc.timestamp_of_change: u32 ]
-    let firstField = this.svc.timestampOfChange;
-    firstField |= this.sdc.timestampOfChange << 32n;
+    // [ sdc.pre_inner: u32 | sdc.pre_is_some: u8 | sdc.post_inner: u32 | sdc.post_is_some: u8 | sdc.block_of_change: u32 | svc.block_of_change: u32 ]
+    let firstField = BigInt(this.svc.blockOfChange);
+    firstField |= BigInt(this.sdc.blockOfChange) << 32n;
     firstField |= (this.sdc.post === undefined ? 0n : 1n) << 64n;
     firstField |= BigInt(this.sdc.post || 0) << 72n;
     firstField |= (this.sdc.pre === undefined ? 0n : 1n) << 104n;

package/src/stats/stats.ts

@@ -92,7 +92,6 @@ export type ServerCircuitName =
   | 'block-root-rollup'
   | 'single-tx-block-root-rollup'
   | 'empty-block-root-rollup'
-  | 'padding-block-root-rollup'
   | 'block-merge-rollup'
   | 'root-rollup'
   | 'avm-circuit'

package/src/tests/factories.ts

@@ -165,7 +165,7 @@ import { CallContext } from '../tx/call_context.js';
 import { ContentCommitment } from '../tx/content_commitment.js';
 import { FunctionData } from '../tx/function_data.js';
 import { GlobalVariables } from '../tx/global_variables.js';
-import { IncludeByTimestamp } from '../tx/include_by_timestamp.js';
+import { MaxBlockNumber } from '../tx/max_block_number.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '../tx/processed_tx.js';
 import { PublicCallRequestWithCalldata } from '../tx/public_call_request_with_calldata.js';
@@ -174,7 +174,7 @@ import { TreeSnapshots } from '../tx/tree_snapshots.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
 import { TxContext } from '../tx/tx_context.js';
 import { TxRequest } from '../tx/tx_request.js';
-import { Vector } from '../types/index.js';
+import { RollupTypes, Vector } from '../types/index.js';
 import { VkData } from '../vks/index.js';
 import { VerificationKey, VerificationKeyAsFields, VerificationKeyData } from '../vks/verification_key.js';
 import { mockTx } from './mocks.js';
@@ -308,7 +308,7 @@ export function makeContractStorageRead(seed = 1): ContractStorageRead {
 }
 
 export function makeRollupValidationRequests(seed = 1) {
-  return new RollupValidationRequests(new IncludeByTimestamp(true, BigInt(seed + 0x31415)));
+  return new RollupValidationRequests(new MaxBlockNumber(true, seed + 0x31415));
 }
 
 function makeTxConstantData(seed = 1) {
@@ -567,7 +567,7 @@ export function makeTxRequest(seed = 1): TxRequest {
  */
 export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicInputs {
   return PrivateCircuitPublicInputs.from({
-    includeByTimestamp: new IncludeByTimestamp(true, BigInt(seed + 0x31415)),
+    maxBlockNumber: new MaxBlockNumber(true, seed + 0x31415),
     callContext: makeCallContext(seed, { isStaticCall: true }),
     argsHash: fr(seed + 0x100),
     returnsHash: fr(seed + 0x200),
@@ -684,6 +684,7 @@ export function makeBaseOrMergeRollupPublicInputs(
   globalVariables: GlobalVariables | undefined = undefined,
 ): BaseOrMergeRollupPublicInputs {
   return new BaseOrMergeRollupPublicInputs(
+    RollupTypes.Base,
     1,
     makeBlockConstantData(seed + 0x200, globalVariables),
     makePartialStateReference(seed + 0x300),
@@ -832,6 +833,7 @@ export function makeEmptyBlockRootRollupInputs(
   return new EmptyBlockRootRollupInputs(
     makeBlockRootRollupData(seed + 0x1000),
     makeBlockConstantData(0x2500, globalVariables),
+    true,
   );
 }
 

package/src/tx/index.ts

@@ -1,7 +1,7 @@
 export * from './block_header.js';
 export * from './call_context.js';
 export * from './global_variables.js';
-export * from './include_by_timestamp.js';
+export * from './max_block_number.js';
 export * from './content_commitment.js';
 export * from './state_reference.js';
 export * from './partial_state_reference.js';

package/src/tx/max_block_number.ts

@@ -0,0 +1,81 @@
+import { MAX_BLOCK_NUMBER_LENGTH } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+
+import type { UInt32 } from '../types/index.js';
+
+/**
+ * Maximum block number.
+ */
+export class MaxBlockNumber {
+  constructor(
+    /**
+     * Whether a max block number was requested.
+     */
+    public isSome: boolean,
+    /**
+     * The requested max block number, if isSome is true.
+     */
+    public value: UInt32,
+  ) {}
+
+  /**
+   * Serialize as a buffer.
+   * @returns The buffer.
+   */
+  toBuffer() {
+    return serializeToBuffer(...MaxBlockNumber.getFields(this));
+  }
+
+  toFields(): Fr[] {
+    const fields = serializeToFields(...MaxBlockNumber.getFields(this));
+    if (fields.length !== MAX_BLOCK_NUMBER_LENGTH) {
+      throw new Error(
+        `Invalid number of fields for MaxBlockNumber. Expected ${MAX_BLOCK_NUMBER_LENGTH}, got ${fields.length}`,
+      );
+    }
+    return fields;
+  }
+
+  /**
+   * Deserializes MaxBlockNumber from a buffer or reader.
+   * @param buffer - Buffer to read from.
+   * @returns The MaxBlockNumber.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader): MaxBlockNumber {
+    const reader = BufferReader.asReader(buffer);
+    return new MaxBlockNumber(reader.readBoolean(), reader.readNumber());
+  }
+
+  static fromFields(fields: Fr[] | FieldReader): MaxBlockNumber {
+    const reader = FieldReader.asReader(fields);
+    return new MaxBlockNumber(reader.readBoolean(), reader.readU32());
+  }
+
+  static empty() {
+    return new MaxBlockNumber(false, 0);
+  }
+
+  isEmpty(): boolean {
+    return !this.isSome && this.value === 0;
+  }
+
+  /**
+   * Create a new instance from a fields dictionary.
+   * @param fields - The dictionary.
+   * @returns A new instance.
+   */
+  static from(fields: FieldsOf<MaxBlockNumber>): MaxBlockNumber {
+    return new MaxBlockNumber(...MaxBlockNumber.getFields(fields));
+  }
+
+  /**
+   * Serialize into a field array. Low-level utility.
+   * @param fields - Object with fields.
+   * @returns The array.
+   */
+  static getFields(fields: FieldsOf<MaxBlockNumber>) {
+    return [fields.isSome, fields.value] as const;
+  }
+}

package/src/tx/offchain_effect.ts

@@ -2,7 +2,6 @@ import { Fr } from '@aztec/foundation/fields';
 
 import type { AztecAddress } from '../aztec-address/index.js';
 
-// The following identifier was copied over from `noir-projects/aztec-nr/aztec/src/messages/offchain_messages.nr`.
 // poseidon2hash("aztecnr_offchain_message")
 export const OFFCHAIN_MESSAGE_IDENTIFIER: Fr = new Fr(
   6023466688192654631553769360478808766602235351827869819420284624004071427516n,

package/src/tx/validator/error_texts.ts

@@ -11,7 +11,7 @@ export const TX_ERROR_DUPLICATE_NULLIFIER_IN_TX = 'Duplicate nullifier in tx';
 export const TX_ERROR_EXISTING_NULLIFIER = 'Existing nullifier';
 
 // Metadata
-export const TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP = 'Invalid expiration timestamp';
+export const TX_ERROR_INVALID_MAX_BLOCK_NUMBER = 'Invalid max block number';
 export const TX_ERROR_INCORRECT_L1_CHAIN_ID = 'Incorrect L1 chain id';
 export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
 export const TX_ERROR_INCORRECT_VK_TREE_ROOT = 'Incorrect protocol circuits tree root';

package/src/types/shared.ts

@@ -44,3 +44,12 @@ export enum CircuitType {
   STANDARD = 0,
   ULTRA = 1,
 }
+
+/**
+ * Rollup types.
+ */
+export enum RollupTypes {
+  Base = 0,
+  Merge = 1,
+  Root = 2,
+}

package/src/vks/verification_key.ts

@@ -9,7 +9,6 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
-import { hashVK } from '../hash/index.js';
 import { CircuitType } from '../types/shared.js';
 
 /**
@@ -94,11 +93,6 @@ export class VerificationKeyAsFields {
     public hash: Fr,
   ) {}
 
-  static async fromKey(key: Fr[]) {
-    const hash = await hashVK(key);
-    return new VerificationKeyAsFields(key, hash);
-  }
-
   public get numPublicInputs() {
     return Number(this.key[CIRCUIT_PUBLIC_INPUTS_INDEX]);
   }

package/dest/rollup/padding_block_root_rollup_inputs.d.ts

@@ -1,20 +0,0 @@
-import { BufferReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { EpochConstantData } from './epoch_constant_data.js';
-/**
- * Inputs of the padding block root rollup circuit.
- */
-export declare class PaddingBlockRootRollupInputs {
-    readonly constants: EpochConstantData;
-    constructor(constants: EpochConstantData);
-    static from(fields: FieldsOf<PaddingBlockRootRollupInputs>): PaddingBlockRootRollupInputs;
-    static getFields(fields: FieldsOf<PaddingBlockRootRollupInputs>): readonly [EpochConstantData];
-    static fromBuffer(buffer: Buffer | BufferReader): PaddingBlockRootRollupInputs;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    static fromString(str: string): PaddingBlockRootRollupInputs;
-    toString(): `0x${string}`;
-    /** Returns a buffer representation for JSON serialization. */
-    toJSON(): Buffer<ArrayBufferLike>;
-    static get schema(): import("zod").ZodType<PaddingBlockRootRollupInputs, any, string>;
-}
-//# sourceMappingURL=padding_block_root_rollup_inputs.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"padding_block_root_rollup_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/padding_block_root_rollup_inputs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,4BAA4B;aACX,SAAS,EAAE,iBAAiB;gBAA5B,SAAS,EAAE,iBAAiB;IAExD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,4BAA4B,CAAC,GAAG,4BAA4B;IAIzF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,4BAA4B,CAAC;IAI/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,4BAA4B;IAK9E,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,QAAQ;IAIR,8DAA8D;IAC9D,MAAM;IAIN,MAAM,KAAK,MAAM,qEAEhB;CACF"}