From 155ab001b21ff8ceb553444209b07c25d980d282 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Thu, 8 Aug 2024 16:59:39 +0000 Subject: [PATCH 1/2] fix: read correct env vars --- yarn-project/aztec/src/cli/aztec_start_options.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn-project/aztec/src/cli/aztec_start_options.ts b/yarn-project/aztec/src/cli/aztec_start_options.ts index 32c971638b1..d12cbff5f6e 100644 --- a/yarn-project/aztec/src/cli/aztec_start_options.ts +++ b/yarn-project/aztec/src/cli/aztec_start_options.ts @@ -134,16 +134,16 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = { envVar: 'AVAILABILITY_ORACLE_CONTRACT_ADDRESS', }, { - flag: '--gas-token-address ', + flag: '--fee-juice-address ', description: 'The deployed L1 gas token contract address', defaultValue: undefined, - envVar: 'GAS_TOKEN_CONTRACT_ADDRESS', + envVar: 'FEE_JUICE_CONTRACT_ADDRESS', }, { - flag: '--gas-portal-address ', + flag: '--fee-juice-portal-address ', description: 'The deployed L1 gas portal contract address', defaultValue: undefined, - envVar: 'GAS_PORTAL_CONTRACT_ADDRESS', + envVar: 'FEE_JUICE_PORTAL_CONTRACT_ADDRESS', }, ], // We can't easily auto-generate node options as they're parts of modules defined below From f2b3f2e77235cd57c0fcd68094be0ee4c79af115 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Fri, 9 Aug 2024 07:57:40 +0000 Subject: [PATCH 2/2] fix: don't retry public VM proofs --- .../prover-client/src/prover-agent/memory-proving-queue.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts b/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts index 6362a0546c3..0ee31b82acc 100644 --- a/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts +++ b/yarn-project/prover-client/src/prover-agent/memory-proving-queue.ts @@ -164,7 +164,8 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource return Promise.resolve(); } - if (job.attempts < MAX_RETRIES) { + // every job should be retried with the exception of the public VM since its in development and can fail + if (job.attempts < MAX_RETRIES && job.request.type !== ProvingRequestType.PUBLIC_VM) { job.attempts++; this.log.warn( `Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${err}. Retry ${