@maci-protocol/sdk 0.0.0-ci.fd7cff6 → 0.0.0-ci.fdc9104

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Barry WhiteHat, Kendrick Tan, Kobi Gurkan, Kirill Goncharov
-Cory Dickson, Han Jian, Chih-Cheng Liang, and Koh Wei Jie
+Copyright (c) 2025 Ethereum Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/package.json

@@ -4,6 +4,7 @@
   "private": false,
   "description": "MACI's SDK",
   "main": "build/ts/index.js",
+  "types": "build/ts/index.d.ts",
   "exports": {
     ".": {
       "types": "./build/ts/index.d.ts",
@@ -14,6 +15,13 @@
       "default": "./build/ts/browser/index.js"
     }
   },
+  "typesVersions": {
+    "*": {
+      "browser": [
+        "./build/ts/browser/index.d.ts"
+      ]
+    }
+  },
   "bin": {
     "maci-sdk": "./build/ts/index.js"
   },
@@ -28,7 +36,7 @@
   "scripts": {
     "watch": "tsc --watch",
     "build": "tsc -p tsconfig.build.json",
-    "postbuild": "cp package.json ./build && mkdir -p ./zkeys",
+    "postbuild": "cp package.json ./build",
     "types": "tsc -p tsconfig.json --noEmit",
     "test": "jest",
     "test:coverage": "pnpm run test --coverage",
@@ -36,21 +44,22 @@
   },
   "dependencies": {
     "@zk-kit/lean-imt": "^2.2.3",
-    "ethers": "^6.13.4",
+    "ethers": "^6.15.0",
     "@maci-protocol/contracts": "^3.0.0",
     "@maci-protocol/core": "^3.0.0",
     "@maci-protocol/crypto": "^3.0.0",
     "@maci-protocol/domainobjs": "^3.0.0",
-    "multiformats": "9.9.0"
+    "multiformats": "9.9.0",
+    "snarkjs": "^0.7.5"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.2",
-    "@types/node": "^22.14.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.2.0",
     "@types/snarkjs": "^0.7.9",
-    "jest": "^29.5.0",
-    "mocha": "^11.1.0",
+    "jest": "^30.2.0",
+    "mocha": "^11.7.2",
     "nyc": "^17.1.0",
-    "ts-jest": "^29.3.0",
-    "typescript": "^5.8.2"
+    "ts-jest": "^29.4.1",
+    "typescript": "^5.9.2"
   }
 }

package/build/ts/browser/index.d.ts

@@ -1,15 +1,15 @@
-export * from "../verifyingKeys";
-export * from "../maci";
-export * from "../relayer";
 export * from "../poll";
-export * from "../proof";
+export * from "../proof/download";
+export * from "../proof/types";
 export * from "../tally";
 export * from "../trees";
 export * from "../vote";
-export * from "../utils";
-export * from "../user";
 export * from "../maciKeys";
-export { EMode, EContracts, EPolicies, EInitialVoiceCreditProxies, extractVk, genProofSnarkjs, formatProofForVerifierContract, verifyProof, cleanThreads, unlinkFile, getBlockTimestamp, genEmptyBallotRoots, } from "@maci-protocol/contracts";
-export type { FullProveResult, IDeployParams, IMergeParams, IProveParams, IVerifyingKeyStruct, SnarkProof, IIpfsMessage, } from "@maci-protocol/contracts";
+export * from "../subgraph";
+export * from "../user/types";
+export { getSignedupUserData, signup, hasUserSignedUp } from "../user/signup";
+export { getJoinedUserData, hasUserJoinedPoll, generateMaciStateTree, getPollJoiningCircuitEvents, joiningCircuitInputs, generateMaciStateTreeWithEndKey, } from "../user/utils";
+export * from "./joinPoll";
+export type { EMode, FullProveResult, IDeployParams, IMergeParams, IProveParams, IVerifyingKeyStruct, SnarkProof, IIpfsMessage, } from "@maci-protocol/contracts";
 export * from "@maci-protocol/contracts/typechain-types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/browser/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,OAAO,EACL,KAAK,EACL,UAAU,EACV,SAAS,EACT,0BAA0B,EAC1B,SAAS,EACT,eAAe,EACf,8BAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAElC,YAAY,EACV,eAAe,EACf,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,YAAY,GACb,MAAM,0BAA0B,CAAC;AAElC,cAAc,0CAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/browser/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,2BAA2B,EAC3B,oBAAoB,EACpB,+BAA+B,GAChC,MAAM,eAAe,CAAC;AAEvB,cAAc,YAAY,CAAC;AAE3B,YAAY,EACV,KAAK,EACL,eAAe,EACf,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,YAAY,GACb,MAAM,0BAA0B,CAAC;AAElC,cAAc,0CAA0C,CAAC"}

