@maci-protocol/sdk 0.0.0-ci.ec84efe → 0.0.0-ci.eea13a2

package/build/ts/verifyingKeys/checkVerifyingKeys.js

@@ -15,50 +15,49 @@ const utils_2 = require("./utils");
  * @param CheckVerifyingKeysArgs - The arguments for the checkVerifyingKeys command
  * @returns Whether the verifying keys match or not
  */
-const checkVerifyingKeys = async ({ stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, processMessagesZkeyPath, tallyVotesZkeyPath, pollJoiningZkeyPath, pollJoinedZkeyPath, vkRegistry, signer, useQuadraticVoting = true, }) => {
-    if (!vkRegistry) {
-        throw new Error("Please provide a VkRegistry contract address");
+const checkVerifyingKeys = async ({ stateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize, messageProcessorZkeyPath, voteTallyZkeyPath, pollJoiningZkeyPath, pollJoinedZkeyPath, verifyingKeysRegistry, signer, mode = contracts_1.EMode.QV, }) => {
+    if (!verifyingKeysRegistry) {
+        throw new Error("Please provide a VerifyingKeysRegistry contract address");
     }
-    const isVkExists = await (0, utils_1.contractExists)(signer.provider, vkRegistry);
-    if (!isVkExists) {
-        throw new Error("The VkRegistry contract does not exist");
+    const isVerifyingKeyExists = await (0, utils_1.contractExists)(signer.provider, verifyingKeysRegistry);
+    if (!isVerifyingKeyExists) {
+        throw new Error("The VerifyingKeysRegistry contract does not exist");
     }
     // we need to ensure that the zkey files exist
-    const isProcessMessagesZkeyPathExists = fs_1.default.existsSync(processMessagesZkeyPath);
+    const isProcessMessagesZkeyPathExists = fs_1.default.existsSync(messageProcessorZkeyPath);
     if (!isProcessMessagesZkeyPathExists) {
         throw new Error("The provided Process messages zkey does not exist");
     }
-    const isTallyVotesZkeyPathExists = fs_1.default.existsSync(tallyVotesZkeyPath);
+    const isTallyVotesZkeyPathExists = fs_1.default.existsSync(voteTallyZkeyPath);
     if (!isTallyVotesZkeyPathExists) {
         throw new Error("The provided Tally votes zkey does not exist");
     }
     // extract the verification keys from the zkey files
-    const { pollJoiningVk, pollJoinedVk, processVk, tallyVk } = await (0, utils_2.extractAllVks)({
-        processMessagesZkeyPath,
-        tallyVotesZkeyPath,
+    const { pollJoiningVerifyingKey, pollJoinedVerifyingKey, processVerifyingKey, tallyVerifyingKey } = await (0, utils_2.extractAllVerifyingKeys)({
+        messageProcessorZkeyPath,
+        voteTallyZkeyPath,
         pollJoiningZkeyPath,
         pollJoinedZkeyPath,
     });
-    const mode = useQuadraticVoting ? contracts_1.EMode.QV : contracts_1.EMode.NON_QV;
-    const { pollJoiningVkOnChain, pollJoinedVkOnChain, processVkOnChain, tallyVkOnChain } = await (0, utils_2.getAllOnChainVks)({
-        vkRegistryAddress: vkRegistry,
+    const { pollJoiningVerifyingKeyOnChain, pollJoinedVerifyingKeyOnChain, processVerifyingKeyOnChain, tallyVerifyingKeyOnChain, } = await (0, utils_2.getAllOnChainVerifyingKeys)({
+        verifyingKeysRegistryAddress: verifyingKeysRegistry,
         signer,
         stateTreeDepth,
         voteOptionTreeDepth,
         messageBatchSize,
-        intStateTreeDepth,
+        tallyProcessingStateTreeDepth,
         mode,
     });
-    if (!(0, utils_2.compareVks)(pollJoiningVkOnChain, pollJoiningVk)) {
+    if (!(0, utils_2.compareVerifyingKeys)(pollJoiningVerifyingKeyOnChain, pollJoiningVerifyingKey)) {
         throw new Error("Poll verifying keys do not match");
     }
-    if (!(0, utils_2.compareVks)(pollJoinedVkOnChain, pollJoinedVk)) {
+    if (!(0, utils_2.compareVerifyingKeys)(pollJoinedVerifyingKeyOnChain, pollJoinedVerifyingKey)) {
         throw new Error("Poll verifying keys do not match");
     }
-    if (!(0, utils_2.compareVks)(processVkOnChain, processVk)) {
+    if (!(0, utils_2.compareVerifyingKeys)(processVerifyingKeyOnChain, processVerifyingKey)) {
         throw new Error("Process verifying keys do not match");
     }
-    if (!(0, utils_2.compareVks)(tallyVkOnChain, tallyVk)) {
+    if (!(0, utils_2.compareVerifyingKeys)(tallyVerifyingKeyOnChain, tallyVerifyingKey)) {
         throw new Error("Tally verifying keys do not match");
     }
     return true;

package/build/ts/verifyingKeys/checkVerifyingKeys.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkVerifyingKeys.js","sourceRoot":"","sources":["../../../ts/verifyingKeys/checkVerifyingKeys.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiD;AAEjD,4CAAoB;AAIpB,oCAA0C;AAE1C,mCAAsE;AAEtE;;;;;;GAMG;AACI,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,UAAU,EACV,MAAM,EACN,kBAAkB,GAAG,IAAI,GACD,EAAoB,EAAE;IAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,QAAS,EAAE,UAAU,CAAC,CAAC;IAEtE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,8CAA8C;IAC9C,MAAM,+BAA+B,GAAG,YAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IAE/E,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,0BAA0B,GAAG,YAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAErE,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,oDAAoD;IACpD,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,qBAAa,EAAC;QAC9E,uBAAuB;QACvB,kBAAkB;QAClB,mBAAmB;QACnB,kBAAkB;KACnB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,iBAAK,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAK,CAAC,MAAM,CAAC;IAE1D,MAAM,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,wBAAgB,EAAC;QAC7G,iBAAiB,EAAE,UAAU;QAC7B,MAAM;QACN,cAAc;QACd,mBAAmB;QACnB,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;IAEH,IAAI,CAAC,IAAA,kBAAU,EAAC,oBAAoB,EAAE,aAAa,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,IAAA,kBAAU,EAAC,mBAAmB,EAAE,YAAY,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,IAAA,kBAAU,EAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,IAAA,kBAAU,EAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAzEW,QAAA,kBAAkB,sBAyE7B"}
+{"version":3,"file":"checkVerifyingKeys.js","sourceRoot":"","sources":["../../../ts/verifyingKeys/checkVerifyingKeys.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiD;AAEjD,4CAAoB;AAIpB,oCAA0C;AAE1C,mCAAoG;AAEpG;;;;;;GAMG;AACI,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,cAAc,EACd,6BAA6B,EAC7B,mBAAmB,EACnB,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,EACrB,MAAM,EACN,IAAI,GAAG,iBAAK,CAAC,EAAE,GACS,EAAoB,EAAE;IAC9C,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,oBAAoB,GAAG,MAAM,IAAA,sBAAc,EAAC,MAAM,CAAC,QAAS,EAAE,qBAAqB,CAAC,CAAC;IAE3F,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,8CAA8C;IAC9C,MAAM,+BAA+B,GAAG,YAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;IAEhF,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,0BAA0B,GAAG,YAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAEpE,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,oDAAoD;IACpD,MAAM,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GAC/F,MAAM,IAAA,+BAAuB,EAAC;QAC5B,wBAAwB;QACxB,iBAAiB;QACjB,mBAAmB;QACnB,kBAAkB;KACnB,CAAC,CAAC;IAEL,MAAM,EACJ,8BAA8B,EAC9B,6BAA6B,EAC7B,0BAA0B,EAC1B,wBAAwB,GACzB,GAAG,MAAM,IAAA,kCAA0B,EAAC;QACnC,4BAA4B,EAAE,qBAAqB;QACnD,MAAM;QACN,cAAc;QACd,mBAAmB;QACnB,gBAAgB;QAChB,6BAA6B;QAC7B,IAAI;KACL,CAAC,CAAC;IAEH,IAAI,CAAC,IAAA,4BAAoB,EAAC,8BAA8B,EAAE,uBAAuB,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,IAAA,4BAAoB,EAAC,6BAA6B,EAAE,sBAAsB,CAAC,EAAE,CAAC;QACjF,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,IAAA,4BAAoB,EAAC,0BAA0B,EAAE,mBAAmB,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,IAAA,4BAAoB,EAAC,wBAAwB,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA7EW,QAAA,kBAAkB,sBA6E7B"}

package/build/ts/verifyingKeys/index.d.ts

@@ -1,5 +1,5 @@
 export { checkVerifyingKeys } from "./checkVerifyingKeys";
 export { setVerifyingKeys } from "./setVerifyingKeys";
-export { getAllOnChainVks, compareVks, extractAllVks, extractVkToFile } from "./utils";
-export type { IGetAllVksArgs, IMaciVerifyingKeys, IExtractAllVksArgs, IMaciVks, ISetVerifyingKeysArgs, ICheckVerifyingKeysArgs, } from "./types";
+export { getAllOnChainVerifyingKeys, compareVerifyingKeys, extractAllVerifyingKeys, extractVerifyingKeyToFile, } from "./utils";
+export type { IGetAllVerifyingKeysArgs, IMaciVerifyingKeysOnchain, IExtractAllVerifyingKeysArgs, IMaciVerifyingKeys, ISetVerifyingKeysArgs, ICheckVerifyingKeysArgs, } from "./types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/verifyingKeys/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACvF,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,QAAQ,EACR,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/verifyingKeys/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,SAAS,CAAC;AACjB,YAAY,EACV,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,SAAS,CAAC"}

package/build/ts/verifyingKeys/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractVkToFile = exports.extractAllVks = exports.compareVks = exports.getAllOnChainVks = exports.setVerifyingKeys = exports.checkVerifyingKeys = void 0;
+exports.extractVerifyingKeyToFile = exports.extractAllVerifyingKeys = exports.compareVerifyingKeys = exports.getAllOnChainVerifyingKeys = exports.setVerifyingKeys = exports.checkVerifyingKeys = void 0;
 var checkVerifyingKeys_1 = require("./checkVerifyingKeys");
 Object.defineProperty(exports, "checkVerifyingKeys", { enumerable: true, get: function () { return checkVerifyingKeys_1.checkVerifyingKeys; } });
 var setVerifyingKeys_1 = require("./setVerifyingKeys");
 Object.defineProperty(exports, "setVerifyingKeys", { enumerable: true, get: function () { return setVerifyingKeys_1.setVerifyingKeys; } });
 var utils_1 = require("./utils");
-Object.defineProperty(exports, "getAllOnChainVks", { enumerable: true, get: function () { return utils_1.getAllOnChainVks; } });
-Object.defineProperty(exports, "compareVks", { enumerable: true, get: function () { return utils_1.compareVks; } });
-Object.defineProperty(exports, "extractAllVks", { enumerable: true, get: function () { return utils_1.extractAllVks; } });
-Object.defineProperty(exports, "extractVkToFile", { enumerable: true, get: function () { return utils_1.extractVkToFile; } });
+Object.defineProperty(exports, "getAllOnChainVerifyingKeys", { enumerable: true, get: function () { return utils_1.getAllOnChainVerifyingKeys; } });
+Object.defineProperty(exports, "compareVerifyingKeys", { enumerable: true, get: function () { return utils_1.compareVerifyingKeys; } });
+Object.defineProperty(exports, "extractAllVerifyingKeys", { enumerable: true, get: function () { return utils_1.extractAllVerifyingKeys; } });
+Object.defineProperty(exports, "extractVerifyingKeyToFile", { enumerable: true, get: function () { return utils_1.extractVerifyingKeyToFile; } });
 //# sourceMappingURL=index.js.map

package/build/ts/verifyingKeys/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/verifyingKeys/index.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iCAAuF;AAA9E,yGAAA,gBAAgB,OAAA;AAAE,mGAAA,UAAU,OAAA;AAAE,sGAAA,aAAa,OAAA;AAAE,wGAAA,eAAe,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/verifyingKeys/index.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iCAKiB;AAJf,mHAAA,0BAA0B,OAAA;AAC1B,6GAAA,oBAAoB,OAAA;AACpB,gHAAA,uBAAuB,OAAA;AACvB,kHAAA,yBAAyB,OAAA"}

package/build/ts/verifyingKeys/setVerifyingKeys.d.ts

@@ -3,5 +3,5 @@ import type { ISetVerifyingKeysArgs } from "./types";
  * Set the verifying keys on the contract
  * @param args - The arguments for the setVerifyingKeys function
  */
-export declare const setVerifyingKeys: ({ pollJoiningVk, pollJoinedVk, processMessagesVk, tallyVotesVk, stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, vkRegistryAddress, signer, mode, }: ISetVerifyingKeysArgs) => Promise<void>;
+export declare const setVerifyingKeys: ({ pollJoiningVerifyingKey, pollJoinedVerifyingKey, processMessagesVerifyingKeys, tallyVotesVerifyingKeys, stateTreeDepth, pollStateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize, verifyingKeysRegistryAddress, signer, modes, }: ISetVerifyingKeysArgs) => Promise<void>;
 //# sourceMappingURL=setVerifyingKeys.d.ts.map

package/build/ts/verifyingKeys/setVerifyingKeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setVerifyingKeys.d.ts","sourceRoot":"","sources":["../../../ts/verifyingKeys/setVerifyingKeys.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAMrD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAU,8KAYpC,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAwFtC,CAAC"}
+{"version":3,"file":"setVerifyingKeys.d.ts","sourceRoot":"","sources":["../../../ts/verifyingKeys/setVerifyingKeys.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAMrD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAU,oQAapC,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAmItC,CAAC"}

package/build/ts/verifyingKeys/setVerifyingKeys.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setVerifyingKeys = void 0;
-const contracts_1 = require("@maci-protocol/contracts");
+const typechain_types_1 = require("@maci-protocol/contracts/typechain-types");
 const core_1 = require("@maci-protocol/core");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
@@ -9,64 +9,99 @@ const utils_2 = require("./utils");
  * Set the verifying keys on the contract
  * @param args - The arguments for the setVerifyingKeys function
  */
-const setVerifyingKeys = async ({ pollJoiningVk, pollJoinedVk, processMessagesVk, tallyVotesVk, stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, vkRegistryAddress, signer, mode, }) => {
+const setVerifyingKeys = async ({ pollJoiningVerifyingKey, pollJoinedVerifyingKey, processMessagesVerifyingKeys, tallyVotesVerifyingKeys, stateTreeDepth, pollStateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize, verifyingKeysRegistryAddress, signer, modes, }) => {
     // validate args
-    if (stateTreeDepth < 1 || intStateTreeDepth < 1 || voteOptionTreeDepth < 1 || messageBatchSize < 1) {
+    if (stateTreeDepth < 1 || tallyProcessingStateTreeDepth < 1 || voteOptionTreeDepth < 1 || messageBatchSize < 1) {
         throw new Error("Invalid depth or batch size parameters");
     }
-    if (stateTreeDepth < intStateTreeDepth) {
+    if (stateTreeDepth < tallyProcessingStateTreeDepth) {
         throw new Error("Invalid state tree depth or intermediate state tree depth");
     }
-    const vkRegistryContractExists = await (0, utils_1.contractExists)(signer.provider, vkRegistryAddress);
-    // ensure we have a contract deployed at the provided address
-    if (!vkRegistryContractExists) {
-        throw new Error(`A VkRegistry contract is not deployed at ${vkRegistryAddress}`);
+    if (processMessagesVerifyingKeys.length !== modes.length) {
+        throw new Error("Number of process messages verifying keys must match number of modes");
     }
-    // connect to VkRegistry contract
-    const vkRegistryContract = contracts_1.VkRegistry__factory.connect(vkRegistryAddress, signer);
-    // check if the poll vk was already set
-    const pollJoiningVkSig = (0, core_1.genPollJoiningVkSig)(stateTreeDepth);
-    if (await vkRegistryContract.isPollJoiningVkSet(pollJoiningVkSig)) {
-        throw new Error("This poll verifying key is already set in the contract");
+    if (tallyVotesVerifyingKeys.length !== modes.length) {
+        throw new Error("Number of tally votes verifying keys must match number of modes");
     }
-    // check if the poll vk was already set
-    const pollJoinedVkSig = (0, core_1.genPollJoinedVkSig)(stateTreeDepth);
-    if (await vkRegistryContract.isPollJoinedVkSet(pollJoinedVkSig)) {
-        throw new Error("This poll verifying key is already set in the contract");
+    const isContractExists = await (0, utils_1.contractExists)(signer.provider, verifyingKeysRegistryAddress);
+    // ensure we have a contract deployed at the provided address
+    if (!isContractExists) {
+        throw new Error(`A VerifyingKeysRegistry contract is not deployed at ${verifyingKeysRegistryAddress}`);
     }
-    // check if the process messages vk was already set
-    const processVkSig = (0, core_1.genProcessVkSig)(stateTreeDepth, voteOptionTreeDepth, messageBatchSize);
-    if (await vkRegistryContract.isProcessVkSet(processVkSig, contracts_1.EMode.QV)) {
-        throw new Error("This process verifying key is already set in the contract");
+    // connect to VerifyingKeysRegistry contract
+    const verifyingKeysRegistryContract = typechain_types_1.VerifyingKeysRegistry__factory.connect(verifyingKeysRegistryAddress, signer);
+    // check if the poll verifyingKeys were already set
+    const pollJoiningVerifyingKeySignature = (0, core_1.generatePollJoiningVerifyingKeySignature)(stateTreeDepth);
+    const pollJoinedVerifyingKeySignature = (0, core_1.generatePollJoinedVerifyingKeySignature)(stateTreeDepth);
+    const [isPollJoiningVerifyingKeySet, isPollJoinedVerifyingKeySet] = await Promise.all([
+        verifyingKeysRegistryContract.isPollJoiningVerifyingKeySet(pollJoiningVerifyingKeySignature),
+        verifyingKeysRegistryContract.isPollJoinedVerifyingKeySet(pollJoinedVerifyingKeySignature),
+    ]);
+    if (isPollJoiningVerifyingKeySet) {
+        throw new Error("This poll joining verifying key is already set in the contract");
     }
-    // do the same for the tally votes vk
-    const tallyVkSig = (0, core_1.genTallyVkSig)(stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth);
-    if (await vkRegistryContract.isTallyVkSet(tallyVkSig, mode)) {
-        throw new Error("This tally verifying key is already set in the contract");
+    if (isPollJoinedVerifyingKeySet) {
+        throw new Error("This poll joined verifying key is already set in the contract");
     }
+    // check if the process messages or tally verifyingKey were already set for each mode
+    const processVerifyingKeySignature = (0, core_1.generateProcessVerifyingKeySignature)(stateTreeDepth, voteOptionTreeDepth, messageBatchSize);
+    const tallyVerifyingKeySignature = (0, core_1.generateTallyVerifyingKeySignature)(stateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth);
+    const keyChecks = await Promise.all(modes.map(async (mode) => {
+        const [isProcessVerifyingKeySet, isTallyVerifyingKeySet] = await Promise.all([
+            verifyingKeysRegistryContract.isProcessVerifyingKeySet(processVerifyingKeySignature, mode),
+            verifyingKeysRegistryContract.isTallyVerifyingKeySet(tallyVerifyingKeySignature, mode),
+        ]);
+        return { mode, isProcessVerifyingKeySet, isTallyVerifyingKeySet };
+    }));
+    keyChecks.forEach(({ mode, isProcessVerifyingKeySet, isTallyVerifyingKeySet }) => {
+        if (isProcessVerifyingKeySet) {
+            throw new Error(`This process verifying key is already set in the contract for mode ${mode}`);
+        }
+        if (isTallyVerifyingKeySet) {
+            throw new Error(`This tally verifying key is already set in the contract for mode ${mode}`);
+        }
+    });
     // set them onchain
-    const tx = await vkRegistryContract.setVerifyingKeysBatch(stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, [mode], pollJoiningVk.asContractParam(), pollJoinedVk.asContractParam(), [processMessagesVk.asContractParam()], [tallyVotesVk.asContractParam()]);
+    const tx = await verifyingKeysRegistryContract.setVerifyingKeysBatch({
+        stateTreeDepth,
+        pollStateTreeDepth,
+        tallyProcessingStateTreeDepth,
+        voteOptionTreeDepth,
+        messageBatchSize,
+        modes,
+        pollJoiningVerifyingKey: pollJoiningVerifyingKey.asContractParam(),
+        pollJoinedVerifyingKey: pollJoinedVerifyingKey.asContractParam(),
+        processVerifyingKeys: processMessagesVerifyingKeys.map((key) => key.asContractParam()),
+        tallyVerifyingKeys: tallyVotesVerifyingKeys.map((key) => key.asContractParam()),
+    });
     const receipt = await tx.wait();
     if (receipt?.status !== 1) {
         throw new Error("Set verifying keys transaction failed");
     }
-    const [pollJoiningVkOnChain, pollJoinedVkOnChain, processVkOnChain, tallyVkOnChain] = await Promise.all([
-        vkRegistryContract.getPollJoiningVk(stateTreeDepth),
-        vkRegistryContract.getPollJoinedVk(stateTreeDepth),
-        vkRegistryContract.getProcessVk(stateTreeDepth, voteOptionTreeDepth, messageBatchSize, mode),
-        vkRegistryContract.getTallyVk(stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, mode),
+    // Verify that all keys were set correctly
+    const [pollJoiningVerifyingKeyOnChain, pollJoinedVerifyingKeyOnChain] = await Promise.all([
+        verifyingKeysRegistryContract.getPollJoiningVerifyingKey(stateTreeDepth),
+        verifyingKeysRegistryContract.getPollJoinedVerifyingKey(stateTreeDepth),
     ]);
-    if (!(0, utils_2.compareVks)(pollJoiningVkOnChain, pollJoiningVk)) {
-        throw new Error("pollJoiningVk mismatch");
-    }
-    if (!(0, utils_2.compareVks)(pollJoinedVkOnChain, pollJoinedVk)) {
-        throw new Error("pollJoinedVk mismatch");
+    if (!(0, utils_2.compareVerifyingKeys)(pollJoiningVerifyingKeyOnChain, pollJoiningVerifyingKey)) {
+        throw new Error("pollJoiningVerifyingKey mismatch");
     }
-    if (!(0, utils_2.compareVks)(processVkOnChain, processMessagesVk)) {
-        throw new Error("processVk mismatch");
+    if (!(0, utils_2.compareVerifyingKeys)(pollJoinedVerifyingKeyOnChain, pollJoinedVerifyingKey)) {
+        throw new Error("pollJoinedVerifyingKey mismatch");
     }
-    if (!(0, utils_2.compareVks)(tallyVkOnChain, tallyVotesVk)) {
-        throw new Error("tallyVk mismatch");
+    for (let i = 0; i < modes.length; i += 1) {
+        const mode = modes[i];
+        // eslint-disable-next-line no-await-in-loop
+        const [processVerifyingKeyOnChain, tallyVerifyingKeyOnChain] = await Promise.all([
+            verifyingKeysRegistryContract.getProcessVerifyingKey(stateTreeDepth, voteOptionTreeDepth, messageBatchSize, mode),
+            verifyingKeysRegistryContract.getTallyVerifyingKey(stateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth, mode),
+        ]);
+        if (!(0, utils_2.compareVerifyingKeys)(processVerifyingKeyOnChain, processMessagesVerifyingKeys[i])) {
+            throw new Error("processVerifyingKey mismatch");
+        }
+        if (!(0, utils_2.compareVerifyingKeys)(tallyVerifyingKeyOnChain, tallyVotesVerifyingKeys[i])) {
+            throw new Error("tallyVerifyingKey mismatch");
+        }
     }
 };
 exports.setVerifyingKeys = setVerifyingKeys;

package/build/ts/verifyingKeys/setVerifyingKeys.js.map

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

package/build/ts/verifyingKeys/types.d.ts

@@ -1,14 +1,14 @@
 import type { EMode } from "@maci-protocol/contracts";
-import type { IVkContractParams, VerifyingKey } from "@maci-protocol/domainobjs";
+import type { IVerifyingKeyContractParams, VerifyingKey } from "@maci-protocol/domainobjs";
 import type { Signer } from "ethers";
 /**
- * Arguments for the getAllVks function
+ * Arguments for the getAllVerifyingKeys function
  */
-export interface IGetAllVksArgs {
+export interface IGetAllVerifyingKeysArgs {
     /**
-     * The address of the VkRegistry contract
+     * The address of the VerifyingKeysRegistry contract
      */
-    vkRegistryAddress: string;
+    verifyingKeysRegistryAddress: string;
     /**
      * The signer to use for the contract calls
      */
@@ -28,7 +28,7 @@ export interface IGetAllVksArgs {
     /**
      * The depth of the ballot tree
      */
-    intStateTreeDepth: number;
+    tallyProcessingStateTreeDepth: number;
     /**
      * The mode to use for the contract calls
      */
@@ -37,28 +37,28 @@ export interface IGetAllVksArgs {
 /**
  * MACI's verifying keys
  */
-export interface IMaciVerifyingKeys {
+export interface IMaciVerifyingKeysOnchain {
     /**
      * The verifying key for the poll joining circuit
      */
-    pollJoiningVkOnChain: IVkContractParams;
+    pollJoiningVerifyingKeyOnChain: IVerifyingKeyContractParams;
     /**
      * The verifying key for the poll joined circuit
      */
-    pollJoinedVkOnChain: IVkContractParams;
+    pollJoinedVerifyingKeyOnChain: IVerifyingKeyContractParams;
     /**
      * The verifying key for the process messages circuit
      */
-    processVkOnChain: IVkContractParams;
+    processVerifyingKeyOnChain: IVerifyingKeyContractParams;
     /**
      * The verifying key for the tally votes circuit
      */
-    tallyVkOnChain: IVkContractParams;
+    tallyVerifyingKeyOnChain: IVerifyingKeyContractParams;
 }
 /**
- * Arguments for the extractAllVks function
+ * Arguments for the extractAllVerifyingKeys function
  */
-export interface IExtractAllVksArgs {
+export interface IExtractAllVerifyingKeysArgs {
     /**
      * The path to the poll joining zkey
      */
@@ -70,61 +70,65 @@ export interface IExtractAllVksArgs {
     /**
      * The path to the process messages zkey
      */
-    processMessagesZkeyPath?: string;
+    messageProcessorZkeyPath?: string;
     /**
      * The path to the tally votes zkey
      */
-    tallyVotesZkeyPath?: string;
+    voteTallyZkeyPath?: string;
 }
 /**
  * Maci verifying keys
  */
-export interface IMaciVks {
+export interface IMaciVerifyingKeys {
     /**
      * The poll joining verifying key
      */
-    pollJoiningVk?: VerifyingKey;
+    pollJoiningVerifyingKey?: VerifyingKey;
     /**
      * The poll joined verifying key
      */
-    pollJoinedVk?: VerifyingKey;
+    pollJoinedVerifyingKey?: VerifyingKey;
     /**
      * The message processing verifying key
      */
-    processVk?: VerifyingKey;
+    processVerifyingKey?: VerifyingKey;
     /**
      * The tally verifying key
      */
-    tallyVk?: VerifyingKey;
+    tallyVerifyingKey?: VerifyingKey;
 }
 /**
  * The arguments for the setVerifyingKeys function
  */
 export interface ISetVerifyingKeysArgs {
     /**
-     * The polll joining Vk object
+     * The polll joining verifying key object
      */
-    pollJoiningVk: VerifyingKey;
+    pollJoiningVerifyingKey: VerifyingKey;
     /**
-     * The poll joined Vk object
+     * The poll joined verifying key object
      */
-    pollJoinedVk: VerifyingKey;
+    pollJoinedVerifyingKey: VerifyingKey;
     /**
-     * The process messages Vk object
+     * The process messages verifying keys array
      */
-    processMessagesVk: VerifyingKey;
+    processMessagesVerifyingKeys: VerifyingKey[];
     /**
-     * The tally votes Vk object
+     * The tally votes verifying keys array
      */
-    tallyVotesVk: VerifyingKey;
+    tallyVotesVerifyingKeys: VerifyingKey[];
     /**
      * The state tree depth
      */
     stateTreeDepth: number;
+    /**
+     * The poll state tree depth
+     */
+    pollStateTreeDepth: number;
     /**
      * The intermediate state tree depth (ballot tree)
      */
-    intStateTreeDepth: number;
+    tallyProcessingStateTreeDepth: number;
     /**
      * The vote option tree depth
      */
@@ -134,17 +138,17 @@ export interface ISetVerifyingKeysArgs {
      */
     messageBatchSize: number;
     /**
-     * The VkRegistry contract address
+     * The VerifyingKeysRegistry contract address
      */
-    vkRegistryAddress: string;
+    verifyingKeysRegistryAddress: string;
     /**
      * The signer
      */
     signer: Signer;
     /**
-     * QV or NON_QV
+     * QV, NON_QV or FULL
      */
-    mode: EMode;
+    modes: EMode[];
 }
 /**
  * Interface for the arguments to the checkVerifyingKeys command
@@ -157,7 +161,7 @@ export interface ICheckVerifyingKeysArgs {
     /**
      * The depth of the state subtree
      */
-    intStateTreeDepth: number;
+    tallyProcessingStateTreeDepth: number;
     /**
      * The depth of the vote option tree
      */
@@ -177,28 +181,28 @@ export interface ICheckVerifyingKeysArgs {
     /**
      * The path to the process messages zkey
      */
-    processMessagesZkeyPath: string;
+    messageProcessorZkeyPath: string;
     /**
      * The path to the tally votes zkey
      */
-    tallyVotesZkeyPath: string;
+    voteTallyZkeyPath: string;
     /**
      * A signer object
      */
     signer: Signer;
     /**
-     * The address of the VkRegistry contract
+     * The address of the VerifyingKeysRegistry contract
      */
-    vkRegistry: string;
+    verifyingKeysRegistry: string;
     /**
-     * Whether to use quadratic voting or not
+     * Voting mode
      */
-    useQuadraticVoting?: boolean;
+    mode?: EMode;
 }
 /**
- * Interface for the arguments to the extractVkToFile command
+ * Interface for the arguments to the extractVerifyingKeyToFile command
  */
-export interface IExtractVkToFileArgs {
+export interface IExtractVerifyingKeyToFileArgs {
     /**
      * File path for poll joining zkey
      */
@@ -210,21 +214,25 @@ export interface IExtractVkToFileArgs {
     /**
      * File path for processMessagesQv zkey
      */
-    processMessagesZkeyPathQv: string;
+    messageProcessorZkeyPathQv: string;
     /**
      * File path for tallyVotesQv zkey
      */
-    tallyVotesZkeyPathQv: string;
+    voteTallyZkeyPathQv: string;
     /**
      * File path for processMessagesNonQv zkey
      */
-    processMessagesZkeyPathNonQv: string;
+    messageProcessorZkeyPathNonQv: string;
+    /**
+     * File path for MessageProcessor zkey
+     */
+    messageProcessorZkeyPathFull: string;
     /**
-     * File path for tallyVotes zkey
+     * File path for VoteTally zkey
      */
-    tallyVotesZkeyPathNonQv: string;
+    voteTallyZkeyPathNonQv: string;
     /**
-     * Output file path of extracted vkeys
+     * Output file path of extracted verifying keys
      */
     outputFilePath: string;
 }

package/build/ts/verifyingKeys/types.d.ts.map

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