@maci-protocol/testing 0.0.0-ci.cf26211 → 0.0.0-ci.cf2cc5b

package/build/ts/__tests__/e2e.test.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const contracts_1 = require("@maci-protocol/contracts");
 const core_1 = require("@maci-protocol/core");
 const crypto_1 = require("@maci-protocol/crypto");
 const domainobjs_1 = require("@maci-protocol/domainobjs");
@@ -27,38 +28,33 @@ describe("e2e tests", function test() {
     const useWasm = (0, sdk_1.isArm)();
     this.timeout(900000);
     let maciAddresses;
-    let vkRegistryAddress;
     let initialVoiceCreditProxyContractAddress;
-    let verifierContractAddress;
     let signer;
+    let userSigners;
     const generateProofsArgs = {
         outputDir: constants_1.testProofsDirPath,
         tallyFile: constants_1.testTallyFilePath,
-        tallyZkey: constants_1.tallyVotesTestZkeyPath,
-        processZkey: constants_1.processMessageTestZkeyPath,
+        voteTallyZkey: constants_1.testTallyVotesZkeyPath,
+        messageProcessorZkey: constants_1.testProcessMessageZkeyPath,
         pollId: 0n,
         rapidsnark: constants_1.testRapidsnarkPath,
-        processWitgen: constants_1.testProcessMessagesWitnessPath,
-        processDatFile: constants_1.testProcessMessagesWitnessDatPath,
-        tallyWitgen: constants_1.testTallyVotesWitnessPath,
-        tallyDatFile: constants_1.testTallyVotesWitnessDatPath,
-        coordinatorPrivateKey: constants_1.coordinatorPrivKey,
-        processWasm: constants_1.testProcessMessagesWasmPath,
-        tallyWasm: constants_1.testTallyVotesWasmPath,
+        messageProcessorWitnessGenerator: constants_1.testProcessMessagesWitnessPath,
+        messageProcessorWitnessDatFile: constants_1.testProcessMessagesWitnessDatPath,
+        voteTallyWitnessGenerator: constants_1.testTallyVotesWitnessPath,
+        voteTallyWitnessDatFile: constants_1.testTallyVotesWitnessDatPath,
+        coordinatorPrivateKey: constants_1.coordinatorPrivateKey,
+        messageProcessorWasm: constants_1.testProcessMessagesWasmPath,
+        voteTallyWasm: constants_1.testTallyVotesWasmPath,
         useWasm,
-        useQuadraticVoting: true,
+        mode: core_1.EMode.QV,
     };
-    // before all tests we deploy the vk registry contract and set the verifying keys
+    // before all tests we deploy the verifying keys registry contract and set the verifying keys
     before(async () => {
-        signer = await (0, sdk_1.getDefaultSigner)();
-        // we deploy the vk registry contract
-        vkRegistryAddress = await (0, sdk_1.deployVkRegistryContract)({ signer });
-        const [initialVoiceCreditProxy] = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, signer, undefined, true);
+        const signers = await (0, contracts_1.getSigners)();
+        [signer, ...userSigners] = signers;
+        const constantInitialVoiceCreditProxyFactory = await (0, sdk_1.deployConstantInitialVoiceCreditProxyFactory)(signer, true);
+        const initialVoiceCreditProxy = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, constantInitialVoiceCreditProxyFactory, signer);
         initialVoiceCreditProxyContractAddress = await initialVoiceCreditProxy.getAddress();
-        const verifier = await (0, sdk_1.deployVerifier)(signer, true);
-        verifierContractAddress = await verifier.getAddress();
-        // we set the verifying keys
-        await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)), vkRegistryAddress });
     });
     describe("2 signups (1 after stateAq is merged and logs are fetched), 1 message", () => {
         after(async () => {
@@ -76,6 +72,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -85,8 +87,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -94,38 +94,37 @@ describe("e2e tests", function test() {
         it("should signup one user", async () => {
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: user.pubKey.serialize(),
+                maciPublicKey: user.publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[0],
             });
         });
         it("should join one user", async () => {
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: user.privKey.serialize(),
-                stateIndex: 1n,
+                privateKey: user.privateKey.serialize(),
                 pollId: 0n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                signer,
+                signer: userSigners[0],
             });
         });
         it("should publish one message", async () => {
             await (0, sdk_1.publish)({
-                pubkey: user.pubKey.serialize(),
+                publicKey: user.publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: user.privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: user.privateKey.serialize(),
                 signer,
             });
         });
@@ -139,9 +138,9 @@ describe("e2e tests", function test() {
             });
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: new domainobjs_1.Keypair().pubKey.serialize(),
+                maciPublicKey: new domainobjs_1.Keypair().publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[1],
             });
             await (0, sdk_1.proveOnChain)({ ...constants_1.proveOnChainArgs, maciAddress: maciAddresses.maciContractAddress, signer });
             await (0, sdk_1.verify)({
@@ -167,6 +166,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -176,8 +181,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -188,9 +191,9 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.signup)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    maciPubKey: users[i].pubKey.serialize(),
+                    maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -200,115 +203,114 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    privateKey: users[i].privKey.serialize(),
-                    stateIndex: BigInt(i + 1),
+                    privateKey: users[i].privateKey.serialize(),
                     pollId: 0n,
-                    pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                    useWasm: true,
-                    pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                    useWasm,
+                    pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
         it("should publish eight messages", async () => {
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 2n,
                 pollId: 0n,
                 newVoteWeight: 4n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 2n,
                 pollId: 0n,
                 newVoteWeight: 3n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[1].pubKey.serialize(),
+                publicKey: users[1].publicKey.serialize(),
                 stateIndex: 2n,
                 voteOptionIndex: 2n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[1].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[1].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[2].pubKey.serialize(),
+                publicKey: users[2].publicKey.serialize(),
                 stateIndex: 3n,
                 voteOptionIndex: 2n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[2].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[2].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[3].pubKey.serialize(),
+                publicKey: users[3].publicKey.serialize(),
                 stateIndex: 4n,
                 voteOptionIndex: 2n,
                 nonce: 3n,
                 pollId: 0n,
                 newVoteWeight: 3n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[3].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[3].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[3].pubKey.serialize(),
+                publicKey: users[3].publicKey.serialize(),
                 stateIndex: 4n,
                 voteOptionIndex: 2n,
                 nonce: 2n,
                 pollId: 0n,
                 newVoteWeight: 2n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[3].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[3].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[3].pubKey.serialize(),
+                publicKey: users[3].publicKey.serialize(),
                 stateIndex: 4n,
                 voteOptionIndex: 1n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[3].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[3].privateKey.serialize(),
                 signer,
             });
         });