package/build/ts/browser/index.js

@@ -14,30 +14,27 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genEmptyBallotRoots = exports.getBlockTimestamp = exports.unlinkFile = exports.cleanThreads = exports.verifyProof = exports.formatProofForVerifierContract = exports.genProofSnarkjs = exports.extractVk = exports.EInitialVoiceCreditProxies = exports.EPolicies = exports.EContracts = exports.EMode = void 0;
-__exportStar(require("../verifyingKeys"), exports);
-__exportStar(require("../maci"), exports);
-__exportStar(require("../relayer"), exports);
+exports.generateMaciStateTreeWithEndKey = exports.joiningCircuitInputs = exports.getPollJoiningCircuitEvents = exports.generateMaciStateTree = exports.hasUserJoinedPoll = exports.getJoinedUserData = exports.hasUserSignedUp = exports.signup = exports.getSignedupUserData = void 0;
 __exportStar(require("../poll"), exports);
-__exportStar(require("../proof"), exports);
+__exportStar(require("../proof/download"), exports);
+__exportStar(require("../proof/types"), exports);
 __exportStar(require("../tally"), exports);
 __exportStar(require("../trees"), exports);
 __exportStar(require("../vote"), exports);
-__exportStar(require("../utils"), exports);
-__exportStar(require("../user"), exports);
 __exportStar(require("../maciKeys"), exports);
