@devtion/devcli 0.0.0-7e983e3 → 0.0.0-bfc9ee4

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(verification.user_code, { 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-7e983e3",
+  "version": "0.0.0-bfc9ee4",
   "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",
@@ -96,5 +96,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "afae72061a3b366b05508de53fe91e9b254cc3d5"
+  "gitHead": "b2a3be0c3d0ad2a94270d7a256b5b5acf3b1c47f"
 }

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(verification.user_code, { 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(