@dorafactory/maci-sdk 0.1.3-pre.46.beta.12 → 0.1.3-pre.46.beta.15

package/dist/index.js

@@ -3536,6 +3536,16 @@ var AMaciQueryClient = class {
         }
       });
     };
+    this.getFeeConfig = async () => {
+      return this.client.queryContractSmart(this.contractAddress, {
+        get_fee_config: {}
+      });
+    };
+    this.getDelayConfig = async () => {
+      return this.client.queryContractSmart(this.contractAddress, {
+        get_delay_config: {}
+      });
+    };
     this.client = client;
     this.contractAddress = contractAddress;
     this.admin = this.admin.bind(this);
@@ -3575,6 +3585,8 @@ var AMaciQueryClient = class {
     this.getDeactivateEnabled = this.getDeactivateEnabled.bind(this);
     this.getRegistrationConfig = this.getRegistrationConfig.bind(this);
     this.queryRegistrationStatus = this.queryRegistrationStatus.bind(this);
+    this.getFeeConfig = this.getFeeConfig.bind(this);
+    this.getDelayConfig = this.getDelayConfig.bind(this);
   }
 };
 var AMaciClient = class extends AMaciQueryClient {
@@ -3919,6 +3931,16 @@ var RegistryQueryClient = class {
         get_circuit_charge_config: {}
       });
     };