-var contracts_1 = require("@maci-protocol/contracts");
-Object.defineProperty(exports, "EMode", { enumerable: true, get: function () { return contracts_1.EMode; } });
-Object.defineProperty(exports, "EContracts", { enumerable: true, get: function () { return contracts_1.EContracts; } });
-Object.defineProperty(exports, "EPolicies", { enumerable: true, get: function () { return contracts_1.EPolicies; } });
-Object.defineProperty(exports, "EInitialVoiceCreditProxies", { enumerable: true, get: function () { return contracts_1.EInitialVoiceCreditProxies; } });
-Object.defineProperty(exports, "extractVk", { enumerable: true, get: function () { return contracts_1.extractVk; } });
-Object.defineProperty(exports, "genProofSnarkjs", { enumerable: true, get: function () { return contracts_1.genProofSnarkjs; } });
-Object.defineProperty(exports, "formatProofForVerifierContract", { enumerable: true, get: function () { return contracts_1.formatProofForVerifierContract; } });
-Object.defineProperty(exports, "verifyProof", { enumerable: true, get: function () { return contracts_1.verifyProof; } });
-Object.defineProperty(exports, "cleanThreads", { enumerable: true, get: function () { return contracts_1.cleanThreads; } });
-Object.defineProperty(exports, "unlinkFile", { enumerable: true, get: function () { return contracts_1.unlinkFile; } });
-Object.defineProperty(exports, "getBlockTimestamp", { enumerable: true, get: function () { return contracts_1.getBlockTimestamp; } });
-Object.defineProperty(exports, "genEmptyBallotRoots", { enumerable: true, get: function () { return contracts_1.genEmptyBallotRoots; } });
+__exportStar(require("../subgraph"), exports);
+__exportStar(require("../user/types"), exports);
+var signup_1 = require("../user/signup");
+Object.defineProperty(exports, "getSignedupUserData", { enumerable: true, get: function () { return signup_1.getSignedupUserData; } });
+Object.defineProperty(exports, "signup", { enumerable: true, get: function () { return signup_1.signup; } });
+Object.defineProperty(exports, "hasUserSignedUp", { enumerable: true, get: function () { return signup_1.hasUserSignedUp; } });
+var utils_1 = require("../user/utils");
+Object.defineProperty(exports, "getJoinedUserData", { enumerable: true, get: function () { return utils_1.getJoinedUserData; } });
+Object.defineProperty(exports, "hasUserJoinedPoll", { enumerable: true, get: function () { return utils_1.hasUserJoinedPoll; } });
+Object.defineProperty(exports, "generateMaciStateTree", { enumerable: true, get: function () { return utils_1.generateMaciStateTree; } });
+Object.defineProperty(exports, "getPollJoiningCircuitEvents", { enumerable: true, get: function () { return utils_1.getPollJoiningCircuitEvents; } });
+Object.defineProperty(exports, "joiningCircuitInputs", { enumerable: true, get: function () { return utils_1.joiningCircuitInputs; } });
+Object.defineProperty(exports, "generateMaciStateTreeWithEndKey", { enumerable: true, get: function () { return utils_1.generateMaciStateTreeWithEndKey; } });
+__exportStar(require("./joinPoll"), exports);
 __exportStar(require("@maci-protocol/contracts/typechain-types"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/browser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,0CAAwB;AACxB,6CAA2B;AAC3B,0CAAwB;AACxB,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,sDAakC;AAZhC,kGAAA,KAAK,OAAA;AACL,uGAAA,UAAU,OAAA;AACV,sGAAA,SAAS,OAAA;AACT,uHAAA,0BAA0B,OAAA;AAC1B,sGAAA,SAAS,OAAA;AACT,4GAAA,eAAe,OAAA;AACf,2HAAA,8BAA8B,OAAA;AAC9B,wGAAA,WAAW,OAAA;AACX,yGAAA,YAAY,OAAA;AACZ,uGAAA,UAAU,OAAA;AACV,8GAAA,iBAAiB,OAAA;AACjB,gHAAA,mBAAmB,OAAA;AAarB,2EAAyD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/browser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,oDAAkC;AAClC,iDAA+B;AAC/B,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,8CAA4B;AAC5B,gDAA8B;AAC9B,yCAA8E;AAArE,6GAAA,mBAAmB,OAAA;AAAE,gGAAA,MAAM,OAAA;AAAE,yGAAA,eAAe,OAAA;AACrD,uCAOuB;AANrB,0GAAA,iBAAiB,OAAA;AACjB,0GAAA,iBAAiB,OAAA;AACjB,8GAAA,qBAAqB,OAAA;AACrB,oHAAA,2BAA2B,OAAA;AAC3B,6GAAA,oBAAoB,OAAA;AACpB,wHAAA,+BAA+B,OAAA;AAGjC,6CAA2B;AAa3B,2EAAyD"}

package/build/ts/browser/joinPoll.d.ts

@@ -0,0 +1,10 @@
+import type { IJoinPollBrowserArgs, IJoinPollData } from "../user/types";
+/**
+ * Join Poll user to the Poll contract
+ * @dev This version is optimised to work on browsers
+ * @dev It uses WASM + accepts already created inclusion proofs
+ * @param {IJoinPollArgs} args - The arguments for the join poll command
+ * @returns {IJoinPollData} The poll state index of the joined user and transaction hash
+ */
+export declare const joinPoll: ({ maciAddress, privateKey, pollId, signer, startBlock, endBlock, blocksPerBatch, pollJoiningZkey, pollJoiningWasm, sgDataArg, ivcpDataArg, inclusionProof, useLatestStateIndex, }: IJoinPollBrowserArgs) => Promise<IJoinPollData>;
+//# sourceMappingURL=joinPoll.d.ts.map

package/build/ts/browser/joinPoll.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"joinPoll.d.ts","sourceRoot":"","sources":["../../../ts/browser/joinPoll.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAQzE;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,GAAU,mLAc5B,oBAAoB,KAAG,OAAO,CAAC,aAAa,CA+F9C,CAAC"}

package/build/ts/browser/joinPoll.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinPoll = void 0;
+/* eslint-disable no-underscore-dangle */
+const typechain_types_1 = require("@maci-protocol/contracts/typechain-types");
+const crypto_1 = require("@maci-protocol/crypto");
+const domainobjs_1 = require("@maci-protocol/domainobjs");
+const utils_1 = require("../user/utils");
+const contracts_1 = require("../utils/contracts");
+const utils_2 = require("./utils");
+/**
+ * Join Poll user to the Poll contract
+ * @dev This version is optimised to work on browsers
+ * @dev It uses WASM + accepts already created inclusion proofs
+ * @param {IJoinPollArgs} args - The arguments for the join poll command
+ * @returns {IJoinPollData} The poll state index of the joined user and transaction hash
+ */
+const joinPoll = async ({ maciAddress, privateKey, pollId, signer, startBlock, endBlock, blocksPerBatch, pollJoiningZkey, pollJoiningWasm, sgDataArg, ivcpDataArg, inclusionProof, useLatestStateIndex, }) => {
+    const validContract = await (0, contracts_1.contractExists)(signer.provider, maciAddress);
+    if (!validContract) {
+        throw new Error("MACI contract does not exist");
+    }
+    if (!domainobjs_1.PrivateKey.isValidSerialized(privateKey)) {
+        throw new Error("Invalid MACI private key");
+    }
+    if (pollId < 0) {
+        throw new Error("Invalid poll id");
+    }
+    const userMaciPrivateKey = domainobjs_1.PrivateKey.deserialize(privateKey);
+    const userMaciPublicKey = new domainobjs_1.Keypair(userMaciPrivateKey).publicKey;
+    const nullifier = (0, crypto_1.poseidon)([BigInt(userMaciPrivateKey.asCircuitInputs()), pollId]);
+    // check if the user has already joined the poll based on the nullifier
+    const hasUserJoinedAlready = await (0, utils_1.hasUserJoinedPoll)({
+        maciAddress,
+        pollId,
+        nullifier,
+        signer,
+    });
+    if (hasUserJoinedAlready) {
+        throw new Error("User has already joined");
+    }
+    const maciContract = typechain_types_1.MACI__factory.connect(maciAddress, signer);
+    const pollContracts = await maciContract.getPoll(pollId);
+    const pollContract = typechain_types_1.Poll__factory.connect(pollContracts.poll, signer);
+    // get the state index from the MACI contract
+    const stateIndex = await maciContract.getStateIndex(userMaciPublicKey.hash()).catch(() => -1n);
+    const stateTreeDepth = await maciContract.stateTreeDepth();
+    let circuitInputs;
+    if (inclusionProof) {
+        circuitInputs = (0, utils_1.joiningCircuitInputs)(inclusionProof, stateTreeDepth, userMaciPrivateKey, userMaciPublicKey, pollId);
+    }
+    else {
+        circuitInputs = await (0, utils_1.getPollJoiningCircuitEvents)({
+            maciContract,
+            stateIndex,
+            pollId,
+            userMaciPrivateKey,
+            signer,
+            startBlock,
+            endBlock,
+            blocksPerBatch,
+        });
+    }
+    const stateRootIndex = useLatestStateIndex
+        ? Number.parseInt((await maciContract.totalSignups()).toString(), 10) - 1
+        : stateIndex;
+    // generate the proof for this batch
+    const { proof } = await (0, utils_2.generateProofSnarkjs)({
+        inputs: circuitInputs,
+        zkeyPath: pollJoiningZkey,
+        wasmPath: pollJoiningWasm,
+    });
+    // submit the message onchain as well as the encryption public key
+    const tx = await pollContract.joinPoll(nullifier, userMaciPublicKey.asContractParam(), stateRootIndex, (0, utils_2.formatProofForVerifierContract)(proof), sgDataArg, ivcpDataArg);
+    const receipt = await tx.wait();
+    if (receipt?.status !== 1) {
+        throw new Error("Transaction failed");
+    }
+    const [{ args }] = await pollContract.queryFilter(pollContract.filters.PollJoined, receipt.blockNumber, receipt.blockNumber);
+    return {
+        pollStateIndex: args._pollStateIndex.toString(),
+        voiceCredits: args._voiceCreditBalance.toString(),
+        nullifier: nullifier.toString(),
+        hash: receipt.hash,
+    };
+};
+exports.joinPoll = joinPoll;
+//# sourceMappingURL=joinPoll.js.map

package/build/ts/browser/joinPoll.js.map

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

package/build/ts/browser/utils.d.ts

@@ -0,0 +1,18 @@
+import { type Groth16Proof } from "snarkjs";
+import type { IGenerateProofOptions, FullProveResult, SnarkProof } from "@maci-protocol/contracts";
+/**
+ * Format a SnarkProof type to an array of strings
+ * which can be passed to the Groth16 verifier contract.
+ * @param proof the SnarkProof to format
+ * @returns an array of strings
+ */
+export declare const formatProofForVerifierContract: (proof: SnarkProof | Groth16Proof) => string[];
+/**
+ * Generate a zk-SNARK proof using snarkjs
+ * @param inputs - the inputs to the circuit
+ * @param zkeyPath - the path to the zkey
+ * @param wasmPath - the path to the wasm witness
+ * @returns the zk-SNARK proof and public signals
+ */
+export declare const generateProofSnarkjs: ({ inputs, zkeyPath, wasmPath, }: IGenerateProofOptions) => Promise<FullProveResult>;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../ts/browser/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEnG;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,GAAI,OAAO,UAAU,GAAG,YAAY,KAAG,MAAM,EAY5D,CAAC;AAE7B;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAU,iCAIxC,qBAAqB,KAAG,OAAO,CAAC,eAAe,CAOjD,CAAC"}

package/build/ts/browser/utils.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateProofSnarkjs = exports.formatProofForVerifierContract = void 0;
+const snarkjs_1 = require("snarkjs");
+/**
+ * Format a SnarkProof type to an array of strings
+ * which can be passed to the Groth16 verifier contract.
+ * @param proof the SnarkProof to format
+ * @returns an array of strings
+ */
+const formatProofForVerifierContract = (proof) => [
+    proof.pi_a[0],
+    proof.pi_a[1],
+    proof.pi_b[0][1],
+    proof.pi_b[0][0],
+    proof.pi_b[1][1],
+    proof.pi_b[1][0],
+    proof.pi_c[0],
+    proof.pi_c[1],
+].map((x) => x.toString());
+exports.formatProofForVerifierContract = formatProofForVerifierContract;
+/**
+ * Generate a zk-SNARK proof using snarkjs
+ * @param inputs - the inputs to the circuit
+ * @param zkeyPath - the path to the zkey
+ * @param wasmPath - the path to the wasm witness
+ * @returns the zk-SNARK proof and public signals
+ */
+const generateProofSnarkjs = async ({ inputs, zkeyPath, wasmPath, }) => {
+    if (!wasmPath) {
+        throw new Error("wasmPath must be specified");
+    }
+    const { proof, publicSignals } = await snarkjs_1.groth16.fullProve(inputs, wasmPath, zkeyPath);
+    return { proof, publicSignals };
+};
+exports.generateProofSnarkjs = generateProofSnarkjs;
+//# sourceMappingURL=utils.js.map

package/build/ts/browser/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../ts/browser/utils.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AAIrD;;;;;GAKG;AACI,MAAM,8BAA8B,GAAG,CAAC,KAAgC,EAAY,EAAE,CAC3F;IACE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACb,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAEb,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACb,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;CACd,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAZhB,QAAA,8BAA8B,kCAYd;AAE7B;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,MAAM,EACN,QAAQ,EACR,QAAQ,GACc,EAA4B,EAAE;IACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,iBAAO,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACrF,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;AAClC,CAAC,CAAC;AAXW,QAAA,oBAAoB,wBAW/B"}

package/build/ts/deploy/index.d.ts

@@ -1,5 +1,6 @@
 export { deployPoll } from "./poll";
-export { deployVkRegistryContract } from "./vkRegistry";
+export { deployVerifyingKeysRegistryContract } from "./verifyingKeysRegistry";
 export { deployMaci } from "./maci";
-export type { IDeployPollArgs, IPollContractsData, IDeployMaciArgs, IMaciContracts, IDeployVkRegistryArgs, } from "./types";
+export { deployFactoryWithLinkedLibraries } from "./utils";
+export type { IDeployPollArgs, IPollContractsData, IDeployMaciArgs, IMaciContracts, IDeployVerifyingKeyRegistryArgs, } from "./types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/deploy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,qBAAqB,GACtB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/deploy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,mCAAmC,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gCAAgC,EAAE,MAAM,SAAS,CAAC;AAE3D,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,+BAA+B,GAChC,MAAM,SAAS,CAAC"}

package/build/ts/deploy/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployMaci = exports.deployVkRegistryContract = exports.deployPoll = void 0;
+exports.deployFactoryWithLinkedLibraries = exports.deployMaci = exports.deployVerifyingKeysRegistryContract = exports.deployPoll = void 0;
 var poll_1 = require("./poll");
 Object.defineProperty(exports, "deployPoll", { enumerable: true, get: function () { return poll_1.deployPoll; } });
-var vkRegistry_1 = require("./vkRegistry");
-Object.defineProperty(exports, "deployVkRegistryContract", { enumerable: true, get: function () { return vkRegistry_1.deployVkRegistryContract; } });
+var verifyingKeysRegistry_1 = require("./verifyingKeysRegistry");
+Object.defineProperty(exports, "deployVerifyingKeysRegistryContract", { enumerable: true, get: function () { return verifyingKeysRegistry_1.deployVerifyingKeysRegistryContract; } });
 var maci_1 = require("./maci");
 Object.defineProperty(exports, "deployMaci", { enumerable: true, get: function () { return maci_1.deployMaci; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "deployFactoryWithLinkedLibraries", { enumerable: true, get: function () { return utils_1.deployFactoryWithLinkedLibraries; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/deploy/index.ts"],"names":[],"mappings":";;;AAAA,+BAAoC;AAA3B,kGAAA,UAAU,OAAA;AACnB,2CAAwD;AAA/C,sHAAA,wBAAwB,OAAA;AACjC,+BAAoC;AAA3B,kGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/deploy/index.ts"],"names":[],"mappings":";;;AAAA,+BAAoC;AAA3B,kGAAA,UAAU,OAAA;AACnB,iEAA8E;AAArE,4IAAA,mCAAmC,OAAA;AAC5C,+BAAoC;AAA3B,kGAAA,UAAU,OAAA;AACnB,iCAA2D;AAAlD,yHAAA,gCAAgC,OAAA"}

package/build/ts/deploy/maci.d.ts

@@ -4,5 +4,5 @@ import type { IDeployMaciArgs, IMaciContracts } from "./types";
  * @param args - The arguments for the MACI contracts deployment
  * @returns The deployed MACI contracts
  */
-export declare const deployMaci: ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddress, messageProcessorFactoryAddress, tallyFactoryAddress, signer, poseidonAddresses, }: IDeployMaciArgs) => Promise<IMaciContracts>;
+export declare const deployMaci: ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddress, messageProcessorFactoryAddress, tallyFactoryAddress, signer, poseidonAddresses, verifier, }: IDeployMaciArgs) => Promise<IMaciContracts>;
 //# sourceMappingURL=maci.d.ts.map

package/build/ts/deploy/maci.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maci.d.ts","sourceRoot":"","sources":["../../../ts/deploy/maci.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAI/D;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAU,8IAQ9B,eAAe,KAAG,OAAO,CAAC,cAAc,CAmF1C,CAAC"}
+{"version":3,"file":"maci.d.ts","sourceRoot":"","sources":["../../../ts/deploy/maci.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAK/D;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAU,wJAS9B,eAAe,KAAG,OAAO,CAAC,cAAc,CA8F1C,CAAC"}

package/build/ts/deploy/maci.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployMaci = void 0;
 const contracts_1 = require("@maci-protocol/contracts");
 const utils_1 = require("./utils");
+const verifyingKeysRegistry_1 = require("./verifyingKeysRegistry");
 /**
  * Deploy the MACI contracts
  * @param args - The arguments for the MACI contracts deployment
  * @returns The deployed MACI contracts
  */
-const deployMaci = async ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddress, messageProcessorFactoryAddress, tallyFactoryAddress, signer, poseidonAddresses, }) => {
-    const emptyBallotRoots = (0, contracts_1.genEmptyBallotRoots)(stateTreeDepth);
+const deployMaci = async ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddress, messageProcessorFactoryAddress, tallyFactoryAddress, signer, poseidonAddresses, verifier, }) => {
+    const emptyBallotRoots = (0, contracts_1.generateEmptyBallotRoots)(stateTreeDepth);
     const { PoseidonT3Contract, PoseidonT4Contract, PoseidonT5Contract, PoseidonT6Contract } = await (0, contracts_1.deployPoseidonContracts)(signer, poseidonAddresses, true);
     const poseidonAddrs = await Promise.all([
         PoseidonT3Contract.getAddress(),
@@ -55,6 +56,9 @@ const deployMaci = async ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddr
         }),
         signer,
     });
