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

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,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,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,WAAW,MAAM,KAAG,MAAM,CAAmD;IAErF;;;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

@@ -35,10 +35,10 @@ class Message {
         this.asCircuitInputs = () => this.asArray();
         /**
          * 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
          */
-        this.hash = (encPubKey) => (0, crypto_1.hash12)([...this.data, ...encPubKey.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,SAAiB,EAAU,EAAE,CAAC,IAAA,eAAM,EAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QAErF;;;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,25 +1,25 @@
-import { type PrivKey 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.";
 /**
- * @notice PrivKey is a TS Class representing a MACI PrivateKey
+ * @notice PrivateKey is a TS Class representing a MACI PrivateKey
  * which is a seed to be used to generate a public key (point on the curve)
  * This is a MACI private key, which is not to be
  * confused with an Ethereum private key.
  * A serialized MACI private key is prefixed by 'macisk.'
  */
-export declare class PrivKey {
-    rawPrivKey: RawPrivKey;
+export declare class PrivateKey {
+    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
      */
-    copy: () => PrivKey;
+    copy: () => PrivateKey;
     /**
      * Return this Private key as a circuit input
      * @returns the Private key as a circuit input
@@ -35,13 +35,13 @@ export declare class PrivKey {
      * @param s the serialized private key
      * @returns the deserialized private key
      */
-    static deserialize: (s: string) => PrivKey;
+    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
      */
@@ -49,8 +49,8 @@ export declare class PrivKey {
     /**
      * Deserialize this object from a JSON object
      * @param json - the json object
-     * @returns the deserialized object as a PrivKey instance
+     * @returns the deserialized object as a PrivateKey instance
      */
-    static fromJSON(json: IJsonPrivateKey): PrivKey;
+    static fromJSON(json: IJsonPrivateKey): PrivateKey;
 }
 //# sourceMappingURL=privateKey.d.ts.map

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,OAAO,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE5F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD;;;;;;GAMG;AACH,qBAAa,OAAO;IAClB,UAAU,EAAE,UAAU,CAAC;IAEvB;;;OAGG;gBACS,UAAU,EAAE,UAAU;IAIlC;;;OAGG;IACH,IAAI,QAAO,OAAO,CAAoD;IAEtE;;;OAGG;IACH,eAAe,QAAO,MAAM,CAAwD;IAEpF;;;OAGG;IACH,SAAS,QAAO,MAAM,CAOpB;IAEF;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,GAAG,MAAM,KAAG,OAAO,CAGvC;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,OAAO;CAGhD"}
+{"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"}

package/build/ts/privateKey.js

@@ -1,79 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrivKey = exports.SERIALIZED_PRIV_KEY_PREFIX = void 0;
+exports.PrivateKey = exports.SERIALIZED_PRIV_KEY_PREFIX = void 0;
 const crypto_1 = require("@maci-protocol/crypto");
 exports.SERIALIZED_PRIV_KEY_PREFIX = "macisk.";
 /**
- * @notice PrivKey is a TS Class representing a MACI PrivateKey
+ * @notice PrivateKey is a TS Class representing a MACI PrivateKey
  * which is a seed to be used to generate a public key (point on the curve)
  * This is a MACI private key, which is not to be
  * confused with an Ethereum private key.
  * A serialized MACI private key is prefixed by 'macisk.'
  */
-class PrivKey {
+class PrivateKey {
     /**
      * Generate a new Private key object
-     * @param rawPrivKey the raw private key (a bigint)
+     * @param raw the raw private key (a bigint)
      */
-    constructor(rawPrivKey) {
+    constructor(raw) {
         /**
          * Create a copy of this Private key
          * @returns a copy of the Private key
          */
-        this.copy = () => new PrivKey(BigInt(this.rawPrivKey.toString()));
+        this.copy = () => new PrivateKey(BigInt(this.raw.toString()));
         /**
          * Return this Private key as a circuit input
          * @returns the Private key as a circuit input
          */
-        this.asCircuitInputs = () => (0, crypto_1.formatPrivKeyForBabyJub)(this.rawPrivKey).toString();
+        this.asCircuitInputs = () => (0, crypto_1.formatPrivateKeyForBabyJub)(this.raw).toString();
         /**
          * Serialize the private key
          * @returns the serialized private key
          */
         this.serialize = () => {
-            let x = this.rawPrivKey.toString(16);
+            let x = this.raw.toString(16);
             if (x.length % 2 !== 0) {
                 x = `0${x}`;
             }
             return `${exports.SERIALIZED_PRIV_KEY_PREFIX}${x.padStart(64, "0")}`;
         };
-        this.rawPrivKey = rawPrivKey;
+        this.raw = raw;
     }
     /**
      * Serialize this object
      */
     toJSON() {
         return {
-            privKey: this.serialize(),
+            privateKey: this.serialize(),
         };
     }
     /**
      * Deserialize this object from a JSON object
      * @param json - the json object
-     * @returns the deserialized object as a PrivKey instance
+     * @returns the deserialized object as a PrivateKey instance
      */
     static fromJSON(json) {
-        return PrivKey.deserialize(json.privKey);
+        return PrivateKey.deserialize(json.privateKey);
     }
 }
-exports.PrivKey = PrivKey;
+exports.PrivateKey = PrivateKey;
 /**
  * Deserialize the private key
  * @param s the serialized private key
  * @returns the deserialized private key
  */
-PrivKey.deserialize = (s) => {
+PrivateKey.deserialize = (s) => {
     const x = s.slice(exports.SERIALIZED_PRIV_KEY_PREFIX.length);
-    return new PrivKey(BigInt(`0x${x}`));
+    return new PrivateKey(BigInt(`0x${x}`));
 };
 /**
  * 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
  */
-PrivKey.isValidSerializedPrivKey = (s) => {
-    const correctPrefix = s.startsWith(exports.SERIALIZED_PRIV_KEY_PREFIX);
-    const x = s.slice(exports.SERIALIZED_PRIV_KEY_PREFIX.length);
-    return correctPrefix && x.length === 64;
+PrivateKey.isValidSerialized = (serialized) => {
+    const correctPrefix = serialized.startsWith(exports.SERIALIZED_PRIV_KEY_PREFIX);
+    const body = serialized.slice(exports.SERIALIZED_PRIV_KEY_PREFIX.length);
+    return correctPrefix && body.length === 64;
 };
 //# sourceMappingURL=privateKey.js.map

package/build/ts/privateKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"privateKey.js","sourceRoot":"","sources":["../../ts/privateKey.ts"],"names":[],"mappings":";;;AAAA,kDAA4F;AAI/E,QAAA,0BAA0B,GAAG,SAAS,CAAC;AAEpD;;;;;;GAMG;AACH,MAAa,OAAO;IAGlB;;;OAGG;IACH,YAAY,UAAsB;QAIlC;;;WAGG;QACH,SAAI,GAAG,GAAY,EAAE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEtE;;;WAGG;QACH,oBAAe,GAAG,GAAW,EAAE,CAAC,IAAA,gCAAuB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEpF;;;WAGG;QACH,cAAS,GAAG,GAAW,EAAE;YACvB,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YACd,CAAC;YAED,OAAO,GAAG,kCAA0B,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;QAC/D,CAAC,CAAC;QA1BA,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAiDD;;OAEG;IACH,MAAM;QACJ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE;SAC1B,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAqB;QACnC,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;;AA1EH,0BA2EC;AAvCC;;;;GAIG;AACI,mBAAW,GAAG,CAAC,CAAS,EAAW,EAAE;IAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,kCAA0B,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,CAAC,AAHiB,CAGhB;AAEF;;;;GAIG;AACI,gCAAwB,GAAG,CAAC,CAAS,EAAW,EAAE;IACvD,MAAM,aAAa,GAAG,CAAC,CAAC,UAAU,CAAC,kCAA0B,CAAC,CAAC;IAC/D,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,kCAA0B,CAAC,MAAM,CAAC,CAAC;IAErD,OAAO,aAAa,IAAI,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC;AAC1C,CAAC,AAL8B,CAK7B"}
+{"version":3,"file":"privateKey.js","sourceRoot":"","sources":["../../ts/privateKey.ts"],"names":[],"mappings":";;;AAAA,kDAAqG;AAIxF,QAAA,0BAA0B,GAAG,SAAS,CAAC;AAEpD;;;;;;GAMG;AACH,MAAa,UAAU;IAGrB;;;OAGG;IACH,YAAY,GAAkB;QAI9B;;;WAGG;QACH,SAAI,GAAG,GAAe,EAAE,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAErE;;;WAGG;QACH,oBAAe,GAAG,GAAW,EAAE,CAAC,IAAA,mCAA0B,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEhF;;;WAGG;QACH,cAAS,GAAG,GAAW,EAAE;YACvB,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YACd,CAAC;YAED,OAAO,GAAG,kCAA0B,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;QAC/D,CAAC,CAAC;QA1BA,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAiDD;;OAEG;IACH,MAAM;QACJ,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE;SAC7B,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAqB;QACnC,OAAO,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;;AA1EH,gCA2EC;AAvCC;;;;GAIG;AACI,sBAAW,GAAG,CAAC,CAAS,EAAc,EAAE;IAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,kCAA0B,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC,AAHiB,CAGhB;AAEF;;;;GAIG;AACI,4BAAiB,GAAG,CAAC,UAAkB,EAAW,EAAE;IACzD,MAAM,aAAa,GAAG,UAAU,CAAC,UAAU,CAAC,kCAA0B,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,kCAA0B,CAAC,MAAM,CAAC,CAAC;IAEjE,OAAO,aAAa,IAAI,IAAI,CAAC,MAAM,KAAK,EAAE,CAAC;AAC7C,CAAC,AALuB,CAKtB"}

package/build/ts/publicKey.d.ts

@@ -1,4 +1,4 @@
-import { type PubKey as RawPubKey } from "@maci-protocol/crypto";
+import { type PublicKey as RawPublicKey } from "@maci-protocol/crypto";
 import type { IJsonPublicKey, IG1ContractParams } from "./types";
 export declare const SERIALIZED_PUB_KEY_PREFIX = "macipk.";
 /**
@@ -9,8 +9,8 @@ export declare const SERIALIZED_PUB_KEY_PREFIX = "macipk.";
  * A raw MACI public key can be thought as a pair of
  * BigIntegers (x, y) representing a point on the baby jubjub curve
  */
-export declare class PubKey {
-    rawPubKey: RawPubKey;
+export declare class PublicKey {
+    raw: RawPublicKey;
     /**
      * Create a new instance of a public key
      * @dev You might want to allow an invalid raw key,
@@ -18,15 +18,15 @@ export declare class PubKey {
      * will be random, and likely not be a point on the curve.
      * However we need to match keys to the circuit which does
      * not perform such checks
-     * @param rawPubKey the raw public key
+     * @param raw the raw public key
      * @param allowInvalid whether to allow invalid public keys
      */
-    constructor(rawPubKey: RawPubKey, allowInvalid?: boolean);
+    constructor(raw: RawPublicKey, allowInvalid?: boolean);
     /**
      * Create a copy of the public key
      * @returns a copy of the public key
      */
-    copy: () => PubKey;
+    copy: () => PublicKey;
     /**
      * Return this public key as smart contract parameters
      * @returns the public key as smart contract parameters
@@ -54,36 +54,36 @@ export declare class PubKey {
     hash: () => bigint;
     /**
      * Check whether this public key equals to another public key
-     * @param p the public key to compare with
+     * @param key the public key to compare with
      * @returns whether they match
      */
-    equals: (p: PubKey) => boolean;
+    equals: (key: PublicKey) => boolean;
     /**
      * Deserialize a serialized public key
      * @param s the serialized public key
      * @returns the deserialized public key
      */
-    static deserialize: (s: string) => PubKey;
+    static deserialize: (s: string) => PublicKey;
     /**
      * Check whether a serialized public key is serialized correctly
      * @param s the serialized public key
      * @returns whether the serialized public key is valid
      */
-    static isValidSerializedPubKey: (s: string) => boolean;
+    static isValidSerialized: (s: string) => boolean;
     /**
      * Serialize this object
      */
     toJSON(): IJsonPublicKey;
     /**
-     * Deserialize a JSON object into a PubKey instance
+     * Deserialize a JSON object into a PublicKey instance
      * @param json - the json object
-     * @returns PubKey
+     * @returns PublicKey
      */
-    static fromJSON(json: IJsonPublicKey): PubKey;
+    static fromJSON(json: IJsonPublicKey): PublicKey;
     /**
      * Generate a default pad key
      * @returns a default pad key
      */
-    static genPadKey(): PubKey;
+    static genPadKey(): PublicKey;
 }
 //# sourceMappingURL=publicKey.d.ts.map

package/build/ts/publicKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicKey.d.ts","sourceRoot":"","sources":["../../ts/publicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,MAAM,IAAI,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAInH,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,MAAM;IACjB,SAAS,EAAE,SAAS,CAAC;IAErB;;;;;;;;;OASG;gBACS,SAAS,EAAE,SAAS,EAAE,YAAY,UAAQ;IAOtD;;;OAGG;IACH,IAAI,QAAO,MAAM,CAA6F;IAE9G;;;OAGG;IACH,eAAe,QAAO,iBAAiB,CAOrC;IAEF;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAA4C;IAE1E;;;OAGG;IACH,OAAO,QAAO,MAAM,EAAE,CAA2C;IAEjE;;;OAGG;IACH,SAAS,QAAO,MAAM,CAQpB;IAEF;;;OAGG;IACH,IAAI,QAAO,MAAM,CAAwD;IAEzE;;;;OAIG;IACH,MAAM,GAAI,GAAG,MAAM,KAAG,OAAO,CAAiF;IAE9G;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,GAAG,MAAM,KAAG,MAAM,CAGtC;IAEF;;;;OAIG;IACH,MAAM,CAAC,uBAAuB,GAAI,GAAG,MAAM,KAAG,OAAO,CASnD;IAEF;;OAEG;IACH,MAAM,IAAI,cAAc;IAMxB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM;IAI7C;;;OAGG;IACH,MAAM,CAAC,SAAS,IAAI,MAAM;CAY3B"}
+{"version":3,"file":"publicKey.d.ts","sourceRoot":"","sources":["../../ts/publicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,SAAS,IAAI,YAAY,EAC/B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB,GAAG,EAAE,YAAY,CAAC;IAElB;;;;;;;;;OASG;gBACS,GAAG,EAAE,YAAY,EAAE,YAAY,UAAQ;IAOnD;;;OAGG;IACH,IAAI,QAAO,SAAS,CAAoF;IAExG;;;OAGG;IACH,eAAe,QAAO,iBAAiB,CAOrC;IAEF;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAsC;IAEpE;;;OAGG;IACH,OAAO,QAAO,MAAM,EAAE,CAA+B;IAErD;;;OAGG;IACH,SAAS,QAAO,MAAM,CAQpB;IAEF;;;OAGG;IACH,IAAI,QAAO,MAAM,CAA4C;IAE7D;;;;OAIG;IACH,MAAM,GAAI,KAAK,SAAS,KAAG,OAAO,CAA6D;IAE/F;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,GAAG,MAAM,KAAG,SAAS,CAGzC;IAEF;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,GAAI,GAAG,MAAM,KAAG,OAAO,CAS7C;IAEF;;OAEG;IACH,MAAM,IAAI,cAAc;IAMxB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS;IAIhD;;;OAGG;IACH,MAAM,CAAC,SAAS,IAAI,SAAS;CAY9B"}

package/build/ts/publicKey.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.PubKey = exports.SERIALIZED_PUB_KEY_PREFIX = void 0;
+exports.PublicKey = exports.SERIALIZED_PUB_KEY_PREFIX = void 0;
 const crypto_1 = require("@maci-protocol/crypto");
 const assert_1 = __importDefault(require("assert"));
 exports.SERIALIZED_PUB_KEY_PREFIX = "macipk.";
@@ -15,7 +15,7 @@ exports.SERIALIZED_PUB_KEY_PREFIX = "macipk.";
  * A raw MACI public key can be thought as a pair of
  * BigIntegers (x, y) representing a point on the baby jubjub curve
  */
-class PubKey {
+class PublicKey {
     /**
      * Create a new instance of a public key
      * @dev You might want to allow an invalid raw key,
@@ -23,21 +23,21 @@ class PubKey {
      * will be random, and likely not be a point on the curve.
      * However we need to match keys to the circuit which does
      * not perform such checks
-     * @param rawPubKey the raw public key
+     * @param raw the raw public key
      * @param allowInvalid whether to allow invalid public keys
      */
-    constructor(rawPubKey, allowInvalid = false) {
+    constructor(raw, allowInvalid = false) {
         /**
          * Create a copy of the public key
          * @returns a copy of the public key
          */
-        this.copy = () => new PubKey([BigInt(this.rawPubKey[0].toString()), BigInt(this.rawPubKey[1].toString())]);
+        this.copy = () => new PublicKey([BigInt(this.raw[0].toString()), BigInt(this.raw[1].toString())]);
         /**
          * Return this public key as smart contract parameters
          * @returns the public key as smart contract parameters
          */
         this.asContractParam = () => {
-            const [x, y] = this.rawPubKey;
+            const [x, y] = this.raw;
             return {
                 x: x.toString(),
                 y: y.toString(),
@@ -47,18 +47,18 @@ class PubKey {
          * Return this public key as circuit inputs
          * @returns an array of strings
          */
-        this.asCircuitInputs = () => this.rawPubKey.map((x) => x.toString());
+        this.asCircuitInputs = () => this.raw.map((x) => x.toString());
         /**
          * Return this public key as an array of bigints
          * @returns the public key as an array of bigints
          */
-        this.asArray = () => [this.rawPubKey[0], this.rawPubKey[1]];
+        this.asArray = () => [this.raw[0], this.raw[1]];
         /**
          * Generate a serialized public key from this public key object
          * @returns the string representation of a serialized public key
          */
         this.serialize = () => {
-            const packed = (0, crypto_1.packPubKey)(this.rawPubKey).toString(16);
+            const packed = (0, crypto_1.packPublicKey)(this.raw).toString(16);
             if (packed.length % 2 !== 0) {
                 return `${exports.SERIALIZED_PUB_KEY_PREFIX}0${packed}`;
             }
@@ -68,33 +68,33 @@ class PubKey {
          * Hash the two baby jubjub coordinates
          * @returns the hash of this public key
          */
-        this.hash = () => (0, crypto_1.hashLeftRight)(this.rawPubKey[0], this.rawPubKey[1]);
+        this.hash = () => (0, crypto_1.hashLeftRight)(this.raw[0], this.raw[1]);
         /**
          * Check whether this public key equals to another public key
-         * @param p the public key to compare with
+         * @param key the public key to compare with
          * @returns whether they match
          */
-        this.equals = (p) => this.rawPubKey[0] === p.rawPubKey[0] && this.rawPubKey[1] === p.rawPubKey[1];
+        this.equals = (key) => this.raw[0] === key.raw[0] && this.raw[1] === key.raw[1];
         if (!allowInvalid) {
-            (0, assert_1.default)((0, crypto_1.inCurve)(rawPubKey), "PubKey not on curve");
+            (0, assert_1.default)((0, crypto_1.inCurve)(raw), "PublicKey not on curve");
         }
-        this.rawPubKey = rawPubKey;
+        this.raw = raw;
     }
     /**
      * Serialize this object
      */
     toJSON() {
         return {
-            pubKey: this.serialize(),
+            publicKey: this.serialize(),
         };
     }
     /**
-     * Deserialize a JSON object into a PubKey instance
+     * Deserialize a JSON object into a PublicKey instance
      * @param json - the json object
-     * @returns PubKey
+     * @returns PublicKey
      */
     static fromJSON(json) {
-        return PubKey.deserialize(json.pubKey);
+        return PublicKey.deserialize(json.publicKey);
     }
     /**
      * Generate a default pad key
@@ -107,31 +107,31 @@ class PubKey {
         // confident that no-one knows the private key associated with this
         // public key. See:
         // https://github.com/iden3/circomlib/blob/d5ed1c3ce4ca137a6b3ca48bec4ac12c1b38957a/src/pedersen_printbases.js
-        return new PubKey([
+        return new PublicKey([
             BigInt("10457101036533406547632367118273992217979173478358440826365724437999023779287"),
             BigInt("19824078218392094440610104313265183977899662750282163392862422243483260492317"),
         ]);
     }
 }
-exports.PubKey = PubKey;
+exports.PublicKey = PublicKey;
 /**
  * Deserialize a serialized public key
  * @param s the serialized public key
  * @returns the deserialized public key
  */
-PubKey.deserialize = (s) => {
+PublicKey.deserialize = (s) => {
     const len = exports.SERIALIZED_PUB_KEY_PREFIX.length;
-    return new PubKey((0, crypto_1.unpackPubKey)(BigInt(`0x${s.slice(len).toString()}`)));
+    return new PublicKey((0, crypto_1.unpackPublicKey)(BigInt(`0x${s.slice(len).toString()}`)));
 };
 /**
  * Check whether a serialized public key is serialized correctly
  * @param s the serialized public key
  * @returns whether the serialized public key is valid
  */
-PubKey.isValidSerializedPubKey = (s) => {
+PublicKey.isValidSerialized = (s) => {
     const correctPrefix = s.startsWith(exports.SERIALIZED_PUB_KEY_PREFIX);
     try {
-        PubKey.deserialize(s);
+        PublicKey.deserialize(s);
         return correctPrefix;
     }
     catch {

package/build/ts/publicKey.js.map

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

package/build/ts/stateLeaf.d.ts

@@ -1,18 +1,18 @@
 import type { IJsonStateLeaf, IStateLeaf, IStateLeafContractParams } from "./types";
-import { PubKey } from "./publicKey";
+import { PublicKey } from "./publicKey";
 /**
  * @notice A leaf in the state tree, which maps
  * public keys to voice credit balances
  */
 export declare class StateLeaf implements IStateLeaf {
-    pubKey: PubKey;
+    publicKey: PublicKey;
     voiceCreditBalance: bigint;
     /**
      * Create a new instance of a state leaf
-     * @param pubKey the public key of the user signin up
+     * @param publicKey the public key of the user signin up
      * @param voiceCreditBalance the voice credit balance of the user
      */
-    constructor(pubKey: PubKey, voiceCreditBalance: bigint);
+    constructor(publicKey: PublicKey, voiceCreditBalance: bigint);
     /**
      * Crate a deep copy of the object
      * @returns a copy of the state leaf

package/build/ts/stateLeaf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stateLeaf.d.ts","sourceRoot":"","sources":["../../ts/stateLeaf.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAGpF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;gBACS,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM;IAKtD;;;OAGG;IACH,IAAI,IAAI,SAAS;IAIjB;;;OAGG;IACH,MAAM,CAAC,YAAY,IAAI,SAAS;IAkBhC;;;OAGG;IACH,MAAM,CAAC,aAAa,IAAI,SAAS;IAKjC;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAuE;IAEtF;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAmB;IAEjD;;;OAGG;IACH,IAAI,QAAO,MAAM,CAA0B;IAE3C;;;OAGG;IACH,eAAe,IAAI,wBAAwB;IAO3C;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO;IAIhC;;;;;OAKG;IACH,SAAS,QAAO,MAAM,CAIpB;IAEF;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,YAAY,MAAM,KAAG,SAAS,CAKlD;IAEF;;OAEG;IACH,MAAM,IAAI,cAAc;IAOxB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS;CAGjD"}
+{"version":3,"file":"stateLeaf.d.ts","sourceRoot":"","sources":["../../ts/stateLeaf.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAGpF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;GAGG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,SAAS,EAAE,SAAS,CAAC;IAErB,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;gBACS,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM;IAK5D;;;OAGG;IACH,IAAI,IAAI,SAAS;IAIjB;;;OAGG;IACH,MAAM,CAAC,YAAY,IAAI,SAAS;IAkBhC;;;OAGG;IACH,MAAM,CAAC,aAAa,IAAI,SAAS;IAKjC;;;OAGG;IACH,OAAO,CAAC,OAAO,CAA0E;IAEzF;;;OAGG;IACH,eAAe,QAAO,MAAM,EAAE,CAAmB;IAEjD;;;OAGG;IACH,IAAI,QAAO,MAAM,CAA0B;IAE3C;;;OAGG;IACH,eAAe,IAAI,wBAAwB;IAO3C;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO;IAIhC;;;;;OAKG;IACH,SAAS,QAAO,MAAM,CAIpB;IAEF;;;;OAIG;IACH,MAAM,CAAC,WAAW,GAAI,YAAY,MAAM,KAAG,SAAS,CAKlD;IAEF;;OAEG;IACH,MAAM,IAAI,cAAc;IAOxB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS;CAGjD"}

package/build/ts/stateLeaf.js

@@ -11,15 +11,15 @@ const publicKey_1 = require("./publicKey");
 class StateLeaf {
     /**
      * Create a new instance of a state leaf
-     * @param pubKey the public key of the user signin up
+     * @param publicKey the public key of the user signin up
      * @param voiceCreditBalance the voice credit balance of the user
      */
-    constructor(pubKey, voiceCreditBalance) {
+    constructor(publicKey, voiceCreditBalance) {
         /**
          * Return this state leaf as an array of bigints
          * @returns the state leaf as an array of bigints
          */
-        this.asArray = () => [...this.pubKey.asArray(), this.voiceCreditBalance];
+        this.asArray = () => [...this.publicKey.asArray(), this.voiceCreditBalance];
         /**
          * Return this state leaf as an array of bigints
          * @returns the state leaf as an array of bigints
@@ -37,10 +37,10 @@ class StateLeaf {
          * @returns
          */
         this.serialize = () => {
-            const data = [this.pubKey.serialize(), this.voiceCreditBalance.toString(16)];
+            const data = [this.publicKey.serialize(), this.voiceCreditBalance.toString(16)];
             return Buffer.from(JSON.stringify(data, null, 0), "utf8").toString("base64url");
         };
-        this.pubKey = pubKey;
+        this.publicKey = publicKey;
         this.voiceCreditBalance = voiceCreditBalance;
     }
     /**
@@ -48,7 +48,7 @@ class StateLeaf {
      * @returns a copy of the state leaf
      */
     copy() {
-        return new StateLeaf(this.pubKey.copy(), BigInt(this.voiceCreditBalance.toString()));
+        return new StateLeaf(this.publicKey.copy(), BigInt(this.voiceCreditBalance.toString()));
     }
     /**
      * Generate a blank state leaf
@@ -63,7 +63,7 @@ class StateLeaf {
         // https://github.com/iden3/circomlib/blob/d5ed1c3ce4ca137a6b3ca48bec4ac12c1b38957a/src/pedersen_printbases.js
         // Its hash should equal
         // 11672248758340751985123309654953904206381780234474872690580702076708041504880.
-        return new StateLeaf(new publicKey_1.PubKey([
+        return new StateLeaf(new publicKey_1.PublicKey([
             BigInt("10457101036533406547632367118273992217979173478358440826365724437999023779287"),
             BigInt("19824078218392094440610104313265183977899662750282163392862422243483260492317"),
         ]), BigInt(0));
@@ -74,7 +74,7 @@ class StateLeaf {
      */
     static genRandomLeaf() {
         const keypair = new keyPair_1.Keypair();
-        return new StateLeaf(keypair.pubKey, (0, crypto_1.genRandomSalt)());
+        return new StateLeaf(keypair.publicKey, (0, crypto_1.generateRandomSalt)());
     }
     /**
      * Return this state leaf as a contract param
@@ -82,7 +82,7 @@ class StateLeaf {
      */
     asContractParam() {
         return {
-            pubKey: this.pubKey.asContractParam(),
+            publicKey: this.publicKey.asContractParam(),
             voiceCreditBalance: this.voiceCreditBalance.toString(),
         };
     }
@@ -92,14 +92,14 @@ class StateLeaf {
      * @returns whether they are equal or not
      */
     equals(leaf) {
-        return this.pubKey.equals(leaf.pubKey) && this.voiceCreditBalance === leaf.voiceCreditBalance;
+        return this.publicKey.equals(leaf.publicKey) && this.voiceCreditBalance === leaf.voiceCreditBalance;
     }
     /**
      * Serialize to a JSON object
      */
     toJSON() {
         return {
-            pubKey: this.pubKey.serialize(),
+            publicKey: this.publicKey.serialize(),
             voiceCreditBalance: this.voiceCreditBalance.toString(),
         };
     }
@@ -109,7 +109,7 @@ class StateLeaf {
      * @returns the deserialized object as a StateLeaf instance
      */
     static fromJSON(json) {
-        return new StateLeaf(publicKey_1.PubKey.deserialize(json.pubKey), BigInt(json.voiceCreditBalance));
+        return new StateLeaf(publicKey_1.PublicKey.deserialize(json.publicKey), BigInt(json.voiceCreditBalance));
     }
 }
 exports.StateLeaf = StateLeaf;
@@ -121,6 +121,6 @@ exports.StateLeaf = StateLeaf;
 StateLeaf.deserialize = (serialized) => {
     const base64 = serialized.replace(/-/g, "+").replace(/_/g, "/");
     const json = JSON.parse(Buffer.from(base64, "base64").toString("utf8"));
-    return new StateLeaf(publicKey_1.PubKey.deserialize(json[0]), BigInt(`0x${json[1]}`));
+    return new StateLeaf(publicKey_1.PublicKey.deserialize(json[0]), BigInt(`0x${json[1]}`));
 };
 //# sourceMappingURL=stateLeaf.js.map

package/build/ts/stateLeaf.js.map

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