@dorafactory/maci-sdk 0.1.3-pre.46.beta.1 → 0.1.3-pre.46.beta.11

package/dist/index.js

@@ -1247,7 +1247,9 @@ var rerandomize = (pubKey, ciphertext, randomVal = genRandomSalt()) => {
 var genAddKeyInput = (depth, {
   coordPubKey,
   oldKey,
-  deactivates
+  deactivates,
+  newPubKey,
+  pollId
 }) => {
   const sharedKeyHash = poseidon(genEcdhSharedKey(oldKey.privKey, coordPubKey));
   const randomVal = genRandomSalt();
@@ -1259,7 +1261,7 @@ var genAddKeyInput = (depth, {
   const c1 = [deactivateLeaf[0], deactivateLeaf[1]];
   const c2 = [deactivateLeaf[2], deactivateLeaf[3]];
   const { d1, d2 } = rerandomize(coordPubKey, { c1, c2 }, randomVal);
-  const nullifier = poseidon([BigInt(oldKey.formatedPrivKey), 1444992409218394441042n]);
+  const nullifier = poseidon([BigInt(oldKey.formatedPrivKey), pollId]);
   const tree = new Tree(5, depth, 0n);
   const leaves = deactivates.map((d) => poseidon(d));
   tree.initLeaves(leaves);
@@ -1272,7 +1274,9 @@ var genAddKeyInput = (depth, {
     d1[0],
     d1[1],
     d2[0],
-    d2[1]
+    d2[1],
+    poseidon(newPubKey),
+    pollId
   ]);
   const input = {
     inputHash,
@@ -1287,7 +1291,9 @@ var genAddKeyInput = (depth, {
     d2,
     deactivateLeafPathElements,
     nullifier,
-    oldPrivateKey: oldKey.formatedPrivKey
+    oldPrivateKey: oldKey.formatedPrivKey,
+    newPubKey,
+    pollId
   };
   return input;
 };
@@ -4342,6 +4348,46 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
         _funds
       );
     };
+    this.publishMessage = async ({
+      contractAddr,
+      encPubKeys,
+      messages
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          publish_message: {
+            contract_addr: contractAddr,
+            enc_pub_keys: encPubKeys,
+            messages
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
+    this.publishDeactivateMessage = async ({
+      contractAddr,
+      encPubKey,
+      message
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          publish_deactivate_message: {
+            contract_addr: contractAddr,
+            enc_pub_key: encPubKey,
+            message
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -4354,6 +4400,8 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
     this.createAmaciRound = this.createAmaciRound.bind(this);
     this.setRoundInfo = this.setRoundInfo.bind(this);
     this.setVoteOptionsMap = this.setVoteOptionsMap.bind(this);
+    this.publishMessage = this.publishMessage.bind(this);
+    this.publishDeactivateMessage = this.publishDeactivateMessage.bind(this);
   }
 };
 
@@ -4399,7 +4447,6 @@ async function createApiSaasClientBy({
   return new ApiSaasClient(signingCosmWasmClient, address, contractAddress);
 }
 async function createContractClientByWallet(rpcEndpoint, wallet) {
-  console.log("rpcEndpoint", rpcEndpoint);
   const client = await import_cosmwasm_stargate.SigningCosmWasmClient.connectWithSigner(rpcEndpoint, wallet, {
     ...defaultSigningClientOptions
   });
@@ -4431,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.");
   }
@@ -4515,6 +4562,7 @@ var Contract = class {
       [requiredFee]
     );
     let contractAddress = "";
+    let pollId = "";
     for (const event of res.events) {
       if (event.type === "wasm") {
         const actionEvent = event.attributes.find(
@@ -4524,8 +4572,16 @@ var Contract = class {
           const roundAddrEvent = event.attributes.find(
             (attr) => attr.key === "round_addr"
           );
+          const pollIdEvent = event.attributes.find(
+            (attr) => attr.key === "poll_id"
+          );
           if (roundAddrEvent) {
             contractAddress = roundAddrEvent.value.toString();
+          }
+          if (pollIdEvent) {
+            pollId = pollIdEvent.value.toString();
+          }
+          if (contractAddress) {
             break;
           }
         }
@@ -4533,7 +4589,8 @@ var Contract = class {
     }
     return {
       ...res,
-      contractAddress
+      contractAddress,
+      pollId
     };
   }
   async queryRoundInfo({ signer, roundAddress }) {
@@ -4944,6 +5001,7 @@ var Contract = class {
       createResponse = await client.createAmaciRound(roundParams, fee);
     }
     let contractAddress = "";
+    let pollId = "";
     for (const event of createResponse.events) {
       if (event.type === "wasm") {
         const actionEvent = event.attributes.find(
@@ -4953,8 +5011,16 @@ var Contract = class {
           const roundAddrEvent = event.attributes.find(
             (attr) => attr.key === "round_addr"
           );
+          const pollIdEvent = event.attributes.find(
+            (attr) => attr.key === "poll_id"
+          );
           if (roundAddrEvent) {
             contractAddress = roundAddrEvent.value.toString();
+          }
+          if (pollIdEvent) {
+            pollId = pollIdEvent.value.toString();
+          }
+          if (contractAddress) {
             break;
           }
         }
@@ -4962,9 +5028,126 @@ var Contract = class {
     }
     return {
       ...createResponse,
-      contractAddress
+      contractAddress,
+      pollId
     };
   }
+  async publishMessageViaSaas({
+    signer,
+    contractAddress,
+    encPubKeys,
+    messages,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        publish_message: {
+          contract_addr: contractAddress,
+          enc_pub_keys: encPubKeys,
+          messages
+        }
+      };
+      const gasEstimation = await contractClient.simulate(
+        address,
+        [
+          {
+            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+            value: {
+              sender: address,
+              contract: this.apiSaasAddress,
+              msg: new TextEncoder().encode(JSON.stringify(msg))
+            }
+          }
+        ],
+        ""
+      );
+      const multiplier = typeof fee === "number" ? fee : 1.8;
+      const gasPrice = import_stargate2.GasPrice.fromString("10000000000peaka");
+      const calculatedFee = (0, import_stargate2.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
+      const grantFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.publishMessage({ contractAddr: contractAddress, encPubKeys, messages }, grantFee);
+    } else {
+      const grantFee = {
+        ...fee,
+        granter: saasGranter
+      };
+      return client.publishMessage({ contractAddr: contractAddress, encPubKeys, messages }, grantFee);
+    }
+  }
+  async publishDeactivateMessageViaSaas({
+    signer,
+    contractAddress,
+    encPubKey,
+    message,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        publish_deactivate_message: {
+          contract_addr: contractAddress,
+          enc_pub_key: encPubKey,
+          message
+        }
+      };
+      const gasEstimation = await contractClient.simulate(
+        address,
+        [
+          {
+            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+            value: {
+              sender: address,
+              contract: this.apiSaasAddress,
+              msg: new TextEncoder().encode(JSON.stringify(msg))
+            }
+          }
+        ],
+        ""
+      );
+      const multiplier = typeof fee === "number" ? fee : 1.8;
+      const gasPrice = import_stargate2.GasPrice.fromString("10000000000peaka");
+      const calculatedFee = (0, import_stargate2.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
+      const grantFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.publishDeactivateMessage(
+        { contractAddr: contractAddress, encPubKey, message },
+        grantFee
+      );
+    } else {
+      const grantFee = {
+        ...fee,
+        granter: saasGranter
+      };
+      return client.publishDeactivateMessage(
+        { contractAddr: contractAddress, encPubKey, message },
+        grantFee
+      );
+    }
+  }
 };
 
 // src/libs/oracle-certificate/oracle-certificate.ts
@@ -5023,7 +5206,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) {
@@ -5486,6 +5669,18 @@ var MACI = class {
       if (!address) {
         address = (await signer.getAccounts())[0].address;
       }
+      const msgLength = payload[0]?.msg.length ?? 0;
+      if (msgLength === 7) {
+        return await this.publishMessageBatchLegacy({
+          signer,
+          address,
+          payload,
+          contractAddress,
+          gasStation,
+          granter,
+          fee
+        });
+      }
       return await this.publishMessageBatch({
         signer,
         address,
@@ -5571,34 +5766,29 @@ var MACI = class {
     }));
     const totalFee = (BigInt(MESSAGE_FEE) * BigInt(payload.length)).toString();
     const batchFunds = [{ denom: FEE_DENOM, amount: totalFee }];
-    if (gasStation && typeof fee !== "object") {
+    if (gasStation && granter === this.contract.apiSaasAddress) {
+      return this.contract.publishMessageViaSaas({
+        signer,
+        contractAddress,
+        encPubKeys,
+        messages,
+        granter,
+        fee
+      });
+    } else if (gasStation && typeof fee !== "object") {
       const client = await this.contract.contractClient({ signer });
-      const encPubKeysBigInt = payload.map((p) => ({
-        x: p.encPubkeys[0],
-        y: p.encPubkeys[1]
-      }));
-      const messagesBigInt = payload.map((p) => ({
-        data: p.msg
-      }));
-      const msg = {
+      const msgForSimulate = {
         typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
         value: import_tx.MsgExecuteContract.fromPartial({
           sender: address,
           contract: contractAddress,
           msg: new TextEncoder().encode(
-            JSON.stringify(
-              stringizing({
-                publish_message: {
-                  enc_pub_keys: encPubKeysBigInt,
-                  messages: messagesBigInt
-                }
-              })
-            )
+            JSON.stringify({ publish_message: { enc_pub_keys: encPubKeys, messages } })
           ),
           funds: batchFunds
         })
       };
-      const gasEstimation = await client.simulate(address, [msg], "");
+      const gasEstimation = await client.simulate(address, [msgForSimulate], "");
       const multiplier = typeof fee === "number" ? fee : 1.8;
       const gasPrice = import_stargate3.GasPrice.fromString("10000000000peaka");
       const calculatedFee = (0, import_stargate3.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
@@ -5617,6 +5807,63 @@ var MACI = class {
     }
     return amaciClient.publishMessage({ encPubKeys, messages }, fee, void 0, batchFunds);
   }
+  async publishMessageBatchLegacy({
+    signer,
+    address,
+    payload,
+    contractAddress,
+    gasStation,
+    granter,
+    fee = 1.8
+  }) {
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+    const client = await this.contract.contractClient({ signer });
+    const messages = payload.map((p) => ({
+      data: p.msg
+    }));
+    const encPubKeys = payload.map((p) => ({
+      x: p.encPubkeys[0],
+      y: p.encPubkeys[1]
+    }));
+    const msg = {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: import_tx.MsgExecuteContract.fromPartial({
+        sender: address,
+        contract: contractAddress,
+        msg: new TextEncoder().encode(
+          JSON.stringify(
+            stringizing({
+              publish_message_batch: {
+                enc_pub_keys: encPubKeys,
+                messages
+              }
+            })
+          )
+        )
+      })
+    };
+    if (gasStation && typeof fee !== "object") {
+      const gasEstimation = await client.simulate(address, [msg], "");
+      const multiplier = typeof fee === "number" ? fee : 1.8;
+      const gasPrice = import_stargate3.GasPrice.fromString("10000000000peaka");
+      const calculatedFee = (0, import_stargate3.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
+      const grantFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: granter || contractAddress
+      };
+      return client.signAndBroadcast(address, [msg], grantFee);
+    } else if (gasStation && typeof fee === "object") {
+      const grantFee = {
+        ...fee,
+        granter: granter || contractAddress
+      };
+      return client.signAndBroadcast(address, [msg], grantFee);
+    }
+    return client.signAndBroadcast(address, [msg], fee);
+  }
   async deactivate({
     signer,
     address,
@@ -5712,10 +5959,23 @@ var MACI = class {
   }) {
     try {
       address = address || (await signer.getAccounts())[0].address;
-      const client = await this.contract.contractClient({
-        signer
-      });
       const { msg, encPubkeys } = payload;
+      if (gasStation === true && granter === this.contract.apiSaasAddress) {
+        return this.contract.publishDeactivateMessageViaSaas({
+          signer,
+          contractAddress,
+          encPubKey: {
+            x: encPubkeys[0].toString(),
+            y: encPubkeys[1].toString()
+          },
+          message: {
+            data: msg.map((m) => m.toString())
+          },
+          granter,
+          fee
+        });
+      }
+      const client = await this.contract.contractClient({ signer });
       const deactivateMsg = stringizing({
         publish_deactivate_message: {
           enc_pub_key: {
@@ -5771,6 +6031,7 @@ var MACI = class {
   }
   async genAddKeyInput({
     maciKeypair,
+    newMaciKeypair,
     contractAddress
   }) {
     const deactivates = await this.fetchAllDeactivateLogs({
@@ -5779,12 +6040,15 @@ var MACI = class {
     const roundInfo = await this.getRoundInfo({
       contractAddress
     });
+    const pollId = await this.getPollId({ contractAddress });
     const circuitPower = roundInfo.circuitPower;
     const stateTreeDepth = Number(circuitPower.split("-")[0]);
     const inputObj = genAddKeyInput(stateTreeDepth + 2, {
       coordPubKey: [BigInt(roundInfo.coordinatorPubkeyX), BigInt(roundInfo.coordinatorPubkeyY)],
       oldKey: maciKeypair,
-      deactivates: deactivates.map((d) => d.map(BigInt))
+      deactivates: deactivates.map((d) => d.map(BigInt)),
+      newPubKey: newMaciKeypair.pubKey,
+      pollId: BigInt(pollId)
     });
     return inputObj;
   }
@@ -6429,6 +6693,47 @@ var MaciApiClient = class {
       method: "GET"
     });
   }
+  /**
+   * Get coordinator public key, deactivate root, and voter scale for a round.
+   * Lighter alternative to the full data endpoint when only circuit inputs are needed.
+   */
+  async getPreDeactivateMeta(params) {
+    return this.fetch(`/v1/pre-deactivate/${params.contractAddress}/meta`, {
+      method: "GET"
+    });
+  }
+  /**
+   * Get K-anonymous Merkle proof packages for the specified leaf indices.
+   * The caller should mix the real leaf index with decoy indices to preserve privacy.
+   */
+  async getPreDeactivateProof(contractAddress, indices) {
+    return this.fetch(
+      `/v1/pre-deactivate/${contractAddress}/proof?indices=${indices}`,
+      { method: "GET" }
+    );
+  }
+  // ==================== Claim Key APIs ====================
+  /**
+   * Claim MACI Key
+   * Assign the next available pre-generated MACI key pair for an AMACI round (first-come-first-served).
+   * Returns pubkey, secretKey, and the full deactivate Merkle proof.
+   * WARNING: secretKey is returned only once and cannot be retrieved again.
+   */
+  async claimMaciKey(params) {
+    return this.fetch(`/v1/rounds/${params.contractAddress}/claim-key`, {
+      method: "POST"
+    });
+  }
+  /**
+   * Get Claim Statistics
+   * Returns total key slots (scale), claimed count, and available count for the round.
+   * Public endpoint — no authentication required.
+   */
+  async getClaimStats(params) {
+    return this.fetch(`/v1/rounds/${params.contractAddress}/claim-key-stats`, {
+      method: "GET"
+    });
+  }
 };
 
 // src/maci.ts
@@ -6789,10 +7094,12 @@ var MaciClient = class {
   }
   async genAddKeyInput({
     contractAddress,
-    maciKeypair
+    maciKeypair,
+    newMaciKeypair
   }) {
     return await this.maci.genAddKeyInput({
       maciKeypair: maciKeypair || this.maciKeypair,
+      newMaciKeypair,
       contractAddress
     });
   }
@@ -7005,6 +7312,19 @@ var MaciClient = class {
     }
     return await this.saasApiClient.setVoteOptions(params);
   }
+  /**
+   * Claim the next available pre-generated MACI key pair for an AMACI round via SaaS API.
+   * The key is assigned on a first-come-first-served basis.
+   * WARNING: secretKey is returned only once — save it immediately, it cannot be retrieved again.
+   * @param contractAddress - Round contract address
+   * @returns Claimed key pair with full deactivate Merkle proof
+   */
+  async saasClaimKey(contractAddress) {
+    if (!this.saasApiClient) {
+      throw new Error("SaaS API client not initialized");
+    }
+    return await this.saasApiClient.claimMaciKey({ contractAddress });
+  }
 };
 
 // src/voter.ts
@@ -7497,6 +7817,15 @@ var MaciAccount = class {
 
 // src/voter.ts
 var import_poseidon_cipher3 = require("@zk-kit/poseidon-cipher");
+function buildKAnonymousIndices(deactivateIdx, voterScale) {
+  const kMax = Math.min(200, Math.floor(voterScale * 0.1) || 1);
+  const pool = Array.from({ length: voterScale }, (_, i) => i).filter((i) => i !== deactivateIdx);
+  for (let i = pool.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    [pool[i], pool[j]] = [pool[j], pool[i]];
+  }
+  return [deactivateIdx, ...pool.slice(0, kMax - 1)].sort((a, b) => a - b).join(",");
+}
 var VoterClient = class _VoterClient {
   /**
    * @constructor
@@ -7627,7 +7956,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);
   }
   /**
@@ -7728,16 +8057,32 @@ var VoterClient = class _VoterClient {
     stateTreeDepth,
     operatorPubkey,
     deactivates,
+    newPubkey,
+    pollId,
     wasmFile,
     zkeyFile,
     derivePathParams
   }) {
     const [coordPubkeyX, coordPubkeyY] = this.unpackMaciPubkey(operatorPubkey);
-    const addKeyInput = await this.genAddKeyInput(stateTreeDepth + 2, {
-      coordPubKey: [coordPubkeyX, coordPubkeyY],
-      deactivates: deactivates.map((d) => d.map(BigInt)),
-      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");
     }
@@ -7758,20 +8103,117 @@ var VoterClient = class _VoterClient {
     stateTreeDepth,
     coordinatorPubkey,
     deactivates,
+    contractAddress,
+    deactivateIdx,
+    voterScale,
+    preComputedProof,
+    newPubkey,
+    pollId,
     wasmFile,
     zkeyFile,
     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;
+    let preComputedLeaf;
+    if (deactivates && deactivates.length > 0) {
+      resolvedDeactivates = deactivates.map((d) => d.map(BigInt));
+    } else if (preComputedProof) {
+      if (deactivateIdx === void 0) {
+        throw new Error(
+          "buildPreAddNewKeyPayload: `deactivateIdx` is required when `preComputedProof` is provided"
+        );
+      }
+      preComputedLeaf = preComputedProof.deactivateLeaf.map(BigInt);
+      preComputedTreeProof = {
+        root: preComputedProof.root,
+        pathElements: preComputedProof.pathElements
+      };
+      resolvedDeactivates = [];
+    } else {
+      if (!contractAddress) {
+        throw new Error(
+          "buildPreAddNewKeyPayload: `contractAddress` is required when `deactivates` is not provided"
+        );
+      }
+      if (deactivateIdx === void 0) {
+        throw new Error(
+          "buildPreAddNewKeyPayload: `deactivateIdx` is required when `deactivates` is not provided"
+        );
+      }
+      if (voterScale === void 0) {
+        throw new Error(
+          "buildPreAddNewKeyPayload: `voterScale` is required for the K-anonymous API path"
+        );
+      }
+      const indicesParam = buildKAnonymousIndices(deactivateIdx, voterScale);
+      const proofResp = await this.saasApiClient.getPreDeactivateProof(
+        contractAddress,
+        indicesParam
+      );
+      const pkg = proofResp.proofs.find((p) => p.leafIndex === deactivateIdx);
+      if (!pkg) {
+        throw new Error(
+          `buildPreAddNewKeyPayload: proof package for leafIndex ${deactivateIdx} not found in API response`
+        );
+      }
+      preComputedLeaf = pkg.deactivateLeaf.map(BigInt);
+      preComputedTreeProof = {
+        root: proofResp.root,
+        pathElements: pkg.pathElements
+      };
+      resolvedDeactivates = [];
+    }
+    const genPreAddKeyInputStart = Date.now();
     const addKeyInput = await this.genPreAddKeyInput(stateTreeDepth + 2, {
-      coordPubKey: [coordPubkeyX, coordPubkeyY],
-      deactivates: deactivates.map((d) => d.map(BigInt)),
-      derivePathParams
+      coordPubKey,
+      deactivates: resolvedDeactivates,
+      newPubKey: newPubkey,
+      pollId,
+      derivePathParams,
+      preComputedTreeProof,
+      preComputedLeaf,
+      deactivateIdx
     });
+    console.log(`[genPreAddKeyInput] elapsed: ${Date.now() - genPreAddKeyInputStart}ms`);
     if (addKeyInput === null) {
       throw Error("genPreAddKeyInput failed, cannot find deactivate idx");
     }
+    const fullProveStart = Date.now();
     const { proof } = await import_snarkjs.groth16.fullProve(addKeyInput, wasmFile, zkeyFile);
+    console.log(`[fullProve] elapsed: ${Date.now() - fullProveStart}ms`);
     const proofHex = await adaptToUncompressed(proof);
     return {
       proof: proofHex,
@@ -7787,6 +8229,8 @@ var VoterClient = class _VoterClient {
   async genAddKeyInput(depth, {
     coordPubKey,
     deactivates,
+    newPubKey,
+    pollId,
     derivePathParams
   }) {
     const signer = this.getSigner(derivePathParams);
@@ -7800,7 +8244,7 @@ var VoterClient = class _VoterClient {
     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 nullifier = poseidon([signer.getFormatedPrivKey(), pollId]);
     const tree = new Tree(5, depth, 0n);
     const leaves = deactivates.map((d) => poseidon(d));
     tree.initLeaves(leaves);
@@ -7813,7 +8257,9 @@ var VoterClient = class _VoterClient {
       d1[0],
       d1[1],
       d2[0],
-      d2[1]
+      d2[1],
+      poseidon(newPubKey),
+      pollId
     ]);
     const input = {
       inputHash,
@@ -7828,32 +8274,75 @@ var VoterClient = class _VoterClient {
       d2,
       deactivateLeafPathElements,
       nullifier,
-      oldPrivateKey: signer.getFormatedPrivKey()
+      oldPrivateKey: signer.getFormatedPrivKey(),
+      newPubKey,
+      pollId
     };
     return input;
   }
   async genPreAddKeyInput(depth, {
     coordPubKey,
     deactivates,
-    derivePathParams
+    newPubKey,
+    pollId,
+    derivePathParams,
+    preComputedTreeProof,
+    preComputedLeaf,
+    deactivateIdx: providedDeactivateIdx
   }) {
+    let t0 = Date.now();
     const signer = this.getSigner(derivePathParams);
-    const sharedKeyHash = poseidon(signer.genEcdhSharedKey(coordPubKey));
+    console.log(`[genPreAddKeyInput] getSigner: ${Date.now() - t0}ms`);
+    t0 = Date.now();
     const randomVal = genRandomSalt();
-    const deactivateIdx = deactivates.findIndex((d) => d[4] === sharedKeyHash);
-    if (deactivateIdx < 0) {
+    let deactivateIdx;
+    if (providedDeactivateIdx !== void 0) {
+      deactivateIdx = providedDeactivateIdx;
+      console.log(
+        `[genPreAddKeyInput] using provided deactivateIdx=${deactivateIdx} (skip search)`
+      );
+    } else {
+      const sharedKeyHash = poseidon(signer.genEcdhSharedKey(coordPubKey));
+      console.log(`[genPreAddKeyInput] genEcdhSharedKey + poseidon: ${Date.now() - t0}ms`);
+      t0 = Date.now();
+      deactivateIdx = deactivates.findIndex((d) => d[4] === sharedKeyHash);
+      if (deactivateIdx < 0) {
+        return null;
+      }
+      console.log(`[genPreAddKeyInput] genRandomSalt + findDeactivateIdx: ${Date.now() - t0}ms`);
+      t0 = Date.now();
+    }
+    const deactivateLeaf = preComputedLeaf ?? deactivates[deactivateIdx];
+    if (!deactivateLeaf) {
       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);
+    console.log(`[genPreAddKeyInput] rerandomize: ${Date.now() - t0}ms`);
+    t0 = Date.now();
+    const nullifier = poseidon([signer.getFormatedPrivKey(), pollId]);
+    console.log(`[genPreAddKeyInput] nullifier (poseidon): ${Date.now() - t0}ms`);
+    t0 = Date.now();
+    let deactivateRoot;
+    let deactivateLeafPathElements;
+    if (preComputedTreeProof) {
+      deactivateRoot = BigInt(preComputedTreeProof.root);
+      deactivateLeafPathElements = preComputedTreeProof.pathElements.map(
+        (level) => level.map(BigInt)
+      );
+      console.log(`[genPreAddKeyInput] using preComputedTreeProof (API path)`);
+    } else {
+      const tree = new Tree(5, depth, 0n);
+      const leaves = deactivates.map((d) => poseidon(d));
+      tree.initLeaves(leaves);
+      console.log(`[genPreAddKeyInput] build tree + initLeaves: ${Date.now() - t0}ms`);
+      t0 = Date.now();
+      deactivateRoot = tree.root;
+      deactivateLeafPathElements = tree.pathElementOf(deactivateIdx);
+      console.log(`[genPreAddKeyInput] tree.root + pathElementOf: ${Date.now() - t0}ms`);
+      t0 = Date.now();
+    }
     const inputHash = computeInputHash([
       deactivateRoot,
       poseidon(coordPubKey),
@@ -7861,8 +8350,12 @@ var VoterClient = class _VoterClient {
       d1[0],
       d1[1],
       d2[0],
-      d2[1]
+      d2[1],
+      poseidon(newPubKey),
+      pollId
     ]);
+    console.log(`[genPreAddKeyInput] computeInputHash: ${Date.now() - t0}ms`);
+    t0 = Date.now();
     const input = {
       inputHash,
       coordPubKey,
@@ -7876,7 +8369,9 @@ var VoterClient = class _VoterClient {
       d2,
       deactivateLeafPathElements,
       nullifier,
-      oldPrivateKey: signer.getFormatedPrivKey()
+      oldPrivateKey: signer.getFormatedPrivKey(),
+      newPubKey,
+      pollId
     };
     return input;
   }
@@ -7897,7 +8392,68 @@ 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({
+      msg,
+      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({
@@ -7905,6 +8461,164 @@ var VoterClient = class _VoterClient {
       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
@@ -7995,8 +8709,14 @@ var VoterClient = class _VoterClient {
   }
   // ==================== Maci Voter Methods ====================
   /**
-   * Pre-create a new account for AMACI voting (pre-deactivate mode)
-   * @param params - Parameters including contract address, deactivates, circuit files, and ticket
+   * Pre-create a new account for AMACI voting (pre-deactivate mode).
+   *
+   * Two modes are supported:
+   * - **Local mode**: pass `deactivates` to build the Merkle tree locally (original behaviour).
+   * - **API mode**: omit `deactivates` and the proof will be fetched from the SaaS API using
+   *   `contractAddress` (K-anonymous request).
+   *
+   * @param params - Parameters including contract address, optional deactivates, circuit files, and ticket
    * @returns Result with transaction details and new voter account
    */
   async saasPreCreateNewAccount({
@@ -8004,32 +8724,43 @@ var VoterClient = class _VoterClient {
     stateTreeDepth,
     coordinatorPubkey,
     deactivates,
+    deactivateIdx,
+    voterScale,
+    preComputedProof,
+    pollId,
     wasmFile,
     zkeyFile,
     ticket,
     derivePathParams
   }) {
+    const newVoterClient = new _VoterClient({
+      network: this.network,
+      restEndpoint: this.restEndpoint,
+      apiEndpoint: this.apiEndpoint,
+      saasApiEndpoint: this.saasApiEndpoint,
+      registryAddress: this.registryAddress
+    });
+    const newPubkey = newVoterClient.getPubkey().toPoints();
     const addNewKeyPayload = await this.buildPreAddNewKeyPayload({
       stateTreeDepth,
       coordinatorPubkey,
       deactivates,
+      contractAddress,
+      deactivateIdx,
+      voterScale,
+      preComputedProof,
+      newPubkey,
+      pollId: pollId !== void 0 ? BigInt(pollId) : void 0,
       wasmFile,
       zkeyFile,
       derivePathParams
     });
-    const newVoterClient = new _VoterClient({
-      network: this.network,
-      restEndpoint: this.restEndpoint,
-      apiEndpoint: this.apiEndpoint,
-      saasApiEndpoint: this.saasApiEndpoint,
-      registryAddress: this.registryAddress
-    });
     const addNewKeyResult = await newVoterClient.saasSubmitPreAddNewKey({
       contractAddress,
       proof: addNewKeyPayload.proof,
       d: addNewKeyPayload.d,
       nullifier: addNewKeyPayload.nullifier,
-      newPubkey: newVoterClient.getPubkey().toPoints().map((p) => p.toString()),
+      newPubkey: newPubkey.map((p) => p.toString()),
       ticket
     });
     return {
@@ -8047,22 +8778,19 @@ var VoterClient = class _VoterClient {
     operatorPubkey,
     selectedOptions,
     ticket,
+    pollId,
+    stateIdx,
     derivePathParams
   }) {
-    const stateIdx = await this.getStateIdx({
-      contractAddress,
-      derivePathParams
-    });
-    if (stateIdx === -1) {
+    const resolvedStateIdx = stateIdx !== void 0 ? stateIdx : await this.getStateIdx({ contractAddress, derivePathParams });
+    if (resolvedStateIdx === -1) {
       throw new Error("State index is not set, Please signup or addNewKey first");
     }
-    const pollId = await this.getPollId(contractAddress);
     const payload = this.buildVotePayload({
-      stateIdx,
+      stateIdx: resolvedStateIdx,
       operatorPubkey,
       selectedOptions,
       pollId,
-      // Pass pollId instead of contractAddress
       derivePathParams
     });
     const voteResult = await this.saasSubmitVote({
@@ -8278,6 +9006,8 @@ var OperatorClient = class {
     stateTreeDepth,
     operatorPubkey,
     deactivates,
+    newPubkey,
+    pollId,
     wasmFile,
     zkeyFile,
     derivePathParams
@@ -8286,6 +9016,8 @@ var OperatorClient = class {
     const addKeyInput = await this.genAddKeyInput(stateTreeDepth + 2, {
       coordPubKey: [coordPubkeyX, coordPubkeyY],
       deactivates: deactivates.map((d) => d.map(BigInt)),
+      newPubKey: newPubkey,
+      pollId,
       derivePathParams
     });
     if (addKeyInput === null) {
@@ -8308,6 +9040,8 @@ var OperatorClient = class {
     stateTreeDepth,
     coordinatorPubkey,
     deactivates,
+    newPubkey,
+    pollId,
     wasmFile,
     zkeyFile,
     derivePathParams
@@ -8316,6 +9050,8 @@ var OperatorClient = class {
     const addKeyInput = await this.genPreAddKeyInput(stateTreeDepth + 2, {
       coordPubKey: [coordPubkeyX, coordPubkeyY],
       deactivates: deactivates.map((d) => d.map(BigInt)),
+      newPubKey: newPubkey,
+      pollId,
       derivePathParams
     });
     if (addKeyInput === null) {
@@ -8337,6 +9073,8 @@ var OperatorClient = class {
   async genAddKeyInput(depth, {
     coordPubKey,
     deactivates,
+    newPubKey,
+    pollId,
     derivePathParams
   }) {
     const signer = this.getSigner(derivePathParams);
@@ -8350,7 +9088,7 @@ var OperatorClient = class {
     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 nullifier = poseidon([signer.getFormatedPrivKey(), pollId]);
     const tree = new Tree(5, depth, 0n);
     const leaves = deactivates.map((d) => poseidon(d));
     tree.initLeaves(leaves);
@@ -8363,7 +9101,9 @@ var OperatorClient = class {
       d1[0],
       d1[1],
       d2[0],
-      d2[1]
+      d2[1],
+      poseidon(newPubKey),
+      pollId
     ]);
     const input = {
       inputHash,
@@ -8378,13 +9118,17 @@ var OperatorClient = class {
       d2,
       deactivateLeafPathElements,
       nullifier,
-      oldPrivateKey: signer.getFormatedPrivKey()
+      oldPrivateKey: signer.getFormatedPrivKey(),
+      newPubKey,
+      pollId
     };
     return input;
   }
   async genPreAddKeyInput(depth, {
     coordPubKey,
     deactivates,
+    newPubKey,
+    pollId,
     derivePathParams
   }) {
     const signer = this.getSigner(derivePathParams);
@@ -8398,7 +9142,7 @@ var OperatorClient = class {
     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 nullifier = poseidon([signer.getFormatedPrivKey(), pollId]);
     const tree = new Tree(5, depth, 0n);
     const leaves = deactivates.map((d) => poseidon(d));
     tree.initLeaves(leaves);
@@ -8411,7 +9155,9 @@ var OperatorClient = class {
       d1[0],
       d1[1],
       d2[0],
-      d2[1]
+      d2[1],
+      poseidon(newPubKey),
+      pollId
     ]);
     const input = {
       inputHash,
@@ -8426,7 +9172,9 @@ var OperatorClient = class {
       d2,
       deactivateLeafPathElements,
       nullifier,
-      oldPrivateKey: signer.getFormatedPrivKey()
+      oldPrivateKey: signer.getFormatedPrivKey(),
+      newPubKey,
+      pollId
     };
     return input;
   }
@@ -8445,7 +9193,13 @@ var OperatorClient = class {
     pollId,
     derivePathParams
   }) {
-    const payload = this.batchGenMessage(stateIdx, operatorPubkey, [[0, 0]], pollId, derivePathParams);
+    const payload = this.batchGenMessage(
+      stateIdx,
+      operatorPubkey,
+      [[0, 0]],
+      pollId,
+      derivePathParams
+    );
     return stringizing(payload[0]);
   }
   /**
@@ -8549,10 +9303,10 @@ var OperatorClient = class {
   }
   /**
    * Decrypt message to command
-   * 
+   *
    * Message structure after decryption (7 elements):
    * [packed_data, newPubKey_x, newPubKey_y, salt, sig_R8_x, sig_R8_y, sig_S]
-   * 
+   *
    * Packed data contains (from low to high bits):
    * - nonce (bits 0-31)
    * - stateIdx (bits 32-63)
@@ -8949,6 +9703,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})`);