@devtion/backend 0.0.0-7e983e3 → 0.0.0-ed314b8

package/dist/src/functions/index.js

@@ -1292,6 +1292,7 @@ const coordinate = async (participant, circuit, isSingleParticipantCoordination,
             printLog(`Coordinate - executing scenario A - single - participantResumingAfterTimeoutExpiration`, LogLevel.DEBUG);
             newParticipantStatus = "CONTRIBUTING" /* ParticipantStatus.CONTRIBUTING */;
             newContributionStep = "DOWNLOADING" /* ParticipantContributionStep.DOWNLOADING */;
+            newCurrentContributorId = participant.id;
         }
         // Scenario (B).
         else if (participantIsNotCurrentContributor) {
@@ -1400,53 +1401,6 @@ const waitForVMCommandExecution = (resolve, reject, ssm, vmInstanceId, commandId
         }
     }, 60000); // 1 minute.
 };
-/**
- * Wait until the artifacts have been downloaded.
- * @param {any} resolve the promise.
- * @param {any} reject the promise.
- * @param {string} potTempFilePath the tmp path to the locally downloaded pot file.
- * @param {string} firstZkeyTempFilePath the tmp path to the locally downloaded first zkey file.
- * @param {string} lastZkeyTempFilePath the tmp path to the locally downloaded last zkey file.
- */
-const waitForFileDownload = (resolve, reject, potTempFilePath, firstZkeyTempFilePath, lastZkeyTempFilePath, circuitId, participantId) => {
-    const maxWaitTime = 5 * 60 * 1000; // 5 minutes
-    // every second check if the file download was completed
-    const interval = setInterval(async () => {
-        printLog(`Verifying that the artifacts were downloaded for circuit ${circuitId} and participant ${participantId}`, LogLevel.DEBUG);
-        try {
-            // check if files have been downloaded
-            if (!fs.existsSync(potTempFilePath)) {
-                printLog(`Pot file not found at ${potTempFilePath}`, LogLevel.DEBUG);
-            }
-            if (!fs.existsSync(firstZkeyTempFilePath)) {
-                printLog(`First zkey file not found at ${firstZkeyTempFilePath}`, LogLevel.DEBUG);
-            }
-            if (!fs.existsSync(lastZkeyTempFilePath)) {
-                printLog(`Last zkey file not found at ${lastZkeyTempFilePath}`, LogLevel.DEBUG);
-            }
-            // if all files were downloaded
-            if (fs.existsSync(potTempFilePath) && fs.existsSync(firstZkeyTempFilePath) && fs.existsSync(lastZkeyTempFilePath)) {
-                printLog(`All required files are present on disk.`, LogLevel.INFO);
-                // resolve the promise
-                resolve();
-            }
-        }
-        catch (error) {
-            // if we have an error then we print it as a warning and reject
-            printLog(`Error while downloading files: ${error}`, LogLevel.WARN);
-            reject();
-        }
-        finally {
-            printLog(`Clearing the interval for file download. Circuit ${circuitId} and participant ${participantId}`, LogLevel.DEBUG);
-            clearInterval(interval);
-        }
-    }, 5000);
-    // we want to clean in 5 minutes in case
-    setTimeout(() => {
-        clearInterval(interval);
-        reject(new Error('Timeout exceeded while waiting for files to be downloaded.'));
-    }, maxWaitTime);
-};
 /**
  * This method is used to coordinate the waiting queues of ceremony circuits.
  * @dev this cloud function is triggered whenever an update of a document related to a participant of a ceremony occurs.
@@ -1757,7 +1711,9 @@ const verifycontribution = functionsV2__namespace.https.onCall({ memory: "16GiB"
             const newAvgVerifyCloudFunctionTime = avgVerifyCloudFunctionTime > 0
                 ? (avgVerifyCloudFunctionTime + verifyCloudFunctionTime) / 2
                 : verifyCloudFunctionTime;
-            // Prepare tx to update circuit average contribution/verification time.
+            // Prepare tx to update circuit average contribution/verification time.    
+            const updatedCircuitDoc = await getDocumentById(actions.getCircuitsCollectionPath(ceremonyId), circuitId);
+            const { waitingQueue: updatedWaitingQueue } = updatedCircuitDoc.data();
             /// @dev this must happen only for valid contributions.
             batch.update(circuitDoc.ref, {
                 avgTimings: {
@@ -1770,7 +1726,7 @@ const verifycontribution = functionsV2__namespace.https.onCall({ memory: "16GiB"
                         : avgVerifyCloudFunctionTime
                 },
                 waitingQueue: {
-                    ...waitingQueue,
+                    ...updatedWaitingQueue,
                     completedContributions: isContributionValid
                         ? completedContributions + 1
                         : completedContributions,
@@ -1835,33 +1791,21 @@ const verifycontribution = functionsV2__namespace.https.onCall({ memory: "16GiB"
             await downloadArtifactFromS3Bucket(bucketName, potStoragePath, potTempFilePath);
             await downloadArtifactFromS3Bucket(bucketName, firstZkeyStoragePath, firstZkeyTempFilePath);
             await downloadArtifactFromS3Bucket(bucketName, lastZkeyStoragePath, lastZkeyTempFilePath);
-            await sleep(6000);
-            // wait until the files are actually downloaded
-            return new Promise((resolve, reject) => waitForFileDownload(resolve, reject, potTempFilePath, firstZkeyTempFilePath, lastZkeyTempFilePath, circuitId, participantDoc.id))
-                .then(async () => {
-                printLog(`Downloads from AWS S3 bucket completed - ceremony ${ceremonyId} circuit ${circuitId}`, LogLevel.DEBUG);
-                // Step (1.A.4).
-                isContributionValid = await snarkjs.zKey.verifyFromInit(firstZkeyTempFilePath, potTempFilePath, lastZkeyTempFilePath, transcriptLogger);
-                // Compute contribution hash.
-                lastZkeyBlake2bHash = await actions.blake512FromPath(lastZkeyTempFilePath);
-                // Free resources by unlinking temporary folders.
-                // Do not free-up verification transcript path here.
-                try {
-                    fs.unlinkSync(potTempFilePath);
-                    fs.unlinkSync(firstZkeyTempFilePath);
-                    fs.unlinkSync(lastZkeyTempFilePath);
-                }
-                catch (error) {
-                    printLog(`Error while unlinking temporary files - Error ${error}`, LogLevel.WARN);
-                }
-                await completeVerification();
-            })
-                .catch((error) => {
-                // Throw the new error
-                const commonError = COMMON_ERRORS.CM_INVALID_REQUEST;
-                const additionalDetails = error.toString();
-                logAndThrowError(makeError(commonError.code, commonError.message, additionalDetails));
-            });
+            // Step (1.A.4).
+            isContributionValid = await snarkjs.zKey.verifyFromInit(firstZkeyTempFilePath, potTempFilePath, lastZkeyTempFilePath, transcriptLogger);
+            // Compute contribution hash.
+            lastZkeyBlake2bHash = await actions.blake512FromPath(lastZkeyTempFilePath);
+            // Free resources by unlinking temporary folders.
+            // Do not free-up verification transcript path here.
+            try {
+                fs.unlinkSync(potTempFilePath);
+                fs.unlinkSync(firstZkeyTempFilePath);
+                fs.unlinkSync(lastZkeyTempFilePath);
+            }
+            catch (error) {
+                printLog(`Error while unlinking temporary files - Error ${error}`, LogLevel.WARN);
+            }
+            await completeVerification();
         }
     }
 });
@@ -2523,7 +2467,7 @@ const checkAndRemoveBlockingContributor = functions__namespace
                                 // Prepare Firestore batch of txs.
                                 const batch = firestore.batch();
                                 // Remove current contributor from waiting queue.
-                                contributors.shift(1);
+                                contributors.shift();
                                 // Check if someone else is ready to start the contribution.
                                 if (contributors.length > 0) {
                                     // Step (E.1).

package/dist/src/functions/index.mjs

@@ -19,7 +19,7 @@ import { pipeline } from 'node:stream';
 import { promisify } from 'node:util';
 import fs, { readFileSync } from 'fs';
 import mime from 'mime-types';
-import { setTimeout as setTimeout$1 } from 'timers/promises';
+import { setTimeout } from 'timers/promises';
 import fetch from '@adobe/node-fetch-retry';
 import path from 'path';
 import os from 'os';
@@ -191,7 +191,7 @@ const getCurrentServerTimestampInMillis = () => Timestamp.now().toMillis();
  * Interrupt the current execution for a specified amount of time.
  * @param ms <number> - the amount of time expressed in milliseconds.
  */
