@devtion/devcli 0.0.0-5d170d3 → 0.0.0-7140596

package/README.md

@@ -61,6 +61,8 @@ or run specific commands with `npx`:
 npx @p0tion/phase2cli contribute
 ```
 
+> Please note that phase2cli only runs on Linux or Mac systems. If a Windows user, please install [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install) first.
+
 ## 📜 Usage
 
 ### Local Development

package/dist/.env

@@ -1,41 +1,40 @@
-### FIREBASE ###
-### These configs are related to the configuration of the Firebase services.
-
-
-# The Firebase Application API key for making request against the services.
-# nb. this is going to be auto-generated when creating a new application.
-FIREBASE_API_KEY=AIzaSyDVAu8U4zBpM3FFLPyktSjZnCmg1IR73Cg
-# The URL to Firebase Authentication service (should point to default).
-# nb. this is going to be auto-generated when creating a new application.
-FIREBASE_AUTH_DOMAIN=p0tion-ci-environment.firebaseapp.com
-# The Firebase Application project id (should match with application name).
-FIREBASE_PROJECT_ID=p0tion-ci-environment
-# The Firebase unique message sender identifier (to recognize the application user).
-# nb. this is going to be auto-generated when creating a new application.
-FIREBASE_MESSAGING_SENDER_ID=22680510841
-# The Firebase unique identifier for your application.
-# nb. this is going to be auto-generated when creating a new application.
-FIREBASE_APP_ID=1:22680510841:web:529a664e73dbabd1c7cfa8
-FIREBASE_CF_URL_VERIFY_CONTRIBUTION=https://verifycontribution-mq4aqokliq-ew.a.run.app
-
-### AUTHENTICATION ###
-### These configs are related to the authentication of users.
-
-# The unique identifier for the Github client associated to the OAuth Application.
-AUTH_GITHUB_CLIENT_ID=e9f8a5fabdfe0d95618c
-
-### AWS S3 STORAGE ###
-### These configs are related to the configuration of the interaction with the
-### AWS S3 bucket used as storage for ceremony artifacts.
-
-# The chunk size to be used when executing multi-part upload or downloads.
-# default 50 MBs.
-# (e.g. a 200 MB file setting a stream chunk size of 50 MB is going to be splitted and uploaded/downloaded in 4 chunks).
-CONFIG_STREAM_CHUNK_SIZE_IN_MB=50
-# The postfix string for each ceremony bucket.
-# default -ph2-ceremony
-CONFIG_CEREMONY_BUCKET_POSTFIX=-p0tion-development-environment
-# The amount of time in seconds which indicates the duration about the validity of a pre-signed URL.
-# default: 7200 seconds = 2 hours.
-CONFIG_PRESIGNED_URL_EXPIRATION_IN_SECONDS=7200
+### FIREBASE ###
+### These configs are related to the configuration of the Firebase services.
 
+
+# The Firebase Application API key for making request against the services.
+# nb. this is going to be auto-generated when creating a new application.
+FIREBASE_API_KEY="AIzaSyDVAu8U4zBpM3FFLPyktSjZnCmg1IR73Cg"
+# The URL to Firebase Authentication service (should point to default).
+# nb. this is going to be auto-generated when creating a new application.
+FIREBASE_AUTH_DOMAIN="p0tion-ci-environment.firebaseapp.com"
+# The Firebase Application project id (should match with application name).
+FIREBASE_PROJECT_ID="p0tion-ci-environment"
+# The Firebase unique message sender identifier (to recognize the application user).
+# nb. this is going to be auto-generated when creating a new application.
+FIREBASE_MESSAGING_SENDER_ID="22680510841"
+# The Firebase unique identifier for your application.
+# nb. this is going to be auto-generated when creating a new application.
+FIREBASE_APP_ID="1:22680510841:web:529a664e73dbabd1c7cfa8"
+FIREBASE_CF_URL_VERIFY_CONTRIBUTION="https://verifycontribution-mq4aqokliq-ew.a.run.app"
+
+### AUTHENTICATION ###
+### These configs are related to the authentication of users.
+
+# The unique identifier for the Github client associated to the OAuth Application.
+AUTH_GITHUB_CLIENT_ID="e9f8a5fabdfe0d95618c"
+
+### AWS S3 STORAGE ###
+### These configs are related to the configuration of the interaction with the
+### AWS S3 bucket used as storage for ceremony artifacts.
+
+# The chunk size to be used when executing multi-part upload or downloads.
+# default 50 MBs.
+# (e.g. a 200 MB file setting a stream chunk size of 50 MB is going to be splitted and uploaded/downloaded in 4 chunks).
+CONFIG_STREAM_CHUNK_SIZE_IN_MB=50
+# The postfix string for each ceremony bucket.
+# default "-ph2-ceremony"
+CONFIG_CEREMONY_BUCKET_POSTFIX="-p0tion-development-environment"
+# The amount of time in seconds which indicates the duration about the validity of a pre-signed URL.
+# default: 7200 seconds = 2 hours.
+CONFIG_PRESIGNED_URL_EXPIRATION_IN_SECONDS=7200

package/dist/index.js

@@ -2113,8 +2113,9 @@ const onVerification = async (verification) => {
     clipboard.writeSync(verification.user_code);
     clipboard.readSync();
     // Display data.
-    console.log(`${theme.symbols.warning} Visit ${theme.text.bold(theme.text.underlined(verification.verification_uri))} on this device to generate a new token and authenticate`);
-    console.log(`${theme.symbols.info} Your auth code: ${theme.text.bold(verification.user_code)} (${theme.emojis.clipboard} ${theme.symbols.success})\n`);
+    console.log(`${theme.symbols.warning} Visit ${theme.text.bold(theme.text.underlined(verification.verification_uri))} on this device to generate a new token and authenticate\n`);
+    console.log(theme.colors.magenta(figlet.textSync("Code is Below", { font: "ANSI Shadow" })), '\n');
+    console.log(`${theme.symbols.info} Your auth code: ${theme.text.bold(verification.user_code)} has been copied to your clipboard (${theme.emojis.clipboard} ${theme.symbols.success})\n`);
     const spinner = customSpinner(`Redirecting to Github...`, `clock`);
     spinner.start();
     await sleep(10000); // ~10s to make users able to read the CLI.
@@ -2407,7 +2408,6 @@ const listenToCeremonyCircuitDocumentChanges = (firestoreDatabase, ceremonyId, p
         const { avgTimings, waitingQueue } = changedCircuit.data();
         const { fullContribution, verifyCloudFunction } = avgTimings;
         const { currentContributor } = waitingQueue;
-        // Get circuit current contributor participant document.
         const circuitCurrentContributor = await getDocumentById(firestoreDatabase, getParticipantsCollectionPath(ceremonyId), currentContributor);
         // Check data.
         if (!circuitCurrentContributor.data())
@@ -2616,7 +2616,7 @@ const listenToParticipantDocumentChanges = async (firestoreDatabase, cloudFuncti
                     // Get latest contribution verification result.
                     await getLatestVerificationResult(firestoreDatabase, ceremony.id, circuit.id, participant.id);
                 // Get next circuit for contribution.
-                const nextCircuit = getCircuitBySequencePosition(circuits, changedContributionProgress + 1);
+                const nextCircuit = timeoutExpired ? getCircuitBySequencePosition(circuits, changedContributionProgress) : getCircuitBySequencePosition(circuits, changedContributionProgress + 1);
                 // Check disk space requirements for participant.
                 const wannaGenerateAttestation = await handleDiskSpaceRequirementForNextContribution(cloudFunctions, ceremony.id, nextCircuit.data.sequencePosition, nextCircuit.data.zKeySizeInBytes, timeoutExpired, providerUserId);
                 // Check if the participant would like to generate a new attestation.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devtion/devcli",
   "type": "module",
-  "version": "0.0.0-5d170d3",
+  "version": "0.0.0-7140596",
   "description": "All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies",
   "repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
   "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -64,10 +64,11 @@
   },
   "dependencies": {
     "@adobe/node-fetch-retry": "^2.2.0",
+    "@aws-sdk/client-s3": "^3.329.0",
+    "@devtion/actions": "latest",
     "@octokit/auth-oauth-app": "^5.0.5",
     "@octokit/auth-oauth-device": "^4.0.4",
     "@octokit/request": "^6.2.3",
-    "@p0tion/actions": "^1.0.5",
     "blakejs": "^1.2.1",
     "boxen": "^7.1.0",
     "chalk": "^5.2.0",
@@ -96,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff032e8717f4aac3f66730e0a256660c2e741505"
+  "gitHead": "5f4dde47fdee59378296f3581ce9c7ce01676083"
 }

package/src/commands/auth.ts

@@ -4,6 +4,7 @@ import { Verification } from "@octokit/auth-oauth-device/dist-types/types.js"
 import clipboard from "clipboardy"
 import dotenv from "dotenv"
 import open from "open"
+import figlet from "figlet"
 import { fileURLToPath } from "url"
 import { dirname } from "path"
 import { GENERIC_ERRORS, showError } from "../lib/errors.js"
@@ -69,10 +70,13 @@ export const onVerification = async (verification: Verification): Promise<void>
     console.log(
         `${theme.symbols.warning} Visit ${theme.text.bold(
             theme.text.underlined(verification.verification_uri)
-        )} on this device to generate a new token and authenticate`
+        )} on this device to generate a new token and authenticate\n`
     )
