@aztec/ivc-integration 3.0.0-devnet.5 → 3.0.0-devnet.6-patch.1

package/src/types/index.ts

@@ -37,9 +37,9 @@ export type PrivateKernelPublicInputs = {
   read_requests: FixedLengthArray<Field, 4>;
 }
 
-export type CivcProofData = {
+export type ChonkProofData = {
   public_inputs: KernelPublicInputs;
-  proof: FixedLengthArray<Field, 2084>;
+  proof: FixedLengthArray<Field, 1963>;
   vk_data: VerificationKey<127>;
 }
 
@@ -186,7 +186,7 @@ export type RollupPublicInputs = {
 
 export type PreviousRollupData = {
   base_or_merge_public_inputs: RollupPublicInputs;
-  proof: FixedLengthArray<Field, 535>;
+  proof: FixedLengthArray<Field, 531>;
   vk: VerificationKey<115>;
 }
 
@@ -292,7 +292,7 @@ export async function MockPrivateKernelTail(prev_kernel_public_inputs: PrivateKe
   return returnValue as KernelPublicInputs;
 }
 export type MockRollupTxBasePublicInputType = {
-  civc_proof_data: CivcProofData;
+  chonk_proof_data: ChonkProofData;
   verification_key: VerificationKey<1000>;
   proof: FixedLengthArray<Field, 20000>;
   public_inputs: AvmCircuitPublicInputs;
@@ -301,22 +301,22 @@ export type MockRollupTxBasePublicInputType = {
 export type MockRollupTxBasePublicReturnType = RollupPublicInputs;
 
 
-export async 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 async function MockRollupTxBasePublic(chonk_proof_data: ChonkProofData, verification_key: VerificationKey<1000>, proof: FixedLengthArray<Field, 20000>, public_inputs: AvmCircuitPublicInputs, MockRollupTxBasePublic_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs> {
   const program = new Noir(MockRollupTxBasePublic_circuit);
-  const args: InputMap = { civc_proof_data, verification_key, proof, public_inputs };
+  const args: InputMap = { chonk_proof_data, verification_key, proof, public_inputs };
   const { returnValue } = await program.execute(args, foreignCallHandler);
   return returnValue as RollupPublicInputs;
 }
 export type MockRollupTxBasePrivateInputType = {
-  civc_proof_data: CivcProofData;
+  chonk_proof_data: ChonkProofData;
 }
 
 export type MockRollupTxBasePrivateReturnType = RollupPublicInputs;
 
 
-export async function MockRollupTxBasePrivate(civc_proof_data: CivcProofData, MockRollupTxBasePrivate_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs> {
+export async function MockRollupTxBasePrivate(chonk_proof_data: ChonkProofData, MockRollupTxBasePrivate_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs> {
   const program = new Noir(MockRollupTxBasePrivate_circuit);
-  const args: InputMap = { civc_proof_data };
+  const args: InputMap = { chonk_proof_data };
   const { returnValue } = await program.execute(args, foreignCallHandler);
   return returnValue as RollupPublicInputs;
 }

package/src/witgen.ts

@@ -4,7 +4,7 @@ import {
   MEGA_VK_LENGTH_IN_FIELDS,
 } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
 import { type ForeignCallInput, type ForeignCallOutput, Noir } from '@aztec/noir-noir_js';
 import type { AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
@@ -12,6 +12,7 @@ import type { RecursiveProof } from '@aztec/stdlib/proofs';
 import { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
 import { strict as assert } from 'assert';
+import { ungzip } from 'pako';
 
 import MockAppCreatorCircuit from '../artifacts/app_creator.json' with { type: 'json' };
 import MockAppReaderCircuit from '../artifacts/app_reader.json' with { type: 'json' };
@@ -251,7 +252,7 @@ export async function generateTestingIVCStack(
   // A call to the reader app creates 1 read request. A reset kernel will be run if there are 2 read requests in the
   // public inputs. All read requests must be cleared before running the tail kernel.
   numReaderAppCalls: number,
-): Promise<[string[], Uint8Array[], KernelPublicInputs, string[]]> {
+): Promise<[Uint8Array[], Uint8Array[], KernelPublicInputs, Uint8Array[]]> {
   if (numCreatorAppCalls > 2) {
     throw new Error('The creator app can only be called at most twice.');
   }
@@ -368,7 +369,22 @@ export async function generateTestingIVCStack(
   bytecodes.push(MockHidingCircuit.bytecode);
   vks.push(MockHidingVk.keyAsBytes);
 
-  return [bytecodes, witnessStack, hidingWitnessGenResult.publicInputs, vks];
+  function base64ToUint8Array(base64: string): Uint8Array {
+    return Uint8Array.from(atob(base64), c => c.charCodeAt(0));
+  }
+  function hexToUint8Array(hex: string): Uint8Array {
+    const cleaned = hex.replace(/^0x/i, '');
+    const bytes = new Uint8Array(cleaned.length / 2);
+    for (let i = 0; i < bytes.length; i++) {
+      bytes[i] = parseInt(cleaned.slice(i * 2, i * 2 + 2), 16);
+    }
+    return bytes;
+  }
+  const rawBytecodes = bytecodes.map(base64ToUint8Array).map((arr: Uint8Array) => ungzip(arr));
+  const rawWitnessStack = witnessStack.map((arr: Uint8Array) => ungzip(arr));
+  const rawVks = vks.map(hexToUint8Array);
+
+  return [rawBytecodes, rawWitnessStack, hidingWitnessGenResult.publicInputs, rawVks];
 }
 
 export function mapRecursiveProofToNoir<N extends number>(proof: RecursiveProof<N>): FixedLengthArray<string, N> {

package/dest/prove_wasm.d.ts

@@ -1,4 +0,0 @@
-import { ClientIvcProofWithPublicInputs } from '@aztec/stdlib/proofs';
-export declare function proveClientIVC(bytecodes: string[], witnessStack: Uint8Array[], vks: string[], threads?: number): Promise<ClientIvcProofWithPublicInputs>;
-export declare function proveThenVerifyAztecClient(bytecodes: string[], witnessStack: Uint8Array[], vks: string[], threads?: number): Promise<boolean>;
-//# sourceMappingURL=prove_wasm.d.ts.map

package/dest/prove_wasm.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prove_wasm.d.ts","sourceRoot":"","sources":["../src/prove_wasm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAWtE,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,UAAU,EAAE,EAC1B,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,8BAA8B,CAAC,CAezC;AAED,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,UAAU,EAAE,EAC1B,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAiBlB"}

package/dest/prove_wasm.js

@@ -1,38 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { ClientIvcProofWithPublicInputs } from '@aztec/stdlib/proofs';
-import os from 'os';
-import { ungzip } from 'pako';
-const logger = createLogger('ivc-integration:prove_wasm');
-function base64ToUint8Array(base64) {
-    return Uint8Array.from(atob(base64), (c)=>c.charCodeAt(0));
-}
-export async function proveClientIVC(bytecodes, witnessStack, vks, threads) {
-    const { AztecClientBackend } = await import('@aztec/bb.js');
-    const backend = new AztecClientBackend(bytecodes.map(base64ToUint8Array).map((arr)=>ungzip(arr)), {
-        threads: threads || Math.min(os.cpus().length, 16),
-        logger: logger.info,
-        wasmPath: process.env.BB_WASM_PATH
-    });
-    try {
-        const [proof] = await backend.prove(witnessStack.map((arr)=>ungzip(arr)), vks.map((hex)=>new Uint8Array(Buffer.from(hex, 'hex'))));
-        return ClientIvcProofWithPublicInputs.fromBufferArray(proof);
-    } finally{
-        await backend.destroy();
-    }
-}
-export async function proveThenVerifyAztecClient(bytecodes, witnessStack, vks, threads) {
-    const { AztecClientBackend } = await import('@aztec/bb.js');
-    const backend = new AztecClientBackend(bytecodes.map(base64ToUint8Array).map((arr)=>ungzip(arr)), {
-        threads: threads || Math.min(os.cpus().length, 16),
-        logger: logger.info,
-        wasmPath: process.env.BB_WASM_PATH
-    });
-    try {
-        // These are optional - easier not to pass them.
-        const [_, msgpackProof, vk] = await backend.prove(witnessStack.map((arr)=>ungzip(arr)), vks.map((hex)=>new Uint8Array(Buffer.from(hex, 'hex'))));
-        const verified = await backend.verify(msgpackProof, vk);
-        return verified;
-    } finally{
-        await backend.destroy();
-    }
-}

package/src/prove_wasm.ts

@@ -1,57 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { ClientIvcProofWithPublicInputs } from '@aztec/stdlib/proofs';
-
-import os from 'os';
-import { ungzip } from 'pako';
-
-const logger = createLogger('ivc-integration:prove_wasm');
-
-function base64ToUint8Array(base64: string): Uint8Array {
-  return Uint8Array.from(atob(base64), c => c.charCodeAt(0));
-}
-
-export async function proveClientIVC(
-  bytecodes: string[],
-  witnessStack: Uint8Array[],
-  vks: string[],
-  threads?: number,
-): Promise<ClientIvcProofWithPublicInputs> {
-  const { AztecClientBackend } = await import('@aztec/bb.js');
-  const backend = new AztecClientBackend(
-    bytecodes.map(base64ToUint8Array).map((arr: Uint8Array) => ungzip(arr)),
-    { threads: threads || Math.min(os.cpus().length, 16), logger: logger.info, wasmPath: process.env.BB_WASM_PATH },
-  );
-  try {
-    const [proof] = await backend.prove(
-      witnessStack.map((arr: Uint8Array) => ungzip(arr)),
-      vks.map(hex => new Uint8Array(Buffer.from(hex, 'hex'))),
-    );
-    return ClientIvcProofWithPublicInputs.fromBufferArray(proof);
-  } finally {
-    await backend.destroy();
-  }
-}
-
-export async function proveThenVerifyAztecClient(
-  bytecodes: string[],
-  witnessStack: Uint8Array[],
-  vks: string[],
-  threads?: number,
-): Promise<boolean> {
-  const { AztecClientBackend } = await import('@aztec/bb.js');
-  const backend = new AztecClientBackend(
-    bytecodes.map(base64ToUint8Array).map((arr: Uint8Array) => ungzip(arr)),
-    { threads: threads || Math.min(os.cpus().length, 16), logger: logger.info, wasmPath: process.env.BB_WASM_PATH },
-  );
-  try {
-    // These are optional - easier not to pass them.
-    const [_, msgpackProof, vk] = await backend.prove(
-      witnessStack.map((arr: Uint8Array) => ungzip(arr)),
-      vks.map(hex => new Uint8Array(Buffer.from(hex, 'hex'))),
-    );
-    const verified = await backend.verify(msgpackProof, vk);
-    return verified;
-  } finally {
-    await backend.destroy();
-  }
-}