@@ -317,98 +319,98 @@ describe("e2e tests", function test() {
                 {
                     pollId: 0n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 2n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 4n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 2n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 3n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 9n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[1].privKey,
+                    privateKey: users[1].privateKey,
                     stateIndex: 2n,
                     voteWeight: 9n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[1].pubKey,
+                    newPublicKey: users[1].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[2].privKey,
+                    privateKey: users[2].privateKey,
                     stateIndex: 3n,
                     voteWeight: 9n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[2].pubKey,
+                    newPublicKey: users[2].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 3n,
-                    privateKey: users[3].privKey,
+                    privateKey: users[3].privateKey,
                     stateIndex: 4n,
                     voteWeight: 3n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[3].pubKey,
+                    newPublicKey: users[3].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 2n,
-                    privateKey: users[3].privKey,
+                    privateKey: users[3].privateKey,
                     stateIndex: 4n,
                     voteWeight: 2n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[3].pubKey,
+                    newPublicKey: users[3].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[3].privKey,
+                    privateKey: users[3].privateKey,
                     stateIndex: 4n,
                     voteWeight: 9n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[3].pubKey,
+                    newPublicKey: users[3].publicKey,
                 },
             ];
             const messages = votes
@@ -417,8 +419,8 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 0,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 0, maciAddress: maciAddresses.maciContractAddress });
         });
