@aztec/stdlib 0.87.7 → 1.0.0-nightly.20250605

package/dest/logs/public_log.js

@@ -37,6 +37,9 @@ export class PublicLog {
     getEmittedFields() {
         return this.fields.slice(0, this.emittedLength);
     }
+    getEmittedFieldsWithoutTag() {
+        return this.fields.slice(1, this.emittedLength);
+    }
     toBlobFields() {
         return [
             new Fr(this.emittedLength),

package/dest/logs/tx_scoped_l2_log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAK3B,YAAY,EAAE,MAAM;IAIpB,WAAW,EAAE,MAAM;IAInB,GAAG,EAAE,UAAU,GAAG,SAAS;gBAlB3B,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAK3B,YAAY,EAAE,MAAM,EAIpB,WAAW,EAAE,MAAM,EAInB,GAAG,EAAE,UAAU,GAAG,SAAS;IAGpC,IAAI,YAAY,YAEf;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ;IAYR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;WAYnB,MAAM,CAAC,YAAY,UAAsB;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa;CAW5B"}
+{"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAK3B,YAAY,EAAE,MAAM;IAIpB,WAAW,EAAE,MAAM;IAInB,GAAG,EAAE,UAAU,GAAG,SAAS;gBAlB3B,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAK3B,YAAY,EAAE,MAAM,EAIpB,WAAW,EAAE,MAAM,EAInB,GAAG,EAAE,UAAU,GAAG,SAAS;IAGpC,IAAI,YAAY,YAEf;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ;IAYR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;WAYnB,MAAM,CAAC,YAAY,UAAsB;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa;CAW5B"}

package/dest/logs/tx_scoped_l2_log.js

@@ -3,6 +3,7 @@ import { z } from 'zod';
 import { TxHash } from '../tx/tx_hash.js';
 import { PrivateLog } from './private_log.js';
 import { PublicLog } from './public_log.js';
+// TODO(#14460): Split to private and public versions instead of having this weird mix.
 export class TxScopedL2Log {
     txHash;
     dataStartIndexForTx;

package/dest/messaging/index.d.ts

@@ -4,4 +4,5 @@ export * from './l1_to_l2_message_source.js';
 export * from './l1_actor.js';
 export * from './l2_actor.js';
 export * from './l2_to_l1_message.js';
+export * from './l2_to_l1_membership.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/messaging/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/messaging/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC"}

package/dest/messaging/index.js

@@ -4,3 +4,4 @@ export * from './l1_to_l2_message_source.js';
 export * from './l1_actor.js';
 export * from './l2_actor.js';
 export * from './l2_to_l1_message.js';
+export * from './l2_to_l1_membership.js';

package/dest/messaging/l2_to_l1_membership.d.ts

@@ -0,0 +1,11 @@
+import { Fr } from '@aztec/foundation/fields';
+import { SiblingPath } from '@aztec/foundation/trees';
+export interface MessageRetrieval {
+    getL2ToL1Messages(l2BlockNumber: number): Promise<Fr[][] | undefined>;
+}
+export type L2ToL1MembershipWitness = {
+    l2MessageIndex: bigint;
+    siblingPath: SiblingPath<number>;
+};
+export declare function computeL2ToL1MembershipWitness(messageRetriever: MessageRetrieval, l2BlockNumber: number, message: Fr): Promise<L2ToL1MembershipWitness | undefined>;
+//# sourceMappingURL=l2_to_l1_membership.d.ts.map

package/dest/messaging/l2_to_l1_membership.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"l2_to_l1_membership.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_to_l1_membership.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAwB,WAAW,EAAkC,MAAM,yBAAyB,CAAC;AAE5G,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,CAAC;CACvE;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,wBAAsB,8BAA8B,CAClD,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,EAAE,GACV,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC,CA+F9C"}

package/dest/messaging/l2_to_l1_membership.js

@@ -0,0 +1,70 @@
+import { SHA256Trunc } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { MerkleTreeCalculator, SiblingPath, UnbalancedMerkleTreeCalculator } from '@aztec/foundation/trees';
+export async function computeL2ToL1MembershipWitness(messageRetriever, l2BlockNumber, message) {
+    const messagesPerTx = await messageRetriever.getL2ToL1Messages(l2BlockNumber);
+    if (!messagesPerTx) {
+        return undefined;
+    }
+    // Find index of message in subtree and index of tx in a block
+    let messageIndexInTx = -1, txIndex = -1;
+    {
+        txIndex = messagesPerTx.findIndex((messages)=>{
+            const idx = messages.findIndex((msg)=>msg.equals(message));
+            messageIndexInTx = Math.max(messageIndexInTx, idx);
+            return idx !== -1;
+        });
+    }
+    if (txIndex === -1) {
+        throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
+    }
+    const hasher = new SHA256Trunc();
+    // Get the message path in subtree and message subtree height
+    let messagePathInSubtree;
+    let messageSubtreeHeight;
+    {
+        const txMessages = messagesPerTx[txIndex];
+        messageSubtreeHeight = txMessages.length <= 1 ? 1 : Math.ceil(Math.log2(txMessages.length));
+        const calculator = await MerkleTreeCalculator.create(messageSubtreeHeight, Buffer.alloc(32, 0), (lhs, rhs)=>Promise.resolve(hasher.hash(lhs, rhs)));
+        const tree = await calculator.computeTree(txMessages.map((msg)=>msg.toBuffer()));
+        const tempPath = tree.getSiblingPath(messageIndexInTx);
+        messagePathInSubtree = new SiblingPath(tempPath.length, tempPath);
+    }
+    // If the number of txs is 1 we are dealing with a special case where the tx subtree itself is the whole block's
+    // l2 to l1 message tree.
+    const numTransactions = messagesPerTx.length;
+    if (numTransactions === 1) {
+        return {
+            l2MessageIndex: BigInt(messageIndexInTx),
+            siblingPath: messagePathInSubtree
+        };
+    }
+    // Calculate roots for all tx subtrees
+    const txSubtreeRoots = await Promise.all(messagesPerTx.map(async (messages, _)=>{
+        // For a tx with no messages, we have to set an out hash of 0 to match what the circuit does.
+        if (messages.length === 0) {
+            return Fr.ZERO;
+        }
+        const txTreeHeight = messages.length <= 1 ? 1 : Math.ceil(Math.log2(messages.length));
+        const calculator = await MerkleTreeCalculator.create(txTreeHeight, Buffer.alloc(32, 0), (lhs, rhs)=>Promise.resolve(hasher.hash(lhs, rhs)));
+        const root = await calculator.computeTreeRoot(messages.map((msg)=>msg.toBuffer()));
+        return Fr.fromBuffer(root);
+    }));
+    // Construct the top tree and compute the combined path
+    let combinedPath;
+    {
+        const topTreeHeight = Math.ceil(Math.log2(txSubtreeRoots.length));
+        // The root of this tree is the out_hash calculated in Noir => we truncate to match Noir's SHA
+        const topTree = UnbalancedMerkleTreeCalculator.create(topTreeHeight, (lhs, rhs)=>Promise.resolve(hasher.hash(lhs, rhs)));
+        await topTree.appendLeaves(txSubtreeRoots.map((f)=>f.toBuffer()));
+        const txPathInTopTree = await topTree.getSiblingPath(txSubtreeRoots[txIndex].toBigInt());
+        // Append subtree path to top tree path
+        combinedPath = messagePathInSubtree.toBufferArray().concat(txPathInTopTree.toBufferArray());
+    }
+    // Append binary index of subtree path to binary index of top tree path
+    const combinedIndex = parseInt(txIndex.toString(2).concat(messageIndexInTx.toString(2).padStart(messageSubtreeHeight, '0')), 2);
+    return {
+        l2MessageIndex: BigInt(combinedIndex),
+        siblingPath: new SiblingPath(combinedPath.length, combinedPath)
+    };
+}

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,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,6DAA6D;aAC7C,MAAM,EAAE,mBAAmB;IAC3C,gDAAgD;aAChC,OAAO,EAAE,EAAE;IAC3B,mDAAmD;aACnC,cAAc,EAAE,cAAc;IAC9C,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IAVpC,OAAO,CAAC,IAAI,CAAqB;;IAG/B,6DAA6D;IAC7C,MAAM,EAAE,mBAAmB;IAC3C,gDAAgD;IAChC,OAAO,EAAE,EAAE;IAC3B,mDAAmD;IACnC,cAAc,EAAE,cAAc;IAC9C,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGpC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAInD,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAcnE,QAAQ,IAAI,MAAM;IAYlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAU/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;IAIvE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB;IASlD,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC;;;OAGG;IACH,OAAO,IAAI,MAAM;IASjB,QAAQ;CAGT"}
+{"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,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,qBAAa,gBAAiB,YAAW,QAAQ;IAI7C,6DAA6D;aAC7C,MAAM,EAAE,mBAAmB;IAC3C,gDAAgD;aAChC,OAAO,EAAE,EAAE;IAC3B,mDAAmD;aACnC,cAAc,EAAE,cAAc;IAC9C,gDAAgD;aAChC,QAAQ,EAAE,MAAM,EAAE;IAVpC,OAAO,CAAC,IAAI,CAAqB;;IAG/B,6DAA6D;IAC7C,MAAM,EAAE,mBAAmB;IAC3C,gDAAgD;IAChC,OAAO,EAAE,EAAE;IAC3B,mDAAmD;IACnC,cAAc,EAAE,cAAc;IAC9C,gDAAgD;IAChC,QAAQ,EAAE,MAAM,EAAE;IAGpC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAInD,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM;IAcnE,QAAQ,IAAI,MAAM;IAYlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAU/D,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;IAIvE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB;IASlD,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC;;;OAGG;IACH,OAAO,IAAI,MAAM;IASjB,QAAQ;CAKT"}

package/dest/rollup/avm_proof_data.d.ts

@@ -1,15 +1,17 @@
-import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/vk_data.js';
 export declare class AvmProofData {
     publicInputs: AvmCircuitPublicInputs;
-    proof: RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>;
-    vkData: VkWitnessData;
-    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>, vkData: VkWitnessData);
+    proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
+    vkData: VkData;
+    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>, vkData: VkData);
     static fromBuffer(buffer: Buffer | BufferReader): AvmProofData;
     toBuffer(): Buffer<ArrayBufferLike>;
     static empty(): AvmProofData;
 }
+export declare function enhanceProofWithPiValidationFlag(proof: Fr[], skipPublicInputsValidation: boolean): Fr[];
 //# sourceMappingURL=avm_proof_data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,0BAA0B,CAAC;IACxD,MAAM,EAAE,aAAa;gBAFrB,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,0BAA0B,CAAC,EACxD,MAAM,EAAE,aAAa;IAG9B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb"}
+{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC;IAClE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC,EAClE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb;AAGD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}

package/dest/rollup/avm_proof_data.js

@@ -1,8 +1,9 @@
-import { AVM_PROOF_LENGTH_IN_FIELDS } from '@aztec/constants';
+import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/vk_data.js';
 export class AvmProofData {
     publicInputs;
     proof;
@@ -14,12 +15,19 @@ export class AvmProofData {
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkWitnessData));
+        return new AvmProofData(reader.readObject(AvmCircuitPublicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
     }
     toBuffer() {
         return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
     }
     static empty() {
-        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_PROOF_LENGTH_IN_FIELDS), VkWitnessData.empty());
+        return new AvmProofData(AvmCircuitPublicInputs.empty(), makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED), VkData.empty());
     }
 }
