@maci-protocol/testing 0.0.0-ci.185b643 → 0.0.0-ci.192804f

package/build/ts/constants.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ceremonyTallyVotesWasmPath = exports.ceremonyProcessMessagesNonQvWasmPath = exports.ceremonyProcessMessagesWasmPath = exports.ceremonyTallyVotesNonQvDatPath = exports.ceremonyTallyVotesDatPath = exports.ceremonyTallyVotesNonQvWitnessPath = exports.ceremonyTallyVotesWitnessPath = exports.ceremonyProcessMessagesNonQvDatPath = exports.ceremonyProcessMessagesDatPath = exports.ceremonyProcessMessagesNonQvWitnessPath = exports.ceremonyProcessMessagesWitnessPath = exports.ceremonyPollJoiningWitnessPath = exports.ceremonyTallyVotesNonQvZkeyPath = exports.ceremonyTallyVotesZkeyPath = exports.ceremonyProcessMessagesNonQvZkeyPath = exports.ceremonyProcessMessagesZkeyPath = exports.ceremonyPollJoinedZkeyPath = exports.ceremonyPollJoiningZkeyPath = exports.testRapidsnarkPath = exports.testTallyVotesWasmPath = exports.testProcessMessagesWasmPath = exports.testPollJoiningWasmPath = exports.testTallyVotesWitnessDatPath = exports.testTallyVotesWitnessPath = exports.testProcessMessagesWitnessDatPath = exports.testProcessMessagesWitnessPath = exports.testPollJoiningWitnessPath = exports.testProofsDirPath = exports.testTallyFilePath = exports.tallyVotesTestNonQvZkeyPath = exports.processMessageTestNonQvZkeyPath = exports.tallyVotesTestZkeyPath = exports.processMessageTestZkeyPath = exports.pollJoinedTestZkeyPath = exports.pollJoiningTestZkeyPath = exports.maxVoteOptions = exports.maxMessages = exports.pollDuration = exports.coordinatorPrivKey = exports.coordinatorPubKey = exports.coordinatorKeypair = exports.DEFAULT_IVCP_DATA = exports.DEFAULT_SG_DATA = exports.DEFAULT_VOTE_OPTIONS = exports.DEFAULT_INITIAL_VOICE_CREDITS = exports.MESSAGE_BATCH_SIZE = exports.VOTE_OPTION_TREE_DEPTH = exports.INT_STATE_TREE_DEPTH = exports.POLL_STATE_TREE_DEPTH = exports.STATE_TREE_DEPTH = void 0;
-exports.invalidVote = exports.deployPollArgs = exports.deployArgs = exports.verifyingKeysArgs = exports.verifyArgs = exports.proveOnChainArgs = exports.mergeSignupsArgs = exports.timeTravelArgs = exports.checkVerifyingKeysArgs = exports.tallyVotesZkeyPathNonQv = exports.processMessagesZkeyPathNonQv = exports.rapidsnark = exports.pollJoinedWitgen = exports.pollJoinedWasm = exports.pollWitgen = exports.pollWasm = exports.pollJoinedZkey = exports.pollJoiningZkey = exports.testTallyVotesNonQvWasmPath = exports.testProcessMessagesNonQvWasmPath = exports.testTallyVotesNonQvWitnessDatPath = exports.testTallyVotesNonQvWitnessPath = exports.testProcessMessagesNonQvWitnessDatPath = exports.testProcessMessagesNonQvWitnessPath = exports.ceremonyTallyVotesNonQvWasmPath = void 0;
+exports.ceremonyTallyVotesWitnessPath = exports.ceremonyTallyVotesZkeyPath = exports.testTallyVotesWasmPath = exports.testTallyVotesWitnessDatPath = exports.testTallyVotesWitnessPath = exports.testTallyVotesZkeyPath = exports.testProcessMessagesFullWasmPath = exports.testProcessMessagesFullWitnessDatPath = exports.testProcessMessagesFullWitnessPath = exports.testProcessMessageFullZkeyPath = exports.ceremonyProcessMessagesNonQvWasmPath = exports.ceremonyProcessMessagesNonQvDatPath = exports.ceremonyProcessMessagesNonQvWitnessPath = exports.ceremonyProcessMessagesNonQvZkeyPath = exports.testProcessMessagesNonQvWasmPath = exports.testProcessMessagesNonQvWitnessDatPath = exports.testProcessMessagesNonQvWitnessPath = exports.testProcessMessageNonQvZkeyPath = exports.ceremonyProcessMessagesWasmPath = exports.ceremonyProcessMessagesDatPath = exports.ceremonyProcessMessagesWitnessPath = exports.ceremonyProcessMessagesZkeyPath = exports.testProcessMessagesWasmPath = exports.testProcessMessagesWitnessDatPath = exports.testProcessMessagesWitnessPath = exports.testProcessMessageZkeyPath = exports.testPollJoinedWasmPath = exports.testPollJoinedWitnessPath = exports.testPollJoinedZkeyPath = exports.testPollJoiningWasmPath = exports.testPollJoiningWitnessPath = exports.testPollJoiningZkeyPath = exports.testProofsDirPath = exports.testTallyFilePath = exports.testRapidsnarkPath = exports.maxVoteOptions = exports.maxMessages = exports.pollDuration = exports.coordinatorPrivateKey = exports.coordinatorPublicKey = exports.coordinatorKeypair = exports.DEFAULT_IVCP_DATA = exports.DEFAULT_SG_DATA = exports.DEFAULT_VOTE_OPTIONS = exports.DEFAULT_INITIAL_VOICE_CREDITS = exports.MESSAGE_BATCH_SIZE = exports.VOTE_OPTION_TREE_DEPTH = exports.TALLY_PROCESSING_STATE_TREE_DEPTH = exports.POLL_STATE_TREE_DEPTH = exports.STATE_TREE_DEPTH = void 0;
+exports.invalidVote = exports.deployPollArgs = exports.deployArgs = exports.verifyingKeysArgs = exports.verifyArgs = exports.proveOnChainArgs = exports.mergeSignupsArgs = exports.timeTravelArgs = exports.checkVerifyingKeysArgs = exports.testTallyVotesFullWasmPath = exports.testTallyVotesFullWitnessDatPath = exports.testTallyVotesFullWitnessPath = exports.testTallyVotesFullZkeyPath = exports.ceremonyVoteTallyNonQvWasmPath = exports.ceremonyVoteTallyNonQvDatPath = exports.ceremonyVoteTallyNonQvWitnessPath = exports.ceremonyVoteTallyNonQvZkeyPath = exports.testVoteTallyNonQvWasmPath = exports.testVoteTallyNonQvWitnessDatPath = exports.testVoteTallyNonQvWitnessPath = exports.testVoteTallyNonQvZkeyPath = exports.ceremonyTallyVotesWasmPath = exports.ceremonyTallyVotesDatPath = void 0;
 const domainobjs_1 = require("@maci-protocol/domainobjs");
 const sdk_1 = require("@maci-protocol/sdk");
 const os_1 = require("os");
