@aztec/stdlib 0.87.2 → 0.87.3-nightly.20250529

package/src/tx/profiling.ts

@@ -10,9 +10,14 @@ import { AbiDecodedSchema } from '../schemas/schemas.js';
 type FunctionTiming = {
   functionName: string;
   time: number;
+  oracles?: Record<string, { times: number[] }>;
 };
 
-const FunctionTimingSchema = z.object({ functionName: z.string(), time: z.number() });
+const FunctionTimingSchema = z.object({
+  functionName: z.string(),
+  time: z.number(),
+  oracles: optional(z.record(z.string(), z.object({ times: z.array(z.number()) }))),
+});
 
 export type ProvingTimings = {
   sync?: number;

package/src/tx/proven_tx.ts

@@ -6,7 +6,7 @@ import { z } from 'zod';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import { PrivateExecutionResult, collectSortedContractClassLogs } from './private_execution_result.js';
-import { type ProvingTimings, SimulationTimingsSchema } from './profiling.js';
+import { type ProvingTimings, ProvingTimingsSchema } from './profiling.js';
 import { Tx } from './tx.js';
 
 export class TxProvingResult {
@@ -35,7 +35,7 @@ export class TxProvingResult {
         privateExecutionResult: PrivateExecutionResult.schema,
         publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
         clientIvcProof: ClientIvcProof.schema,
-        timings: optional(SimulationTimingsSchema),
+        timings: optional(ProvingTimingsSchema),
       })
       .transform(TxProvingResult.from);
   }

package/src/tx/tx.ts

@@ -11,7 +11,6 @@ import type { GasSettings } from '../gas/gas_settings.js';
 import type { GetPublicLogsResponse } from '../interfaces/get_logs_response.js';
 import type { L2LogsSource } from '../interfaces/l2_logs_source.js';
 import type { PublicCallRequest } from '../kernel/index.js';