+    const verifierContract = verifier || (await (0, contracts_1.deployVerifier)(signer, true));
+    const verifierContractAddress = await verifierContract.getAddress();
+    const verifyingKeysRegistryContractAddress = await (0, verifyingKeysRegistry_1.deployVerifyingKeysRegistryContract)({ signer });
     const maciContractAddress = await (0, utils_1.deployFactoryWithLinkedLibraries)({
         abi: contracts_1.MACI__factory.abi,
         bytecode: contracts_1.MACI__factory.linkBytecode({
@@ -65,12 +69,16 @@ const deployMaci = async ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddr
         }),
         signer,
         args: [
-            pollFactoryContractAddress,
-            messageProcessorFactoryContractAddress,
-            tallyFactoryContractAddress,
-            signupPolicyAddress,
-            stateTreeDepth,
-            emptyBallotRoots,
+            {
+                pollFactory: pollFactoryContractAddress,
+                messageProcessorFactory: messageProcessorFactoryContractAddress,
+                tallyFactory: tallyFactoryContractAddress,
+                signUpPolicy: signupPolicyAddress,
+                verifier: verifierContractAddress,
+                verifyingKeysRegistry: verifyingKeysRegistryContractAddress,
+                stateTreeDepth,
+                emptyBallotRoots,
+            },
         ],
     });
     const policy = contracts_1.IBasePolicy__factory.connect(signupPolicyAddress, signer);