+// TODO(#14234)[Unconditional PIs validation]: remove this function.
+export function enhanceProofWithPiValidationFlag(proof, skipPublicInputsValidation) {
+    const skipPublicInputsField = skipPublicInputsValidation ? new Fr(1) : new Fr(0);
+    return [
+        skipPublicInputsField
+    ].concat(proof).slice(0, AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED);
+}

package/dest/rollup/base_rollup_hints.d.ts

@@ -33,7 +33,7 @@ export declare class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -62,7 +62,7 @@ export declare class PrivateBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -95,7 +95,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>;
     /**
      * Data which is not modified by the base rollup circuit.
      */
@@ -112,7 +112,7 @@ export declare class PublicBaseRollupHints {
     /**
      * Preimages to the kernel's contractClassLogsHashes.
      */
-    contractClassLogsPreimages: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
+    contractClassLogsFields: Tuple<ContractClassLogFields, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>, 
     /**
      * Data which is not modified by the base rollup circuit.
      */

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

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

package/dest/rollup/base_rollup_hints.js

@@ -15,7 +15,7 @@ export class PrivateBaseRollupHints {
     stateDiffHints;
     feePayerFeeJuiceBalanceReadHint;
     archiveRootMembershipWitness;
-    contractClassLogsPreimages;
+    contractClassLogsFields;
     constants;
     constructor(/**
      * Partial state reference at the start of the rollup.
@@ -29,7 +29,7 @@ export class PrivateBaseRollupHints {
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */ archiveRootMembershipWitness, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
+     */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.start = start;
@@ -37,7 +37,7 @@ export class PrivateBaseRollupHints {
         this.stateDiffHints = stateDiffHints;
         this.feePayerFeeJuiceBalanceReadHint = feePayerFeeJuiceBalanceReadHint;
         this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
+        this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
     static from(fields) {
@@ -50,7 +50,7 @@ export class PrivateBaseRollupHints {
             fields.stateDiffHints,
             fields.feePayerFeeJuiceBalanceReadHint,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
+            fields.contractClassLogsFields,
             fields.constants
         ];
     }
@@ -80,7 +80,7 @@ export class PrivateBaseRollupHints {
 export class PublicBaseRollupHints {
     startSpongeBlob;
     archiveRootMembershipWitness;
-    contractClassLogsPreimages;
+    contractClassLogsFields;
     constants;
     constructor(/**
      * Sponge state to absorb blob inputs at the start of the rollup.
@@ -88,12 +88,12 @@ export class PublicBaseRollupHints {
      * Membership witnesses of blocks referred by each of the 2 kernels.
      */ archiveRootMembershipWitness, /**
      * Preimages to the kernel's contractClassLogsHashes.
-     */ contractClassLogsPreimages, /**
+     */ contractClassLogsFields, /**
      * Data which is not modified by the base rollup circuit.
      */ constants){
         this.startSpongeBlob = startSpongeBlob;
         this.archiveRootMembershipWitness = archiveRootMembershipWitness;
-        this.contractClassLogsPreimages = contractClassLogsPreimages;
+        this.contractClassLogsFields = contractClassLogsFields;
         this.constants = constants;
     }
     static from(fields) {
@@ -103,7 +103,7 @@ export class PublicBaseRollupHints {
         return [
             fields.startSpongeBlob,
             fields.archiveRootMembershipWitness,
-            fields.contractClassLogsPreimages,
+            fields.contractClassLogsFields,
             fields.constants
         ];
     }

package/dest/rollup/previous_rollup_block_data.d.ts

@@ -1,8 +1,7 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_public_inputs.js';
 /**
  * Represents the data of a previous block merge or block root rollup circuit.
@@ -17,13 +16,9 @@ export declare class PreviousRollupBlockData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
     /**
-     * The verification key of the block merge or block root rollup circuit.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vk: VerificationKeyAsFields;
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>;
+    vkData: VkData;
     constructor(
     /**
      * Public inputs to the block merge or block root rollup circuit.
@@ -34,13 +29,9 @@ export declare class PreviousRollupBlockData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, 
     /**
-     * The verification key of the block merge or block root rollup circuit.
-     */
-    vk: VerificationKeyAsFields, 
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>);
+    vkData: VkData);
     /**
      * Serializes previous rollup data to a buffer.
      * @returns The buffer of the serialized previous rollup data.

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

@@ -1 +1 @@
-{"version":3,"file":"previous_rollup_block_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_block_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AAEjG;;GAEG;AACH,qBAAa,uBAAuB;IAEhC;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;;IAf1D;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;IAG5D;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uBAAuB;CASjF"}
+{"version":3,"file":"previous_rollup_block_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_block_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AAEjG;;GAEG;AACH,qBAAa,uBAAuB;IAEhC;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;;IAXrB;;OAEG;IACI,iCAAiC,EAAE,iCAAiC;IAC3E;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;IAGvB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,uBAAuB;CAQjF"}

package/dest/rollup/previous_rollup_block_data.js

@@ -1,35 +1,30 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_public_inputs.js';
 /**
  * Represents the data of a previous block merge or block root rollup circuit.
  */ export class PreviousRollupBlockData {
     blockRootOrBlockMergePublicInputs;
     proof;
-    vk;
-    vkWitness;
+    vkData;
     constructor(/**
      * Public inputs to the block merge or block root rollup circuit.
      */ blockRootOrBlockMergePublicInputs, /**
      * The proof of the block merge or block root rollup circuit.
      */ proof, /**
-     * The verification key of the block merge or block root rollup circuit.
-     */ vk, /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */ vkWitness){
+     * The verification key and the witness of the vk in the vk tree.
+     */ vkData){
         this.blockRootOrBlockMergePublicInputs = blockRootOrBlockMergePublicInputs;
         this.proof = proof;
-        this.vk = vk;
-        this.vkWitness = vkWitness;
+        this.vkData = vkData;
     }
     /**
    * Serializes previous rollup data to a buffer.
    * @returns The buffer of the serialized previous rollup data.
    */ toBuffer() {
-        return serializeToBuffer(this.blockRootOrBlockMergePublicInputs, this.proof, this.vk, this.vkWitness);
+        return serializeToBuffer(this.blockRootOrBlockMergePublicInputs, this.proof, this.vkData);
     }
     /**
    * Deserializes previous rollup data from a buffer.
@@ -37,6 +32,6 @@ import { BlockRootOrBlockMergePublicInputs } from './block_root_or_block_merge_p
    * @returns A new PreviousRollupData instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PreviousRollupBlockData(reader.readObject(BlockRootOrBlockMergePublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VerificationKeyAsFields), MembershipWitness.fromBuffer(reader, VK_TREE_HEIGHT));
+        return new PreviousRollupBlockData(reader.readObject(BlockRootOrBlockMergePublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
 }

package/dest/rollup/previous_rollup_data.d.ts

@@ -1,8 +1,7 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 /**
  * Represents the data of a previous merge or base rollup circuit.
@@ -17,13 +16,9 @@ export declare class PreviousRollupData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
     /**
-     * The verification key of the base or merge rollup circuit.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vk: VerificationKeyAsFields;
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>;
+    vkData: VkData;
     constructor(
     /**
      * Public inputs to the base or merge rollup circuit.
@@ -34,13 +29,9 @@ export declare class PreviousRollupData {
      */
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, 
     /**
-     * The verification key of the base or merge rollup circuit.
-     */
-    vk: VerificationKeyAsFields, 
-    /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
+     * The verification key and the witness of the vk in the vk tree.
      */
-    vkWitness: MembershipWitness<typeof VK_TREE_HEIGHT>);
+    vkData: VkData);
     /**
      * Serializes previous rollup data to a buffer.
      * @returns The buffer of the serialized previous rollup data.

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

@@ -1 +1 @@
-{"version":3,"file":"previous_rollup_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;;IAf1D;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,EAAE,EAAE,uBAAuB;IAClC;;OAEG;IACI,SAAS,EAAE,iBAAiB,CAAC,OAAO,cAAc,CAAC;IAG5D;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;CAS5E"}
+{"version":3,"file":"previous_rollup_data.d.ts","sourceRoot":"","sources":["../../src/rollup/previous_rollup_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;;IAXrB;;OAEG;IACI,6BAA6B,EAAE,6BAA6B;IACnE;;OAEG;IACI,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IAC9E;;OAEG;IACI,MAAM,EAAE,MAAM;IAGvB;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;WACW,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;CAQ5E"}

package/dest/rollup/previous_rollup_data.js

@@ -1,35 +1,30 @@
-import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, VK_TREE_HEIGHT } from '@aztec/constants';
+import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VerificationKeyAsFields } from '../vks/verification_key.js';
+import { VkData } from '../vks/index.js';
 import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js';
 /**
  * Represents the data of a previous merge or base rollup circuit.
  */ export class PreviousRollupData {
     baseOrMergeRollupPublicInputs;
     proof;
-    vk;
-    vkWitness;
+    vkData;
     constructor(/**
      * Public inputs to the base or merge rollup circuit.
      */ baseOrMergeRollupPublicInputs, /**
      * The proof of the base or merge rollup circuit.
      */ proof, /**
-     * The verification key of the base or merge rollup circuit.
-     */ vk, /**
-     * Sibling path of the rollup circuit's vk in a big tree of rollup circuit vks.
-     */ vkWitness){
+     * The verification key and the witness of the vk in the vk tree.
+     */ vkData){
         this.baseOrMergeRollupPublicInputs = baseOrMergeRollupPublicInputs;
         this.proof = proof;
-        this.vk = vk;
-        this.vkWitness = vkWitness;
+        this.vkData = vkData;
     }
     /**
    * Serializes previous rollup data to a buffer.
    * @returns The buffer of the serialized previous rollup data.
    */ toBuffer() {
-        return serializeToBuffer(this.baseOrMergeRollupPublicInputs, this.proof, this.vk, this.vkWitness);
+        return serializeToBuffer(this.baseOrMergeRollupPublicInputs, this.proof, this.vkData);
     }
     /**
    * Deserializes previous rollup data from a buffer.
@@ -37,6 +32,6 @@ import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inp
    * @returns A new PreviousRollupData instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PreviousRollupData(reader.readObject(BaseOrMergeRollupPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VerificationKeyAsFields), MembershipWitness.fromBuffer(reader, VK_TREE_HEIGHT));
+        return new PreviousRollupData(reader.readObject(BaseOrMergeRollupPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
 }

package/dest/rollup/private_tube_data.d.ts

@@ -2,12 +2,12 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export declare class PrivateTubeData {
     publicInputs: PrivateToRollupKernelCircuitPublicInputs;
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    vkData: VkWitnessData;
-    constructor(publicInputs: PrivateToRollupKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkWitnessData);
+    vkData: VkData;
+    constructor(publicInputs: PrivateToRollupKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkData);
     static empty(): PrivateTubeData;
     static fromBuffer(buffer: Buffer | BufferReader): PrivateTubeData;
     toBuffer(): Buffer<ArrayBufferLike>;

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

@@ -1 +1 @@
-{"version":3,"file":"private_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/private_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,eAAe;IAEjB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,aAAa;gBAFrB,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,aAAa;IAG9B,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}
+{"version":3,"file":"private_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/private_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBAAa,eAAe;IAEjB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}

package/dest/rollup/private_tube_data.js

@@ -2,7 +2,7 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { PrivateToRollupKernelCircuitPublicInputs } from '../kernel/private_to_rollup_kernel_circuit_public_inputs.js';
 import { RecursiveProof, makeEmptyRecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export class PrivateTubeData {
     publicInputs;
     proof;
@@ -13,11 +13,11 @@ export class PrivateTubeData {
         this.vkData = vkData;
     }
     static empty() {
-        return new PrivateTubeData(PrivateToRollupKernelCircuitPublicInputs.empty(), makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VkWitnessData.empty());
+        return new PrivateTubeData(PrivateToRollupKernelCircuitPublicInputs.empty(), makeEmptyRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VkData.empty());
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PrivateTubeData(reader.readObject(PrivateToRollupKernelCircuitPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkWitnessData));
+        return new PrivateTubeData(reader.readObject(PrivateToRollupKernelCircuitPublicInputs), RecursiveProof.fromBuffer(reader, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), reader.readObject(VkData));
     }
     toBuffer() {
         return serializeToBuffer(this.publicInputs, this.proof, this.vkData);

package/dest/rollup/public_tube_data.d.ts

@@ -2,12 +2,12 @@ import { NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { PrivateToPublicKernelCircuitPublicInputs } from '../kernel/private_to_public_kernel_circuit_public_inputs.js';
 import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkWitnessData } from '../vks/vk_witness_data.js';
+import { VkData } from '../vks/index.js';
 export declare class PublicTubeData {
     publicInputs: PrivateToPublicKernelCircuitPublicInputs;
     proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
-    vkData: VkWitnessData;
-    constructor(publicInputs: PrivateToPublicKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkWitnessData);
+    vkData: VkData;
+    constructor(publicInputs: PrivateToPublicKernelCircuitPublicInputs, proof: RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>, vkData: VkData);
     static empty(): PublicTubeData;
     static fromBuffer(buffer: Buffer | BufferReader): PublicTubeData;
     toBuffer(): Buffer<ArrayBufferLike>;

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

@@ -1 +1 @@
-{"version":3,"file":"public_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/public_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,qBAAa,cAAc;IAEhB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,aAAa;gBAFrB,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,aAAa;IAG9B,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}
+{"version":3,"file":"public_tube_data.d.ts","sourceRoot":"","sources":["../../src/rollup/public_tube_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,wCAAwC,EAAE,MAAM,6DAA6D,CAAC;AACvH,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBAAa,cAAc;IAEhB,YAAY,EAAE,wCAAwC;IACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC;IACvE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,wCAAwC,EACtD,KAAK,EAAE,cAAc,CAAC,OAAO,yCAAyC,CAAC,EACvE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,KAAK;IAQZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;CAGT"}