@maci-protocol/testing 0.0.0-ci.f4bc8a6 → 0.0.0-ci.f4e2c46

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

@@ -27,38 +27,38 @@ describe("e2e tests", function test() {
     const useWasm = (0, sdk_1.isArm)();
     this.timeout(900000);
     let maciAddresses;
-    let vkRegistryAddress;
+    let verifyingKeysRegistryAddress;
     let initialVoiceCreditProxyContractAddress;
     let verifierContractAddress;
     let signer;
     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 });
+        // 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);
         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 });
+        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 () => {
@@ -66,9 +66,9 @@ describe("e2e tests", function test() {
         });
         const user = new domainobjs_1.Keypair();
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -86,7 +86,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -94,7 +94,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,
             });
@@ -102,13 +102,12 @@ describe("e2e tests", function test() {
         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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -117,15 +116,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: 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,7 +138,7 @@ 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,
             });
@@ -157,9 +156,9 @@ describe("e2e tests", function test() {
         });
         const users = [new domainobjs_1.Keypair(), new domainobjs_1.Keypair(), new domainobjs_1.Keypair(), new domainobjs_1.Keypair()];
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -177,7 +176,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -188,7 +187,7 @@ 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,
                 });
@@ -200,13 +199,12 @@ 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,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                     useWasm: true,
                     pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -216,99 +214,99 @@ describe("e2e tests", function test() {
         });
         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 +315,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 +415,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 });
         });
@@ -442,9 +440,9 @@ describe("e2e tests", function test() {
         });
         const users = Array.from({ length: 30 }, () => new domainobjs_1.Keypair());
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -462,7 +460,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -472,7 +470,7 @@ 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,
                 });
@@ -482,13 +480,12 @@ 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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -501,35 +498,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,
                 });
             }
@@ -554,9 +551,9 @@ describe("e2e tests", function test() {
         });
         const users = Array.from({ length: 30 }, () => new domainobjs_1.Keypair());
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -574,7 +571,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -585,7 +582,7 @@ 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,
                 });
@@ -597,13 +594,12 @@ 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,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                     useWasm: true,
                     pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -617,14 +613,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,
                 });
             }
@@ -647,9 +643,9 @@ describe("e2e tests", function test() {
         });
         const users = Array.from({ length: 30 }, () => new domainobjs_1.Keypair());
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -667,7 +663,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -678,7 +674,7 @@ 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,
                 });
@@ -690,13 +686,12 @@ 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,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                     useWasm: true,
                     pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -710,14 +705,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: 1n,
                     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 +722,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 +762,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 });
         });
@@ -792,9 +787,9 @@ describe("e2e tests", function test() {
         });
         const users = Array.from({ length: 5 }, () => new domainobjs_1.Keypair());
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -812,27 +807,26 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 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,
             });
             // 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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -840,39 +834,38 @@ 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,
             });
             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,
             });
             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,
             });
             // 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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -882,14 +875,14 @@ describe("e2e tests", function test() {
                 {
                     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 +891,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)();
@@ -918,7 +911,7 @@ describe("e2e tests", function test() {
             await (0, utils_1.clean)();
         });
         it("should deploy a new poll", async () => {
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
@@ -930,7 +923,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -938,13 +931,13 @@ 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,
             });
             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,
             });
@@ -953,13 +946,12 @@ describe("e2e tests", function test() {
             // 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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -968,13 +960,12 @@ describe("e2e tests", function test() {
             // 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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -986,26 +977,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 +1005,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,
             });
         });
@@ -1076,7 +1067,7 @@ describe("e2e tests", function test() {
             await (0, utils_1.clean)();
         });
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -1086,7 +1077,7 @@ describe("e2e tests", function test() {
             });
         });
         it("should run the first poll", async () => {
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             // deploy a poll contract
@@ -1098,7 +1089,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -1108,14 +1099,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,
                 });
                 // 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,13 +1118,12 @@ 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,
