@devtion/devcli 0.0.0-101d43f → 0.0.0-36caea1

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @module @p0tion/phase2cli
+ * @module @devtion/devcli
  * @version 1.0.6
  * @file All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies
  * @copyright Ethereum Foundation 2022
@@ -17,7 +17,7 @@ import boxen from 'boxen';
 import { pipeline } from 'node:stream';
 import { promisify } from 'node:util';
 import fetch$1 from 'node-fetch';
-import { commonTerms, formatZkeyIndex, getZkeyStorageFilePath, finalContributionIndex, createCustomLoggerForFile, getBucketName, progressToNextContributionStep, permanentlyStoreCurrentContributionTimeAndHash, convertToDoubleDigits, multiPartUpload, verifyContribution, generateGetObjectPreSignedUrl, convertBytesOrKbToGb, numExpIterations, getDocumentById, getParticipantsCollectionPath, fromQueryToFirebaseDocumentInfo, getAllCollectionDocs, extractPrefix, autoGenerateEntropy, vmConfigurationTypes, initializeFirebaseCoreServices, signInToFirebaseWithCredentials, getCurrentFirebaseAuthUser, isCoordinator, parseCeremonyFile, blake512FromPath, checkIfObjectExist, setupCeremony, genesisZkeyIndex, getR1csStorageFilePath, getWasmStorageFilePath, getPotStorageFilePath, extractPoTFromFilename, potFileDownloadMainUrl, createS3Bucket, potFilenameTemplate, getR1CSInfo, getOpenedCeremonies, getCeremonyCircuits, checkParticipantForCeremony, getCurrentActiveParticipantTimeout, getCircuitBySequencePosition, getCircuitContributionsFromContributor, progressToNextCircuitForContribution, resumeContributionAfterTimeoutExpiration, generateValidContributionsAttestation, getContributionsValidityForContributor, getClosedCeremonies, checkAndPrepareCoordinatorForFinalization, computeSHA256ToHex, finalizeCeremony, getVerificationKeyStorageFilePath, verificationKeyAcronym, getVerifierContractStorageFilePath, verifierSmartContractAcronym, finalizeCircuit, exportVkey, exportVerifierContract } from '@p0tion/actions';
+import { commonTerms, formatZkeyIndex, getZkeyStorageFilePath, finalContributionIndex, createCustomLoggerForFile, getBucketName, progressToNextContributionStep, permanentlyStoreCurrentContributionTimeAndHash, convertToDoubleDigits, multiPartUpload, verifyContribution, generateGetObjectPreSignedUrl, convertBytesOrKbToGb, numExpIterations, getDocumentById, getParticipantsCollectionPath, fromQueryToFirebaseDocumentInfo, getAllCollectionDocs, extractPrefix, autoGenerateEntropy, vmConfigurationTypes, initializeFirebaseCoreServices, signInToFirebaseWithCredentials, getCurrentFirebaseAuthUser, isCoordinator, parseCeremonyFile, blake512FromPath, checkIfObjectExist, setupCeremony, genesisZkeyIndex, getR1csStorageFilePath, getWasmStorageFilePath, getPotStorageFilePath, extractPoTFromFilename, potFileDownloadMainUrl, createS3Bucket, potFilenameTemplate, getR1CSInfo, getOpenedCeremonies, getCeremonyCircuits, checkParticipantForCeremony, getCurrentActiveParticipantTimeout, getCircuitBySequencePosition, getCircuitContributionsFromContributor, progressToNextCircuitForContribution, resumeContributionAfterTimeoutExpiration, generateValidContributionsAttestation, getContributionsValidityForContributor, getClosedCeremonies, checkAndPrepareCoordinatorForFinalization, computeSHA256ToHex, finalizeCeremony, getVerificationKeyStorageFilePath, verificationKeyAcronym, getVerifierContractStorageFilePath, verifierSmartContractAcronym, finalizeCircuit, exportVkey, exportVerifierContract } from '@devtion/actions';
 import fetch from '@adobe/node-fetch-retry';
 import { request } from '@octokit/request';
 import { SingleBar, Presets } from 'cli-progress';
