@dorafactory/maci-sdk 0.1.3-pre.46.beta.7 → 0.1.3-pre.46.beta.8

package/dist/index.js

@@ -4478,11 +4478,11 @@ function getAMaciRoundCircuitFee(network, maxVoter, maxOption) {
     amount: "0"
   };
   if (maxVoter <= 25 && maxOption <= 5) {
-    requiredFee.amount = "20000000000000000000";
+    requiredFee.amount = "5000000000000000000";
   } else if (maxVoter <= 625 && maxOption <= 25) {
-    requiredFee.amount = "540000000000000000000";
+    requiredFee.amount = "27000000000000000000";
   } else if (maxVoter <= 15625 && maxOption <= 125) {
-    requiredFee.amount = "1080000000000000000000";
+    requiredFee.amount = "208000000000000000000";
   } else {
     throw new Error("Number of voters or options is too large.");
   }
@@ -5186,7 +5186,7 @@ var import_tx = require("cosmjs-types/cosmwasm/wasm/v1/tx.js");
 // src/libs/maci/config.ts
 var FEE_DENOM = "peaka";
 var DEACTIVATE_FEE = "10000000000000000000";
-var MESSAGE_FEE = "10000000000000000000";
+var MESSAGE_FEE = "60000000000000000";
 
 // src/libs/maci/maci.ts
 function isErrorResponse(response) {
@@ -7901,7 +7901,7 @@ var VoterClient = class _VoterClient {
     derivePathParams
   }) {
     const plan = this.normalizeVoteOptions(selectedOptions);
-    const payload = this.batchGenMessage(stateIdx, operatorPubkey, pollId, plan, derivePathParams);
+    const payload = pollId !== void 0 ? this.batchGenMessage(stateIdx, operatorPubkey, pollId, plan, derivePathParams) : this.legacyBatchGenMessage(stateIdx, operatorPubkey, plan, derivePathParams);
     return stringizing(payload);
   }
   /**
@@ -8009,13 +8009,25 @@ var VoterClient = class _VoterClient {
     derivePathParams
   }) {
     const [coordPubkeyX, coordPubkeyY] = this.unpackMaciPubkey(operatorPubkey);
-    const addKeyInput = await this.genAddKeyInput(stateTreeDepth + 2, {
-      coordPubKey: [coordPubkeyX, coordPubkeyY],
-      deactivates: deactivates.map((d) => d.map(BigInt)),
-      newPubKey: newPubkey,
-      pollId,
-      derivePathParams
-    });
+    let addKeyInput;
+    if (pollId !== void 0) {
+      if (!newPubkey) {
+        throw new Error("buildAddNewKeyPayload: `newPubkey` is required when `pollId` is provided");
+      }
+      addKeyInput = await this.genAddKeyInput(stateTreeDepth + 2, {
+        coordPubKey: [coordPubkeyX, coordPubkeyY],
+        deactivates: deactivates.map((d) => d.map(BigInt)),
+        newPubKey: newPubkey,
+        pollId,
+        derivePathParams
+      });
+    } else {
+      addKeyInput = await this.legacyGenAddKeyInput(stateTreeDepth + 2, {
+        coordPubKey: [coordPubkeyX, coordPubkeyY],
+        deactivates: deactivates.map((d) => d.map(BigInt)),
+        derivePathParams
+      });
+    }
     if (addKeyInput === null) {
       throw Error("genAddKeyInput failed");
     }
@@ -8046,6 +8058,36 @@ var VoterClient = class _VoterClient {
     derivePathParams
   }) {
     const [coordPubkeyX, coordPubkeyY] = this.unpackMaciPubkey(coordinatorPubkey);
+    if (pollId === void 0) {
+      if (!deactivates || deactivates.length === 0) {
+        throw new Error(
+          "buildPreAddNewKeyPayload: `deactivates` is required in legacy mode (pollId omitted)"
+        );
+      }
+      const addKeyInput2 = await this.legacyGenPreAddKeyInput(stateTreeDepth + 2, {
+        coordPubKey: [coordPubkeyX, coordPubkeyY],
+        deactivates: deactivates.map((d) => d.map(BigInt)),
+        derivePathParams
+      });
+      if (addKeyInput2 === null) {
+        throw Error("legacyGenPreAddKeyInput failed, cannot find deactivate idx");
+      }
+      const { proof: proof2 } = await import_snarkjs.groth16.fullProve(addKeyInput2, wasmFile, zkeyFile);
+      const proofHex2 = await adaptToUncompressed(proof2);
+      return {
+        proof: proofHex2,
+        d: [
+          addKeyInput2.d1[0].toString(),
+          addKeyInput2.d1[1].toString(),
+          addKeyInput2.d2[0].toString(),
+          addKeyInput2.d2[1].toString()
+        ],
+        nullifier: addKeyInput2.nullifier.toString()
+      };
+    }
+    if (!newPubkey) {
+      throw new Error("buildPreAddNewKeyPayload: `newPubkey` is required when `pollId` is provided");
+    }
     const coordPubKey = [coordPubkeyX, coordPubkeyY];
     let resolvedDeactivates;
     let preComputedTreeProof;
@@ -8282,7 +8324,7 @@ var VoterClient = class _VoterClient {
     nonce = 0,
     derivePathParams
   }) {
-    const genMessage = this.genMessageFactory(stateIdx, operatorPubkey, pollId, derivePathParams);
+    const genMessage = pollId !== void 0 ? this.genMessageFactory(stateIdx, operatorPubkey, pollId, derivePathParams) : this.legacyGenMessageFactory(stateIdx, operatorPubkey, derivePathParams);
     const encAccount = genKeypair();
     const msg = genMessage(BigInt(encAccount.privKey), nonce, 0, 0, true);
     return stringizing({
@@ -8290,6 +8332,225 @@ var VoterClient = class _VoterClient {
       encPubkeys: encAccount.pubKey
     });
   }
+  // ==================== Legacy Methods (backward-compat, no pollId) ====================
+  legacyGenMessageFactory(stateIdx, operatorPubkey, derivePathParams) {
+    return (encPriKey, nonce, voIdx, newVotes, isLastCmd, salt) => {
+      if (salt === void 0) {
+        salt = BigInt(`0x${import_crypto_js3.default.lib.WordArray.random(7).toString(import_crypto_js3.default.enc.Hex)}`);
+      }
+      const packaged = BigInt(nonce) + (BigInt(stateIdx) << 32n) + (BigInt(voIdx) << 64n) + (BigInt(newVotes) << 96n) + (BigInt(salt) << 192n);
+      const signer = this.getSigner(derivePathParams);
+      let newPubKey;
+      if (isLastCmd) {
+        newPubKey = [0n, 0n];
+      } else {
+        newPubKey = [...signer.getPublicKey().toPoints()];
+      }
+      const hash = poseidon([packaged, ...newPubKey]);
+      const signature = signer.sign(hash);
+      const command = [packaged, ...newPubKey, ...signature.R8, signature.S];
+      const coordPubkey = this.unpackMaciPubkey(operatorPubkey);
+      const message = (0, import_poseidon_cipher3.poseidonEncrypt)(command, genEcdhSharedKey(encPriKey, coordPubkey), 0n);
+      return message;
+    };
+  }
+  legacyBatchGenMessage(stateIdx, operatorPubkey, plan, derivePathParams) {
+    const genMessage = this.legacyGenMessageFactory(stateIdx, operatorPubkey, derivePathParams);
+    const payload = [];
+    for (let i = plan.length - 1; i >= 0; i--) {
+      const p = plan[i];
+      const encAccount = genKeypair();
+      const isLastCmd = i === plan.length - 1;
+      const msg = genMessage(BigInt(encAccount.privKey), i + 1, p[0], p[1], isLastCmd);
+      payload.push({
+        msg,
+        encPubkeys: encAccount.pubKey
+      });
+    }
+    return payload;
+  }
+  legacyBuildVotePayload({
+    stateIdx,
+    operatorPubkey,
+    selectedOptions,
+    derivePathParams
+  }) {
+    const plan = this.normalizeVoteOptions(selectedOptions);
+    const payload = this.legacyBatchGenMessage(stateIdx, operatorPubkey, plan, derivePathParams);
+    return stringizing(payload);
+  }
+  legacyBuildDeactivatePayload({
+    stateIdx,
+    operatorPubkey,
+    nonce = 0,
+    derivePathParams
+  }) {
+    const genMessage = this.legacyGenMessageFactory(stateIdx, operatorPubkey, derivePathParams);
+    const encAccount = genKeypair();
+    const msg = genMessage(BigInt(encAccount.privKey), nonce, 0, 0, true);
+    return stringizing({
+      msg,
+      encPubkeys: encAccount.pubKey
+    });
+  }
+  async legacyGenAddKeyInput(depth, {
+    coordPubKey,
+    deactivates,
+    derivePathParams
+  }) {
+    const signer = this.getSigner(derivePathParams);
+    const sharedKeyHash = poseidon(signer.genEcdhSharedKey(coordPubKey));
+    const randomVal = genRandomSalt();
+    const deactivateIdx = deactivates.findIndex((d) => d[4] === sharedKeyHash);
+    if (deactivateIdx < 0) {
+      return null;
+    }
+    const deactivateLeaf = deactivates[deactivateIdx];
+    const c1 = [deactivateLeaf[0], deactivateLeaf[1]];
+    const c2 = [deactivateLeaf[2], deactivateLeaf[3]];
+    const { d1, d2 } = rerandomize(coordPubKey, { c1, c2 }, randomVal);
+    const nullifier = poseidon([signer.getFormatedPrivKey(), 1444992409218394441042n]);
+    const tree = new Tree(5, depth, 0n);
+    const leaves = deactivates.map((d) => poseidon(d));
+    tree.initLeaves(leaves);
+    const deactivateRoot = tree.root;
+    const deactivateLeafPathElements = tree.pathElementOf(deactivateIdx);
+    const inputHash = computeInputHash([
+      deactivateRoot,
+      poseidon(coordPubKey),
+      nullifier,
+      d1[0],
+      d1[1],
+      d2[0],
+      d2[1]
+    ]);
+    return {
+      inputHash,
+      coordPubKey,
+      deactivateRoot,
+      deactivateIndex: deactivateIdx,
+      deactivateLeaf: poseidon(deactivateLeaf),
+      c1,
+      c2,
+      randomVal,
+      d1,
+      d2,
+      deactivateLeafPathElements,
+      nullifier,
+      oldPrivateKey: signer.getFormatedPrivKey()
+    };
+  }
+  async legacyGenPreAddKeyInput(depth, {
+    coordPubKey,
+    deactivates,
+    derivePathParams
+  }) {
+    const signer = this.getSigner(derivePathParams);
+    const sharedKeyHash = poseidon(signer.genEcdhSharedKey(coordPubKey));
+    const randomVal = genRandomSalt();
+    const deactivateIdx = deactivates.findIndex((d) => d[4] === sharedKeyHash);
+    if (deactivateIdx < 0) {
+      return null;
+    }
+    const deactivateLeaf = deactivates[deactivateIdx];
+    const c1 = [deactivateLeaf[0], deactivateLeaf[1]];
+    const c2 = [deactivateLeaf[2], deactivateLeaf[3]];
+    const { d1, d2 } = rerandomize(coordPubKey, { c1, c2 }, randomVal);
+    const nullifier = poseidon([signer.getFormatedPrivKey(), 1444992409218394441042n]);
+    const tree = new Tree(5, depth, 0n);
+    const leaves = deactivates.map((d) => poseidon(d));
+    tree.initLeaves(leaves);
+    const deactivateRoot = tree.root;
+    const deactivateLeafPathElements = tree.pathElementOf(deactivateIdx);
+    const inputHash = computeInputHash([
+      deactivateRoot,
+      poseidon(coordPubKey),
+      nullifier,
+      d1[0],
+      d1[1],
+      d2[0],
+      d2[1]
+    ]);
+    return {
+      inputHash,
+      coordPubKey,
+      deactivateRoot,
+      deactivateIndex: deactivateIdx,
+      deactivateLeaf: poseidon(deactivateLeaf),
+      c1,
+      c2,
+      randomVal,
+      d1,
+      d2,
+      deactivateLeafPathElements,
+      nullifier,
+      oldPrivateKey: signer.getFormatedPrivKey()
+    };
+  }
+  /**
+   * Legacy `buildAddNewKeyPayload` — old deactivate+addNewKey flow without `pollId` / `newPubKey`
+   * in the ZK circuit.  Use when interacting with contracts that predate the poll-ID upgrade.
+   */
+  async legacyBuildAddNewKeyPayload({
+    stateTreeDepth,
+    operatorPubkey,
+    deactivates,
+    wasmFile,
+    zkeyFile,
+    derivePathParams
+  }) {
+    const [coordPubkeyX, coordPubkeyY] = this.unpackMaciPubkey(operatorPubkey);
+    const addKeyInput = await this.legacyGenAddKeyInput(stateTreeDepth + 2, {
+      coordPubKey: [coordPubkeyX, coordPubkeyY],
+      deactivates: deactivates.map((d) => d.map(BigInt)),
+      derivePathParams
+    });
+    if (addKeyInput === null) {
+      throw Error("legacyGenAddKeyInput failed, cannot find deactivate idx");
+    }
+    const { proof } = await import_snarkjs.groth16.fullProve(addKeyInput, wasmFile, zkeyFile);
+    const proofHex = await adaptToUncompressed(proof);
+    return {
+      proof: proofHex,
+      d: [
+        addKeyInput.d1[0].toString(),
+        addKeyInput.d1[1].toString(),
+        addKeyInput.d2[0].toString(),
+        addKeyInput.d2[1].toString()
+      ],
+      nullifier: addKeyInput.nullifier.toString()
+    };
+  }
+  async legacyBuildPreAddNewKeyPayload({
+    stateTreeDepth,
+    coordinatorPubkey,
+    deactivates,
+    wasmFile,
+    zkeyFile,
+    derivePathParams
+  }) {
+    const [coordPubkeyX, coordPubkeyY] = this.unpackMaciPubkey(coordinatorPubkey);
+    const addKeyInput = await this.legacyGenPreAddKeyInput(stateTreeDepth + 2, {
+      coordPubKey: [coordPubkeyX, coordPubkeyY],
+      deactivates: deactivates.map((d) => d.map(BigInt)),
+      derivePathParams
+    });
+    if (addKeyInput === null) {
+      throw Error("legacyGenPreAddKeyInput failed, cannot find deactivate idx");
+    }
+    const { proof } = await import_snarkjs.groth16.fullProve(addKeyInput, wasmFile, zkeyFile);
+    const proofHex = await adaptToUncompressed(proof);
+    return {
+      proof: proofHex,
+      d: [
+        addKeyInput.d1[0].toString(),
+        addKeyInput.d1[1].toString(),
+        addKeyInput.d2[0].toString(),
+        addKeyInput.d2[1].toString()
+      ],
+      nullifier: addKeyInput.nullifier.toString()
+    };
+  }
   // ==================== SaaS API Client Methods ====================
   /**
    * Create a MACI round via SaaS API
@@ -8419,7 +8680,7 @@ var VoterClient = class _VoterClient {
       deactivateIdx,
       voterScale,
       newPubkey,
-      pollId: BigInt(pollId),
+      pollId: pollId !== void 0 ? BigInt(pollId) : void 0,
       wasmFile,
       zkeyFile,
       derivePathParams
@@ -9372,6 +9633,19 @@ var OperatorClient = class {
       throw new Error("Poll ID not set. Ensure initRound was called with pollId parameter.");
     }
     const batchSize = this.batchSize;
+    if (this.msgEndIdx === 0) {
+      this.endProcessingPeriod();
+      const newStateRoot2 = this.stateTree.root;
+      const newStateCommitment2 = poseidon([newStateRoot2, newStateSalt]);
+      this.stateCommitment = newStateCommitment2;
+      return {
+        input: {
+          newStateCommitment: newStateCommitment2,
+          packedVals: BigInt(this.maxVoteOptions) + (BigInt(this.numSignUps) << 32n) + (this.isQuadraticCost ? 1n << 64n : 0n)
+        },
+        proof: null
+      };
+    }
     const batchStartIdx = Math.floor((this.msgEndIdx - 1) / batchSize) * batchSize;
     const batchEndIdx = Math.min(batchStartIdx + batchSize, this.msgEndIdx);
     console.log(`Process messages [${batchStartIdx}, ${batchEndIdx})`);