@aztec/stdlib 0.81.0 → 0.82.0

package/src/proofs/client_ivc_proof.ts

@@ -3,7 +3,6 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 const CLIENT_IVC_PROOF_LENGTH = 172052;
-const CLIENT_IVC_VK_LENGTH = 2730;
 
 /**
  * TODO(https://github.com/AztecProtocol/aztec-packages/issues/7370) refactor this to
@@ -15,7 +14,6 @@ export class ClientIvcProof {
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7370): Need to precompute private kernel tail VK so we can verify this immediately in the tx pool
     // which parts of these are needed to quickly verify that we have a correct IVC proof
     public clientIvcProofBuffer: Buffer,
-    public clientIvcVkBuffer: Buffer,
   ) {}
 
   public isEmpty() {
@@ -23,18 +21,15 @@ export class ClientIvcProof {
   }
 
   static empty() {
-    return new ClientIvcProof(Buffer.from(''), Buffer.from(''));
+    return new ClientIvcProof(Buffer.from(''));
   }
 
   static fake(fill = Math.floor(Math.random() * 255)) {
-    return new ClientIvcProof(Buffer.alloc(1, fill), Buffer.alloc(1, fill));
+    return new ClientIvcProof(Buffer.alloc(1, fill));
   }
 
   static random() {
-    return new ClientIvcProof(
-      Buffer.from(randomBytes(CLIENT_IVC_PROOF_LENGTH)),
-      Buffer.from(randomBytes(CLIENT_IVC_VK_LENGTH)),
-    );
+    return new ClientIvcProof(Buffer.from(randomBytes(CLIENT_IVC_PROOF_LENGTH)));
   }
 
   static get schema() {
@@ -47,15 +42,10 @@ export class ClientIvcProof {
 
   static fromBuffer(buffer: Buffer | BufferReader): ClientIvcProof {
     const reader = BufferReader.asReader(buffer);
-    return new ClientIvcProof(reader.readBuffer(), reader.readBuffer());
+    return new ClientIvcProof(reader.readBuffer());
   }
 
   public toBuffer() {
-    return serializeToBuffer(
-      this.clientIvcProofBuffer.length,
-      this.clientIvcProofBuffer,
-      this.clientIvcVkBuffer.length,
-      this.clientIvcVkBuffer,
-    );
+    return serializeToBuffer(this.clientIvcProofBuffer.length, this.clientIvcProofBuffer);
   }
 }

package/src/rollup/tube_inputs.ts

@@ -5,15 +5,19 @@ import type { FieldsOf } from '@aztec/foundation/types';
 
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 
+/**
+ * Inputs for the tube circuit, which turns a client IVC proof folding stack into an ultrahonk proof.
+ * 'usePublicTailVk' signifies if we should prove this with the public or private kernel tail client IVC VKs.
+ */
 export class TubeInputs {
-  constructor(public clientIVCData: ClientIvcProof) {}
+  constructor(public usePublicTailVk: boolean, public clientIVCData: ClientIvcProof) {}
 
   static from(fields: FieldsOf<TubeInputs>): TubeInputs {
     return new TubeInputs(...TubeInputs.getFields(fields));
   }
 
   static getFields(fields: FieldsOf<TubeInputs>) {
-    return [fields.clientIVCData] as const;
+    return [fields.usePublicTailVk, fields.clientIVCData] as const;
   }
 
   /**
@@ -39,7 +43,7 @@ export class TubeInputs {
    */
   static fromBuffer(buffer: Buffer | BufferReader): TubeInputs {
     const reader = BufferReader.asReader(buffer);
-    return new TubeInputs(reader.readObject(ClientIvcProof));
+    return new TubeInputs(reader.readBoolean(), reader.readObject(ClientIvcProof));
   }
 
   isEmpty(): boolean {
@@ -55,7 +59,7 @@ export class TubeInputs {
   }
 
   static empty() {
-    return new TubeInputs(ClientIvcProof.empty());
+    return new TubeInputs(false, ClientIvcProof.empty());
   }
 
   /** Returns a hex representation for JSON serialization. */

package/src/trees/nullifier_membership_witness.ts

@@ -56,4 +56,16 @@ export class NullifierMembershipWitness {
   public toFields(): Fr[] {
     return [new Fr(this.index), ...this.leafPreimage.toFields(), ...this.siblingPath.toFields()];
   }
+
+  /**
+   * Returns a representation of the nullifier membership witness as expected by intrinsic Noir deserialization.
+   */
+  public toNoirRepresentation(): (string | string[])[] {
+    // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+    return [
+      new Fr(this.index).toString() as string,
+      ...(this.leafPreimage.toFields().map(fr => fr.toString()) as string[]),
+      this.siblingPath.toFields().map(fr => fr.toString()) as string[],
+    ];
+  }
 }

package/src/trees/public_data_witness.ts

@@ -58,6 +58,21 @@ export class PublicDataWitness {
     ];
   }
 
