@maci-protocol/cli 0.0.0-ci.3ff6873 → 0.0.0-ci.4019d90

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"));
@@ -66,34 +67,31 @@ program
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
     .requiredOption("-s, --stateTreeDepth <stateTreeDepth>", "the state tree depth", parseInt)
-    .action(async (cmdOptions) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
-        (0, utils_1.banner)(cmdOptions.quiet);
+        (0, utils_1.banner)(args.quiet);
         const network = await signer.provider?.getNetwork();
         const [poseidonT3, poseidonT4, poseidonT5, poseidonT6] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.PoseidonT3, sdk_1.EContracts.PoseidonT4, sdk_1.EContracts.PoseidonT5, sdk_1.EContracts.PoseidonT6],
             network: network?.name,
         });
         let [signupPolicyContractAddress] = (0, utils_1.readContractAddresses)({
-            contractNames: [cmdOptions.signupPolicyContractName.toString()],
+            contractNames: [args.signupPolicyContractName.toString()],
             network: network?.name,
         });
         if (!signupPolicyContractAddress) {
-            const checkerFactory = cmdOptions.freeForAllCheckerFactoryAddress
-                ? sdk_1.FreeForAllCheckerFactory__factory.connect(cmdOptions.freeForAllCheckerFactoryAddress, signer)
+            const checkerFactory = args.freeForAllCheckerFactoryAddress
+                ? sdk_1.FreeForAllCheckerFactory__factory.connect(args.freeForAllCheckerFactoryAddress, signer)
                 : undefined;
-            const policyFactory = cmdOptions.freeForAllPolicyFactoryAddress
-                ? sdk_1.FreeForAllPolicyFactory__factory.connect(cmdOptions.freeForAllPolicyFactoryAddress, signer)
+            const policyFactory = args.freeForAllPolicyFactoryAddress
+                ? sdk_1.FreeForAllPolicyFactory__factory.connect(args.freeForAllPolicyFactoryAddress, signer)
                 : undefined;
             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,
@@ -102,14 +100,15 @@ program
                 poseidonT6,
             },
             signer,
-            stateTreeDepth: cmdOptions.stateTreeDepth,
+            stateTreeDepth: args.stateTreeDepth,
         });
-        const emptyBallotRoots = (0, sdk_1.genEmptyBallotRoots)(cmdOptions.stateTreeDepth);
+        const emptyBallotRoots = (0, sdk_1.generateEmptyBallotRoots)(args.stateTreeDepth);
         // save to the JSON File
         await (0, utils_1.storeContractAddresses)({
             data: {
-                [cmdOptions.signupPolicyContractName]: { address: signupPolicyContractAddress, args: [] },
+                [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: [
@@ -117,7 +116,7 @@ program
                         messageProcessorFactoryContractAddress,
                         tallyFactoryContractAddress,
                         signupPolicyContractAddress,
-                        cmdOptions.stateTreeDepth,
+                        args.stateTreeDepth,
                         emptyBallotRoots.map((root) => root.toString()),
                     ],
                 },
@@ -131,7 +130,7 @@ program
             },
             signer,
         });
