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

package/build/ts/testingClass.js

@@ -14,16 +14,16 @@ const user_1 = require("./user");
  * It can be used to deploy and initialize the contracts
  */
 class TestingClass {
-    constructor({ pollJoiningZkeyPath, pollJoinedZkeyPath, processMessagesZkeyPath, tallyVotesZkeyPath, pollWasm, pollWitgen, rapidsnark, }) {
+    constructor({ pollJoiningZkeyPath, pollJoinedZkeyPath, messageProcessorZkeyPath, voteTallyZkeyPath, pollWasm, pollWitnessGenerator, rapidsnark, }) {
         this.contractsData = {
             initialized: false,
         };
         this.pollJoiningZkeyPath = pollJoiningZkeyPath;
         this.pollJoinedZkeyPath = pollJoinedZkeyPath;
-        this.processMessagesZkeyPath = processMessagesZkeyPath;
-        this.tallyVotesZkeyPath = tallyVotesZkeyPath;
+        this.messageProcessorZkeyPath = messageProcessorZkeyPath;
+        this.voteTallyZkeyPath = voteTallyZkeyPath;
         this.pollWasm = pollWasm;
-        this.pollWitgen = pollWitgen;
+        this.pollWitnessGenerator = pollWitnessGenerator;
         this.rapidsnark = rapidsnark;
     }
     static async getInstance(paths) {
@@ -47,32 +47,36 @@ class TestingClass {
         if (this.contractsData.initialized) {
             return;
         }
-        const [signer] = await hardhat_1.default.ethers.getSigners();
+        const [signer] = (await hardhat_1.default.ethers.getSigners());
         const coordinatorKeypair = new domainobjs_1.Keypair();
         const user = new domainobjs_1.Keypair();
-        const { pollJoiningVk, pollJoinedVk, processVk, tallyVk } = await (0, sdk_1.extractAllVks)({
+        const { pollJoiningVerifyingKey, pollJoinedVerifyingKey, processVerifyingKey, tallyVerifyingKey } = await (0, sdk_1.extractAllVerifyingKeys)({
             pollJoiningZkeyPath: this.pollJoiningZkeyPath,
             pollJoinedZkeyPath: this.pollJoinedZkeyPath,
-            processMessagesZkeyPath: this.processMessagesZkeyPath,
-            tallyVotesZkeyPath: this.tallyVotesZkeyPath,
+            messageProcessorZkeyPath: this.messageProcessorZkeyPath,
+            voteTallyZkeyPath: this.voteTallyZkeyPath,
         });
-        const vkRegistry = await (0, sdk_1.deployVkRegistryContract)({ signer });
+        const verifyingKeysRegistry = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ signer });
         await (0, sdk_1.setVerifyingKeys)({
-            vkRegistryAddress: vkRegistry,
+            verifyingKeysRegistryAddress: verifyingKeysRegistry,
             stateTreeDepth: constants_1.STATE_TREE_DEPTH,
-            intStateTreeDepth: constants_1.INT_STATE_TREE_DEPTH,
+            tallyProcessingStateTreeDepth: constants_1.TALLY_PROCESSING_STATE_TREE_DEPTH,
             voteOptionTreeDepth: constants_1.VOTE_OPTION_TREE_DEPTH,
             messageBatchSize: constants_1.MESSAGE_BATCH_SIZE,
-            pollJoiningVk: pollJoiningVk,
-            pollJoinedVk: pollJoinedVk,
-            processMessagesVk: processVk,
-            tallyVotesVk: tallyVk,
+            pollStateTreeDepth: constants_1.POLL_STATE_TREE_DEPTH,
+            pollJoiningVerifyingKey: pollJoiningVerifyingKey,
+            pollJoinedVerifyingKey: pollJoinedVerifyingKey,
+            processMessagesVerifyingKey: processVerifyingKey,
+            tallyVotesVerifyingKey: tallyVerifyingKey,
             mode: sdk_1.EMode.NON_QV,
             signer,
         });
-        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();
         const maciAddresses = await (0, sdk_1.deployMaci)({
             stateTreeDepth: 10,
@@ -87,10 +91,11 @@ class TestingClass {
         const { pollContractAddress } = await (0, sdk_1.deployPoll)({
             pollStartTimestamp: startDate,
             pollEndTimestamp: startDate + 130,
-            intStateTreeDepth: constants_1.INT_STATE_TREE_DEPTH,
+            tallyProcessingStateTreeDepth: constants_1.TALLY_PROCESSING_STATE_TREE_DEPTH,
             messageBatchSize: constants_1.MESSAGE_BATCH_SIZE,
+            stateTreeDepth: constants_1.POLL_STATE_TREE_DEPTH,
             voteOptionTreeDepth: constants_1.VOTE_OPTION_TREE_DEPTH,
-            coordinatorPubKey: coordinatorKeypair.pubKey,
+            coordinatorPublicKey: coordinatorKeypair.publicKey,
             mode: sdk_1.EMode.NON_QV,
             relayers: [await signer.getAddress()],
             signer,
@@ -99,29 +104,28 @@ class TestingClass {
             policyContractAddress: pollPolicyContractAddress,
             initialVoiceCreditProxyContractAddress,
             voteOptions: constants_1.DEFAULT_VOTE_OPTIONS,
-            vkRegistryContractAddress: vkRegistry,
+            verifyingKeysRegistryContractAddress: verifyingKeysRegistry,
         });
         await (0, sdk_1.signup)({
             maciAddress: maciAddresses.maciContractAddress,
-            maciPubKey: user.pubKey.serialize(),
+            maciPublicKey: user.publicKey.serialize(),
             sgData: constants_1.DEFAULT_SG_DATA,
             signer,
         });
-        const { pollStateIndex, voiceCredits, timestamp } = await (0, sdk_1.joinPoll)({
+        const { pollStateIndex, voiceCredits } = await (0, sdk_1.joinPoll)({
             maciAddress: maciAddresses.maciContractAddress,
             pollId: 0n,
-            privateKey: user.privKey.serialize(),
-            stateIndex: 1n,
+            privateKey: user.privateKey.serialize(),
             pollJoiningZkey: this.pollJoiningZkeyPath,
             pollWasm: this.pollWasm,
-            pollWitgen: this.pollWitgen,
+            pollWitnessGenerator: this.pollWitnessGenerator,
             rapidsnark: this.rapidsnark,
             signer,
             useWasm: true,
             sgDataArg: constants_1.DEFAULT_SG_DATA,
             ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
         });
-        const maciState = await (0, sdk_1.genMaciStateFromContract)({
+        const maciState = await (0, sdk_1.generateMaciStateFromContract)({
             provider: signer.provider,
             address: maciAddresses.maciContractAddress,
             coordinatorKeypair,
@@ -130,7 +134,7 @@ class TestingClass {
         this.contractsData.maciState = maciState;
         this.contractsData.maciContractAddress = maciAddresses.maciContractAddress;
         this.contractsData.users = [];
-        this.contractsData.users.push(new user_1.User(user, [], BigInt(voiceCredits), 0n, BigInt(timestamp), BigInt(pollStateIndex)));
+        this.contractsData.users.push(new user_1.User(user, [], BigInt(voiceCredits), 0n, BigInt(pollStateIndex)));
         this.contractsData.initialized = true;
         this.contractsData.polls?.push(pollContractAddress);
     }

package/build/ts/testingClass.js.map

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

package/build/ts/types.d.ts

@@ -1,6 +1,6 @@
-import { genMaciStateFromContract } from "@maci-protocol/sdk";
+import { generateMaciStateFromContract } from "@maci-protocol/sdk";
 import type { User } from "./user";
-import type { MACI, Verifier, VkRegistry, FreeForAllPolicy, ConstantInitialVoiceCreditProxy, IIpfsMessage } from "@maci-protocol/sdk";
+import type { MACI, Verifier, VerifyingKeysRegistry, FreeForAllPolicy, ConstantInitialVoiceCreditProxy, IIpfsMessage } from "@maci-protocol/sdk";
 import type { Signer } from "ethers";
 /**
  * A util interface that represents a vote object
@@ -44,7 +44,7 @@ export interface ITestSuite {
 export interface IDeployedTestContracts {
     maci: MACI;
     verifier: Verifier;
-    vkRegistry: VkRegistry;
+    verifyingKeysRegistry: VerifyingKeysRegistry;
     policy: FreeForAllPolicy;
     initialVoiceCreditProxy: ConstantInitialVoiceCreditProxy;
 }
@@ -55,7 +55,7 @@ export interface IContractsData {
     initialized: boolean;
     users?: User[];
     maciContractAddress?: string;
-    maciState?: Awaited<ReturnType<typeof genMaciStateFromContract>>;
+    maciState?: Awaited<ReturnType<typeof generateMaciStateFromContract>>;
     polls?: string[];
 }
 export interface IRelayTestMessagesArgs {
@@ -65,7 +65,7 @@ export interface IRelayTestMessagesArgs {
     pollId: number;
 }
 /**
- * Interface for the paths to the zkey files and the wasm and witgen files
+ * Interface for the paths to the zkey files and the wasm and witnessGenerator files
  */
 export interface ITestingClassPaths {
     /**
@@ -77,21 +77,21 @@ export interface ITestingClassPaths {
      */
     pollJoinedZkeyPath: string;
     /**
-     * Path to the processMessages zkey file
+     * Path to the MessageProcessor zkey file
      */
-    processMessagesZkeyPath: string;
+    messageProcessorZkeyPath: string;
     /**
-     * Path to the tallyVotes zkey file
+     * Path to the VoteTally zkey file
      */
-    tallyVotesZkeyPath: string;
+    voteTallyZkeyPath: string;
     /**
      * Path to the poll wasm file
      */
     pollWasm: string;
     /**
-     * Path to the poll witgen file
+     * Path to the poll witnessGenerator file
      */
-    pollWitgen: string;
+    pollWitnessGenerator: string;
     /**
      * Path to the rapidsnark file
      */

package/build/ts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../ts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EACV,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,+BAA+B,EAC/B,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,8BAA8B,EAAE,MAAM,CAAC;IACvC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;IAClB,eAAe,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,gBAAgB,CAAC;IACzB,uBAAuB,EAAE,+BAA+B,CAAC;CAC1D;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;IACjE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../ts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EACV,IAAI,EACJ,QAAQ,EACR,qBAAqB,EACrB,gBAAgB,EAChB,+BAA+B,EAC/B,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,8BAA8B,EAAE,MAAM,CAAC;IACvC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;IAClB,eAAe,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;IACnB,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,MAAM,EAAE,gBAAgB,CAAC;IACzB,uBAAuB,EAAE,+BAA+B,CAAC;CAC1D;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC,CAAC;IACtE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,wBAAwB,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB"}

package/build/ts/user.d.ts

@@ -1,4 +1,4 @@
-import { Keypair, type PrivKey } from "@maci-protocol/domainobjs";
+import { Keypair, type PrivateKey } from "@maci-protocol/domainobjs";
 import type { IVote } from "./types";
 /**
  * A class representing a user and its votes
@@ -9,23 +9,19 @@ export declare class User {
     voiceCreditBalance: bigint;
     nonce: bigint;
     stateLeafIndex?: bigint;
-    /**
-     * The timestamp of when the user joined the poll
-     */
-    timestamp?: bigint;
     /**
      * Create a new instance of a UserCommand object
-     * @param _keypair the keypair of the user
+     * @param keypair the keypair of the user
      * @param votes the votes casted by the user
      * @param voiceCreditBalance the voice credit balance of the user
      * @param nonce the nonce of the user
-     * @param timestamp the timestamp of when the user joined the poll
+     * @param stateLeafIndex the state leaf index
      */
-    constructor(_keypair: Keypair, votes: IVote[], voiceCreditBalance: bigint, nonce: bigint, timestamp?: bigint, stateLeafIndex?: bigint);
+    constructor(keypair: Keypair, votes: IVote[], voiceCreditBalance: bigint, nonce: bigint, stateLeafIndex?: bigint);
     /**
      * Helper function that can be used to change the keypair of the user
      * @returns
      */
-    changeKeypair(): PrivKey;
+    changeKeypair(): PrivateKey;
 }
 //# sourceMappingURL=user.d.ts.map

package/build/ts/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../ts/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;GAEG;AACH,qBAAa,IAAI;IACf,OAAO,EAAE,OAAO,CAAC;IAEjB,KAAK,EAAE,KAAK,EAAE,CAAC;IAEf,kBAAkB,EAAE,MAAM,CAAC;IAE3B,KAAK,EAAE,MAAM,CAAC;IAEd,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;OAOG;gBAED,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,EAAE,EACd,kBAAkB,EAAE,MAAM,EAC1B,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,MAAM;IAUzB;;;OAGG;IACH,aAAa,IAAI,OAAO;CAMzB"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../ts/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;GAEG;AACH,qBAAa,IAAI;IACf,OAAO,EAAE,OAAO,CAAC;IAEjB,KAAK,EAAE,KAAK,EAAE,CAAC;IAEf,kBAAkB,EAAE,MAAM,CAAC;IAE3B,KAAK,EAAE,MAAM,CAAC;IAEd,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;;OAOG;gBACS,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM;IAQhH;;;OAGG;IACH,aAAa,IAAI,UAAU;CAM5B"}

package/build/ts/user.js

@@ -8,18 +8,17 @@ const domainobjs_1 = require("@maci-protocol/domainobjs");
 class User {
     /**
      * Create a new instance of a UserCommand object
-     * @param _keypair the keypair of the user
+     * @param keypair the keypair of the user
      * @param votes the votes casted by the user
      * @param voiceCreditBalance the voice credit balance of the user
      * @param nonce the nonce of the user
-     * @param timestamp the timestamp of when the user joined the poll
+     * @param stateLeafIndex the state leaf index
      */
-    constructor(_keypair, votes, voiceCreditBalance, nonce, timestamp, stateLeafIndex) {
-        this.keypair = _keypair;
+    constructor(keypair, votes, voiceCreditBalance, nonce, stateLeafIndex) {
+        this.keypair = keypair;
         this.votes = votes;
         this.voiceCreditBalance = voiceCreditBalance;
         this.nonce = nonce;
-        this.timestamp = timestamp;
         this.stateLeafIndex = stateLeafIndex;
     }
     /**
@@ -28,7 +27,7 @@ class User {
      */
     changeKeypair() {
         const newUserKeypair = new domainobjs_1.Keypair();
-        const oldPrivateKey = this.keypair.privKey;
+        const oldPrivateKey = this.keypair.privateKey;
         this.keypair = !newUserKeypair.equals(this.keypair) ? newUserKeypair : this.keypair;
         return oldPrivateKey;
     }

package/build/ts/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../ts/user.ts"],"names":[],"mappings":";;;AAAA,0DAAkE;AAIlE;;GAEG;AACH,MAAa,IAAI;IAgBf;;;;;;;OAOG;IACH,YACE,QAAiB,EACjB,KAAc,EACd,kBAA0B,EAC1B,KAAa,EACb,SAAkB,EAClB,cAAuB;QAEvB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,MAAM,cAAc,GAAG,IAAI,oBAAO,EAAE,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACpF,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAlDD,oBAkDC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../ts/user.ts"],"names":[],"mappings":";;;AAAA,0DAAqE;AAIrE;;GAEG;AACH,MAAa,IAAI;IAWf;;;;;;;OAOG;IACH,YAAY,OAAgB,EAAE,KAAc,EAAE,kBAA0B,EAAE,KAAa,EAAE,cAAuB;QAC9G,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,MAAM,cAAc,GAAG,IAAI,oBAAO,EAAE,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACpF,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AArCD,oBAqCC"}

package/build/ts/utils.d.ts

@@ -23,16 +23,16 @@ export declare const readJSONFile: <T = Record<string, Record<string, string> |
  * @param presetVotes - the preset votes if any
  * @returns an array of UserCommand objects
  */
-export declare const genTestUserCommands: (numUsers: number, numVotesPerUser: number, bribers?: IBriber[], presetVotes?: IVote[][]) => User[];
+export declare const generateTestUserCommands: (numUsers: number, numVotesPerUser: number, bribers?: IBriber[], presetVotes?: IVote[][]) => User[];
 /**
  * Assertion function to validate that the tally results are as expected
  * @param maxMessages - the max number of messages
  * @param expectedTally - the expected tally values
- * @param expectedPerVOSpentVoiceCredits - the expected per VO spent voice credits
+ * @param expectedPerVoteOptionSpentVoiceCredits - the expected per vote option spent voice credits
  * @param expectedTotalSpentVoiceCredits - the expected total spent voice credits
  * @param tallyFile the tally file itself as an object
  */
-export declare const expectTally: (maxMessages: number, expectedTally: number[], expectedPerVOSpentVoiceCredits: number[], expectedTotalSpentVoiceCredits: number, tallyFile: ITallyData) => void;
+export declare const expectTally: (maxMessages: number, expectedTally: number[], expectedPerVoteOptionSpentVoiceCredits: number[], expectedTotalSpentVoiceCredits: number, tallyFile: ITallyData) => void;
 /**
  * Stop the current thread for x seconds
  * @param ms - the number of ms to sleep for

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../ts/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAQrD,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEtE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,eAAO,MAAM,YAAY,aAAa,CAAC;AAEvC,eAAO,MAAM,WAAW;;;;;;CAMvB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAU,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,EACvF,UAAU,MAAM,KACf,OAAO,CAAC,CAAC,CAQX,CAAC;AAiDF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,MAAM,EAChB,iBAAiB,MAAM,EACvB,UAAU,OAAO,EAAE,EACnB,cAAc,KAAK,EAAE,EAAE,KACtB,IAAI,EAsBN,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,GACtB,aAAa,MAAM,EACnB,eAAe,MAAM,EAAE,EACvB,gCAAgC,MAAM,EAAE,EACxC,gCAAgC,MAAM,EACtC,WAAW,UAAU,KACpB,IAmBF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAU,IAAI,MAAM,KAAG,OAAO,CAAC,IAAI,CAGjD,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,KAAK,QAAO,OAAiC,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAU,MAAM,MAAM,EAAE,MAAM,OAAO,KAAG,OAAO,CAAC,IAAI,CAM/E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAU,oBAAiB,KAAG,OAAO,CAAC,IAAI,CAY3D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,MAAM,EAAE,CACsD,CAAC;AAEnH;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAU,4CAKrC,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAavC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../ts/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAQrD,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEtE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,eAAO,MAAM,YAAY,aAAa,CAAC;AAEvC,eAAO,MAAM,WAAW;;;;;;CAMvB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAU,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,EACvF,UAAU,MAAM,KACf,OAAO,CAAC,CAAC,CAQX,CAAC;AAiDF;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,GACnC,UAAU,MAAM,EAChB,iBAAiB,MAAM,EACvB,UAAU,OAAO,EAAE,EACnB,cAAc,KAAK,EAAE,EAAE,KACtB,IAAI,EAsBN,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,GACtB,aAAa,MAAM,EACnB,eAAe,MAAM,EAAE,EACvB,wCAAwC,MAAM,EAAE,EAChD,gCAAgC,MAAM,EACtC,WAAW,UAAU,KACpB,IAmBF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAU,IAAI,MAAM,KAAG,OAAO,CAAC,IAAI,CAGjD,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,KAAK,QAAO,OAAiC,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAU,MAAM,MAAM,EAAE,MAAM,OAAO,KAAG,OAAO,CAAC,IAAI,CAM/E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAU,oBAAiB,KAAG,OAAO,CAAC,IAAI,CAY3D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,MAAM,EAAE,CACsD,CAAC;AAEnH;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAU,4CAKrC,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAavC,CAAC"}

package/build/ts/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.relayTestMessages = exports.getBackupFilenames = exports.clean = exports.writeBackupFile = exports.isArm = exports.sleep = exports.expectTally = exports.genTestUserCommands = exports.readJSONFile = exports.defaultVote = exports.backupFolder = void 0;
+exports.relayTestMessages = exports.getBackupFilenames = exports.clean = exports.writeBackupFile = exports.isArm = exports.sleep = exports.expectTally = exports.generateTestUserCommands = exports.readJSONFile = exports.defaultVote = exports.backupFolder = void 0;
 // eslint-disable-next-line import/no-extraneous-dependencies
 const domainobjs_1 = require("@maci-protocol/domainobjs");
 const sdk_1 = require("@maci-protocol/sdk");
@@ -76,7 +76,7 @@ const getTestVoteValues = (userIndex, voteIndex, numVotesPerUser, votes, bribers
  * @param presetVotes - the preset votes if any
  * @returns an array of UserCommand objects
  */
-const genTestUserCommands = (numUsers, numVotesPerUser, bribers, presetVotes) => {
+const generateTestUserCommands = (numUsers, numVotesPerUser, bribers, presetVotes) => {
     const usersCommands = [];
     for (let i = 0; i < numUsers; i += 1) {
         const userKeypair = new domainobjs_1.Keypair();
@@ -95,30 +95,30 @@ const genTestUserCommands = (numUsers, numVotesPerUser, bribers, presetVotes) =>
     }
     return usersCommands;
 };
-exports.genTestUserCommands = genTestUserCommands;
+exports.generateTestUserCommands = generateTestUserCommands;
 /**
  * Assertion function to validate that the tally results are as expected
  * @param maxMessages - the max number of messages
  * @param expectedTally - the expected tally values
- * @param expectedPerVOSpentVoiceCredits - the expected per VO spent voice credits
+ * @param expectedPerVoteOptionSpentVoiceCredits - the expected per vote option spent voice credits
  * @param expectedTotalSpentVoiceCredits - the expected total spent voice credits
  * @param tallyFile the tally file itself as an object
  */
-const expectTally = (maxMessages, expectedTally, expectedPerVOSpentVoiceCredits, expectedTotalSpentVoiceCredits, tallyFile) => {
-    const genTally = Array(maxMessages).fill("0");
-    const genPerVOSpentVoiceCredits = Array(maxMessages).fill("0");
+const expectTally = (maxMessages, expectedTally, expectedPerVoteOptionSpentVoiceCredits, expectedTotalSpentVoiceCredits, tallyFile) => {
+    const tally = Array(maxMessages).fill("0");
+    const perVOSpentVoiceCredits = Array(maxMessages).fill("0");
     expectedTally.forEach((voteWeight, voteOption) => {
         if (voteWeight !== 0) {
-            genTally[voteOption] = voteWeight.toString();
+            tally[voteOption] = voteWeight.toString();
         }
     });
-    expectedPerVOSpentVoiceCredits.forEach((spentCredit, index) => {
+    expectedPerVoteOptionSpentVoiceCredits.forEach((spentCredit, index) => {
         if (spentCredit !== 0) {
-            genPerVOSpentVoiceCredits[index] = spentCredit.toString();
+            perVOSpentVoiceCredits[index] = spentCredit.toString();
         }
     });
-    (0, chai_1.expect)(tallyFile.results.tally).to.deep.equal(genTally);
-    (0, chai_1.expect)(tallyFile.perVOSpentVoiceCredits?.tally).to.deep.equal(genPerVOSpentVoiceCredits);
+    (0, chai_1.expect)(tallyFile.results.tally).to.deep.equal(tally);
+    (0, chai_1.expect)(tallyFile.perVoteOptionSpentVoiceCredits?.tally).to.deep.equal(perVOSpentVoiceCredits);
     (0, chai_1.expect)(tallyFile.totalSpentVoiceCredits.spent).to.eq(expectedTotalSpentVoiceCredits.toString());
 };
 exports.expectTally = expectTally;

package/build/ts/utils.js.map

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