+  /**
+   * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
+   */
+  public toNoirRepresentation(): (string | string[])[] {
+    // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+    return [
+      new Fr(this.index).toString() as string,
+      new Fr(this.leafPreimage.slot).toString() as string,
+      new Fr(this.leafPreimage.value).toString() as string,
+      new Fr(this.leafPreimage.nextSlot).toString() as string,
+      new Fr(this.leafPreimage.nextIndex).toString() as string,
+      this.siblingPath.toFields().map(fr => fr.toString()) as string[],
+    ];
+  }
+
   toBuffer(): Buffer {
     return serializeToBuffer([this.index, this.leafPreimage, this.siblingPath]);
   }

package/src/tx/index.ts

@@ -16,6 +16,8 @@ export * from './tx_hash.js';
 export * from './tx_receipt.js';
 export * from './tx.js';
 export * from './processed_tx.js';
+export * from './proven_tx.js';
+export * from './profiled_tx.js';
 export * from './simulated_tx.js';
 export * from './tx_effect.js';
 export * from './public_simulation_output.js';

package/src/tx/private_execution_result.ts

@@ -115,6 +115,13 @@ export class PrivateExecutionResult {
   static async random(nested = 1): Promise<PrivateExecutionResult> {
     return new PrivateExecutionResult(await PrivateCallExecutionResult.random(nested), Fr.random());
   }
+
+  /**
+   * The block number that this execution was simulated with.
+   */
+  getSimulationBlockNumber(): number {
+    return this.entrypoint.publicInputs.historicalHeader.globalVariables.blockNumber.toNumber();
+  }
 }
 
 /**

package/src/tx/profiled_tx.ts

@@ -0,0 +1,27 @@
+import type { ZodFor } from '@aztec/foundation/schemas';
+
+import { z } from 'zod';
+
+import { type PrivateExecutionStep, PrivateExecutionStepSchema } from '../kernel/private_kernel_prover_output.js';
+
+export class TxProfileResult {
+  constructor(public executionSteps: PrivateExecutionStep[]) {}
+
+  static get schema(): ZodFor<TxProfileResult> {
+    return z
+      .object({
+        executionSteps: z.array(PrivateExecutionStepSchema),
+      })
+      .transform(({ executionSteps }) => new TxProfileResult(executionSteps));
+  }
+
+  static random(): TxProfileResult {
+    return new TxProfileResult([
+      {
+        functionName: 'random',
+        bytecode: Buffer.from('random'),
+        witness: new Map([[1, 'random']]),
+      },
+    ]);
+  }
+}

package/src/tx/proven_tx.ts

@@ -0,0 +1,58 @@
+import type { FieldsOf } from '@aztec/foundation/types';
+
+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,
+  collectEnqueuedPublicFunctionCalls,
+  collectPublicTeardownFunctionCall,
+  collectSortedContractClassLogs,
+} from './private_execution_result.js';
+import { Tx } from './tx.js';
+
+export class TxProvingResult {
+  constructor(
+    public privateExecutionResult: PrivateExecutionResult,
+    public publicInputs: PrivateKernelTailCircuitPublicInputs,
+    public clientIvcProof: ClientIvcProof,
+  ) {}
+
+  toTx(): Tx {
+    const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
+    const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(this.privateExecutionResult);
+    const teardownPublicFunction = collectPublicTeardownFunctionCall(this.privateExecutionResult);
+
+    const tx = new Tx(
+      this.publicInputs,
+      this.clientIvcProof,
+      contractClassLogs,
+      enqueuedPublicFunctions,
+      teardownPublicFunction,
+    );
+    return tx;
+  }
+
+  static get schema() {
+    return z
+      .object({
+        privateExecutionResult: PrivateExecutionResult.schema,
+        publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
+        clientIvcProof: ClientIvcProof.schema,
+      })
+      .transform(TxProvingResult.from);
+  }
+
+  static from(fields: FieldsOf<TxProvingResult>) {
+    return new TxProvingResult(fields.privateExecutionResult, fields.publicInputs, fields.clientIvcProof);
+  }
+
+  static async random() {
+    return new TxProvingResult(
+      await PrivateExecutionResult.random(),
+      PrivateKernelTailCircuitPublicInputs.empty(),
+      ClientIvcProof.empty(),
+    );
+  }
+}

package/src/tx/simulated_tx.ts

@@ -5,10 +5,6 @@ import { z } from 'zod';
 
 import { Gas } from '../gas/gas.js';
 import type { GasUsed } from '../gas/gas_used.js';
-import {
-  type PrivateKernelProverProfileResult,
-  PrivateKernelProverProfileResultSchema,
-} from '../kernel/private_kernel_prover_profile_result.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import {
@@ -47,15 +43,12 @@ export class PrivateSimulationResult {
   }
 }
 
-export class TxSimulationResult extends PrivateSimulationResult {
+export class TxSimulationResult {
   constructor(
-    privateExecutionResult: PrivateExecutionResult,
-    publicInputs: PrivateKernelTailCircuitPublicInputs,
+    public privateExecutionResult: PrivateExecutionResult,
+    public publicInputs: PrivateKernelTailCircuitPublicInputs,
     public publicOutput?: PublicSimulationOutput,
-    public profileResult?: PrivateKernelProverProfileResult,
-  ) {
-    super(privateExecutionResult, publicInputs);
-  }
+  ) {}
 
   get gasUsed(): GasUsed {
     return (
@@ -74,34 +67,22 @@ export class TxSimulationResult extends PrivateSimulationResult {
         privateExecutionResult: PrivateExecutionResult.schema,
         publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
         publicOutput: PublicSimulationOutput.schema.optional(),
-        profileResult: PrivateKernelProverProfileResultSchema.optional(),
       })
       .transform(TxSimulationResult.from);
   }
 
   static from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed'>) {
-    return new TxSimulationResult(
-      fields.privateExecutionResult,
-      fields.publicInputs,
-      fields.publicOutput,
-      fields.profileResult,
-    );
-  }
-
-  getPublicReturnValues() {
-    return this.publicOutput ? this.publicOutput.publicReturnValues : [];
+    return new TxSimulationResult(fields.privateExecutionResult, fields.publicInputs, fields.publicOutput);
   }
 
   static fromPrivateSimulationResultAndPublicOutput(
     privateSimulationResult: PrivateSimulationResult,
     publicOutput?: PublicSimulationOutput,
-    profileResult?: PrivateKernelProverProfileResult,
   ) {
     return new TxSimulationResult(
       privateSimulationResult.privateExecutionResult,
       privateSimulationResult.publicInputs,
       publicOutput,
-      profileResult,
     );
   }
 
@@ -112,50 +93,17 @@ export class TxSimulationResult extends PrivateSimulationResult {
       await PublicSimulationOutput.random(),
     );
   }
-}
-
-export class TxProvingResult {
-  constructor(
-    public privateExecutionResult: PrivateExecutionResult,
-    public publicInputs: PrivateKernelTailCircuitPublicInputs,
-    public clientIvcProof: ClientIvcProof,
-  ) {}
 
-  toTx(): Tx {
-    const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
-    const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(this.privateExecutionResult);
-    const teardownPublicFunction = collectPublicTeardownFunctionCall(this.privateExecutionResult);
-
-    const tx = new Tx(
-      this.publicInputs,
-      this.clientIvcProof,
-      contractClassLogs,
-      enqueuedPublicFunctions,
-      teardownPublicFunction,
-    );
-    return tx;
-  }
-
-  static get schema() {
-    return z
-      .object({
-        privateExecutionResult: PrivateExecutionResult.schema,
-        publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
-        clientIvcProof: ClientIvcProof.schema,
-      })
-      .transform(TxProvingResult.from);
+  getPrivateReturnValues() {
+    return new PrivateSimulationResult(this.privateExecutionResult, this.publicInputs).getPrivateReturnValues();
   }
 
-  static from(fields: FieldsOf<TxProvingResult>) {
-    return new TxProvingResult(fields.privateExecutionResult, fields.publicInputs, fields.clientIvcProof);
+  toSimulatedTx(): Tx {
+    return new PrivateSimulationResult(this.privateExecutionResult, this.publicInputs).toSimulatedTx();
   }
 
-  static async random() {
-    return new TxProvingResult(
-      await PrivateExecutionResult.random(),
-      PrivateKernelTailCircuitPublicInputs.empty(),
-      ClientIvcProof.empty(),
-    );
+  getPublicReturnValues() {
+    return this.publicOutput ? this.publicOutput.publicReturnValues : [];
   }
 }
 

package/src/tx/tx_receipt.ts

@@ -1,9 +1,7 @@
-import type { Fr } from '@aztec/foundation/fields';
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
-import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { L2BlockHash } from '../block/block_hash.js';
 import { type ZodFor, schemas } from '../schemas/schemas.js';
@@ -41,8 +39,6 @@ export class TxReceipt {
     public blockHash?: L2BlockHash,
     /** The block number in which the transaction was included. */
     public blockNumber?: number,