-        (0, sdk_1.logGreen)({ quiet: cmdOptions.quiet, text: (0, sdk_1.success)(`MACI deployed at:  ${maciContractAddress}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`MACI deployed at:  ${maciContractAddress}`) });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
@@ -140,75 +139,81 @@ 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 VkRegistry contract address")
+    .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 (cmdOptions) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
-        const [vkContractAddress] = (0, utils_1.readContractAddresses)({
-            contractNames: [sdk_1.EContracts.VkRegistry],
+        const [contractAddress] = (0, utils_1.readContractAddresses)({
+            contractNames: [sdk_1.EContracts.VerifyingKeysRegistry],
             network: network?.name,
-            defaultAddresses: [cmdOptions.vkContract],
+            defaultAddresses: [args.vkContract],
         });
-        (0, sdk_1.logYellow)({ quiet: cmdOptions.quiet, text: (0, sdk_1.info)("Retrieving verifying keys from the contract...") });
+        (0, sdk_1.logYellow)({ quiet: args.quiet, text: (0, sdk_1.info)("Retrieving verifying keys from the contract...") });
         await (0, sdk_1.checkVerifyingKeys)({
-            stateTreeDepth: cmdOptions.stateTreeDepth,
-            intStateTreeDepth: cmdOptions.intStateTreeDepth,
-            voteOptionTreeDepth: cmdOptions.voteOptionTreeDepth,
-            messageBatchSize: cmdOptions.messageBatchSize,
-            processMessagesZkeyPath: cmdOptions.processMessagesZkey,
-            tallyVotesZkeyPath: cmdOptions.tallyVotesZkey,
-            pollJoiningZkeyPath: cmdOptions.pollJoiningZkey,
-            pollJoinedZkeyPath: cmdOptions.pollJoinedZkey,
-            vkRegistry: vkContractAddress,
-            useQuadraticVoting: cmdOptions.useQuadraticVoting,
+            stateTreeDepth: args.stateTreeDepth,
+            tallyProcessingStateTreeDepth: args.tallyProcessingStateTreeDepth,
+            voteOptionTreeDepth: args.voteOptionTreeDepth,
+            messageBatchSize: args.messageBatchSize,
+            messageProcessorZkeyPath: args.messageProcessorZkey,
+            voteTallyZkeyPath: args.voteTallyZkey,
+            pollJoiningZkeyPath: args.pollJoiningZkey,
+            pollJoinedZkeyPath: args.pollJoinedZkey,
+            verifyingKeysRegistry: contractAddress,
+            mode: args.mode,
             signer,
         });
-        (0, sdk_1.logGreen)({ quiet: cmdOptions.quiet, text: (0, sdk_1.success)("Verifying keys match") });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)("Verifying keys match") });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
     }
 });
 program
-    .command("genMaciPubKey")
+    .command("generateMaciPubKey")
     .description("generate a new MACI public key")
     .requiredOption("-k, --private-key <privateKey>", "the private key")
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
-    .action((cmdObj) => {
-    const publicKey = (0, sdk_1.generateMaciPublicKey)(cmdObj.privateKey);
-    (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Public key: ${publicKey}`) });
+    .action((args) => {
+    const publicKey = (0, sdk_1.generateMaciPublicKey)(args.privateKey);
+    (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Public key: ${publicKey}`) });
 });
 program
-    .command("genMaciKeyPair")
+    .command("generateMaciKeyPair")
     .description("generate a new MACI key pair")
     .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((cmdObj) => {
-    const { publicKey, privateKey } = (0, sdk_1.generateKeypair)({ seed: cmdObj.seed });
-    (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Public key: ${publicKey}`) });
-    (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Private key: ${privateKey}`) });
+    .action((args) => {
+    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("deployVkRegistry")
+    .command("deployVerifyingKeysRegistry")
     .description("deploy a new verification key registry contract")
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
-        (0, utils_1.banner)(cmdObj.quiet);
+        (0, utils_1.banner)(args.quiet);
         const signer = await getSigner();
         // assume that the vkRegistry contract is the first one to be deployed
         const isContractAddressesStoreExists = fs_1.default.existsSync(utils_1.contractAddressesStorePath);
@@ -217,12 +222,15 @@ program
             (0, utils_1.resetContractAddresses)(network?.name);
         }
         // deploy and store the address
-        const vkRegistryAddress = await (0, sdk_1.deployVkRegistryContract)({ signer });
+        const verifyingKeysRegistryAddress = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ signer });
         await (0, utils_1.storeContractAddresses)({
-            data: { [sdk_1.EContracts.VkRegistry]: { address: vkRegistryAddress, args: [] } },
+            data: { [sdk_1.EContracts.VerifyingKeysRegistry]: { address: verifyingKeysRegistryAddress, args: [] } },
             signer,
         });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`VkRegistry deployed at: ${vkRegistryAddress}`) });
+        (0, sdk_1.logGreen)({
+            quiet: args.quiet,
+            text: (0, sdk_1.success)(`VerifyingKeysRegistry deployed at: ${verifyingKeysRegistryAddress}`),
+        });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
@@ -249,37 +257,38 @@ program
 program
     .command("deployPoll")
     .description("deploy a new poll")
-    .option("-k, --vkRegistryAddress <vkRegistryAddress>", "the vk registry contract address")
-    .requiredOption("-s, --start <pollStartDate>", "the poll start date", parseInt)
-    .requiredOption("-e, --end <pollEndDate>", "the poll end date", parseInt)
-    .requiredOption("-i, --int-state-tree-depth <intStateTreeDepth>", "the int state tree depth", parseInt)
+    .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, --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)
     .option("--initial-voice-credits <initialVoiceCredits>", "the initial voice credits", parseInt)
     .option("--initial-voice-credits-proxy <initialVoiceCreditsProxy>", "the initial voice credits proxy address")
     .option("--signup-policy <signupPolicy>", "the signup policy contract address")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
-        (0, utils_1.banner)(cmdObj.quiet);
+        (0, utils_1.banner)(args.quiet);
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
-        const [vkRegistryAddress, maciAddress, initialVoiceCreditProxyAddress, verifierContractAddress] = (0, utils_1.readContractAddresses)({
+        const [maciAddress, initialVoiceCreditProxyAddress, initialVoiceCreditProxyFactoryAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [
-                sdk_1.EContracts.VkRegistry,
+                sdk_1.EContracts.VerifyingKeysRegistry,
                 sdk_1.EContracts.MACI,
                 sdk_1.EContracts.ConstantInitialVoiceCreditProxy,
+                sdk_1.EContracts.ConstantInitialVoiceCreditProxyFactory,
                 sdk_1.EContracts.Verifier,
             ],
             network: network?.name,
-            defaultAddresses: [cmdObj.vkRegistryAddress, cmdObj.maciAddress, cmdObj.initialVoiceCreditsProxy],
+            defaultAddresses: [args.verifyingKeysRegistryAddress, args.maciAddress, args.initialVoiceCreditsProxy],
         });
         const maciContract = sdk_1.MACI__factory.connect(maciAddress, signer);
         const nextPollId = await maciContract.nextPollId();
@@ -289,40 +298,39 @@ program
             contractNames: [policyContractName.toString()],
             keys: [nextPollId.toString()],
             network: network?.name,
-            defaultAddresses: [cmdObj.signupPolicy],
+            defaultAddresses: [args.signupPolicy],
         });
         const { pollId, pollContractAddress, tallyContractAddress, messageProcessorContractAddress, initialVoiceCreditProxyContractAddress, policyContractAddress, } = await (0, sdk_1.deployPoll)({
-            initialVoiceCredits: cmdObj.initialVoiceCredits || defaults_1.DEFAULT_INITIAL_VOICE_CREDITS,
-            pollStartTimestamp: cmdObj.start,
-            pollEndTimestamp: cmdObj.end,
-            intStateTreeDepth: cmdObj.intStateTreeDepth,
-            messageBatchSize: cmdObj.messageBatchSize,
-            stateTreeDepth: cmdObj.stateTreeDepth,
-            voteOptionTreeDepth: cmdObj.voteOptionTreeDepth,
-            coordinatorPublicKey: domainobjs_1.PublicKey.deserialize(cmdObj.publicKey),
+            initialVoiceCredits: args.initialVoiceCredits || defaults_1.DEFAULT_INITIAL_VOICE_CREDITS,
+            pollStartTimestamp: args.start,
+            pollEndTimestamp: args.end,
+            tallyProcessingStateTreeDepth: args.tallyProcessingStateTreeDepth,
+            messageBatchSize: args.messageBatchSize,
+            stateTreeDepth: args.stateTreeDepth,
+            voteOptionTreeDepth: args.voteOptionTreeDepth,
+            coordinatorPublicKey: domainobjs_1.PublicKey.deserialize(args.publicKey),
             maciAddress,
-            vkRegistryContractAddress: vkRegistryAddress,
-            relayers: cmdObj.relayers ?? [ethers_1.ZeroAddress],
-            mode: cmdObj.useQuadraticVoting ? sdk_1.EMode.QV : sdk_1.EMode.NON_QV,
+            relayers: args.relayers ?? [ethers_1.ZeroAddress],
+            mode: args.mode,
             signer,
-            voteOptions: cmdObj.voteOptions ?? defaults_1.DEFAULT_VOTE_OPTIONS,
-            verifierContractAddress,
+            voteOptions: args.voteOptions ?? defaults_1.DEFAULT_VOTE_OPTIONS,
             policyContractAddress: signupPolicyContractAddress,
+            initialVoiceCreditProxyFactoryAddress,
             initialVoiceCreditProxyContractAddress: initialVoiceCreditProxyAddress,
         });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Poll ID: ${pollId}`) });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Poll contract address: ${pollContractAddress}`) });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Tally contract address: ${tallyContractAddress}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Poll ID: ${pollId}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Poll contract address: ${pollContractAddress}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Tally contract address: ${tallyContractAddress}`) });
         (0, sdk_1.logGreen)({
-            quiet: cmdObj.quiet,
+            quiet: args.quiet,
             text: (0, sdk_1.success)(`Message processor contract address: ${messageProcessorContractAddress}`),
         });
         (0, sdk_1.logGreen)({
-            quiet: cmdObj.quiet,
+            quiet: args.quiet,
             text: (0, sdk_1.success)(`Initial voice credit proxy contract address: ${initialVoiceCreditProxyContractAddress}`),
         });
         (0, sdk_1.logGreen)({
-            quiet: cmdObj.quiet,
+            quiet: args.quiet,
             text: (0, sdk_1.success)(`Signup policy contract address: ${policyContractAddress}`),
         });
     }
