@maci-protocol/testing 0.0.0-ci.20c52c6 → 0.0.0-ci.22106c8

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 verifyingKeysRegistryAddress;
     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,
+        messageProcessorWitnessGenerator: constants_1.testProcessMessagesWitnessPath,
+        messageProcessorWitnessDatFile: constants_1.testProcessMessagesWitnessDatPath,
+        voteTallyWitnessGenerator: constants_1.testTallyVotesWitnessPath,
+        voteTallyWitnessDatFile: constants_1.testTallyVotesWitnessDatPath,
         coordinatorPrivateKey: constants_1.coordinatorPrivateKey,
-        processWasm: constants_1.testProcessMessagesWasmPath,
-        tallyWasm: constants_1.testTallyVotesWasmPath,
+        messageProcessorWasm: constants_1.testProcessMessagesWasmPath,
+        voteTallyWasm: constants_1.testTallyVotesWasmPath,
         useWasm,
         mode: core_1.EMode.QV,
     };
     // 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 verifying keys registry contract
-        verifyingKeysRegistryAddress = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ 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)), verifyingKeysRegistryAddress });
     });
     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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -96,23 +96,22 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 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.privateKey.serialize(),
-                stateIndex: 1n,
                 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 () => {
@@ -141,7 +140,7 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -190,7 +193,7 @@ describe("e2e tests", function test() {
                     maciAddress: maciAddresses.maciContractAddress,
                     maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -201,16 +204,15 @@ describe("e2e tests", function test() {
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
                     privateKey: users[i].privateKey.serialize(),
-                    stateIndex: BigInt(i + 1),
                     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],
                 });
             }
         });
@@ -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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -474,7 +480,7 @@ describe("e2e tests", function test() {
                     maciAddress: maciAddresses.maciContractAddress,
                     maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -483,16 +489,15 @@ describe("e2e tests", function test() {
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
                 privateKey: users[0].privateKey.serialize(),
-                stateIndex: 1n,
                 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 () => {
@@ -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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -587,7 +596,7 @@ describe("e2e tests", function test() {
                     maciAddress: maciAddresses.maciContractAddress,
                     maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -598,16 +607,15 @@ describe("e2e tests", function test() {
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
                     privateKey: users[i].privateKey.serialize(),
-                    stateIndex: BigInt(i + 1),
                     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],
                 });
             }
         });
@@ -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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -680,7 +692,7 @@ describe("e2e tests", function test() {
                     maciAddress: maciAddresses.maciContractAddress,
                     maciPublicKey: users[i].publicKey.serialize(),
                     sgData: constants_1.DEFAULT_SG_DATA,
-                    signer,
+                    signer: userSigners[i],
                 });
             }
         });
@@ -691,16 +703,15 @@ describe("e2e tests", function test() {
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
                     privateKey: users[i].privateKey.serialize(),
-                    stateIndex: BigInt(i + 1),
                     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],
                 });
             }
         });
@@ -711,7 +722,7 @@ describe("e2e tests", function test() {
                 await (0, sdk_1.publish)({
                     maciAddress: maciAddresses.maciContractAddress,
                     publicKey: users[i].publicKey.serialize(),
-                    stateIndex: 1n,
+                    stateIndex: BigInt(i + 1),
                     voteOptionIndex: 0n,
                     nonce: 1n,
                     pollId: 0n,
@@ -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,8 +828,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -821,22 +836,21 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 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].privateKey.serialize(),
-                stateIndex: 1n,
                 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)({
@@ -855,28 +869,27 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 maciPublicKey: users[1].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[1],
             });
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
                 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].privateKey.serialize(),
-                stateIndex: 2n,
                 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 = [
                 {
@@ -929,8 +942,6 @@ describe("e2e tests", function test() {
                 pollEndTimestamp: startDate + constants_1.pollDuration,
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
-                verifierContractAddress,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -940,13 +951,13 @@ describe("e2e tests", function test() {
                 maciAddress: maciAddresses.maciContractAddress,
                 maciPublicKey: users[3].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[3],
             });
             await (0, sdk_1.signup)({
                 maciAddress: maciAddresses.maciContractAddress,
                 maciPublicKey: users[4].publicKey.serialize(),
                 sgData: constants_1.DEFAULT_SG_DATA,
-                signer,
+                signer: userSigners[4],
             });
         });
         it("should join users", async () => {
@@ -954,31 +965,29 @@ describe("e2e tests", function test() {
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
                 privateKey: users[3].privateKey.serialize(),
-                stateIndex: 4n,
                 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].privateKey.serialize(),
-                stateIndex: 5n,
                 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 () => {
@@ -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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -1110,7 +1123,7 @@ describe("e2e tests", function test() {
                     maciAddress: maciAddresses.maciContractAddress,
                     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)({
@@ -1128,16 +1141,15 @@ describe("e2e tests", function test() {
                 await (0, sdk_1.joinPoll)({
                     maciAddress: maciAddresses.maciContractAddress,
                     privateKey: users[i].privateKey.serialize(),
-                    stateIndex: BigInt(i + 1),
                     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)({
@@ -1215,8 +1227,6 @@ describe("e2e tests", function test() {
                     pollEndTimestamp: startDate + constants_1.pollDuration,
                     relayers: [await signer.getAddress()],
                     maciAddress: maciAddresses.maciContractAddress,
-                    verifierContractAddress,
-                    verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                     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,
-                    verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                     policyContractAddress: pollPolicyContractAddress,
                     initialVoiceCreditProxyContractAddress,
                 });
@@ -1242,21 +1250,21 @@ describe("e2e tests", function test() {
         it("join the second and third polls", async () => {
             // eslint-disable-next-line @typescript-eslint/prefer-for-of
             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].privateKey.serialize(),
-                        stateIndex: BigInt(i + 1),
                         pollId: BigInt(pollId),
-                        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)({
@@ -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,
-                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -1508,12 +1520,11 @@ describe("e2e tests", function test() {
             await (0, sdk_1.joinPoll)({
                 maciAddress: maciAddresses.maciContractAddress,
                 privateKey: user.privateKey.serialize(),
-                stateIndex: 1n,
                 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,