Skip to content

fix: Client IVC paths in bb prover #11637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludamad merged 1 commit into from
Jan 30, 2025
Merged

fix: Client IVC paths in bb prover #11637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions yarn-project/bb-prover/src/bb/execute.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { promises as fs } from 'fs';
import { basename, dirname, join } from 'path';

import { type UltraHonkFlavor } from '../honk.js';
import { CLIENT_IVC_PROOF_FILE_NAME, CLIENT_IVC_VK_FILE_NAME } from '../prover/client_ivc_proof_utils.js';

export const VK_FILENAME = 'vk';
export const VK_FIELDS_FILENAME = 'vk_fields.json';
Expand Down Expand Up @@ -345,8 +346,8 @@ export async function generateTubeProof(
}

// // Paths for the inputs
const vkPath = join(workingDirectory, 'client_ivc_vk.bin');
const proofPath = join(workingDirectory, 'client_ivc_proof.bin');
const vkPath = join(workingDirectory, CLIENT_IVC_VK_FILE_NAME);
const proofPath = join(workingDirectory, CLIENT_IVC_PROOF_FILE_NAME);

// The proof is written to e.g. /workingDirectory/proof
const outputPath = workingDirectory;
Expand Down
9 changes: 6 additions & 3 deletions yarn-project/bb-prover/src/prover/client_ivc_proof_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { ClientIvcProof } from '@aztec/circuits.js';
import { promises as fs } from 'fs';
import { join } from 'path';

export const CLIENT_IVC_VK_FILE_NAME = 'client_ivc_vk';
export const CLIENT_IVC_PROOF_FILE_NAME = 'client_ivc_proof';

/**
* TODO(#7371): eventually remove client_ivc_prove_output_all_msgpack and properly handle these accumulators and VKs
* Create a ClientIvcProof from the result of client_ivc_prove_output_all or client_ivc_prove_output_all_msgpack
Expand All @@ -11,7 +14,7 @@ import { join } from 'path';
*/
export async function readFromOutputDirectory(directory: string) {
const [clientIvcVkBuffer, clientIvcProofBuffer] = await Promise.all(
['client_ivc_vk', 'client_ivc_proof'].map(fileName => fs.readFile(join(directory, fileName))),
[CLIENT_IVC_VK_FILE_NAME, CLIENT_IVC_PROOF_FILE_NAME].map(fileName => fs.readFile(join(directory, fileName))),
);
return new ClientIvcProof(clientIvcProofBuffer, clientIvcVkBuffer);
}
Expand All @@ -32,8 +35,8 @@ export async function readFromOutputDirectory(directory: string) {
export async function writeToOutputDirectory(clientIvcProof: ClientIvcProof, directory: string) {
const { clientIvcProofBuffer, clientIvcVkBuffer } = clientIvcProof;
const fileData = [
['client_ivc_proof', clientIvcProofBuffer],
['client_ivc_vk', clientIvcVkBuffer],
[CLIENT_IVC_PROOF_FILE_NAME, clientIvcProofBuffer],
[CLIENT_IVC_VK_FILE_NAME, clientIvcVkBuffer],
] as const;
await Promise.all(fileData.map(([fileName, buffer]) => fs.writeFile(join(directory, fileName), buffer)));
}