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
1 change: 1 addition & 0 deletions yarn-project/aztec/src/cli/aztec_start_action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
l1Salt: nodeOptions.deployAztecContractsSalt,
noPXE: sandboxOptions.noPXE,
testAccounts: sandboxOptions.testAccounts,
realProofs: false,
},
userLog,
);
Expand Down
3 changes: 2 additions & 1 deletion yarn-project/aztec/src/sandbox/sandbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
// Create a local blob sink client inside the sandbox, no http connectivity
const blobSinkClient = createBlobSinkClient();
const node = await createAztecNode(aztecNodeConfig, { telemetry, blobSinkClient }, { prefilledPublicData });
const pxe = await createAztecPXE(node);
const pxeServiceConfig = { proverEnabled: aztecNodeConfig.realProofs };
const pxe = await createAztecPXE(node, pxeServiceConfig);

await setupCanonicalL2FeeJuice(pxe, aztecNodeConfig.l1Contracts.feeJuicePortalAddress, logger.info);

Expand Down
4 changes: 4 additions & 0 deletions yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ async function setupFromFresh(
// TODO: For some reason this is currently the union of a bunch of subsystems. That needs fixing.
const aztecNodeConfig: AztecNodeConfig & SetupOptions = { ...getConfigEnvVars(), ...opts };
aztecNodeConfig.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
// Only enable proving if specifically requested.
aztecNodeConfig.realProofs = !!opts.realProofs;

// Create a temp directory for all ephemeral state and cleanup afterwards
const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
Expand Down Expand Up @@ -440,6 +442,8 @@ async function setupFromFresh(
logger.verbose('Creating pxe...');
const pxeConfig = getPXEServiceConfig();
pxeConfig.dataDirectory = statePath ?? path.join(directoryToCleanup, randomBytes(8).toString('hex'));
// Only enable proving if specifically requested.
pxeConfig.proverEnabled = !!opts.realProofs;
const pxe = await createPXEService(aztecNode, pxeConfig);

const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
Expand Down
4 changes: 4 additions & 0 deletions yarn-project/end-to-end/src/fixtures/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ export async function setupPXEService(
teardown: () => Promise<void>;
}> {
const pxeServiceConfig = { ...getPXEServiceConfig(), ...opts };
// For tests we only want proving enabled if specifically requested
pxeServiceConfig.proverEnabled = !!opts.proverEnabled;

// If no data directory provided, create a temp directory and clean up afterwards
const configuredDataDirectory = pxeServiceConfig.dataDirectory;
Expand Down Expand Up @@ -357,6 +359,8 @@ export async function setup(
): Promise<EndToEndContext> {
const config = { ...getConfigEnvVars(), ...opts };
config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
// For tests we only want proving enabled if specifically requested
config.realProofs = !!opts.realProofs;

const logger = getLogger();

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/prover-client/src/proving_broker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export const proverAgentConfigMappings: ConfigMappingsType<ProverAgentConfig> =
realProofs: {
env: 'PROVER_REAL_PROOFS',
description: 'Whether to construct real proofs',
...booleanConfigHelper(false),
...booleanConfigHelper(true),
},
proverTestDelayType: {
env: 'PROVER_TEST_DELAY_TYPE',
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/pxe/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
proverEnabled: {
env: 'PXE_PROVER_ENABLED',
description: 'Enable real proofs',
...booleanConfigHelper(),
...booleanConfigHelper(true),
},
};

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/stdlib/src/interfaces/prover-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const proverConfigMappings: ConfigMappingsType<ProverConfig> = {
realProofs: {
env: 'PROVER_REAL_PROOFS',
description: 'Whether to construct real proofs',
...booleanConfigHelper(),
...booleanConfigHelper(true),
},
proverId: {
env: 'PROVER_ID',
Expand Down