@maci-protocol/sdk 0.0.0-ci.fb960ed → 0.0.0-ci.fc91dc9

package/build/ts/verifyingKeys/checkVerifyingKeys.js

@@ -15,13 +15,13 @@ 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, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, processMessagesZkeyPath, tallyVotesZkeyPath, pollJoiningZkeyPath, pollJoinedZkeyPath, verifyingKeysRegistry, signer, useQuadraticVoting = true, }) => {
+    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);
@@ -33,15 +33,15 @@ const checkVerifyingKeys = async ({ stateTreeDepth, intStateTreeDepth, voteOptio
         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)({
+    const { pollJoiningVerifyingKey, pollJoinedVerifyingKey, processVerifyingKey, tallyVerifyingKey } = await (0, utils_2.extractAllVerifyingKeys)({
         processMessagesZkeyPath,
         tallyVotesZkeyPath,
         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,
@@ -49,16 +49,16 @@ const checkVerifyingKeys = async ({ stateTreeDepth, intStateTreeDepth, voteOptio
         intStateTreeDepth,
         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,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,EACrB,MAAM,EACN,kBAAkB,GAAG,IAAI,GACD,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,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,uBAAuB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GAC/F,MAAM,IAAA,+BAAuB,EAAC;QAC5B,uBAAuB;QACvB,kBAAkB;QAClB,mBAAmB;QACnB,kBAAkB;KACnB,CAAC,CAAC;IAEL,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,iBAAK,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAK,CAAC,MAAM,CAAC;IAE1D,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,iBAAiB;QACjB,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;AA/EW,QAAA,kBAAkB,sBA+E7B"}

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, pollStateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, vkRegistryAddress, signer, mode, }: ISetVerifyingKeysArgs) => Promise<void>;
+export declare const setVerifyingKeys: ({ pollJoiningVerifyingKey, pollJoinedVerifyingKey, processMessagesVerifyingKey, tallyVotesVerifyingKey, stateTreeDepth, pollStateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, verifyingKeysRegistryAddress, signer, mode, }: 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":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAMrD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAU,kMAapC,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAyFtC,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,qPAapC,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAsGtC,CAAC"}

package/build/ts/verifyingKeys/setVerifyingKeys.js

@@ -1,7 +1,6 @@
 "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");
@@ -10,7 +9,7 @@ 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, pollStateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, vkRegistryAddress, signer, mode, }) => {
+const setVerifyingKeys = async ({ pollJoiningVerifyingKey, pollJoinedVerifyingKey, processMessagesVerifyingKey, tallyVotesVerifyingKey, stateTreeDepth, pollStateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, verifyingKeysRegistryAddress, signer, mode, }) => {
     // validate args
     if (stateTreeDepth < 1 || intStateTreeDepth < 1 || voteOptionTreeDepth < 1 || messageBatchSize < 1) {
         throw new Error("Invalid depth or batch size parameters");
@@ -18,67 +17,67 @@ const setVerifyingKeys = async ({ pollJoiningVk, pollJoinedVk, processMessagesVk
     if (stateTreeDepth < intStateTreeDepth) {
         throw new Error("Invalid state tree depth or intermediate state tree depth");
     }
-    const vkRegistryContractExists = await (0, utils_1.contractExists)(signer.provider, vkRegistryAddress);
+    const isContractExists = await (0, utils_1.contractExists)(signer.provider, verifyingKeysRegistryAddress);
     // ensure we have a contract deployed at the provided address
-    if (!vkRegistryContractExists) {
-        throw new Error(`A VkRegistry contract is not deployed at ${vkRegistryAddress}`);
+    if (!isContractExists) {
+        throw new Error(`A VerifyingKeysRegistry contract is not deployed at ${verifyingKeysRegistryAddress}`);
     }
-    // connect to VkRegistry contract
-    const vkRegistryContract = typechain_types_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)) {
+    // connect to VerifyingKeysRegistry contract
+    const verifyingKeysRegistryContract = typechain_types_1.VerifyingKeysRegistry__factory.connect(verifyingKeysRegistryAddress, signer);
+    // check if the poll verifyingKey was already set
+    const pollJoiningVerifyingKeySignature = (0, core_1.generatePollJoiningVerifyingKeySignature)(stateTreeDepth);
+    if (await verifyingKeysRegistryContract.isPollJoiningVerifyingKeySet(pollJoiningVerifyingKeySignature)) {
         throw new Error("This poll verifying key is already set in the contract");
     }
-    // check if the poll vk was already set
-    const pollJoinedVkSig = (0, core_1.genPollJoinedVkSig)(stateTreeDepth);
-    if (await vkRegistryContract.isPollJoinedVkSet(pollJoinedVkSig)) {
+    // check if the poll verifyingKey was already set
+    const pollJoinedVerifyingKeySignature = (0, core_1.generatePollJoinedVerifyingKeySignature)(stateTreeDepth);
+    if (await verifyingKeysRegistryContract.isPollJoinedVerifyingKeySet(pollJoinedVerifyingKeySignature)) {
         throw new Error("This poll verifying key is already set in the contract");
     }
-    // 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)) {
+    // check if the process messages verifyingKey was already set
+    const processVerifyingKeySignature = (0, core_1.generateProcessVerifyingKeySignature)(stateTreeDepth, voteOptionTreeDepth, messageBatchSize);
+    if (await verifyingKeysRegistryContract.isProcessVerifyingKeySet(processVerifyingKeySignature, mode)) {
         throw new Error("This process 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)) {
+    // do the same for the tally votes verifyingKey
+    const tallyVerifyingKeySignature = (0, core_1.generateTallyVerifyingKeySignature)(stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth);
+    if (await verifyingKeysRegistryContract.isTallyVerifyingKeySet(tallyVerifyingKeySignature, mode)) {
         throw new Error("This tally verifying key is already set in the contract");
     }
     // set them onchain
-    const tx = await vkRegistryContract.setVerifyingKeysBatch({
+    const tx = await verifyingKeysRegistryContract.setVerifyingKeysBatch({
         stateTreeDepth,
         pollStateTreeDepth,
         intStateTreeDepth,
         voteOptionTreeDepth,
         messageBatchSize,
         modes: [mode],
-        pollJoiningVk: pollJoiningVk.asContractParam(),
-        pollJoinedVk: pollJoinedVk.asContractParam(),
-        processVks: [processMessagesVk.asContractParam()],
-        tallyVks: [tallyVotesVk.asContractParam()],
+        pollJoiningVerifyingKey: pollJoiningVerifyingKey.asContractParam(),
+        pollJoinedVerifyingKey: pollJoinedVerifyingKey.asContractParam(),
+        processVerifyingKeys: [processMessagesVerifyingKey.asContractParam()],
+        tallyVerifyingKeys: [tallyVotesVerifyingKey.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),
+    const [pollJoiningVerifyingKeyOnChain, pollJoinedVerifyingKeyOnChain, processVerifyingKeyOnChain, tallyVerifyingKeyOnChain,] = await Promise.all([
+        verifyingKeysRegistryContract.getPollJoiningVerifyingKey(stateTreeDepth),
+        verifyingKeysRegistryContract.getPollJoinedVerifyingKey(stateTreeDepth),
+        verifyingKeysRegistryContract.getProcessVerifyingKey(stateTreeDepth, voteOptionTreeDepth, messageBatchSize, mode),
+        verifyingKeysRegistryContract.getTallyVerifyingKey(stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, mode),
     ]);
-    if (!(0, utils_2.compareVks)(pollJoiningVkOnChain, pollJoiningVk)) {
-        throw new Error("pollJoiningVk mismatch");
+    if (!(0, utils_2.compareVerifyingKeys)(pollJoiningVerifyingKeyOnChain, pollJoiningVerifyingKey)) {
+        throw new Error("pollJoiningVerifyingKey mismatch");
     }
-    if (!(0, utils_2.compareVks)(pollJoinedVkOnChain, pollJoinedVk)) {
-        throw new Error("pollJoinedVk mismatch");
+    if (!(0, utils_2.compareVerifyingKeys)(pollJoinedVerifyingKeyOnChain, pollJoinedVerifyingKey)) {
+        throw new Error("pollJoinedVerifyingKey mismatch");
     }
-    if (!(0, utils_2.compareVks)(processVkOnChain, processMessagesVk)) {
-        throw new Error("processVk mismatch");
+    if (!(0, utils_2.compareVerifyingKeys)(processVerifyingKeyOnChain, processMessagesVerifyingKey)) {
+        throw new Error("processVerifyingKey mismatch");
     }
-    if (!(0, utils_2.compareVks)(tallyVkOnChain, tallyVotesVk)) {
-        throw new Error("tallyVk mismatch");
+    if (!(0, utils_2.compareVerifyingKeys)(tallyVerifyingKeyOnChain, tallyVotesVerifyingKey)) {
+        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
      */
@@ -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
      */
@@ -79,44 +79,44 @@ export interface IExtractAllVksArgs {
 /**
  * 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 key object
      */
-    processMessagesVk: VerifyingKey;
+    processMessagesVerifyingKey: VerifyingKey;
     /**
-     * The tally votes Vk object
+     * The tally votes verifying key object
      */
-    tallyVotesVk: VerifyingKey;
+    tallyVotesVerifyingKey: VerifyingKey;
     /**
      * The state tree depth
      */
@@ -138,9 +138,9 @@ export interface ISetVerifyingKeysArgs {
      */
     messageBatchSize: number;
     /**
-     * The VkRegistry contract address
+     * The VerifyingKeysRegistry contract address
      */
-    vkRegistryAddress: string;
+    verifyingKeysRegistryAddress: string;
     /**
      * The signer
      */
@@ -191,18 +191,18 @@ export interface ICheckVerifyingKeysArgs {
      */
     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
      */
     useQuadraticVoting?: boolean;
 }
 /**
- * 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
      */
@@ -228,7 +228,7 @@ export interface IExtractVkToFileArgs {
      */
     tallyVotesZkeyPathNonQv: 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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"}

package/build/ts/verifyingKeys/utils.d.ts

@@ -1,29 +1,29 @@
-import { type IVkContractParams, VerifyingKey } from "@maci-protocol/domainobjs";
-import type { IGetAllVksArgs, IExtractAllVksArgs, IMaciVks, IMaciVerifyingKeys, IExtractVkToFileArgs } from "./types";
+import { type IVerifyingKeyContractParams, VerifyingKey } from "@maci-protocol/domainobjs";
+import type { IGetAllVerifyingKeysArgs, IExtractAllVerifyingKeysArgs, IMaciVerifyingKeys, IMaciVerifyingKeysOnchain, IExtractVerifyingKeyToFileArgs } from "./types";
 /**
  * Get all the verifying keys from the contract
- * @param args - The arguments for the getAllVks function
+ * @param args - The arguments for the getAllVerifyingKeys function
  * @returns The verifying keys
  */
-export declare const getAllOnChainVks: ({ vkRegistryAddress, signer, stateTreeDepth, voteOptionTreeDepth, messageBatchSize, intStateTreeDepth, mode, }: IGetAllVksArgs) => Promise<IMaciVerifyingKeys>;
+export declare const getAllOnChainVerifyingKeys: ({ verifyingKeysRegistryAddress, signer, stateTreeDepth, voteOptionTreeDepth, messageBatchSize, intStateTreeDepth, mode, }: IGetAllVerifyingKeysArgs) => Promise<IMaciVerifyingKeysOnchain>;
 /**
  * Compare two verifying keys
- * @param vkOnChain - the verifying key on chain
- * @param vk - the local verifying key
+ * @param verifyingKeyOnChain - the verifying key on chain
+ * @param verifyingKey - the local verifying key
  * @returns whether they are equal or not
  */
-export declare const compareVks: (vkOnChain: VerifyingKey | IVkContractParams, vk?: VerifyingKey | IVkContractParams) => boolean;
+export declare const compareVerifyingKeys: (verifyingKeyOnChain: VerifyingKey | IVerifyingKeyContractParams, verifyingKey?: VerifyingKey | IVerifyingKeyContractParams) => boolean;
 /**
  * Extract all the verifying keys
- * @param args - The arguments for the extractAllVks function
+ * @param args - The arguments for the extractAllVerifyingKeys function
  * @returns The verifying keys
  */
-export declare const extractAllVks: ({ pollJoiningZkeyPath, pollJoinedZkeyPath, processMessagesZkeyPath, tallyVotesZkeyPath, }: IExtractAllVksArgs) => Promise<IMaciVks>;
+export declare const extractAllVerifyingKeys: ({ pollJoiningZkeyPath, pollJoinedZkeyPath, processMessagesZkeyPath, tallyVotesZkeyPath, }: IExtractAllVerifyingKeysArgs) => Promise<IMaciVerifyingKeys>;
 /**
  * Command to confirm that the verifying keys in the contract match the local ones
  * @note 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
  * @param args The arguments for the checkVerifyingKeys command
  * @returns Whether the verifying keys match or not
  */
-export declare const extractVkToFile: ({ processMessagesZkeyPathQv, tallyVotesZkeyPathQv, processMessagesZkeyPathNonQv, pollJoinedZkeyPath, pollJoiningZkeyPath, tallyVotesZkeyPathNonQv, outputFilePath, }: IExtractVkToFileArgs) => Promise<void>;
+export declare const extractVerifyingKeyToFile: ({ processMessagesZkeyPathQv, tallyVotesZkeyPathQv, processMessagesZkeyPathNonQv, pollJoinedZkeyPath, pollJoiningZkeyPath, tallyVotesZkeyPathNonQv, outputFilePath, }: IExtractVerifyingKeyToFileArgs) => Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../ts/verifyingKeys/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIjF,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEtH;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAU,gHAQpC,cAAc,KAAG,OAAO,CAAC,kBAAkB,CAgB7C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,GACrB,WAAW,YAAY,GAAG,iBAAiB,EAC3C,KAAK,YAAY,GAAG,iBAAiB,KACpC,OA2BF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAU,2FAKjC,kBAAkB,KAAG,OAAO,CAAC,QAAQ,CAgBvC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAU,sKAQnC,oBAAoB,KAAG,OAAO,CAAC,IAAI,CAcrC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../ts/verifyingKeys/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,2BAA2B,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAI3F,OAAO,KAAK,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,kBAAkB,EAClB,yBAAyB,EACzB,8BAA8B,EAC/B,MAAM,SAAS,CAAC;AAEjB;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,GAAU,2HAQ9C,wBAAwB,KAAG,OAAO,CAAC,yBAAyB,CAqB9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,qBAAqB,YAAY,GAAG,2BAA2B,EAC/D,eAAe,YAAY,GAAG,2BAA2B,KACxD,OA2BF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAU,2FAK3C,4BAA4B,KAAG,OAAO,CAAC,kBAAkB,CAsB3D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,GAAU,sKAQ7C,8BAA8B,KAAG,OAAO,CAAC,IAAI,CA4B/C,CAAC"}