@aztec/ivc-integration 0.85.0 → 0.86.0

package/src/prove_wasm.ts

@@ -1,9 +1,33 @@
+import { createLogger } from '@aztec/foundation/log';
+import { ClientIvcProof } 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[],
+  threads?: number,
+): Promise<ClientIvcProof> {
+  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 },
+  );
+  try {
+    const [proof] = await backend.prove(witnessStack.map((arr: Uint8Array) => ungzip(arr)));
+    return new ClientIvcProof(Buffer.from(proof));
+  } finally {
+    await backend.destroy();
+  }
+}
+
 export async function proveThenVerifyAztecClient(
   bytecodes: string[],
   witnessStack: Uint8Array[],
@@ -12,9 +36,10 @@ export async function proveThenVerifyAztecClient(
   const { AztecClientBackend } = await import('@aztec/bb.js');
   const backend = new AztecClientBackend(
     bytecodes.map(base64ToUint8Array).map((arr: Uint8Array) => ungzip(arr)),
-    { threads },
+    { threads: threads || Math.min(os.cpus().length, 16), logger: logger.info },
   );
   try {
+    // These are optional - easier not to pass them.
     const [proof, vk] = await backend.prove(witnessStack.map((arr: Uint8Array) => ungzip(arr)));
     const verified = await backend.verify(proof, vk);
     return verified;

package/src/types/index.ts

@@ -37,7 +37,7 @@ export type TubeData = {
 }
 
 export type VerificationKey = {
-  key: FixedLengthArray<Field, 139>;
+  key: FixedLengthArray<Field, 113>;
   hash: Field;
 }
 
@@ -81,13 +81,13 @@ export async function AppReader(commitments_to_read: FixedLengthArray<Field, 2>,
 export type MockPrivateKernelInitInputType = {
   tx: TxRequest;
   app_inputs: AppPublicInputs;
-  app_vk: FixedLengthArray<Field, 143>;
+  app_vk: FixedLengthArray<Field, 127>;
 }
 
 export type MockPrivateKernelInitReturnType = PrivateKernelPublicInputs;
 
 
-export async function MockPrivateKernelInit(tx: TxRequest, app_inputs: AppPublicInputs, app_vk: FixedLengthArray<Field, 143>, MockPrivateKernelInit_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<PrivateKernelPublicInputs> {
+export async function MockPrivateKernelInit(tx: TxRequest, app_inputs: AppPublicInputs, app_vk: FixedLengthArray<Field, 127>, MockPrivateKernelInit_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<PrivateKernelPublicInputs> {
   const program = new Noir(MockPrivateKernelInit_circuit);
   const args: InputMap = { tx, app_inputs, app_vk };
   const { returnValue } = await program.execute(args, foreignCallHandler);
@@ -95,15 +95,15 @@ export async function MockPrivateKernelInit(tx: TxRequest, app_inputs: AppPublic
 }
 export type MockPrivateKernelInnerInputType = {
   prev_kernel_public_inputs: PrivateKernelPublicInputs;
-  kernel_vk: FixedLengthArray<Field, 143>;
+  kernel_vk: FixedLengthArray<Field, 127>;
   app_inputs: AppPublicInputs;
-  app_vk: FixedLengthArray<Field, 143>;
+  app_vk: FixedLengthArray<Field, 127>;
 }
 
 export type MockPrivateKernelInnerReturnType = PrivateKernelPublicInputs;
 
 
-export async function MockPrivateKernelInner(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: FixedLengthArray<Field, 143>, app_inputs: AppPublicInputs, app_vk: FixedLengthArray<Field, 143>, MockPrivateKernelInner_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<PrivateKernelPublicInputs> {
+export async function MockPrivateKernelInner(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: FixedLengthArray<Field, 127>, app_inputs: AppPublicInputs, app_vk: FixedLengthArray<Field, 127>, MockPrivateKernelInner_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<PrivateKernelPublicInputs> {
   const program = new Noir(MockPrivateKernelInner_circuit);
   const args: InputMap = { prev_kernel_public_inputs, kernel_vk, app_inputs, app_vk };
   const { returnValue } = await program.execute(args, foreignCallHandler);
@@ -111,14 +111,14 @@ export async function MockPrivateKernelInner(prev_kernel_public_inputs: PrivateK
 }
 export type MockPrivateKernelResetInputType = {
   prev_kernel_public_inputs: PrivateKernelPublicInputs;
-  kernel_vk: FixedLengthArray<Field, 143>;
+  kernel_vk: FixedLengthArray<Field, 127>;
   commitment_read_hints: FixedLengthArray<u32, 4>;
 }
 
 export type MockPrivateKernelResetReturnType = PrivateKernelPublicInputs;
 
 
-export async function MockPrivateKernelReset(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: FixedLengthArray<Field, 143>, commitment_read_hints: FixedLengthArray<u32, 4>, MockPrivateKernelReset_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<PrivateKernelPublicInputs> {
+export async function MockPrivateKernelReset(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: FixedLengthArray<Field, 127>, commitment_read_hints: FixedLengthArray<u32, 4>, MockPrivateKernelReset_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<PrivateKernelPublicInputs> {
   const program = new Noir(MockPrivateKernelReset_circuit);
   const args: InputMap = { prev_kernel_public_inputs, kernel_vk, commitment_read_hints };
   const { returnValue } = await program.execute(args, foreignCallHandler);
@@ -126,13 +126,13 @@ export async function MockPrivateKernelReset(prev_kernel_public_inputs: PrivateK
 }
 export type MockPrivateKernelTailInputType = {
   prev_kernel_public_inputs: PrivateKernelPublicInputs;
-  kernel_vk: FixedLengthArray<Field, 143>;
+  kernel_vk: FixedLengthArray<Field, 127>;
 }
 
 export type MockPrivateKernelTailReturnType = KernelPublicInputs;
 
 
-export async function MockPrivateKernelTail(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: FixedLengthArray<Field, 143>, MockPrivateKernelTail_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<KernelPublicInputs> {
+export async function MockPrivateKernelTail(prev_kernel_public_inputs: PrivateKernelPublicInputs, kernel_vk: FixedLengthArray<Field, 127>, MockPrivateKernelTail_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<KernelPublicInputs> {
   const program = new Noir(MockPrivateKernelTail_circuit);
   const args: InputMap = { prev_kernel_public_inputs, kernel_vk };
   const { returnValue } = await program.execute(args, foreignCallHandler);

package/src/witgen.ts

@@ -6,10 +6,7 @@ import {
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { type ForeignCallOutput, Noir } from '@aztec/noir-noir_js';
-import type { PublicTxSimulationTester } from '@aztec/simulator/server';
 import type { AvmCircuitPublicInputs } from '@aztec/stdlib/avm';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { RecursiveProof } from '@aztec/stdlib/proofs';
 import type { VerificationKeyAsFields } from '@aztec/stdlib/vks';
 
@@ -348,26 +345,3 @@ export function mapAvmPublicInputsToNoir(
   }
   return serialized.map(x => x.toString()) as FixedLengthArray<string, typeof AVM_V2_PUBLIC_INPUTS_FLATTENED_SIZE>;
 }
-
-export async function simulateAvmBulkTesting(
-  simTester: PublicTxSimulationTester,
-  contractInstance: ContractInstanceWithAddress,
-) {
-  const argsField = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
-  const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
-  const args = [
-    argsField,
-    argsU8,
-    /*getInstanceForAddress=*/ contractInstance.address.toField(),
-    /*expectedDeployer=*/ contractInstance.deployer.toField(),
-    /*expectedClassId=*/ contractInstance.currentContractClassId.toField(),
-    /*expectedInitializationHash=*/ contractInstance.initializationHash.toField(),
-  ];
-
-  return await simTester.simulateTx(
-    /*sender=*/ AztecAddress.fromNumber(42),
-    /*setupCalls=*/ [],
-    /*appCalls=*/ [{ address: contractInstance.address, fnName: 'bulk_testing', args }],
-    /*teardownCall=*/ undefined,
-  );
-}