@@ -452,6 +454,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -461,8 +469,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -472,9 +478,9 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.signup)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    maciPubKey: users[i].pubKey.serialize(),
+                    maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -482,17 +488,16 @@ describe("e2e tests", function test() {
             // eslint-disable-next-line no-await-in-loop
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: users[0].privKey.serialize(),
-                stateIndex: 1n,
+                privateKey: users[0].privateKey.serialize(),
                 pollId: 0n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                signer,
+                signer: userSigners[0],
             });
         });
         it("should publish and relay 12 messages with the same nonce", async () => {
@@ -501,35 +506,35 @@ describe("e2e tests", function test() {
                 .map(() => (0, sdk_1.generateVote)({
                 pollId: 0n,
                 voteOptionIndex: 0n,
-                salt: (0, crypto_1.genRandomSalt)(),
+                salt: (0, crypto_1.generateRandomSalt)(),
                 nonce: 1n,
-                privateKey: users[0].privKey,
+                privateKey: users[0].privateKey,
                 stateIndex: 1n,
                 voteWeight: 9n,
-                coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                 maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                newPubKey: users[0].pubKey,
+                newPublicKey: users[0].publicKey,
             }))
                 .map(({ message, ephemeralKeypair }) => ({
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 0,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 0, maciAddress: maciAddresses.maciContractAddress });
             for (let i = 0; i < 12; i += 1) {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.publish)({
-                    pubkey: users[0].pubKey.serialize(),
+                    publicKey: users[0].publicKey.serialize(),
                     stateIndex: 1n,
                     voteOptionIndex: 0n,
                     nonce: 1n,
                     pollId: 0n,
                     newVoteWeight: 9n,
                     maciAddress: maciAddresses.maciContractAddress,
-                    salt: (0, crypto_1.genRandomSalt)(),
-                    privateKey: users[0].privKey.serialize(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
+                    privateKey: users[0].privateKey.serialize(),
                     signer,
                 });
             }
@@ -564,6 +569,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -573,8 +584,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -585,9 +594,9 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.signup)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    maciPubKey: users[i].pubKey.serialize(),
+                    maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -597,17 +606,16 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    privateKey: users[i].privKey.serialize(),
-                    stateIndex: BigInt(i + 1),
+                    privateKey: users[i].privateKey.serialize(),
                     pollId: 0n,
-                    pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                    useWasm: true,
-                    pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                    useWasm,
+                    pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -617,14 +625,14 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.publish)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    pubkey: users[i].pubKey.serialize(),
+                    publicKey: users[i].publicKey.serialize(),
                     stateIndex: BigInt(i + 1),
                     voteOptionIndex: 0n,
                     nonce: 1n,
                     pollId: 0n,
                     newVoteWeight: 9n,
-                    salt: (0, crypto_1.genRandomSalt)(),
-                    privateKey: users[i].privKey.serialize(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
+                    privateKey: users[i].privateKey.serialize(),
                     signer,
                 });
             }
@@ -657,6 +665,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -666,8 +680,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -678,9 +690,9 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.signup)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    maciPubKey: users[i].pubKey.serialize(),
+                    maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -690,17 +702,16 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    privateKey: users[i].privKey.serialize(),
-                    stateIndex: BigInt(i + 1),
+                    privateKey: users[i].privateKey.serialize(),
                     pollId: 0n,
-                    pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                    useWasm: true,
-                    pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                    useWasm,
+                    pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -710,14 +721,14 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.publish)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    pubkey: users[i].pubKey.serialize(),
-                    stateIndex: 1n,
+                    publicKey: users[i].publicKey.serialize(),
+                    stateIndex: BigInt(i + 1),
                     voteOptionIndex: 0n,
                     nonce: 1n,
                     pollId: 0n,
                     newVoteWeight: 9n,
-                    salt: (0, crypto_1.genRandomSalt)(),
-                    privateKey: users[i].privKey.serialize(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
+                    privateKey: users[i].privateKey.serialize(),
                     signer,
                 });
             }
