@maci-protocol/cli 0.0.0-ci.a584b1a → 0.0.0-ci.a874953

package/build/package.json

@@ -24,35 +24,35 @@
   "scripts": {
     "watch": "tsc --watch",
     "build": "tsc -p tsconfig.build.json",
-    "postbuild": "cp package.json ./build && mkdir -p ./zkeys",
+    "postbuild": "cp package.json ./build",
     "types": "tsc -p tsconfig.json --noEmit",
     "docs": "typedoc --plugin typedoc-plugin-markdown --options ./typedoc.json"
   },
   "dependencies": {
-    "@commander-js/extra-typings": "^13.1.0",
-    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
-    "commander": "^13.1.0",
-    "dotenv": "^16.5.0",
-    "ethers": "^6.13.7",
-    "hardhat": "^2.23.0",
+    "@commander-js/extra-typings": "^14.0.0",
+    "@nomicfoundation/hardhat-toolbox": "^6.1.0",
+    "commander": "^14.0.0",
+    "dotenv": "^17.2.2",
+    "ethers": "^6.15.0",
+    "hardhat": "^2.25.0",
     "@maci-protocol/domainobjs": "^3.0.0",
     "@maci-protocol/sdk": "^1.0.0",
     "prompt": "^1.3.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.9",
-    "@types/chai-as-promised": "^7.1.8",
+    "@types/chai-as-promised": "^8.0.2",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.8",
+    "@types/node": "^24.11.0",
     "@types/prompt": "^1.1.9",
     "@types/snarkjs": "^0.7.9",
     "chai": "^4.3.10",
-    "chai-as-promised": "^7.1.2",
-    "mocha": "^11.1.0",
+    "chai-as-promised": "^8.0.1",
+    "mocha": "^11.7.2",
     "nyc": "^17.1.0",
     "snarkjs": "^0.7.5",
     "ts-mocha": "^11.1.0",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "nyc": {
     "reporter": [

package/build/ts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":";AAoDA,OAAO,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":";AAmDA,OAAO,WAAW,CAAC"}

package/build/ts/index.js

@@ -45,6 +45,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 require("./cliInit");
 const utils_1 = require("./utils");
+const constants_1 = require("./utils/constants");
 const defaults_1 = require("./utils/defaults");
 // set the description version and name of the cli tool
 const { description, version, name } = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname, "..", "package.json"), "utf8"));
@@ -89,11 +90,8 @@ program
             const [contract] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ checker: checkerFactory, policy: policyFactory }, signer, true);
             signupPolicyContractAddress = await contract.getAddress();
         }
-        // deploy a verifier contract
-        const verifierContract = await (0, sdk_1.deployVerifier)(signer, true);
-        const verifierContractAddress = await verifierContract.getAddress();
         // deploy MACI, PollFactory and poseidon