@@ -334,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)
@@ -346,42 +353,41 @@ 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")
-    .action(async (cmdObj) => {
+    .option("-g, --poll-witness-generator <pollWitnessGenerator>", "the path to the poll witness generation binary")
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
-        const privateKey = cmdObj.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
+        const privateKey = args.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
         const data = await (0, sdk_1.joinPoll)({
             maciAddress,
             privateKey,
-            stateIndex: cmdObj.stateIndex,
-            stateFile: cmdObj.stateFile,
-            pollId: cmdObj.pollId,
+            stateFile: args.stateFile,
+            pollId: args.pollId,
             signer,
-            startBlock: cmdObj.startBlock,
-            endBlock: cmdObj.endBlock,
-            blocksPerBatch: cmdObj.blocksPerBatch,
-            pollJoiningZkey: cmdObj.pollJoiningZkey,
-            pollWasm: cmdObj.pollWasm,
-            useWasm: cmdObj.wasm,
-            rapidsnark: cmdObj.rapidsnark,
-            pollWitgen: cmdObj.pollWitnessgen,
-            sgDataArg: cmdObj.sgData ?? utils_1.DEFAULT_SG_DATA,
-            ivcpDataArg: cmdObj.ivcpData ?? utils_1.DEFAULT_IVCP_DATA,
-        });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.info)(`User joined poll with nullifier: ${data.nullifier}`) });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.info)(`User joined poll with state index: ${data.pollStateIndex}`) });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.info)(`User joined poll with ${data.voiceCredits} voice credits`) });
+            startBlock: args.startBlock,
+            endBlock: args.endBlock,
+            blocksPerBatch: args.blocksPerBatch,
+            pollJoiningZkey: args.pollJoiningZkey,
+            pollJoiningWasm: args.pollJoiningWasm,
+            useWasm: args.wasm,
+            rapidsnark: args.rapidsnark,
+            pollWitnessGenerator: args.pollWitnessGenerator,
+            sgDataArg: args.sgData ?? utils_1.DEFAULT_SG_DATA,
+            ivcpDataArg: args.ivcpData ?? utils_1.DEFAULT_IVCP_DATA,
+        });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.info)(`User joined poll with nullifier: ${data.nullifier}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.info)(`User joined poll with state index: ${data.pollStateIndex}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.info)(`User joined poll with ${data.voiceCredits} voice credits`) });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
@@ -391,49 +397,70 @@ 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")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
-        const [vkRegistryAddress] = (0, utils_1.readContractAddresses)({
-            contractNames: [sdk_1.EContracts.VkRegistry],
+        const [verifyingKeysRegistryAddress] = (0, utils_1.readContractAddresses)({
+            contractNames: [sdk_1.EContracts.VerifyingKeysRegistry],
             network: network?.name,
-            defaultAddresses: [cmdObj.vkRegistry],
+            defaultAddresses: [args.vkRegistry],
         });
-        const { pollJoiningVk, pollJoinedVk, processVk, tallyVk } = await (0, sdk_1.extractAllVks)({
-            pollJoiningZkeyPath: cmdObj.pollJoiningZkey,
-            pollJoinedZkeyPath: cmdObj.pollJoinedZkey,
-            processMessagesZkeyPath: cmdObj.useQuadraticVoting
-                ? cmdObj.processMessagesZkeyQv
-                : cmdObj.processMessagesZkeyNonQv,
-            tallyVotesZkeyPath: cmdObj.useQuadraticVoting ? cmdObj.tallyVotesZkeyQv : cmdObj.tallyVotesZkeyQv,
+        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,
+        });
+        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: cmdObj.stateTreeDepth,
-            intStateTreeDepth: cmdObj.intStateTreeDepth,
-            voteOptionTreeDepth: cmdObj.voteOptionTreeDepth,
-            messageBatchSize: cmdObj.messageBatchSize,
-            pollStateTreeDepth: cmdObj.pollStateTreeDepth || cmdObj.stateTreeDepth,
-            pollJoiningVk: pollJoiningVk,
-            pollJoinedVk: pollJoinedVk,
-            processMessagesVk: processVk,
-            tallyVotesVk: tallyVk,
-            vkRegistryAddress,
-            mode: cmdObj.useQuadraticVoting ? sdk_1.EMode.QV : sdk_1.EMode.NON_QV,
+            stateTreeDepth: args.stateTreeDepth,
+            tallyProcessingStateTreeDepth: args.tallyProcessingStateTreeDepth,
+            voteOptionTreeDepth: args.voteOptionTreeDepth,
+            messageBatchSize: args.messageBatchSize,
+            pollStateTreeDepth: args.pollStateTreeDepth || args.stateTreeDepth,
+            pollJoiningVerifyingKey: pollJoiningVerifyingKey,
+            pollJoinedVerifyingKey: pollJoinedVerifyingKey,
+            processMessagesVerifyingKeys: processVerifyingKeys,
+            tallyVotesVerifyingKeys: tallyVerifyingKeys,
+            verifyingKeysRegistryAddress,
+            modes: args.modes,
             signer,
         });
     }
