@maci-protocol/domainobjs 0.0.0-ci.2df0337 → 0.0.0-ci.2ff3d96

package/LICENSE

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

package/build/ts/ballot.d.ts

@@ -7,12 +7,13 @@ export declare class Ballot {
     votes: bigint[];
     nonce: bigint;
     voteOptionTreeDepth: number;
+    totalVoteOptions: number;
     /**
      * Create a new Ballot instance
-     * @param _numVoteOptions How many vote options are available in the poll
-     * @param _voteOptionTreeDepth The depth of the merkle tree holding the vote options
+     * @param totalVoteOptions How many vote options are available in the poll
+     * @param voteOptionTreeDepth The depth of the merkle tree holding the vote options
      */
-    constructor(_numVoteOptions: number, _voteOptionTreeDepth: number);
+    constructor(totalVoteOptions: number, voteOptionTreeDepth: number);
     /**
      * Generate an hash of this ballot
      * @returns The hash of the ballot
@@ -42,18 +43,18 @@ export declare class Ballot {
     equals(b: Ballot): boolean;
     /**
      * Generate a random ballot
-     * @param numVoteOptions How many vote options are available
+     * @param totalVoteOptions How many vote options are available
      * @param voteOptionTreeDepth How deep is the merkle tree holding the vote options
      * @returns a random Ballot
      */
-    static genRandomBallot(numVoteOptions: number, voteOptionTreeDepth: number): Ballot;
+    static generateRandom(totalVoteOptions: number, voteOptionTreeDepth: number): Ballot;
     /**
      * Generate a blank ballot
-     * @param numVoteOptions How many vote options are available
+     * @param totalVoteOptions How many vote options are available
      * @param voteOptionTreeDepth How deep is the merkle tree holding the vote options
      * @returns a Blank Ballot object
      */
-    static genBlankBallot(numVoteOptions: number, voteOptionTreeDepth: number): Ballot;
+    static generateBlank(totalVoteOptions: number, voteOptionTreeDepth: number): Ballot;
     /**
      * Serialize to a JSON object
      */

package/build/ts/ballot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ballot.d.ts","sourceRoot":"","sources":["../../ts/ballot.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;GAGG;AACH,qBAAa,MAAM;IACjB,KAAK,EAAE,MAAM,EAAE,CAAM;IAErB,KAAK,SAAa;IAElB,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;OAIG;gBACS,eAAe,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM;IASjE;;;OAGG;IACH,IAAI,QAAO,MAAM,CAGf;IAEF;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAmB;IAEjD;;;;OAIG;IACH,OAAO,QAAO,MAAM,EAAE,CAUpB;IAEF;;;OAGG;IACH,IAAI,QAAO,MAAM,CAMf;IAEF;;;;OAIG;IACH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAK1B;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;IAMnF;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;IAKlF;;OAEG;IACH,MAAM,IAAI,WAAW;IAQrB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM;CAM3C"}
+{"version":3,"file":"ballot.d.ts","sourceRoot":"","sources":["../../ts/ballot.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;GAGG;AACH,qBAAa,MAAM;IACjB,KAAK,EAAE,MAAM,EAAE,CAAM;IAErB,KAAK,SAAa;IAElB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;gBACS,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM;IAYjE;;;OAGG;IACH,IAAI,QAAO,MAAM,CAGf;IAEF;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAmB;IAEjD;;;;OAIG;IACH,OAAO,QAAO,MAAM,EAAE,CAWpB;IAEF;;;OAGG;IACH,IAAI,QAAO,MAAM,CAMf;IAEF;;;;OAIG;IACH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAK1B;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;IAMpF;;;;;OAKG;IACH,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;IAInF;;OAEG;IACH,MAAM,IAAI,WAAW;IAQrB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM;CAM3C"}

package/build/ts/ballot.js

@@ -13,10 +13,10 @@ const assert_1 = __importDefault(require("assert"));
 class Ballot {
     /**
      * Create a new Ballot instance
-     * @param _numVoteOptions How many vote options are available in the poll
-     * @param _voteOptionTreeDepth The depth of the merkle tree holding the vote options
+     * @param totalVoteOptions How many vote options are available in the poll
+     * @param voteOptionTreeDepth The depth of the merkle tree holding the vote options
      */
-    constructor(_numVoteOptions, _voteOptionTreeDepth) {
+    constructor(totalVoteOptions, voteOptionTreeDepth) {
         this.votes = [];
         this.nonce = BigInt(0);
         /**
@@ -41,11 +41,11 @@ class Ballot {
             const lastIndex = this.votes.length - 1;
             const foundIndex = this.votes.findIndex((_, index) => this.votes[lastIndex - index] !== BigInt(0));
             const lastIndexToInsert = foundIndex < 0 ? -1 : lastIndex - foundIndex;
-            const voTree = new crypto_1.IncrementalQuinTree(this.voteOptionTreeDepth, BigInt(0), 5, crypto_1.hash5);
+            const voteTree = new crypto_1.IncrementalQuinTree(this.voteOptionTreeDepth, BigInt(0), 5, crypto_1.hash5);
             for (let i = 0; i <= lastIndexToInsert; i += 1) {
-                voTree.insert(this.votes[i]);
+                voteTree.insert(this.votes[i]);
             }
-            return [this.nonce, voTree.root];
+            return [this.nonce, voteTree.root];
         };
         /**
          * Create a deep clone of this Ballot
@@ -57,11 +57,12 @@ class Ballot {
             b.nonce = BigInt(this.nonce.toString());
             return b;
         };
-        this.voteOptionTreeDepth = _voteOptionTreeDepth;
-        (0, assert_1.default)(5 ** _voteOptionTreeDepth >= _numVoteOptions);
-        (0, assert_1.default)(_numVoteOptions >= 0);
-        for (let i = 0; i < _numVoteOptions; i += 1) {
-            this.votes.push(BigInt(0));
+        (0, assert_1.default)(5 ** voteOptionTreeDepth >= totalVoteOptions);
+        (0, assert_1.default)(totalVoteOptions >= 0);
+        this.voteOptionTreeDepth = voteOptionTreeDepth;
+        this.totalVoteOptions = totalVoteOptions;
+        for (let i = 0; i < totalVoteOptions; i += 1) {
+            this.votes.push(0n);
         }
     }
     /**
@@ -75,24 +76,23 @@ class Ballot {
     }
     /**
      * Generate a random ballot
-     * @param numVoteOptions How many vote options are available
+     * @param totalVoteOptions How many vote options are available
      * @param voteOptionTreeDepth How deep is the merkle tree holding the vote options
      * @returns a random Ballot
      */
-    static genRandomBallot(numVoteOptions, voteOptionTreeDepth) {
-        const ballot = new Ballot(numVoteOptions, voteOptionTreeDepth);
-        ballot.nonce = (0, crypto_1.genRandomSalt)();
+    static generateRandom(totalVoteOptions, voteOptionTreeDepth) {
+        const ballot = new Ballot(totalVoteOptions, voteOptionTreeDepth);
+        ballot.nonce = (0, crypto_1.generateRandomSalt)();
         return ballot;
     }
     /**
      * Generate a blank ballot
-     * @param numVoteOptions How many vote options are available
+     * @param totalVoteOptions How many vote options are available
      * @param voteOptionTreeDepth How deep is the merkle tree holding the vote options
      * @returns a Blank Ballot object
      */
-    static genBlankBallot(numVoteOptions, voteOptionTreeDepth) {
-        const ballot = new Ballot(numVoteOptions, voteOptionTreeDepth);
-        return ballot;
+    static generateBlank(totalVoteOptions, voteOptionTreeDepth) {
+        return new Ballot(totalVoteOptions, voteOptionTreeDepth);
     }
     /**
      * Serialize to a JSON object

package/build/ts/ballot.js.map

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

package/build/ts/commands/{PCommand.d.ts → VoteCommand.d.ts}

@@ -4,14 +4,14 @@ import type { PrivateKey } from "../privateKey";
 import { Message } from "../message";
 import { PublicKey } from "../publicKey";
 export interface IDecryptMessage {
-    command: PCommand;
+    command: VoteCommand;
     signature: Signature;
 }
 /**
  * @notice Unencrypted data whose fields include the user's public key, vote etc.
  * This represents a Vote command.
  */
-export declare class PCommand {
+export declare class VoteCommand {
     stateIndex: bigint;
     newPublicKey: PublicKey;
     voteOptionIndex: bigint;
@@ -20,7 +20,7 @@ export declare class PCommand {
     pollId: bigint;
     salt: bigint;
     /**
-     * Create a new PCommand
+     * Create a new VoteCommand
      * @param stateIndex the state index of the user
      * @param newPublicKey the new public key of the user
      * @param voteOptionIndex the index of the vote option
@@ -31,10 +31,10 @@ export declare class PCommand {
      */
     constructor(stateIndex: bigint, newPublicKey: PublicKey, voteOptionIndex: bigint, newVoteWeight: bigint, nonce: bigint, pollId: bigint, salt?: bigint);
     /**
-     * Create a deep clone of this PCommand
-     * @returns a copy of the PCommand
+     * Create a deep clone of this VoteCommand
+     * @returns a copy of the VoteCommand
      */
-    copy: <T extends PCommand>() => T;
+    copy: <T extends VoteCommand>() => T;
     /**
      * @notice Returns this Command as an array. Note that 5 of the Command's fields
      * are packed into a single 250-bit value. This allows Messages to be
@@ -43,7 +43,7 @@ export declare class PCommand {
      */
     asArray: () => bigint[];
     asCircuitInputs: () => bigint[];
-    equals: (command: PCommand) => boolean;
+    equals: (command: VoteCommand) => boolean;
     hash: () => bigint;
     /**
      * @notice Signs this command and returns a Signature.
@@ -80,10 +80,10 @@ export declare class PCommand {
      */
     toJSON(): IJsonPCommand;
     /**
-     * Deserialize into a PCommand instance
+     * Deserialize into a VoteCommand instance
      * @param json
-     * @returns a PCommand instance
+     * @returns a VoteCommand instance
      */
-    static fromJSON(json: IJsonPCommand): PCommand;
+    static fromJSON(json: IJsonPCommand): VoteCommand;
 }
-//# sourceMappingURL=PCommand.d.ts.map
+//# sourceMappingURL=VoteCommand.d.ts.map

package/build/ts/commands/VoteCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"VoteCommand.d.ts","sourceRoot":"","sources":["../../../ts/commands/VoteCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,SAAS,EACd,KAAK,aAAa,EAGnB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,SAAS,CAAC;IAExB,eAAe,EAAE,MAAM,CAAC;IAExB,aAAa,EAAE,MAAM,CAAC;IAEtB,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;;;OASG;gBAED,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,MAA6B;IAkBrC;;;OAGG;IACH,IAAI,GAAI,CAAC,SAAS,WAAW,OAAK,CAAC,CASf;IAEpB;;;;;OAKG;IACH,OAAO,QAAO,MAAM,EAAE,CAcpB;IAEF,eAAe,QAAO,MAAM,EAAE,CAAmB;IAKjD,MAAM,GAAI,SAAS,WAAW,KAAG,OAAO,CAOX;IAE7B,IAAI,QAAO,MAAM,CAA0B;IAE3C;;OAEG;IACH,IAAI,GAAI,YAAY,UAAU,KAAG,SAAS,CAAiD;IAE3F;;;;OAIG;IACH,eAAe,GAAI,WAAW,SAAS,EAAE,WAAW,SAAS,KAAG,OAAO,CACd;IAEzD;;;;;;;;;OASG;IACH,OAAO,GAAI,WAAW,SAAS,EAAE,WAAW,aAAa,KAAG,OAAO,CAUjE;IAEF;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,GAAI,SAAS,OAAO,EAAE,WAAW,aAAa,EAAE,eAAa,KAAG,eAAe,CAyC3F;IAEF;;OAEG;IACH,MAAM,IAAI,aAAa;IAYvB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW;CAalD"}

package/build/ts/commands/{PCommand.js → VoteCommand.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.PCommand = void 0;
+exports.VoteCommand = void 0;
 const crypto_1 = require("@maci-protocol/crypto");
 const assert_1 = __importDefault(require("assert"));
 const message_1 = require("../message");
@@ -12,9 +12,9 @@ const publicKey_1 = require("../publicKey");
  * @notice Unencrypted data whose fields include the user's public key, vote etc.
  * This represents a Vote command.
  */
-class PCommand {
+class VoteCommand {
     /**
-     * Create a new PCommand
+     * Create a new VoteCommand
      * @param stateIndex the state index of the user
      * @param newPublicKey the new public key of the user
      * @param voteOptionIndex the index of the vote option
@@ -23,12 +23,12 @@ class PCommand {
      * @param pollId the poll ID
      * @param salt the salt of the message
      */
-    constructor(stateIndex, newPublicKey, voteOptionIndex, newVoteWeight, nonce, pollId, salt = (0, crypto_1.genRandomSalt)()) {
+    constructor(stateIndex, newPublicKey, voteOptionIndex, newVoteWeight, nonce, pollId, salt = (0, crypto_1.generateRandomSalt)()) {
         /**
-         * Create a deep clone of this PCommand
-         * @returns a copy of the PCommand
+         * Create a deep clone of this VoteCommand
+         * @returns a copy of the VoteCommand
          */
-        this.copy = () => new PCommand(BigInt(this.stateIndex.toString()), this.newPublicKey.copy(), BigInt(this.voteOptionIndex.toString()), BigInt(this.newVoteWeight.toString()), BigInt(this.nonce.toString()), BigInt(this.pollId.toString()), BigInt(this.salt.toString()));
+        this.copy = () => new VoteCommand(BigInt(this.stateIndex.toString()), this.newPublicKey.copy(), BigInt(this.voteOptionIndex.toString()), BigInt(this.newVoteWeight.toString()), BigInt(this.nonce.toString()), BigInt(this.pollId.toString()), BigInt(this.salt.toString()));
         /**
          * @notice Returns this Command as an array. Note that 5 of the Command's fields
          * are packed into a single 250-bit value. This allows Messages to be
@@ -62,13 +62,13 @@ class PCommand {
         /**
          * @notice Signs this command and returns a Signature.
          */
-        this.sign = (privateKey) => (0, crypto_1.sign)(privateKey.rawPrivKey.toString(), this.hash());
+        this.sign = (privateKey) => (0, crypto_1.sign)(privateKey.raw.toString(), this.hash());
         /**
          * @notice Returns true if the given signature is a correct signature of this
          * command and signed by the private key associated with the given public
          * key.
          */
-        this.verifySignature = (signature, publicKey) => (0, crypto_1.verifySignature)(this.hash(), signature, publicKey.rawPubKey);
+        this.verifySignature = (signature, publicKey) => (0, crypto_1.verifySignature)(this.hash(), signature, publicKey.raw);
         /**
          * @notice Encrypts this command along with a signature to produce a Message.
          * To save gas, we can constrain the following values to 50 bits and pack
@@ -115,16 +115,16 @@ class PCommand {
         };
     }
     /**
-     * Deserialize into a PCommand instance
+     * Deserialize into a VoteCommand instance
      * @param json
-     * @returns a PCommand instance
+     * @returns a VoteCommand instance
      */
     static fromJSON(json) {
-        const command = new PCommand(BigInt(json.stateIndex), publicKey_1.PublicKey.deserialize(json.newPublicKey), BigInt(json.voteOptionIndex), BigInt(json.newVoteWeight), BigInt(json.nonce), BigInt(json.pollId), BigInt(json.salt));
+        const command = new VoteCommand(BigInt(json.stateIndex), publicKey_1.PublicKey.deserialize(json.newPublicKey), BigInt(json.voteOptionIndex), BigInt(json.newVoteWeight), BigInt(json.nonce), BigInt(json.pollId), BigInt(json.salt));
         return command;
     }
 }
-exports.PCommand = PCommand;
+exports.VoteCommand = VoteCommand;
 /**
  * Decrypts a Message to produce a Command.
  * @dev You can force decrypt the message by setting `force` to true.
@@ -133,11 +133,11 @@ exports.PCommand = PCommand;
  * @param sharedKey - the shared key to use for decryption
  * @param force - whether to force decryption or not
  */
-PCommand.decrypt = (message, sharedKey, force = false) => {
+VoteCommand.decrypt = (message, sharedKey, force = false) => {
     const decrypted = force
         ? (0, crypto_1.poseidonDecryptWithoutCheck)(message.data, sharedKey, BigInt(0), 7)
         : (0, crypto_1.poseidonDecrypt)(message.data, sharedKey, BigInt(0), 7);
-    const p = BigInt(decrypted[0].toString());
+    const data = BigInt(decrypted[0].toString());
     // Returns the value of the 50 bits at position `pos` in `val`
     // create 50 '1' bits
     // shift left by pos
@@ -146,26 +146,26 @@ PCommand.decrypt = (message, sharedKey, force = false) => {
     const extract = (val, pos) => 
     // eslint-disable-next-line no-bitwise
     BigInt((((BigInt(1) << BigInt(50)) - BigInt(1)) << BigInt(pos)) & val) >> BigInt(pos);
-    // p is a packed value
+    // data is a packed value
     // bits 0 - 50:    stateIndex
     // bits 51 - 100:  voteOptionIndex
     // bits 101 - 150: newVoteWeight
     // bits 151 - 200: nonce
     // bits 201 - 250: pollId
-    const stateIndex = extract(p, 0);
-    const voteOptionIndex = extract(p, 50);
-    const newVoteWeight = extract(p, 100);
-    const nonce = extract(p, 150);
-    const pollId = extract(p, 200);
+    const stateIndex = extract(data, 0);
+    const voteOptionIndex = extract(data, 50);
+    const newVoteWeight = extract(data, 100);
+    const nonce = extract(data, 150);
+    const pollId = extract(data, 200);
     // create new public key but allow it to be invalid (as when passing an mismatched
     // encryptionPublicKey, a message will not decrypt resulting in potentially invalid public keys)
     const newPublicKey = new publicKey_1.PublicKey([decrypted[1], decrypted[2]], true);
     const salt = decrypted[3];
-    const command = new PCommand(stateIndex, newPublicKey, voteOptionIndex, newVoteWeight, nonce, pollId, salt);
+    const command = new VoteCommand(stateIndex, newPublicKey, voteOptionIndex, newVoteWeight, nonce, pollId, salt);
     const signature = {
         R8: [decrypted[4], decrypted[5]],
         S: decrypted[6],
     };
     return { command, signature };
 };
-//# sourceMappingURL=PCommand.js.map
+//# sourceMappingURL=VoteCommand.js.map

package/build/ts/commands/VoteCommand.js.map

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

package/build/ts/commands/index.d.ts

@@ -1,3 +1,3 @@
-export { PCommand } from "./PCommand";
+export { VoteCommand } from "./VoteCommand";
 export type { IJsonTCommand, IJsonPCommand } from "./types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC"}

package/build/ts/commands/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PCommand = void 0;
-var PCommand_1 = require("./PCommand");
-Object.defineProperty(exports, "PCommand", { enumerable: true, get: function () { return PCommand_1.PCommand; } });
+exports.VoteCommand = void 0;
+var VoteCommand_1 = require("./VoteCommand");
+Object.defineProperty(exports, "VoteCommand", { enumerable: true, get: function () { return VoteCommand_1.VoteCommand; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/commands/index.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/commands/index.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAAnC,0GAAA,WAAW,OAAA"}

package/build/ts/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,cAAc,WAA2B,CAAC;AACvD,eAAO,MAAM,kBAAkB,QAAwB,CAAC;AACxD,eAAO,MAAM,MAAM,WAAwB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,cAAc,WAA4B,CAAC;AACxD,eAAO,MAAM,kBAAkB,QAAwB,CAAC;AACxD,eAAO,MAAM,MAAM,WAAiC,CAAC"}

package/build/ts/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.padKey = exports.blankStateLeafHash = exports.blankStateLeaf = void 0;
 const publicKey_1 = require("./publicKey");
 const stateLeaf_1 = require("./stateLeaf");
-exports.blankStateLeaf = stateLeaf_1.StateLeaf.genBlankLeaf();
+exports.blankStateLeaf = stateLeaf_1.StateLeaf.generateBlank();
 exports.blankStateLeafHash = exports.blankStateLeaf.hash();
-exports.padKey = publicKey_1.PublicKey.genPadKey();
+exports.padKey = publicKey_1.PublicKey.generatePaddingKey();
 //# sourceMappingURL=constants.js.map

package/build/ts/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,2CAAwC;AAE3B,QAAA,cAAc,GAAG,qBAAS,CAAC,YAAY,EAAE,CAAC;AAC1C,QAAA,kBAAkB,GAAG,sBAAc,CAAC,IAAI,EAAE,CAAC;AAC3C,QAAA,MAAM,GAAG,qBAAS,CAAC,SAAS,EAAE,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,2CAAwC;AAE3B,QAAA,cAAc,GAAG,qBAAS,CAAC,aAAa,EAAE,CAAC;AAC3C,QAAA,kBAAkB,GAAG,sBAAc,CAAC,IAAI,EAAE,CAAC;AAC3C,QAAA,MAAM,GAAG,qBAAS,CAAC,kBAAkB,EAAE,CAAC"}

package/build/ts/index.d.ts

@@ -5,7 +5,8 @@ export { PublicKey, SERIALIZED_PUB_KEY_PREFIX } from "./publicKey";
 export { Keypair } from "./keyPair";
 export { StateLeaf } from "./stateLeaf";
 export { blankStateLeaf, blankStateLeafHash, padKey } from "./constants";
-export type { Proof, IStateLeaf, VoteOptionTreeLeaf, IJsonKeyPair, IJsonPrivateKey, IJsonPublicKey, IJsonStateLeaf, IG1ContractParams, IG2ContractParams, IVkContractParams, IVkObjectParams, IStateLeafContractParams, IMessageContractParams, IJsonBallot, } from "./types";
-export { type IJsonTCommand, type IJsonPCommand, PCommand } from "./commands";
 export { VerifyingKey } from "./verifyingKey";
+export { VoteCounts } from "./voteCounts";
+export type { Proof, IStateLeaf, VoteOptionTreeLeaf, IJsonKeyPair, IJsonPrivateKey, IJsonPublicKey, IJsonStateLeaf, IG1ContractParams, IG2ContractParams, IVerifyingKeyContractParams, IVerifyingKeyObjectParams, IStateLeafContractParams, IMessageContractParams, IJsonBallot, IJsonVoteCounts, } from "./types";
+export { type IJsonTCommand, type IJsonPCommand, VoteCommand } from "./commands";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAEzE,YAAY,EACV,KAAK,EACL,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,sBAAsB,EACtB,WAAW,GACZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,YAAY,EACV,KAAK,EACL,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EACtB,WAAW,EACX,eAAe,GAChB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC"}

package/build/ts/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerifyingKey = exports.PCommand = exports.padKey = exports.blankStateLeafHash = exports.blankStateLeaf = exports.StateLeaf = exports.Keypair = exports.SERIALIZED_PUB_KEY_PREFIX = exports.PublicKey = exports.SERIALIZED_PRIV_KEY_PREFIX = exports.PrivateKey = exports.Message = exports.Ballot = void 0;
+exports.VoteCommand = exports.VoteCounts = exports.VerifyingKey = exports.padKey = exports.blankStateLeafHash = exports.blankStateLeaf = exports.StateLeaf = exports.Keypair = exports.SERIALIZED_PUB_KEY_PREFIX = exports.PublicKey = exports.SERIALIZED_PRIV_KEY_PREFIX = exports.PrivateKey = exports.Message = exports.Ballot = void 0;
 var ballot_1 = require("./ballot");
 Object.defineProperty(exports, "Ballot", { enumerable: true, get: function () { return ballot_1.Ballot; } });
 var message_1 = require("./message");
@@ -19,8 +19,10 @@ var constants_1 = require("./constants");
 Object.defineProperty(exports, "blankStateLeaf", { enumerable: true, get: function () { return constants_1.blankStateLeaf; } });
 Object.defineProperty(exports, "blankStateLeafHash", { enumerable: true, get: function () { return constants_1.blankStateLeafHash; } });
 Object.defineProperty(exports, "padKey", { enumerable: true, get: function () { return constants_1.padKey; } });
-var commands_1 = require("./commands");
-Object.defineProperty(exports, "PCommand", { enumerable: true, get: function () { return commands_1.PCommand; } });
 var verifyingKey_1 = require("./verifyingKey");
 Object.defineProperty(exports, "VerifyingKey", { enumerable: true, get: function () { return verifyingKey_1.VerifyingKey; } });
+var voteCounts_1 = require("./voteCounts");
+Object.defineProperty(exports, "VoteCounts", { enumerable: true, get: function () { return voteCounts_1.VoteCounts; } });
+var commands_1 = require("./commands");
+Object.defineProperty(exports, "VoteCommand", { enumerable: true, get: function () { return commands_1.VoteCommand; } });
 //# sourceMappingURL=index.js.map

package/build/ts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AAEf,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAEhB,2CAAsE;AAA7D,wGAAA,UAAU,OAAA;AAAE,wHAAA,0BAA0B,OAAA;AAE/C,yCAAmE;AAA1D,sGAAA,SAAS,OAAA;AAAE,sHAAA,yBAAyB,OAAA;AAE7C,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAEhB,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAElB,yCAAyE;AAAhE,2GAAA,cAAc,OAAA;AAAE,+GAAA,kBAAkB,OAAA;AAAE,mGAAA,MAAM,OAAA;AAmBnD,uCAA8E;AAA7B,oGAAA,QAAQ,OAAA;AAEzD,+CAA8C;AAArC,4GAAA,YAAY,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,2CAAsE;AAA7D,wGAAA,UAAU,OAAA;AAAE,wHAAA,0BAA0B,OAAA;AAC/C,yCAAmE;AAA1D,sGAAA,SAAS,OAAA;AAAE,sHAAA,yBAAyB,OAAA;AAC7C,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,yCAAyE;AAAhE,2GAAA,cAAc,OAAA;AAAE,+GAAA,kBAAkB,OAAA;AAAE,mGAAA,MAAM,OAAA;AACnD,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AAoBnB,uCAAiF;AAAhC,uGAAA,WAAW,OAAA"}

package/build/ts/keyPair.d.ts

@@ -1,4 +1,4 @@
-import { EcdhSharedKey } from "@maci-protocol/crypto";
+import { type EcdhSharedKey } from "@maci-protocol/crypto";
 import type { IJsonKeyPair } from "./types";
 import { PrivateKey } from "./privateKey";
 import { PublicKey } from "./publicKey";
@@ -28,7 +28,7 @@ export declare class Keypair {
      * @param publicKey
      * @returns
      */
-    static genEcdhSharedKey(privateKey: PrivateKey, publicKey: PublicKey): EcdhSharedKey;
+    static generateEcdhSharedKey(privateKey: PrivateKey, publicKey: PublicKey): EcdhSharedKey;
     /**
      * Check whether two Keypairs are equal
      * @param keypair the keypair to compare with

package/build/ts/keyPair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyPair.d.ts","sourceRoot":"","sources":["../../ts/keyPair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA2C,MAAM,uBAAuB,CAAC;AAI/F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;;GAKG;AACH,qBAAa,OAAO;IAClB,UAAU,EAAE,UAAU,CAAC;IAEvB,SAAS,EAAE,SAAS,CAAC;IAErB;;;;OAIG;gBACS,UAAU,CAAC,EAAE,UAAU;IAWnC;;;OAGG;IACH,IAAI,QAAO,OAAO,CAAwC;IAE1D;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa;IAIpF;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAcjC;;OAEG;IACH,MAAM,IAAI,YAAY;IAOtB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;CAG7C"}
+{"version":3,"file":"keyPair.d.ts","sourceRoot":"","sources":["../../ts/keyPair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA6D,MAAM,uBAAuB,CAAC;AAItH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;;GAKG;AACH,qBAAa,OAAO;IAClB,UAAU,EAAE,UAAU,CAAC;IAEvB,SAAS,EAAE,SAAS,CAAC;IAErB;;;;OAIG;gBACS,UAAU,CAAC,EAAE,UAAU;IAWnC;;;OAGG;IACH,IAAI,QAAO,OAAO,CAAwC;IAE1D;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa;IAIzF;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAajC;;OAEG;IACH,MAAM,IAAI,YAAY;IAOtB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;CAG7C"}

package/build/ts/keyPair.js

@@ -28,12 +28,12 @@ class Keypair {
         this.copy = () => new Keypair(this.privateKey.copy());
         if (privateKey) {
             this.privateKey = privateKey;
-            this.publicKey = new publicKey_1.PublicKey((0, crypto_1.genPubKey)(privateKey.rawPrivKey));
+            this.publicKey = new publicKey_1.PublicKey((0, crypto_1.generatePublicKey)(privateKey.raw));
         }
         else {
-            const rawKeyPair = (0, crypto_1.genKeypair)();
-            this.privateKey = new privateKey_1.PrivateKey(rawKeyPair.privateKey);
-            this.publicKey = new publicKey_1.PublicKey(rawKeyPair.publicKey);
+            const rawKeypair = (0, crypto_1.generateKeypair)();
+            this.privateKey = new privateKey_1.PrivateKey(rawKeypair.privateKey);
+            this.publicKey = new publicKey_1.PublicKey(rawKeypair.publicKey);
         }
     }
     /**
@@ -42,8 +42,8 @@ class Keypair {
      * @param publicKey
      * @returns
      */
-    static genEcdhSharedKey(privateKey, publicKey) {
-        return (0, crypto_1.genEcdhSharedKey)(privateKey.rawPrivKey, publicKey.rawPubKey);
+    static generateEcdhSharedKey(privateKey, publicKey) {
+        return (0, crypto_1.generateEcdhSharedKey)(privateKey.raw, publicKey.raw);
     }
     /**
      * Check whether two Keypairs are equal
@@ -51,14 +51,13 @@ class Keypair {
      * @returns whether they are equal or not
      */
     equals(keypair) {
-        const equalPrivKey = this.privateKey.rawPrivKey === keypair.privateKey.rawPrivKey;
-        const equalPubKey = this.publicKey.rawPubKey[0] === keypair.publicKey.rawPubKey[0] &&
-            this.publicKey.rawPubKey[1] === keypair.publicKey.rawPubKey[1];
+        const equalPrivateKey = this.privateKey.raw === keypair.privateKey.raw;
+        const equalPublic = this.publicKey.raw[0] === keypair.publicKey.raw[0] && this.publicKey.raw[1] === keypair.publicKey.raw[1];
         // If this assertion fails, something is very wrong and this function
         // should not return anything
         // eslint-disable-next-line no-bitwise
-        (0, assert_1.default)(!(+equalPrivKey ^ +equalPubKey));
-        return equalPrivKey;
+        (0, assert_1.default)(!(+equalPrivateKey ^ +equalPublic));
+        return equalPrivateKey;
     }
     /**
      * Serialize into a JSON object

package/build/ts/keyPair.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyPair.js","sourceRoot":"","sources":["../../ts/keyPair.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+F;AAE/F,oDAA4B;AAI5B,6CAA0C;AAC1C,2CAAwC;AAExC;;;;;GAKG;AACH,MAAa,OAAO;IAKlB;;;;OAIG;IACH,YAAY,UAAuB;QAWnC;;;WAGG;QACH,SAAI,GAAG,GAAY,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAdxD,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAA,kBAAS,EAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,IAAA,mBAAU,GAAE,CAAC;YAChC,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACxD,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAQD;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,UAAsB,EAAE,SAAoB;QAClE,OAAO,IAAA,yBAAgB,EAAC,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAgB;QACrB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAClF,MAAM,WAAW,GACf,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEjE,qEAAqE;QACrE,6BAA6B;QAC7B,sCAAsC;QACtC,IAAA,gBAAM,EAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;QAExC,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;YACvC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;SACtC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAkB;QAChC,OAAO,IAAI,OAAO,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF;AA1ED,0BA0EC"}
+{"version":3,"file":"keyPair.js","sourceRoot":"","sources":["../../ts/keyPair.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAsH;AAEtH,oDAA4B;AAI5B,6CAA0C;AAC1C,2CAAwC;AAExC;;;;;GAKG;AACH,MAAa,OAAO;IAKlB;;;;OAIG;IACH,YAAY,UAAuB;QAWnC;;;WAGG;QACH,SAAI,GAAG,GAAY,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAdxD,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAA,0BAAiB,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,IAAA,wBAAe,GAAE,CAAC;YACrC,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACxD,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAQD;;;;;OAKG;IACH,MAAM,CAAC,qBAAqB,CAAC,UAAsB,EAAE,SAAoB;QACvE,OAAO,IAAA,8BAAqB,EAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAgB;QACrB,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;QACvE,MAAM,WAAW,GACf,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE3G,qEAAqE;QACrE,6BAA6B;QAC7B,sCAAsC;QACtC,IAAA,gBAAM,EAAC,CAAC,CAAC,CAAC,eAAe,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;QAE3C,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;YACvC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;SACtC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAkB;QAChC,OAAO,IAAI,OAAO,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF;AAzED,0BAyEC"}

package/build/ts/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../ts/message.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEtD;;GAEG;AACH,qBAAa,OAAO;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf,MAAM,CAAC,WAAW,SAAM;IAExB;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE;IAK1B;;;OAGG;IACH,OAAO,CAAC,OAAO,CAA6B;IAE5C;;;OAGG;IACH,eAAe,QAAO,sBAAsB,CAEzC;IAEH;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAmB;IAEjD;;;;OAIG;IACH,IAAI,GAAI,qBAAqB,SAAS,KAAG,MAAM,CAA6D;IAE5G;;;OAGG;IACH,IAAI,QAAO,OAAO,CAAoE;IAEtF;;;;OAIG;IACH,MAAM,GAAI,GAAG,OAAO,KAAG,OAAO,CAM5B;IAEF;;OAEG;IACH,MAAM,IAAI,sBAAsB;IAIhC;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO;CAGvD"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../ts/message.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEtD;;GAEG;AACH,qBAAa,OAAO;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf,MAAM,CAAC,WAAW,SAAM;IAExB;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE;IAK1B;;;OAGG;IACH,OAAO,CAAC,OAAO,CAA6B;IAE5C;;;OAGG;IACH,eAAe,QAAO,sBAAsB,CAEzC;IAEH;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAmB;IAEjD;;;;OAIG;IACH,IAAI,GAAI,qBAAqB,SAAS,KAAG,MAAM,CAAuD;IAEtG;;;OAGG;IACH,IAAI,QAAO,OAAO,CAAoE;IAEtF;;;;OAIG;IACH,MAAM,GAAI,GAAG,OAAO,KAAG,OAAO,CAM5B;IAEF;;OAEG;IACH,MAAM,IAAI,sBAAsB;IAIhC;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO;CAGvD"}

package/build/ts/message.js

@@ -38,7 +38,7 @@ class Message {
          * @param encryptionPublicKey the public key that is used to encrypt this message
          * @returns the hash of the message data and the public key
          */
-        this.hash = (encryptionPublicKey) => (0, crypto_1.hash12)([...this.data, ...encryptionPublicKey.rawPubKey]);
+        this.hash = (encryptionPublicKey) => (0, crypto_1.hash12)([...this.data, ...encryptionPublicKey.raw]);
         /**
          * Create a copy of the message
          * @returns a copy of the message

package/build/ts/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../ts/message.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+C;AAE/C,oDAA4B;AAK5B;;GAEG;AACH,MAAa,OAAO;IAKlB;;;;OAIG;IACH,YAAY,IAAc;QAK1B;;;WAGG;QACK,YAAO,GAAG,GAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAE5C;;;WAGG;QACH,oBAAe,GAAG,GAA2B,EAAE,CAAC,CAAC;YAC/C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SACjD,CAAC,CAAC;QAEH;;;WAGG;QACH,oBAAe,GAAG,GAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEjD;;;;WAIG;QACH,SAAI,GAAG,CAAC,mBAA8B,EAAU,EAAE,CAAC,IAAA,eAAM,EAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;QAE5G;;;WAGG;QACH,SAAI,GAAG,GAAY,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtF;;;;WAIG;QACH,WAAM,GAAG,CAAC,CAAU,EAAW,EAAE;YAC/B,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC;QAhDA,IAAA,gBAAM,EAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAgDD;;OAEG;IACH,MAAM;QACJ,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAA4B;QAC1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;;AA3EH,0BA4EC;AAzEQ,mBAAW,GAAG,EAAE,AAAL,CAAM"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../ts/message.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+C;AAE/C,oDAA4B;AAK5B;;GAEG;AACH,MAAa,OAAO;IAKlB;;;;OAIG;IACH,YAAY,IAAc;QAK1B;;;WAGG;QACK,YAAO,GAAG,GAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAE5C;;;WAGG;QACH,oBAAe,GAAG,GAA2B,EAAE,CAAC,CAAC;YAC/C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SACjD,CAAC,CAAC;QAEH;;;WAGG;QACH,oBAAe,GAAG,GAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEjD;;;;WAIG;QACH,SAAI,GAAG,CAAC,mBAA8B,EAAU,EAAE,CAAC,IAAA,eAAM,EAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtG;;;WAGG;QACH,SAAI,GAAG,GAAY,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtF;;;;WAIG;QACH,WAAM,GAAG,CAAC,CAAU,EAAW,EAAE;YAC/B,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC;QAhDA,IAAA,gBAAM,EAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAgDD;;OAEG;IACH,MAAM;QACJ,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAA4B;QAC1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;;AA3EH,0BA4EC;AAzEQ,mBAAW,GAAG,EAAE,AAAL,CAAM"}

package/build/ts/privateKey.d.ts

@@ -1,4 +1,4 @@
-import { type PrivateKey as RawPrivKey } from "@maci-protocol/crypto";
+import { type PrivateKey as RawPrivateKey } from "@maci-protocol/crypto";
 import type { IJsonPrivateKey } from "./types";
 export declare const SERIALIZED_PRIV_KEY_PREFIX = "macisk.";
 /**
@@ -9,12 +9,12 @@ export declare const SERIALIZED_PRIV_KEY_PREFIX = "macisk.";
  * A serialized MACI private key is prefixed by 'macisk.'
  */
 export declare class PrivateKey {
-    rawPrivKey: RawPrivKey;
+    raw: RawPrivateKey;
     /**
      * Generate a new Private key object
-     * @param rawPrivKey the raw private key (a bigint)
+     * @param raw the raw private key (a bigint)
      */
-    constructor(rawPrivKey: RawPrivKey);
+    constructor(raw: RawPrivateKey);
     /**
      * Create a copy of this Private key
      * @returns a copy of the Private key
@@ -38,10 +38,10 @@ export declare class PrivateKey {
     static deserialize: (s: string) => PrivateKey;
     /**
      * Check if the serialized private key is valid
-     * @param s the serialized private key
+     * @param serialized the serialized private key
      * @returns whether it is a valid serialized private key
      */
-    static isValidSerializedPrivKey: (s: string) => boolean;
+    static isValidSerialized: (serialized: string) => boolean;
     /**
      * Serialize this object
      */

package/build/ts/privateKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"privateKey.d.ts","sourceRoot":"","sources":["../../ts/privateKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,UAAU,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD;;;;;;GAMG;AACH,qBAAa,UAAU;IACrB,UAAU,EAAE,UAAU,CAAC;IAEvB;;;OAGG;gBACS,UAAU,EAAE,UAAU;IAIlC;;;OAGG;IACH,IAAI,QAAO,UAAU,CAAuD;IAE5E;;;OAGG;IACH,eAAe,QAAO,MAAM,CAAwD;IAEpF;;;OAGG;IACH,SAAS,QAAO,MAAM,CAOpB;IAEF;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,GAAG,MAAM,KAAG,UAAU,CAG1C;IAEF;;;;OAIG;IACH,MAAM,CAAC,wBAAwB,GAAI,GAAG,MAAM,KAAG,OAAO,CAKpD;IAEF;;OAEG;IACH,MAAM,IAAI,eAAe;IAMzB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU;CAGnD"}
+{"version":3,"file":"privateKey.d.ts","sourceRoot":"","sources":["../../ts/privateKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,UAAU,IAAI,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAErG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD;;;;;;GAMG;AACH,qBAAa,UAAU;IACrB,GAAG,EAAE,aAAa,CAAC;IAEnB;;;OAGG;gBACS,GAAG,EAAE,aAAa;IAI9B;;;OAGG;IACH,IAAI,QAAO,UAAU,CAAgD;IAErE;;;OAGG;IACH,eAAe,QAAO,MAAM,CAAoD;IAEhF;;;OAGG;IACH,SAAS,QAAO,MAAM,CAOpB;IAEF;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,GAAG,MAAM,KAAG,UAAU,CAG1C;IAEF;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,GAAI,YAAY,MAAM,KAAG,OAAO,CAKtD;IAEF;;OAEG;IACH,MAAM,IAAI,eAAe;IAMzB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU;CAGnD"}