@aztec/stdlib 0.85.0 → 0.86.0-nightly.20250426

package/src/p2p/topic_type.ts

@@ -6,8 +6,8 @@ import { P2PClientType } from './client_type.js';
  * @param topicType
  * @returns
  */
-export function createTopicString(topicType: TopicType) {
-  return '/aztec/' + topicType + '/0.1.0';
+export function createTopicString(topicType: TopicType, protocolVersion: string) {
+  return `/aztec/${TopicType[topicType]}/${protocolVersion}`;
 }
 
 /**
@@ -35,10 +35,10 @@ export function getTopicTypeForClientType(clientType: P2PClientType) {
  *  ...
  * }
  */
-export function metricsTopicStrToLabels() {
+export function metricsTopicStrToLabels(protocolVersion: string) {
   const topicStrToLabel = new Map<string, string>();
   for (const topic in TopicType) {
-    topicStrToLabel.set(createTopicString(TopicType[topic as keyof typeof TopicType]), topic);
+    topicStrToLabel.set(createTopicString(TopicType[topic as keyof typeof TopicType], protocolVersion), topic);
   }
 
   return topicStrToLabel;

package/src/rollup/block_root_or_block_merge_public_inputs.ts

@@ -23,14 +23,6 @@ export class BlockRootOrBlockMergePublicInputs {
      * Archive tree after adding this block range.
      */
     public newArchive: AppendOnlyTreeSnapshot,
-    /**
-     * Identifier of the previous block before the range.
-     */
-    public previousBlockHash: Fr,
-    /**
-     * Identifier of the last block in the range.
-     */
-    public endBlockHash: Fr,
     /**
      * Global variables for the first block in the range.
      */
@@ -76,8 +68,6 @@ export class BlockRootOrBlockMergePublicInputs {
     return new BlockRootOrBlockMergePublicInputs(
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(AppendOnlyTreeSnapshot),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
       reader.readObject(GlobalVariables),
       reader.readObject(GlobalVariables),
       Fr.fromBuffer(reader),
@@ -97,8 +87,6 @@ export class BlockRootOrBlockMergePublicInputs {
     return serializeToBuffer(
       this.previousArchive,
       this.newArchive,
-      this.previousBlockHash,
-      this.endBlockHash,
       this.startGlobalVariables,
       this.endGlobalVariables,
       this.outHash,

package/src/rollup/block_root_rollup.ts

@@ -25,6 +25,10 @@ export class BlockRootRollupData {
      * Hint for inserting the new l1 to l2 message subtree.
      */
     public l1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>,
+    /**
+     * Hint for checking the hash of previous_block_header is the last leaf of the previous archive.
+     */
+    public previousArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
     /**
      * Hint for inserting the new block hash to the last archive.
      */
@@ -73,6 +77,7 @@ export class BlockRootRollupData {
     return [
       fields.l1ToL2Roots,
       fields.l1ToL2MessageSubtreeSiblingPath,
+      fields.previousArchiveSiblingPath,
       fields.newArchiveSiblingPath,
       fields.previousBlockHeader,
       fields.proverId,
@@ -90,6 +95,7 @@ export class BlockRootRollupData {
       RootParityInput.fromBuffer(reader, NESTED_RECURSIVE_PROOF_LENGTH),
       reader.readArray(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr),
       reader.readArray(ARCHIVE_HEIGHT, Fr),
+      reader.readArray(ARCHIVE_HEIGHT, Fr),
       BlockHeader.fromBuffer(reader),
       Fr.fromBuffer(reader),
     );

package/src/rollup/root_rollup.ts

@@ -103,8 +103,6 @@ export class RootRollupPublicInputs {
     /** Snapshot of archive tree before/after this rollup been processed */
     public previousArchive: AppendOnlyTreeSnapshot,
     public endArchive: AppendOnlyTreeSnapshot,
-    public previousBlockHash: Fr,
-    public endBlockHash: Fr,
     // This is a u64 in nr, but GlobalVariables contains this as a u64 and is mapped to ts as a field, so I'm doing the same here
     public endTimestamp: Fr,
     public endBlockNumber: Fr,
@@ -120,8 +118,6 @@ export class RootRollupPublicInputs {
     return [
       fields.previousArchive,
       fields.endArchive,
-      fields.previousBlockHash,
-      fields.endBlockHash,
       fields.endTimestamp,
       fields.endBlockNumber,
       fields.outHash,
@@ -158,8 +154,6 @@ export class RootRollupPublicInputs {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
       reader.readArray(AZTEC_MAX_EPOCH_DURATION, FeeRecipient),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
@@ -194,8 +188,6 @@ export class RootRollupPublicInputs {
       Fr.random(),
       Fr.random(),
       Fr.random(),
-      Fr.random(),
-      Fr.random(),
       makeTuple(AZTEC_MAX_EPOCH_DURATION, FeeRecipient.random),
       Fr.random(),
       Fr.random(),

package/src/snapshots/download.ts

@@ -2,8 +2,6 @@ import { fromEntries, getEntries, maxBy } from '@aztec/foundation/collection';
 import { jsonParseWithSchemaSync } from '@aztec/foundation/json-rpc';
 import type { ReadOnlyFileStore } from '@aztec/stdlib/file-store';
 
-import { join } from 'path';
-
 import {
   SnapshotDataKeys,
   type SnapshotDataUrls,
@@ -47,8 +45,9 @@ export function getSnapshotIndexPath(metadata: SnapshotsIndexMetadata): string {
   return `${getBasePath(metadata)}/index.json`;
 }
 
-export function makeSnapshotLocalPaths(baseDir: string): SnapshotDataUrls {
-  return fromEntries(SnapshotDataKeys.map(key => [key, join(baseDir, `${key}.db`)]));
+export function makeSnapshotPaths(baseDir: string): SnapshotDataUrls {
+  // We do not use path.join since that screws up protocol prefixes
+  return fromEntries(SnapshotDataKeys.map(key => [key, `${baseDir}/${key}.db`]));
 }
 
 export async function downloadSnapshot(

package/src/snapshots/index.ts

@@ -1,3 +1,3 @@
 export * from './types.js';
 export * from './upload.js';
-export { downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotLocalPaths } from './download.js';
+export { getBasePath, downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotPaths } from './download.js';

package/src/snapshots/types.ts

@@ -35,6 +35,9 @@ export type SnapshotsIndex = SnapshotsIndexMetadata & {
   snapshots: SnapshotMetadata[];
 };
 
+export type UploadSnapshotMetadata = Pick<SnapshotMetadata, 'l2BlockNumber' | 'l2BlockHash' | 'l1BlockNumber'> &
+  Pick<SnapshotsIndex, 'l1ChainId' | 'rollupVersion' | 'rollupAddress'>;
+
 export const SnapshotsIndexSchema = z.object({
   l1ChainId: z.number(),
   rollupVersion: z.number(),
@@ -56,3 +59,12 @@ export const SnapshotsIndexSchema = z.object({
     }),
   ),
 }) satisfies ZodFor<SnapshotsIndex>;
+
+export const UploadSnapshotMetadataSchema = z.object({
+  l2BlockNumber: z.number(),
+  l2BlockHash: z.string(),
+  l1BlockNumber: z.number(),
+  l1ChainId: z.number(),
+  rollupVersion: z.number(),
+  rollupAddress: schemas.EthAddress,
+}) satisfies ZodFor<UploadSnapshotMetadata>;

package/src/snapshots/upload.ts

@@ -1,41 +1,49 @@
 import { fromEntries, getEntries, pick } from '@aztec/foundation/collection';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { isoDate } from '@aztec/foundation/string';
 import type { FileStore } from '@aztec/stdlib/file-store';
 
 import { getBasePath, getSnapshotIndex, getSnapshotIndexPath } from './download.js';
-import type { SnapshotDataKeys, SnapshotMetadata, SnapshotsIndex } from './types.js';
+import type { SnapshotDataKeys, SnapshotMetadata, SnapshotsIndex, UploadSnapshotMetadata } from './types.js';
 
-export type UploadSnapshotMetadata = Pick<SnapshotMetadata, 'l2BlockNumber' | 'l2BlockHash' | 'l1BlockNumber'> &
-  Pick<SnapshotsIndex, 'l1ChainId' | 'rollupVersion' | 'rollupAddress'>;
-
-export async function uploadSnapshot(
+export async function uploadSnapshotData(
   localPaths: Record<SnapshotDataKeys, string>,
   schemaVersions: SnapshotMetadata['schemaVersions'],
   metadata: UploadSnapshotMetadata,
   store: FileStore,
+  opts: { pathFor?: (key: SnapshotDataKeys) => string; private?: boolean } = {},
 ): Promise<SnapshotMetadata> {
   const timestamp = Date.now();
-  const date = new Date().toISOString().replace(/[-:T]/g, '').replace(/\..+$/, '');
+  const date = isoDate();
   const basePath = getBasePath(metadata);
-  const targetPathFor = (key: SnapshotDataKeys) => `${basePath}/${key}-${date}-${metadata.l2BlockHash}.db`;
+  const targetPathFor =
+    opts.pathFor ?? ((key: SnapshotDataKeys) => `${basePath}/${key}-${date}-${metadata.l2BlockHash}.db`);
 
   const dataUrls = fromEntries(
     await Promise.all(
       getEntries(localPaths).map(
         async ([key, path]) =>
-          [key, await store.upload(targetPathFor(key), path, { compress: true, public: true })] as const,
+          [key, await store.upload(targetPathFor(key), path, { compress: true, public: !opts.private })] as const,
       ),
     ),
   );
 
-  const snapshotsIndex = (await getSnapshotIndex(metadata, store)) ?? createEmptyIndex(metadata);
-
-  const newSnapshotMetadata: SnapshotMetadata = {
+  return {
     ...pick(metadata, 'l1BlockNumber', 'l2BlockHash', 'l2BlockNumber'),
     schemaVersions,
     timestamp,
     dataUrls,
   };
+}
+
+export async function uploadSnapshotToIndex(
+  localPaths: Record<SnapshotDataKeys, string>,
+  schemaVersions: SnapshotMetadata['schemaVersions'],
+  metadata: UploadSnapshotMetadata,
+  store: FileStore,
+): Promise<SnapshotMetadata> {
+  const newSnapshotMetadata = await uploadSnapshotData(localPaths, schemaVersions, metadata, store);
+  const snapshotsIndex = (await getSnapshotIndex(metadata, store)) ?? createEmptyIndex(metadata);
   snapshotsIndex.snapshots.unshift(newSnapshotMetadata);
 
   await store.save(getSnapshotIndexPath(metadata), Buffer.from(jsonStringify(snapshotsIndex, true)), {

package/src/tests/factories.ts

@@ -713,10 +713,8 @@ export function makeBlockRootOrBlockMergeRollupPublicInputs(
   return new BlockRootOrBlockMergePublicInputs(
     makeAppendOnlyTreeSnapshot(seed + 0x200),
     makeAppendOnlyTreeSnapshot(seed + 0x300),
-    fr(seed + 0x400),
-    fr(seed + 0x500),
-    globalVariables ?? makeGlobalVariables(seed + 0x501),
-    globalVariables ?? makeGlobalVariables(seed + 0x502),
+    globalVariables ?? makeGlobalVariables(seed + 0x400),
+    globalVariables ?? makeGlobalVariables(seed + 0x500),
     fr(seed + 0x600),
     makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x700),
     fr(seed + 0x800),
@@ -786,8 +784,9 @@ function makeBlockRootRollupData(seed = 0) {
     makeRootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH>(NESTED_RECURSIVE_PROOF_LENGTH, seed + 0x2000),
     makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, fr, 0x2100),
     makeTuple(ARCHIVE_HEIGHT, fr, 0x2200),
-    makeHeader(seed + 0x2300),
-    fr(seed + 0x2400),
+    makeTuple(ARCHIVE_HEIGHT, fr, 0x2300),
+    makeHeader(seed + 0x2400),
+    fr(seed + 0x2500),
   );
 }
 
@@ -880,18 +879,16 @@ export function makeRootParityInputs(seed = 0): RootParityInputs {
  */
 export function makeRootRollupPublicInputs(seed = 0): RootRollupPublicInputs {
   return new RootRollupPublicInputs(
+    makeAppendOnlyTreeSnapshot(seed + 0x100),
     makeAppendOnlyTreeSnapshot(seed + 0x200),
-    makeAppendOnlyTreeSnapshot(seed + 0x300),
+    fr(seed + 0x300),
     fr(seed + 0x400),
     fr(seed + 0x500),
-    fr(seed + 0x600),
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x600),
     fr(seed + 0x700),
-    fr(seed + 0x800),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeFeeRecipient(seed), 0x900),
-    fr(seed + 0x100),
-    fr(seed + 0x101),
-    fr(seed + 0x200),
-    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x300),
+    fr(seed + 0x701),
+    fr(seed + 0x702),
+    makeTuple(AZTEC_MAX_EPOCH_DURATION, () => makeBlockBlobPublicInputs(seed), 0x800),
   );
 }
 

package/src/tests/mocks.ts

@@ -221,7 +221,7 @@ export interface MakeConsensusPayloadOptions {
   txHashes?: TxHash[];
 }
 
-const makeAndSignConsensusPayload = async (
+const makeAndSignConsensusPayload = (
   domainSeparator: SignatureDomainSeparator,
   options?: MakeConsensusPayloadOptions,
 ) => {
@@ -238,19 +238,19 @@ const makeAndSignConsensusPayload = async (
     txHashes,
   });
 
-  const hash = await getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
+  const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
   const signature = signer.sign(hash);
 
   return { payload, signature };
 };
 
-export const makeBlockProposal = async (options?: MakeConsensusPayloadOptions): Promise<BlockProposal> => {
-  const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
+export const makeBlockProposal = (options?: MakeConsensusPayloadOptions): BlockProposal => {
+  const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
   return new BlockProposal(payload, signature);
 };
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
-export const makeBlockAttestation = async (options?: MakeConsensusPayloadOptions): Promise<BlockAttestation> => {
-  const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
+export const makeBlockAttestation = (options?: MakeConsensusPayloadOptions): BlockAttestation => {
+  const { payload, signature } = makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
   return new BlockAttestation(payload, signature);
 };

package/src/tx/block_header.ts

@@ -64,6 +64,10 @@ export class BlockHeader {
     return this.globalVariables.slotNumber.toBigInt();
   }
 
+  getBlockNumber() {
+    return this.globalVariables.blockNumber.toNumber();
+  }
+
   getSize() {
     return (
       this.lastArchive.getSize() +

package/src/tx/profiled_tx.ts

@@ -21,6 +21,7 @@ export class TxProfileResult {
         functionName: 'random',
         bytecode: Buffer.from('random'),
         witness: new Map([[1, 'random']]),
+        vk: Buffer.from('random'),
       },
     ]);
   }

package/src/tx/tx.ts

@@ -15,7 +15,7 @@ import type { ScopedLogHash } from '../kernel/log_hash.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
-import { TopicType, createTopicString } from '../p2p/topic_type.js';
+import { TopicType } from '../p2p/topic_type.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import type { TxStats } from '../stats/stats.js';
 import { HashedValues } from './hashed_values.js';
@@ -26,7 +26,7 @@ import { TxHash } from './tx_hash.js';
  * The interface of an L2 transaction.
  */
 export class Tx extends Gossipable {
-  static override p2pTopic: string;
+  static override p2pTopic = TopicType.tx;
   // For memoization
   private txHash: TxHash | undefined;
   private calldataMap: Map<string, Fr[]> | undefined;
@@ -53,11 +53,6 @@ export class Tx extends Gossipable {
     super();
   }
 
-  // Gossipable method
-  static {
-    this.p2pTopic = createTopicString(TopicType.tx);
-  }
-
   // Gossipable method
   override async p2pMessageIdentifier(): Promise<Buffer32> {
     return new Buffer32((await this.getTxHash()).toBuffer());