+                    pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                     useWasm: true,
                     pollWasm: constants_1.testPollJoiningWasmPath,
-                    pollWitgen: constants_1.testPollJoiningWitnessPath,
+                    pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                     rapidsnark: constants_1.testRapidsnarkPath,
                     sgDataArg: constants_1.DEFAULT_SG_DATA,
                     ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -1143,7 +1133,7 @@ describe("e2e tests", function test() {
                 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 +1142,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 +1173,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)();
@@ -1205,7 +1195,7 @@ describe("e2e tests", function test() {
         it("should deploy two more polls", async () => {
             const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
             {
-                const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+                const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
                 const pollPolicyContractAddress = await pollPolicy.getAddress();
                 // deploy a poll contract
                 await (0, sdk_1.deployPoll)({
@@ -1216,13 +1206,13 @@ describe("e2e tests", function test() {
                     relayers: [await signer.getAddress()],
                     maciAddress: maciAddresses.maciContractAddress,
                     verifierContractAddress,
-                    vkRegistryContractAddress: vkRegistryAddress,
+                    verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                     policyContractAddress: pollPolicyContractAddress,
                     initialVoiceCreditProxyContractAddress,
                 });
             }
             {
-                const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+                const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
                 const pollPolicyContractAddress = await pollPolicy.getAddress();
                 // deploy a poll contract
                 await (0, sdk_1.deployPoll)({
@@ -1233,7 +1223,7 @@ describe("e2e tests", function test() {
                     relayers: [await signer.getAddress()],
                     maciAddress: maciAddresses.maciContractAddress,
                     verifierContractAddress,
-                    vkRegistryContractAddress: vkRegistryAddress,
+                    verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                     policyContractAddress: pollPolicyContractAddress,
                     initialVoiceCreditProxyContractAddress,
                 });
@@ -1241,18 +1231,18 @@ 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,
+                        privateKey: users[i].privateKey.serialize(),
+                        pollId: BigInt(pollId),
+                        pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                         useWasm: true,
                         pollWasm: constants_1.testPollJoiningWasmPath,
-                        pollWitgen: constants_1.testPollJoiningWitnessPath,
+                        pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                         rapidsnark: constants_1.testRapidsnarkPath,
                         sgDataArg: constants_1.DEFAULT_SG_DATA,
                         ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -1261,8 +1251,8 @@ describe("e2e tests", function test() {
                     // 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 +1263,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 +1304,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 +1320,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 +1330,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 +1358,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,
             });
         });
@@ -1470,9 +1460,9 @@ describe("e2e tests", function test() {
             }
         });
         before(async () => {
-            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const signupPolicyContractAddress = await signupPolicy.getAddress();
-            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
+            const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
             const pollPolicyContractAddress = await pollPolicy.getAddress();
             // deploy the smart contracts
             maciAddresses = await (0, sdk_1.deployMaci)({
@@ -1490,7 +1480,7 @@ describe("e2e tests", function test() {
                 relayers: [await signer.getAddress()],
                 maciAddress: maciAddresses.maciContractAddress,
                 verifierContractAddress,
-                vkRegistryContractAddress: vkRegistryAddress,
+                verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
                 policyContractAddress: pollPolicyContractAddress,
                 initialVoiceCreditProxyContractAddress,
             });
@@ -1498,7 +1488,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 +1497,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,
+                pollJoiningZkey: constants_1.testPollJoiningZkeyPath,
                 useWasm: true,
                 pollWasm: constants_1.testPollJoiningWasmPath,
-                pollWitgen: constants_1.testPollJoiningWitnessPath,
+                pollWitnessGenerator: constants_1.testPollJoiningWitnessPath,
                 rapidsnark: constants_1.testRapidsnarkPath,
                 sgDataArg: constants_1.DEFAULT_SG_DATA,
                 ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
@@ -1522,15 +1511,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 +1528,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 +1544,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 +1556,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,