@@ -807,7 +807,7 @@ const handleStartOrResumeContribution = async (cloudFunctions, firestoreDatabase
         console.log(`${theme.symbols.success} Contribution ${theme.text.bold(`#${nextZkeyIndex}`)} already computed`);
     // Contribution step = UPLOADING.
     if (isFinalizing || participantData.contributionStep === "UPLOADING" /* ParticipantContributionStep.UPLOADING */) {
-        spinner.text = `Uploading ${isFinalizing ? "final" : "your"} contribution ${!isFinalizing ? theme.text.bold(`#${nextZkeyIndex}`) : ""} to storage.\n${theme.symbols.warning} This step may take a while based on circuit size and your contribution speed. Everything's fine, just be patient.`;
+        spinner.text = `Uploading ${isFinalizing ? "final" : "your"} contribution ${!isFinalizing ? theme.text.bold(`#${nextZkeyIndex}`) : ""} to storage.\n${theme.symbols.warning} This step may take a while based on circuit size and your internet speed. Everything's fine, just be patient.`;
         spinner.start();
         if (!isFinalizing)
             await multiPartUpload(cloudFunctions, bucketName, nextZkeyStorageFilePath, nextZkeyLocalFilePath, Number(process.env.CONFIG_STREAM_CHUNK_SIZE_IN_MB), ceremony.id, participantData.tempContributionData);
@@ -2641,11 +2641,12 @@ const listenToParticipantDocumentChanges = async (firestoreDatabase, cloudFuncti
  */
 const contribute = async (opt) => {
     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.auth;
+    // Check for authentication.
+    const { user, providerUserId, token } = auth ? await authWithToken(firebaseApp, auth) : await checkAuth(firebaseApp);
     // Prepare data.
     let selectedCeremony;
     // Retrieve the opened ceremonies.
@@ -3155,6 +3156,7 @@ 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")

package/dist/types/commands/contribute.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Contribution, ContributionValidity, FirebaseDocumentInfo } from "@p0tion/actions";
+import { Contribution, ContributionValidity, FirebaseDocumentInfo } from "@devtion/actions";
 import { DocumentSnapshot, DocumentData, Firestore } from "firebase/firestore";
 import { Functions } from "firebase/functions";
 /**

package/dist/types/commands/finalize.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { FirebaseDocumentInfo } from "@p0tion/actions";
+import { FirebaseDocumentInfo } from "@devtion/actions";
 import { Functions } from "firebase/functions";
 import { Firestore } from "firebase/firestore";
 /**

package/dist/types/commands/observe.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { FirebaseDocumentInfo } from "@p0tion/actions";
+import { FirebaseDocumentInfo } from "@devtion/actions";
 import { Firestore } from "firebase/firestore";
 /**
  * Clean cursor lines from current position back to root (default: zero).

package/dist/types/commands/setup.d.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { Functions } from "firebase/functions";
-import { CeremonyTimeoutType, CircomCompilerData, CircuitInputData, CeremonyInputData, CircuitDocument } from "@p0tion/actions";
+import { CeremonyTimeoutType, CircomCompilerData, CircuitInputData, CeremonyInputData, CircuitDocument } from "@devtion/actions";
 /**
  * Handle whatever is needed to obtain the input data for a circuit that the coordinator would like to add to the ceremony.
  * @param choosenCircuitFilename <string> - the name of the circuit to add.

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

@@ -1,6 +1,6 @@
 import { Answers } from "prompts";
 import { Firestore } from "firebase/firestore";
-import { CeremonyInputData, FirebaseDocumentInfo, CircomCompilerData, CircuitInputData, CeremonyTimeoutType, DiskTypeForVM } from "@p0tion/actions";
+import { CeremonyInputData, FirebaseDocumentInfo, CircomCompilerData, CircuitInputData, CeremonyTimeoutType, DiskTypeForVM } from "@devtion/actions";
 /**
  * Ask a binary (yes/no or true/false) customizable question.
  * @param question <string> - the question to be answered.

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";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devtion/devcli",
   "type": "module",
-  "version": "0.0.0-101d43f",
+  "version": "0.0.0-36caea1",
   "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": "2390beae56f741cf791760fbc5e84775e7bc7474"
 }

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"
@@ -891,12 +891,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.auth 
+
+    // Check for authentication.
+    const { user, providerUserId, token } = auth ? await authWithToken(firebaseApp, auth) : await checkAuth(firebaseApp)
 
     // Prepare data.
     let selectedCeremony: FirebaseDocumentInfo

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"

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"
 

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"

package/src/commands/setup.ts

@@ -7,7 +7,6 @@ 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.

package/src/commands/validate.ts

@@ -1,4 +1,4 @@
-import { parseCeremonyFile } from "@p0tion/actions"
+import { parseCeremonyFile } from "@devtion/actions"
 import { showError } from "../lib/errors.js"
 
 /**

package/src/index.ts

@@ -21,6 +21,7 @@ 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")

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"

package/src/lib/prompts.ts

@@ -14,7 +14,7 @@ import {
     CircuitContributionVerificationMechanism,
     vmConfigurationTypes,
     DiskTypeForVM
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import theme from "./theme.js"
 import { COMMAND_ERRORS, showError } from "./errors.js"
 

package/src/lib/services.ts

@@ -2,7 +2,7 @@ import {
     getCurrentFirebaseAuthUser,
     initializeFirebaseCoreServices,
     signInToFirebaseWithCredentials
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import clear from "clear"
 import figlet from "figlet"
 import { FirebaseApp } from "firebase/app"

package/src/lib/utils.ts

@@ -19,7 +19,7 @@ import {
     permanentlyStoreCurrentContributionTimeAndHash,
     progressToNextContributionStep,
     verifyContribution
-} from "@p0tion/actions"
+} from "@devtion/actions"
 import { Presets, SingleBar } from "cli-progress"
 import dotenv from "dotenv"
 import { GithubAuthProvider, OAuthCredential } from "firebase/auth"
@@ -696,7 +696,7 @@ export const handleStartOrResumeContribution = async (
             !isFinalizing ? theme.text.bold(`#${nextZkeyIndex}`) : ""
         } to storage.\n${
             theme.symbols.warning
-        } This step may take a while based on circuit size and your contribution speed. Everything's fine, just be patient.`
+        } This step may take a while based on circuit size and your internet speed. Everything's fine, just be patient.`
         spinner.start()
 
         if (!isFinalizing)