@devtion/devcli 0.0.0-101d43f → 0.0.0-142ec0a

package/dist/types/lib/utils.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseDocumentInfo } from "@p0tion/actions";
+import { FirebaseDocumentInfo } from "@devtion/actions";
 import { OAuthCredential } from "firebase/auth";
 import { DocumentData, Firestore } from "firebase/firestore";
 import { Functions } from "firebase/functions";
@@ -154,5 +154,6 @@ export declare const getLatestUpdatesFromParticipant: (firestoreDatabase: Firest
  * @param entropyOrBeaconHash <string> - the entropy or beacon hash (only when finalizing) for the contribution.
  * @param contributorOrCoordinatorIdentifier <string> - the identifier of the contributor or coordinator (only when finalizing).
  * @param isFinalizing <boolean> - flag to discriminate between ceremony finalization (true) and contribution (false).
+ * @param circuitsLength <number> - the total number of circuits in the ceremony.
  */
-export declare const handleStartOrResumeContribution: (cloudFunctions: Functions, firestoreDatabase: Firestore, ceremony: FirebaseDocumentInfo, circuit: FirebaseDocumentInfo, participant: FirebaseDocumentInfo, entropyOrBeaconHash: any, contributorOrCoordinatorIdentifier: string, isFinalizing: boolean) => Promise<void>;
+export declare const handleStartOrResumeContribution: (cloudFunctions: Functions, firestoreDatabase: Firestore, ceremony: FirebaseDocumentInfo, circuit: FirebaseDocumentInfo, participant: FirebaseDocumentInfo, entropyOrBeaconHash: any, contributorOrCoordinatorIdentifier: string, isFinalizing: boolean, circuitsLength: number) => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devtion/devcli",
   "type": "module",
-  "version": "0.0.0-101d43f",
+  "version": "0.0.0-142ec0a",
   "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",
@@ -65,10 +65,10 @@
   "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.6",
     "blakejs": "^1.2.1",
     "boxen": "^7.1.0",
     "chalk": "^5.2.0",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e6569587be6eeb1bbc2e65563eb247c100e9d66"
+  "gitHead": "e1031fbb36d4e2bbf1988f32fdc0ddfe230e8684"
 }

package/src/commands/auth.ts

@@ -63,8 +63,13 @@ export const expirationCountdownForGithubOAuth = (expirationInSeconds: number) =
  */
 export const onVerification = async (verification: Verification): Promise<void> => {
     // Copy code to clipboard.
-    clipboard.writeSync(verification.user_code)
-    clipboard.readSync()
+    let noClipboard = false
+    try {
+        clipboard.writeSync(verification.user_code)
+        clipboard.readSync()
+    } catch (error) {
+        noClipboard = true
+    }
 
     // Display data.
     console.log(
@@ -73,12 +78,13 @@ export const onVerification = async (verification: Verification): Promise<void>
         )} 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.colors.magenta(figlet.textSync("Code is Below", { font: "ANSI Shadow" })), "\n")
+
+    const message = !noClipboard ? `has been copied to your clipboard (${theme.emojis.clipboard})` : ``
     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.info} Your auth code: ${theme.text.bold(verification.user_code)} ${message} ${
             theme.symbols.success
-        })\n`
+        }\n`
     )
 
     const spinner = customSpinner(`Redirecting to Github...`, `clock`)
@@ -86,8 +92,12 @@ export const onVerification = async (verification: Verification): Promise<void>
 
     await sleep(10000) // ~10s to make users able to read the CLI.
 
-    // Automatically open the page (# Step 2).
-    await open(verification.verification_uri)
+    try {
+        // Automatically open the page (# Step 2).
+        await open(verification.verification_uri)
+    } catch (error: any) {
+        console.log(`${theme.symbols.info} Please authenticate via GitHub at ${verification.verification_uri}`)
+    }
 
     spinner.stop()
 

package/src/commands/contribute.ts