@@ -727,38 +738,38 @@ describe("e2e tests", function test() {
                 {
                     pollId: 0n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 2n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 5n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 2n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 3n,
-                    privateKey: users[2].privKey,
+                    privateKey: users[2].privateKey,
                     stateIndex: 3n,
                     voteWeight: 9n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[2].pubKey,
+                    newPublicKey: users[2].publicKey,
                 },
                 {
                     pollId: 0n,
                     voteOptionIndex: 3n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 3n,
-                    privateKey: users[3].privKey,
+                    privateKey: users[3].privateKey,
                     stateIndex: 4n,
                     voteWeight: 7n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[3].pubKey,
+                    newPublicKey: users[3].publicKey,
                 },
             ];
             const messages = votes
@@ -767,8 +778,8 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 0,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 0, maciAddress: maciAddresses.maciContractAddress });
         });
@@ -802,6 +813,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -811,85 +828,81 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
             // signup
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: users[0].pubKey.serialize(),
+                maciPublicKey: users[0].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[0],
             });
             // joinPoll
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: users[0].privKey.serialize(),
-                stateIndex: 1n,
+                privateKey: users[0].privateKey.serialize(),
                 pollId: 0n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                signer,
+                signer: userSigners[0],
             });
             // publish
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: users[1].pubKey.serialize(),
+                maciPublicKey: users[1].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[1],
             });
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: users[2].pubKey.serialize(),
+                maciPublicKey: users[2].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[2],
             });
             // joinPoll
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: users[1].privKey.serialize(),
-                stateIndex: 2n,
+                privateKey: users[1].privateKey.serialize(),
                 pollId: 0n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                signer,
+                signer: userSigners[1],
             });
             const votes = [
                 {
                     pollId: 0n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[1].privKey,
+                    privateKey: users[1].privateKey,
                     stateIndex: 2n,
                     voteWeight: 2n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[1].pubKey,
+                    newPublicKey: users[1].publicKey,
                 },
             ];
             const messages = votes
@@ -898,8 +911,8 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 0,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 0, maciAddress: maciAddresses.maciContractAddress });
             const ipfsMessageBackupFiles = await (0, utils_1.getBackupFilenames)();
@@ -929,8 +942,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -938,47 +949,45 @@ describe("e2e tests", function test() {
         it("should signup two new users", async () => {
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: users[3].pubKey.serialize(),
+                maciPublicKey: users[3].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[3],
             });
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: users[4].pubKey.serialize(),
+                maciPublicKey: users[4].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[4],
             });
         });
         it("should join users", async () => {
             // joinPoll
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: users[3].privKey.serialize(),
-                stateIndex: 4n,
+                privateKey: users[3].privateKey.serialize(),
                 pollId: 1n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                signer,
+                signer: userSigners[3],
             });
             // joinPoll
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: users[4].privKey.serialize(),
-                stateIndex: 5n,
+                privateKey: users[4].privateKey.serialize(),
                 pollId: 1n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                signer,
+                signer: userSigners[4],
             });
         });
         it("should relay new messages", async () => {
@@ -986,26 +995,26 @@ describe("e2e tests", function test() {
                 {
                     pollId: 1n,
                     voteOptionIndex: 1n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 9n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
                 {
                     pollId: 1n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[1].privKey,
+                    privateKey: users[1].privateKey,
                     stateIndex: 1n,
                     voteWeight: 5n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[1].pubKey,
+                    newPublicKey: users[1].publicKey,
                 },
             ];
             const messages = votes
@@ -1014,36 +1023,36 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 1,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 1, maciAddress: maciAddresses.maciContractAddress });
         });
         it("should publish a new message from the first poll voter", async () => {
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 1n,
                 newVoteWeight: 7n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
         });
         it("should publish a new message by the new poll voters", async () => {
             await (0, sdk_1.publish)({
-                pubkey: users[1].pubKey.serialize(),
+                publicKey: users[1].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 1n,
                 newVoteWeight: 7n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[1].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[1].privateKey.serialize(),
                 signer,
             });
         });
