@aztec/ivc-integration 3.0.3 → 4.0.0-devnet.1-patch.0

package/src/prove_native.ts

@@ -12,7 +12,6 @@ import {
 } from '@aztec/bb-prover';
 import {
   AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
-  AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED,
   CHONK_PROOF_LENGTH,
   HIDING_KERNEL_IO_PUBLIC_INPUTS_SIZE,
   NESTED_RECURSIVE_PROOF_LENGTH,
@@ -25,7 +24,6 @@ import type { AvmCircuitInputs, AvmCircuitPublicInputs } from '@aztec/stdlib/avm
 import { makeProofAndVerificationKey } from '@aztec/stdlib/interfaces/server';
 import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
 import { Proof, RecursiveProof } from '@aztec/stdlib/proofs';
-import { enhanceProofWithPiValidationFlag } from '@aztec/stdlib/rollup';
 import { VerificationKeyAsFields, VerificationKeyData } from '@aztec/stdlib/vks';
 
 import * as fs from 'fs/promises';
@@ -153,9 +151,7 @@ export async function proveAvm(
   avmCircuitInputs: AvmCircuitInputs,
   workingDirectory: string,
   logger: Logger,
-  skipPublicInputsValidation: boolean = false,
 ): Promise<{
-  vk: VerificationKeyAsFields;
   proof: Fr[];
   publicInputs: AvmCircuitPublicInputs;
 }> {
@@ -171,11 +167,7 @@ export async function proveAvm(
   }
 
   const avmProofPath = proofRes.proofPath;
-  const avmVkDirectoryPath = proofRes.vkDirectoryPath;
   expect(avmProofPath).toBeDefined();
-  expect(avmVkDirectoryPath).toBeDefined();
-
-  const avmVkPath = path.join(proofRes.vkDirectoryPath as string, VK_FILENAME);
 
   // Read the binary proof
   const avmProofBuffer = await fs.readFile(avmProofPath!);
@@ -193,26 +185,11 @@ export async function proveAvm(
     proof.push(new Fr(0));
   }
 
-  // Read the key
-  const vkBuffer = await fs.readFile(avmVkPath!);
-  const vkReader = BufferReader.asReader(vkBuffer);
-  const vk: Fr[] = [];
-  while (!vkReader.isEmpty()) {
-    vk.push(Fr.fromBuffer(vkReader));
-  }
-  // We extend to a fixed-size padded vk as during development any new AVM circuit precomputed
-  // column changes the vk length and we do not have a mechanism to feedback a cpp constant to noir/TS.
-  // TODO(#13390): Revive a non-padded vk proof
-  while (vk.length < AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED) {
-    vk.push(new Fr(0));
-  }
-
   const verificationResult = await verifyAvmProof(
     bbPath,
     workingDirectory,
     proofRes.proofPath!,
     avmCircuitInputs.publicInputs,
-    path.join(proofRes.vkDirectoryPath!, VK_FILENAME),
     logger,
   );
 
@@ -220,12 +197,8 @@ export async function proveAvm(
     throw new Error(`AVM V2 proof verification failed: ${verificationResult.reason}`);
   }
 
-  // TODO(#14234)[Unconditional PIs validation]: Remove next lines and return proof instead of proofWithPublicInputsValidationFlag
-  const proofWithPublicInputsValidationFlag = enhanceProofWithPiValidationFlag(proof, skipPublicInputsValidation);
-
   return {
-    proof: proofWithPublicInputsValidationFlag,
-    vk: await VerificationKeyAsFields.fromKey(vk),
+    proof,
     publicInputs: avmCircuitInputs.publicInputs,
   };
 }

package/src/types/index.ts

@@ -39,7 +39,7 @@ export type PrivateKernelPublicInputs = {
 
 export type ChonkProofData = {
   public_inputs: KernelPublicInputs;
-  proof: FixedLengthArray<Field, 1963>;
+  proof: FixedLengthArray<Field, 1935>;
   vk_data: VerificationKey<127>;
 }
 
@@ -186,7 +186,7 @@ export type RollupPublicInputs = {
 
 export type PreviousRollupData = {
   base_or_merge_public_inputs: RollupPublicInputs;
-  proof: FixedLengthArray<Field, 531>;
+  proof: FixedLengthArray<Field, 519>;
   vk: VerificationKey<115>;
 }
 
@@ -293,14 +293,14 @@ export async function MockPrivateKernelTail(prev_kernel_public_inputs: PrivateKe
 }
 export type MockRollupTxBasePublicInputType = {
   chonk_proof_data: ChonkProofData;
-  proof: FixedLengthArray<Field, 20000>;
+  proof: FixedLengthArray<Field, 16200>;
   public_inputs: AvmCircuitPublicInputs;
 }
 
 export type MockRollupTxBasePublicReturnType = RollupPublicInputs;
 
 
-export async function MockRollupTxBasePublic(chonk_proof_data: ChonkProofData, proof: FixedLengthArray<Field, 20000>, public_inputs: AvmCircuitPublicInputs, MockRollupTxBasePublic_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs> {
+export async function MockRollupTxBasePublic(chonk_proof_data: ChonkProofData, proof: FixedLengthArray<Field, 16200>, public_inputs: AvmCircuitPublicInputs, MockRollupTxBasePublic_circuit: CompiledCircuit, foreignCallHandler?: ForeignCallHandler): Promise<RollupPublicInputs> {
   const program = new Noir(MockRollupTxBasePublic_circuit);
   const args: InputMap = { chonk_proof_data, proof, public_inputs };
   const { returnValue } = await program.execute(args, foreignCallHandler);