@aztec/stdlib 0.80.0 → 0.82.0

package/dest/logs/tx_scoped_l2_log.js

@@ -1,14 +1,13 @@
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, boolToBuffer, numToUInt32BE } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { schemas } from '../schemas/schemas.js';
 import { TxHash } from '../tx/tx_hash.js';
+import { PrivateLog } from './private_log.js';
+import { PublicLog } from './public_log.js';
 export class TxScopedL2Log {
     txHash;
     dataStartIndexForTx;
     blockNumber;
-    isFromPublic;
-    logData;
+    log;
     constructor(/*
      * Hash of the tx where the log is included
      */ txHash, /*
@@ -17,42 +16,52 @@ export class TxScopedL2Log {
      */ dataStartIndexForTx, /*
      * The block this log is included in
      */ blockNumber, /*
-     * Indicates if the log comes from the public logs stream (partial note)
-     */ isFromPublic, /*
-     * The log data
-     */ logData){
+     * The log data as either a PrivateLog or PublicLog
+     */ log){
         this.txHash = txHash;
         this.dataStartIndexForTx = dataStartIndexForTx;
         this.blockNumber = blockNumber;
-        this.isFromPublic = isFromPublic;
-        this.logData = logData;
+        this.log = log;
+    }
+    get isFromPublic() {
+        return this.log instanceof PublicLog;
     }
     static get schema() {
         return z.object({
             txHash: TxHash.schema,
             dataStartIndexForTx: z.number(),
             blockNumber: z.number(),
-            isFromPublic: z.boolean(),
-            logData: schemas.Buffer
-        }).transform(({ txHash, dataStartIndexForTx, blockNumber, isFromPublic, logData })=>new TxScopedL2Log(txHash, dataStartIndexForTx, blockNumber, isFromPublic, logData));
+            log: z.union([
+                PrivateLog.schema,
+                PublicLog.schema
+            ])
+        }).transform(({ txHash, dataStartIndexForTx, blockNumber, log })=>new TxScopedL2Log(txHash, dataStartIndexForTx, blockNumber, log));
     }
     toBuffer() {
+        const isFromPublic = this.log instanceof PublicLog;
         return Buffer.concat([
             this.txHash.toBuffer(),
             numToUInt32BE(this.dataStartIndexForTx),
             numToUInt32BE(this.blockNumber),
-            boolToBuffer(this.isFromPublic),
-            this.logData
+            boolToBuffer(isFromPublic),
+            this.log.toBuffer()
         ]);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new TxScopedL2Log(reader.readObject(TxHash), reader.readNumber(), reader.readNumber(), reader.readBoolean(), reader.readToEnd());
+        const txHash = reader.readObject(TxHash);
+        const dataStartIndexForTx = reader.readNumber();
+        const blockNumber = reader.readNumber();
+        const isFromPublic = reader.readBoolean();
+        const log = isFromPublic ? PublicLog.fromBuffer(reader) : PrivateLog.fromBuffer(reader);
+        return new TxScopedL2Log(txHash, dataStartIndexForTx, blockNumber, log);
     }
-    static random() {
-        return new TxScopedL2Log(TxHash.random(), 1, 1, false, Fr.random().toBuffer());
+    static async random() {
+        const isFromPublic = Math.random() < 0.5;
+        const log = isFromPublic ? await PublicLog.random() : PrivateLog.random();
+        return new TxScopedL2Log(TxHash.random(), 1, 1, log);
     }
     equals(other) {
-        return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.blockNumber === other.blockNumber && this.isFromPublic === other.isFromPublic && this.logData.equals(other.logData);
+        return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.blockNumber === other.blockNumber && (this.log instanceof PublicLog && other.log instanceof PublicLog || this.log instanceof PrivateLog && other.log instanceof PrivateLog) && this.log.equals(other.log);
     }
 }

package/dest/noir/index.d.ts