@@ -12,7 +12,7 @@ const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
 exports.STATE_TREE_DEPTH = 10;
 exports.POLL_STATE_TREE_DEPTH = 10;
-exports.INT_STATE_TREE_DEPTH = 1;
+exports.TALLY_PROCESSING_STATE_TREE_DEPTH = 1;
 exports.VOTE_OPTION_TREE_DEPTH = 2;
 exports.MESSAGE_BATCH_SIZE = 20;
 exports.DEFAULT_INITIAL_VOICE_CREDITS = 100;
@@ -20,71 +20,82 @@ exports.DEFAULT_VOTE_OPTIONS = 25;
 exports.DEFAULT_SG_DATA = "0x0000000000000000000000000000000000000000000000000000000000000000";
 exports.DEFAULT_IVCP_DATA = "0x0000000000000000000000000000000000000000000000000000000000000000";
 exports.coordinatorKeypair = new domainobjs_1.Keypair();
-exports.coordinatorPubKey = exports.coordinatorKeypair.pubKey.serialize();
-exports.coordinatorPrivKey = exports.coordinatorKeypair.privKey.serialize();
+exports.coordinatorPublicKey = exports.coordinatorKeypair.publicKey.serialize();
+exports.coordinatorPrivateKey = exports.coordinatorKeypair.privateKey.serialize();
 exports.pollDuration = 2000;
 exports.maxMessages = 25;
 exports.maxVoteOptions = 25;
-exports.pollJoiningTestZkeyPath = "./zkeys/PollJoining_10_test/PollJoining_10_test.0.zkey";
-exports.pollJoinedTestZkeyPath = "./zkeys/PollJoined_10_test/PollJoined_10_test.0.zkey";
-exports.processMessageTestZkeyPath = "./zkeys/ProcessMessages_10-20-2_test/ProcessMessages_10-20-2_test.0.zkey";
-exports.tallyVotesTestZkeyPath = "./zkeys/TallyVotes_10-1-2_test/TallyVotes_10-1-2_test.0.zkey";
-exports.processMessageTestNonQvZkeyPath = "./zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test.0.zkey";
-exports.tallyVotesTestNonQvZkeyPath = "./zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test.0.zkey";
+exports.testRapidsnarkPath = `${(0, os_1.homedir)()}/rapidsnark/build/prover`;
 exports.testTallyFilePath = "./tally.json";
 exports.testProofsDirPath = "./proofs";
