Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion barretenberg/cpp/src/barretenberg/bb/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,6 @@ int main(int argc, char* argv[])
if (command == "prove_and_verify_mega_honk_program") {
return proveAndVerifyHonkProgram<MegaFlavor>(bytecode_path, witness_path) ? 0 : 1;
}
// TODO(https://github.com/AztecProtocol/barretenberg/issues/1050) we need a verify_client_ivc bb cli command
// TODO(#7371): remove this
if (command == "client_ivc_prove_output_all_msgpack") {
std::filesystem::path output_dir = get_option(args, "-o", "./target");
Expand Down
11 changes: 9 additions & 2 deletions yarn-project/bb-prover/src/bb/execute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ import { type LogFn, currentLevel as currentLogLevel } from '@aztec/foundation/l
import { Timer } from '@aztec/foundation/timer';
import { type NoirCompiledCircuit } from '@aztec/types/noir';



import * as proc from 'child_process';
import * as fs from 'fs/promises';
import { basename, dirname, join } from 'path';


export const VK_FILENAME = 'vk';
export const VK_FIELDS_FILENAME = 'vk_fields.json';
export const PROOF_FILENAME = 'proof';
Expand Down Expand Up @@ -455,10 +458,14 @@ export async function generateTubeProof(
const logFunction = (message: string) => {
log(`TubeCircuit (prove) BB out - ${message}`);
};
const verifyResult = await executeBB(pathToBB, 'verify_client_ivc', args, logFunction);
if (verifyResult.status !== BB_RESULT.SUCCESS) {
return { status: BB_RESULT.FAILURE, reason: `Failed to verify client IVC at ${workingDirectory}` };
}
const result = await executeBB(pathToBB, 'prove_tube', args, logFunction);
const durationMs = timer.ms();

if (result.status == BB_RESULT.SUCCESS) {
if (result.status === BB_RESULT.SUCCESS) {
return {
status: BB_RESULT.SUCCESS,
durationMs,
Expand Down Expand Up @@ -869,4 +876,4 @@ async function fsCache<T>(
}

return res;
}
}