@@ -455,25 +482,25 @@ program
     .requiredOption("-w, --new-vote-weight <newVoteWeight>", "the new vote weight", BigInt)
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
-        const privateKey = cmdObj.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
+        const privateKey = args.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
         await (0, sdk_1.publish)({
-            publicKey: cmdObj.publicKey,
-            stateIndex: cmdObj.stateIndex,
-            voteOptionIndex: cmdObj.voteOptionIndex,
-            nonce: cmdObj.nonce,
-            pollId: cmdObj.pollId,
-            newVoteWeight: cmdObj.newVoteWeight,
+            publicKey: args.publicKey,
+            stateIndex: args.stateIndex,
+            voteOptionIndex: args.voteOptionIndex,
+            nonce: args.nonce,
+            pollId: args.pollId,
+            newVoteWeight: args.newVoteWeight,
             maciAddress,
-            salt: cmdObj.salt,
+            salt: args.salt,
             privateKey,
             signer,
         });
@@ -488,23 +515,23 @@ program
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-x, --maci-address <maciAddress>", "the MACI contract address")
     .requiredOption("-p, --poll-id <pollId>", "the poll id", BigInt)
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
         const receipt = await (0, sdk_1.mergeSignups)({
-            pollId: cmdObj.pollId,
+            pollId: args.pollId,
             maciAddress,
             signer,
         });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.info)(`Transaction hash: ${receipt.hash}`) });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.info)(`Transaction hash: ${receipt.hash}`) });
         (0, sdk_1.logGreen)({
-            quiet: cmdObj.quiet,
+            quiet: args.quiet,
             text: (0, sdk_1.success)(`Executed mergeSignups(); gas used: ${receipt.gasUsed.toString()}`),
         });
     }
