refactor(prover-node): use each entity's own id as the failure-upload jobId

uploadEpochProofFailure already prefixes the upload path with the epoch number, so
the epoch in the jobId was redundant — and the epoch-only string dropped the
per-upload uniqueness the original session.getId() UUID gave. Use each entity's own
id instead: the session's id for a session (epoch) failure, and the prover's
content-addressed id for a checkpoint failure. Drop the now-unused epoch param from
tryUploadEpochFailure.

Author: PhilWindle

yarn-project/end-to-end/src/single-node/proving/upload_failed_proof.test.ts

@@ -63,7 +63,7 @@ describe('single-node/proving/upload_failed_proof', () => {
 
   // Makes the prover's top-tree prove always throw. Because every checkpoint prover still succeeds, the
   // session fails on its own account (state 'failed'), which the session manager treats as a genuine,
-  // race-free failure and uploads a post-mortem eagerly via tryUploadEpochFailure(epoch, checkpoints).
+  // race-free failure and uploads a post-mortem eagerly via tryUploadEpochFailure(sessionId, checkpoints).
   // Intercepts that to capture the upload URL, then tears down the live context, downloads the proving
   // job data, and re-runs it via rerunEpochProvingJob with fake proofs on a fresh config.
   it('uploads failed proving job state and re-runs it on a fresh instance', async () => {
@@ -81,8 +81,8 @@ describe('single-node/proving/upload_failed_proof', () => {
     // healthy provers (a top-tree failure here).
     const { promise: epochUploaded, resolve: onEpochUploaded } = promiseWithResolvers<string>();
     const origTryUploadEpochFailure = proverNode.tryUploadEpochFailure.bind(proverNode);
-    proverNode.tryUploadEpochFailure = async (epoch: any, checkpoints: any) => {
-      const url = await origTryUploadEpochFailure(epoch, checkpoints);
+    proverNode.tryUploadEpochFailure = async (id: any, checkpoints: any) => {
+      const url = await origTryUploadEpochFailure(id, checkpoints);
       if (url !== undefined) {
         onEpochUploaded(url);
       }

yarn-project/prover-node/src/prover-node.ts

@@ -582,7 +582,7 @@ export class ProverNode implements L2BlockStreamEventHandler, ProverNodeApi, Tra
         finalizationDelayMs: this.config.proverNodeEpochProvingDelayMs,
       },
       onSessionFailed: async session => {
-        await this.tryUploadEpochFailure(session.getEpochNumber(), session.getCheckpoints());
+        await this.tryUploadEpochFailure(session.getId(), session.getCheckpoints());
       },
       bindings: this.log.getBindings(),
     });
@@ -615,7 +615,7 @@ export class ProverNode implements L2BlockStreamEventHandler, ProverNodeApi, Tra
    * store is configured or the checkpoint set is empty.
    */
   public async tryUploadEpochFailure(
-    epoch: EpochNumber,
+    id: string,
     checkpoints: readonly CheckpointProver[],
   ): Promise<string | undefined> {
     if (!this.config.proverNodeFailedEpochStore || checkpoints.length === 0) {
@@ -624,7 +624,8 @@ export class ProverNode implements L2BlockStreamEventHandler, ProverNodeApi, Tra
     const data = SessionManager.buildProvingData(checkpoints);
     return await uploadEpochProofFailure(
       this.config.proverNodeFailedEpochStore,
-      `failed-epoch-${epoch}`,
+      // The session's own id; `uploadEpochProofFailure` already prefixes the path with the epoch number.
+      id,
       data,
       this.l2BlockSource as Archiver,
       this.worldState,
@@ -647,7 +648,8 @@ export class ProverNode implements L2BlockStreamEventHandler, ProverNodeApi, Tra
       const data = SessionManager.buildProvingData([prover]);
       return await uploadEpochProofFailure(
         this.config.proverNodeFailedEpochStore,
-        `failed-checkpoint-${prover.epochNumber}-${prover.checkpoint.number}`,
+        // The prover's content-addressed id; the epoch number is already in the upload path.
+        prover.id,
         data,
         this.l2BlockSource as Archiver,
         this.worldState,