@aztec/stdlib 4.0.0-nightly.20260108 → 4.0.0-nightly.20260111

package/src/tests/mocks.ts

@@ -6,7 +6,7 @@ import {
   MAX_NULLIFIERS_PER_TX,
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
 } from '@aztec/constants';
-import { makeTuple } from '@aztec/foundation/array';
+import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
 import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { padArrayEnd, times } from '@aztec/foundation/collection';
@@ -16,6 +16,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { ContractArtifact } from '../abi/abi.js';
 import { PublicTxEffect } from '../avm/avm.js';
+import type { AvmAccumulatedData } from '../avm/avm_accumulated_data.js';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
@@ -202,6 +203,7 @@ export async function mockProcessedTx({
   // The default gasUsed is the tx overhead.
   gasUsed = Gas.from({ daGas: FIXED_DA_GAS, l2Gas: FIXED_L2_GAS }),
   privateOnly = false,
+  avmAccumulatedData,
   ...mockTxOpts
 }: {
   seed?: number;
@@ -213,6 +215,7 @@ export async function mockProcessedTx({
   protocolContracts?: ProtocolContracts;
   feePaymentPublicDataWrite?: PublicDataWrite;
   privateOnly?: boolean;
+  avmAccumulatedData?: Partial<FieldsOf<AvmAccumulatedData>>;
 } & Parameters<typeof mockTx>[1] = {}) {
   seed *= 0x1000; // Avoid clashing with the previous mock values if seed only increases by 1.
   anchorBlockHeader ??= db?.getInitialHeader() ?? makeBlockHeader(seed);
@@ -292,19 +295,22 @@ export async function mockProcessedTx({
     avmOutput.previousRevertibleAccumulatedDataArrayLengths =
       avmOutput.previousRevertibleAccumulatedData.getArrayLengths();
     // Assign final data emitted from avm.
-    avmOutput.accumulatedData.noteHashes = revertibleData.noteHashes;
-    avmOutput.accumulatedData.nullifiers = padArrayEnd(
-      nonRevertibleData.nullifiers.concat(revertibleData.nullifiers).filter(n => !n.isEmpty()),
-      Fr.ZERO,
-      MAX_NULLIFIERS_PER_TX,
-    );
-    avmOutput.accumulatedData.l2ToL1Msgs = revertibleData.l2ToL1Msgs;
-    avmOutput.accumulatedData.publicDataWrites = makeTuple(
-      MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-      i => new PublicDataWrite(new Fr(i), new Fr(i + 10)),
-      seed + 0x2000,
-    );
-    avmOutput.accumulatedData.publicDataWrites[0] = feePaymentPublicDataWrite;
+    avmOutput.accumulatedData.noteHashes = avmAccumulatedData?.noteHashes ?? revertibleData.noteHashes;
+    avmOutput.accumulatedData.nullifiers =
+      avmAccumulatedData?.nullifiers ??
+      padArrayEnd(
+        nonRevertibleData.nullifiers.concat(revertibleData.nullifiers).filter(n => !n.isEmpty()),
+        Fr.ZERO,
+        MAX_NULLIFIERS_PER_TX,
+      );
+    avmOutput.accumulatedData.l2ToL1Msgs = avmAccumulatedData?.l2ToL1Msgs ?? revertibleData.l2ToL1Msgs;
+    avmOutput.accumulatedData.publicDataWrites =
+      avmAccumulatedData?.publicDataWrites ??
+      makeTuple(
+        MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+        i => (i === 0 ? feePaymentPublicDataWrite : new PublicDataWrite(new Fr(i), new Fr(i + 10))),
+        seed + 0x2000,
+      );
     avmOutput.accumulatedDataArrayLengths = avmOutput.accumulatedData.getArrayLengths();
     avmOutput.gasSettings = gasSettings;
     // Note: The fee is computed from the tx's gas used, which only includes the gas used in private. But this shouldn't

package/src/tx/index.ts

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

package/dest/tx/content_commitment.d.ts

@@ -1,49 +0,0 @@
-import type { ViemContentCommitment } from '@aztec/ethereum/contracts';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { z } from 'zod';
-export declare class ContentCommitment {
-    blobsHash: Fr;
-    inHash: Fr;
-    outHash: Fr;
-    constructor(blobsHash: Fr, inHash: Fr, outHash: Fr);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        blobsHash: z.ZodType<Fr, any, string>;
-        inHash: z.ZodType<Fr, any, string>;
-        outHash: z.ZodType<Fr, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        blobsHash: Fr;
-        inHash: Fr;
-        outHash: Fr;
-    }, {
-        blobsHash: string;
-        inHash: string;
-        outHash: string;
-    }>, ContentCommitment, {
-        blobsHash: string;
-        inHash: string;
-        outHash: string;
-    }>;
-    static getFields(fields: FieldsOf<ContentCommitment>): readonly [Fr, Fr, Fr];
-    static from(fields: FieldsOf<ContentCommitment>): ContentCommitment;
-    getSize(): number;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    static fromBuffer(buffer: Buffer | BufferReader): ContentCommitment;
-    toInspect(): {
-        blobsHash: `0x${string}`;
-        inHash: `0x${string}`;
-        outHash: `0x${string}`;
-    };
-    toViem(): ViemContentCommitment;
-    static fromViem(contentCommitment: ViemContentCommitment): ContentCommitment;
-    toFields(): Fr[];
-    static fromFields(fields: Fr[] | FieldReader): ContentCommitment;
-    static random(overrides?: Partial<FieldsOf<ContentCommitment>>): ContentCommitment;
-    static empty(): ContentCommitment;
-    isEmpty(): boolean;
-    toString(): string;
-    static fromString(str: string): ContentCommitment;
-    equals(other: this): boolean;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudF9jb21taXRtZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvY29udGVudF9jb21taXRtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUF3QyxNQUFNLDZCQUE2QixDQUFDO0FBRTlHLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIscUJBQWEsaUJBQWlCO0lBRW5CLFNBQVMsRUFBRSxFQUFFO0lBQ2IsTUFBTSxFQUFFLEVBQUU7SUFDVixPQUFPLEVBQUUsRUFBRTtJQUhwQixZQUNTLFNBQVMsRUFBRSxFQUFFLEVBQ2IsTUFBTSxFQUFFLEVBQUUsRUFDVixPQUFPLEVBQUUsRUFBRSxFQUNoQjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7O09BUWhCO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGlCQUFpQixDQUFDLHlCQUVuRDtJQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxxQkFFOUM7SUFFRCxPQUFPLFdBRU47SUFFRCxRQUFRLDRCQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxpQkFBaUIsQ0FJbEU7SUFFRCxTQUFTOzs7O01BTVI7SUFFRCxNQUFNLElBQUkscUJBQXFCLENBTTlCO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsRUFBRSxxQkFBcUIscUJBTXZEO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLGlCQUFpQixDQUcvRDtJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxHQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsQ0FBTSxHQUFHLGlCQUFpQixDQU9yRjtJQUVELE1BQU0sQ0FBQyxLQUFLLElBQUksaUJBQWlCLENBRWhDO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFTSxRQUFRLElBQUksTUFBTSxDQUV4QjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxpQkFBaUIsQ0FHaEQ7SUFFTSxNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksR0FBRyxPQUFPLENBSWxDO0NBQ0YifQ==

package/dest/tx/content_commitment.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"content_commitment.d.ts","sourceRoot":"","sources":["../../src/tx/content_commitment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,iBAAiB;IAEnB,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IAHpB,YACS,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EAChB;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,yBAEnD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,iBAAiB,CAAC,qBAE9C;IAED,OAAO,WAEN;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAIlE;IAED,SAAS;;;;MAMR;IAED,MAAM,IAAI,qBAAqB,CAM9B;IAED,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,qBAAqB,qBAMvD;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,iBAAiB,CAG/D;IAED,MAAM,CAAC,MAAM,CAAC,SAAS,GAAE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAM,GAAG,iBAAiB,CAOrF;IAED,MAAM,CAAC,KAAK,IAAI,iBAAiB,CAEhC;IAED,OAAO,IAAI,OAAO,CAEjB;IAEM,QAAQ,IAAI,MAAM,CAExB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAGhD;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAIlC;CACF"}

package/dest/tx/content_commitment.js

@@ -1,90 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { bufferToHex } from '@aztec/foundation/string';
-import { z } from 'zod';
-export class ContentCommitment {
-    blobsHash;
-    inHash;
-    outHash;
-    constructor(blobsHash, inHash, outHash){
-        this.blobsHash = blobsHash;
-        this.inHash = inHash;
-        this.outHash = outHash;
-    }
-    static get schema() {
-        return z.object({
-            blobsHash: schemas.Fr,
-            inHash: schemas.Fr,
-            outHash: schemas.Fr
-        }).transform(({ blobsHash, inHash, outHash })=>new ContentCommitment(blobsHash, inHash, outHash));
-    }
-    static getFields(fields) {
-        return [
-            fields.blobsHash,
-            fields.inHash,
-            fields.outHash
-        ];
-    }
-    static from(fields) {
-        return new ContentCommitment(...ContentCommitment.getFields(fields));
-    }
-    getSize() {
-        return this.toBuffer().length;
-    }
-    toBuffer() {
-        return serializeToBuffer(...ContentCommitment.getFields(this));
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new ContentCommitment(reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr));
-    }
-    toInspect() {
-        return {
-            blobsHash: this.blobsHash.toString(),
-            inHash: this.inHash.toString(),
-            outHash: this.outHash.toString()
-        };
-    }
-    toViem() {
-        return {
-            blobsHash: this.blobsHash.toString(),
-            inHash: this.inHash.toString(),
-            outHash: this.outHash.toString()
-        };
-    }
-    static fromViem(contentCommitment) {
-        return new ContentCommitment(Fr.fromString(contentCommitment.blobsHash), Fr.fromString(contentCommitment.inHash), Fr.fromString(contentCommitment.outHash));
-    }
-    toFields() {
-        return serializeToFields(...ContentCommitment.getFields(this));
-    }
-    static fromFields(fields) {
-        const reader = FieldReader.asReader(fields);
-        return new ContentCommitment(reader.readField(), reader.readField(), reader.readField());
-    }
-    static random(overrides = {}) {
-        return ContentCommitment.from({
-            blobsHash: Fr.random(),
-            inHash: Fr.random(),
-            outHash: Fr.random(),
-            ...overrides
-        });
-    }
-    static empty() {
-        return new ContentCommitment(Fr.zero(), Fr.zero(), Fr.zero());
-    }
-    isEmpty() {
-        return this.blobsHash.isZero() && this.inHash.isZero() && this.outHash.isZero();
-    }
-    toString() {
-        return bufferToHex(this.toBuffer());
-    }
-    static fromString(str) {
-        const buffer = Buffer.from(str.replace(/^0x/i, ''), 'hex');
-        return ContentCommitment.fromBuffer(buffer);
-    }
-    equals(other) {
-        return this.blobsHash.equals(other.blobsHash) && this.inHash.equals(other.inHash) && this.outHash.equals(other.outHash);
-    }
-}

package/src/tx/content_commitment.ts

@@ -1,113 +0,0 @@
-import type { ViemContentCommitment } from '@aztec/ethereum/contracts';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { bufferToHex } from '@aztec/foundation/string';
-import type { FieldsOf } from '@aztec/foundation/types';
-
-import { z } from 'zod';
-
-export class ContentCommitment {
-  constructor(
-    public blobsHash: Fr,
-    public inHash: Fr,
-    public outHash: Fr,
-  ) {}
-
-  static get schema() {
-    return z
-      .object({
-        blobsHash: schemas.Fr,
-        inHash: schemas.Fr,
-        outHash: schemas.Fr,
-      })
-      .transform(({ blobsHash, inHash, outHash }) => new ContentCommitment(blobsHash, inHash, outHash));
-  }
-
-  static getFields(fields: FieldsOf<ContentCommitment>) {
-    return [fields.blobsHash, fields.inHash, fields.outHash] as const;
-  }
-
-  static from(fields: FieldsOf<ContentCommitment>) {
-    return new ContentCommitment(...ContentCommitment.getFields(fields));
-  }
-
-  getSize() {
-    return this.toBuffer().length;
-  }
-
-  toBuffer() {
-    return serializeToBuffer(...ContentCommitment.getFields(this));
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader): ContentCommitment {
-    const reader = BufferReader.asReader(buffer);
-
-    return new ContentCommitment(reader.readObject(Fr), reader.readObject(Fr), reader.readObject(Fr));
-  }
-
-  toInspect() {
-    return {
-      blobsHash: this.blobsHash.toString(),
-      inHash: this.inHash.toString(),
-      outHash: this.outHash.toString(),
-    };
-  }
-
-  toViem(): ViemContentCommitment {
-    return {
-      blobsHash: this.blobsHash.toString(),
-      inHash: this.inHash.toString(),
-      outHash: this.outHash.toString(),
-    };
-  }
-
-  static fromViem(contentCommitment: ViemContentCommitment) {
-    return new ContentCommitment(
-      Fr.fromString(contentCommitment.blobsHash),
-      Fr.fromString(contentCommitment.inHash),
-      Fr.fromString(contentCommitment.outHash),
-    );
-  }
-
-  toFields(): Fr[] {
-    return serializeToFields(...ContentCommitment.getFields(this));
-  }
-
-  static fromFields(fields: Fr[] | FieldReader): ContentCommitment {
-    const reader = FieldReader.asReader(fields);
-    return new ContentCommitment(reader.readField(), reader.readField(), reader.readField());
-  }
-
-  static random(overrides: Partial<FieldsOf<ContentCommitment>> = {}): ContentCommitment {
-    return ContentCommitment.from({
-      blobsHash: Fr.random(),
-      inHash: Fr.random(),
-      outHash: Fr.random(),
-      ...overrides,
-    });
-  }
-
-  static empty(): ContentCommitment {
-    return new ContentCommitment(Fr.zero(), Fr.zero(), Fr.zero());
-  }
-
-  isEmpty(): boolean {
-    return this.blobsHash.isZero() && this.inHash.isZero() && this.outHash.isZero();
-  }
-
-  public toString(): string {
-    return bufferToHex(this.toBuffer());
-  }
-
-  static fromString(str: string): ContentCommitment {
-    const buffer = Buffer.from(str.replace(/^0x/i, ''), 'hex');
-    return ContentCommitment.fromBuffer(buffer);
-  }
-
-  public equals(other: this): boolean {
-    return (
-      this.blobsHash.equals(other.blobsHash) && this.inHash.equals(other.inHash) && this.outHash.equals(other.outHash)
-    );
-  }
-}