@@ -518,37 +545,39 @@ program
     .requiredOption("-s, --seconds <seconds>", "the number of seconds to fast-forward", parseInt)
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
-        (0, utils_1.banner)(cmdObj.quiet);
+        (0, utils_1.banner)(args.quiet);
         const signer = await getSigner();
-        await (0, sdk_1.timeTravel)({ seconds: cmdObj.seconds, signer });
-        (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`Fast-forwarded ${cmdObj.seconds} seconds`) });
+        await (0, sdk_1.timeTravel)({ seconds: args.seconds, signer });
+        (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`Fast-forwarded ${args.seconds} seconds`) });
     }
     catch (error) {
         program.error(error.message, { exitCode: 1 });
     }
 });
 program
-    .command("extractVkToFile")
+    .command("extractVerifyingKeyToFile")
     .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 (cmdObj) => {
+    .action(async (args) => {
     try {
-        await (0, sdk_1.extractVkToFile)({
-            processMessagesZkeyPathQv: cmdObj.processMessagesZkeyQv,
-            tallyVotesZkeyPathQv: cmdObj.tallyVotesZkeyQv,
-            processMessagesZkeyPathNonQv: cmdObj.processMessagesZkeyNonQv,
-            tallyVotesZkeyPathNonQv: cmdObj.tallyVotesZkeyNonQv,
-            pollJoiningZkeyPath: cmdObj.pollJoiningZkey,
-            pollJoinedZkeyPath: cmdObj.pollJoinedZkey,
-            outputFilePath: cmdObj.outputFile,
+        await (0, sdk_1.extractVerifyingKeyToFile)({
+            messageProcessorZkeyPathQv: args.messageProcessorZkeyQv,
+            messageProcessorZkeyPathFull: args.messageProcessorZkeyFull,
+            voteTallyZkeyPathQv: args.voteTallyZkeyQv,
+            messageProcessorZkeyPathNonQv: args.messageProcessorZkeyNonQv,
+            voteTallyZkeyPathNonQv: args.voteTallyZkeyNonQv,
+            pollJoiningZkeyPath: args.pollJoiningZkey,
+            pollJoinedZkeyPath: args.pollJoinedZkey,
+            outputFilePath: args.outputFile,
         });
     }
     catch (error) {
@@ -563,23 +592,23 @@ program
     .option("-s, --sg-data <sgData>", "the signup gateway data")
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
         const data = await (0, sdk_1.signup)({
-            maciPublicKey: cmdObj.publicKey,
+            maciPublicKey: args.publicKey,
             maciAddress,
-            sgData: cmdObj.sgData ?? utils_1.DEFAULT_SG_DATA,
+            sgData: args.sgData ?? utils_1.DEFAULT_SG_DATA,
             signer,
         });
         (0, sdk_1.logGreen)({
-            quiet: cmdObj.quiet,
+            quiet: args.quiet,
             text: (0, sdk_1.success)(`State index: ${data.stateIndex.toString()}\n Transaction hash: ${data.transactionHash}`),
         });
     }
@@ -593,25 +622,25 @@ program
     .requiredOption("-p, --public-key <publicKey>", "the MACI public key")
     .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 (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
         const data = await (0, sdk_1.getSignedupUserData)({
-            maciPublicKey: cmdObj.publicKey,
+            maciPublicKey: args.publicKey,
             maciAddress,
             signer,
         });
         if (data.isRegistered) {
-            (0, sdk_1.logGreen)({ quiet: cmdObj.quiet, text: (0, sdk_1.success)(`State index: ${data.stateIndex?.toString()}`) });
+            (0, sdk_1.logGreen)({ quiet: args.quiet, text: (0, sdk_1.success)(`State index: ${data.stateIndex?.toString()}`) });
         }
         else {
-            (0, sdk_1.logRed)({ quiet: cmdObj.quiet, text: "User is not registered" });
+            (0, sdk_1.logRed)({ quiet: args.quiet, text: "User is not registered" });
         }
     }
     catch (error) {
@@ -628,25 +657,25 @@ program
     .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)
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
         const data = await (0, sdk_1.getJoinedUserData)({
-            pollPublicKey: cmdObj.publicKey,
-            startBlock: cmdObj.startBlock,
+            pollPublicKey: args.publicKey,
+            startBlock: args.startBlock,
             maciAddress,
-            pollId: cmdObj.pollId,
+            pollId: args.pollId,
             signer,
         });
         if (data.isJoined) {
             (0, sdk_1.logGreen)({
-                quiet: cmdObj.quiet,
+                quiet: args.quiet,
                 text: (0, sdk_1.success)([
                     `Poll state index: ${data.pollStateIndex?.toString()}, registered: ${data.isJoined}`,
                     `Voice credits: ${data.voiceCredits?.toString()}`,
@@ -654,7 +683,7 @@ program
             });
         }
         else {
-            (0, sdk_1.logRed)({ quiet: cmdObj.quiet, text: "User has not joined the poll" });
+            (0, sdk_1.logRed)({ quiet: args.quiet, text: "User has not joined the poll" });
         }
     }
     catch (error) {
@@ -666,29 +695,34 @@ program
     .description("Get deployed poll from MACI contract")
     .option("-p, --poll <poll>", "the poll id")
     .option("-x, --maci-address <maciAddress>", "the MACI contract address")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
         const details = await (0, sdk_1.getPoll)({
-            pollId: cmdObj.poll,
+            pollId: args.poll,
             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",
+        };
         (0, sdk_1.logGreen)({
             quiet: true,
             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()}`,
-                `Number of signups ${details.numSignups}`,
+                `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")),
         });
     }
@@ -703,15 +737,15 @@ program
     .requiredOption("-w, --address <address>", "the address to fund")
     .option("-q, --quiet <quiet>", "whether to print values to the console", (value) => value === "true", false)
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
-        (0, utils_1.banner)(cmdObj.quiet);
+        (0, utils_1.banner)(args.quiet);
         const signer = await getSigner();
-        const hash = await (0, sdk_1.fundWallet)({ amount: cmdObj.amount, address: cmdObj.address, signer });
-        (0, sdk_1.logYellow)({ quiet: cmdObj.quiet, text: (0, sdk_1.info)(`Transaction hash: ${hash}`) });
+        const hash = await (0, sdk_1.fundWallet)({ amount: args.amount, address: args.address, signer });
+        (0, sdk_1.logYellow)({ quiet: args.quiet, text: (0, sdk_1.info)(`Transaction hash: ${hash}`) });
         (0, sdk_1.logGreen)({
-            quiet: cmdObj.quiet,
-            text: (0, sdk_1.success)(`Successfully funded ${cmdObj.address} with ${cmdObj.amount} wei`),
+            quiet: args.quiet,
+            text: (0, sdk_1.success)(`Successfully funded ${args.address} with ${args.amount} wei`),
         });
     }
     catch (error) {
@@ -726,34 +760,34 @@ program
     .option("-x, --maci-address <maciAddress>", "the MACI 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")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
-        (0, utils_1.banner)(cmdObj.quiet);
+        (0, utils_1.banner)(args.quiet);
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         // read the tally file
-        const isTallyFileExists = fs_1.default.existsSync(cmdObj.tallyFile);
-        if (!cmdObj.tallyFile || !isTallyFileExists) {
-            throw new Error(`Unable to open ${cmdObj.tallyFile}`);
+        const isTallyFileExists = fs_1.default.existsSync(args.tallyFile);
+        if (!args.tallyFile || !isTallyFileExists) {
+            throw new Error(`Unable to open ${args.tallyFile}`);
         }
-        const tallyData = await (0, utils_1.readJSONFile)(cmdObj.tallyFile);
+        const tallyData = await (0, utils_1.readJSONFile)(args.tallyFile);
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
-        const pollParams = await (0, sdk_1.getPollParams)({ pollId: cmdObj.pollId, maciContractAddress: maciAddress, signer });
+        const pollParams = await (0, sdk_1.getPollParams)({ pollId: args.pollId, maciContractAddress: maciAddress, signer });
         const tallyCommitments = (0, sdk_1.generateTallyCommitments)({
             tallyData,
             voteOptionTreeDepth: pollParams.voteOptionTreeDepth,
         });
         await (0, sdk_1.verify)({
             tallyData,
-            pollId: cmdObj.pollId,
+            pollId: args.pollId,
             maciAddress,
             signer,
             tallyCommitments,
-            numVoteOptions: pollParams.numVoteOptions,
+            totalVoteOptions: pollParams.totalVoteOptions,
             voteOptionTreeDepth: pollParams.voteOptionTreeDepth,
         });
     }
@@ -762,34 +796,34 @@ program
     }
 });
 program
-    .command("genProofs")
+    .command("generateProofs")
     .description("generate the proofs for a poll")
     .option("-k, --private-key <privateKey>", "your serialized MACI private key")
     .option("-x, --maci-address <maciAddress>", "the MACI contract address")
     .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();
@@ -813,15 +847,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,
         });
@@ -831,7 +865,7 @@ program
     }
 });
 program