@@ -1084,6 +1093,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
         });
         it("should run the first poll", async () => {
             const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
@@ -1097,8 +1112,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -1108,14 +1121,14 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.signup)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    maciPubKey: users[i].pubKey.serialize(),
+                    maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
                 // eslint-disable-next-line no-await-in-loop
                 const { isRegistered, stateIndex } = await (0, sdk_1.getSignedupUserData)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    maciPubKey: users[i].pubKey.serialize(),
+                    maciPublicKey: users[i].publicKey.serialize(),
                     signer,
                 });
                 (0, chai_1.expect)(isRegistered).to.eq(true);
@@ -1127,23 +1140,22 @@ describe("e2e tests", function test() {
                 // eslint-disable-next-line no-await-in-loop
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
-                    privateKey: users[i].privKey.serialize(),
-                    stateIndex: BigInt(i + 1),
+                    privateKey: users[i].privateKey.serialize(),
                     pollId: 0n,
-                    pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                    useWasm: true,
-                    pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                    useWasm,
+                    pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
                 // eslint-disable-next-line no-await-in-loop
                 const { isJoined, pollStateIndex } = await (0, sdk_1.getJoinedUserData)({
                     maciAddress: maciAddresses.maciContractAddress,
                     pollId: 0n,
-                    pollPubKey: users[i].pubKey.serialize(),
+                    pollPublicKey: users[i].publicKey.serialize(),
                     signer,
                     startBlock: 0,
                 });
@@ -1152,29 +1164,29 @@ describe("e2e tests", function test() {
             }
             // publish
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
             const votes = [
                 {
                     pollId: 0n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 5n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
             ];
             const messages = votes
@@ -1183,8 +1195,8 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 0,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 0, maciAddress: maciAddresses.maciContractAddress });
             const ipfsMessageBackupFiles = await (0, utils_1.getBackupFilenames)();
@@ -1215,8 +1227,6 @@ describe("e2e tests", function test() {
                     pollEndTimestamp: startDate + constants_1.pollDuration,
                     relayers: [await signer.getAddress()],
                     maciAddress: maciAddresses.maciContractAddress,
-                    verifierContractAddress,
-                    vkRegistryContractAddress: vkRegistryAddress,
                     policyContractAddress: pollPolicyContractAddress,
                     initialVoiceCreditProxyContractAddress,
                 });
@@ -1232,8 +1242,6 @@ describe("e2e tests", function test() {
                     pollEndTimestamp: startDate + constants_1.pollDuration,
                     relayers: [await signer.getAddress()],
                     maciAddress: maciAddresses.maciContractAddress,
-                    verifierContractAddress,
-                    vkRegistryContractAddress: vkRegistryAddress,
                     policyContractAddress: pollPolicyContractAddress,
                     initialVoiceCreditProxyContractAddress,
                 });
@@ -1241,28 +1249,28 @@ describe("e2e tests", function test() {
         });
         it("join the second and third polls", async () => {
             // eslint-disable-next-line @typescript-eslint/prefer-for-of
-            for (let p = 1; p <= 2; p += 1) {
+            for (let pollId = 1; pollId <= 2; pollId += 1) {
+                // eslint-disable-next-line @typescript-eslint/prefer-for-of
                 for (let i = 0; i < users.length; i += 1) {
                     // eslint-disable-next-line no-await-in-loop
                     await (0, sdk_1.joinPoll)({
                         maciAddress: maciAddresses.maciContractAddress,
-                        privateKey: users[i].privKey.serialize(),
-                        stateIndex: BigInt(i + 1),
-                        pollId: BigInt(p),
-                        pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                        useWasm: true,
-                        pollWasm: constants_1.testPollJoiningWasmPath,
-                        pollWitgen: constants_1.testPollJoiningWitnessPath,
+                        privateKey: users[i].privateKey.serialize(),
+                        pollId: BigInt(pollId),
+                        pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                        useWasm,
+                        pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                        pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                         rapidsnark: constants_1.testRapidsnarkPath,
                         sgDataArg: constants_1.DEFAULT_SG_DATA,
                         ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
-                        signer,
+                        signer: userSigners[i],
                     });
                     // eslint-disable-next-line no-await-in-loop
                     const { isJoined, pollStateIndex } = await (0, sdk_1.getJoinedUserData)({
                         maciAddress: maciAddresses.maciContractAddress,
-                        pollId: BigInt(p),
-                        pollPubKey: users[i].pubKey.serialize(),
+                        pollId: BigInt(pollId),
+                        pollPublicKey: users[i].publicKey.serialize(),
                         signer,
                         startBlock: 0,
                     });
@@ -1273,39 +1281,39 @@ describe("e2e tests", function test() {
         });
         it("should publish messages to the second poll", async () => {
             await (0, sdk_1.publish)({
-                pubkey: users[0].pubKey.serialize(),
+                publicKey: users[0].publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 0n,
                 nonce: 1n,
                 pollId: 1n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[0].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[0].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[1].pubKey.serialize(),
+                publicKey: users[1].publicKey.serialize(),
                 stateIndex: 2n,
                 voteOptionIndex: 3n,
                 nonce: 1n,
                 pollId: 1n,
                 newVoteWeight: 1n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[1].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[1].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[2].pubKey.serialize(),
+                publicKey: users[2].publicKey.serialize(),
                 stateIndex: 3n,
                 voteOptionIndex: 5n,
                 nonce: 1n,
                 pollId: 1n,
                 newVoteWeight: 3n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[2].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[2].privateKey.serialize(),
                 signer,
             });
         });
@@ -1314,14 +1322,14 @@ describe("e2e tests", function test() {
                 {
                     pollId: 1n,
                     voteOptionIndex: 0n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[0].privKey,
+                    privateKey: users[0].privateKey,
                     stateIndex: 1n,
                     voteWeight: 3n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[0].pubKey,
+                    newPublicKey: users[0].publicKey,
                 },
             ];
             const messages = votes
@@ -1330,8 +1338,8 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 1,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 1, maciAddress: maciAddresses.maciContractAddress });
         });
@@ -1340,26 +1348,26 @@ describe("e2e tests", function test() {
                 {
                     pollId: 2n,
                     voteOptionIndex: 7n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[4].privKey,
+                    privateKey: users[4].privateKey,
                     stateIndex: 4n,
                     voteWeight: 3n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[4].pubKey,
+                    newPublicKey: users[4].publicKey,
                 },
                 {
                     pollId: 2n,
                     voteOptionIndex: 5n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: users[5].privKey,
+                    privateKey: users[5].privateKey,
                     stateIndex: 5n,
                     voteWeight: 4n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: users[5].pubKey,
+                    newPublicKey: users[5].publicKey,
                 },
             ];
             const messages = votes
@@ -1368,46 +1376,46 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 2,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 2, maciAddress: maciAddresses.maciContractAddress });
         });
         it("should publish messages to the third poll", async () => {
             await (0, sdk_1.publish)({
-                pubkey: users[3].pubKey.serialize(),
+                publicKey: users[3].publicKey.serialize(),
                 stateIndex: 3n,
                 voteOptionIndex: 5n,
                 nonce: 1n,
                 pollId: 2n,
                 newVoteWeight: 3n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[3].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[3].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[4].pubKey.serialize(),
+                publicKey: users[4].publicKey.serialize(),
                 stateIndex: 4n,
                 voteOptionIndex: 7n,
                 nonce: 1n,
                 pollId: 2n,
                 newVoteWeight: 2n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[4].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[4].privateKey.serialize(),
                 signer,
             });
             await (0, sdk_1.publish)({
-                pubkey: users[5].pubKey.serialize(),
+                publicKey: users[5].publicKey.serialize(),
                 stateIndex: 5n,
                 voteOptionIndex: 5n,
                 nonce: 1n,
                 pollId: 2n,
                 newVoteWeight: 9n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: users[5].privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: users[5].privateKey.serialize(),
                 signer,
             });
         });
@@ -1480,6 +1488,12 @@ describe("e2e tests", function test() {
                 signer,
                 signupPolicyAddress: signupPolicyContractAddress,
             });
+            // we set the verifying keys
+            const { verifyingKeysRegistryContractAddress } = maciAddresses;
+            await (0, sdk_1.setVerifyingKeys)({
+                ...(await (0, constants_1.verifyingKeysArgs)(signer)),
+                verifyingKeysRegistryAddress: verifyingKeysRegistryContractAddress,
+            });
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
             await (0, sdk_1.deployPoll)({
@@ -1489,8 +1503,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -1498,7 +1510,7 @@ describe("e2e tests", function test() {
         it("should signup one user", async () => {
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
-                maciPubKey: user.pubKey.serialize(),
+                maciPublicKey: user.publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
                 signer,
             });
@@ -1507,13 +1519,12 @@ describe("e2e tests", function test() {
             // joinPoll
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
-                privateKey: user.privKey.serialize(),
-                stateIndex: 1n,
+                privateKey: user.privateKey.serialize(),
                 pollId: 0n,
-                pollJoiningZkey: constants_1.pollJoiningTestZkeyPath,
-                useWasm: true,
-                pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
+                useWasm,
+                pollJoiningWasm: constants_1.testPollJoiningWasmPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -1522,15 +1533,15 @@ describe("e2e tests", function test() {
         });
         it("should publish one message", async () => {
             await (0, sdk_1.publish)({
-                pubkey: user.pubKey.serialize(),
+                publicKey: user.publicKey.serialize(),
                 stateIndex: 1n,
                 voteOptionIndex: 5n,
                 nonce: 1n,
                 pollId: 0n,
                 newVoteWeight: 3n,
                 maciAddress: maciAddresses.maciContractAddress,
-                salt: (0, crypto_1.genRandomSalt)(),
-                privateKey: user.privKey.serialize(),
+                salt: (0, crypto_1.generateRandomSalt)(),
+                privateKey: user.privateKey.serialize(),
                 signer,
             });
         });
@@ -1539,14 +1550,14 @@ describe("e2e tests", function test() {
                 {
                     pollId: 0n,
                     voteOptionIndex: 5n,
-                    salt: (0, crypto_1.genRandomSalt)(),
+                    salt: (0, crypto_1.generateRandomSalt)(),
                     nonce: 1n,
-                    privateKey: user.privKey,
+                    privateKey: user.privateKey,
                     stateIndex: 1n,
                     voteWeight: 5n,
-                    coordinatorPubKey: constants_1.coordinatorKeypair.pubKey,
+                    coordinatorPublicKey: constants_1.coordinatorKeypair.publicKey,
                     maxVoteOption: BigInt(core_1.VOTE_OPTION_TREE_ARITY ** constants_1.deployPollArgs.voteOptionTreeDepth),
-                    newPubKey: user.pubKey,
+                    newPublicKey: user.publicKey,
                 },
             ];
             const messages = votes
@@ -1555,8 +1566,8 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 poll: 0,
                 data: message.data.map(String),
-                publicKey: ephemeralKeypair.pubKey.asArray().map(String),
-                hash: message.hash(ephemeralKeypair.pubKey).toString(),
+                publicKey: ephemeralKeypair.publicKey.asArray().map(String),
+                hash: message.hash(ephemeralKeypair.publicKey).toString(),
             }));
             await (0, utils_1.relayTestMessages)({ messages, signer, pollId: 0, maciAddress: maciAddresses.maciContractAddress });
         });
@@ -1567,7 +1578,7 @@ describe("e2e tests", function test() {
             await (0, sdk_1.generateMaciState)({
                 maciAddress: maciAddresses.maciContractAddress,
                 outputPath: stateOutPath,
-                coordinatorPrivateKey: constants_1.coordinatorPrivKey,
+                coordinatorPrivateKey: constants_1.coordinatorPrivateKey,
                 blockPerBatch: 50,
                 pollId: 0n,
                 signer,