@maci-protocol/domainobjs 0.0.0-ci.f9da2fc → 0.0.0-ci.fc91dc9

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

@@ -9,10 +9,10 @@ export declare class Ballot {
     voteOptionTreeDepth: number;
     /**
      * Create a new Ballot instance
-     * @param _numVoteOptions How many vote options are available in the poll
+     * @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 +42,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 genRandomBallot(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 genBlankBallot(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;;;;OAIG;gBACS,iBAAiB,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM;IASnE;;;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,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;IAMrF;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM;IAKpF;;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 _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);
         /**
@@ -58,9 +58,9 @@ class Ballot {
             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) {
+        (0, assert_1.default)(5 ** _voteOptionTreeDepth >= _totalVoteOptions);
+        (0, assert_1.default)(_totalVoteOptions >= 0);
+        for (let i = 0; i < _totalVoteOptions; i += 1) {
             this.votes.push(BigInt(0));
         }
     }
@@ -75,23 +75,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 genRandomBallot(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);
+    static genBlankBallot(totalVoteOptions, voteOptionTreeDepth) {
+        const ballot = new Ballot(totalVoteOptions, voteOptionTreeDepth);
         return ballot;
     }
     /**

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

@@ -1,8 +1,8 @@
 import { type Signature, type EcdhSharedKey } from "@maci-protocol/crypto";
 import type { IJsonPCommand } from "./types";
-import type { PrivKey } from "../privateKey";
+import type { PrivateKey } from "../privateKey";
 import { Message } from "../message";
-import { PubKey } from "../publicKey";
+import { PublicKey } from "../publicKey";
 export interface IDecryptMessage {
     command: PCommand;
     signature: Signature;
@@ -13,7 +13,7 @@ export interface IDecryptMessage {
  */
 export declare class PCommand {
     stateIndex: bigint;
-    newPubKey: PubKey;
+    newPublicKey: PublicKey;
     voteOptionIndex: bigint;
     newVoteWeight: bigint;
     nonce: bigint;
@@ -22,14 +22,14 @@ export declare class PCommand {
     /**
      * Create a new PCommand
      * @param stateIndex the state index of the user
-     * @param newPubKey the new public key of the user
+     * @param newPublicKey the new public key of the user
      * @param voteOptionIndex the index of the vote option
      * @param newVoteWeight the new vote weight of the user
      * @param nonce the nonce of the message
      * @param pollId the poll ID
      * @param salt the salt of the message
      */
-    constructor(stateIndex: bigint, newPubKey: PubKey, voteOptionIndex: bigint, newVoteWeight: bigint, nonce: bigint, pollId: bigint, salt?: bigint);
+    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
@@ -48,13 +48,13 @@ export declare class PCommand {
     /**
      * @notice Signs this command and returns a Signature.
      */
-    sign: (privKey: PrivKey) => Signature;
+    sign: (privateKey: PrivateKey) => Signature;
     /**
      * @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.
      */
-    verifySignature: (signature: Signature, pubKey: PubKey) => boolean;
+    verifySignature: (signature: Signature, publicKey: PublicKey) => boolean;
     /**
      * @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

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

@@ -1 +1 @@
-{"version":3,"file":"PCommand.d.ts","sourceRoot":"","sources":["../../../ts/commands/PCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,SAAS,EAEd,KAAK,aAAa,EAGnB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;GAGG;AACH,qBAAa,QAAQ;IACnB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,MAAM,CAAC;IAElB,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,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,MAAwB;IAkBhC;;;OAGG;IACH,IAAI,GAAI,CAAC,SAAS,QAAQ,OAAK,CAAC,CASZ;IAEpB;;;;;OAKG;IACH,OAAO,QAAO,MAAM,EAAE,CAcpB;IAEF,eAAe,QAAO,MAAM,EAAE,CAAmB;IAKjD,MAAM,GAAI,SAAS,QAAQ,KAAG,OAAO,CAOR;IAE7B,IAAI,QAAO,MAAM,CAA0B;IAE3C;;OAEG;IACH,IAAI,GAAI,SAAS,OAAO,KAAG,SAAS,CAAqD;IAEzF;;;;OAIG;IACH,eAAe,GAAI,WAAW,SAAS,EAAE,QAAQ,MAAM,KAAG,OAAO,CACL;IAE5D;;;;;;;;;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,QAAQ;CAa/C"}
+{"version":3,"file":"PCommand.d.ts","sourceRoot":"","sources":["../../../ts/commands/PCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,SAAS,EAEd,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,QAAQ,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;GAGG;AACH,qBAAa,QAAQ;IACnB,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,QAAQ,OAAK,CAAC,CASZ;IAEpB;;;;;OAKG;IACH,OAAO,QAAO,MAAM,EAAE,CAcpB;IAEF,eAAe,QAAO,MAAM,EAAE,CAAmB;IAKjD,MAAM,GAAI,SAAS,QAAQ,KAAG,OAAO,CAOR;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,QAAQ;CAa/C"}

package/build/ts/commands/PCommand.js

@@ -16,19 +16,19 @@ class PCommand {
     /**
      * Create a new PCommand
      * @param stateIndex the state index of the user
-     * @param newPubKey the new public key of the user
+     * @param newPublicKey the new public key of the user
      * @param voteOptionIndex the index of the vote option
      * @param newVoteWeight the new vote weight of the user
      * @param nonce the nonce of the message
      * @param pollId the poll ID
      * @param salt the salt of the message
      */
-    constructor(stateIndex, newPubKey, 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
          */
-        this.copy = () => new PCommand(BigInt(this.stateIndex.toString()), this.newPubKey.copy(), BigInt(this.voteOptionIndex.toString()), BigInt(this.newVoteWeight.toString()), BigInt(this.nonce.toString()), BigInt(this.pollId.toString()), BigInt(this.salt.toString()));
+        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()));
         /**
          * @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 @@ class PCommand {
                 (BigInt(this.nonce) << BigInt(150)) +
                 (BigInt(this.pollId) << BigInt(200));
             /* eslint-enable no-bitwise */
-            const command = [params, ...this.newPubKey.asArray(), this.salt];
+            const command = [params, ...this.newPublicKey.asArray(), this.salt];
             (0, assert_1.default)(command.length === 4);
             return command;
         };
@@ -52,7 +52,7 @@ class PCommand {
          * Check whether this command has deep equivalence to another command
          */
         this.equals = (command) => this.stateIndex === command.stateIndex &&
-            this.newPubKey.equals(command.newPubKey) &&
+            this.newPublicKey.equals(command.newPublicKey) &&
             this.voteOptionIndex === command.voteOptionIndex &&
             this.newVoteWeight === command.newVoteWeight &&
             this.nonce === command.nonce &&
@@ -62,13 +62,13 @@ class PCommand {
         /**
          * @notice Signs this command and returns a Signature.
          */
-        this.sign = (privKey) => (0, crypto_1.sign)(privKey.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, pubKey) => (0, crypto_1.verifySignature)(this.hash(), signature, pubKey.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
@@ -93,7 +93,7 @@ class PCommand {
         (0, assert_1.default)(limit50Bits >= nonce);
         (0, assert_1.default)(limit50Bits >= pollId);
         this.stateIndex = stateIndex;
-        this.newPubKey = newPubKey;
+        this.newPublicKey = newPublicKey;
         this.voteOptionIndex = voteOptionIndex;
         this.newVoteWeight = newVoteWeight;
         this.nonce = nonce;
@@ -106,7 +106,7 @@ class PCommand {
     toJSON() {
         return {
             stateIndex: this.stateIndex.toString(),
-            newPubKey: this.newPubKey.serialize(),
+            newPublicKey: this.newPublicKey.serialize(),
             voteOptionIndex: this.voteOptionIndex.toString(),
             newVoteWeight: this.newVoteWeight.toString(),
             nonce: this.nonce.toString(),
@@ -120,7 +120,7 @@ class PCommand {
      * @returns a PCommand instance
      */
     static fromJSON(json) {
-        const command = new PCommand(BigInt(json.stateIndex), publicKey_1.PubKey.deserialize(json.newPubKey), BigInt(json.voteOptionIndex), BigInt(json.newVoteWeight), BigInt(json.nonce), BigInt(json.pollId), BigInt(json.salt));
+        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));
         return command;
     }
 }
@@ -137,7 +137,7 @@ PCommand.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,22 +146,22 @@ 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
-    // encPubKey, a message will not decrypt resulting in potentially invalid public keys)
-    const newPubKey = new publicKey_1.PubKey([decrypted[1], decrypted[2]], true);
+    // 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, newPubKey, voteOptionIndex, newVoteWeight, nonce, pollId, salt);
+    const command = new PCommand(stateIndex, newPublicKey, voteOptionIndex, newVoteWeight, nonce, pollId, salt);
     const signature = {
         R8: [decrypted[4], decrypted[5]],
         S: decrypted[6],

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

@@ -1 +1 @@
-{"version":3,"file":"PCommand.js","sourceRoot":"","sources":["../../../ts/commands/PCommand.ts"],"names":[],"mappings":";;;;;;AAAA,kDAY+B;AAE/B,oDAA4B;AAK5B,wCAAqC;AACrC,4CAAsC;AAOtC;;;GAGG;AACH,MAAa,QAAQ;IAenB;;;;;;;;;OASG;IACH,YACE,UAAkB,EAClB,SAAiB,EACjB,eAAuB,EACvB,aAAqB,EACrB,KAAa,EACb,MAAc,EACd,OAAe,IAAA,sBAAa,GAAE;QAkBhC;;;WAGG;QACH,SAAI,GAAG,GAA0B,EAAE,CACjC,IAAI,QAAQ,CACV,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,EAClC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EACrB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,EACvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EACrC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAC7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CACb,CAAC;QAEpB;;;;;WAKG;QACH,YAAO,GAAG,GAAa,EAAE;YACvB,+BAA+B;YAC/B,MAAM,MAAM,GACV,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBACvB,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5C,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3C,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;gBACnC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACvC,8BAA8B;YAE9B,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjE,IAAA,gBAAM,EAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;YAE7B,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,oBAAe,GAAG,GAAa,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEjD;;WAEG;QACH,WAAM,GAAG,CAAC,OAAiB,EAAW,EAAE,CACtC,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU;YACtC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YACxC,IAAI,CAAC,eAAe,KAAK,OAAO,CAAC,eAAe;YAChD,IAAI,CAAC,aAAa,KAAK,OAAO,CAAC,aAAa;YAC5C,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;YAC5B,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM;YAC9B,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;QAE7B,SAAI,GAAG,GAAW,EAAE,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAE3C;;WAEG;QACH,SAAI,GAAG,CAAC,OAAgB,EAAa,EAAE,CAAC,IAAA,aAAI,EAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEzF;;;;WAIG;QACH,oBAAe,GAAG,CAAC,SAAoB,EAAE,MAAc,EAAW,EAAE,CAClE,IAAA,wBAAe,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5D;;;;;;;;;WASG;QACH,YAAO,GAAG,CAAC,SAAoB,EAAE,SAAwB,EAAW,EAAE;YACpE,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAE7G,IAAA,gBAAM,EAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;YAE/B,MAAM,UAAU,GAAe,IAAA,wBAAe,EAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhF,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,UAAsB,CAAC,CAAC;YAEpD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;QAtGA,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACpC,IAAA,gBAAM,EAAC,WAAW,IAAI,UAAU,CAAC,CAAC;QAClC,IAAA,gBAAM,EAAC,WAAW,IAAI,eAAe,CAAC,CAAC;QACvC,IAAA,gBAAM,EAAC,WAAW,IAAI,aAAa,CAAC,CAAC;QACrC,IAAA,gBAAM,EAAC,WAAW,IAAI,KAAK,CAAC,CAAC;QAC7B,IAAA,gBAAM,EAAC,WAAW,IAAI,MAAM,CAAC,CAAC;QAE9B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IA6ID;;OAEG;IACH,MAAM;QACJ,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YACtC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YACrC,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;YAChD,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC5C,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC9B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;SAC3B,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAmB;QACjC,MAAM,OAAO,GAAG,IAAI,QAAQ,CAC1B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EACvB,kBAAM,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAClC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAC5B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAClB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAClB,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;;AA7NH,4BA8NC;AApFC;;;;;;;GAOG;AACI,gBAAO,GAAG,CAAC,OAAgB,EAAE,SAAwB,EAAE,KAAK,GAAG,KAAK,EAAmB,EAAE;IAC9F,MAAM,SAAS,GAAG,KAAK;QACrB,CAAC,CAAC,IAAA,oCAA2B,EAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,IAAA,wBAAe,EAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3D,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE1C,8DAA8D;IAC9D,qBAAqB;IACrB,oBAAoB;IACpB,eAAe;IACf,qBAAqB;IACrB,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,GAAW,EAAU,EAAE;IACnD,sCAAsC;IACtC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;IAExF,sBAAsB;IACtB,6BAA6B;IAC7B,kCAAkC;IAClC,gCAAgC;IAChC,wBAAwB;IACxB,yBAAyB;IACzB,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAE/B,kFAAkF;IAClF,sFAAsF;IACtF,MAAM,SAAS,GAAG,IAAI,kBAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAE1B,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAEzG,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAU;QACzC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;KAChB,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC,AAzCa,CAyCZ"}
+{"version":3,"file":"PCommand.js","sourceRoot":"","sources":["../../../ts/commands/PCommand.ts"],"names":[],"mappings":"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"}

package/build/ts/commands/types.d.ts

@@ -11,7 +11,7 @@ export interface IJsonTCommand {
  */
 export interface IJsonPCommand {
     stateIndex: string;
-    newPubKey: string;
+    newPublicKey: string;
     voteOptionIndex: string;
     newVoteWeight: string;
     nonce: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/commands/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/commands/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd"}

package/build/ts/constants.d.ts

@@ -1,6 +1,6 @@
-import { PubKey } from "./publicKey";
+import { PublicKey } from "./publicKey";
 import { StateLeaf } from "./stateLeaf";
 export declare const blankStateLeaf: StateLeaf;
 export declare const blankStateLeafHash: bigint;
-export declare const padKey: PubKey;
+export declare const padKey: PublicKey;
 //# sourceMappingURL=constants.d.ts.map

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,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,cAAc,WAA2B,CAAC;AACvD,eAAO,MAAM,kBAAkB,QAAwB,CAAC;AACxD,eAAO,MAAM,MAAM,QAAqB,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,WAA2B,CAAC;AACvD,eAAO,MAAM,kBAAkB,QAAwB,CAAC;AACxD,eAAO,MAAM,MAAM,WAAwB,CAAC"}

package/build/ts/constants.js

@@ -5,5 +5,5 @@ const publicKey_1 = require("./publicKey");
 const stateLeaf_1 = require("./stateLeaf");
 exports.blankStateLeaf = stateLeaf_1.StateLeaf.genBlankLeaf();
 exports.blankStateLeafHash = exports.blankStateLeaf.hash();
-exports.padKey = publicKey_1.PubKey.genPadKey();
+exports.padKey = publicKey_1.PublicKey.genPadKey();
 //# 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,2CAAqC;AACrC,2CAAwC;AAE3B,QAAA,cAAc,GAAG,qBAAS,CAAC,YAAY,EAAE,CAAC;AAC1C,QAAA,kBAAkB,GAAG,sBAAc,CAAC,IAAI,EAAE,CAAC;AAC3C,QAAA,MAAM,GAAG,kBAAM,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,YAAY,EAAE,CAAC;AAC1C,QAAA,kBAAkB,GAAG,sBAAc,CAAC,IAAI,EAAE,CAAC;AAC3C,QAAA,MAAM,GAAG,qBAAS,CAAC,SAAS,EAAE,CAAC"}

package/build/ts/index.d.ts

@@ -1,11 +1,11 @@
 export { Ballot } from "./ballot";
 export { Message } from "./message";
-export { PrivKey, SERIALIZED_PRIV_KEY_PREFIX } from "./privateKey";
-export { PubKey, SERIALIZED_PUB_KEY_PREFIX } from "./publicKey";
+export { PrivateKey, SERIALIZED_PRIV_KEY_PREFIX } from "./privateKey";
+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 { Proof, IStateLeaf, VoteOptionTreeLeaf, IJsonKeyPair, IJsonPrivateKey, IJsonPublicKey, IJsonStateLeaf, IG1ContractParams, IG2ContractParams, IVerifyingKeyContractParams, IVerifyingKeyObjectParams, IStateLeafContractParams, IMessageContractParams, IJsonBallot, } from "./types";
 export { type IJsonTCommand, type IJsonPCommand, PCommand } from "./commands";
 export { VerifyingKey } from "./verifyingKey";
 //# 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,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAEhE,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;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,2BAA2B,EAC3B,yBAAyB,EACzB,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"}

package/build/ts/index.js

@@ -1,15 +1,15 @@
 "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.PubKey = exports.SERIALIZED_PRIV_KEY_PREFIX = exports.PrivKey = exports.Message = exports.Ballot = void 0;
+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;
 var ballot_1 = require("./ballot");
 Object.defineProperty(exports, "Ballot", { enumerable: true, get: function () { return ballot_1.Ballot; } });
 var message_1 = require("./message");
 Object.defineProperty(exports, "Message", { enumerable: true, get: function () { return message_1.Message; } });
 var privateKey_1 = require("./privateKey");
-Object.defineProperty(exports, "PrivKey", { enumerable: true, get: function () { return privateKey_1.PrivKey; } });
+Object.defineProperty(exports, "PrivateKey", { enumerable: true, get: function () { return privateKey_1.PrivateKey; } });
 Object.defineProperty(exports, "SERIALIZED_PRIV_KEY_PREFIX", { enumerable: true, get: function () { return privateKey_1.SERIALIZED_PRIV_KEY_PREFIX; } });
 var publicKey_1 = require("./publicKey");
-Object.defineProperty(exports, "PubKey", { enumerable: true, get: function () { return publicKey_1.PubKey; } });
+Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return publicKey_1.PublicKey; } });
 Object.defineProperty(exports, "SERIALIZED_PUB_KEY_PREFIX", { enumerable: true, get: function () { return publicKey_1.SERIALIZED_PUB_KEY_PREFIX; } });
 var keyPair_1 = require("./keyPair");
 Object.defineProperty(exports, "Keypair", { enumerable: true, get: function () { return keyPair_1.Keypair; } });

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,2CAAmE;AAA1D,qGAAA,OAAO,OAAA;AAAE,wHAAA,0BAA0B,OAAA;AAE5C,yCAAgE;AAAvD,mGAAA,MAAM,OAAA;AAAE,sHAAA,yBAAyB,OAAA;AAE1C,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;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"}

package/build/ts/keyPair.d.ts

@@ -1,7 +1,7 @@
 import { EcdhSharedKey } from "@maci-protocol/crypto";
 import type { IJsonKeyPair } from "./types";
-import { PrivKey } from "./privateKey";
-import { PubKey } from "./publicKey";
+import { PrivateKey } from "./privateKey";
+import { PublicKey } from "./publicKey";
 /**
  * @notice A KeyPair is a pair of public and private keys
  * This is a MACI keypair, which is not to be
@@ -9,14 +9,14 @@ import { PubKey } from "./publicKey";
  * A MACI keypair is comprised of a MACI public key and a MACI private key
  */
 export declare class Keypair {
-    privKey: PrivKey;
-    pubKey: PubKey;
+    privateKey: PrivateKey;
+    publicKey: PublicKey;
     /**
      * Create a new instance of a Keypair
-     * @param privKey the private key (optional)
-     * @notice if no privKey is passed, it will automatically generate a new private key
+     * @param privateKey the private key (optional)
+     * @notice if no privateKey is passed, it will automatically generate a new private key
      */
-    constructor(privKey?: PrivKey);
+    constructor(privateKey?: PrivateKey);
     /**
      * Create a deep clone of this Keypair
      * @returns a copy of the Keypair
@@ -24,11 +24,11 @@ export declare class Keypair {
     copy: () => Keypair;
     /**
      * Generate a shared key
-     * @param privKey
-     * @param pubKey
+     * @param privateKey
+     * @param publicKey
      * @returns
      */
-    static genEcdhSharedKey(privKey: PrivKey, pubKey: PubKey): 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,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;GAKG;AACH,qBAAa,OAAO;IAClB,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;gBACS,OAAO,CAAC,EAAE,OAAO;IAW7B;;;OAGG;IACH,IAAI,QAAO,OAAO,CAAqC;IAEvD;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa;IAIxE;;;;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,aAAa,EAA6D,MAAM,uBAAuB,CAAC;AAIjH,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

@@ -17,33 +17,33 @@ const publicKey_1 = require("./publicKey");
 class Keypair {
     /**
      * Create a new instance of a Keypair
-     * @param privKey the private key (optional)
-     * @notice if no privKey is passed, it will automatically generate a new private key
+     * @param privateKey the private key (optional)
+     * @notice if no privateKey is passed, it will automatically generate a new private key
      */
-    constructor(privKey) {
+    constructor(privateKey) {
         /**
          * Create a deep clone of this Keypair
          * @returns a copy of the Keypair
          */
-        this.copy = () => new Keypair(this.privKey.copy());
-        if (privKey) {
-            this.privKey = privKey;
-            this.pubKey = new publicKey_1.PubKey((0, crypto_1.genPubKey)(privKey.rawPrivKey));
+        this.copy = () => new Keypair(this.privateKey.copy());
+        if (privateKey) {
+            this.privateKey = privateKey;
+            this.publicKey = new publicKey_1.PublicKey((0, crypto_1.generatePublicKey)(privateKey.raw));
         }
         else {
-            const rawKeyPair = (0, crypto_1.genKeypair)();
-            this.privKey = new privateKey_1.PrivKey(rawKeyPair.privKey);
-            this.pubKey = new publicKey_1.PubKey(rawKeyPair.pubKey);
+            const rawKeypair = (0, crypto_1.generateKeypair)();
+            this.privateKey = new privateKey_1.PrivateKey(rawKeypair.privateKey);
+            this.publicKey = new publicKey_1.PublicKey(rawKeypair.publicKey);
         }
     }
     /**
      * Generate a shared key
-     * @param privKey
-     * @param pubKey
+     * @param privateKey
+     * @param publicKey
      * @returns
      */
-    static genEcdhSharedKey(privKey, pubKey) {
-        return (0, crypto_1.genEcdhSharedKey)(privKey.rawPrivKey, pubKey.rawPubKey);
+    static generateEcdhSharedKey(privateKey, publicKey) {
+        return (0, crypto_1.generateEcdhSharedKey)(privateKey.raw, publicKey.raw);
     }
     /**
      * Check whether two Keypairs are equal
@@ -51,22 +51,21 @@ class Keypair {
      * @returns whether they are equal or not
      */
     equals(keypair) {
-        const equalPrivKey = this.privKey.rawPrivKey === keypair.privKey.rawPrivKey;
-        const equalPubKey = this.pubKey.rawPubKey[0] === keypair.pubKey.rawPubKey[0] &&
-            this.pubKey.rawPubKey[1] === keypair.pubKey.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
      */
     toJSON() {
         return {
-            privKey: this.privKey.serialize(),
-            pubKey: this.pubKey.serialize(),
+            privateKey: this.privateKey.serialize(),
+            publicKey: this.publicKey.serialize(),
         };
     }
     /**
@@ -75,7 +74,7 @@ class Keypair {
      * @returns a keypair instance
      */
     static fromJSON(json) {
-        return new Keypair(privateKey_1.PrivKey.deserialize(json.privKey));
+        return new Keypair(privateKey_1.PrivateKey.deserialize(json.privateKey));
     }
 }
 exports.Keypair = Keypair;

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,6CAAuC;AACvC,2CAAqC;AAErC;;;;;GAKG;AACH,MAAa,OAAO;IAKlB;;;;OAIG;IACH,YAAY,OAAiB;QAW7B;;;WAGG;QACH,SAAI,GAAG,GAAY,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAdrD,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,IAAI,kBAAM,CAAC,IAAA,kBAAS,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,IAAA,mBAAU,GAAE,CAAC;YAChC,IAAI,CAAC,OAAO,GAAG,IAAI,oBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,kBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAQD;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAgB,EAAE,MAAc;QACtD,OAAO,IAAA,yBAAgB,EAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAgB;QACrB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5E,MAAM,WAAW,GACf,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAE3D,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,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;SAChC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAkB;QAChC,OAAO,IAAI,OAAO,CAAC,oBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;CACF;AA1ED,0BA0EC"}
+{"version":3,"file":"keyPair.js","sourceRoot":"","sources":["../../ts/keyPair.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiH;AAEjH,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

@@ -1,4 +1,4 @@
-import type { PubKey } from "./publicKey";
+import type { PublicKey } from "./publicKey";
 import type { IMessageContractParams } from "./types";
 /**
  * @notice An encrypted command and signature.
@@ -29,10 +29,10 @@ export declare class Message {
     asCircuitInputs: () => bigint[];
     /**
      * Hash the message data and a public key
-     * @param encPubKey the public key that is used to encrypt this message
+     * @param encryptionPublicKey the public key that is used to encrypt this message
      * @returns the hash of the message data and the public key
      */
-    hash: (encPubKey: PubKey) => bigint;
+    hash: (encryptionPublicKey: PublicKey) => bigint;
     /**
      * Create a copy of the message
      * @returns a copy of the message