-exports.testPollJoiningWitnessPath = "./zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test";
-exports.testProcessMessagesWitnessPath = "./zkeys/ProcessMessages_10-20-2_test/ProcessMessages_10-20-2_test_cpp/ProcessMessages_10-20-2_test";
-exports.testProcessMessagesWitnessDatPath = "./zkeys/ProcessMessages_10-20-2_test/ProcessMessages_10-20-2_test_cpp/ProcessMessages_10-20-2_test.dat";
-exports.testTallyVotesWitnessPath = "./zkeys/TallyVotes_10-1-2_test/TallyVotes_10-1-2_test_cpp/TallyVotes_10-1-2_test";
-exports.testTallyVotesWitnessDatPath = "./zkeys/TallyVotes_10-1-2_test/TallyVotes_10-1-2_test_cpp/TallyVotes_10-1-2_test.dat";
-exports.testPollJoiningWasmPath = "./zkeys/PollJoining_10_test/PollJoining_10_test_js/PollJoining_10_test.wasm";
-exports.testProcessMessagesWasmPath = "./zkeys/ProcessMessages_10-20-2_test/ProcessMessages_10-20-2_test_js/ProcessMessages_10-20-2_test.wasm";
-exports.testTallyVotesWasmPath = "./zkeys/TallyVotes_10-1-2_test/TallyVotes_10-1-2_test_js/TallyVotes_10-1-2_test.wasm";
-exports.testRapidsnarkPath = `${(0, os_1.homedir)()}/rapidsnark/build/prover`;
-exports.ceremonyPollJoiningZkeyPath = "./zkeys/PollJoining_10_test/PollJoining_10_test.0.zkey";
-exports.ceremonyPollJoinedZkeyPath = "./zkeys/PollJoined_10_test/PollJoined_10_test.0.zkey";
-exports.ceremonyProcessMessagesZkeyPath = "./zkeys/ProcessMessages_6-9-2-3/processMessages_6-9-2-3.zkey";
-exports.ceremonyProcessMessagesNonQvZkeyPath = "./zkeys/ProcessMessagesNonQv_6-9-2-3/processMessagesNonQv_6-9-2-3.zkey";
-exports.ceremonyTallyVotesZkeyPath = "./zkeys/TallyVotes_6-2-3/tallyVotes_6-2-3.zkey";
-exports.ceremonyTallyVotesNonQvZkeyPath = "./zkeys/TallyVotesNonQv_6-2-3/tallyVotesNonQv_6-2-3.zkey";
-exports.ceremonyPollJoiningWitnessPath = "./zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test";
-exports.ceremonyProcessMessagesWitnessPath = "./zkeys/ProcessMessages_14-9-2-3/ProcessMessages_14-9-2-3_cpp/ProcessMessages_14-9-2-3";
-exports.ceremonyProcessMessagesNonQvWitnessPath = "./zkeys/ProcessMessagesNonQv_14-9-2-3/ProcessMessagesNonQv_14-9-2-3_cpp/ProcessMessagesNonQv_14-9-2-3";
-exports.ceremonyProcessMessagesDatPath = "./zkeys/ProcessMessages_14-9-2-3/ProcessMessages_14-9-2-3_cpp/ProcessMessages_14-9-2-3.dat";
-exports.ceremonyProcessMessagesNonQvDatPath = "./zkeys/ProcessMessagesNonQv_14-9-2-3/ProcessMessagesNonQv_14-9-2-3_cpp/ProcessMessagesNonQv_14-9-2-3.dat";
-exports.ceremonyTallyVotesWitnessPath = "./zkeys/TallyVotes_14-5-3/TallyVotes_14-5-3_cpp/TallyVotes_14-5-3";
-exports.ceremonyTallyVotesNonQvWitnessPath = "./zkeys/TallyVotesNonQv_14-5-3/TallyVotesNonQv_14-5-3_cpp/TallyVotesNonQv_14-5-3";
-exports.ceremonyTallyVotesDatPath = "./zkeys/TallyVotes_14-5-3/TallyVotes_14-5-3_cpp/TallyVotes_14-5-3.dat";
-exports.ceremonyTallyVotesNonQvDatPath = "./zkeys/TallyVotesNonQv_14-5-3/TallyVotesNonQv_14-5-3_cpp/TallyVotesNonQv_14-5-3.dat";
-exports.ceremonyProcessMessagesWasmPath = "./zkeys/ProcessMessages_14-9-2-3/ProcessMessages_14-9-2-3_js/ProcessMessages_14-9-2-3.wasm";
-exports.ceremonyProcessMessagesNonQvWasmPath = "./zkeys/ProcessMessagesNonQv_14-9-2-3/ProcessMessagesNonQv_14-9-2-3_js/ProcessMessagesNonQv_14-9-2-3.wasm";
-exports.ceremonyTallyVotesWasmPath = "./zkeys/TallyVotes_14-5-3/TallyVotes_14-5-3_js/TallyVotes_14-5-3.wasm";
-exports.ceremonyTallyVotesNonQvWasmPath = "./zkeys/TallyVotesNonQv_14-5-3/TallyVotesNonQv_14-5-3_js/TallyVotesNonQv_14-5-3.wasm";
-exports.testProcessMessagesNonQvWitnessPath = "./zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test_cpp/ProcessMessagesNonQv_10-20-2_test";
-exports.testProcessMessagesNonQvWitnessDatPath = "./zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test_cpp/ProcessMessagesNonQv_10-20-2_test.dat";
-exports.testTallyVotesNonQvWitnessPath = "./zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test_cpp/TallyVotesNonQv_10-1-2_test";
-exports.testTallyVotesNonQvWitnessDatPath = "./zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test_cpp/TallyVotesNonQv_10-1-2_test.dat";
-exports.testProcessMessagesNonQvWasmPath = "./zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test_js/ProcessMessagesNonQv_10-20-2_test.wasm";
-exports.testTallyVotesNonQvWasmPath = "./zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test_js/TallyVotesNonQv_10-1-2_test.wasm";
-exports.pollJoiningZkey = path_1.default.resolve(__dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test.0.zkey");
-exports.pollJoinedZkey = path_1.default.resolve(__dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test.0.zkey");
-exports.pollWasm = path_1.default.resolve(__dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test_js/PollJoining_10_test.wasm");
-exports.pollWitgen = path_1.default.resolve(__dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test");
-exports.pollJoinedWasm = path_1.default.resolve(__dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test_js/PollJoined_10_test.wasm");
-exports.pollJoinedWitgen = path_1.default.resolve(__dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test_cpp/PollJoined_10_test");
-exports.rapidsnark = `${(0, os_1.homedir)()}/rapidsnark/build/prover`;
-exports.processMessagesZkeyPathNonQv = path_1.default.resolve(__dirname, "../zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test.0.zkey");
-exports.tallyVotesZkeyPathNonQv = path_1.default.resolve(__dirname, "../zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test.0.zkey");
+const root = path_1.default.resolve(__dirname, "../../..");
+// Poll joining paths
+exports.testPollJoiningZkeyPath = path_1.default.resolve(root, "./zkeys/PollJoining_10_test/PollJoining_10_test.0.zkey");
+exports.testPollJoiningWitnessPath = path_1.default.resolve(root, "./zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test");
+exports.testPollJoiningWasmPath = path_1.default.resolve(root, "./zkeys/PollJoining_10_test/PollJoining_10_test_js/PollJoining_10_test.wasm");
+// Poll joined paths
+exports.testPollJoinedZkeyPath = path_1.default.resolve(root, "./zkeys/PollJoined_10_test/PollJoined_10_test.0.zkey");
+exports.testPollJoinedWitnessPath = path_1.default.resolve(root, "./zkeys/PollJoined_10_test/PollJoined_10_test_cpp/PollJoined_10_test");
+exports.testPollJoinedWasmPath = path_1.default.resolve(root, "./zkeys/PollJoined_10_test/PollJoined_10_test_js/PollJoined_10_test.wasm");
+// Process messages QV paths
+exports.testProcessMessageZkeyPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_10-20-2_test/MessageProcessorQv_10-20-2_test.0.zkey");
+exports.testProcessMessagesWitnessPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_10-20-2_test/MessageProcessorQv_10-20-2_test_cpp/MessageProcessorQv_10-20-2_test");
+exports.testProcessMessagesWitnessDatPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_10-20-2_test/MessageProcessorQv_10-20-2_test_cpp/MessageProcessorQv_10-20-2_test.dat");
+exports.testProcessMessagesWasmPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_10-20-2_test/MessageProcessorQv_10-20-2_test_js/MessageProcessorQv_10-20-2_test.wasm");
+// Process messages ceremony QV paths
+exports.ceremonyProcessMessagesZkeyPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_6-9-2-3/processMessages_6-9-2-3.zkey");
+exports.ceremonyProcessMessagesWitnessPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_14-9-2-3/MessageProcessorQv_14-9-2-3_cpp/MessageProcessorQv_14-9-2-3");
+exports.ceremonyProcessMessagesDatPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_14-9-2-3/MessageProcessorQv_14-9-2-3_cpp/MessageProcessorQv_14-9-2-3.dat");
+exports.ceremonyProcessMessagesWasmPath = path_1.default.resolve(root, "./zkeys/MessageProcessorQv_14-9-2-3/MessageProcessorQv_14-9-2-3_js/MessageProcessorQv_14-9-2-3.wasm");
+// Process messages Non-QV paths
+exports.testProcessMessageNonQvZkeyPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_10-20-2_test/MessageProcessorNonQv_10-20-2_test.0.zkey");
+exports.testProcessMessagesNonQvWitnessPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_10-20-2_test/MessageProcessorNonQv_10-20-2_test_cpp/MessageProcessorNonQv_10-20-2_test");
+exports.testProcessMessagesNonQvWitnessDatPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_10-20-2_test/MessageProcessorNonQv_10-20-2_test_cpp/MessageProcessorNonQv_10-20-2_test.dat");
+exports.testProcessMessagesNonQvWasmPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_10-20-2_test/MessageProcessorNonQv_10-20-2_test_js/MessageProcessorNonQv_10-20-2_test.wasm");
+// Process messages ceremony Non-QV paths
+exports.ceremonyProcessMessagesNonQvZkeyPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_6-9-2-3/MessageProcessorNonQv_6-9-2-3.zkey");
+exports.ceremonyProcessMessagesNonQvWitnessPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_14-9-2-3/MessageProcessorNonQv_14-9-2-3_cpp/MessageProcessorNonQv_14-9-2-3");
+exports.ceremonyProcessMessagesNonQvDatPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_14-9-2-3/MessageProcessorNonQv_14-9-2-3_cpp/MessageProcessorNonQv_14-9-2-3.dat");
+exports.ceremonyProcessMessagesNonQvWasmPath = path_1.default.resolve(root, "./zkeys/MessageProcessorNonQv_14-9-2-3/MessageProcessorNonQv_14-9-2-3_js/MessageProcessorNonQv_14-9-2-3.wasm");
+// Process messages Full paths
+exports.testProcessMessageFullZkeyPath = path_1.default.resolve(root, "./zkeys/MessageProcessorFull_10-20-2_test/MessageProcessorFull_10-20-2_test.0.zkey");
+exports.testProcessMessagesFullWitnessPath = path_1.default.resolve(root, "./zkeys/MessageProcessorFull_10-20-2_test/MessageProcessorFull_10-20-2_test_cpp/MessageProcessorFull_10-20-2_test");
+exports.testProcessMessagesFullWitnessDatPath = path_1.default.resolve(root, "./zkeys/MessageProcessorFull_10-20-2_test/MessageProcessorFull_10-20-2_test_cpp/MessageProcessorFull_10-20-2_test.dat");
+exports.testProcessMessagesFullWasmPath = path_1.default.resolve(root, "./zkeys/MessageProcessorFull_10-20-2_test/MessageProcessorFull_10-20-2_test_js/MessageProcessorFull_10-20-2_test.wasm");
+// Tally votes QV paths
+exports.testTallyVotesZkeyPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_10-1-2_test/VoteTallyQv_10-1-2_test.0.zkey");
+exports.testTallyVotesWitnessPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_10-1-2_test/VoteTallyQv_10-1-2_test_cpp/VoteTallyQv_10-1-2_test");
+exports.testTallyVotesWitnessDatPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_10-1-2_test/VoteTallyQv_10-1-2_test_cpp/VoteTallyQv_10-1-2_test.dat");
+exports.testTallyVotesWasmPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_10-1-2_test/VoteTallyQv_10-1-2_test_js/VoteTallyQv_10-1-2_test.wasm");
+// Tally votes ceremony QV paths
+exports.ceremonyTallyVotesZkeyPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_6-2-3/tallyVotes_6-2-3.zkey");
+exports.ceremonyTallyVotesWitnessPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_14-5-3/VoteTallyQv_14-5-3_cpp/VoteTallyQv_14-5-3");
+exports.ceremonyTallyVotesDatPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_14-5-3/VoteTallyQv_14-5-3_cpp/VoteTallyQv_14-5-3.dat");
+exports.ceremonyTallyVotesWasmPath = path_1.default.resolve(root, "./zkeys/VoteTallyQv_14-5-3/VoteTallyQv_14-5-3_js/VoteTallyQv_14-5-3.wasm");
+// Tally votes Non-QV paths
+exports.testVoteTallyNonQvZkeyPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test.0.zkey");
+exports.testVoteTallyNonQvWitnessPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test_cpp/VoteTallyNonQv_10-1-2_test");
+exports.testVoteTallyNonQvWitnessDatPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test_cpp/VoteTallyNonQv_10-1-2_test.dat");
+exports.testVoteTallyNonQvWasmPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test_js/VoteTallyNonQv_10-1-2_test.wasm");
+// Tally votes ceremony Non-QV paths
+exports.ceremonyVoteTallyNonQvZkeyPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_6-2-3/tallyVotesNonQv_6-2-3.zkey");
+exports.ceremonyVoteTallyNonQvWitnessPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_14-5-3/VoteTallyNonQv_14-5-3_cpp/VoteTallyNonQv_14-5-3");
+exports.ceremonyVoteTallyNonQvDatPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_14-5-3/VoteTallyNonQv_14-5-3_cpp/VoteTallyNonQv_14-5-3.dat");
+exports.ceremonyVoteTallyNonQvWasmPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_14-5-3/VoteTallyNonQv_14-5-3_js/VoteTallyNonQv_14-5-3.wasm");
+// Tally votes Full paths
+exports.testTallyVotesFullZkeyPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test.0.zkey");
+exports.testTallyVotesFullWitnessPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test_cpp/VoteTallyNonQv_10-1-2_test");
+exports.testTallyVotesFullWitnessDatPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test_cpp/VoteTallyNonQv_10-1-2_test.dat");
+exports.testTallyVotesFullWasmPath = path_1.default.resolve(root, "./zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test_js/VoteTallyNonQv_10-1-2_test.wasm");
 exports.checkVerifyingKeysArgs = {
     stateTreeDepth: exports.STATE_TREE_DEPTH,
-    intStateTreeDepth: exports.INT_STATE_TREE_DEPTH,
+    tallyProcessingStateTreeDepth: exports.TALLY_PROCESSING_STATE_TREE_DEPTH,
     voteOptionTreeDepth: exports.VOTE_OPTION_TREE_DEPTH,
     messageBatchSize: exports.MESSAGE_BATCH_SIZE,
-    pollJoiningZkeyPath: exports.pollJoiningTestZkeyPath,
-    pollJoinedZkeyPath: exports.pollJoinedTestZkeyPath,
-    processMessagesZkeyPath: exports.processMessageTestZkeyPath,
-    tallyVotesZkeyPath: exports.tallyVotesTestZkeyPath,
+    pollJoiningZkeyPath: exports.testPollJoiningZkeyPath,
+    pollJoinedZkeyPath: exports.testPollJoinedZkeyPath,
+    messageProcessorZkeyPath: exports.testProcessMessageZkeyPath,
+    voteTallyZkeyPath: exports.testTallyVotesZkeyPath,
 };
 exports.timeTravelArgs = {
     seconds: exports.pollDuration,
@@ -109,30 +120,58 @@ const verifyArgs = async (signer) => {
         tallyData,
         maciAddress: tallyData.maci,
         tallyCommitments,
-        numVoteOptions: tallyData.results.tally.length,
+        totalVoteOptions: tallyData.results.tally.length,
         voteOptionTreeDepth: pollParams.voteOptionTreeDepth,
         signer,
     };
 };
 exports.verifyArgs = verifyArgs;
-const verifyingKeysArgs = async (signer, mode = sdk_1.EMode.QV) => {
-    const { pollJoiningVk, pollJoinedVk, processVk, tallyVk } = await (0, sdk_1.extractAllVks)({
-        pollJoiningZkeyPath: exports.pollJoiningTestZkeyPath,
-        pollJoinedZkeyPath: exports.pollJoinedTestZkeyPath,
-        processMessagesZkeyPath: mode === sdk_1.EMode.QV ? exports.processMessageTestZkeyPath : exports.processMessageTestNonQvZkeyPath,
-        tallyVotesZkeyPath: mode === sdk_1.EMode.QV ? exports.tallyVotesTestZkeyPath : exports.tallyVotesTestNonQvZkeyPath,
+const zkeysByMode = {
+    [sdk_1.EMode.QV]: {
+        messageProcessorZkeyPath: exports.testProcessMessageZkeyPath,
+        voteTallyZkeyPath: exports.testTallyVotesZkeyPath,
+    },
+    [sdk_1.EMode.NON_QV]: {
+        messageProcessorZkeyPath: exports.testProcessMessageNonQvZkeyPath,
+        voteTallyZkeyPath: exports.testVoteTallyNonQvZkeyPath,
+    },
+    [sdk_1.EMode.FULL]: {
+        messageProcessorZkeyPath: exports.testProcessMessageFullZkeyPath,
+        voteTallyZkeyPath: exports.testTallyVotesFullZkeyPath,
+    },
+};
+const verifyingKeysArgs = async (signer, modes = [sdk_1.EMode.QV]) => {
+    const { pollJoiningVerifyingKey, pollJoinedVerifyingKey } = await (0, sdk_1.extractAllVerifyingKeys)({
+        pollJoiningZkeyPath: exports.testPollJoiningZkeyPath,
+        pollJoinedZkeyPath: exports.testPollJoinedZkeyPath,
+    });
+    const keysResults = await Promise.all(modes.map((mode) => {
+        const { messageProcessorZkeyPath, voteTallyZkeyPath } = zkeysByMode[mode];
+        return (0, sdk_1.extractAllVerifyingKeys)({
+            messageProcessorZkeyPath,
+            voteTallyZkeyPath,
+        });
+    }));
+    const processMessagesVerifyingKeys = [];
+    const tallyVotesVerifyingKeys = [];
+    keysResults.forEach(({ processVerifyingKey, tallyVerifyingKey }, idx) => {
+        if (!processVerifyingKey || !tallyVerifyingKey) {
+            throw new Error(`Verifying keys for mode ${modes[idx]} are not valid`);
+        }
+        processMessagesVerifyingKeys.push(processVerifyingKey);
+        tallyVotesVerifyingKeys.push(tallyVerifyingKey);
     });
     return {
         stateTreeDepth: exports.STATE_TREE_DEPTH,
         pollStateTreeDepth: exports.POLL_STATE_TREE_DEPTH,
-        intStateTreeDepth: exports.INT_STATE_TREE_DEPTH,
+        tallyProcessingStateTreeDepth: exports.TALLY_PROCESSING_STATE_TREE_DEPTH,
         voteOptionTreeDepth: exports.VOTE_OPTION_TREE_DEPTH,
         messageBatchSize: exports.MESSAGE_BATCH_SIZE,
-        pollJoiningVk: pollJoiningVk,
-        pollJoinedVk: pollJoinedVk,
-        processMessagesVk: processVk,
-        tallyVotesVk: tallyVk,
-        mode,
+        pollJoiningVerifyingKey: pollJoiningVerifyingKey,
+        pollJoinedVerifyingKey: pollJoinedVerifyingKey,
+        processMessagesVerifyingKeys,
+        tallyVotesVerifyingKeys,
+        modes,
         signer,
     };
 };
@@ -141,11 +180,11 @@ exports.deployArgs = {
     stateTreeDepth: exports.STATE_TREE_DEPTH,
 };
 exports.deployPollArgs = {
-    intStateTreeDepth: exports.INT_STATE_TREE_DEPTH,
+    tallyProcessingStateTreeDepth: exports.TALLY_PROCESSING_STATE_TREE_DEPTH,
     messageBatchSize: exports.MESSAGE_BATCH_SIZE,
     stateTreeDepth: exports.POLL_STATE_TREE_DEPTH,
     voteOptionTreeDepth: exports.VOTE_OPTION_TREE_DEPTH,
-    coordinatorPubKey: exports.coordinatorKeypair.pubKey,
+    coordinatorPublicKey: exports.coordinatorKeypair.publicKey,
     initialVoiceCredits: exports.DEFAULT_INITIAL_VOICE_CREDITS,
     mode: sdk_1.EMode.QV,
     voteOptions: exports.DEFAULT_VOTE_OPTIONS,

package/build/ts/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":"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"}

package/build/ts/testingClass.d.ts

@@ -14,27 +14,27 @@ export declare class TestingClass {
      */
     private pollJoinedZkeyPath;
     /**
-     * Paths to the processMessages zkey file
+     * Paths to the MessageProcessor zkey file
      */
-    private processMessagesZkeyPath;
+    private messageProcessorZkeyPath;
     /**
-     * Paths to the tallyVotes zkey file
+     * Paths to the VoteTally zkey file
      */
-    private tallyVotesZkeyPath;
+    private voteTallyZkeyPath;
     /**
-     * Paths to the poll wasm file
+     * Paths to the poll joining wasm file
      */
-    private pollWasm;
+    private pollJoiningWasm;
     /**
-     * Paths to the poll witgen file
+     * Paths to the poll witnessGenerator file
      */
-    private pollWitgen;
+    private pollWitnessGenerator;
     /**
      * Paths to the rapidsnark file
      */
     private rapidsnark;
     readonly contractsData: IContractsData;
-    constructor({ pollJoiningZkeyPath, pollJoinedZkeyPath, processMessagesZkeyPath, tallyVotesZkeyPath, pollWasm, pollWitgen, rapidsnark, }: ITestingClassPaths);
+    constructor({ pollJoiningZkeyPath, pollJoinedZkeyPath, messageProcessorZkeyPath, voteTallyZkeyPath, pollJoiningWasm, pollWitnessGenerator, rapidsnark, }: ITestingClassPaths);
     static getInstance(paths: ITestingClassPaths): Promise<TestingClass>;
     static sleep(ms: number): Promise<void>;
     static clean(): void;

package/build/ts/testingClass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testingClass.d.ts","sourceRoot":"","sources":["../../ts/testingClass.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAelE;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAe;IAEvC;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAS;IAEpC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;OAEG;IACH,OAAO,CAAC,uBAAuB,CAAS;IAExC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAS;IAEzB;;OAEG;IACH,OAAO,CAAC,UAAU,CAAS;IAE3B;;OAEG;IACH,OAAO,CAAC,UAAU,CAAS;IAE3B,QAAQ,CAAC,aAAa,EAAE,cAAc,CAEpC;gBAEU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,QAAQ,EACR,UAAU,EACV,UAAU,GACX,EAAE,kBAAkB;WAUR,WAAW,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;WAS7D,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7C,MAAM,CAAC,KAAK,IAAI,IAAI;YAMN,aAAa;CA2H5B"}
+{"version":3,"file":"testingClass.d.ts","sourceRoot":"","sources":["../../ts/testingClass.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAiBlE;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAe;IAEvC;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAS;IAEpC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;OAEG;IACH,OAAO,CAAC,wBAAwB,CAAS;IAEzC;;OAEG;IACH,OAAO,CAAC,iBAAiB,CAAS;IAElC;;OAEG;IACH,OAAO,CAAC,eAAe,CAAS;IAEhC;;OAEG;IACH,OAAO,CAAC,oBAAoB,CAAS;IAErC;;OAEG;IACH,OAAO,CAAC,UAAU,CAAS;IAE3B,QAAQ,CAAC,aAAa,EAAE,cAAc,CAEpC;gBAEU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,EACxB,iBAAiB,EACjB,eAAe,EACf,oBAAoB,EACpB,UAAU,GACX,EAAE,kBAAkB;WAUR,WAAW,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;WAS7D,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7C,MAAM,CAAC,KAAK,IAAI,IAAI;YAMN,aAAa;CA2H5B"}

package/build/ts/testingClass.js

@@ -9,21 +9,22 @@ const sdk_1 = require("@maci-protocol/sdk");
 const hardhat_1 = __importDefault(require("hardhat"));
 const constants_1 = require("./constants");
 const user_1 = require("./user");
+const utils_1 = require("./utils");
 /**
  * A class that represents the testing class used in MACI tests
  * It can be used to deploy and initialize the contracts
  */
 class TestingClass {
-    constructor({ pollJoiningZkeyPath, pollJoinedZkeyPath, processMessagesZkeyPath, tallyVotesZkeyPath, pollWasm, pollWitgen, rapidsnark, }) {
+    constructor({ pollJoiningZkeyPath, pollJoinedZkeyPath, messageProcessorZkeyPath, voteTallyZkeyPath, pollJoiningWasm, pollWitnessGenerator, rapidsnark, }) {
         this.contractsData = {
             initialized: false,
         };
         this.pollJoiningZkeyPath = pollJoiningZkeyPath;
         this.pollJoinedZkeyPath = pollJoinedZkeyPath;
-        this.processMessagesZkeyPath = processMessagesZkeyPath;
-        this.tallyVotesZkeyPath = tallyVotesZkeyPath;
-        this.pollWasm = pollWasm;
-        this.pollWitgen = pollWitgen;
+        this.messageProcessorZkeyPath = messageProcessorZkeyPath;
+        this.voteTallyZkeyPath = voteTallyZkeyPath;
+        this.pollJoiningWasm = pollJoiningWasm;
+        this.pollWitnessGenerator = pollWitnessGenerator;
         this.rapidsnark = rapidsnark;
     }
     static async getInstance(paths) {
@@ -47,29 +48,14 @@ class TestingClass {
         if (this.contractsData.initialized) {
             return;
         }
-        const [signer] = await hardhat_1.default.ethers.getSigners();
+        const [signer] = (await hardhat_1.default.ethers.getSigners());
         const coordinatorKeypair = new domainobjs_1.Keypair();
         const user = new domainobjs_1.Keypair();
-        const { pollJoiningVk, pollJoinedVk, processVk, tallyVk } = await (0, sdk_1.extractAllVks)({
+        const { pollJoiningVerifyingKey, pollJoinedVerifyingKey, processVerifyingKey, tallyVerifyingKey } = await (0, sdk_1.extractAllVerifyingKeys)({
             pollJoiningZkeyPath: this.pollJoiningZkeyPath,
             pollJoinedZkeyPath: this.pollJoinedZkeyPath,
-            processMessagesZkeyPath: this.processMessagesZkeyPath,
-            tallyVotesZkeyPath: this.tallyVotesZkeyPath,
-        });
-        const vkRegistry = await (0, sdk_1.deployVkRegistryContract)({ signer });
-        await (0, sdk_1.setVerifyingKeys)({
-            vkRegistryAddress: vkRegistry,
-            stateTreeDepth: constants_1.STATE_TREE_DEPTH,
-            intStateTreeDepth: constants_1.INT_STATE_TREE_DEPTH,
-            voteOptionTreeDepth: constants_1.VOTE_OPTION_TREE_DEPTH,
-            messageBatchSize: constants_1.MESSAGE_BATCH_SIZE,
-            pollStateTreeDepth: constants_1.POLL_STATE_TREE_DEPTH,
-            pollJoiningVk: pollJoiningVk,
-            pollJoinedVk: pollJoinedVk,
-            processMessagesVk: processVk,
-            tallyVotesVk: tallyVk,
-            mode: sdk_1.EMode.NON_QV,
-            signer,
+            messageProcessorZkeyPath: this.messageProcessorZkeyPath,
+            voteTallyZkeyPath: this.voteTallyZkeyPath,
         });
         const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
         const signupPolicyContractAddress = await signupPolicy.getAddress();
@@ -83,50 +69,65 @@ class TestingClass {
             signer,
             signupPolicyAddress: signupPolicyContractAddress,
         });
-        const [initialVoiceCreditProxy] = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, signer, undefined, true);
+        // we set the verifying keys
+        const { verifyingKeysRegistryContractAddress } = maciAddresses;
+        await (0, sdk_1.setVerifyingKeys)({
+            verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            stateTreeDepth: constants_1.STATE_TREE_DEPTH,
+            tallyProcessingStateTreeDepth: constants_1.TALLY_PROCESSING_STATE_TREE_DEPTH,
+            voteOptionTreeDepth: constants_1.VOTE_OPTION_TREE_DEPTH,
+            messageBatchSize: constants_1.MESSAGE_BATCH_SIZE,
+            pollStateTreeDepth: constants_1.POLL_STATE_TREE_DEPTH,
+            pollJoiningVerifyingKey: pollJoiningVerifyingKey,
+            pollJoinedVerifyingKey: pollJoinedVerifyingKey,
+            processMessagesVerifyingKeys: [processVerifyingKey],
+            tallyVotesVerifyingKeys: [tallyVerifyingKey],
+            modes: [sdk_1.EMode.NON_QV],
+            signer,
+        });
+        const constantInitialVoiceCreditProxyFactory = await (0, sdk_1.deployConstantInitialVoiceCreditProxyFactory)(signer, true);
+        const initialVoiceCreditProxy = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, constantInitialVoiceCreditProxyFactory, signer);
+        const initialVoiceCreditProxyFactoryAddress = await constantInitialVoiceCreditProxyFactory.getAddress();
         const initialVoiceCreditProxyContractAddress = await initialVoiceCreditProxy.getAddress();
-        const verifier = await (0, sdk_1.deployVerifier)(signer, true);
-        const verifierContractAddress = await verifier.getAddress();
         const startDate = Math.floor(Date.now() / 1000) + 30;
         const { pollContractAddress } = await (0, sdk_1.deployPoll)({
             pollStartTimestamp: startDate,
             pollEndTimestamp: startDate + 130,
-            intStateTreeDepth: constants_1.INT_STATE_TREE_DEPTH,
+            tallyProcessingStateTreeDepth: constants_1.TALLY_PROCESSING_STATE_TREE_DEPTH,
             messageBatchSize: constants_1.MESSAGE_BATCH_SIZE,
             stateTreeDepth: constants_1.POLL_STATE_TREE_DEPTH,
             voteOptionTreeDepth: constants_1.VOTE_OPTION_TREE_DEPTH,
-            coordinatorPubKey: coordinatorKeypair.pubKey,
+            coordinatorPublicKey: coordinatorKeypair.publicKey,
             mode: sdk_1.EMode.NON_QV,
             relayers: [await signer.getAddress()],
             signer,
-            verifierContractAddress,
             maciAddress: maciAddresses.maciContractAddress,
             policyContractAddress: pollPolicyContractAddress,
+            initialVoiceCreditProxyFactoryAddress,
             initialVoiceCreditProxyContractAddress,
             voteOptions: constants_1.DEFAULT_VOTE_OPTIONS,
-            vkRegistryContractAddress: vkRegistry,
         });
         await (0, sdk_1.signup)({
             maciAddress: maciAddresses.maciContractAddress,
-            maciPubKey: user.pubKey.serialize(),
+            maciPublicKey: user.publicKey.serialize(),
             sgData: constants_1.DEFAULT_SG_DATA,
             signer,
         });
+        const useWasm = (0, utils_1.isArm)();
         const { pollStateIndex, voiceCredits } = await (0, sdk_1.joinPoll)({
             maciAddress: maciAddresses.maciContractAddress,
             pollId: 0n,
-            privateKey: user.privKey.serialize(),
-            stateIndex: 1n,
+            privateKey: user.privateKey.serialize(),
             pollJoiningZkey: this.pollJoiningZkeyPath,
-            pollWasm: this.pollWasm,
-            pollWitgen: this.pollWitgen,
+            pollJoiningWasm: this.pollJoiningWasm,
+            pollWitnessGenerator: this.pollWitnessGenerator,
             rapidsnark: this.rapidsnark,
             signer,
-            useWasm: true,
+            useWasm,
             sgDataArg: constants_1.DEFAULT_SG_DATA,
             ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
         });
-        const maciState = await (0, sdk_1.genMaciStateFromContract)({
+        const maciState = await (0, sdk_1.generateMaciStateFromContract)({
             provider: signer.provider,
             address: maciAddresses.maciContractAddress,
             coordinatorKeypair,

package/build/ts/testingClass.js.map

@@ -1 +1 @@
-{"version":3,"file":"testingClass.js","sourceRoot":"","sources":["../../ts/testingClass.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testingClass.js","sourceRoot":"","sources":["../../ts/testingClass.ts"],"names":[],"mappings":"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"}

package/build/ts/types.d.ts

@@ -1,6 +1,5 @@
-import { genMaciStateFromContract } from "@maci-protocol/sdk";
+import { type generateMaciStateFromContract, type MACI, type Verifier, type VerifyingKeysRegistry, type FreeForAllPolicy, type ConstantInitialVoiceCreditProxy, type IIpfsMessage } from "@maci-protocol/sdk";
 import type { User } from "./user";
-import type { MACI, Verifier, VkRegistry, FreeForAllPolicy, ConstantInitialVoiceCreditProxy, IIpfsMessage } from "@maci-protocol/sdk";
 import type { Signer } from "ethers";
 /**
  * A util interface that represents a vote object
@@ -44,7 +43,7 @@ export interface ITestSuite {
 export interface IDeployedTestContracts {
     maci: MACI;
     verifier: Verifier;
-    vkRegistry: VkRegistry;
+    verifyingKeysRegistry: VerifyingKeysRegistry;
     policy: FreeForAllPolicy;
     initialVoiceCreditProxy: ConstantInitialVoiceCreditProxy;
 }
@@ -55,7 +54,7 @@ export interface IContractsData {
     initialized: boolean;
     users?: User[];
     maciContractAddress?: string;
-    maciState?: Awaited<ReturnType<typeof genMaciStateFromContract>>;
+    maciState?: Awaited<ReturnType<typeof generateMaciStateFromContract>>;
     polls?: string[];
 }
 export interface IRelayTestMessagesArgs {
@@ -65,7 +64,7 @@ export interface IRelayTestMessagesArgs {
     pollId: number;
 }
 /**
- * Interface for the paths to the zkey files and the wasm and witgen files
+ * Interface for the paths to the zkey files and the wasm and witnessGenerator files
  */
 export interface ITestingClassPaths {
     /**
@@ -77,21 +76,21 @@ export interface ITestingClassPaths {
      */
     pollJoinedZkeyPath: string;
     /**
-     * Path to the processMessages zkey file
+     * Path to the MessageProcessor zkey file
      */
-    processMessagesZkeyPath: string;
+    messageProcessorZkeyPath: string;
     /**
-     * Path to the tallyVotes zkey file
+     * Path to the VoteTally zkey file
      */
-    tallyVotesZkeyPath: string;
+    voteTallyZkeyPath: string;
     /**
-     * Path to the poll wasm file
+     * Path to the poll joining wasm file
      */
-    pollWasm: string;
+    pollJoiningWasm: string;
     /**
-     * Path to the poll witgen file
+     * Path to the poll witnessGenerator file
      */
-    pollWitgen: string;
+    pollWitnessGenerator: string;
     /**
      * Path to the rapidsnark file
      */