Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export class BBNativePrivateKernelProver extends BBPrivateKernelProver {
throw err;
}),
this.skipCleanup,
this.log,
);
}
}
1 change: 1 addition & 0 deletions yarn-project/bb-prover/src/prover/bb_prover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ export class BBNativeRollupProver implements ServerCircuitProver {
throw err;
}),
this.config.bbSkipCleanup,
logger,
);
}
}
4 changes: 2 additions & 2 deletions yarn-project/bb-prover/src/verifier/bb_verifier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
proofType: 'ultra-honk',
} satisfies CircuitVerificationStats);
};
await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup);
await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
}

public async verifyProof(tx: Tx): Promise<boolean> {
Expand Down Expand Up @@ -103,7 +103,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
proofType: 'client-ivc',
} satisfies CircuitVerificationStats);
};
await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup);
await runInDirectory(this.config.bbWorkingDirectory, operation, this.config.bbSkipCleanup, this.logger);
return true;
} catch (err) {
this.logger.warn(`Failed to verify ClientIVC proof for tx ${Tx.getHash(tx)}: ${String(err)}`);
Expand Down
7 changes: 5 additions & 2 deletions yarn-project/foundation/src/fs/run_in_dir.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import { promises as fs } from 'fs';
import * as path from 'path';

import { createLogger } from '../log/pino-logger.js';

// Create a random directory underneath a 'base' directory
// Calls a provided method, ensures the random directory is cleaned up afterwards unless the operation fails
export async function runInDirectory<T>(
workingDirBase: string,
fn: (dir: string) => Promise<T>,
skipCleanup: boolean | undefined,
logger = createLogger('foundation:run-in-directory'),
): Promise<T> {
// Create random directory to be used for temp files
const workingDirectory = await fs.mkdtemp(path.join(workingDirBase, 'tmp-'));
Expand All @@ -22,8 +25,8 @@ export async function runInDirectory<T>(
if (!skipCleanup) {
try {
await fs.rm(workingDirectory, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
} catch {
// ignore cleanup errors
} catch (err) {
logger.warn(`Failed to cleanup temporary directory ${workingDirectory}: ${err}`, { err });
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/simulator/src/providers/acvm_native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export class NativeACVMSimulator implements SimulationProvider {
return result.witness;
};

return await runInDirectory(this.workingDirectory, operation, false);
return await runInDirectory(this.workingDirectory, operation, false, logger);
}

executeUserCircuit(
Expand Down