@@ -81,6 +89,8 @@ const deployMaci = async ({ stateTreeDepth, signupPolicyAddress, pollFactoryAddr
         messageProcessorFactoryContractAddress,
         tallyFactoryContractAddress,
         poseidonAddresses: poseidonAddrs,
+        verifierContractAddress,
+        verifyingKeysRegistryContractAddress,
     };
 };
 exports.deployMaci = deployMaci;

package/build/ts/deploy/maci.js.map

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

package/build/ts/deploy/poll.d.ts

@@ -4,5 +4,5 @@ import type { IDeployPollArgs, IPollContractsData } from "./types";
  * @param args - The arguments for the deploy poll command
  * @returns The addresses of the deployed contracts
  */
-export declare const deployPoll: ({ maciAddress, pollStartTimestamp, pollEndTimestamp, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, coordinatorPubKey, verifierContractAddress, vkRegistryContractAddress, mode, policyContractAddress, initialVoiceCreditProxyContractAddress, relayers, voteOptions, initialVoiceCredits, signer, }: IDeployPollArgs) => Promise<IPollContractsData>;
+export declare const deployPoll: ({ maciAddress, pollStartTimestamp, pollEndTimestamp, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize, stateTreeDepth, coordinatorPublicKey, mode, policyContractAddress, initialVoiceCreditProxyContractAddress, relayers, voteOptions, initialVoiceCredits, freeForAllCheckerFactoryAddress, freeForAllPolicyFactoryAddress, initialVoiceCreditProxyFactoryAddress, signer, }: IDeployPollArgs) => Promise<IPollContractsData>;
 //# sourceMappingURL=poll.d.ts.map