+
+    console.log(theme.colors.magenta(figlet.textSync("Code is Below", { font: "ANSI Shadow" })), '\n')
+        
     console.log(
-        `${theme.symbols.info} Your auth code: ${theme.text.bold(verification.user_code)} (${theme.emojis.clipboard} ${
+        `${theme.symbols.info} Your auth code: ${theme.text.bold(verification.user_code)} has been copied to your clipboard (${theme.emojis.clipboard} ${
             theme.symbols.success
         })\n`
     )

package/src/commands/contribute.ts

@@ -464,7 +464,6 @@ export const listenToCeremonyCircuitDocumentChanges = (
         const { fullContribution, verifyCloudFunction } = avgTimings
         const { currentContributor } = waitingQueue
 
-        // Get circuit current contributor participant document.
         const circuitCurrentContributor = await getDocumentById(
             firestoreDatabase,
             getParticipantsCollectionPath(ceremonyId),
@@ -811,7 +810,7 @@ export const listenToParticipantDocumentChanges = async (
                     await getLatestVerificationResult(firestoreDatabase, ceremony.id, circuit.id, participant.id)
 
                 // Get next circuit for contribution.
-                const nextCircuit = getCircuitBySequencePosition(circuits, changedContributionProgress + 1)
+                const nextCircuit = timeoutExpired ? getCircuitBySequencePosition(circuits, changedContributionProgress) : getCircuitBySequencePosition(circuits, changedContributionProgress + 1)
 
                 // Check disk space requirements for participant.
                 const wannaGenerateAttestation = await handleDiskSpaceRequirementForNextContribution(