-    /** Information useful for testing/debugging, set when test flag is set to true in `waitOpts`. */
-    public debugInfo?: DebugInfo,
   ) {}
 
   static empty() {
@@ -58,7 +54,6 @@ export class TxReceipt {
         blockHash: L2BlockHash.schema.optional(),
         blockNumber: z.number().int().nonnegative().optional(),
         transactionFee: schemas.BigInt.optional(),
-        debugInfo: DebugInfoSchema.optional(),
       })
       .transform(TxReceipt.from);
   }
@@ -71,7 +66,6 @@ export class TxReceipt {
       fields.transactionFee,
       fields.blockHash,
       fields.blockNumber,
-      fields.debugInfo,
     );
   }
 
@@ -89,33 +83,3 @@ export class TxReceipt {
     }
   }
 }
-
-/**
- * Information useful for debugging/testing purposes included in the receipt when the debug flag is set to true
- * in `WaitOpts`.
- */
-interface DebugInfo {
-  /**
-   * New note hashes created by the transaction.
-   */
-  noteHashes: Fr[];
-  /**
-   * New nullifiers created by the transaction.
-   */
-  nullifiers: Fr[];
-  /**
-   * New public data writes created by the transaction.
-   */
-  publicDataWrites: PublicDataWrite[];
-  /**
-   * New L2 to L1 messages created by the transaction.
-   */
-  l2ToL1Msgs: Fr[];
-}
-
-const DebugInfoSchema = z.object({
-  noteHashes: z.array(schemas.Fr),
-  nullifiers: z.array(schemas.Fr),
-  publicDataWrites: z.array(PublicDataWrite.schema),
-  l2ToL1Msgs: z.array(schemas.Fr),
-});