package/build/ts/deploy/poll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poll.d.ts","sourceRoot":"","sources":["../../../ts/deploy/poll.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAMnE;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAU,kTAiB9B,eAAe,KAAG,OAAO,CAAC,kBAAkB,CAwH9C,CAAC"}
+{"version":3,"file":"poll.d.ts","sourceRoot":"","sources":["../../../ts/deploy/poll.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAMnE;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAU,qYAmB9B,eAAe,KAAG,OAAO,CAAC,kBAAkB,CAkI9C,CAAC"}

package/build/ts/deploy/poll.js

@@ -4,21 +4,18 @@ exports.deployPoll = void 0;
 const contracts_1 = require("@maci-protocol/contracts");
 const core_1 = require("@maci-protocol/core");
 const domainobjs_1 = require("@maci-protocol/domainobjs");
-const utils_1 = require("../utils");
-const utils_2 = require("./utils");
+const contracts_2 = require("../utils/contracts");
+const utils_1 = require("./utils");
 /**
  * Deploy a poll
  * @param args - The arguments for the deploy poll command
  * @returns The addresses of the deployed contracts
  */
-const deployPoll = async ({ maciAddress, pollStartTimestamp, pollEndTimestamp, intStateTreeDepth, voteOptionTreeDepth, messageBatchSize, coordinatorPubKey, verifierContractAddress, vkRegistryContractAddress, mode, policyContractAddress, initialVoiceCreditProxyContractAddress, relayers, voteOptions, initialVoiceCredits, signer, }) => {
-    if (!vkRegistryContractAddress) {
-        throw new Error("Please provide a VkRegistry contract address");
-    }
+const deployPoll = async ({ maciAddress, pollStartTimestamp, pollEndTimestamp, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize, stateTreeDepth, coordinatorPublicKey, mode, policyContractAddress, initialVoiceCreditProxyContractAddress, relayers, voteOptions, initialVoiceCredits, freeForAllCheckerFactoryAddress, freeForAllPolicyFactoryAddress, initialVoiceCreditProxyFactoryAddress, signer, }) => {
     if (!maciAddress) {
         throw new Error("Please provide a MACI contract address");
     }
-    const isMaciExists = await (0, utils_1.contractExists)(signer.provider, maciAddress);
+    const isMaciExists = await (0, contracts_2.contractExists)(signer.provider, maciAddress);
     if (!isMaciExists) {
         throw new Error("MACI contract does not exist");
     }
@@ -26,12 +23,21 @@ const deployPoll = async ({ maciAddress, pollStartTimestamp, pollEndTimestamp, i
     // check if we have a signupPolicy already deployed or passed as arg
     let signupPolicyContractAddress = policyContractAddress;
     if (!signupPolicyContractAddress) {
-        const [contract] = await (0, contracts_1.deployFreeForAllSignUpPolicy)(signer, true);
+        const checkerFactory = freeForAllCheckerFactoryAddress
+            ? contracts_1.FreeForAllCheckerFactory__factory.connect(freeForAllCheckerFactoryAddress, signer)
+            : undefined;
+        const policyFactory = freeForAllPolicyFactoryAddress
+            ? contracts_1.FreeForAllPolicyFactory__factory.connect(freeForAllPolicyFactoryAddress, signer)
+            : undefined;
+        const [contract] = await (0, contracts_1.deployFreeForAllSignUpPolicy)({ checker: checkerFactory, policy: policyFactory }, signer, true);
         signupPolicyContractAddress = await contract.getAddress();
     }
     let initialVoiceCreditProxyAddress = initialVoiceCreditProxyContractAddress;
     if (!initialVoiceCreditProxyAddress) {
-        const [contract] = await (0, contracts_1.deployConstantInitialVoiceCreditProxy)({ amount: initialVoiceCredits ?? utils_2.DEFAULT_INITIAL_VOICE_CREDITS }, signer, undefined, true);
+        const constantInitialVoiceCreditProxyFactory = initialVoiceCreditProxyFactoryAddress
+            ? contracts_1.ConstantInitialVoiceCreditProxyFactory__factory.connect(initialVoiceCreditProxyFactoryAddress, signer)
+            : await (0, contracts_1.deployConstantInitialVoiceCreditProxyFactory)(signer, true);
+        const contract = await (0, contracts_1.deployConstantInitialVoiceCreditProxy)({ amount: initialVoiceCredits ?? utils_1.DEFAULT_INITIAL_VOICE_CREDITS }, constantInitialVoiceCreditProxyFactory, signer);
         initialVoiceCreditProxyAddress = await contract.getAddress();
     }
     // required arg -> poll duration
@@ -42,7 +48,7 @@ const deployPoll = async ({ maciAddress, pollStartTimestamp, pollEndTimestamp, i
         throw new Error("End date cannot be before start date");
     }
     // required arg -> int state tree depth
-    if (intStateTreeDepth <= 0) {
+    if (tallyProcessingStateTreeDepth <= 0) {
         throw new Error("Int state tree depth cannot be <= 0");
     }
     // required arg -> message tree depth
@@ -58,7 +64,7 @@ const deployPoll = async ({ maciAddress, pollStartTimestamp, pollEndTimestamp, i
         throw new Error("Vote options cannot be greater than the number of leaves in the vote option tree");
     }
     // we check that the coordinator's public key is valid
-    if (!domainobjs_1.PubKey.isValidSerializedPubKey(coordinatorPubKey.serialize())) {
+    if (!domainobjs_1.PublicKey.isValidSerialized(coordinatorPublicKey.serialize())) {
         throw new Error("Invalid MACI public key");
     }
     const receipt = await maciContract
@@ -66,13 +72,12 @@ const deployPoll = async ({ maciAddress, pollStartTimestamp, pollEndTimestamp, i
         startDate: pollStartTimestamp,
         endDate: pollEndTimestamp,
         treeDepths: {
-            intStateTreeDepth,
+            tallyProcessingStateTreeDepth,
             voteOptionTreeDepth,
+            stateTreeDepth,
         },
         messageBatchSize,
-        coordinatorPubKey: coordinatorPubKey.asContractParam(),
-        verifier: verifierContractAddress,
-        vkRegistry: vkRegistryContractAddress,
+        coordinatorPublicKey: coordinatorPublicKey.asContractParam(),
         mode,
         policy: signupPolicyContractAddress,
         initialVoiceCreditProxy: initialVoiceCreditProxyAddress,

package/build/ts/deploy/poll.js.map

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