-import type { ScopedLogHash } from '../kernel/log_hash.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
@@ -42,9 +41,11 @@ export class Tx extends Gossipable {
      */
     public readonly clientIvcProof: ClientIvcProof,
     /**
-     * Contract class logs generated by the tx.
+     * Contract class log fields emitted from the tx.
+     * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
+     * It's checked in data_validator.ts
      */
-    public contractClassLogs: ContractClassLogFields[],
+    public contractClassLogFields: ContractClassLogFields[],
     /**
      * An array of calldata for the enqueued public function calls and the teardown function call.
      */
@@ -120,7 +121,7 @@ export class Tx extends Gossipable {
     return serializeToBuffer([
       this.data,
       this.clientIvcProof,
-      serializeArrayOfBufferableToVector(this.contractClassLogs, 1),
+      serializeArrayOfBufferableToVector(this.contractClassLogFields, 1),
       serializeArrayOfBufferableToVector(this.publicFunctionCalldata, 1),
     ]);
   }
@@ -130,14 +131,14 @@ export class Tx extends Gossipable {
       .object({
         data: PrivateKernelTailCircuitPublicInputs.schema,
         clientIvcProof: ClientIvcProof.schema,
-        contractClassLogs: z.array(ContractClassLogFields.schema),
+        contractClassLogFields: z.array(ContractClassLogFields.schema),
         publicFunctionCalldata: z.array(HashedValues.schema),
       })
       .transform(Tx.from);
   }
 
   static from(fields: FieldsOf<Tx>) {
-    return new Tx(fields.data, fields.clientIvcProof, fields.contractClassLogs, fields.publicFunctionCalldata);
+    return new Tx(fields.data, fields.clientIvcProof, fields.contractClassLogFields, fields.publicFunctionCalldata);
   }
 
   /**
@@ -149,43 +150,32 @@ export class Tx extends Gossipable {
     return logsSource.getPublicLogs({ txHash: await this.getTxHash() });
   }
 
+  getContractClassLogs(): ContractClassLog[] {
+    const logHashes = this.data.getNonEmptyContractClassLogsHashes();
+    return logHashes.map((logHash, i) =>
+      ContractClassLog.from({
+        contractAddress: logHash.contractAddress,
+        fields: this.contractClassLogFields[i],
+        emittedLength: logHash.logHash.length,
+      }),
+    );
+  }
+
   /**
    * Gets either revertible or non revertible contract class logs emitted by this tx.
    * @param revertible - true for revertible only logs, false for non reverible only logs.
    * @returns The requested logs.
    */
-  async getSplitContractClassLogs(revertible: boolean, silo: boolean = false): Promise<ContractClassLog[]> {
-    // Should only be called on txs with public calls
+  getSplitContractClassLogs(revertible: boolean): ContractClassLog[] {
     if (!this.data.forPublic) {
-      return [];
+      throw new Error('`getSplitContractClassLogs` should only be called on txs with public calls');
     }
-    const contractClassLogsHashes = revertible
-      ? this.data.forPublic.revertibleAccumulatedData.contractClassLogsHashes.filter(h => !h.isEmpty())
-      : this.data.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes.filter(h => !h.isEmpty());
-    return await this.filterContractClassLogs(contractClassLogsHashes, silo);
-  }
 
-  /**
-   * Filters contract class logs emitted by this tx.
-   * @param logHashes - logs to keep represented by their hashes.
-   * @param silo - whether to silo the logs before returning them.
-   * @returns The requested logs.
-   */
-  async filterContractClassLogs(logHashes: ScopedLogHash[], silo: boolean = false): Promise<ContractClassLog[]> {
-    const contractClassLogs = [];
-    for (const fields of this.contractClassLogs) {
-      const hashedLog = await fields.hash();
-      const logHash = logHashes.find(hash => hash.value.equals(hashedLog));
-      if (logHash) {
-        const log = ContractClassLog.from({
-          contractAddress: logHash.contractAddress,
-          fields,
-          emittedLength: logHash.logHash.length,
-        });
-        contractClassLogs.push(silo ? await log.silo() : log);
-      }
-    }
-    return contractClassLogs;
+    const contractClassLogs = this.getContractClassLogs();
+    const numNonRevertible = this.data.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes.filter(
+      h => !h.isEmpty(),
+    ).length;
+    return revertible ? contractClassLogs.slice(numNonRevertible) : contractClassLogs.slice(0, numNonRevertible);
   }
 
   /**
@@ -246,7 +236,7 @@ export class Tx extends Gossipable {
     return (
       this.data.getSize() +
       this.clientIvcProof.clientIvcProofBuffer.length +
-      arraySerializedSizeOfNonEmpty(this.contractClassLogs) +
+      arraySerializedSizeOfNonEmpty(this.contractClassLogFields) +
       this.publicFunctionCalldata.reduce((accum, cd) => accum + cd.getSize(), 0)
     );
   }
@@ -290,9 +280,9 @@ export class Tx extends Gossipable {
   static clone(tx: Tx): Tx {
     const publicInputs = PrivateKernelTailCircuitPublicInputs.fromBuffer(tx.data.toBuffer());
     const clientIvcProof = ClientIvcProof.fromBuffer(tx.clientIvcProof.toBuffer());
-    const contractClassLogs = tx.contractClassLogs.map(p => p.clone());
+    const contractClassLogFields = tx.contractClassLogFields.map(p => p.clone());
     const publicFunctionCalldata = tx.publicFunctionCalldata.map(cd => HashedValues.fromBuffer(cd.toBuffer()));
-    const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogs, publicFunctionCalldata);
+    const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogFields, publicFunctionCalldata);
     if (tx.txHash) {
       clonedTx.setTxHash(TxHash.fromBuffer(tx.txHash.toBuffer()));
     }
@@ -314,22 +304,6 @@ export class Tx extends Gossipable {
     );
   }
 
-  /**
-   * Filters out logs from functions that are not present in the provided kernel output.
-   *
-   * The purpose of this is to remove logs that got dropped due to a revert,
-   * in which case, we only have the kernel's hashes to go on, as opposed to
-   * this grouping by function maintained in this class.
-   *
-   * The logic therefore is to drop all FunctionLogs if any constituent hash
-   * does not appear in the provided hashes: it is impossible for part of a
-   * function to revert.
-   */
-  // TODO: don't modify the tx object directly. The preimages should match the log hashes. When did the log hashes change?
-  public async filterRevertedLogs() {
-    this.contractClassLogs = (await this.getSplitContractClassLogs(false)).map(log => log.fields);
-  }
-
   #combinePublicCallRequestWithCallData(request: PublicCallRequest) {
     const calldataMap = this.getCalldataMap();
     // Assume empty calldata if nothing is given for the hash.

package/src/tx/tx_effect.ts

@@ -232,15 +232,33 @@ export class TxEffect {
     return thisLayer[0];
   }
 
-  static async random(numPublicCallsPerTx = 3, numPublicLogsPerCall = 1): Promise<TxEffect> {
+  static async random(
+    numPublicCallsPerTx = 3,
+    numPublicLogsPerCall = 1,
+    maxEffects: number | undefined = undefined,
+  ): Promise<TxEffect> {
     return new TxEffect(
       RevertCode.random(),
       TxHash.random(),
       new Fr(Math.floor(Math.random() * 100_000)),
-      makeTuple(MAX_NOTE_HASHES_PER_TX, Fr.random),
-      makeTuple(MAX_NULLIFIERS_PER_TX, Fr.random),
-      makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, Fr.random),
-      makeTuple(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataWrite.random),
+      makeTuple(
+        maxEffects === undefined ? MAX_NOTE_HASHES_PER_TX : Math.min(maxEffects, MAX_NOTE_HASHES_PER_TX),
+        Fr.random,
+      ),
+      makeTuple(
+        maxEffects === undefined ? MAX_NULLIFIERS_PER_TX : Math.min(maxEffects, MAX_NULLIFIERS_PER_TX),
+        Fr.random,
+      ),
+      makeTuple(
+        maxEffects === undefined ? MAX_L2_TO_L1_MSGS_PER_TX : Math.min(maxEffects, MAX_L2_TO_L1_MSGS_PER_TX),
+        Fr.random,
+      ),
+      makeTuple(
+        maxEffects === undefined
+          ? MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+          : Math.min(maxEffects, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
+        PublicDataWrite.random,
+      ),
       makeTuple(MAX_PRIVATE_LOGS_PER_TX, () => PrivateLog.random()),
       await makeTupleAsync(numPublicCallsPerTx * numPublicLogsPerCall, async () => await PublicLog.random()),
       await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random),

package/src/validators/types.ts

@@ -35,3 +35,5 @@ export type ValidatorsStats = {
   initialSlot?: bigint;
   slotWindow: number;
 };
+
+export type ValidatorsEpochPerformance = Record<`0x${string}`, { missed: number; total: number }>;

package/src/vks/index.ts

@@ -1,2 +1,2 @@
 export * from './verification_key.js';
-export * from './vk_witness_data.js';
+export * from './vk_data.js';

package/src/vks/{vk_witness_data.ts → vk_data.ts}

@@ -7,26 +7,26 @@ import { bufferToHex } from '@aztec/foundation/string';
 import type { UInt32 } from '../types/shared.js';
 import { VerificationKeyData } from './verification_key.js';
 
-export class VkWitnessData {
+export class VkData {
   constructor(
     public vk: VerificationKeyData,
     /**
      * Index of the vk in the vk tree.
      */
-    public vkIndex: UInt32,
+    public leafIndex: UInt32,
     /**
      * Sibling path of the vk in the vk tree.
      */
-    public vkPath: Tuple<Fr, typeof VK_TREE_HEIGHT>,
+    public siblingPath: Tuple<Fr, typeof VK_TREE_HEIGHT>,
   ) {}
 
   static empty() {
-    return new VkWitnessData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
+    return new VkData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new VkWitnessData(
+    return new VkData(
       reader.readObject(VerificationKeyData),
       reader.readNumber(),
       reader.readArray(VK_TREE_HEIGHT, Fr),
@@ -34,7 +34,7 @@ export class VkWitnessData {
   }
 
   toBuffer() {
-    return serializeToBuffer(this.vk, this.vkIndex, this.vkPath);
+    return serializeToBuffer(this.vk, this.leafIndex, this.siblingPath);
   }
 
   toString() {

package/dest/vks/vk_witness_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vk_witness_data.d.ts","sourceRoot":"","sources":["../../src/vks/vk_witness_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,aAAa;IAEf,EAAE,EAAE,mBAAmB;IAC9B;;OAEG;IACI,OAAO,EAAE,MAAM;IACtB;;OAEG;IACI,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;gBARxC,EAAE,EAAE,mBAAmB;IAC9B;;OAEG;IACI,OAAO,EAAE,MAAM;IACtB;;OAEG;IACI,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGjD,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,QAAQ;CAGT"}