package/dest/block/nullifier_with_block_source.d.ts

@@ -1,6 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { InBlock } from './in_block.js';
-export interface NullifierWithBlockSource {
-    findNullifiersIndexesWithBlock(blockNumber: number, nullifiers: Fr[]): Promise<(InBlock<bigint> | undefined)[]>;
-}
-//# sourceMappingURL=nullifier_with_block_source.d.ts.map

package/dest/block/nullifier_with_block_source.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nullifier_with_block_source.d.ts","sourceRoot":"","sources":["../../src/block/nullifier_with_block_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,WAAW,wBAAwB;IACvC,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CACjH"}

package/dest/block/nullifier_with_block_source.js

@@ -1 +0,0 @@
-export { };

package/dest/kernel/private_kernel_prover_profile_result.d.ts

@@ -1,25 +0,0 @@
-import { z } from 'zod';
-export declare const PrivateKernelProverProfileResultSchema: z.ZodObject<{
-    gateCounts: z.ZodArray<z.ZodObject<{
-        circuitName: z.ZodString;
-        gateCount: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        circuitName: string;
-        gateCount: number;
-    }, {
-        circuitName: string;
-        gateCount: number;
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
-    gateCounts: {
-        circuitName: string;
-        gateCount: number;
-    }[];
-}, {
-    gateCounts: {
-        circuitName: string;
-        gateCount: number;
-    }[];
-}>;
-export type PrivateKernelProverProfileResult = z.infer<typeof PrivateKernelProverProfileResultSchema>;
-//# sourceMappingURL=private_kernel_prover_profile_result.d.ts.map

package/dest/kernel/private_kernel_prover_profile_result.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"private_kernel_prover_profile_result.d.ts","sourceRoot":"","sources":["../../src/kernel/private_kernel_prover_profile_result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,sCAAsC;;;;;;;;;;;;;;;;;;;;;EAEjD,CAAC;AAEH,MAAM,MAAM,gCAAgC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sCAAsC,CAAC,CAAC"}

package/dest/kernel/private_kernel_prover_profile_result.js

@@ -1,7 +0,0 @@
-import { z } from 'zod';
-export const PrivateKernelProverProfileResultSchema = z.object({
-    gateCounts: z.array(z.object({
-        circuitName: z.string(),
-        gateCount: z.number()
-    }))
-});

package/src/block/nullifier_with_block_source.ts

@@ -1,7 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-
-import type { InBlock } from './in_block.js';
-
-export interface NullifierWithBlockSource {
-  findNullifiersIndexesWithBlock(blockNumber: number, nullifiers: Fr[]): Promise<(InBlock<bigint> | undefined)[]>;
-}

package/src/kernel/private_kernel_prover_profile_result.ts

@@ -1,7 +0,0 @@
-import { z } from 'zod';
-
-export const PrivateKernelProverProfileResultSchema = z.object({
-  gateCounts: z.array(z.object({ circuitName: z.string(), gateCount: z.number() })),
-});
-
-export type PrivateKernelProverProfileResult = z.infer<typeof PrivateKernelProverProfileResultSchema>;