fix: missing pre-condition when resuming during computing step; wrong…

… pre-condition on related cf
quadratic-funding · Feb 23, 2023 · 90c8729 · 90c8729
1 parent 15788ea
commit 90c8729
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/packages/backend/src/functions/participant.ts b/packages/backend/src/functions/participant.ts
@@ -282,24 +282,23 @@ export const permanentlyStoreCurrentContributionTimeAndHash = functions.https.on
 
         // Pre-condition: computing contribution step or finalizing (only for coordinator when finalizing ceremony).
         if (
-            contributionStep !== ParticipantContributionStep.COMPUTING ||
-            (isCoordinator && status !== ParticipantStatus.FINALIZING)
-        )
-            logAndThrowError(SPECIFIC_ERRORS.SE_PARTICIPANT_CANNOT_STORE_PERMANENT_DATA)
-
-        // Send tx.
-        await participantDoc.ref.set(
-            {
-                contributions: [
-                    ...currentContributions,
-                    {
-                        hash: data.contributionHash,
-                        computationTime: data.contributionComputationTime
-                    }
-                ]
-            },
-            { merge: true }
+            contributionStep === ParticipantContributionStep.COMPUTING ||
+            (isCoordinator && status === ParticipantStatus.FINALIZING)
         )
+            // Send tx.
+            await participantDoc.ref.set(
+                {
+                    contributions: [
+                        ...currentContributions,
+                        {
+                            hash: data.contributionHash,
+                            computationTime: data.contributionComputationTime
+                        }
+                    ]
+                },
+                { merge: true }
+            )
+        else logAndThrowError(SPECIFIC_ERRORS.SE_PARTICIPANT_CANNOT_STORE_PERMANENT_DATA)
 
         printLog(
             `Participant ${participantDoc.id} has successfully stored the contribution hash ${data.contributionHash} and computation time ${data.contributionComputationTime}`,

diff --git a/packages/phase2cli/src/commands/contribute.ts b/packages/phase2cli/src/commands/contribute.ts
@@ -649,6 +649,7 @@ const listenToParticipantDocumentChanges = async (
         const {
             contributionProgress: exContributionProgress,
             status: exStatus,
+            contributions: exContributions,
             contributionStep: exContributionStep,
             tempContributionData: exTempContributionData
         } = participant.data()!
@@ -730,6 +731,9 @@ const listenToParticipantDocumentChanges = async (
 
             const noTemporaryContributionData = !exTempContributionData && !changedTempContributionData
 
+            const samePermanentContributionData =
+                (!exContributions && !changedContributions) || exContributions.length === changedContributions.length
+
             const downloadingStep = changedContributionStep === ParticipantContributionStep.DOWNLOADING
             const computingStep = changedContributionStep === ParticipantContributionStep.COMPUTING
             const uploadingStep = changedContributionStep === ParticipantContributionStep.UPLOADING
@@ -764,7 +768,7 @@ const listenToParticipantDocumentChanges = async (
                         resumingAfterTimeoutExpiration ||
                         neverResumedContribution)) ||
                 // Pre-condition X => contribute / resume when contribution step = COMPUTING.
-                (computingStep && resumingContribution) ||
+                (computingStep && resumingContribution && samePermanentContributionData) ||
                 // Pre-condition Y => contribute / resume when contribution step = UPLOADING without any pre-uploaded chunk.
                 (uploadingStep && resumingContribution && noTemporaryContributionData) ||
                 // Pre-condition Z => contribute / resume when contribution step = UPLOADING w/ some pre-uploaded chunk.

diff --git a/packages/phase2cli/src/lib/utils.ts b/packages/phase2cli/src/lib/utils.ts
@@ -540,7 +540,7 @@ export const handleStartOrResumeContribution = async (
 
         // Advance to next contribution step (COMPUTING) if not finalizing.
         if (!isFinalizing) {
-            spinner.text = `Preparing to contribution computation...`
+            spinner.text = `Preparing for contribution computation...`
             spinner.start()
 
             await progressToNextContributionStep(cloudFunctions, ceremony.id)
@@ -607,7 +607,7 @@ export const handleStartOrResumeContribution = async (
 
         // Advance to next contribution step (UPLOADING) if not finalizing.
         if (!isFinalizing) {
-            spinner.text = `Preparing to uploading the contribution...`
+            spinner.text = `Preparing for uploading the contribution...`
             spinner.start()
 
             await progressToNextContributionStep(cloudFunctions, ceremony.id)