-const sleep = async (ms) => setTimeout$1(ms);
+const sleep = async (ms) => setTimeout(ms);
 /**
  * Query for ceremony circuits.
  * @notice the order by sequence position is fundamental to maintain parallelism among contributions for different circuits.
@@ -1269,6 +1269,7 @@ const coordinate = async (participant, circuit, isSingleParticipantCoordination,
             printLog(`Coordinate - executing scenario A - single - participantResumingAfterTimeoutExpiration`, LogLevel.DEBUG);
             newParticipantStatus = "CONTRIBUTING" /* ParticipantStatus.CONTRIBUTING */;
             newContributionStep = "DOWNLOADING" /* ParticipantContributionStep.DOWNLOADING */;
+            newCurrentContributorId = participant.id;
         }
         // Scenario (B).
         else if (participantIsNotCurrentContributor) {
@@ -1377,53 +1378,6 @@ const waitForVMCommandExecution = (resolve, reject, ssm, vmInstanceId, commandId
         }
     }, 60000); // 1 minute.
 };
-/**
- * Wait until the artifacts have been downloaded.
- * @param {any} resolve the promise.
- * @param {any} reject the promise.
- * @param {string} potTempFilePath the tmp path to the locally downloaded pot file.
- * @param {string} firstZkeyTempFilePath the tmp path to the locally downloaded first zkey file.
- * @param {string} lastZkeyTempFilePath the tmp path to the locally downloaded last zkey file.
- */
-const waitForFileDownload = (resolve, reject, potTempFilePath, firstZkeyTempFilePath, lastZkeyTempFilePath, circuitId, participantId) => {
-    const maxWaitTime = 5 * 60 * 1000; // 5 minutes
-    // every second check if the file download was completed
-    const interval = setInterval(async () => {
-        printLog(`Verifying that the artifacts were downloaded for circuit ${circuitId} and participant ${participantId}`, LogLevel.DEBUG);
-        try {
-            // check if files have been downloaded
-            if (!fs.existsSync(potTempFilePath)) {
-                printLog(`Pot file not found at ${potTempFilePath}`, LogLevel.DEBUG);
-            }
-            if (!fs.existsSync(firstZkeyTempFilePath)) {
-                printLog(`First zkey file not found at ${firstZkeyTempFilePath}`, LogLevel.DEBUG);
-            }
-            if (!fs.existsSync(lastZkeyTempFilePath)) {
-                printLog(`Last zkey file not found at ${lastZkeyTempFilePath}`, LogLevel.DEBUG);
-            }
-            // if all files were downloaded
-            if (fs.existsSync(potTempFilePath) && fs.existsSync(firstZkeyTempFilePath) && fs.existsSync(lastZkeyTempFilePath)) {
-                printLog(`All required files are present on disk.`, LogLevel.INFO);
-                // resolve the promise
-                resolve();
-            }
-        }
-        catch (error) {
-            // if we have an error then we print it as a warning and reject
-            printLog(`Error while downloading files: ${error}`, LogLevel.WARN);
-            reject();
-        }
-        finally {
-            printLog(`Clearing the interval for file download. Circuit ${circuitId} and participant ${participantId}`, LogLevel.DEBUG);
-            clearInterval(interval);
-        }
-    }, 5000);
-    // we want to clean in 5 minutes in case
-    setTimeout(() => {
-        clearInterval(interval);
-        reject(new Error('Timeout exceeded while waiting for files to be downloaded.'));
-    }, maxWaitTime);
-};
 /**
  * This method is used to coordinate the waiting queues of ceremony circuits.
  * @dev this cloud function is triggered whenever an update of a document related to a participant of a ceremony occurs.
@@ -1734,7 +1688,9 @@ const verifycontribution = functionsV2.https.onCall({ memory: "16GiB", timeoutSe
             const newAvgVerifyCloudFunctionTime = avgVerifyCloudFunctionTime > 0
                 ? (avgVerifyCloudFunctionTime + verifyCloudFunctionTime) / 2
                 : verifyCloudFunctionTime;
-            // Prepare tx to update circuit average contribution/verification time.
+            // Prepare tx to update circuit average contribution/verification time.    
+            const updatedCircuitDoc = await getDocumentById(getCircuitsCollectionPath(ceremonyId), circuitId);
+            const { waitingQueue: updatedWaitingQueue } = updatedCircuitDoc.data();
             /// @dev this must happen only for valid contributions.
             batch.update(circuitDoc.ref, {
                 avgTimings: {
@@ -1747,7 +1703,7 @@ const verifycontribution = functionsV2.https.onCall({ memory: "16GiB", timeoutSe
                         : avgVerifyCloudFunctionTime
                 },
                 waitingQueue: {
-                    ...waitingQueue,
+                    ...updatedWaitingQueue,
                     completedContributions: isContributionValid
                         ? completedContributions + 1
                         : completedContributions,
@@ -1812,33 +1768,21 @@ const verifycontribution = functionsV2.https.onCall({ memory: "16GiB", timeoutSe
             await downloadArtifactFromS3Bucket(bucketName, potStoragePath, potTempFilePath);
             await downloadArtifactFromS3Bucket(bucketName, firstZkeyStoragePath, firstZkeyTempFilePath);
             await downloadArtifactFromS3Bucket(bucketName, lastZkeyStoragePath, lastZkeyTempFilePath);
-            await sleep(6000);
-            // wait until the files are actually downloaded
-            return new Promise((resolve, reject) => waitForFileDownload(resolve, reject, potTempFilePath, firstZkeyTempFilePath, lastZkeyTempFilePath, circuitId, participantDoc.id))
-                .then(async () => {
-                printLog(`Downloads from AWS S3 bucket completed - ceremony ${ceremonyId} circuit ${circuitId}`, LogLevel.DEBUG);
-                // Step (1.A.4).
-                isContributionValid = await zKey.verifyFromInit(firstZkeyTempFilePath, potTempFilePath, lastZkeyTempFilePath, transcriptLogger);
-                // Compute contribution hash.
-                lastZkeyBlake2bHash = await blake512FromPath(lastZkeyTempFilePath);
-                // Free resources by unlinking temporary folders.
-                // Do not free-up verification transcript path here.
-                try {
-                    fs.unlinkSync(potTempFilePath);
-                    fs.unlinkSync(firstZkeyTempFilePath);
-                    fs.unlinkSync(lastZkeyTempFilePath);
-                }
-                catch (error) {
-                    printLog(`Error while unlinking temporary files - Error ${error}`, LogLevel.WARN);
-                }
-                await completeVerification();
-            })
-                .catch((error) => {
-                // Throw the new error
-                const commonError = COMMON_ERRORS.CM_INVALID_REQUEST;
-                const additionalDetails = error.toString();
-                logAndThrowError(makeError(commonError.code, commonError.message, additionalDetails));
-            });
+            // Step (1.A.4).
+            isContributionValid = await zKey.verifyFromInit(firstZkeyTempFilePath, potTempFilePath, lastZkeyTempFilePath, transcriptLogger);
+            // Compute contribution hash.
+            lastZkeyBlake2bHash = await blake512FromPath(lastZkeyTempFilePath);
+            // Free resources by unlinking temporary folders.
+            // Do not free-up verification transcript path here.
+            try {
+                fs.unlinkSync(potTempFilePath);
+                fs.unlinkSync(firstZkeyTempFilePath);
+                fs.unlinkSync(lastZkeyTempFilePath);
+            }
+            catch (error) {
+                printLog(`Error while unlinking temporary files - Error ${error}`, LogLevel.WARN);
+            }
+            await completeVerification();
         }
     }
 });
@@ -2500,7 +2444,7 @@ const checkAndRemoveBlockingContributor = functions
                                 // Prepare Firestore batch of txs.
                                 const batch = firestore.batch();
                                 // Remove current contributor from waiting queue.
-                                contributors.shift(1);
+                                contributors.shift();
                                 // Check if someone else is ready to start the contribution.
                                 if (contributors.length > 0) {
                                     // Step (E.1).

package/dist/types/functions/circuit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circuit.d.ts","sourceRoot":"","sources":["../../../src/functions/circuit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAA;AAyCpD,OAAO,EAAuB,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAyR5E;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,6BAA6B,4FAoGpC,CAAA;AA8BN;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,kBAAkB,0EAya9B,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,+CAA+C,wEA4EtD,CAAA;AAEN;;;;GAIG;AACH,eAAO,MAAM,eAAe,uDA8EtB,CAAA"}
+{"version":3,"file":"circuit.d.ts","sourceRoot":"","sources":["../../../src/functions/circuit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAA;AACpD,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAA;AAyCpD,OAAO,EAAuB,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAkO5E;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,6BAA6B,4FAoGpC,CAAA;AA8BN;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,kBAAkB,0EA0Z9B,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,+CAA+C,wEA4EtD,CAAA;AAEN;;;;GAIG;AACH,eAAO,MAAM,eAAe,uDA8EtB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtion/backend",
-  "version": "0.0.0-7e983e3",
+  "version": "0.0.0-ed314b8",
   "description": "MPC Phase 2 backend for Firebase services management",
   "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
   "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "afae72061a3b366b05508de53fe91e9b254cc3d5"
+  "gitHead": "939c38be7a996fab9ec750ac63b70c5b11471809"
 }

package/src/functions/circuit.ts

@@ -131,6 +131,7 @@ const coordinate = async (
 
             newParticipantStatus = ParticipantStatus.CONTRIBUTING
             newContributionStep = ParticipantContributionStep.DOWNLOADING
+            newCurrentContributorId = participant.id
         }
         // Scenario (B).
         else if (participantIsNotCurrentContributor) {
@@ -265,62 +266,6 @@ const waitForVMCommandExecution = (
     }, 60000) // 1 minute.
 }
 
-/**
- * Wait until the artifacts have been downloaded.
- * @param {any} resolve the promise.
- * @param {any} reject the promise.
- * @param {string} potTempFilePath the tmp path to the locally downloaded pot file.
- * @param {string} firstZkeyTempFilePath the tmp path to the locally downloaded first zkey file.
- * @param {string} lastZkeyTempFilePath the tmp path to the locally downloaded last zkey file. 
- */
-const waitForFileDownload = (
-    resolve: any,
-    reject: any,
-    potTempFilePath: string,
-    firstZkeyTempFilePath: string,
-    lastZkeyTempFilePath: string,
-    circuitId: string,
-    participantId: string 
-) => {
-    const maxWaitTime = 5 * 60 * 1000 // 5 minutes
-    // every second check if the file download was completed
-    const interval = setInterval(async () => {
-        printLog(`Verifying that the artifacts were downloaded for circuit ${circuitId} and participant ${participantId}`, LogLevel.DEBUG)
-        try {                            
-            // check if files have been downloaded
-            if (!fs.existsSync(potTempFilePath)) {
-                printLog(`Pot file not found at ${potTempFilePath}`, LogLevel.DEBUG)
-            }
-            if (!fs.existsSync(firstZkeyTempFilePath)) {
-                printLog(`First zkey file not found at ${firstZkeyTempFilePath}`, LogLevel.DEBUG)
-            }
-            if (!fs.existsSync(lastZkeyTempFilePath)) {
-                printLog(`Last zkey file not found at ${lastZkeyTempFilePath}`, LogLevel.DEBUG)
-            }
-
-            // if all files were downloaded
-            if (fs.existsSync(potTempFilePath) && fs.existsSync(firstZkeyTempFilePath) && fs.existsSync(lastZkeyTempFilePath)) {
-                printLog(`All required files are present on disk.`, LogLevel.INFO)
-                // resolve the promise
-                resolve()
-            }
-        } catch (error: any) {
-            // if we have an error then we print it as a warning and reject
-            printLog(`Error while downloading files: ${error}`, LogLevel.WARN)
-            reject()
-        } finally {
-            printLog(`Clearing the interval for file download. Circuit ${circuitId} and participant ${participantId}`, LogLevel.DEBUG)
-            clearInterval(interval)
-        }
-    }, 5000)
-
-    // we want to clean in 5 minutes in case
-    setTimeout(() => {
-        clearInterval(interval)
-        reject(new Error('Timeout exceeded while waiting for files to be downloaded.'))
-    }, maxWaitTime)
-}
-
 /**
  * This method is used to coordinate the waiting queues of ceremony circuits.
  * @dev this cloud function is triggered whenever an update of a document related to a participant of a ceremony occurs.
@@ -763,7 +708,9 @@ export const verifycontribution = functionsV2.https.onCall(
                         ? (avgVerifyCloudFunctionTime + verifyCloudFunctionTime) / 2
                         : verifyCloudFunctionTime
 
-                // Prepare tx to update circuit average contribution/verification time.
+                // Prepare tx to update circuit average contribution/verification time.    
+                const updatedCircuitDoc = await getDocumentById(getCircuitsCollectionPath(ceremonyId), circuitId)
+                const { waitingQueue: updatedWaitingQueue } = updatedCircuitDoc.data()!
                 /// @dev this must happen only for valid contributions.
                 batch.update(circuitDoc.ref, {
                     avgTimings: {
@@ -776,7 +723,7 @@ export const verifycontribution = functionsV2.https.onCall(
                             : avgVerifyCloudFunctionTime
                     },
                     waitingQueue: {
-                        ...waitingQueue,
+                        ...updatedWaitingQueue,
                         completedContributions: isContributionValid
                             ? completedContributions + 1
                             : completedContributions,
@@ -879,45 +826,28 @@ export const verifycontribution = functionsV2.https.onCall(
                 await downloadArtifactFromS3Bucket(bucketName, firstZkeyStoragePath, firstZkeyTempFilePath)
                 await downloadArtifactFromS3Bucket(bucketName, lastZkeyStoragePath, lastZkeyTempFilePath)
 
-                await sleep(6000)
-
-                // wait until the files are actually downloaded
-                return new Promise<void>((resolve, reject) => 
-                    waitForFileDownload(resolve, reject, potTempFilePath, firstZkeyTempFilePath, lastZkeyTempFilePath, circuitId, participantDoc.id)
+                // Step (1.A.4).
+                isContributionValid = await zKey.verifyFromInit(
+                    firstZkeyTempFilePath,
+                    potTempFilePath,
+                    lastZkeyTempFilePath,
+                    transcriptLogger
                 )
-                    .then(async () => {
-                        printLog(`Downloads from AWS S3 bucket completed - ceremony ${ceremonyId} circuit ${circuitId}`, LogLevel.DEBUG)
-
-                        // Step (1.A.4).
-                        isContributionValid = await zKey.verifyFromInit(
-                            firstZkeyTempFilePath,
-                            potTempFilePath,
-                            lastZkeyTempFilePath,
-                            transcriptLogger
-                        )
-                        
-                        // Compute contribution hash.
-                        lastZkeyBlake2bHash = await blake512FromPath(lastZkeyTempFilePath)
-
-                        // Free resources by unlinking temporary folders.
-                        // Do not free-up verification transcript path here.
-                        try {
-                            fs.unlinkSync(potTempFilePath)
-                            fs.unlinkSync(firstZkeyTempFilePath)
-                            fs.unlinkSync(lastZkeyTempFilePath)
-                        } catch (error: any) {
-                            printLog(`Error while unlinking temporary files - Error ${error}`, LogLevel.WARN)
-                        }  
-
-                        await completeVerification()
-                    })
-                    .catch((error: any) => {
-                        // Throw the new error
-                        const commonError = COMMON_ERRORS.CM_INVALID_REQUEST
-                        const additionalDetails = error.toString()
-
-                        logAndThrowError(makeError(commonError.code, commonError.message, additionalDetails))
-                    })
+                
+                // Compute contribution hash.
+                lastZkeyBlake2bHash = await blake512FromPath(lastZkeyTempFilePath)
+
+                // Free resources by unlinking temporary folders.
+                // Do not free-up verification transcript path here.
+                try {
+                    fs.unlinkSync(potTempFilePath)
+                    fs.unlinkSync(firstZkeyTempFilePath)
+                    fs.unlinkSync(lastZkeyTempFilePath)
+                } catch (error: any) {
+                    printLog(`Error while unlinking temporary files - Error ${error}`, LogLevel.WARN)
+                }  
+
+                await completeVerification()
             }
         }
     }

package/src/functions/timeout.ts

@@ -174,7 +174,7 @@ export const checkAndRemoveBlockingContributor = functions
                                     const batch = firestore.batch()
 
                                     // Remove current contributor from waiting queue.
-                                    contributors.shift(1)
+                                    contributors.shift()
 
                                     // Check if someone else is ready to start the contribution.
                                     if (contributors.length > 0) {