-    .command("genLocalState")
+    .command("generateLocalState")
     .description("generate a local MACI state from the smart contracts events")
     .requiredOption("-o, --output <outputPath>", "the path where to write the state")
     .requiredOption("-p, --poll-id <pollId>", "the id of the poll", BigInt)
@@ -846,30 +880,30 @@ program
     .option("-r, --rpc-provider <provider>", "the rpc provider URL")
     .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*/))
     .option("-l, --logs-output <logsOutputPath>", "the path where to save the logs for debugging and auditing purposes")
-    .action(async (cmdObj) => {
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
-        const coordinatorPrivateKey = cmdObj.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
+        const coordinatorPrivateKey = args.privateKey || (await (0, utils_1.promptSensitiveValue)("Insert your MACI private key"));
         await (0, sdk_1.generateMaciState)({
-            outputPath: cmdObj.output.toString(),
-            pollId: cmdObj.pollId,
+            outputPath: args.output.toString(),
+            pollId: args.pollId,
             maciAddress,
             coordinatorPrivateKey,
-            provider: cmdObj.rpcProvider,
-            endBlock: cmdObj.endBlock,
-            startBlock: cmdObj.startBlock,
-            blockPerBatch: cmdObj.blocksPerBatch,
-            transactionHash: cmdObj.transactionHash,
-            ipfsMessageBackupFiles: cmdObj.ipfsMessageBackupFiles,
-            sleep: cmdObj.sleep,
+            provider: args.rpcProvider,
+            endBlock: args.endBlock,
+            startBlock: args.startBlock,
+            blockPerBatch: args.blocksPerBatch,
+            transactionHash: args.transactionHash,
+            ipfsMessageBackupFiles: args.ipfsMessageBackupFiles,
+            sleep: args.sleep,
             signer,
-            logsOutputPath: cmdObj.logsOutput,
+            logsOutputPath: args.logsOutput,
         });
     }
     catch (error) {
@@ -884,20 +918,20 @@ program
     .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("-x, --maci-address <maciAddress>", "the MACI contract address")
-    .requiredOption("-f, --proof-dir <proofDir>", "the proof output directory from the genProofs subcommand")
-    .action(async (cmdObj) => {
+    .requiredOption("-f, --proof-dir <proofDir>", "the proof output directory from the generateProofs subcommand")
+    .action(async (args) => {
     try {
         const signer = await getSigner();
         const network = await signer.provider?.getNetwork();
         const [maciAddress] = (0, utils_1.readContractAddresses)({
             contractNames: [sdk_1.EContracts.MACI],
             network: network?.name,
-            defaultAddresses: [cmdObj.maciAddress],
+            defaultAddresses: [args.maciAddress],
         });
         await (0, sdk_1.proveOnChain)({
-            pollId: cmdObj.pollId,
-            tallyFile: cmdObj.tallyFile,
-            proofDir: cmdObj.proofDir,
+            pollId: args.pollId,
+            tallyFile: args.tallyFile,
+            proofDir: args.proofDir,
             maciAddress,
             signer,
         });