+    this.getFeeConfig = async () => {
+      return this.client.queryContractSmart(this.contractAddress, {
+        get_fee_config: {}
+      });
+    };
+    this.getDelayConfig = async () => {
+      return this.client.queryContractSmart(this.contractAddress, {
+        get_delay_config: {}
+      });
+    };
     this.getPollId = async ({ address }) => {
       return this.client.queryContractSmart(this.contractAddress, {
         get_poll_id: {
@@ -3954,6 +3976,8 @@ var RegistryQueryClient = class {
     this.getMaciOperatorPubkey = this.getMaciOperatorPubkey.bind(this);
     this.getMaciOperatorIdentity = this.getMaciOperatorIdentity.bind(this);
     this.getCircuitChargeConfig = this.getCircuitChargeConfig.bind(this);
+    this.getFeeConfig = this.getFeeConfig.bind(this);
+    this.getDelayConfig = this.getDelayConfig.bind(this);
     this.getPollId = this.getPollId.bind(this);
     this.getPollAddress = this.getPollAddress.bind(this);
     this.getNextPollId = this.getNextPollId.bind(this);
@@ -4015,7 +4039,6 @@ var RegistryClient = class extends RegistryQueryClient {
       certificationSystem,
       circuitType,
       deactivateEnabled,
-      maxVoter,
       operator,
       registrationMode,
       roundInfo,
@@ -4031,7 +4054,6 @@ var RegistryClient = class extends RegistryQueryClient {
             certification_system: certificationSystem,
             circuit_type: circuitType,
             deactivate_enabled: deactivateEnabled,
-            max_voter: maxVoter,
             operator,
             registration_mode: registrationMode,
             round_info: roundInfo,
@@ -4125,6 +4147,38 @@ var RegistryClient = class extends RegistryQueryClient {
         _funds
       );
     };
+    this.updateFeeConfig = async ({
+      config
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          update_fee_config: {
+            config
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
+    this.updateDelayConfig = async ({
+      config
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          update_delay_config: {
+            config
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -4137,6 +4191,8 @@ var RegistryClient = class extends RegistryQueryClient {
     this.updateAmaciCodeId = this.updateAmaciCodeId.bind(this);
     this.changeOperator = this.changeOperator.bind(this);
     this.changeChargeConfig = this.changeChargeConfig.bind(this);
+    this.updateFeeConfig = this.updateFeeConfig.bind(this);
+    this.updateDelayConfig = this.updateDelayConfig.bind(this);
   }
 };
 
@@ -4282,7 +4338,6 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
       certificationSystem,
       circuitType,
       deactivateEnabled,
-      maxVoter,
       operator,
       registrationMode,
       roundInfo,
@@ -4298,7 +4353,6 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
             certification_system: certificationSystem,
             circuit_type: circuitType,
             deactivate_enabled: deactivateEnabled,
-            max_voter: maxVoter,
             operator,
             registration_mode: registrationMode,
             round_info: roundInfo,
@@ -4312,6 +4366,22 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
         _funds
       );
     };
+    this.updateFeeConfig = async ({
+      config
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          update_fee_config: {
+            config
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
     this.setRoundInfo = async ({
       contractAddr,
       roundInfo
@@ -4388,6 +4458,76 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
         _funds
       );
     };
+    this.signUp = async ({
+      amount,
+      certificate,
+      contractAddr,
+      pubkey
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          sign_up: {
+            amount,
+            certificate,
+            contract_addr: contractAddr,
+            pubkey
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
+    this.addNewKey = async ({
+      contractAddr,
+      d,
+      groth16Proof,
+      nullifier,
+      pubkey
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          add_new_key: {
+            contract_addr: contractAddr,
+            d,
+            groth16_proof: groth16Proof,
+            nullifier,
+            pubkey
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
+    this.preAddNewKey = async ({
+      contractAddr,
+      d,
+      groth16Proof,
+      nullifier,
+      pubkey
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          pre_add_new_key: {
+            contract_addr: contractAddr,
+            d,
+            groth16_proof: groth16Proof,
+            nullifier,
+            pubkey
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -4398,10 +4538,14 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
     this.deposit = this.deposit.bind(this);
     this.withdraw = this.withdraw.bind(this);
     this.createAmaciRound = this.createAmaciRound.bind(this);
+    this.updateFeeConfig = this.updateFeeConfig.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);
+    this.signUp = this.signUp.bind(this);
+    this.addNewKey = this.addNewKey.bind(this);
+    this.preAddNewKey = this.preAddNewKey.bind(this);
   }
 };
 
@@ -4437,6 +4581,13 @@ async function createRegistryClientBy({
   const [{ address }] = await wallet.getAccounts();
   return new RegistryClient(signingCosmWasmClient, address, contractAddress);
 }
+async function createRegistryQueryClientBy({
+  rpcEndpoint,
+  contractAddress
+}) {
+  const cosmWasmClient = await import_cosmwasm_stargate.CosmWasmClient.connect(rpcEndpoint);
+  return new RegistryQueryClient(cosmWasmClient, contractAddress);
+}
 async function createApiSaasClientBy({
   rpcEndpoint,
   wallet,
@@ -4453,53 +4604,33 @@ async function createContractClientByWallet(rpcEndpoint, wallet) {
   return client;
 }
 
-// src/types/index.ts
-var MaciCircuitType = /* @__PURE__ */ ((MaciCircuitType2) => {
-  MaciCircuitType2["IP1V"] = "0";
-  MaciCircuitType2["QV"] = "1";
-  return MaciCircuitType2;
-})(MaciCircuitType || {});
-var MaciCertSystemType = /* @__PURE__ */ ((MaciCertSystemType2) => {
-  MaciCertSystemType2["GROTH16"] = "groth16";
-  MaciCertSystemType2["PLONK"] = "plonk";
-  return MaciCertSystemType2;
-})(MaciCertSystemType || {});
-var MaciRoundType = /* @__PURE__ */ ((MaciRoundType2) => {
-  MaciRoundType2["MACI"] = "0";
-  MaciRoundType2["AMACI"] = "1";
-  MaciRoundType2["ORACLE_MACI"] = "2";
-  return MaciRoundType2;
-})(MaciRoundType || {});
+// src/libs/contract/contract.ts
+var import_stargate2 = require("@cosmjs/stargate");
 
-// src/libs/contract/utils.ts
-function getAMaciRoundCircuitFee(network, maxVoter, maxOption) {
-  let requiredFee = {
-    denom: "peaka",
-    amount: "0"
-  };
-  if (maxVoter <= 25 && maxOption <= 5) {
-    requiredFee.amount = "5000000000000000000";
-  } else if (maxVoter <= 625 && maxOption <= 25) {
-    requiredFee.amount = "27000000000000000000";
-  } else if (maxVoter <= 15625 && maxOption <= 125) {
-    requiredFee.amount = "208000000000000000000";
-  } else {
-    throw new Error("Number of voters or options is too large.");
-  }
-  return requiredFee;
-}
-function getMaciRoundCircuitFee(network, maxVoter, maxOption) {
-  const amaciRoundFee = getAMaciRoundCircuitFee(network, maxVoter, maxOption);
-  const feeAmount = BigInt(amaciRoundFee.amount);
-  const maciRoundFeeAmount = feeAmount * BigInt(1) / BigInt(10);
-  return {
-    denom: "peaka",
-    amount: maciRoundFeeAmount.toString()
-  };
-}
+// src/libs/maci/config.ts
+var FEE_DENOM = "peaka";
+var DEFAULT_BASE_FEE = "30000000000000000000";
+var DEFAULT_MESSAGE_FEE = "60000000000000000";
+var DEFAULT_DEACTIVATE_FEE = "10000000000000000000";
+var DEFAULT_SIGNUP_FEE = "30000000000000000";
+var DEFAULT_BASE_DELAY = 200;
+var DEFAULT_MESSAGE_DELAY = 2;
+var DEFAULT_SIGNUP_DELAY = 1;
+var DEFAULT_DEACTIVATE_DELAY = 600;
+var DEFAULT_FEE_CONFIG = {
+  baseFee: DEFAULT_BASE_FEE,
+  messageFee: DEFAULT_MESSAGE_FEE,
+  deactivateFee: DEFAULT_DEACTIVATE_FEE,
+  signupFee: DEFAULT_SIGNUP_FEE
+};
+var DEFAULT_DELAY_CONFIG = {
+  baseDelay: DEFAULT_BASE_DELAY,
+  messageDelay: DEFAULT_MESSAGE_DELAY,
+  signupDelay: DEFAULT_SIGNUP_DELAY,
+  deactivateDelay: DEFAULT_DEACTIVATE_DELAY
+};
 
 // src/libs/contract/contract.ts
-var import_stargate2 = require("@cosmjs/stargate");
 var Contract = class {
   constructor({
     network,
@@ -4538,18 +4669,12 @@ var Contract = class {
       wallet: signer,
       contractAddress: this.registryAddress
     });
-    const requiredFee = getAMaciRoundCircuitFee(
-      this.network,
-      params.maxVoter,
-      params.voteOptionMap.length
-    );
     const fee = params.fee ?? "auto";
     const res = await client.createRound(
       {
         certificationSystem: params.certificationSystem ?? "0",
         circuitType: params.circuitType.toString(),
         deactivateEnabled: params.deactivateEnabled,
-        maxVoter: params.maxVoter.toString(),
         operator: params.operator,
         registrationMode: params.registrationMode,
         roundInfo,
@@ -4559,7 +4684,7 @@ var Contract = class {
       },
       fee,
       void 0,
-      [requiredFee]
+      [{ denom: FEE_DENOM, amount: DEFAULT_BASE_FEE }]
     );
     let contractAddress = "";
     let pollId = "";
@@ -4647,6 +4772,12 @@ var Contract = class {
       contractAddress
     });
   }
+  async registryQueryClient() {
+    return createRegistryQueryClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      contractAddress: this.registryAddress
+    });
+  }
   async apiSaasClient({
     signer,
     contractAddress
@@ -4940,7 +5071,6 @@ var Contract = class {
       certificationSystem: params.certificationSystem ?? "0",
       circuitType,
       deactivateEnabled: params.deactivateEnabled,
-      maxVoter: params.maxVoter.toString(),
       operator: params.operator,
       registrationMode: params.registrationMode,
       roundInfo,
@@ -4959,7 +5089,6 @@ var Contract = class {
           certification_system: roundParams.certificationSystem,
           circuit_type: roundParams.circuitType,
           deactivate_enabled: roundParams.deactivateEnabled,
-          max_voter: roundParams.maxVoter,
           operator: roundParams.operator,
           registration_mode: roundParams.registrationMode,
           round_info: roundParams.roundInfo,
@@ -5150,6 +5279,51 @@ var Contract = class {
   }
 };
 
+// src/types/index.ts
+var MaciCircuitType = /* @__PURE__ */ ((MaciCircuitType2) => {
+  MaciCircuitType2["IP1V"] = "0";
+  MaciCircuitType2["QV"] = "1";
+  return MaciCircuitType2;
+})(MaciCircuitType || {});
+var MaciCertSystemType = /* @__PURE__ */ ((MaciCertSystemType2) => {
+  MaciCertSystemType2["GROTH16"] = "groth16";
+  MaciCertSystemType2["PLONK"] = "plonk";
+  return MaciCertSystemType2;
+})(MaciCertSystemType || {});
+var MaciRoundType = /* @__PURE__ */ ((MaciRoundType2) => {
+  MaciRoundType2["MACI"] = "0";
+  MaciRoundType2["AMACI"] = "1";
+  MaciRoundType2["ORACLE_MACI"] = "2";
+  return MaciRoundType2;
+})(MaciRoundType || {});
+
+// src/libs/contract/utils.ts
+function getAMaciRoundCircuitFee(network, maxVoter, maxOption) {
+  let requiredFee = {
+    denom: "peaka",
+    amount: "0"
+  };
+  if (maxVoter <= 25 && maxOption <= 5) {
+    requiredFee.amount = "5000000000000000000";
+  } else if (maxVoter <= 625 && maxOption <= 25) {
+    requiredFee.amount = "27000000000000000000";
+  } else if (maxVoter <= 15625 && maxOption <= 125) {
+    requiredFee.amount = "208000000000000000000";
+  } else {
+    throw new Error("Number of voters or options is too large.");
+  }
+  return requiredFee;
+}
+function getMaciRoundCircuitFee(network, maxVoter, maxOption) {
+  const amaciRoundFee = getAMaciRoundCircuitFee(network, maxVoter, maxOption);
+  const feeAmount = BigInt(amaciRoundFee.amount);
+  const maciRoundFeeAmount = feeAmount * BigInt(1) / BigInt(10);
+  return {
+    denom: "peaka",
+    amount: maciRoundFeeAmount.toString()
+  };
+}
+
 // src/libs/oracle-certificate/oracle-certificate.ts
 var OracleCertificate = class {
   constructor({ certificateApiEndpoint, http }) {
@@ -5202,13 +5376,6 @@ var OracleCertificate = class {
 // src/libs/maci/maci.ts
 var import_stargate3 = require("@cosmjs/stargate");
 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 = "60000000000000000";
-
-// src/libs/maci/maci.ts
 function isErrorResponse(response) {
   return typeof response === "object" && response !== null && "error" in response && typeof response.error === "object" && "message" in response.error;
 }
@@ -5224,6 +5391,46 @@ var MACI = class {
     this.indexer = indexer;
     this.oracleCertificate = oracleCertificate;
     this.maciKeypair = maciKeypair;
+    this.feeConfig = { ...DEFAULT_FEE_CONFIG };
+    this.delayConfig = { ...DEFAULT_DELAY_CONFIG };
+  }
+  /**
+   * Fetch the fee configuration from the given round contract and cache it locally.
+   * Call this once after instantiation (or whenever fees may have changed) to ensure
+   * the SDK uses the correct on-chain fee values for the specific round.
+   */
+  async fetchFeeConfig({ contractAddress }) {
+    try {
+      const roundClient = await this.contract.amaciQueryClient({ contractAddress });
+      const feeConfig = await roundClient.getFeeConfig();
+      this.feeConfig = {
+        ...this.feeConfig,
+        messageFee: feeConfig.message_fee,
+        deactivateFee: feeConfig.deactivate_fee,
+        signupFee: feeConfig.signup_fee
+      };
+    } catch {
+    }
+    return this.feeConfig;
+  }
+  /**
+   * Fetch the delay configuration from the given round contract and cache it locally.
+   * Call this once after instantiation (or whenever delays may have changed) to ensure
+   * the SDK uses the correct on-chain delay values for the specific round.
+   */
+  async fetchDelayConfig({ contractAddress }) {
+    try {
+      const roundClient = await this.contract.amaciQueryClient({ contractAddress });
+      const delayConfig = await roundClient.getDelayConfig();
+      this.delayConfig = {
+        baseDelay: delayConfig.base_delay,
+        messageDelay: delayConfig.message_delay,
+        signupDelay: delayConfig.signup_delay,
+        deactivateDelay: delayConfig.deactivate_delay
+      };
+    } catch {
+    }
+    return this.delayConfig;
   }
   async getPollId({ contractAddress }) {
     const client = await this.contract.amaciQueryClient({ contractAddress });
@@ -5359,10 +5566,6 @@ var MACI = class {
       };
     }
   }
-  async queryAMaciChargeFee({ maxVoter, maxOption }) {
-    const fee = getAMaciRoundCircuitFee(this.network, maxVoter, maxOption);
-    return fee;
-  }
   async queryRoundGasStation({ contractAddress }) {
     const roundInfo = await this.getRoundInfo({ contractAddress });
     return roundInfo.gasStationEnable;
@@ -5445,6 +5648,7 @@ var MACI = class {
           certificate: oracleCertificate?.signature || ""
         }
       };
+      const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
       if (gasStation === true && typeof fee !== "object") {
         const gasEstimation = await client.simulate(
           address,
@@ -5454,7 +5658,8 @@ var MACI = class {
               value: {
                 sender: address,
                 contract: contractAddress,
-                msg: new TextEncoder().encode(JSON.stringify(msg))
+                msg: new TextEncoder().encode(JSON.stringify(msg)),
+                funds: signupFunds
               }
             }
           ],
@@ -5468,15 +5673,15 @@ var MACI = class {
           gas: calculatedFee.gas,
           granter: contractAddress
         };
-        return client.execute(address, contractAddress, msg, grantFee);
+        return client.execute(address, contractAddress, msg, grantFee, void 0, signupFunds);
       } else if (gasStation === true && typeof fee === "object") {
         const grantFee = {
           ...fee,
           granter: contractAddress
         };
-        return client.execute(address, contractAddress, msg, grantFee);
+        return client.execute(address, contractAddress, msg, grantFee, void 0, signupFunds);
       }
-      return client.execute(address, contractAddress, msg, fee || "auto");
+      return client.execute(address, contractAddress, msg, fee || "auto", void 0, signupFunds);
     } catch (error) {
       throw Error(`Signup failed! ${error}`);
     }
@@ -5508,6 +5713,7 @@ var MACI = class {
           certificate: oracleCertificate?.signature || ""
         }
       };
+      const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
       if (gasStation === true && typeof fee !== "object") {
         const gasEstimation = await client.simulate(
           address,
@@ -5517,7 +5723,8 @@ var MACI = class {
               value: {
                 sender: address,
                 contract: contractAddress,
-                msg: new TextEncoder().encode(JSON.stringify(msg))
+                msg: new TextEncoder().encode(JSON.stringify(msg)),
+                funds: signupFunds
               }
             }
           ],
@@ -5531,15 +5738,15 @@ var MACI = class {
           gas: calculatedFee.gas,
           granter: granter || contractAddress
         };
-        return client.execute(address, contractAddress, msg, grantFee);
+        return client.execute(address, contractAddress, msg, grantFee, void 0, signupFunds);
       } else if (gasStation === true && typeof fee === "object") {
         const grantFee = {
           ...fee,
           granter: granter || contractAddress
         };
-        return client.execute(address, contractAddress, msg, grantFee);
+        return client.execute(address, contractAddress, msg, grantFee, void 0, signupFunds);
       }
-      return client.execute(address, contractAddress, msg, fee || "auto");
+      return client.execute(address, contractAddress, msg, fee || "auto", void 0, signupFunds);
     } catch (error) {
       throw Error(`Signup failed! ${error}`);
     }
@@ -5718,7 +5925,7 @@ var MACI = class {
             })
           )
         ),
-        funds: [{ denom: FEE_DENOM, amount: MESSAGE_FEE }]
+        funds: [{ denom: FEE_DENOM, amount: this.feeConfig.messageFee }]
       })
     }));
     if (gasStation && typeof fee !== "object") {
@@ -5764,7 +5971,7 @@ var MACI = class {
       x: p.encPubkeys[0].toString(),
       y: p.encPubkeys[1].toString()
     }));
-    const totalFee = (BigInt(MESSAGE_FEE) * BigInt(payload.length)).toString();
+    const totalFee = (BigInt(this.feeConfig.messageFee) * BigInt(payload.length)).toString();
     const batchFunds = [{ denom: FEE_DENOM, amount: totalFee }];
     if (gasStation && granter === this.contract.apiSaasAddress) {
       return this.contract.publishMessageViaSaas({
@@ -5827,6 +6034,8 @@ var MACI = class {
       x: p.encPubkeys[0],
       y: p.encPubkeys[1]
     }));
+    const totalFee = (BigInt(this.feeConfig.messageFee) * BigInt(payload.length)).toString();
+    const batchFunds = [{ denom: FEE_DENOM, amount: totalFee }];
     const msg = {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: import_tx.MsgExecuteContract.fromPartial({
@@ -5841,7 +6050,8 @@ var MACI = class {
               }
             })
           )
-        )
+        ),
+        funds: batchFunds
       })
     };
     if (gasStation && typeof fee !== "object") {
@@ -5910,7 +6120,7 @@ var MACI = class {
           }
         }
       });
-      const deactivateFunds = [{ denom: FEE_DENOM, amount: DEACTIVATE_FEE }];
+      const deactivateFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.deactivateFee }];
       if (gasStation === true && typeof fee !== "object") {
         const gasEstimation = await client.simulate(
           address,
@@ -5987,7 +6197,7 @@ var MACI = class {
           }
         }
       });
-      const deactivateFunds = [{ denom: FEE_DENOM, amount: DEACTIVATE_FEE }];
+      const deactivateFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.deactivateFee }];
       if (gasStation === true && typeof fee !== "object") {
         const gasEstimation = await client.simulate(
           address,
@@ -6065,6 +6275,7 @@ var MACI = class {
       signer,
       contractAddress
     });
+    const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
     return await client.addNewKey(
       {
         d,
@@ -6075,7 +6286,9 @@ var MACI = class {
           y: newMaciKeypair.pubKey[1].toString()
         }
       },
-      fee
+      fee,
+      void 0,
+      signupFunds
     );
   }
   async rawAddNewKey({
@@ -6093,6 +6306,16 @@ var MACI = class {
       signer,
       contractAddress
     });
+    const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
+    const keyParams = {
+      d,
+      groth16Proof: proof,
+      nullifier: nullifier.toString(),
+      pubkey: {
+        x: newPubkey[0].toString(),
+        y: newPubkey[1].toString()
+      }
+    };
     if (gasStation === true && typeof fee !== "object") {
       const [{ address }] = await signer.getAccounts();
       const contractClient = await this.contract.contractClient({ signer });
@@ -6115,7 +6338,8 @@ var MACI = class {
             value: {
               sender: address,
               contract: contractAddress,
-              msg: new TextEncoder().encode(JSON.stringify(msg))
+              msg: new TextEncoder().encode(JSON.stringify(msg)),
+              funds: signupFunds
             }
           }
         ],
@@ -6129,48 +6353,15 @@ var MACI = class {
         gas: calculatedFee.gas,
         granter: granter || contractAddress
       };
-      return await client.addNewKey(
-        {
-          d,
-          groth16Proof: proof,
-          nullifier: nullifier.toString(),
-          pubkey: {
-            x: newPubkey[0].toString(),
-            y: newPubkey[1].toString()
-          }
-        },
-        grantFee
-      );
+      return await client.addNewKey(keyParams, grantFee, void 0, signupFunds);
     } else if (gasStation === true && typeof fee === "object") {
       const grantFee = {
         ...fee,
         granter: granter || contractAddress
       };
-      return await client.addNewKey(
-        {
-          d,
-          groth16Proof: proof,
-          nullifier: nullifier.toString(),
-          pubkey: {
-            x: newPubkey[0].toString(),
-            y: newPubkey[1].toString()
-          }
-        },
-        grantFee
-      );
+      return await client.addNewKey(keyParams, grantFee, void 0, signupFunds);
     }
-    return await client.addNewKey(
-      {
-        d,
-        groth16Proof: proof,
-        nullifier: nullifier.toString(),
-        pubkey: {
-          x: newPubkey[0].toString(),
-          y: newPubkey[1].toString()
-        }
-      },
-      fee
-    );
+    return await client.addNewKey(keyParams, fee, void 0, signupFunds);
   }
   async rawPreAddNewKey({
     signer,
@@ -6187,6 +6378,16 @@ var MACI = class {
       signer,
       contractAddress
     });
+    const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
+    const keyParams = {
+      d,
+      groth16Proof: proof,
+      nullifier: nullifier.toString(),
+      pubkey: {
+        x: newPubkey[0].toString(),
+        y: newPubkey[1].toString()
+      }
+    };
     if (gasStation === true && typeof fee !== "object") {
       const [{ address }] = await signer.getAccounts();
       const contractClient = await this.contract.contractClient({ signer });
@@ -6209,7 +6410,8 @@ var MACI = class {
             value: {
               sender: address,
               contract: contractAddress,
-              msg: new TextEncoder().encode(JSON.stringify(msg))
+              msg: new TextEncoder().encode(JSON.stringify(msg)),
+              funds: signupFunds
             }
           }
         ],
@@ -6223,48 +6425,15 @@ var MACI = class {
         gas: calculatedFee.gas,
         granter: granter || contractAddress
       };
-      return await client.preAddNewKey(
-        {
-          d,
-          groth16Proof: proof,
-          nullifier: nullifier.toString(),
-          pubkey: {
-            x: newPubkey[0].toString(),
-            y: newPubkey[1].toString()
-          }
-        },
-        grantFee
-      );
+      return await client.preAddNewKey(keyParams, grantFee, void 0, signupFunds);
     } else if (gasStation === true && typeof fee === "object") {
       const grantFee = {
         ...fee,
         granter: granter || contractAddress
       };
-      return await client.preAddNewKey(
-        {
-          d,
-          groth16Proof: proof,
-          nullifier: nullifier.toString(),
-          pubkey: {
-            x: newPubkey[0].toString(),
-            y: newPubkey[1].toString()
-          }
-        },
-        grantFee
-      );
+      return await client.preAddNewKey(keyParams, grantFee, void 0, signupFunds);
     }
-    return await client.preAddNewKey(
-      {
-        d,
-        groth16Proof: proof,
-        nullifier: nullifier.toString(),
-        pubkey: {
-          x: newPubkey[0].toString(),
-          y: newPubkey[1].toString()
-        }
-      },
-      fee
-    );
+    return await client.preAddNewKey(keyParams, fee, void 0, signupFunds);
   }
   async claimAMaciRound({
     signer,
@@ -6716,14 +6885,17 @@ var MaciApiClient = class {
   /**
    * Claim MACI Key
    * Assign the next available pre-generated MACI key pair for an AMACI round (first-come-first-served).
+   * Requires the X-Amaci-Claim-Key header for authentication.
    * Returns pubkey, secretKey, and the full deactivate Merkle proof.
    * WARNING: secretKey is returned only once and cannot be retrieved again.
    */
   async claimMaciKey(params) {
-    const { contractAddress, ...body } = params;
+    const { contractAddress, amaciClaimKey } = params;
     return this.fetch(`/v1/rounds/${contractAddress}/claim-key`, {
       method: "POST",
-      body: JSON.stringify(body)
+      headers: {
+        "X-Amaci-Claim-Key": amaciClaimKey
+      }
     });
   }
   /**
@@ -7011,12 +7183,6 @@ var MaciClient = class {
   async queryRoundClaimable({ contractAddress }) {
     return await this.maci.queryRoundClaimable({ contractAddress });
   }
-  async queryAMaciChargeFee({ maxVoter, maxOption }) {
-    return await this.maci.queryAMaciChargeFee({
-      maxVoter,
-      maxOption
-    });
-  }
   async queryRoundGasStation({ contractAddress }) {
     return await this.maci.queryRoundGasStation({ contractAddress });
   }
@@ -7322,7 +7488,7 @@ var import_snarkjs = require("snarkjs");
 
 // src/libs/keypairs/eddsa-poseidon/keypair.ts
 var import_blake2b = require("@noble/hashes/blake2b");
-var import_utils9 = require("@noble/hashes/utils");
+var import_utils7 = require("@noble/hashes/utils");
 var import_bip32 = require("@scure/bip32");
 var import_sha2563 = require("@noble/hashes/sha256");
 var import_eddsa_poseidon4 = require("@zk-kit/eddsa-poseidon");
@@ -7533,7 +7699,7 @@ var EdDSAPoseidonKeypair = class _EdDSAPoseidonKeypair extends Keypair3 {
   static fromSecretKey(secretKey, options) {
     if (typeof secretKey === "string") {
       const cleanSecretKey = secretKey.startsWith("0x") ? secretKey.slice(2) : secretKey;
-      const decoded = buffer2Bigint((0, import_utils9.hexToBytes)(cleanSecretKey));
+      const decoded = buffer2Bigint((0, import_utils7.hexToBytes)(cleanSecretKey));
       return this.fromSecretKey(decoded, options);
     }
     const unPackedPublicKey = genPubKey(secretKey);
@@ -7541,7 +7707,7 @@ var EdDSAPoseidonKeypair = class _EdDSAPoseidonKeypair extends Keypair3 {
     if (!options || !options.skipValidation) {
       const encoder = new TextEncoder();
       const signData = encoder.encode("dora validation");
-      const msgHash = (0, import_utils9.bytesToHex)((0, import_blake2b.blake2b)(signData, { dkLen: 16 }));
+      const msgHash = (0, import_utils7.bytesToHex)((0, import_blake2b.blake2b)(signData, { dkLen: 16 }));
       const signature = (0, import_eddsa_poseidon4.signMessage)(bigInt2Buffer(secretKey), msgHash);
       if (!(0, import_eddsa_poseidon4.verifySignature)(msgHash, signature, unPackedPublicKey)) {
         throw new Error("Provided secretKey is invalid");
@@ -7571,7 +7737,7 @@ var EdDSAPoseidonKeypair = class _EdDSAPoseidonKeypair extends Keypair3 {
    * @returns The secret key encoded as a hexadecimal string
    */
   getSecretKey() {
-    return (0, import_utils9.bytesToHex)(bigInt2Buffer(this.keypair.secretKey));
+    return (0, import_utils7.bytesToHex)(bigInt2Buffer(this.keypair.secretKey));
   }
   /**
    * Get the secret key as a bigint.
@@ -8760,8 +8926,9 @@ var VoterClient = class _VoterClient {
   /**
    * 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.
+   * Requires an AMACI claim key passed via the X-Amaci-Claim-Key header.
    * WARNING: secretKey is returned only once — save it immediately, it cannot be retrieved again.
-   * @param params - Parameters including contractAddress and ticket
+   * @param params - Parameters including contractAddress and amaciClaimKey
    * @returns Claimed key pair with full deactivate Merkle proof
    */
   async saasClaimKey(params) {