Merge branch 'dev' into staging

privacy-scaling-explorations · Aug 23, 2024 · 49f0841 · 49f0841
2 parents 21824a7 + e312890
commit 49f0841
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/actions/src/helpers/vm.ts b/packages/actions/src/helpers/vm.ts
@@ -163,6 +163,7 @@ export const createEC2Instance = async (
     const { amiId, instanceProfileArn } = getAWSVariables()
 
     // Parametrize the VM EC2 instance.
+    console.log("\nLAUNCHING AWS EC2 INSTANCE\n")
     const params: RunInstancesCommandInput = {
         ImageId: amiId,
         InstanceType: instanceType as _InstanceType,
@@ -199,7 +200,7 @@ export const createEC2Instance = async (
                     },
                     {
                         Key: "ProjectName",
-                        Value: process.env.AWS_TAG_VALUE
+                        Value: "trusted-setup"
                     }
                 ]
             },
@@ -208,7 +209,7 @@ export const createEC2Instance = async (
                 Tags: [
                     {
                         Key: "ProjectName",
-                        Value: process.env.AWS_TAG_VALUE
+                        Value: "trusted-setup"
                     }
                 ]
             }

diff --git a/packages/backend/src/functions/timeout.ts b/packages/backend/src/functions/timeout.ts
@@ -144,8 +144,7 @@ export const checkAndRemoveBlockingContributor = functions
                                     timeoutExpirationDateInMsForBlockingContributor < currentServerTimestamp &&
                                     (contributionStep === ParticipantContributionStep.DOWNLOADING ||
                                         contributionStep === ParticipantContributionStep.COMPUTING ||
-                                        contributionStep === ParticipantContributionStep.UPLOADING ||
-                                        contributionStep === ParticipantContributionStep.COMPLETED)
+                                        contributionStep === ParticipantContributionStep.UPLOADING)
                                 )
                                     timeoutType = TimeoutType.BLOCKING_CONTRIBUTION
 

diff --git a/packages/phase2cli/src/lib/utils.ts b/packages/phase2cli/src/lib/utils.ts
@@ -312,8 +312,9 @@ export const generateCustomUrlToTweetAboutParticipation = (
     ceremonyName: string,
     gistUrl: string,
     isFinalizing: boolean
-) =>
-    isFinalizing
+) => {
+    ceremonyName = ceremonyName.replace(/ /g, "%20")
+    return isFinalizing
         ? `https://twitter.com/intent/tweet?text=I%20have%20finalized%20the%20${ceremonyName}${
               ceremonyName.toLowerCase().includes("trusted") ||
               ceremonyName.toLowerCase().includes("setup") ||
@@ -330,6 +331,7 @@ export const generateCustomUrlToTweetAboutParticipation = (
                   ? "!"
                   : "%20Phase%202%20Trusted%20Setup%20ceremony!"
           }%20You%20can%20view%20the%20steps%20to%20contribute%20here:%20https://ceremony.pse.dev%20You%20can%20view%20my%20attestation%20here:%20${gistUrl}%20#Ethereum%20#ZKP`
+}
 
 /**
  * Return a custom progress bar.