-        const { maciContractAddress, pollFactoryContractAddress, tallyFactoryContractAddress, messageProcessorFactoryContractAddress, poseidonAddresses, } = await (0, sdk_1.deployMaci)({
+        const { maciContractAddress, pollFactoryContractAddress, tallyFactoryContractAddress, messageProcessorFactoryContractAddress, poseidonAddresses, verifierContractAddress, verifyingKeysRegistryContractAddress, } = await (0, sdk_1.deployMaci)({
             signupPolicyAddress: signupPolicyContractAddress,
             poseidonAddresses: {
                 poseidonT3,
@@ -110,6 +108,7 @@ program
             data: {
                 [args.signupPolicyContractName]: { address: signupPolicyContractAddress, args: [] },
                 [sdk_1.EContracts.Verifier]: { address: verifierContractAddress, args: [] },
+                [sdk_1.EContracts.VerifyingKeysRegistry]: { address: verifyingKeysRegistryContractAddress, args: [] },
                 [sdk_1.EContracts.MACI]: {
                     address: maciContractAddress,
                     args: [
@@ -140,16 +139,16 @@ program
 program
     .command("checkVerifyingKeys")
     .description("check that the verifying keys in the contract match the local ones")
-    .option("-u, --use-quadratic-voting <useQuadraticVoting>", "whether to use quadratic voting", (value) => value === "true", true)
+    .option("-m, --mode <mode>", "Voting mode (qv, non-qv, full)", (value) => constants_1.MODE_NAME_TO_ENUM[value], sdk_1.EMode.QV)
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
     .option("-k, --vk-contract <vkContract>", "the VerifyingKeysRegistry contract address")
     .requiredOption("-s, --state-tree-depth <stateTreeDepth>", "the state tree depth", parseInt)
-    .requiredOption("-i, --int-state-tree-depth <intStateTreeDepth>", "the intermediate state tree depth", parseInt)
+    .requiredOption("-i, --tally-processing-state-tree-depth <tallyProcessingStateTreeDepth>", "the intermediate state tree depth", parseInt)
     .requiredOption("-v, --vote-option-tree-depth <voteOptionTreeDepth>", "the vote option tree depth", parseInt)
     .requiredOption("-b, --message-batch-size <messageBatchSize>", "the message batch size", parseInt)
-    .requiredOption("-p, --process-messages-zkey <processMessagesZkeyPath>", "the process messages zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .requiredOption("-t, --tally-votes-zkey <tallyVotesZkeyPath>", "the tally votes zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("-p, --message-processor-zkey <messageProcessorZkeyPath>", "the message processor zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("-t, --vote-tally-zkey <voteTallyZkeyPath>", "the vote tally zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .requiredOption("--poll-joining-zkey <pollJoiningZkey>", "the poll joining zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .requiredOption("--poll-joined-zkey <pollJoinedZkey>", "the poll joined zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .action(async (args) => {
@@ -164,15 +163,15 @@ program
         (0, sdk_1.logYellow)({ quiet: args.quiet, text: (0, sdk_1.info)("Retrieving verifying keys from the contract...") });
         await (0, sdk_1.checkVerifyingKeys)({
             stateTreeDepth: args.stateTreeDepth,
-            intStateTreeDepth: args.intStateTreeDepth,
+            tallyProcessingStateTreeDepth: args.tallyProcessingStateTreeDepth,
             voteOptionTreeDepth: args.voteOptionTreeDepth,
             messageBatchSize: args.messageBatchSize,
-            processMessagesZkeyPath: args.processMessagesZkey,
-            tallyVotesZkeyPath: args.tallyVotesZkey,
+            messageProcessorZkeyPath: args.messageProcessorZkey,
+            voteTallyZkeyPath: args.voteTallyZkey,
             pollJoiningZkeyPath: args.pollJoiningZkey,
             pollJoinedZkeyPath: args.pollJoinedZkey,
             verifyingKeysRegistry: contractAddress,
-            useQuadraticVoting: args.useQuadraticVoting,
+            mode: args.mode,
             signer,
         });
         (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)("Verifying keys match") });
@@ -197,9 +196,15 @@ program
     .option("-s, --seed <seed>", "seed value for keypair", (value) => (value ? BigInt(value) : undefined), undefined)
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .action((args) => {
-    const { publicKey, privateKey } = (0, sdk_1.generateKeypair)({ seed: args.seed });
+    const { publicKey, privateKey, publicKeyAsContractParam } = (0, sdk_1.generateKeypair)({ seed: args.seed });
     (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Public key: ${publicKey}`) });
     (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Private key: ${privateKey}`) });
+    (0, sdk_1.logGreen)({
+        quiet: args.quiet,
+        text: (0, sdk_1.success)(`Public key as contract param:
+         X: ${publicKeyAsContractParam.x}
+         Y: ${publicKeyAsContractParam.y}`),
+    });
 });
 program
     .command("deployVerifyingKeysRegistry")
@@ -255,14 +260,14 @@ program
     .option("-k, --verifyingKeysRegistryAddress <verifyingKeysRegistryAddress>", "the vk registry contract address")
     .requiredOption("--start <pollStartDate>", "the poll start date", parseInt)
     .requiredOption("--end <pollEndDate>", "the poll end date", parseInt)
-    .requiredOption("-i, --int-state-tree-depth <intStateTreeDepth>", "the int state tree depth", parseInt)
+    .requiredOption("-i, --tally-processing-state-tree-depth <tallyProcessingStateTreeDepth>", "the int state tree depth", parseInt)
     .requiredOption("-b, --message-batch-size <messageBatchSize>", "the message batch size", parseInt)
     .requiredOption("-s, --state-tree-depth <stateTreeDepth>", "the state tree depth", parseInt)
     .requiredOption("-v, --vote-option-tree-depth <voteOptionTreeDepth>", "the vote option tree depth", parseInt)
     .requiredOption("-p, --public-key <publicKey>", "the coordinator public key")
-    .option("-u, --use-quadratic-voting <useQuadraticVoting>", "whether to use quadratic voting", (value) => value === "true", true)
+    .option("-m, --mode <mode>", "Voting mode (qv, non-qv, full)", (value) => constants_1.MODE_NAME_TO_ENUM[value], sdk_1.EMode.QV)
     .option("-x, --maci-address <maciAddress>", "the MACI contract address")
-    .option("-m, --relayers <relayers>", "the relayer addresses", (value) => value.split(",").map((item) => item.trim()))
+    .option("--relayers <relayers>", "the relayer addresses", (value) => value.split(",").map((item) => item.trim()))
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
     .option("-o, --vote-options <voteOptions>", "the number of vote options", parseInt)
@@ -274,11 +279,12 @@ program
         (0, utils_1.banner)(args.quiet);
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
-        const [verifyingKeysRegistryAddress, maciAddress, initialVoiceCreditProxyAddress, verifierContractAddress] = (0, utils_1.readContractAddresses)({
+        const [maciAddress, initialVoiceCreditProxyAddress, initialVoiceCreditProxyFactoryAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [
                 sdk_1.EContracts.VerifyingKeysRegistry,
                 sdk_1.EContracts.MACI,
                 sdk_1.EContracts.ConstantInitialVoiceCreditProxy,
+                sdk_1.EContracts.ConstantInitialVoiceCreditProxyFactory,
                 sdk_1.EContracts.Verifier,
             ],
             network: network?.name,
@@ -298,19 +304,18 @@ program
             initialVoiceCredits: args.initialVoiceCredits || defaults_1.DEFAULT_INITIAL_VOICE_CREDITS,
             pollStartTimestamp: args.start,
             pollEndTimestamp: args.end,
-            intStateTreeDepth: args.intStateTreeDepth,
+            tallyProcessingStateTreeDepth: args.tallyProcessingStateTreeDepth,
             messageBatchSize: args.messageBatchSize,
             stateTreeDepth: args.stateTreeDepth,
             voteOptionTreeDepth: args.voteOptionTreeDepth,
             coordinatorPublicKey: domainobjs_1.PublicKey.deserialize(args.publicKey),
             maciAddress,
-            verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
             relayers: args.relayers ?? [ethers_1.ZeroAddress],
-            mode: args.useQuadraticVoting ? sdk_1.EMode.QV : sdk_1.EMode.NON_QV,
+            mode: args.mode,
             signer,
             voteOptions: args.voteOptions ?? defaults_1.DEFAULT_VOTE_OPTIONS,
-            verifierContractAddress,
             policyContractAddress: signupPolicyContractAddress,
+            initialVoiceCreditProxyFactoryAddress,
             initialVoiceCreditProxyContractAddress: initialVoiceCreditProxyAddress,
         });
         (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Poll ID: ${pollId}`) });
@@ -337,7 +342,6 @@ program
     .command("joinPoll")
     .description("join the poll")
     .requiredOption("-k, --private-key <privateKey>", "the private key")
-    .option("-i, --state-index <stateIndex>", "the user's state index", BigInt)
     .option("-s, --sg-data <sgData>", "the signup policy data")
     .option("-v, --ivcp-data <ivcpData>", "the initial voice credit proxy data")
     .option("-n, --new-voice-credit-balance <newVoiceCreditBalance>", "the voice credit balance of the user for the poll", BigInt)
@@ -349,11 +353,11 @@ program
     .option("--end-block <endBlock>", "the block number to end looking for events from", parseInt)
     .option("--blocks-per-batch <blockPerBatch>", "the number of blocks to process per batch", parseInt)
     .option("--transaction-hash <transactionHash>", "transaction hash of MACI contract creation")
-    .option("--poll-wasm <pollWasm>", "the path to the poll witness generation wasm binary")
+    .option("--poll-joining-wasm <pollJoiningWasm>", "the path to the poll joining wasm binary")
     .requiredOption("--poll-joining-zkey <pollZkeyPath>", "the poll join zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .option("-w, --wasm", "whether to use the wasm binaries")
     .option("-r, --rapidsnark <rapidsnark>", "the path to the rapidsnark binary")
-    .option("-g, --poll-witnessgen <pollWitnessgen>", "the path to the poll witness generation binary")
+    .option("-g, --poll-witness-generator <pollWitnessGenerator>", "the path to the poll witness generation binary")
     .action(async (args) => {
     try {
         const signer = await getSigner();
@@ -367,7 +371,6 @@ program
         const data = await (0, sdk_1.joinPoll)({
             maciAddress,
             privateKey,
-            stateIndex: args.stateIndex,
             stateFile: args.stateFile,
             pollId: args.pollId,
             signer,
@@ -375,10 +378,10 @@ program
             endBlock: args.endBlock,
             blocksPerBatch: args.blocksPerBatch,
             pollJoiningZkey: args.pollJoiningZkey,
-            pollWasm: args.pollWasm,
+            pollJoiningWasm: args.pollJoiningWasm,
             useWasm: args.wasm,
             rapidsnark: args.rapidsnark,
-            pollWitgen: args.pollWitnessgen,
+            pollWitnessGenerator: args.pollWitnessGenerator,
             sgDataArg: args.sgData ?? utils_1.DEFAULT_SG_DATA,
             ivcpDataArg: args.ivcpData ?? utils_1.DEFAULT_IVCP_DATA,
         });
@@ -394,17 +397,19 @@ program
     .command("setVerifyingKeys")
     .description("set the verifying keys")
     .requiredOption("-s, --state-tree-depth <stateTreeDepth>", "the state tree depth", parseInt)
-    .requiredOption("-i, --int-state-tree-depth <intStateTreeDepth>", "the intermediate state tree depth", parseInt)
+    .requiredOption("-i, --tally-processing-state-tree-depth <tallyProcessingStateTreeDepth>", "the intermediate state tree depth", parseInt)
     .requiredOption("-v, --vote-option-tree-depth <voteOptionTreeDepth>", "the vote option tree depth", parseInt)
     .requiredOption("-b, --message-batch-size <messageBatchSize>", "the message batch size", parseInt)
     .option("--poll-state-tree-depth <pollStateTreeDepth>", "the poll state tree depth", parseInt)
     .option("--poll-joining-zkey <pollJoiningZkeyPath>", "the poll joining zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .option("--poll-joined-zkey <pollJoinedZkeyPath>", "the poll joined zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .option("--process-messages-zkey-qv <processMessagesZkeyPathQv>", "the process messages qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .option("--tally-votes-zkey-qv <tallyVotesZkeyPathQv>", "the tally votes qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .option("--process-messages-zkey-non-qv <processMessagesZkeyPathNonQv>", "the process messages non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .option("--tally-votes-zkey-non-qv <tallyVotesZkeyPathNonQv>", "the tally votes non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .option("-u, --use-quadratic-voting <useQuadraticVoting>", "whether to use quadratic voting", (value) => value === "true", true)
+    .option("--message-processor-zkey-qv <messageProcessorZkeyPathQv>", "the message processor qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .option("--vote-tally-zkey-qv <voteTallyZkeyPathQv>", "the vote tally qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .option("--message-processor-zkey-non-qv <messageProcessorZkeyPathNonQv>", "the message processor non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .option("--vote-tally-zkey-non-qv <voteTallyZkeyPathNonQv>", "the vote tally non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .option("--message-processor-zkey-full <messageProcessorZkeyPathFull>", "the message processor full zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .option("--vote-tally-zkey-full <tallyVotesZkeyPathFull>", "the vote tally full zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .option("-m, --modes <modes>", "Comma-separated list of voting modes (qv, non-qv, full)", (value) => value.split(",").map((v) => constants_1.MODE_NAME_TO_ENUM[v.trim()]), [sdk_1.EMode.QV])
     .option("-k, --vk-registry <vkRegistry>", "the vk registry contract address")
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
@@ -417,24 +422,45 @@ program
             network: network?.name,
             defaultAddresses: [args.vkRegistry],
         });
-        const { pollJoiningVerifyingKey, pollJoinedVerifyingKey, processVerifyingKey, tallyVerifyingKey } = await (0, sdk_1.extractAllVerifyingKeys)({
+        const processKeys = {
+            [sdk_1.EMode.QV]: args.messageProcessorZkeyQv,
+            [sdk_1.EMode.NON_QV]: args.messageProcessorZkeyNonQv,
+            [sdk_1.EMode.FULL]: args.messageProcessorZkeyFull,
+        };
+        const tallyKeys = {
+            [sdk_1.EMode.QV]: args.voteTallyZkeyQv,
+            [sdk_1.EMode.NON_QV]: args.voteTallyZkeyNonQv,
+            [sdk_1.EMode.FULL]: args.voteTallyZkeyFull,
+        };
+        const { pollJoiningVerifyingKey, pollJoinedVerifyingKey } = await (0, sdk_1.extractAllVerifyingKeys)({
             pollJoiningZkeyPath: args.pollJoiningZkey,
             pollJoinedZkeyPath: args.pollJoinedZkey,
-            processMessagesZkeyPath: args.useQuadraticVoting ? args.processMessagesZkeyQv : args.processMessagesZkeyNonQv,
-            tallyVotesZkeyPath: args.useQuadraticVoting ? args.tallyVotesZkeyQv : args.tallyVotesZkeyQv,
+        });
+        const keysResults = await Promise.all(args.modes.map((mode) => (0, sdk_1.extractAllVerifyingKeys)({
+            messageProcessorZkeyPath: processKeys[mode],
+            voteTallyZkeyPath: tallyKeys[mode],
+        })));
+        const processVerifyingKeys = [];
+        const tallyVerifyingKeys = [];
+        keysResults.forEach(({ processVerifyingKey, tallyVerifyingKey }, idx) => {
+            if (!processVerifyingKey || !tallyVerifyingKey) {
+                throw new Error(`Verifying keys for mode ${args.modes[idx]} are not valid`);
+            }
+            processVerifyingKeys.push(processVerifyingKey);
+            tallyVerifyingKeys.push(tallyVerifyingKey);
         });
         await (0, sdk_1.setVerifyingKeys)({
             stateTreeDepth: args.stateTreeDepth,
-            intStateTreeDepth: args.intStateTreeDepth,
+            tallyProcessingStateTreeDepth: args.tallyProcessingStateTreeDepth,
             voteOptionTreeDepth: args.voteOptionTreeDepth,
             messageBatchSize: args.messageBatchSize,
             pollStateTreeDepth: args.pollStateTreeDepth || args.stateTreeDepth,
             pollJoiningVerifyingKey: pollJoiningVerifyingKey,
             pollJoinedVerifyingKey: pollJoinedVerifyingKey,
-            processMessagesVerifyingKey: processVerifyingKey,
-            tallyVotesVerifyingKey: tallyVerifyingKey,
+            processMessagesVerifyingKeys: processVerifyingKeys,
+            tallyVotesVerifyingKeys: tallyVerifyingKeys,
             verifyingKeysRegistryAddress,
-            mode: args.useQuadraticVoting ? sdk_1.EMode.QV : sdk_1.EMode.NON_QV,
+            modes: args.modes,
             signer,
         });
     }
@@ -466,7 +492,7 @@ program
             defaultAddresses: [args.maciAddress],
         });
         const privateKey = args.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
-        await (0, sdk_1.publish)({
+        const { hash } = await (0, sdk_1.publish)({
             publicKey: args.publicKey,
             stateIndex: args.stateIndex,
             voteOptionIndex: args.voteOptionIndex,
@@ -478,6 +504,10 @@ program
             privateKey,
             signer,
         });
+        (0, sdk_1.logGreen)({
+            quiet: args.quiet,
+            text: (0, sdk_1.success)(`Message published successfully. Transaction hash: ${hash}`),
+        });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
@@ -535,18 +565,20 @@ program
     .description("extract vkey to json file")
     .requiredOption("--poll-joining-zkey <pollJoiningZkey>", "the poll joining zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .requiredOption("--poll-joined-zkey <pollJoinedZkey>", "the poll joined zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .requiredOption("--process-messages-zkey-qv <processMessagesZkeyPathQv>", "the process messages qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .requiredOption("--tally-votes-zkey-qv <tallyVotesZkeyPathQv>", "the tally votes qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .requiredOption("--process-messages-zkey-non-qv <processMessagesZkeyPathNonQv>", "the process messages non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
-    .requiredOption("--tally-votes-zkey-non-qv <tallyVotesZkeyPathNonQv>", "the tally votes non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("--message-processor-zkey-qv <messageProcessorZkeyPathQv>", "the message processor qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("--vote-tally-zkey-qv <voteTallyZkeyPathQv>", "the vote tally qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("--message-processor-zkey-non-qv <messageProcessorZkeyPathNonQv>", "the message processor non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("--message-processor-zkey-full <messageProcessorZkeyPathFull>", "the message processor full zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
+    .requiredOption("--vote-tally-zkey-non-qv <voteTallyZkeyPathNonQv>", "the vote tally non-qv zkey path (see different options for zkey files to use specific circuits https://maci.pse.dev/docs/trusted-setup, https://maci.pse.dev/docs/testing/#pre-compiled-artifacts-for-testing)")
     .requiredOption("-o, --output-file <outputFile>", "the output file path of extracted vkeys")
     .action(async (args) => {
     try {
         await (0, sdk_1.extractVerifyingKeyToFile)({
-            processMessagesZkeyPathQv: args.processMessagesZkeyQv,
-            tallyVotesZkeyPathQv: args.tallyVotesZkeyQv,
-            processMessagesZkeyPathNonQv: args.processMessagesZkeyNonQv,
-            tallyVotesZkeyPathNonQv: args.tallyVotesZkeyNonQv,
+            messageProcessorZkeyPathQv: args.messageProcessorZkeyQv,
+            messageProcessorZkeyPathFull: args.messageProcessorZkeyFull,
+            voteTallyZkeyPathQv: args.voteTallyZkeyQv,
+            messageProcessorZkeyPathNonQv: args.messageProcessorZkeyNonQv,
+            voteTallyZkeyPathNonQv: args.voteTallyZkeyNonQv,
             pollJoiningZkeyPath: args.pollJoiningZkey,
             pollJoinedZkeyPath: args.pollJoinedZkey,
             outputFilePath: args.outputFile,
@@ -667,6 +699,7 @@ program
     .description("Get deployed poll from MACI contract")
     .option("-p, --poll <poll>", "the poll id")
     .option("-x, --maci-address <maciAddress>", "the MACI contract address")
+    .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .action(async (args) => {
     try {
         const signer = await getSigner();
@@ -681,15 +714,22 @@ program
             maciAddress,
             signer,
         });
+        const modeNames = {
+            [sdk_1.EMode.QV]: "Quadratic Voting",
+            [sdk_1.EMode.NON_QV]: "Non-Quadratic Voting",
+            [sdk_1.EMode.FULL]: "Full Credits Voting",
+        };
+        const status = details.isOpen ? "Open" : "Closed";
         (0, sdk_1.logGreen)({
-            quiet: true,
+            quiet: args.quiet,
             text: (0, sdk_1.success)([
                 `ID: ${details.id}`,
                 `Start time: ${new Date(Number(details.startDate) * 1000).toString()}`,
                 `End time: ${new Date(Number(details.endDate) * 1000).toString()}`,
+                `Status: ${status}`,
                 `Number of signups ${details.totalSignups}`,
                 `State tree merged: ${details.isMerged}`,
-                `Mode: ${details.mode === 0n ? "Quadratic Voting" : "Non-Quadratic Voting"}`,
+                `Mode: ${modeNames[details.mode]}`,
             ].join("\n")),
         });
     }
@@ -757,6 +797,7 @@ program
             totalVoteOptions: pollParams.totalVoteOptions,
             voteOptionTreeDepth: pollParams.voteOptionTreeDepth,
         });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)("The tally commitment is correct") });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
@@ -770,27 +811,27 @@ program
     .requiredOption("-o, --poll-id <pollId>", "the poll id", BigInt)
     .requiredOption("-t, --tally-file <tallyFile>", "the tally file with results, per vote option spent credits, spent voice credits total")
     .option("-r, --rapidsnark <rapidsnark>", "the path to the rapidsnark binary")
-    .option("-g, --process-witnessgen <processWitnessgen>", "the path to the process witness generation binary")
-    .option("--process-witnessdat <processWitnessdat>", "the path to the process witness dat file")
-    .option("--tally-witnessgen <tallyWitnessgen>", "the path to the tally witness generation binary")
-    .option("--tally-witnessdat <tallyWitnessdat>", "the path to the tally witness dat file")
+    .option("-g, --message-processor-witness-generator <messageProcessorWitnessGenerator>", "the path to the process witness generation binary")
+    .option("--message-processor-witnessDat <messageProcessorWitnessDat>", "the path to the process witness dat file")
+    .option("--vote-tally-witness-generator <voteTallyWitnessGenerator>", "the path to the tally witness generation binary")
+    .option("--vote-tally-witnessDat <voteTallyWitnessDat>", "the path to the tally witness dat file")
     .requiredOption("--poll-joining-zkey <processJoinZkey>", "the path to the poll join zkey")
-    .requiredOption("--process-zkey <processZkey>", "the path to the process zkey")
-    .requiredOption("--tally-zkey <tallyZkey>", "the path to the tally zkey")
+    .requiredOption("--message-processor-zkey <messageProcessorZkey>", "the path to the process zkey")
+    .requiredOption("--vote-tally-zkey <voteTallyZkey>", "the path to the tally zkey")
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-p, --rpc-provider <provider>", "the rpc provider URL")
     .requiredOption("-f, --output <outputDir>", "the output directory for proofs")
     .option("--transaction-hash <transactionHash>", "transaction hash of MACI contract creation")
     .option("-w, --wasm", "whether to use the wasm binaries")
-    .option("--process-wasm <processWasm>", "the path to the process witness generation wasm binary")
-    .option("--tally-wasm <tallyWasm>", "the path to the tally witness generation wasm binary")
+    .option("--message-processor-wasm <messageProcessorWasm>", "the path to the process witness generation wasm binary")
+    .option("--vote-tally-wasm <voteTallyWasm>", "the path to the tally witness generation wasm binary")
     .option("--state-file <stateFile>", "the path to the state file containing the serialized maci state")
     .option("--start-block <startBlock>", "the block number to start looking for events from", parseInt)
     .option("--end-block <endBlock>", "the block number to end looking for events from", parseInt)
     .option("--blocks-per-batch <blockPerBatch>", "the number of blocks to process per batch", parseInt)
-    .option("-u, --use-quadratic-voting <useQuadraticVoting>", "whether to use quadratic voting", (value) => value === "true", true)
+    .option("-m, --mode <mode>", "Voting mode (qv, non-qv, full)", (value) => constants_1.MODE_NAME_TO_ENUM[value], sdk_1.EMode.QV)
     .option("-b, --ipfs-message-backup-files <ipfsMessageBackupFiles>", "Backup files for ipfs messages (name format: ipfsHash1.json, ipfsHash2.json, ..., ipfsHashN.json)", (value) => value?.split(/\s*,\s*/))
-    .action(async ({ quiet, maciAddress, pollId, ipfsMessageBackupFiles, stateFile, startBlock, endBlock, blocksPerBatch, privateKey, transactionHash, output, tallyFile, tallyZkey, tallyWitnessgen, tallyWasm, processZkey, processWitnessgen, processWasm, useQuadraticVoting, tallyWitnessdat, processWitnessdat, wasm, rapidsnark, }) => {
+    .action(async ({ quiet, maciAddress, pollId, ipfsMessageBackupFiles, stateFile, startBlock, endBlock, blocksPerBatch, privateKey, transactionHash, output, tallyFile, voteTallyZkey, voteTallyWitnessGenerator, voteTallyWasm, messageProcessorZkey, messageProcessorWitnessGenerator, messageProcessorWasm, mode, voteTallyWitnessDat, messageProcessorWitnessDat, wasm, rapidsnark, }) => {
     try {
         (0, utils_1.banner)(quiet);
         const signer = await getSigner();
@@ -814,15 +855,15 @@ program
             signer,
             outputDir: output,
             tallyFile,
-            tallyZkey,
-            tallyWitgen: tallyWitnessgen,
-            tallyWasm,
-            processZkey,
-            processWitgen: processWitnessgen,
-            processWasm,
-            useQuadraticVoting,
-            tallyDatFile: tallyWitnessdat,
-            processDatFile: processWitnessdat,
+            voteTallyZkey,
+            voteTallyWitnessGenerator,
+            voteTallyWasm,
+            messageProcessorZkey,
+            messageProcessorWitnessGenerator,
+            messageProcessorWasm,
+            mode,
+            voteTallyWitnessDatFile: voteTallyWitnessDat,
+            messageProcessorWitnessDatFile: messageProcessorWitnessDat,
             useWasm: wasm,
             rapidsnark,
         });