@dorafactory/maci-sdk 0.0.52 → 0.0.55

package/README.md

@@ -188,17 +188,10 @@ const signupResponse = await client.maci.signup({
   gasStation: true, // Whether to use gas station
 });
 
-// 5. Get user state index
-const stateIdx = await client.maci.getStateIdxByPubKey({
-  contractAddress: 'dora1...',
-  pubKey: maciAccount.pubKey,
-});
-
-// 6. Cast vote
+// 5. Cast vote
 const voteResponse = await client.maci.vote({
   signer: wallet,
   address,
-  stateIdx,
   contractAddress: 'dora1...',
   selectedOptions: [
     { idx: 0, vc: 2 }, // Option index and voting weight

package/dist/index.js

@@ -673,6 +673,8 @@ var hashOne = (preImage) => poseidonT3([preImage, BigInt(0)]);
 // src/libs/crypto/tree.ts
 var Tree = class _Tree {
   constructor(degree, depth, zero) {
+    this.nodes = [];
+    this.zeros = [];
     this.DEPTH = depth;
     this.HEIGHT = depth + 1;
     this.DEGREE = degree;
@@ -686,23 +688,26 @@ var Tree = class _Tree {
     return this.nodes[0];
   }
   initZero(zero) {
-    this.zeros = new Array(this.HEIGHT);
-    this.zeros[0] = zero;
-    for (let i = 1; i < this.zeros.length; i++) {
-      this.zeros[i] = poseidon([this.zeros[i - 1], this.zeros[i - 1]]);
+    const zeros = new Array(this.HEIGHT);
+    zeros[0] = zero;
+    for (let i = 1; i < zeros.length; i++) {
+      const children = new Array(this.DEGREE).fill(zeros[i - 1]);
+      zeros[i] = poseidon(children);
     }
+    this.zeros = zeros;
   }
   initNodes() {
     const DEGREE = this.DEGREE;
-    this.nodes = new Array(this.NODES_COUNT);
+    const nodes = new Array(this.NODES_COUNT);
     for (let d = this.DEPTH; d >= 0; d--) {
       const size = DEGREE ** d;
       const idx0 = (DEGREE ** d - 1) / (DEGREE - 1);
       const zero = this.zeros[this.DEPTH - d];
       for (let i = 0; i < size; i++) {
-        this.nodes[idx0 + i] = zero;
+        nodes[idx0 + i] = zero;
       }
     }
+    this.nodes = nodes;
   }
   initLeaves(leaves) {
     const DEGREE = this.DEGREE;
@@ -750,7 +755,7 @@ var Tree = class _Tree {
     for (let i = 0; i < this.DEPTH; i++) {
       const parentIdx = Math.floor((idx - 1) / this.DEGREE);
       const childrenIdx0 = parentIdx * this.DEGREE + 1;
-      pathIdx.push(idx - childrenIdx0);
+      pathIdx.push(BigInt(idx - childrenIdx0));
       idx = parentIdx;
     }
     return pathIdx;
@@ -798,13 +803,12 @@ var Tree = class _Tree {
       const parentIdx = Math.floor((idx - 1) / this.DEGREE);
       const childrenIdx0 = parentIdx * this.DEGREE + 1;
       this.nodes[parentIdx] = poseidon(
-        this.nodes.slice(childrenIdx0, childrenIdx0 + this.DEGREE)
+        this.nodes.slice(childrenIdx0, childrenIdx0 + 5)
       );
       idx = parentIdx;
     }
   }
 };
-var tree_default = Tree;
 
 // src/libs/crypto/babyjub.ts
 var import_assert3 = __toESM(require("assert"));
@@ -1013,7 +1017,7 @@ var genAddKeyInput = (depth, {
     BigInt(oldKey.formatedPrivKey),
     1444992409218394441042n
   ]);
-  const tree = new tree_default(5, depth, 0n);
+  const tree = new Tree(5, depth, 0n);
   const leaves = deactivates.map((d) => poseidon(d));
   tree.initLeaves(leaves);
   const deactivateRoot = tree.root;
@@ -5501,15 +5505,23 @@ var MACI = class {
   async vote({
     signer,
     address,
-    stateIdx,
     contractAddress,
     selectedOptions,
     operatorCoordPubKey,
     maciKeypair,
     gasStation = false
   }) {
+    if (maciKeypair === void 0) {
+      maciKeypair = this.maciKeypair;
+    }
+    const stateIdx = await this.getStateIdxByPubKey({
+      contractAddress,
+      pubKey: maciKeypair.pubKey
+    });
     if (stateIdx === -1) {
-      throw new Error("State index is not set, Please signup first");
+      throw new Error(
+        "State index is not set, Please signup or addNewKey first"
+      );
     }
     try {
       const round = await this.indexer.getRoundWithFields(contractAddress, [
@@ -5561,9 +5573,6 @@ var MACI = class {
       if (!address) {
         address = (await signer.getAccounts())[0].address;
       }
-      if (maciKeypair === void 0) {
-        maciKeypair = this.maciKeypair;
-      }
       const plan = options.map((o) => {
         return [o.idx, o.vc];
       });
@@ -6122,8 +6131,18 @@ var MaciClient2 = class {
   async getVoiceCreditBalance({
     signer,
     stateIdx,
+    maciKeypair,
     contractAddress
   }) {
+    if (maciKeypair === void 0) {
+      maciKeypair = this.maciKeypair;
+    }
+    if (stateIdx === void 0) {
+      stateIdx = await this.getStateIdxByPubKey({
+        contractAddress,
+        pubKey: maciKeypair.pubKey
+      });
+    }
     return await this.maci.getVoiceCreditBalance({
       signer: this.getSigner(signer),
       stateIdx,
@@ -6283,7 +6302,6 @@ var MaciClient2 = class {
   async vote({
     signer,
     address,
-    stateIdx,
     contractAddress,
     selectedOptions,
     operatorCoordPubKey,
@@ -6293,7 +6311,6 @@ var MaciClient2 = class {
     return await this.maci.vote({
       signer: this.getSigner(signer),
       address,
-      stateIdx,
       contractAddress,
       selectedOptions,
       operatorCoordPubKey,