@@ -62,7 +62,7 @@ export interface NoirCompiledContract {
     file_map: DebugFileMap;
 }
 /**
- * The compilation result of an Aztec.nr contract.
+ * The compilation result of a protocol (non-contract) circuit.
  */
 export interface NoirCompiledCircuit {
     /** The hash of the circuit. */
@@ -78,6 +78,10 @@ export interface NoirCompiledCircuit {
     /** The map of file ID to the source code and path of the file. */
     file_map: DebugFileMap;
 }
+export interface NoirCompiledCircuitWithName extends NoirCompiledCircuit {
+    /** The name of the circuit. */
+    name: string;
+}
 /**
  * The debug metadata of an Aztec.nr contract.
  */

package/dest/noir/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/noir/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/noir/index.ts"],"names":[],"mappings":"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"}

package/dest/note/extended_note.d.ts

@@ -3,7 +3,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { type ZodFor } from '../schemas/index.js';
 import { TxHash } from '../tx/tx_hash.js';
@@ -14,27 +13,23 @@ import { Note } from './note.js';
 export declare class ExtendedNote {
     /** The note as emitted from the Noir contract. */
     note: Note;
-    /** The owner whose public key was used to encrypt the note. */
-    owner: AztecAddress;
+    /** The address whose public key was used to encrypt the note. */
+    recipient: AztecAddress;
     /** The contract address this note is created in. */
     contractAddress: AztecAddress;
     /** The specific storage location of the note on the contract. */
     storageSlot: Fr;
-    /** The type identifier of the note on the contract. */
-    noteTypeId: NoteSelector;
     /** The hash of the tx the note was created in. */
     txHash: TxHash;
     constructor(
     /** The note as emitted from the Noir contract. */
     note: Note, 
-    /** The owner whose public key was used to encrypt the note. */
-    owner: AztecAddress, 
+    /** The address whose public key was used to encrypt the note. */
+    recipient: AztecAddress, 
     /** The contract address this note is created in. */
     contractAddress: AztecAddress, 
     /** The specific storage location of the note on the contract. */
     storageSlot: Fr, 
-    /** The type identifier of the note on the contract. */
-    noteTypeId: NoteSelector, 
     /** The hash of the tx the note was created in. */
     txHash: TxHash);
     toBuffer(): Buffer;
@@ -50,14 +45,12 @@ export declare class UniqueNote extends ExtendedNote {
     constructor(
     /** The note as emitted from the Noir contract. */
     note: Note, 
-    /** The owner whose public key was used to encrypt the note. */
-    owner: AztecAddress, 
+    /** The recipient whose public key was used to encrypt the note. */
+    recipient: AztecAddress, 
     /** The contract address this note is created in. */
     contractAddress: AztecAddress, 
     /** The specific storage location of the note on the contract. */
     storageSlot: Fr, 
-    /** The type identifier of the note on the contract. */
-    noteTypeId: NoteSelector, 
     /** The hash of the tx the note was created in. */
     txHash: TxHash, 
     /** The nonce of the note. */
@@ -79,19 +72,17 @@ export declare class UniqueNote extends ExtendedNote {
             type: "Buffer";
             data: number[];
         }>;
-        owner: ZodFor<AztecAddress>;
+        recipient: ZodFor<AztecAddress>;
         contractAddress: ZodFor<AztecAddress>;
         storageSlot: ZodFor<Fr>;
-        noteTypeId: z.ZodType<NoteSelector, any, string>;
         txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer, string>, TxHash, string>;
         nonce: ZodFor<Fr>;
     }, "strip", z.ZodTypeAny, {
-        owner: AztecAddress;
         storageSlot: Fr;
         contractAddress: AztecAddress;
+        recipient: AztecAddress;
         txHash: TxHash;
         note: Note;
-        noteTypeId: NoteSelector;
         nonce: Fr;
     }, {
         txHash: string;
@@ -99,10 +90,9 @@ export declare class UniqueNote extends ExtendedNote {
             type: "Buffer";
             data: number[];
         };
-        noteTypeId: string;
-        owner?: any;
         storageSlot?: any;
         contractAddress?: any;
+        recipient?: any;
         nonce?: any;
     }>, UniqueNote, {
         txHash: string;
@@ -110,10 +100,9 @@ export declare class UniqueNote extends ExtendedNote {
             type: "Buffer";
             data: number[];
         };
-        noteTypeId: string;
-        owner?: any;
         storageSlot?: any;
         contractAddress?: any;
+        recipient?: any;
         nonce?: any;
     }>;
     toBuffer(): Buffer;

package/dest/note/extended_note.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extended_note.d.ts","sourceRoot":"","sources":["../../src/note/extended_note.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;GAEG;AACH,qBAAa,YAAY;IAErB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,+DAA+D;IACxD,KAAK,EAAE,YAAY;IAC1B,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,uDAAuD;IAChD,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;;IAXrB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,+DAA+D;IACxD,KAAK,EAAE,YAAY;IAC1B,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,uDAAuD;IAChD,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IAGvB,QAAQ,IAAI,MAAM;IAWlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAa/C,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAaxC;IAED,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;WAIhB,MAAM;CAUpB;AAED,qBAAa,UAAW,SAAQ,YAAY;IAcxC,6BAA6B;IACtB,KAAK,EAAE,EAAE;;IAbhB,kDAAkD;IAClD,IAAI,EAAE,IAAI;IACV,+DAA+D;IAC/D,KAAK,EAAE,YAAY;IACnB,oDAAoD;IACpD,eAAe,EAAE,YAAY;IAC7B,iEAAiE;IACjE,WAAW,EAAE,EAAE;IACf,uDAAuD;IACvD,UAAU,EAAE,YAAY;IACxB,kDAAkD;IAClD,MAAM,EAAE,MAAM;IACd,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAKlB,WAAoB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAczB;IAEQ,QAAQ,IAAI,MAAM;WAYL,MAAM;WAYZ,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;WAcxC,UAAU,CAAC,GAAG,EAAE,MAAM;CAGvC"}
+{"version":3,"file":"extended_note.d.ts","sourceRoot":"","sources":["../../src/note/extended_note.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;GAEG;AACH,qBAAa,YAAY;IAErB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,iEAAiE;IAC1D,SAAS,EAAE,YAAY;IAC9B,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,kDAAkD;IAC3C,MAAM,EAAE,MAAM;;IATrB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,iEAAiE;IAC1D,SAAS,EAAE,YAAY;IAC9B,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IAGvB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAY/C,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAYxC;IAED,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;WAIhB,MAAM;CASpB;AAED,qBAAa,UAAW,SAAQ,YAAY;IAYxC,6BAA6B;IACtB,KAAK,EAAE,EAAE;;IAXhB,kDAAkD;IAClD,IAAI,EAAE,IAAI;IACV,mEAAmE;IACnE,SAAS,EAAE,YAAY;IACvB,oDAAoD;IACpD,eAAe,EAAE,YAAY;IAC7B,iEAAiE;IACjE,WAAW,EAAE,EAAE;IACf,kDAAkD;IAClD,MAAM,EAAE,MAAM;IACd,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAKlB,WAAoB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAazB;IAEQ,QAAQ,IAAI,MAAM;WAWL,MAAM;WAWZ,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;WAaxC,UAAU,CAAC,GAAG,EAAE,MAAM;CAGvC"}

package/dest/note/extended_note.js

@@ -2,7 +2,6 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
-import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { schemas } from '../schemas/index.js';
 import { TxHash } from '../tx/tx_hash.js';
@@ -11,49 +10,44 @@ import { Note } from './note.js';
  * A note with contextual data.
  */ export class ExtendedNote {
     note;
-    owner;
+    recipient;
     contractAddress;
     storageSlot;
-    noteTypeId;
     txHash;
-    constructor(/** The note as emitted from the Noir contract. */ note, /** The owner whose public key was used to encrypt the note. */ owner, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The type identifier of the note on the contract. */ noteTypeId, /** The hash of the tx the note was created in. */ txHash){
+    constructor(/** The note as emitted from the Noir contract. */ note, /** The address whose public key was used to encrypt the note. */ recipient, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The hash of the tx the note was created in. */ txHash){
         this.note = note;
-        this.owner = owner;
+        this.recipient = recipient;
         this.contractAddress = contractAddress;
         this.storageSlot = storageSlot;
-        this.noteTypeId = noteTypeId;
         this.txHash = txHash;
     }
     toBuffer() {
         return serializeToBuffer([
             this.note,
-            this.owner,
+            this.recipient,
             this.contractAddress,
             this.storageSlot,
-            this.noteTypeId,
             this.txHash
         ]);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         const note = reader.readObject(Note);
-        const owner = reader.readObject(AztecAddress);
+        const recipient = reader.readObject(AztecAddress);
         const contractAddress = reader.readObject(AztecAddress);
         const storageSlot = reader.readObject(Fr);
-        const noteTypeId = reader.readObject(NoteSelector);
         const txHash = reader.readObject(TxHash);
-        return new this(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
+        return new this(note, recipient, contractAddress, storageSlot, txHash);
     }
     static get schema() {
         return z.object({
             note: Note.schema,
-            owner: schemas.AztecAddress,
+            recipient: schemas.AztecAddress,
             contractAddress: schemas.AztecAddress,
             storageSlot: schemas.Fr,
-            noteTypeId: schemas.NoteSelector,
             txHash: TxHash.schema
-        }).transform(({ note, owner, contractAddress, storageSlot, noteTypeId, txHash })=>{
-            return new ExtendedNote(note, owner, contractAddress, storageSlot, noteTypeId, txHash);
+        }).transform(({ note, recipient, contractAddress, storageSlot, txHash })=>{
+            return new ExtendedNote(note, recipient, contractAddress, storageSlot, txHash);
         });
     }
     toString() {
@@ -63,51 +57,48 @@ import { Note } from './note.js';
         return ExtendedNote.fromBuffer(hexToBuffer(str));
     }
     static async random() {
-        return new ExtendedNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), NoteSelector.random(), TxHash.random());
+        return new ExtendedNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), TxHash.random());
     }
 }
 export class UniqueNote extends ExtendedNote {
     nonce;
-    constructor(/** The note as emitted from the Noir contract. */ note, /** The owner whose public key was used to encrypt the note. */ owner, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The type identifier of the note on the contract. */ noteTypeId, /** The hash of the tx the note was created in. */ txHash, /** The nonce of the note. */ nonce){
-        super(note, owner, contractAddress, storageSlot, noteTypeId, txHash), this.nonce = nonce;
+    constructor(/** The note as emitted from the Noir contract. */ note, /** The recipient whose public key was used to encrypt the note. */ recipient, /** The contract address this note is created in. */ contractAddress, /** The specific storage location of the note on the contract. */ storageSlot, /** The hash of the tx the note was created in. */ txHash, /** The nonce of the note. */ nonce){
+        super(note, recipient, contractAddress, storageSlot, txHash), this.nonce = nonce;
     }
     static get schema() {
         return z.object({
             note: Note.schema,
-            owner: schemas.AztecAddress,
+            recipient: schemas.AztecAddress,
             contractAddress: schemas.AztecAddress,
             storageSlot: schemas.Fr,
-            noteTypeId: schemas.NoteSelector,
             txHash: TxHash.schema,
             nonce: schemas.Fr
-        }).transform(({ note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce })=>{
-            return new UniqueNote(note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce);
+        }).transform(({ note, recipient, contractAddress, storageSlot, txHash, nonce })=>{
+            return new UniqueNote(note, recipient, contractAddress, storageSlot, txHash, nonce);
         });
     }
     toBuffer() {
         return serializeToBuffer([
             this.note,
-            this.owner,
+            this.recipient,
             this.contractAddress,
             this.storageSlot,
-            this.noteTypeId,
             this.txHash,
             this.nonce
         ]);
     }
     static async random() {
-        return new UniqueNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), NoteSelector.random(), TxHash.random(), Fr.random());
+        return new UniqueNote(Note.random(), await AztecAddress.random(), await AztecAddress.random(), Fr.random(), TxHash.random(), Fr.random());
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         const note = reader.readObject(Note);
-        const owner = reader.readObject(AztecAddress);
+        const recipient = reader.readObject(AztecAddress);
         const contractAddress = reader.readObject(AztecAddress);
         const storageSlot = reader.readObject(Fr);
-        const noteTypeId = reader.readObject(NoteSelector);
         const txHash = reader.readObject(TxHash);
         const nonce = reader.readObject(Fr);
-        return new this(note, owner, contractAddress, storageSlot, noteTypeId, txHash, nonce);
+        return new this(note, recipient, contractAddress, storageSlot, txHash, nonce);
     }
     static fromString(str) {
         return UniqueNote.fromBuffer(hexToBuffer(str));

package/dest/note/notes_filter.d.ts

@@ -14,8 +14,8 @@ export type NotesFilter = {
     contractAddress?: AztecAddress;
     /** The specific storage location of the note on the contract. */
     storageSlot?: Fr;
-    /** The owner of the note (whose public key was used to encrypt the note). */
-    owner?: AztecAddress;
+    /** The recipient of the note (whose public key was used to encrypt the note). */
+    recipient?: AztecAddress;
     /** The status of the note. Defaults to 'ACTIVE'. */
     status?: NoteStatus;
     /** The siloed nullifier for the note. */

package/dest/note/notes_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,eAAe,CAAC,EAAE,YAAY,CAAC;IAC/B,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAQhD,CAAC"}
+{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,eAAe,CAAC,EAAE,YAAY,CAAC;IAC/B,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,iFAAiF;IACjF,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAQhD,CAAC"}

package/dest/note/notes_filter.js

@@ -6,7 +6,7 @@ export const NotesFilterSchema = z.object({
     txHash: TxHash.schema.optional(),
     contractAddress: schemas.AztecAddress.optional(),
     storageSlot: schemas.Fr.optional(),
-    owner: schemas.AztecAddress.optional(),
+    recipient: schemas.AztecAddress.optional(),
     status: z.nativeEnum(NoteStatus).optional(),
     siloedNullifier: schemas.Fr.optional(),
     scopes: z.array(schemas.AztecAddress).optional()

package/dest/p2p/consensus_payload.d.ts

@@ -4,6 +4,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
+import type { L2Block } from '../block/l2_block.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { TxHash } from '../tx/tx_hash.js';
 import type { Signable, SignatureDomainSeparator } from './signature_utils.js';
@@ -24,8 +25,8 @@ export declare class ConsensusPayload implements Signable {
         archive: z.ZodType<Fr, any, string>;
         txHashes: z.ZodArray<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer, string>, TxHash, string>, "many">;
     }, "strip", z.ZodTypeAny, {
-        header: BlockHeader;
         archive: Fr;
+        header: BlockHeader;
         txHashes: TxHash[];
     }, {
         archive: string;
@@ -41,6 +42,7 @@ export declare class ConsensusPayload implements Signable {
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload;
     static fromFields(fields: FieldsOf<ConsensusPayload>): ConsensusPayload;
+    static fromBlock(block: L2Block): ConsensusPayload;
     static empty(): ConsensusPayload;
     /**
      * Get the size of the consensus payload in bytes.

package/dest/p2p/consensus_payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consensus_payload.d.ts","sourceRoot":"","sources":["../../src/p2p/consensus_payload.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,oDAAoD;aACpC,MAAM,EAAE,WAAW;aAEnB,OAAO,EAAE,EAAE;IAC3B,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IARpC,OAAO,CAAC,IAAI,CAAqB;;IAG/B,oDAAoD;IACpC,MAAM,EAAE,WAAW,EAEnB,OAAO,EAAE,EAAE;IAC3B,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGpC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAI7C,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBlF,QAAQ,IAAI,MAAM;IAMlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAS/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;IAIvE,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC;;;OAGG;IACH,OAAO,IAAI,MAAM;CAQlB"}
+{"version":3,"file":"consensus_payload.d.ts","sourceRoot":"","sources":["../../src/p2p/consensus_payload.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,oDAAoD;aACpC,MAAM,EAAE,WAAW;aAEnB,OAAO,EAAE,EAAE;IAC3B,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IARpC,OAAO,CAAC,IAAI,CAAqB;;IAG/B,oDAAoD;IACpC,MAAM,EAAE,WAAW,EAEnB,OAAO,EAAE,EAAE;IAC3B,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGpC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAI7C,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBlF,QAAQ,IAAI,MAAM;IAMlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAS/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;IAIvE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB;IAQlD,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC;;;OAGG;IACH,OAAO,IAAI,MAAM;CAQlB"}

package/dest/p2p/consensus_payload.js

@@ -65,6 +65,9 @@ export class ConsensusPayload {
     static fromFields(fields) {
         return new ConsensusPayload(fields.header, fields.archive, fields.txHashes);
     }
+    static fromBlock(block) {
+        return new ConsensusPayload(block.header, block.archive.root, block.body.txEffects.map((tx)=>tx.txHash));
+    }
     static empty() {
         return new ConsensusPayload(BlockHeader.empty(), Fr.ZERO, []);
     }

package/dest/proofs/client_ivc_proof.d.ts

@@ -7,8 +7,7 @@ import { BufferReader } from '@aztec/foundation/serialize';
  */
 export declare class ClientIvcProof {
     clientIvcProofBuffer: Buffer;
-    clientIvcVkBuffer: Buffer;
-    constructor(clientIvcProofBuffer: Buffer, clientIvcVkBuffer: Buffer);
+    constructor(clientIvcProofBuffer: Buffer);
     isEmpty(): boolean;
     static empty(): ClientIvcProof;
     static fake(fill?: number): ClientIvcProof;

package/dest/proofs/client_ivc_proof.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_ivc_proof.d.ts","sourceRoot":"","sources":["../../src/proofs/client_ivc_proof.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E;;;GAGG;AACH,qBAAa,cAAc;IAKhB,oBAAoB,EAAE,MAAM;IAC5B,iBAAiB,EAAE,MAAM;gBADzB,oBAAoB,EAAE,MAAM,EAC5B,iBAAiB,EAAE,MAAM;IAG3B,OAAO;IAId,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,IAAI,CAAC,IAAI,SAAkC;IAIlD,MAAM,CAAC,MAAM;IAOb,MAAM,KAAK,MAAM,uDAEhB;IAED,MAAM;IAIN,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAKzD,QAAQ;CAQhB"}
+{"version":3,"file":"client_ivc_proof.d.ts","sourceRoot":"","sources":["../../src/proofs/client_ivc_proof.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E;;;GAGG;AACH,qBAAa,cAAc;IAKhB,oBAAoB,EAAE,MAAM;gBAA5B,oBAAoB,EAAE,MAAM;IAG9B,OAAO;IAId,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,IAAI,CAAC,IAAI,SAAkC;IAIlD,MAAM,CAAC,MAAM;IAIb,MAAM,KAAK,MAAM,uDAEhB;IAED,MAAM;IAIN,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAKzD,QAAQ;CAGhB"}

package/dest/proofs/client_ivc_proof.js

@@ -2,31 +2,28 @@ import { randomBytes } from '@aztec/foundation/crypto';
 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
  * eventually we read all these VKs from the data tree instead of passing them
  */ export class ClientIvcProof {
     clientIvcProofBuffer;
-    clientIvcVkBuffer;
     constructor(// produced by the sequencer when making the tube proof
     // 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
-    clientIvcProofBuffer, clientIvcVkBuffer){
+    clientIvcProofBuffer){
         this.clientIvcProofBuffer = clientIvcProofBuffer;
-        this.clientIvcVkBuffer = clientIvcVkBuffer;
     }
     isEmpty() {
         return this.clientIvcProofBuffer.length === 0;
     }
     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() {
         return bufferSchemaFor(ClientIvcProof);
@@ -36,9 +33,9 @@ const CLIENT_IVC_VK_LENGTH = 2730;
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new ClientIvcProof(reader.readBuffer(), reader.readBuffer());
+        return new ClientIvcProof(reader.readBuffer());
     }
     toBuffer() {
-        return serializeToBuffer(this.clientIvcProofBuffer.length, this.clientIvcProofBuffer, this.clientIvcVkBuffer.length, this.clientIvcVkBuffer);
+        return serializeToBuffer(this.clientIvcProofBuffer.length, this.clientIvcProofBuffer);
     }
 }

package/dest/proofs/proof.d.ts

@@ -16,7 +16,6 @@ export declare class Proof {
     numPublicInputs: number;
     readonly __proofBrand: any;
     private readonly metadataOffset;
-    private readonly publicInputsOffset;
     constructor(
     /**
      * Holds the serialized proof data in a binary buffer format.

package/dest/proofs/proof.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proof.d.ts","sourceRoot":"","sources":["../../src/proofs/proof.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E;;;;;GAKG;AACH,qBAAa,KAAK;IAYd;;OAEG;IACI,MAAM,EAAE,MAAM;IAEd,eAAe,EAAE,MAAM;IAfhC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;IAI3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAK;IAGpC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAO;;IAGxC;;OAEG;IACI,MAAM,EAAE,MAAM,EAEd,eAAe,EAAE,MAAM;IAGhC;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK;IAQvD;;;;;OAKG;IACI,QAAQ;IAIf;;;OAGG;IACI,QAAQ;IAIR,mBAAmB,IAAI,MAAM;IAO7B,mBAAmB,IAAI,EAAE,EAAE;IAO3B,wBAAwB,IAAI,EAAE,EAAE;IAKvC;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,oDAAoD;IAC7C,OAAO;IAMd,8BAA8B;IAC9B,MAAM,CAAC,KAAK;CAGb;AAED;;;;GAIG;AACH,wBAAgB,cAAc,UAE7B"}
+{"version":3,"file":"proof.d.ts","sourceRoot":"","sources":["../../src/proofs/proof.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E;;;;;GAKG;AACH,qBAAa,KAAK;IASd;;OAEG;IACI,MAAM,EAAE,MAAM;IAEd,eAAe,EAAE,MAAM;IAZhC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC;IAI3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAK;;IAGlC;;OAEG;IACI,MAAM,EAAE,MAAM,EAEd,eAAe,EAAE,MAAM;IAGhC;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK;IAQvD;;;;;OAKG;IACI,QAAQ;IAIf;;;OAGG;IACI,QAAQ;IAIR,mBAAmB,IAAI,MAAM;IAI7B,mBAAmB,IAAI,EAAE,EAAE;IAO3B,wBAAwB,IAAI,EAAE,EAAE;IAKvC;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,oDAAoD;IAC7C,OAAO;IAMd,8BAA8B;IAC9B,MAAM,CAAC,KAAK;CAGb;AAED;;;;GAIG;AACH,wBAAgB,cAAc,UAE7B"}

package/dest/proofs/proof.js

@@ -16,16 +16,12 @@ const EMPTY_PROOF_SIZE = 42;
     // Honk proofs start with a 4 byte length prefix
     // the proof metadata starts immediately after
     metadataOffset;
-    // the metadata is 3 Frs long
-    // the public inputs are after it
-    publicInputsOffset;
     constructor(/**
      * Holds the serialized proof data in a binary buffer format.
      */ buffer, numPublicInputs){
         this.buffer = buffer;
         this.numPublicInputs = numPublicInputs;
         this.metadataOffset = 4;
-        this.publicInputsOffset = 100;
     }
     /**
    * Create a Proof from a Buffer or BufferReader.
@@ -56,12 +52,11 @@ const EMPTY_PROOF_SIZE = 42;
     }
     withoutPublicInputs() {
         return Buffer.concat([
-            this.buffer.subarray(this.metadataOffset, this.publicInputsOffset),
-            this.buffer.subarray(this.publicInputsOffset + Fr.SIZE_IN_BYTES * this.numPublicInputs)
+            this.buffer.subarray(this.metadataOffset + Fr.SIZE_IN_BYTES * this.numPublicInputs)
         ]);
     }
     extractPublicInputs() {
-        const reader = BufferReader.asReader(this.buffer.subarray(this.publicInputsOffset, this.publicInputsOffset + Fr.SIZE_IN_BYTES * this.numPublicInputs));
+        const reader = BufferReader.asReader(this.buffer.subarray(this.metadataOffset, this.metadataOffset + Fr.SIZE_IN_BYTES * this.numPublicInputs));
         return reader.readArray(this.numPublicInputs, Fr);
     }
     extractAggregationObject() {

package/dest/rollup/block_root_rollup.d.ts

@@ -70,7 +70,7 @@ export declare class BlockRootRollupData {
      * @param fields - Fields to create the instance from.
      * @returns An array of fields.
      */
-    static getFields(fields: FieldsOf<BlockRootRollupData>): readonly [RootParityInput<459>, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], BlockHeader, Fr];
+    static getFields(fields: FieldsOf<BlockRootRollupData>): readonly [RootParityInput<456>, [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], [Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr, Fr], BlockHeader, Fr];
     /**
      * Deserializes the inputs from a buffer.
      * @param buffer - A buffer to deserialize from.

package/dest/rollup/tube_inputs.d.ts

@@ -3,11 +3,16 @@
 import { BufferReader } from '@aztec/foundation/serialize';
 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 declare class TubeInputs {
+    usePublicTailVk: boolean;
     clientIVCData: ClientIvcProof;
-    constructor(clientIVCData: ClientIvcProof);
+    constructor(usePublicTailVk: boolean, clientIVCData: ClientIvcProof);
     static from(fields: FieldsOf<TubeInputs>): TubeInputs;
-    static getFields(fields: FieldsOf<TubeInputs>): readonly [ClientIvcProof];
+    static getFields(fields: FieldsOf<TubeInputs>): readonly [boolean, ClientIvcProof];
     /**
      * Serializes the inputs to a buffer.
      * @returns The inputs serialized to a buffer.

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

@@ -1 +1 @@
-{"version":3,"file":"tube_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/tube_inputs.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,qBAAa,UAAU;IACF,aAAa,EAAE,cAAc;gBAA7B,aAAa,EAAE,cAAc;IAEhD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU;IAIrD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAI7C;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAK5D,OAAO,IAAI,OAAO;IAGlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;IAIZ,2DAA2D;IAC3D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,mDAEhB;CACF"}
+{"version":3,"file":"tube_inputs.d.ts","sourceRoot":"","sources":["../../src/rollup/tube_inputs.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D;;;GAGG;AACH,qBAAa,UAAU;IACF,eAAe,EAAE,OAAO;IAAS,aAAa,EAAE,cAAc;gBAA9D,eAAe,EAAE,OAAO,EAAS,aAAa,EAAE,cAAc;IAEjF,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU;IAIrD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAI7C;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,UAAU;IAK5D,OAAO,IAAI,OAAO;IAGlB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK;IAIZ,2DAA2D;IAC3D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,mDAEhB;CACF"}

package/dest/rollup/tube_inputs.js

@@ -2,9 +2,14 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-export class TubeInputs {
+/**
+ * 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 {
+    usePublicTailVk;
     clientIVCData;
-    constructor(clientIVCData){
+    constructor(usePublicTailVk, clientIVCData){
+        this.usePublicTailVk = usePublicTailVk;
         this.clientIVCData = clientIVCData;
     }
     static from(fields) {
@@ -12,6 +17,7 @@ export class TubeInputs {
     }
     static getFields(fields) {
         return [
+            fields.usePublicTailVk,
             fields.clientIVCData
         ];
     }
@@ -33,7 +39,7 @@ export class TubeInputs {
    * @returns A new TubeInputs instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new TubeInputs(reader.readObject(ClientIvcProof));
+        return new TubeInputs(reader.readBoolean(), reader.readObject(ClientIvcProof));
     }
     isEmpty() {
         return this.clientIVCData.isEmpty();
@@ -46,7 +52,7 @@ export class TubeInputs {
         return TubeInputs.fromBuffer(hexToBuffer(str));
     }
     static empty() {
-        return new TubeInputs(ClientIvcProof.empty());
+        return new TubeInputs(false, ClientIvcProof.empty());
     }
     /** Returns a hex representation for JSON serialization. */ toJSON() {
         return this.toBuffer();