@@ -22,7 +22,7 @@ import {
     generateValidContributionsAttestation,
     commonTerms,
     convertToDoubleDigits
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import { DocumentSnapshot, DocumentData, Firestore, onSnapshot, Timestamp } from "firebase/firestore"
 import { Functions } from "firebase/functions"
 import open from "open"
@@ -40,7 +40,7 @@ import {
     estimateParticipantFreeGlobalDiskSpace
 } from "../lib/utils.js"
 import { COMMAND_ERRORS, showError } from "../lib/errors.js"
-import { bootstrapCommandExecutionAndServices, checkAuth } from "../lib/services.js"
+import { authWithToken, bootstrapCommandExecutionAndServices, checkAuth } from "../lib/services.js"
 import { getAttestationLocalFilePath, localPaths } from "../lib/localConfigs.js"
 import theme from "../lib/theme.js"
 import { checkAndMakeNewDirectoryIfNonexistent, writeFile } from "../lib/files.js"
@@ -724,7 +724,8 @@ export const listenToParticipantDocumentChanges = async (
                     participant,
                     entropy,
                     providerUserId,
-                    false // not finalizing.
+                    false, // not finalizing.
+                    circuits.length
                 )
             }
             // Scenario (3.A).
@@ -810,7 +811,9 @@ export const listenToParticipantDocumentChanges = async (
                     await getLatestVerificationResult(firestoreDatabase, ceremony.id, circuit.id, participant.id)
 
                 // Get next circuit for contribution.
-                const nextCircuit = timeoutExpired ? getCircuitBySequencePosition(circuits, changedContributionProgress) : getCircuitBySequencePosition(circuits, changedContributionProgress + 1)
+                const nextCircuit = timeoutExpired
+                    ? getCircuitBySequencePosition(circuits, changedContributionProgress)
+                    : getCircuitBySequencePosition(circuits, changedContributionProgress + 1)
 
                 // Check disk space requirements for participant.
                 const wannaGenerateAttestation = await handleDiskSpaceRequirementForNextContribution(
@@ -891,12 +894,13 @@ export const listenToParticipantDocumentChanges = async (
 const contribute = async (opt: any) => {
     const { firebaseApp, firebaseFunctions, firestoreDatabase } = await bootstrapCommandExecutionAndServices()
 
-    // Check for authentication.
-    const { user, providerUserId, token } = await checkAuth(firebaseApp)
-
     // Get options.
     const ceremonyOpt = opt.ceremony
     const entropyOpt = opt.entropy
+    const { auth } = opt
+
+    // Check for authentication.
+    const { user, providerUserId, token } = auth ? await authWithToken(firebaseApp, auth) : await checkAuth(firebaseApp)
 
     // Prepare data.
     let selectedCeremony: FirebaseDocumentInfo
@@ -948,7 +952,7 @@ const contribute = async (opt: any) => {
     const userData = userDoc.data()
     if (!userData) {
         spinner.fail(
-            `Unfortunately we could not find a user document with your information. This likely means that you did not pass the GitHub reputation checks and therefore are not elegible to contribute to any ceremony. Please contact the coordinator if you believe this to be an error.`
+            `Unfortunately we could not find a user document with your information. This likely means that you did not pass the GitHub reputation checks and therefore are not elegible to contribute to any ceremony. If you believe you pass the requirements, it might be possible that your profile is private and we were not able to fetch your real statistics, in this case please consider making your profile public for the duration of the contribution. Please contact the coordinator if you believe this to be an error.`
         )
         process.exit(0)
     }

package/src/commands/finalize.ts

@@ -22,7 +22,7 @@ import {
     exportVerifierContract,
     FirebaseDocumentInfo,
     exportVkey
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import { Functions } from "firebase/functions"
 import { Firestore } from "firebase/firestore"
 import { dirname } from "path"
@@ -36,9 +36,9 @@ import {
     sleep,
     terminate
 } from "../lib/utils.js"
-import { bootstrapCommandExecutionAndServices, checkAuth } from "../lib/services.js"
+import { authWithToken, bootstrapCommandExecutionAndServices, checkAuth } from "../lib/services.js"
 import {
-    getAttestationLocalFilePath,
+    getFinalAttestationLocalFilePath,
     getFinalZkeyLocalFilePath,
     getVerificationKeyLocalFilePath,
     getVerifierContractLocalFilePath,
@@ -112,7 +112,7 @@ export const handleVerifierSmartContract = async (
         ? `${dirname(
               fileURLToPath(import.meta.url)
           )}/../../../../node_modules/snarkjs/templates/verifier_groth16.sol.ejs`
-        : `${dirname(fileURLToPath(import.meta.url))}/../../../node_modules/snarkjs/templates/verifier_groth16.sol.ejs`
+        : `${dirname(fileURLToPath(import.meta.url))}/../node_modules/snarkjs/templates/verifier_groth16.sol.ejs`
 
     // Export the Solidity verifier smart contract.
     const verifierCode = await exportVerifierContract(finalZkeyLocalFilePath, verifierPath)
@@ -152,6 +152,7 @@ export const handleVerifierSmartContract = async (
  * @param participant <FirebaseDocumentInfo> - the Firestore document of the participant (coordinator).
  * @param beacon <string> - the value used to compute the final contribution while finalizing the ceremony.
  * @param coordinatorIdentifier <string> - the identifier of the coordinator.
+ * @param circuitsLength <number> - the number of circuits in the ceremony.
  */
 export const handleCircuitFinalization = async (
     cloudFunctions: Functions,
@@ -160,7 +161,8 @@ export const handleCircuitFinalization = async (
     circuit: FirebaseDocumentInfo,
     participant: FirebaseDocumentInfo,
     beacon: string,
-    coordinatorIdentifier: string
+    coordinatorIdentifier: string,
+    circuitsLength: number
 ) => {
     // Step (1).
     await handleStartOrResumeContribution(
@@ -171,7 +173,8 @@ export const handleCircuitFinalization = async (
         participant,
         computeSHA256ToHex(beacon),
         coordinatorIdentifier,
-        true
+        true,
+        circuitsLength
     )
 
     await sleep(2000) // workaound for descriptors.
@@ -241,11 +244,16 @@ export const handleCircuitFinalization = async (
  * @dev For proper execution, the command requires the coordinator to be authenticated with a GitHub account (run auth command first) in order to
  * handle sybil-resistance and connect to GitHub APIs to publish the gist containing the final public attestation.
  */
-const finalize = async () => {
+const finalize = async (opt: any) => {
     const { firebaseApp, firebaseFunctions, firestoreDatabase } = await bootstrapCommandExecutionAndServices()
 
     // Check for authentication.
-    const { user, providerUserId, token: coordinatorAccessToken } = await checkAuth(firebaseApp)
+    const { auth } = opt
+    const {
+        user,
+        providerUserId,
+        token: coordinatorAccessToken
+    } = auth ? await authWithToken(firebaseApp, auth) : await checkAuth(firebaseApp)
 
     // Preserve command execution only for coordinators.
     if (!(await isCoordinator(user))) showError(COMMAND_ERRORS.COMMAND_NOT_COORDINATOR, true)
@@ -306,7 +314,8 @@ const finalize = async () => {
             circuit,
             participant,
             beacon,
-            providerUserId
+            providerUserId,
+            circuits.length
         )
 
     process.stdout.write(`\n`)
@@ -344,7 +353,7 @@ const finalize = async () => {
 
     // Write public attestation locally.
     writeFile(
-        getAttestationLocalFilePath(
+        getFinalAttestationLocalFilePath(
             `${prefix}_${finalContributionIndex}_${commonTerms.foldersAndPathsTerms.attestation}.log`
         ),
         Buffer.from(publicAttestation)

package/src/commands/index.ts

@@ -6,4 +6,4 @@ export { default as finalize } from "./finalize.js"
 export { default as clean } from "./clean.js"
 export { default as logout } from "./logout.js"
 export { default as validate } from "./validate.js"
-export { default as listCeremonies} from "./listCeremonies.js"
+export { default as listCeremonies } from "./listCeremonies.js"

package/src/commands/listCeremonies.ts

@@ -1,4 +1,4 @@
-import { commonTerms, getAllCollectionDocs } from "@p0tion/actions"
+import { commonTerms, getAllCollectionDocs } from "@devtion/actions"
 import { showError } from "../lib/errors.js"
 import { bootstrapCommandExecutionAndServices } from "../lib/services.js"
 
@@ -17,11 +17,10 @@ const listCeremonies = async () => {
 
         // loop through all ceremonies
         for (const ceremony of ceremonies) names.push(ceremony.data().prefix)
-        
+
         // print them to the console
         console.log(names.join(", "))
         process.exit(0)
-
     } catch (err: any) {
         showError(`${err.toString()}`, false)
         // we want to exit with a non-zero exit code

package/src/commands/observe.ts

@@ -7,7 +7,7 @@ import {
     getOpenedCeremonies,
     isCoordinator,
     convertToDoubleDigits
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import { Firestore } from "firebase/firestore"
 import logSymbols from "log-symbols"
 import readline from "readline"
@@ -15,7 +15,7 @@ import { COMMAND_ERRORS, GENERIC_ERRORS, showError } from "../lib/errors.js"
 import { promptForCeremonySelection } from "../lib/prompts.js"
 import { bootstrapCommandExecutionAndServices, checkAuth } from "../lib/services.js"
 import theme from "../lib/theme.js"
-import {customSpinner, getSecondsMinutesHoursFromMillis, sleep } from "../lib/utils.js"
+import { customSpinner, getSecondsMinutesHoursFromMillis, sleep } from "../lib/utils.js"
 
 /**
  * Clean cursor lines from current position back to root (default: zero).
@@ -143,7 +143,7 @@ const observe = async () => {
         // Preserve command execution only for coordinators].
         if (!(await isCoordinator(user))) showError(COMMAND_ERRORS.COMMAND_NOT_COORDINATOR, true)
 
-        // Get running cerimonies info (if any).
+        // Get running ceremonies info (if any).
         const runningCeremoniesDocs = await getOpenedCeremonies(firestoreDatabase)
 
         // Ask to select a ceremony.

package/src/commands/setup.ts

@@ -2,12 +2,11 @@
 
 import { zKey } from "snarkjs"
 import boxen from "boxen"
-import { createWriteStream, Dirent, renameSync } from "fs"
+import { createWriteStream, Dirent, renameSync, existsSync } from "fs"
 import { pipeline } from "node:stream"
 import { promisify } from "node:util"
 import fetch from "node-fetch"
 import { Functions } from "firebase/functions"
-import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3"
 import {
     CeremonyTimeoutType,
     CircomCompilerData,
@@ -37,7 +36,7 @@ import {
     setupCeremony,
     parseCeremonyFile,
     CircuitContributionVerificationMechanism
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import { customSpinner, simpleLoader, sleep, terminate } from "../lib/utils.js"
 import {
     promptCeremonyInputData,
@@ -63,7 +62,6 @@ import {
     getFileStats,
     checkAndMakeNewDirectoryIfNonexistent
 } from "../lib/files.js"
-import { Readable } from "stream"
 
 /**
  * Handle whatever is needed to obtain the input data for a circuit that the coordinator would like to add to the ceremony.
@@ -183,7 +181,7 @@ export const handleAdditionOfCircuitsToCeremony = async (
 
         if (matchingWasms.length !== 1) showError(COMMAND_ERRORS.COMMAND_SETUP_MISMATCH_R1CS_WASM, true)
 
-        // Get input data for choosen circuit.
+        // Get input data for chosen circuit.
         const circuitInputData = await getInputDataToAddCircuitToCeremony(
             choosenCircuitFilename,
             matchingWasms[0],
@@ -324,7 +322,7 @@ export const checkAndDownloadSmallestPowersOfTau = async (
  * number of powers greater than or equal to the powers needed by the zKey), the coordinator will be asked
  * to provide a number of powers manually, ranging from the smallest possible to the largest.
  * @param neededPowers <number> - the smallest amount of powers needed by the zKey.
- * @returns Promise<string, string> - the information about the choosen Powers of Tau file for the pre-computed zKey
+ * @returns Promise<string, string> - the information about the chosen Powers of Tau file for the pre-computed zKey
  * along with related powers.
  */
 export const handlePreComputedZkeyPowersOfTauSelection = async (
@@ -468,7 +466,7 @@ export const handleCircuitArtifactUploadToStorage = async (
  * from Hermez's ceremony Phase 1 Reliable Setup Ceremony.
  * @param cmd? <any> - the path to the ceremony setup file.
  */
-const setup = async (cmd: { template?: string, auth?: string}) => {
+const setup = async (cmd: { template?: string; auth?: string }) => {
     // Setup command state.
     const circuits: Array<CircuitDocument> = [] // Circuits.
     let ceremonyId: string = "" // The unique identifier of the ceremony.
@@ -476,8 +474,10 @@ const setup = async (cmd: { template?: string, auth?: string}) => {
     const { firebaseApp, firebaseFunctions, firestoreDatabase } = await bootstrapCommandExecutionAndServices()
 
     // Check for authentication.
-    const { user, providerUserId } = cmd.auth ? await authWithToken(firebaseApp, cmd.auth) : await checkAuth(firebaseApp)
-   
+    const { user, providerUserId } = cmd.auth
+        ? await authWithToken(firebaseApp, cmd.auth)
+        : await checkAuth(firebaseApp)
+
     // Preserve command execution only for coordinators.
     if (!(await isCoordinator(user))) showError(COMMAND_ERRORS.COMMAND_NOT_COORDINATOR, true)
 
@@ -503,7 +503,7 @@ const setup = async (cmd: { template?: string, auth?: string}) => {
     // if there is the file option, then set up the non interactively
     if (cmd.template) {
         // 1. parse the file
-        // tmp data - do not cleanup files as we need them 
+        // tmp data - do not cleanup files as we need them
         const spinner = customSpinner(`Parsing ${theme.text.bold(cmd.template!)} setup configuration file...`, `clock`)
         spinner.start()
         const setupCeremonyData = await parseCeremonyFile(cmd.template!)
@@ -526,18 +526,44 @@ const setup = async (cmd: { template?: string, auth?: string}) => {
             const zkeyLocalPathAndFileName = getZkeyLocalFilePath(circuit.files.initialZkeyFilename)
 
             // 2. download the pot and wasm files
-            await checkAndDownloadSmallestPowersOfTau(convertToDoubleDigits(circuit.metadata?.pot!), circuit.files.potFilename)
-          
+            await checkAndDownloadSmallestPowersOfTau(
+                convertToDoubleDigits(circuit.metadata?.pot!),
+                circuit.files.potFilename
+            )
+
             // 3. generate the zKey
-            const spinner = customSpinner(`Generating genesis zKey for circuit ${theme.text.bold(circuit.name)}...`, `clock`)
+            const spinner = customSpinner(
+                `Generating genesis zKey for circuit ${theme.text.bold(circuit.name)}...`,
+                `clock`
+            )
             spinner.start()
-            await zKey.newZKey(r1csLocalPathAndFileName, getPotLocalFilePath(circuit.files.potFilename), zkeyLocalPathAndFileName, undefined)
-            spinner.succeed(`Generation of the genesis zKey for citcui ${theme.text.bold(circuit.name)} completed successfully`)
 
+            if (existsSync(zkeyLocalPathAndFileName)) {
+                spinner.succeed(
+                    `The genesis zKey for circuit ${theme.text.bold(circuit.name)} is already present on disk`
+                )
+            } else {
+                await zKey.newZKey(
+                    r1csLocalPathAndFileName,
+                    getPotLocalFilePath(circuit.files.potFilename),
+                    zkeyLocalPathAndFileName,
+                    undefined
+                )
+                spinner.succeed(
+                    `Generation of the genesis zKey for circuit ${theme.text.bold(circuit.name)} completed successfully`
+                )
+            }
+
+            const hashSpinner = customSpinner(
+                `Calculating hashes for circuit ${theme.text.bold(circuit.name)}...`,
+                `clock`
+            )
+            hashSpinner.start()
             // 4. calculate the hashes
             const wasmBlake2bHash = await blake512FromPath(wasmLocalPathAndFileName)
             const potBlake2bHash = await blake512FromPath(getPotLocalFilePath(circuit.files.potFilename))
             const initialZkeyBlake2bHash = await blake512FromPath(zkeyLocalPathAndFileName)
+            hashSpinner.succeed(`Hashes for circuit ${theme.text.bold(circuit.name)} calculated successfully`)
 
             // 5. upload the artifacts
 
@@ -549,7 +575,7 @@ const setup = async (cmd: { template?: string, auth?: string}) => {
                 zkeyLocalPathAndFileName,
                 circuit.files.initialZkeyFilename
             )
-           
+
             // Check if PoT file has been already uploaded to storage.
             const alreadyUploadedPot = await checkIfObjectExist(
                 firebaseFunctions,
@@ -590,25 +616,31 @@ const setup = async (cmd: { template?: string, auth?: string}) => {
             // 6 update the setup data object
             ceremonySetupData.circuits[index].files = {
                 ...circuit.files,
-                potBlake2bHash: potBlake2bHash,
-                wasmBlake2bHash: wasmBlake2bHash,
-                initialZkeyBlake2bHash: initialZkeyBlake2bHash
+                potBlake2bHash,
+                wasmBlake2bHash,
+                initialZkeyBlake2bHash
             }
 
             ceremonySetupData.circuits[index].zKeySizeInBytes = getFileStats(zkeyLocalPathAndFileName).size
         }
-      
 
         // 7. setup the ceremony
-        const ceremonyId = await setupCeremony(firebaseFunctions, ceremonySetupData.ceremonyInputData, ceremonySetupData.ceremonyPrefix, ceremonySetupData.circuits)
-        console.log( `Congratulations, the setup of ceremony ${theme.text.bold(
-            ceremonySetupData.ceremonyInputData.title
-        )} (${`UID: ${theme.text.bold(ceremonyId)}`}) has been successfully completed ${
-            theme.emojis.tada
-        }. You will be able to find all the files and info respectively in the ceremony bucket and database document.`)
-    
+        const ceremonyId = await setupCeremony(
+            firebaseFunctions,
+            ceremonySetupData.ceremonyInputData,
+            ceremonySetupData.ceremonyPrefix,
+            ceremonySetupData.circuits
+        )
+        console.log(
+            `Congratulations, the setup of ceremony ${theme.text.bold(
+                ceremonySetupData.ceremonyInputData.title
+            )} (${`UID: ${theme.text.bold(ceremonyId)}`}) has been successfully completed ${
+                theme.emojis.tada
+            }. You will be able to find all the files and info respectively in the ceremony bucket and database document.`
+        )
+
         terminate(providerUserId)
-    } 
+    }
 
     // Look for R1CS files.
     const r1csFilePaths = await filterDirectoryFilesByExtension(cwd, `.r1cs`)

package/src/commands/validate.ts

@@ -1,10 +1,10 @@
-import { parseCeremonyFile } from "@p0tion/actions"
+import { parseCeremonyFile } from "@devtion/actions"
 import { showError } from "../lib/errors.js"
 
 /**
  * Validate ceremony setup command.
  */
-const validate = async (cmd: { template: string, constraints?: number }) => {
+const validate = async (cmd: { template: string; constraints?: number }) => {
     try {
         // parse the file and cleanup after
         const parsedFile = await parseCeremonyFile(cmd.template, true)
@@ -18,7 +18,6 @@ const validate = async (cmd: { template: string, constraints?: number }) => {
         }
 
         console.log(true)
-
     } catch (err: any) {
         showError(`${err.toString()}`, false)
         // we want to exit with a non-zero exit code

package/src/index.ts

@@ -4,7 +4,17 @@ import { createCommand } from "commander"
 import { readFileSync } from "fs"
 import { dirname } from "path"
 import { fileURLToPath } from "url"
-import { setup, auth, contribute, observe, finalize, clean, logout, validate, listCeremonies } from "./commands/index.js"
+import {
+    setup,
+    auth,
+    contribute,
+    observe,
+    finalize,
+    clean,
+    logout,
+    validate,
+    listCeremonies
+} from "./commands/index.js"
 
 // Get pkg info (e.g., name, version).
 const packagePath = `${dirname(fileURLToPath(import.meta.url))}/..`
@@ -21,15 +31,13 @@ program
     .description("compute contributions for a Phase2 Trusted Setup ceremony circuits")
     .option("-c, --ceremony <string>", "the prefix of the ceremony you want to contribute for", "")
     .option("-e, --entropy <string>", "the entropy (aka toxic waste) of your contribution", "")
+    .option("-a, --auth <string>", "the Github OAuth 2.0 token", "")
     .action(contribute)
 program
     .command("clean")
     .description("clean up output generated by commands from the current working directory")
     .action(clean)
-program
-    .command("list")
-    .description("List all ceremonies prefixes")
-    .action(listCeremonies)
+program.command("list").description("List all ceremonies prefixes").action(listCeremonies)
 program
     .command("logout")
     .description("sign out from Firebae Auth service and delete Github OAuth 2.0 token from local storage")
@@ -47,10 +55,10 @@ const ceremony = program.command("coordinate").description("commands for coordin
 ceremony
     .command("setup")
     .description("setup a Groth16 Phase 2 Trusted Setup ceremony for zk-SNARK circuits")
-    .option('-t, --template <path>', 'The path to the ceremony setup template', '')
-    .option('-a, --auth <string>', 'The Github OAuth 2.0 token', '')
+    .option("-t, --template <path>", "The path to the ceremony setup template", "")
+    .option("-a, --auth <string>", "The Github OAuth 2.0 token", "")
     .action(setup)
-    
+
 ceremony
     .command("observe")
     .description("observe in real-time the waiting queue of each ceremony circuit")
@@ -61,6 +69,7 @@ ceremony
     .description(
         "finalize a Phase2 Trusted Setup ceremony by applying a beacon, exporting verification key and verifier contract"
     )
+    .option("-a, --auth <string>", "the Github OAuth 2.0 token", "")
     .action(finalize)
 
 program.parseAsync(process.argv)

package/src/lib/localConfigs.ts

@@ -1,4 +1,4 @@
-import { commonTerms } from "@p0tion/actions"
+import { commonTerms } from "@devtion/actions"
 import Conf from "conf"
 import { dirname } from "path"
 import { readFileSync } from "fs"