@aztec/ivc-integration 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/types/index.d.ts

@@ -26,18 +26,20 @@ export type PrivateKernelPublicInputs = {
     commitments: FixedLengthArray<Field, 4>;
     read_requests: FixedLengthArray<Field, 4>;
 };
-export type TubeData = {
+export type CivcProofData = {
     public_inputs: KernelPublicInputs;
-    proof: FixedLengthArray<Field, 535>;
-    vk_data: VerificationKey<115>;
+    proof: FixedLengthArray<Field, 2084>;
+    vk_data: VerificationKey<127>;
 };
 export type AvmCircuitPublicInputs = {
     global_variables: GlobalVariables;
+    protocol_contracts: ProtocolContracts;
     start_tree_snapshots: TreeSnapshots;
     start_gas_used: Gas;
     gas_settings: GasSettings;
     effective_gas_fees: GasFees;
     fee_payer: AztecAddress;
+    prover_id: Field;
     public_call_request_array_lengths: PublicCallRequestArrayLengths;
     public_setup_call_requests: FixedLengthArray<PublicCallRequest, 32>;
     public_app_logic_call_requests: FixedLengthArray<PublicCallRequest, 32>;
@@ -63,6 +65,9 @@ export type GlobalVariables = {
     fee_recipient: AztecAddress;
     gas_fees: GasFees;
 };
+export type ProtocolContracts = {
+    derived_addresses: FixedLengthArray<AztecAddress, 11>;
+};
 export type TreeSnapshots = {
     l1_to_l2_message_tree: AppendOnlyTreeSnapshot;
     note_hash_tree: AppendOnlyTreeSnapshot;
@@ -111,14 +116,13 @@ export type AvmAccumulatedDataArrayLengths = {
     note_hashes: u32;
     nullifiers: u32;
     l2_to_l1_msgs: u32;
-    public_logs: u32;
     public_data_writes: u32;
 };
 export type AvmAccumulatedData = {
     note_hashes: FixedLengthArray<Field, 64>;
     nullifiers: FixedLengthArray<Field, 64>;
     l2_to_l1_msgs: FixedLengthArray<Scoped, 8>;
-    public_logs: FixedLengthArray<PublicLog, 8>;
+    public_logs: PublicLogs;
     public_data_writes: FixedLengthArray<PublicDataWrite, 64>;
 };
 export type EthAddress = {
@@ -126,15 +130,15 @@ export type EthAddress = {
 };
 export type AppendOnlyTreeSnapshot = {
     root: Field;
-    next_available_leaf_index: u32;
+    next_available_leaf_index: Field;
 };
 export type Scoped = {
     inner: L2ToL1Message;
     contract_address: AztecAddress;
 };
-export type PublicLog = {
-    log: Log;
-    contract_address: AztecAddress;
+export type PublicLogs = {
+    length: u32;
+    payload: FixedLengthArray<Field, 4096>;
 };
 export type PublicDataWrite = {
     leaf_slot: Field;
@@ -144,10 +148,6 @@ export type L2ToL1Message = {
     recipient: EthAddress;
     content: Field;
 };
-export type Log = {
-    fields: FixedLengthArray<Field, 13>;
-    length: u32;
-};
 export type RollupPublicInputs = {
     accumulated: u32;
 };
@@ -200,25 +200,25 @@ export type MockPrivateKernelTailInputType = {
 };
 export type MockPrivateKernelTailReturnType = KernelPublicInputs;
 export declare function MockPrivateKernelTail(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: VerificationKey<127>, MockPrivateKernelTail_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<KernelPublicInputs>;
-export type MockRollupBasePublicInputType = {
-    tube_data: TubeData;
+export type MockRollupTxBasePublicInputType = {
+    civc_proof_data: CivcProofData;
     verification_key: VerificationKey<1000>;
     proof: FixedLengthArray<Field, 20000>;
     public_inputs: AvmCircuitPublicInputs;
 };
-export type MockRollupBasePublicReturnType = RollupPublicInputs;
-export declare function MockRollupBasePublic(tube_data: TubeData, verification_key: VerificationKey<1000>, proof: FixedLengthArray<Field, 20000>, public_inputs: AvmCircuitPublicInputs, MockRollupBasePublic_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs>;
-export type MockRollupBasePrivateInputType = {
-    tube_data: TubeData;
+export type MockRollupTxBasePublicReturnType = RollupPublicInputs;
+export declare function MockRollupTxBasePublic(civc_proof_data: CivcProofData, verification_key: VerificationKey<1000>, proof: FixedLengthArray<Field, 20000>, public_inputs: AvmCircuitPublicInputs, MockRollupTxBasePublic_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs>;
+export type MockRollupTxBasePrivateInputType = {
+    civc_proof_data: CivcProofData;
 };
-export type MockRollupBasePrivateReturnType = RollupPublicInputs;
-export declare function MockRollupBasePrivate(tube_data: TubeData, MockRollupBasePrivate_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs>;
-export type MockRollupMergeInputType = {
+export type MockRollupTxBasePrivateReturnType = RollupPublicInputs;
+export declare function MockRollupTxBasePrivate(civc_proof_data: CivcProofData, MockRollupTxBasePrivate_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs>;
+export type MockRollupTxMergeInputType = {
     a: PreviousRollupData;
     b: PreviousRollupData;
 };
-export type MockRollupMergeReturnType = RollupPublicInputs;
-export declare function MockRollupMerge(a: PreviousRollupData, b: PreviousRollupData, MockRollupMerge_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs>;
+export type MockRollupTxMergeReturnType = RollupPublicInputs;
+export declare function MockRollupTxMerge(a: PreviousRollupData, b: PreviousRollupData, MockRollupTxMerge_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs>;
 export type MockRollupRootInputType = {
     a: PreviousRollupData;
     b: PreviousRollupData;

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

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

package/dest/types/index.js

@@ -64,10 +64,10 @@ export async function MockPrivateKernelTail(prev_kernel_public_inputs, kernel_vk
     const { returnValue } = await program.execute(args, foreignCallHandler);
     return returnValue;
 }
-export async function MockRollupBasePublic(tube_data, verification_key, proof, public_inputs, MockRollupBasePublic_circuit, foreignCallHandler) {
-    const program = new Noir(MockRollupBasePublic_circuit);
+export async function MockRollupTxBasePublic(civc_proof_data, verification_key, proof, public_inputs, MockRollupTxBasePublic_circuit, foreignCallHandler) {
+    const program = new Noir(MockRollupTxBasePublic_circuit);
     const args = {
-        tube_data,
+        civc_proof_data,
         verification_key,
         proof,
         public_inputs
@@ -75,16 +75,16 @@ export async function MockRollupBasePublic(tube_data, verification_key, proof, p
     const { returnValue } = await program.execute(args, foreignCallHandler);
     return returnValue;
 }
-export async function MockRollupBasePrivate(tube_data, MockRollupBasePrivate_circuit, foreignCallHandler) {
-    const program = new Noir(MockRollupBasePrivate_circuit);
+export async function MockRollupTxBasePrivate(civc_proof_data, MockRollupTxBasePrivate_circuit, foreignCallHandler) {
+    const program = new Noir(MockRollupTxBasePrivate_circuit);
     const args = {
-        tube_data
+        civc_proof_data
     };
     const { returnValue } = await program.execute(args, foreignCallHandler);
     return returnValue;
 }
-export async function MockRollupMerge(a, b, MockRollupMerge_circuit, foreignCallHandler) {
-    const program = new Noir(MockRollupMerge_circuit);
+export async function MockRollupTxMerge(a, b, MockRollupTxMerge_circuit, foreignCallHandler) {
+    const program = new Noir(MockRollupTxMerge_circuit);
     const args = {
         a,
         b

package/dest/witgen.d.ts

@@ -5,27 +5,57 @@ import type { RecursiveProof } from '@aztec/stdlib/proofs';
 import { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 import MockAppCreatorCircuit from '../artifacts/app_creator.json';
 import MockAppReaderCircuit from '../artifacts/app_reader.json';
-import MockAppCreatorVk from '../artifacts/keys/app_creator.vk.data.json';
-import MockAppReaderVk from '../artifacts/keys/app_reader.vk.data.json';
-import MockPrivateKernelInitVk from '../artifacts/keys/mock_private_kernel_init.vk.data.json';
-import MockPrivateKernelInnerVk from '../artifacts/keys/mock_private_kernel_inner.vk.data.json';
-import MockPrivateKernelResetVk from '../artifacts/keys/mock_private_kernel_reset.vk.data.json';
-import MockPrivateKernelTailVk from '../artifacts/keys/mock_private_kernel_tail.vk.data.json';
-import MockRollupBasePrivateVk from '../artifacts/keys/mock_rollup_base_private.vk.data.json';
-import MockRollupBasePublicVk from '../artifacts/keys/mock_rollup_base_public.vk.data.json';
-import MockRollupMergeVk from '../artifacts/keys/mock_rollup_merge.vk.data.json';
-import MockRollupRootVk from '../artifacts/keys/mock_rollup_root.vk.data.json';
 import MockHidingCircuit from '../artifacts/mock_hiding.json';
 import MockPrivateKernelInitCircuit from '../artifacts/mock_private_kernel_init.json';
 import MockPrivateKernelInnerCircuit from '../artifacts/mock_private_kernel_inner.json';
 import MockPrivateKernelResetCircuit from '../artifacts/mock_private_kernel_reset.json';
 import MockPrivateKernelTailCircuit from '../artifacts/mock_private_kernel_tail.json';
-import MockRollupBasePrivateCircuit from '../artifacts/mock_rollup_base_private.json';
-import MockRollupBasePublicCircuit from '../artifacts/mock_rollup_base_public.json';
-import MockRollupMergeCircuit from '../artifacts/mock_rollup_merge.json';
 import MockRollupRootCircuit from '../artifacts/mock_rollup_root.json';
-import type { AppCreatorInputType, AppPublicInputs, AppReaderInputType, FixedLengthArray, KernelPublicInputs, MockHidingInputType, MockPrivateKernelInitInputType, MockPrivateKernelInnerInputType, MockPrivateKernelResetInputType, MockPrivateKernelTailInputType, MockRollupBasePrivateInputType, MockRollupBasePublicInputType, MockRollupMergeInputType, MockRollupRootInputType, PrivateKernelPublicInputs, RollupPublicInputs, VerificationKey } from './types/index.js';
-export { MockAppCreatorCircuit, MockAppCreatorVk, MockAppReaderCircuit, MockAppReaderVk, MockPrivateKernelInitCircuit, MockPrivateKernelInitVk, MockPrivateKernelInnerCircuit, MockPrivateKernelInnerVk, MockPrivateKernelResetCircuit, MockPrivateKernelResetVk, MockPrivateKernelTailCircuit, MockHidingCircuit, MockPrivateKernelTailVk, MockRollupBasePrivateCircuit, MockRollupBasePrivateVk, MockRollupBasePublicCircuit, MockRollupBasePublicVk, MockRollupMergeCircuit, MockRollupMergeVk, MockRollupRootCircuit, MockRollupRootVk, };
+import MockRollupTxBasePrivateCircuit from '../artifacts/mock_rollup_tx_base_private.json';
+import MockRollupTxBasePublicCircuit from '../artifacts/mock_rollup_tx_base_public.json';
+import MockRollupTxMergeCircuit from '../artifacts/mock_rollup_tx_merge.json';
+import type { AppCreatorInputType, AppPublicInputs, AppReaderInputType, FixedLengthArray, KernelPublicInputs, MockHidingInputType, MockPrivateKernelInitInputType, MockPrivateKernelInnerInputType, MockPrivateKernelResetInputType, MockPrivateKernelTailInputType, MockRollupRootInputType, MockRollupTxBasePrivateInputType, MockRollupTxBasePublicInputType, MockRollupTxMergeInputType, PrivateKernelPublicInputs, RollupPublicInputs, VerificationKey } from './types/index.js';
+declare const MockAppCreatorVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockAppReaderVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockPrivateKernelInitVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockPrivateKernelInnerVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockPrivateKernelResetVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockPrivateKernelTailVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockRollupTxBasePrivateVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockRollupTxBasePublicVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockRollupTxMergeVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+declare const MockRollupRootVk: {
+    keyAsBytes: any;
+    keyAsFields: any;
+};
+export { MockAppCreatorCircuit, MockAppCreatorVk, MockAppReaderCircuit, MockAppReaderVk, MockPrivateKernelInitCircuit, MockPrivateKernelInitVk, MockPrivateKernelInnerCircuit, MockPrivateKernelInnerVk, MockPrivateKernelResetCircuit, MockPrivateKernelResetVk, MockPrivateKernelTailCircuit, MockHidingCircuit, MockPrivateKernelTailVk, MockRollupTxBasePrivateCircuit, MockRollupTxBasePrivateVk, MockRollupTxBasePublicCircuit, MockRollupTxBasePublicVk, MockRollupTxMergeCircuit, MockRollupTxMergeVk, MockRollupRootCircuit, MockRollupRootVk, };
 export declare function getVkAsFields({ keyAsFields, }: {
     keyAsFields: string[];
 }): Promise<VerificationKey<typeof MEGA_VK_LENGTH_IN_FIELDS>>;
@@ -41,9 +71,9 @@ export declare function witnessGenMockPrivateKernelInnerCircuit(args: MockPrivat
 export declare function witnessGenMockPrivateKernelResetCircuit(args: MockPrivateKernelResetInputType): Promise<WitnessGenResult<PrivateKernelPublicInputs>>;
 export declare function witnessGenMockPrivateKernelTailCircuit(args: MockPrivateKernelTailInputType): Promise<WitnessGenResult<KernelPublicInputs>>;
 export declare function witnessGenMockHidingCircuit(args: MockHidingInputType): Promise<WitnessGenResult<KernelPublicInputs>>;
-export declare function witnessGenMockPublicBaseCircuit(args: MockRollupBasePublicInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
-export declare function witnessGenMockRollupBasePrivateCircuit(args: MockRollupBasePrivateInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
-export declare function witnessGenMockRollupMergeCircuit(args: MockRollupMergeInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
+export declare function witnessGenMockPublicBaseCircuit(args: MockRollupTxBasePublicInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
+export declare function witnessGenMockRollupTxBasePrivateCircuit(args: MockRollupTxBasePrivateInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
+export declare function witnessGenMockRollupTxMergeCircuit(args: MockRollupTxMergeInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
 export declare function witnessGenMockRollupRootCircuit(args: MockRollupRootInputType): Promise<WitnessGenResult<RollupPublicInputs>>;
 export declare function generateTestingIVCStack(numCreatorAppCalls: number, numReaderAppCalls: number): Promise<[string[], Uint8Array[], KernelPublicInputs, string[]]>;
 export declare function mapRecursiveProofToNoir<N extends number>(proof: RecursiveProof<N>): FixedLengthArray<string, N>;

package/dest/witgen.d.ts.map

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

package/dest/witgen.js

@@ -11,39 +11,6 @@ import MockAppCreatorCircuit from '../artifacts/app_creator.json' with {
 import MockAppReaderCircuit from '../artifacts/app_reader.json' with {
     type: 'json'
 };
-import MockAppCreatorVk from '../artifacts/keys/app_creator.vk.data.json' with {
-    type: 'json'
-};
-import MockAppReaderVk from '../artifacts/keys/app_reader.vk.data.json' with {
-    type: 'json'
-};
-import MockHidingVk from '../artifacts/keys/mock_hiding.vk.data.json' with {
-    type: 'json'
-};
-import MockPrivateKernelInitVk from '../artifacts/keys/mock_private_kernel_init.vk.data.json' with {
-    type: 'json'
-};
-import MockPrivateKernelInnerVk from '../artifacts/keys/mock_private_kernel_inner.vk.data.json' with {
-    type: 'json'
-};
-import MockPrivateKernelResetVk from '../artifacts/keys/mock_private_kernel_reset.vk.data.json' with {
-    type: 'json'
-};
-import MockPrivateKernelTailVk from '../artifacts/keys/mock_private_kernel_tail.vk.data.json' with {
-    type: 'json'
-};
-import MockRollupBasePrivateVk from '../artifacts/keys/mock_rollup_base_private.vk.data.json' with {
-    type: 'json'
-};
-import MockRollupBasePublicVk from '../artifacts/keys/mock_rollup_base_public.vk.data.json' with {
-    type: 'json'
-};
-import MockRollupMergeVk from '../artifacts/keys/mock_rollup_merge.vk.data.json' with {
-    type: 'json'
-};
-import MockRollupRootVk from '../artifacts/keys/mock_rollup_root.vk.data.json' with {
-    type: 'json'
-};
 import MockHidingCircuit from '../artifacts/mock_hiding.json' with {
     type: 'json'
 };
@@ -59,20 +26,39 @@ import MockPrivateKernelResetCircuit from '../artifacts/mock_private_kernel_rese
 import MockPrivateKernelTailCircuit from '../artifacts/mock_private_kernel_tail.json' with {
     type: 'json'
 };
-import MockRollupBasePrivateCircuit from '../artifacts/mock_rollup_base_private.json' with {
+import MockRollupRootCircuit from '../artifacts/mock_rollup_root.json' with {
     type: 'json'
 };
-import MockRollupBasePublicCircuit from '../artifacts/mock_rollup_base_public.json' with {
+import MockRollupTxBasePrivateCircuit from '../artifacts/mock_rollup_tx_base_private.json' with {
     type: 'json'
 };
-import MockRollupMergeCircuit from '../artifacts/mock_rollup_merge.json' with {
+import MockRollupTxBasePublicCircuit from '../artifacts/mock_rollup_tx_base_public.json' with {
     type: 'json'
 };
-import MockRollupRootCircuit from '../artifacts/mock_rollup_root.json' with {
+import MockRollupTxMergeCircuit from '../artifacts/mock_rollup_tx_merge.json' with {
     type: 'json'
 };
+// Helper to extract VK from circuit artifact
+function extractVkFromCircuit(circuit) {
+    return {
+        keyAsBytes: circuit.verificationKey.bytes,
+        keyAsFields: circuit.verificationKey.fields
+    };
+}
+// Extract VKs from circuit artifacts
+const MockAppCreatorVk = extractVkFromCircuit(MockAppCreatorCircuit);
+const MockAppReaderVk = extractVkFromCircuit(MockAppReaderCircuit);
+const MockPrivateKernelInitVk = extractVkFromCircuit(MockPrivateKernelInitCircuit);
+const MockPrivateKernelInnerVk = extractVkFromCircuit(MockPrivateKernelInnerCircuit);
+const MockPrivateKernelResetVk = extractVkFromCircuit(MockPrivateKernelResetCircuit);
+const MockPrivateKernelTailVk = extractVkFromCircuit(MockPrivateKernelTailCircuit);
+const MockHidingVk = extractVkFromCircuit(MockHidingCircuit);
+const MockRollupTxBasePrivateVk = extractVkFromCircuit(MockRollupTxBasePrivateCircuit);
+const MockRollupTxBasePublicVk = extractVkFromCircuit(MockRollupTxBasePublicCircuit);
+const MockRollupTxMergeVk = extractVkFromCircuit(MockRollupTxMergeCircuit);
+const MockRollupRootVk = extractVkFromCircuit(MockRollupRootCircuit);
 // Re export the circuit jsons
-export { MockAppCreatorCircuit, MockAppCreatorVk, MockAppReaderCircuit, MockAppReaderVk, MockPrivateKernelInitCircuit, MockPrivateKernelInitVk, MockPrivateKernelInnerCircuit, MockPrivateKernelInnerVk, MockPrivateKernelResetCircuit, MockPrivateKernelResetVk, MockPrivateKernelTailCircuit, MockHidingCircuit, MockPrivateKernelTailVk, MockRollupBasePrivateCircuit, MockRollupBasePrivateVk, MockRollupBasePublicCircuit, MockRollupBasePublicVk, MockRollupMergeCircuit, MockRollupMergeVk, MockRollupRootCircuit, MockRollupRootVk };
+export { MockAppCreatorCircuit, MockAppCreatorVk, MockAppReaderCircuit, MockAppReaderVk, MockPrivateKernelInitCircuit, MockPrivateKernelInitVk, MockPrivateKernelInnerCircuit, MockPrivateKernelInnerVk, MockPrivateKernelResetCircuit, MockPrivateKernelResetVk, MockPrivateKernelTailCircuit, MockHidingCircuit, MockPrivateKernelTailVk, MockRollupTxBasePrivateCircuit, MockRollupTxBasePrivateVk, MockRollupTxBasePublicCircuit, MockRollupTxBasePublicVk, MockRollupTxMergeCircuit, MockRollupTxMergeVk, MockRollupRootCircuit, MockRollupRootVk };
 /* eslint-disable camelcase */ const log = createLogger('aztec:ivc-test');
 export async function getVkAsFields({ keyAsFields }) {
     const key = keyAsFields.map((f)=>Fr.fromString(f));
@@ -149,23 +135,23 @@ export async function witnessGenMockHidingCircuit(args) {
     };
 }
 export async function witnessGenMockPublicBaseCircuit(args) {
-    const program = new Noir(MockRollupBasePublicCircuit);
+    const program = new Noir(MockRollupTxBasePublicCircuit);
     const { witness, returnValue } = await program.execute(args, foreignCallHandler);
     return {
         witness,
         publicInputs: returnValue
     };
 }
-export async function witnessGenMockRollupBasePrivateCircuit(args) {
-    const program = new Noir(MockRollupBasePrivateCircuit);
+export async function witnessGenMockRollupTxBasePrivateCircuit(args) {
+    const program = new Noir(MockRollupTxBasePrivateCircuit);
     const { witness, returnValue } = await program.execute(args, foreignCallHandler);
     return {
         witness,
         publicInputs: returnValue
     };
 }
-export async function witnessGenMockRollupMergeCircuit(args) {
-    const program = new Noir(MockRollupMergeCircuit);
+export async function witnessGenMockRollupTxMergeCircuit(args) {
+    const program = new Noir(MockRollupTxMergeCircuit);
     const { witness, returnValue } = await program.execute(args, foreignCallHandler);
     return {
         witness,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ivc-integration",
-  "version": "2.1.0-rc.9",
+  "version": "3.0.0-devnet.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -62,14 +62,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "2.1.0-rc.9",
-    "@aztec/constants": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/noir-noir_codegen": "2.1.0-rc.9",
-    "@aztec/noir-noir_js": "2.1.0-rc.9",
-    "@aztec/noir-noirc_abi": "2.1.0-rc.9",
-    "@aztec/noir-types": "2.1.0-rc.9",
-    "@aztec/stdlib": "2.1.0-rc.9",
+    "@aztec/bb.js": "3.0.0-devnet.2",
+    "@aztec/constants": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/noir-noir_codegen": "3.0.0-devnet.2",
+    "@aztec/noir-noir_js": "3.0.0-devnet.2",
+    "@aztec/noir-noirc_abi": "3.0.0-devnet.2",
+    "@aztec/noir-types": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
     "change-case": "^5.4.4",
     "pako": "^2.1.0",
     "playwright": "1.49.0",
@@ -77,13 +77,13 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/bb-prover": "2.1.0-rc.9",
-    "@aztec/kv-store": "2.1.0-rc.9",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.9",
-    "@aztec/noir-test-contracts.js": "2.1.0-rc.9",
-    "@aztec/simulator": "2.1.0-rc.9",
-    "@aztec/telemetry-client": "2.1.0-rc.9",
-    "@aztec/world-state": "2.1.0-rc.9",
+    "@aztec/bb-prover": "3.0.0-devnet.2",
+    "@aztec/kv-store": "3.0.0-devnet.2",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.2",
+    "@aztec/noir-test-contracts.js": "3.0.0-devnet.2",
+    "@aztec/simulator": "3.0.0-devnet.2",
+    "@aztec/telemetry-client": "3.0.0-devnet.2",
+    "@aztec/world-state": "3.0.0-devnet.2",
     "@jest/globals": "^30.0.0",
     "@playwright/test": "1.49.0",
     "@types/jest": "^30.0.0",

package/src/prove_native.ts

@@ -8,33 +8,46 @@ import {
   extractVkData,
   generateAvmProof,
   generateProof,
-  generateTubeProof,
-  readClientIVCProofFromOutputDirectory,
-  readProofAsFields,
+  readProofsFromOutputDirectory,
   verifyAvmProof,
   verifyProof,
 } from '@aztec/bb-prover';
 import {
   AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
   AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED,
+  CIVC_PROOF_LENGTH,
   NESTED_RECURSIVE_PROOF_LENGTH,
   RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-  TUBE_PROOF_LENGTH,
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
-import { makeProofAndVerificationKey } from '@aztec/stdlib/interfaces/server';
+import { type ProofAndVerificationKey, makeProofAndVerificationKey } from '@aztec/stdlib/interfaces/server';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
-import type { ClientIvcProof, Proof } from '@aztec/stdlib/proofs';
+import type { Proof } from '@aztec/stdlib/proofs';
 import { enhanceProofWithPiValidationFlag } from '@aztec/stdlib/rollup';
-import { VerificationKeyAsFields, type VerificationKeyData } from '@aztec/stdlib/vks';
+import { VerificationKeyAsFields, VerificationKeyData } from '@aztec/stdlib/vks';
 
 import * as fs from 'fs/promises';
 import { Encoder } from 'msgpackr';
 import * as path from 'path';
 
+/**
+ * Converts verification key bytes from a compiled circuit to VerificationKeyData format
+ * @param vkBytes - The verification key bytes from the circuit
+ * @returns The verification key data
+ */
+async function convertVkBytesToVkData(vkBytes: Buffer): Promise<VerificationKeyData> {
+  // Convert binary to field elements (32 bytes per field)
+  const numFields = vkBytes.length / Fr.SIZE_IN_BYTES;
+  const reader = BufferReader.asReader(vkBytes);
+  const fields = reader.readArray(numFields, Fr);
+
+  const vkAsFields = await VerificationKeyAsFields.fromKey(fields);
+  return new VerificationKeyData(vkAsFields, vkBytes);
+}
+
 export async function proveClientIVC(
   bbBinaryPath: string,
   bbWorkingDirectory: string,
@@ -42,7 +55,7 @@ export async function proveClientIVC(
   bytecodes: string[],
   vks: string[],
   logger: Logger,
-): Promise<ClientIvcProof> {
+): Promise<ProofAndVerificationKey<typeof CIVC_PROOF_LENGTH>> {
   const stepToStruct = (bytecode: string, index: number) => {
     return {
       bytecode: Buffer.from(bytecode, 'base64'),
@@ -67,7 +80,10 @@ export async function proveClientIVC(
     throw new Error(provingResult.reason);
   }
 
-  return readClientIVCProofFromOutputDirectory(bbWorkingDirectory);
+  const vk = await extractVkData(provingResult.vkDirectoryPath!);
+  const proof = await readProofsFromOutputDirectory(provingResult.proofPath!, vk, CIVC_PROOF_LENGTH, logger);
+
+  return makeProofAndVerificationKey(proof, vk);
 }
 
 async function verifyProofWithKey(
@@ -93,22 +109,6 @@ async function verifyProofWithKey(
   logger.info(`Successfully verified proof from key in ${result.durationMs} ms`);
 }
 
-export async function proveTube(pathToBB: string, workingDirectory: string, logger: Logger) {
-  const tubeResult = await generateTubeProof(pathToBB, workingDirectory, workingDirectory.concat('/vk'), logger.info);
-
-  if (tubeResult.status != BB_RESULT.SUCCESS) {
-    throw new Error('Failed to prove tube');
-  }
-
-  const tubeVK = await extractVkData(tubeResult.vkDirectoryPath!);
-  const tubeProof = await readProofAsFields(tubeResult.proofPath!, tubeVK, TUBE_PROOF_LENGTH, logger);
-
-  // Sanity check the tube proof
-  await verifyProofWithKey(pathToBB, workingDirectory, tubeVK, tubeProof.binaryProof, 'ultra_rollup_honk', logger);
-
-  return makeProofAndVerificationKey(tubeProof, tubeVK);
-}
-
 async function proveRollupCircuit<T extends UltraHonkFlavor, ProofLength extends number>(
   name: string,
   pathToBB: string,
@@ -120,11 +120,13 @@ async function proveRollupCircuit<T extends UltraHonkFlavor, ProofLength extends
   proofLength: ProofLength,
 ) {
   await fs.writeFile(path.join(workingDirectory, 'witness.gz'), witness);
+  const vkBuffer = Buffer.from(circuit.verificationKey.bytes, 'hex');
   const proofResult = await generateProof(
     pathToBB,
     workingDirectory,
     name,
     Buffer.from(circuit.bytecode, 'base64'),
+    vkBuffer,
     path.join(workingDirectory, 'witness.gz'),
     flavor,
     logger,
@@ -134,8 +136,8 @@ async function proveRollupCircuit<T extends UltraHonkFlavor, ProofLength extends
     throw new Error(`Failed to generate proof for ${name} with flavor ${flavor}`);
   }
 
-  const vk = await extractVkData(proofResult.vkDirectoryPath!);
-  const proof = await readProofAsFields(proofResult.proofPath!, vk, proofLength, logger);
+  const vk = await convertVkBytesToVkData(vkBuffer);
+  const proof = await readProofsFromOutputDirectory(proofResult.proofPath!, vk, proofLength, logger);
 
   await verifyProofWithKey(pathToBB, workingDirectory, vk, proof.binaryProof, flavor, logger);
 
@@ -193,7 +195,7 @@ export async function proveAvm(
   publicInputs: AvmCircuitPublicInputs;
 }> {
   // The paths for the barretenberg binary and the write path are hardcoded for now.
-  const bbPath = path.resolve('../../barretenberg/cpp/build/bin/bb');
+  const bbPath = path.resolve('../../barretenberg/cpp/build/bin/bb-avm');
 
   // Then we prove.
   const proofRes = await generateAvmProof(bbPath, workingDirectory, avmCircuitInputs, logger);