@dorafactory/maci-sdk 0.1.3-pre.46.beta.16 → 0.1.3-pre.46.beta.17

package/dist/index.js

@@ -247,12 +247,19 @@ function handleError(error) {
 }
 
 // src/libs/http/http.ts
+var DEFAULT_RETRIES = 5;
+var DEFAULT_RETRY_DELAY = 200;
+async function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 var Http = class {
-  constructor(apiEndpoint, restEndpoint, customFetch, defaultOptions) {
+  constructor(apiEndpoint, restEndpoints, customFetch, defaultOptions, retries, retryDelay) {
     this.customFetch = customFetch;
     this.apiEndpoint = apiEndpoint;
-    this.restEndpoint = restEndpoint;
+    this.restEndpoints = Array.isArray(restEndpoints) ? restEndpoints : [restEndpoints];
     this.defaultOptions = defaultOptions;
+    this.retries = retries ?? DEFAULT_RETRIES;
+    this.retryDelay = retryDelay ?? DEFAULT_RETRY_DELAY;
   }
   getFetch() {
     return this.customFetch || fetch;
@@ -265,10 +272,7 @@ var Http = class {
         ...options
       });
       if (!response.ok) {
-        throw new HttpError(
-          `HTTP error! status: ${response.status}`,
-          response.status
-        );
+        throw new HttpError(`HTTP error! status: ${response.status}`, response.status);
       }
       return response;
     } catch (error) {
@@ -297,25 +301,16 @@ var Http = class {
       if (!response.ok) {
         const errorData = await response.json();
         if (errorData.errors?.[0]?.message?.includes("Syntax Error")) {
-          throw new GraphQLError(
-            `GraphQL syntax error: ${errorData.errors[0].message}`
-          );
+          throw new GraphQLError(`GraphQL syntax error: ${errorData.errors[0].message}`);
         }
         if (errorData.errors?.length > 0) {
-          throw new GraphQLError(
-            errorData.errors[0].message || "Unknown GraphQL error"
-          );
+          throw new GraphQLError(errorData.errors[0].message || "Unknown GraphQL error");
         }
-        throw new HttpError(
-          `HTTP error: ${JSON.stringify(errorData)}`,
-          response.status
-        );
+        throw new HttpError(`HTTP error: ${JSON.stringify(errorData)}`, response.status);
       }
       const data = await response.json();
       if (data.errors) {
-        throw new GraphQLError(
-          data.errors[0]?.message || "GraphQL query failed"
-        );
+        throw new GraphQLError(data.errors[0]?.message || "GraphQL query failed");
       }
       return data;
     } catch (error) {
@@ -325,39 +320,51 @@ var Http = class {
       if (error instanceof SyntaxError) {
         throw new ParseError("Failed to parse JSON response");
       }
-      throw new HttpError(
-        `Failed to fetch GraphQL: ${error.message}`,
-        500
-      );
+      throw new HttpError(`Failed to fetch GraphQL: ${error.message}`, 500);
     }
   }
   async fetchRest(path, options) {
-    try {
-      const fetchFn = this.getFetch();
-      const response = await fetchFn(`${this.restEndpoint}${path}`, {
-        ...this.defaultOptions,
-        ...options
-      });
-      if (!response.ok) {
-        throw new HttpError(
-          `HTTP error! status: ${response.status}`,
-          response.status
-        );
-      }
+    let lastError;
+    let restIndex = 0;
+    for (let attempt = 0; attempt <= this.retries; attempt++) {
+      const endpoint = this.restEndpoints[restIndex];
       try {
-        return await response.json();
+        const fetchFn = this.getFetch();
+        const response = await fetchFn(`${endpoint}${path}`, {
+          ...this.defaultOptions,
+          ...options
+        });
+        if (!response.ok) {
+          throw new HttpError(`HTTP error! status: ${response.status}`, response.status);
+        }
+        try {
+          return await response.json();
+        } catch {
+          throw new ParseError("Failed to parse JSON response");
+        }
       } catch (error) {
-        throw new ParseError("Failed to parse JSON response");
-      }
-    } catch (error) {
-      if (error instanceof BaseError) {
-        throw error;
+        if (error instanceof HttpError && error.code >= 400 && error.code < 500) {
+          throw error;
+        }
+        lastError = error;
+        const nextIndex = (restIndex + 1) % this.restEndpoints.length;
+        const delay = this.retryDelay;
+        console.warn(
+          `[Http] REST request failed (attempt ${attempt + 1}/${this.retries + 1}) on ${endpoint}${path}: ${error?.message ?? error}` + (attempt < this.retries ? ` \u2014 retrying on ${this.restEndpoints[nextIndex]} in ${delay}ms` : " \u2014 all retries exhausted")
+        );
+        restIndex = nextIndex;
+        if (attempt < this.retries) {
+          await sleep(delay);
+        }
       }
-      throw new HttpError(
-        `Failed to fetch REST: ${error.message}`,
-        500
-      );
     }
+    if (lastError instanceof BaseError) {
+      throw lastError;
+    }
+    throw new HttpError(
+      `Failed to fetch REST: ${lastError?.message ?? "unknown error"}`,
+      500
+    );
   }
   async fetchAllGraphqlPages(query, variables) {
     let hasNextPage = true;
@@ -476,9 +483,9 @@ function getDefaultParams(network = "mainnet") {
       return {
         network: "mainnet",
         chainId: "vota-ash",
-        rpcEndpoint: "https://vota-rpc.dorafactory.org",
-        restEndpoint: "https://vota-rest.dorafactory.org",
-        apiEndpoint: "https://vota-api.dorafactory.org",
+        rpcEndpoints: ["https://vota-rpc.dorafactory.org", "https://vota-archive-rpc.dorafactory.org"],
+        restEndpoints: ["https://vota-rest.dorafactory.org", "https://vota-archive-rest.dorafactory.org"],
+        apiEndpoint: "https://maci-graphql.dorafactory.org",
         saasApiEndpoint: "https://maci-xl-api.dorafactory.org",
         certificateApiEndpoint: "https://vota-certificate-api.dorafactory.org/api/v1",
         registryAddress: "dora1smg5qp5trjdkcekdjssqpjehdjf6n4cjss0clyvqcud3t3u3948s8rmgg4",
@@ -496,9 +503,9 @@ function getDefaultParams(network = "mainnet") {
       return {
         network: "testnet",
         chainId: "vota-testnet",
-        rpcEndpoint: "https://vota-testnet-rpc.dorafactory.org",
-        restEndpoint: "https://vota-testnet-rest.dorafactory.org",
-        apiEndpoint: "https://vota-testnet-api.dorafactory.org",
+        rpcEndpoints: ["https://vota-testnet-rpc.dorafactory.org"],
+        restEndpoints: ["https://vota-testnet-rest.dorafactory.org"],
+        apiEndpoint: "https://maci-testnet-graphql.dorafactory.org",
         saasApiEndpoint: "https://maci-xl-testnet-api.dorafactory.org",
         certificateApiEndpoint: "https://vota-testnet-certificate-api.dorafactory.org/api/v1",
         registryAddress: "dora13c8aecstyxrhax9znvvh5zey89edrmd2k5va57pxvpe3fxtfsfeqlhsjnd",
@@ -1851,14 +1858,14 @@ var Operator = class {
         const ROUNDS_QUERY = `query {
         activeRoundsCount: rounds(filter: {
           period: {notEqualTo: "Ended"},
-          operator: {equalTo: "${operatorResponse.operatorAddress}"},
+          operatorAddress: {equalTo: "${operatorResponse.operatorAddress}"},
           caller: {equalTo: "${this.amaciRegistryContract}"}
         }) {
           totalCount
         }
         completedRoundsCount: rounds(filter: {
           period: {equalTo: "Ended"},
-          operator: {equalTo: "${operatorResponse.operatorAddress}"},
+          operatorAddress: {equalTo: "${operatorResponse.operatorAddress}"},
           caller: {equalTo: "${this.amaciRegistryContract}"}
         }) {
           totalCount
@@ -1923,10 +1930,9 @@ var Operator = class {
               delayReason
               delayType
               id
-              nodeId
               operatorAddress
               timestamp
-              roundAddress
+              contractAddress
             }
           }
         }
@@ -2001,14 +2007,14 @@ var Operator = class {
           const ROUNDS_QUERY = `query {
               activeRoundsCount: rounds(filter: {
                 period: {notEqualTo: "Ended"},
-                operator: {equalTo: "${operator.operatorAddress}"},
+                operatorAddress: {equalTo: "${operator.operatorAddress}"},
                 caller: {equalTo: "${this.amaciRegistryContract}"}
               }) {
                 totalCount
               }
               completedRoundsCount: rounds(filter: {
                 period: {equalTo: "Ended"},
-                operator: {equalTo: "${operator.operatorAddress}"},
+                operatorAddress: {equalTo: "${operator.operatorAddress}"},
                 caller: {equalTo: "${this.amaciRegistryContract}"}
               }) {
                 totalCount
@@ -2084,10 +2090,9 @@ var Operator = class {
               delayReason
               delayType
               id
-              nodeId
               operatorAddress
               timestamp
-              roundAddress
+              contractAddress
             }
           }
         }
@@ -2095,7 +2100,7 @@ var Operator = class {
       const ROUNDS_QUERY = `query ($limit: Int, $after: Cursor) {
         rounds(first: $limit, after: $after, 
               filter: {
-                operator: {equalTo: "${address}"},
+                operatorAddress: {equalTo: "${address}"},
                 votingEnd: { greaterThanOrEqualTo: "${endNanosTimestamp}" }
               },
               orderBy: [TIMESTAMP_DESC]
@@ -2112,7 +2117,7 @@ var Operator = class {
                   txHash
                   caller
                   admin
-                  operator
+                  operatorAddress
                   contractAddress
                   circuitName
                   timestamp
@@ -2304,7 +2309,7 @@ var Round = class {
         txHash
         caller
         admin
-        operator
+        operatorAddress
         contractAddress
         circuitName
         timestamp
@@ -2332,7 +2337,9 @@ var Round = class {
         maciType
         voiceCreditAmount
         preDeactivateRoot
-        identity
+        operator {
+          identity
+        }
       }
     }`;
       const response = await this.http.fetchGraphql(ROUND_QUERY, "");
@@ -2347,7 +2354,7 @@ var Round = class {
       }
       response.data.round.operatorLogoUrl = "";
       response.data.round.operatorMoniker = "";
-      const identity = response.data.round.identity;
+      const identity = response.data.round.operator?.identity ?? "";
       const keybaseUrl = `https://keybase.io/_/api/1.0/user/lookup.json?key_suffix=${identity}`;
       const keybaseResponse = await this.http.fetch(keybaseUrl);
       const keybaseData = await keybaseResponse.json();
@@ -2393,7 +2400,7 @@ var Round = class {
         "txHash",
         "caller",
         "admin",
-        "operator",
+        "operatorAddress",
         "contractAddress",
         "circuitName",
         "timestamp",
@@ -2420,8 +2427,7 @@ var Round = class {
         "codeId",
         "maciType",
         "voiceCreditAmount",
-        "preDeactivateRoot",
-        "identity"
+        "preDeactivateRoot"
         // 'funds',
       ];
       if (fields && fields.length > 0) {
@@ -2477,7 +2483,7 @@ var Round = class {
                   txHash
                   caller
                   admin
-                  operator
+                  operatorAddress
                   contractAddress
                   circuitName
                   timestamp
@@ -2554,7 +2560,7 @@ var Round = class {
                     txHash
                     caller
                     admin
-                    operator
+                    operatorAddress
                     contractAddress
                     circuitName
                     timestamp
@@ -2669,7 +2675,7 @@ var Round = class {
             txHash
             caller
             admin
-            operator
+            operatorAddress
             contractAddress
             circuitName
             timestamp
@@ -2736,7 +2742,7 @@ var Round = class {
       }
       const ROUND_HISTORY_QUERY = `query ($limit: Int!, $after: Cursor) {
       rounds(first: $limit, after: $after, filter:{
-        operator:{
+        operatorAddress:{
           equalTo: "${operator}"
         }
        }, orderBy: [TIMESTAMP_DESC]){
@@ -2753,7 +2759,7 @@ var Round = class {
                   txHash
                   caller
                   admin
-                  operator
+                  operatorAddress
                   contractAddress
                   circuitName
                   timestamp
@@ -3086,12 +3092,12 @@ query signUpEvents($limit: Int, $after: Cursor) {
   }
   async fetchAllDeactivateLogs(contractAddress) {
     const DEACTIVATE_MESSAGE_QUERY = `query ($limit: Int, $offset: Int) {
-  deactivateMessages(
+  uploadedDeactivateMessages(
     first: $limit,
     offset: $offset,
     orderBy: [BLOCK_HEIGHT_ASC],
     filter: {
-      maciContractAddress: { 
+      contractAddress: { 
         equalTo: "${contractAddress}" 
       },
     }
@@ -3107,8 +3113,8 @@ query signUpEvents($limit: Int, $after: Cursor) {
       timestamp
       txHash
       deactivateMessage
-      maciContractAddress
-      maciOperator
+      contractAddress
+      operatorAddress
     }
   }
 }`;
@@ -4631,20 +4637,45 @@ var DEFAULT_DELAY_CONFIG = {
 };
 
 // src/libs/contract/contract.ts
+function toUtf8(str) {
+  return new TextEncoder().encode(str);
+}
+var DEFAULT_GAS_PRICE = import_stargate2.GasPrice.fromString("10000000000peaka");
+var DEFAULT_RETRIES2 = 5;
+var DEFAULT_RETRY_DELAY2 = 200;
+async function sleep2(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function resolveFee(signingClient, address, msgs, fee, granter) {
+  let stdFee;
+  if (typeof fee === "object") {
+    stdFee = fee;
+  } else {
+    const multiplier = typeof fee === "number" ? fee : 1.8;
+    const gasEstimation = await signingClient.simulate(address, msgs, "");
+    stdFee = (0, import_stargate2.calculateFee)(Math.round(gasEstimation * multiplier), DEFAULT_GAS_PRICE);
+  }
+  if (granter) {
+    return { ...stdFee, granter };
+  }
+  return stdFee;
+}
 var Contract = class {
   constructor({
     network,
-    rpcEndpoint,
+    rpcEndpoints,
     registryAddress,
     saasAddress,
     apiSaasAddress,
     maciCodeId,
     oracleCodeId,
     feegrantOperator,
-    whitelistBackendPubkey
+    whitelistBackendPubkey,
+    retries,
+    retryDelay
   }) {
     this.network = network;
-    this.rpcEndpoint = rpcEndpoint;
+    this.rpcUrls = rpcEndpoints;
     this.registryAddress = registryAddress;
     this.saasAddress = saasAddress;
     this.apiSaasAddress = apiSaasAddress;
@@ -4652,106 +4683,79 @@ var Contract = class {
     this.oracleCodeId = oracleCodeId;
     this.feegrantOperator = feegrantOperator;
     this.whitelistBackendPubkey = whitelistBackendPubkey;
+    this.retries = retries ?? DEFAULT_RETRIES2;
+    this.retryDelay = retryDelay ?? DEFAULT_RETRY_DELAY2;
   }
-  async createAMaciRound(params) {
-    const { signer } = params;
-    const roundInfo = {
-      title: params.title,
-      description: params.description ?? "",
-      link: params.link ?? ""
-    };
-    const votingTime = {
-      start_time: (BigInt(params.startVoting.getTime()) * 1000000n).toString(),
-      end_time: (BigInt(params.endVoting.getTime()) * 1000000n).toString()
-    };
-    const client = await createRegistryClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.registryAddress
-    });
-    const fee = params.fee ?? "auto";
-    const res = await client.createRound(
-      {
-        certificationSystem: params.certificationSystem ?? "0",
-        circuitType: params.circuitType.toString(),
-        deactivateEnabled: params.deactivateEnabled,
-        operator: params.operator,
-        registrationMode: params.registrationMode,
-        roundInfo,
-        voiceCreditMode: params.voiceCreditMode,
-        voteOptionMap: params.voteOptionMap,
-        votingTime
-      },
-      fee,
-      void 0,
-      [{ denom: FEE_DENOM, amount: DEFAULT_BASE_FEE }]
-    );
-    let contractAddress = "";
-    let pollId = "";
-    for (const event of res.events) {
-      if (event.type === "wasm") {
-        const actionEvent = event.attributes.find(
-          (attr) => attr.key === "action"
+  /**
+   * Execute fn with primary-first multi-endpoint failover and exponential backoff retry.
+   * Every call starts from rpcUrls[0] (primary). On failure the next endpoint is tried
+   * in order, cycling back to the primary once all endpoints have been exhausted.
+   * Retries only on connection-level errors; tx-level rejections fail fast.
+   */
+  async withRetry(fn) {
+    let lastError;
+    let urlIndex = 0;
+    for (let attempt = 0; attempt <= this.retries; attempt++) {
+      const rpcEndpoint = this.rpcUrls[urlIndex];
+      try {
+        return await fn(rpcEndpoint);
+      } catch (err) {
+        if (err instanceof import_stargate2.BroadcastTxError) {
+          throw err;
+        }
+        lastError = err;
+        const nextIndex = (urlIndex + 1) % this.rpcUrls.length;
+        const delay = this.retryDelay;
+        console.warn(
+          `[Contract] RPC request failed (attempt ${attempt + 1}/${this.retries + 1}) on ${rpcEndpoint}: ${err?.message ?? err}` + (attempt < this.retries ? ` \u2014 retrying on ${this.rpcUrls[nextIndex]} in ${delay}ms` : " \u2014 all retries exhausted")
         );
-        if (actionEvent && actionEvent.value === "created_round") {
-          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;
-          }
+        urlIndex = nextIndex;
+        if (attempt < this.retries) {
+          await sleep2(delay);
         }
       }
     }
-    return {
-      ...res,
-      contractAddress,
-      pollId
-    };
+    throw lastError;
   }
+  // ==================== Query Methods (unchanged) ====================
   async queryRoundInfo({ signer, roundAddress }) {
-    const client = await createAMaciClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: roundAddress
+    return this.withRetry(async (rpcEndpoint) => {
+      const client = await createAMaciQueryClientBy({ rpcEndpoint, contractAddress: roundAddress });
+      return client.getRoundInfo();
     });
-    const roundInfo = await client.getRoundInfo();
-    return roundInfo;
   }
   async getStateIdx({
     contractAddress,
     pubkey
   }) {
-    const client = await createAMaciQueryClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      contractAddress
+    return this.withRetry(async (rpcEndpoint) => {
+      const client = await createAMaciQueryClientBy({ rpcEndpoint, contractAddress });
+      return client.signuped({ pubkey });
     });
-    const stateIdx = await client.signuped({ pubkey });
-    return stateIdx;
   }
   async getPollId({ contractAddress }) {
-    const client = await createAMaciQueryClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      contractAddress
+    return this.withRetry(async (rpcEndpoint) => {
+      const client = await createAMaciQueryClientBy({ rpcEndpoint, contractAddress });
+      return client.getPollId();
+    });
+  }
+  async isApiSaasOperator({ signer, operator }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const client = await createApiSaasClientBy({
+        rpcEndpoint,
+        wallet: signer,
+        contractAddress: this.apiSaasAddress
+      });
+      return client.isOperator({ address: operator });
     });
-    const pollId = await client.getPollId();
-    return pollId;
   }
+  // ==================== Client Accessors ====================
   async registryClient({
     signer,
     contractAddress
   }) {
     return createRegistryClientBy({
-      rpcEndpoint: this.rpcEndpoint,
+      rpcEndpoint: this.rpcUrls[0],
       wallet: signer,
       contractAddress
     });
@@ -4761,20 +4765,20 @@ var Contract = class {
     contractAddress
   }) {
     return createAMaciClientBy({
-      rpcEndpoint: this.rpcEndpoint,
+      rpcEndpoint: this.rpcUrls[0],
       wallet: signer,
       contractAddress
     });
   }
   async amaciQueryClient({ contractAddress }) {
     return createAMaciQueryClientBy({
-      rpcEndpoint: this.rpcEndpoint,
+      rpcEndpoint: this.rpcUrls[0],
       contractAddress
     });
   }
   async registryQueryClient() {
     return createRegistryQueryClientBy({
-      rpcEndpoint: this.rpcEndpoint,
+      rpcEndpoint: this.rpcUrls[0],
       contractAddress: this.registryAddress
     });
   }
@@ -4783,13 +4787,53 @@ var Contract = class {
     contractAddress
   }) {
     return createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
+      rpcEndpoint: this.rpcUrls[0],
       wallet: signer,
       contractAddress
     });
   }
   async contractClient({ signer }) {
-    return createContractClientByWallet(this.rpcEndpoint, signer);
+    return createContractClientByWallet(this.rpcUrls[0], signer);
+  }
+  // ==================== Write Transaction Methods ====================
+  async createAMaciRound(params) {
+    const { signer } = params;
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const msg = {
+        create_round: {
+          certification_system: params.certificationSystem ?? "0",
+          circuit_type: params.circuitType.toString(),
+          deactivate_enabled: params.deactivateEnabled,
+          operator: params.operator,
+          registration_mode: params.registrationMode,
+          round_info: {
+            title: params.title,
+            description: params.description ?? "",
+            link: params.link ?? ""
+          },
+          voice_credit_mode: params.voiceCreditMode,
+          vote_option_map: params.voteOptionMap,
+          voting_time: {
+            start_time: (BigInt(params.startVoting.getTime()) * 1000000n).toString(),
+            end_time: (BigInt(params.endVoting.getTime()) * 1000000n).toString()
+          }
+        }
+      };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.registryAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: [{ denom: FEE_DENOM, amount: DEFAULT_BASE_FEE }]
+        }
+      };
+      const fee = await resolveFee(signingClient, address, [executeMsg], params.fee ?? "auto");
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], fee);
+      return { txHash };
+    });
   }
   async setApiSaasMaciRoundInfo({
     signer,
@@ -4800,74 +4844,29 @@ var Contract = class {
     gasStation = false,
     fee = 1.8
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    const roundInfo = {
-      title,
-      description,
-      link
-    };
-    if (gasStation && typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         set_round_info: {
           contract_addr: contractAddress,
-          round_info: roundInfo
+          round_info: { title, description, link }
         }
       };
-      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: this.apiSaasAddress
-      };
-      return client.setRoundInfo(
-        {
-          contractAddr: contractAddress,
-          roundInfo
-        },
-        grantFee
-      );
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: this.apiSaasAddress
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.setRoundInfo(
-        {
-          contractAddr: contractAddress,
-          roundInfo
-        },
-        grantFee
-      );
-    }
-    return client.setRoundInfo(
-      {
-        contractAddr: contractAddress,
-        roundInfo
-      },
-      fee
-    );
+      const granter = gasStation ? this.apiSaasAddress : void 0;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async setApiSaasMaciRoundVoteOptions({
     signer,
@@ -4876,69 +4875,29 @@ var Contract = class {
     gasStation = false,
     fee = 1.8
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    if (gasStation && typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         set_vote_options_map: {
           contract_addr: contractAddress,
           vote_option_map: voteOptionMap
         }
       };
-      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: this.apiSaasAddress
-      };
-      return client.setVoteOptionsMap(
-        {
-          contractAddr: contractAddress,
-          voteOptionMap
-        },
-        grantFee
-      );
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: this.apiSaasAddress
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.setVoteOptionsMap(
-        {
-          contractAddr: contractAddress,
-          voteOptionMap
-        },
-        grantFee
-      );
-    }
-    return client.setVoteOptionsMap(
-      {
-        contractAddr: contractAddress,
-        voteOptionMap
-      },
-      fee
-    );
+      const granter = gasStation ? this.apiSaasAddress : void 0;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async addApiSaasOperator({
     signer,
@@ -4946,50 +4905,24 @@ var Contract = class {
     gasStation = false,
     fee = 1.8
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    if (gasStation && typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
-      const msg = {
-        add_operator: {
-          operator
+      const msg = { add_operator: { operator } };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
         }
       };
-      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: this.apiSaasAddress
-      };
-      return client.addOperator({ operator }, grantFee);
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: this.apiSaasAddress
-      };
-      return client.addOperator({ operator }, grantFee);
-    }
-    return client.addOperator({ operator }, fee);
+      const granter = gasStation ? this.apiSaasAddress : void 0;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async removeApiSaasOperator({
     signer,
@@ -4997,169 +4930,70 @@ var Contract = class {
     gasStation = false,
     fee = 1.8
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    if (gasStation && typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
-      const msg = {
-        remove_operator: {
-          operator
+      const msg = { remove_operator: { operator } };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
         }
       };
-      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: this.apiSaasAddress
-      };
-      return client.removeOperator({ operator }, grantFee);
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: this.apiSaasAddress
-      };
-      return client.removeOperator({ operator }, grantFee);
-    }
-    return client.removeOperator({ operator }, fee);
-  }
-  async isApiSaasOperator({ signer, operator }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
+      const granter = gasStation ? this.apiSaasAddress : void 0;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
     });
-    return client.isOperator({ address: operator });
   }
   async createApiSaasAmaciRound(params) {
     const { signer } = params;
-    const roundInfo = {
-      title: params.title,
-      description: params.description ?? "",
-      link: params.link ?? ""
-    };
-    const votingTime = {
-      start_time: (BigInt(params.startVoting.getTime()) * 1000000n).toString(),
-      end_time: (BigInt(params.endVoting.getTime()) * 1000000n).toString()
-    };
-    const circuitType = params.circuitType.toString();
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    const roundParams = {
-      certificationSystem: params.certificationSystem ?? "0",
-      circuitType,
-      deactivateEnabled: params.deactivateEnabled,
-      operator: params.operator,
-      registrationMode: params.registrationMode,
-      roundInfo,
-      voiceCreditMode: params.voiceCreditMode,
-      voteOptionMap: params.voteOptionMap,
-      votingTime
-    };
-    const gasStation = params.gasStation ?? false;
-    const fee = params.fee ?? 1.8;
-    let createResponse;
-    if (gasStation && typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         create_amaci_round: {
-          certification_system: roundParams.certificationSystem,
-          circuit_type: roundParams.circuitType,
-          deactivate_enabled: roundParams.deactivateEnabled,
-          operator: roundParams.operator,
-          registration_mode: roundParams.registrationMode,
-          round_info: roundParams.roundInfo,
-          voice_credit_mode: roundParams.voiceCreditMode,
-          vote_option_map: roundParams.voteOptionMap,
-          voting_time: roundParams.votingTime
+          certification_system: params.certificationSystem ?? "0",
+          circuit_type: params.circuitType.toString(),
+          deactivate_enabled: params.deactivateEnabled,
+          operator: params.operator,
+          registration_mode: params.registrationMode,
+          round_info: {
+            title: params.title,
+            description: params.description ?? "",
+            link: params.link ?? ""
+          },
+          voice_credit_mode: params.voiceCreditMode,
+          vote_option_map: params.voteOptionMap,
+          voting_time: {
+            start_time: (BigInt(params.startVoting.getTime()) * 1000000n).toString(),
+            end_time: (BigInt(params.endVoting.getTime()) * 1000000n).toString()
+          }
+        }
+      };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
         }
       };
-      const gasEstimation = await contractClient.simulate(
+      const granter = params.gasStation ?? false ? this.apiSaasAddress : void 0;
+      const stdFee = await resolveFee(
+        signingClient,
         address,
-        [
-          {
-            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-            value: {
-              sender: address,
-              contract: this.apiSaasAddress,
-              msg: new TextEncoder().encode(JSON.stringify(msg))
-            }
-          }
-        ],
-        ""
+        [executeMsg],
+        params.fee ?? 1.8,
+        granter
       );
-      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: this.apiSaasAddress
-      };
-      createResponse = await client.createAmaciRound(roundParams, grantFee);
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: this.apiSaasAddress
-      };
-      createResponse = await client.createAmaciRound(roundParams, grantFee);
-    } else {
-      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(
-          (attr) => attr.key === "action"
-        );
-        if (actionEvent && actionEvent.value === "created_round") {
-          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;
-          }
-        }
-      }
-    }
-    return {
-      ...createResponse,
-      contractAddress,
-      pollId
-    };
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async signupViaSaas({
     signer,
@@ -5170,21 +5004,9 @@ var Contract = class {
     granter,
     fee = 1.8
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    const saasGranter = granter || this.apiSaasAddress;
-    const signUpParams = {
-      contractAddr: contractAddress,
-      pubkey,
-      certificate,
-      amount
-    };
-    if (typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         sign_up: {
           contract_addr: contractAddress,
@@ -5193,35 +5015,20 @@ var Contract = class {
           amount: amount ?? null
         }
       };
-      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 grantFee2 = {
-        amount: calculatedFee.amount,
-        gas: calculatedFee.gas,
-        granter: saasGranter
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.signUp(signUpParams, grantFee2);
-    }
-    const grantFee = {
-      ...fee,
-      granter: saasGranter
-    };
-    return client.signUp(signUpParams, grantFee);
+      const saasGranter = granter ?? this.apiSaasAddress;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, saasGranter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async preAddNewKeyViaSaas({
     signer,
@@ -5233,22 +5040,9 @@ var Contract = class {
     granter,
     fee = 1.8
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    const saasGranter = granter || this.apiSaasAddress;
-    const keyParams = {
-      contractAddr: contractAddress,
-      pubkey,
-      nullifier,
-      d,
-      groth16Proof
-    };
-    if (typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         pre_add_new_key: {
           contract_addr: contractAddress,
@@ -5258,37 +5052,22 @@ var Contract = class {
           groth16_proof: groth16Proof
         }
       };
-      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 grantFee2 = {
-        amount: calculatedFee.amount,
-        gas: calculatedFee.gas,
-        granter: saasGranter
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.preAddNewKey(keyParams, grantFee2);
-    }
-    const grantFee = {
-      ...fee,
-      granter: saasGranter
-    };
-    return client.preAddNewKey(keyParams, grantFee);
+      const saasGranter = granter ?? this.apiSaasAddress;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, saasGranter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
-  async addNewKeyViaSaas({
+  async preAddNewKey({
     signer,
     contractAddress,
     pubkey,
@@ -5296,24 +5075,47 @@ var Contract = class {
     d,
     groth16Proof,
     granter,
-    fee = 1.8
+    funds = [],
+    fee = "auto"
   }) {
-    const client = await createApiSaasClientBy({
-      rpcEndpoint: this.rpcEndpoint,
-      wallet: signer,
-      contractAddress: this.apiSaasAddress
-    });
-    const saasGranter = granter || this.apiSaasAddress;
-    const keyParams = {
-      contractAddr: contractAddress,
-      pubkey,
-      nullifier,
-      d,
-      groth16Proof
-    };
-    if (typeof fee !== "object") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const msg = {
+        pre_add_new_key: {
+          d,
+          groth16_proof: groth16Proof,
+          nullifier,
+          pubkey
+        }
+      };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: contractAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds
+        }
+      };
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
+  }
+  async addNewKeyViaSaas({
+    signer,
+    contractAddress,
+    pubkey,
+    nullifier,
+    d,
+    groth16Proof,
+    granter,
+    fee = 1.8
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         add_new_key: {
           contract_addr: contractAddress,
@@ -5323,35 +5125,20 @@ var Contract = class {
           groth16_proof: groth16Proof
         }
       };
-      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 grantFee2 = {
-        amount: calculatedFee.amount,
-        gas: calculatedFee.gas,
-        granter: saasGranter
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.addNewKey(keyParams, grantFee2);
-    }
-    const grantFee = {
-      ...fee,
-      granter: saasGranter
-    };
-    return client.addNewKey(keyParams, grantFee);
+      const saasGranter = granter ?? this.apiSaasAddress;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, saasGranter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async publishMessageViaSaas({
     signer,
@@ -5361,15 +5148,9 @@ var Contract = class {
     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") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         publish_message: {
           contract_addr: contractAddress,
@@ -5377,36 +5158,20 @@ var Contract = class {
           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
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.publishMessage({ contractAddr: contractAddress, encPubKeys, messages }, grantFee);
-    }
+      const saasGranter = granter ?? this.apiSaasAddress;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, saasGranter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
   async publishDeactivateMessageViaSaas({
     signer,
@@ -5416,15 +5181,9 @@ var Contract = class {
     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") {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
       const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contractClient({ signer });
       const msg = {
         publish_deactivate_message: {
           contract_addr: contractAddress,
@@ -5432,42 +5191,196 @@ var Contract = class {
           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
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: this.apiSaasAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds: []
+        }
       };
-      return client.publishDeactivateMessage(
-        { contractAddr: contractAddress, encPubKey, message },
-        grantFee
-      );
-    } else {
-      const grantFee = {
-        ...fee,
-        granter: saasGranter
+      const saasGranter = granter ?? this.apiSaasAddress;
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, saasGranter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
+  }
+  // ── Direct (non-SAAS) write methods ──────────────────────────────────────
+  async signup({
+    signer,
+    contractAddress,
+    pubkey,
+    amount = "0",
+    certificate = "",
+    granter,
+    funds = [],
+    fee = "auto"
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const msg = {
+        sign_up: {
+          pubkey,
+          amount,
+          certificate
+        }
       };
-      return client.publishDeactivateMessage(
-        { contractAddr: contractAddress, encPubKey, message },
-        grantFee
-      );
-    }
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: contractAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds
+        }
+      };
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
+  }
+  async addNewKey({
+    signer,
+    contractAddress,
+    pubkey,
+    nullifier,
+    d,
+    groth16Proof,
+    granter,
+    funds = [],
+    fee = "auto"
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const msg = {
+        add_new_key: {
+          d,
+          groth16_proof: groth16Proof,
+          nullifier,
+          pubkey
+        }
+      };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: contractAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds
+        }
+      };
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
+  }
+  async publishMessage({
+    signer,
+    contractAddress,
+    encPubKeys,
+    messages,
+    granter,
+    funds = [],
+    fee = "auto"
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const msg = {
+        publish_message: {
+          enc_pub_keys: encPubKeys,
+          messages
+        }
+      };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: contractAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds
+        }
+      };
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
+  }
+  /**
+   * Generic execute with retry – used for the legacy publish_message_batch format
+   * where the caller pre-builds the EncodeObject (e.g. with stringizing).
+   */
+  async executeWithRetry({
+    signer,
+    address,
+    msgs,
+    granter,
+    fee = "auto"
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const stdFee = await resolveFee(signingClient, address, msgs, fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, msgs, stdFee);
+      return { txHash };
+    });
+  }
+  async publishDeactivateMessage({
+    signer,
+    contractAddress,
+    encPubKey,
+    message,
+    granter,
+    funds = [],
+    fee = "auto"
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const msg = {
+        publish_deactivate_message: {
+          enc_pub_key: encPubKey,
+          message
+        }
+      };
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: contractAddress,
+          msg: toUtf8(JSON.stringify(msg)),
+          funds
+        }
+      };
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, granter);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
+  }
+  async claim({
+    signer,
+    contractAddress,
+    funds = [],
+    fee = "auto"
+  }) {
+    return this.withRetry(async (rpcEndpoint) => {
+      const signingClient = await createContractClientByWallet(rpcEndpoint, signer);
+      const [{ address }] = await signer.getAccounts();
+      const executeMsg = {
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: {
+          sender: address,
+          contract: contractAddress,
+          msg: toUtf8(JSON.stringify({ claim: {} })),
+          funds
+        }
+      };
+      const stdFee = await resolveFee(signingClient, address, [executeMsg], fee, void 0);
+      const txHash = await signingClient.signAndBroadcastSync(address, [executeMsg], stdFee);
+      return { txHash };
+    });
   }
 };
 
@@ -5566,7 +5479,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");
 function isErrorResponse(response) {
   return typeof response === "object" && response !== null && "error" in response && typeof response.error === "object" && "message" in response.error;
@@ -5813,7 +5725,6 @@ var MACI = class {
   }
   async signup({
     signer,
-    address,
     contractAddress,
     maciKeypair,
     oracleCertificate,
@@ -5821,66 +5732,30 @@ var MACI = class {
     fee
   }) {
     try {
-      if (!address) {
-        address = (await signer.getAccounts())[0].address;
-      }
       if (maciKeypair === void 0) {
         maciKeypair = this.maciKeypair;
       }
-      const client = await this.contract.contractClient({
-        signer
-      });
-      const msg = {
-        sign_up: {
-          pubkey: {
-            x: maciKeypair.pubKey[0].toString(),
-            y: maciKeypair.pubKey[1].toString()
-          },
-          amount: oracleCertificate?.amount || "0",
-          certificate: oracleCertificate?.signature || ""
-        }
-      };
       const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
-      if (gasStation === true && typeof fee !== "object") {
-        const gasEstimation = await client.simulate(
-          address,
-          [
-            {
-              typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-              value: {
-                sender: address,
-                contract: contractAddress,
-                msg: new TextEncoder().encode(JSON.stringify(msg)),
-                funds: signupFunds
-              }
-            }
-          ],
-          ""
-        );
-        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: contractAddress
-        };
-        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, void 0, signupFunds);
-      }
-      return client.execute(address, contractAddress, msg, fee || "auto", void 0, signupFunds);
+      const granter = gasStation ? contractAddress : void 0;
+      return await this.contract.signup({
+        signer,
+        contractAddress,
+        pubkey: {
+          x: maciKeypair.pubKey[0].toString(),
+          y: maciKeypair.pubKey[1].toString()
+        },
+        amount: oracleCertificate?.amount ?? "0",
+        certificate: oracleCertificate?.signature ?? "",
+        granter,
+        funds: signupFunds,
+        fee: fee ?? "auto"
+      });
     } catch (error) {
       throw Error(`Signup failed! ${error}`);
     }
   }
   async rawSignup({
     signer,
-    address,
     contractAddress,
     pubKey,
     oracleCertificate,
@@ -5888,73 +5763,35 @@ var MACI = class {
     granter,
     fee
   }) {
-    try {
-      if (!address) {
-        address = (await signer.getAccounts())[0].address;
-      }
-      const client = await this.contract.contractClient({
-        signer
+    const pubkey = {
+      x: pubKey[0].toString(),
+      y: pubKey[1].toString()
+    };
+    const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
+    if (gasStation === true && granter === this.contract.apiSaasAddress) {
+      console.log("[rawSignup] path: viaSaas (gasStation=true, granter=apiSaasAddress)");
+      return this.contract.signupViaSaas({
+        signer,
+        contractAddress,
+        pubkey,
+        certificate: oracleCertificate?.signature,
+        amount: oracleCertificate?.amount,
+        granter,
+        fee
       });
-      const msg = {
-        sign_up: {
-          pubkey: {
-            x: pubKey[0].toString(),
-            y: pubKey[1].toString()
-          },
-          amount: oracleCertificate?.amount || "0",
-          certificate: oracleCertificate?.signature || ""
-        }
-      };
-      const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
-      if (gasStation === true && granter === this.contract.apiSaasAddress) {
-        return this.contract.signupViaSaas({
-          signer,
-          contractAddress,
-          pubkey: {
-            x: pubKey[0].toString(),
-            y: pubKey[1].toString()
-          },
-          certificate: oracleCertificate?.signature,
-          amount: oracleCertificate?.amount,
-          granter,
-          fee
-        });
-      } else if (gasStation === true && typeof fee !== "object") {
-        const gasEstimation = await client.simulate(
-          address,
-          [
-            {
-              typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-              value: {
-                sender: address,
-                contract: contractAddress,
-                msg: new TextEncoder().encode(JSON.stringify(msg)),
-                funds: signupFunds
-              }
-            }
-          ],
-          ""
-        );
-        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.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, void 0, signupFunds);
-      }
-      return client.execute(address, contractAddress, msg, fee || "auto", void 0, signupFunds);
-    } catch (error) {
-      throw Error(`Signup failed! ${error}`);
     }
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    console.log(`[rawSignup] path: direct (gasStation=${gasStation}, granter=${effectiveGranter ?? "none"})`);
+    return this.contract.signup({
+      signer,
+      contractAddress,
+      pubkey,
+      amount: oracleCertificate?.amount ?? "0",
+      certificate: oracleCertificate?.signature ?? "",
+      granter: effectiveGranter,
+      funds: signupFunds,
+      fee: fee ?? "auto"
+    });
   }
   async processVoteOptions({
     selectedOptions,
@@ -6053,15 +5890,34 @@ var MACI = class {
           fee
         });
       }
-      const client = await this.contract.contractClient({
-        signer
-      });
-      return await this.publishMessage({
-        client,
+      if (!address) {
+        address = (await signer.getAccounts())[0].address;
+      }
+      const totalFee = (BigInt(this.feeConfig.messageFee) * BigInt(payload.length)).toString();
+      const legacyMsgs = payload.map(({ msg, encPubkeys }) => ({
+        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+        value: import_tx.MsgExecuteContract.fromPartial({
+          sender: address,
+          contract: contractAddress,
+          msg: new TextEncoder().encode(
+            JSON.stringify(
+              stringizing({
+                publish_message: {
+                  messages: [{ data: msg }],
+                  enc_pub_keys: [{ x: encPubkeys[0], y: encPubkeys[1] }]
+                }
+              })
+            )
+          ),
+          funds: [{ denom: FEE_DENOM, amount: this.feeConfig.messageFee }]
+        })
+      }));
+      const granter = gasStation ? contractAddress : void 0;
+      return await this.contract.executeWithRetry({
+        signer,
         address,
-        payload,
-        contractAddress,
-        gasStation,
+        msgs: legacyMsgs,
+        granter,
         fee
       });
     } catch (error) {
@@ -6107,7 +5963,7 @@ var MACI = class {
     }
   }
   async publishMessage({
-    client,
+    signer,
     address,
     payload,
     contractAddress,
@@ -6115,7 +5971,10 @@ var MACI = class {
     granter,
     fee = 1.8
   }) {
-    const msgs = payload.map(({ msg, encPubkeys }) => ({
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+    const legacyMsgs = payload.map(({ msg, encPubkeys }) => ({
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: import_tx.MsgExecuteContract.fromPartial({
         sender: address,
@@ -6133,25 +5992,8 @@ var MACI = class {
         funds: [{ denom: FEE_DENOM, amount: this.feeConfig.messageFee }]
       })
     }));
-    if (gasStation && typeof fee !== "object") {
-      const gasEstimation = await client.simulate(address, msgs, "");
-      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, msgs, grantFee);
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: granter || contractAddress
-      };
-      return client.signAndBroadcast(address, msgs, grantFee);
-    }
-    return client.signAndBroadcast(address, msgs, fee);
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    return this.contract.executeWithRetry({ signer, address, msgs: legacyMsgs, granter: effectiveGranter, fee });
   }
   async publishMessageBatch({
     signer,
@@ -6165,10 +6007,6 @@ var MACI = class {
     if (!address) {
       address = (await signer.getAccounts())[0].address;
     }
-    const amaciClient = await this.contract.amaciClient({
-      signer,
-      contractAddress
-    });
     const messages = payload.map((p) => ({
       data: p.msg.map((m) => m.toString())
     }));
@@ -6179,6 +6017,7 @@ var MACI = class {
     const totalFee = (BigInt(this.feeConfig.messageFee) * BigInt(payload.length)).toString();
     const batchFunds = [{ denom: FEE_DENOM, amount: totalFee }];
     if (gasStation && granter === this.contract.apiSaasAddress) {
+      console.log("[publishMessageBatch] path: viaSaas (gasStation=true, granter=apiSaasAddress)");
       return this.contract.publishMessageViaSaas({
         signer,
         contractAddress,
@@ -6187,37 +6026,20 @@ var MACI = class {
         granter,
         fee
       });
-    } else if (gasStation && typeof fee !== "object") {
-      const client = await this.contract.contractClient({ signer });
-      const msgForSimulate = {
-        typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-        value: import_tx.MsgExecuteContract.fromPartial({
-          sender: address,
-          contract: contractAddress,
-          msg: new TextEncoder().encode(
-            JSON.stringify({ publish_message: { enc_pub_keys: encPubKeys, messages } })
-          ),
-          funds: batchFunds
-        })
-      };
-      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);
-      const grantFee = {
-        amount: calculatedFee.amount,
-        gas: calculatedFee.gas,
-        granter: granter || contractAddress
-      };
-      return amaciClient.publishMessage({ encPubKeys, messages }, grantFee, void 0, batchFunds);
-    } else if (gasStation && typeof fee === "object") {
-      const grantFee = {
-        ...fee,
-        granter: granter || contractAddress
-      };
-      return amaciClient.publishMessage({ encPubKeys, messages }, grantFee, void 0, batchFunds);
     }
-    return amaciClient.publishMessage({ encPubKeys, messages }, fee, void 0, batchFunds);
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    console.log(
+      `[publishMessageBatch] path: direct (gasStation=${gasStation}, granter=${effectiveGranter ?? "none"})`
+    );
+    return this.contract.publishMessage({
+      signer,
+      contractAddress,
+      encPubKeys,
+      messages,
+      granter: effectiveGranter,
+      funds: batchFunds,
+      fee
+    });
   }
   async publishMessageBatchLegacy({
     signer,
@@ -6231,7 +6053,6 @@ var MACI = class {
     if (!address) {
       address = (await signer.getAccounts())[0].address;
     }
-    const client = await this.contract.contractClient({ signer });
     const messages = payload.map((p) => ({
       data: p.msg
     }));
@@ -6241,7 +6062,7 @@ var MACI = class {
     }));
     const totalFee = (BigInt(this.feeConfig.messageFee) * BigInt(payload.length)).toString();
     const batchFunds = [{ denom: FEE_DENOM, amount: totalFee }];
-    const msg = {
+    const legacyMsg = {
       typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
       value: import_tx.MsgExecuteContract.fromPartial({
         sender: address,
@@ -6259,25 +6080,17 @@ var MACI = class {
         funds: batchFunds
       })
     };
-    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);
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    console.log(
+      `[publishMessageBatchLegacy] path: direct (gasStation=${gasStation}, granter=${effectiveGranter ?? "none"})`
+    );
+    return this.contract.executeWithRetry({
+      signer,
+      address,
+      msgs: [legacyMsg],
+      granter: effectiveGranter,
+      fee
+    });
   }
   async deactivate({
     signer,
@@ -6292,9 +6105,6 @@ var MACI = class {
       if (maciKeypair === void 0) {
         maciKeypair = this.maciKeypair;
       }
-      const client = await this.contract.contractClient({
-        signer
-      });
       const stateIdx = await this.getStateIdxInc({
         address,
         contractAddress
@@ -6313,132 +6123,61 @@ var MACI = class {
         [[0, 0]],
         Number(pollId)
       );
-      const { msg, encPubkeys } = payload[0];
-      const deactivateMsg = stringizing({
-        publish_deactivate_message: {
-          enc_pub_key: {
-            x: encPubkeys[0],
-            y: encPubkeys[1]
-          },
-          message: {
-            data: msg
-          }
-        }
+      return await this.rawDeactivate({
+        signer,
+        contractAddress,
+        payload: payload[0],
+        gasStation,
+        fee
       });
-      const deactivateFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.deactivateFee }];
-      if (gasStation === true && typeof fee !== "object") {
-        const gasEstimation = await client.simulate(
-          address,
-          [
-            {
-              typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-              value: import_tx.MsgExecuteContract.fromPartial({
-                sender: address,
-                contract: contractAddress,
-                msg: new TextEncoder().encode(JSON.stringify(deactivateMsg)),
-                funds: deactivateFunds
-              })
-            }
-          ],
-          ""
-        );
-        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: contractAddress
-        };
-        return client.execute(address, contractAddress, deactivateMsg, grantFee, void 0, deactivateFunds);
-      } else if (gasStation === true && typeof fee === "object") {
-        const grantFee = {
-          ...fee,
-          granter: contractAddress
-        };
-        return client.execute(address, contractAddress, deactivateMsg, grantFee, void 0, deactivateFunds);
-      }
-      return client.execute(address, contractAddress, deactivateMsg, fee, void 0, deactivateFunds);
     } catch (error) {
       throw Error(`Submit deactivate failed! ${error}`);
     }
   }
   async rawDeactivate({
     signer,
-    address,
     contractAddress,
     payload,
     gasStation = false,
     granter,
     fee = 1.8
   }) {
-    try {
-      address = address || (await signer.getAccounts())[0].address;
-      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: {
-            x: encPubkeys[0],
-            y: encPubkeys[1]
-          },
-          message: {
-            data: msg
-          }
-        }
+    const { msg, encPubkeys } = payload;
+    if (gasStation === true && granter === this.contract.apiSaasAddress) {
+      console.log("[rawDeactivate] path: viaSaas (gasStation=true, granter=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 deactivateFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.deactivateFee }];
-      if (gasStation === true && typeof fee !== "object") {
-        const gasEstimation = await client.simulate(
-          address,
-          [
-            {
-              typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-              value: import_tx.MsgExecuteContract.fromPartial({
-                sender: address,
-                contract: contractAddress,
-                msg: new TextEncoder().encode(JSON.stringify(deactivateMsg)),
-                funds: deactivateFunds
-              })
-            }
-          ],
-          ""
-        );
-        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.execute(address, contractAddress, deactivateMsg, grantFee, void 0, deactivateFunds);
-      } else if (gasStation === true && typeof fee === "object") {
-        const grantFee = {
-          ...fee,
-          granter: granter || contractAddress
-        };
-        return client.execute(address, contractAddress, deactivateMsg, grantFee, void 0, deactivateFunds);
-      }
-      return client.execute(address, contractAddress, deactivateMsg, fee, void 0, deactivateFunds);
-    } catch (error) {
-      throw Error(`Submit deactivate failed! ${error}`);
     }
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    console.log(
+      `[rawDeactivate] path: direct (gasStation=${gasStation}, granter=${effectiveGranter ?? "none"})`
+    );
+    const deactivateFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.deactivateFee }];
+    return this.contract.publishDeactivateMessage({
+      signer,
+      contractAddress,
+      encPubKey: {
+        x: encPubkeys[0].toString(),
+        y: encPubkeys[1].toString()
+      },
+      message: {
+        data: msg.map((m) => m.toString())
+      },
+      granter: effectiveGranter,
+      funds: deactivateFunds,
+      fee
+    });
   }
   async fetchAllDeactivateLogs({ contractAddress }) {
     const deactivates = await this.indexer.fetchAllDeactivateLogs(contractAddress);
@@ -6476,25 +6215,15 @@ var MACI = class {
     newMaciKeypair,
     fee = "auto"
   }) {
-    const client = await this.contract.amaciClient({
+    return this.rawAddNewKey({
       signer,
-      contractAddress
+      contractAddress,
+      d,
+      proof,
+      nullifier,
+      newPubkey: newMaciKeypair.pubKey,
+      fee
     });
-    const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
-    return await client.addNewKey(
-      {
-        d,
-        groth16Proof: proof,
-        nullifier: nullifier.toString(),
-        pubkey: {
-          x: newMaciKeypair.pubKey[0].toString(),
-          y: newMaciKeypair.pubKey[1].toString()
-        }
-      },
-      fee,
-      void 0,
-      signupFunds
-    );
   }
   async rawAddNewKey({
     signer,
@@ -6507,77 +6236,40 @@ var MACI = class {
     granter,
     fee = "auto"
   }) {
-    const client = await this.contract.amaciClient({
-      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()
-      }
+    const pubkey = {
+      x: newPubkey[0].toString(),
+      y: newPubkey[1].toString()
     };
+    const nullifierStr = nullifier.toString();
     if (gasStation === true && granter === this.contract.apiSaasAddress) {
+      console.log("[rawAddNewKey] path: viaSaas (gasStation=true, granter=apiSaasAddress)");
       return this.contract.addNewKeyViaSaas({
         signer,
         contractAddress,
-        pubkey: keyParams.pubkey,
-        nullifier: keyParams.nullifier,
+        pubkey,
+        nullifier: nullifierStr,
         d,
         groth16Proof: proof,
         granter,
         fee
       });
-    } else if (gasStation === true && typeof fee !== "object") {
-      const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contract.contractClient({ signer });
-      const msg = {
-        add_new_key: {
-          d,
-          groth16_proof: proof,
-          nullifier: nullifier.toString(),
-          pubkey: {
-            x: newPubkey[0].toString(),
-            y: newPubkey[1].toString()
-          }
-        }
-      };
-      const gasEstimation = await contractClient.simulate(
-        address,
-        [
-          {
-            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-            value: {
-              sender: address,
-              contract: contractAddress,
-              msg: new TextEncoder().encode(JSON.stringify(msg)),
-              funds: signupFunds
-            }
-          }
-        ],
-        ""
-      );
-      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 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(keyParams, grantFee, void 0, signupFunds);
     }
-    return await client.addNewKey(keyParams, fee, void 0, signupFunds);
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    console.log(
+      `[rawAddNewKey] path: direct (gasStation=${gasStation}, granter=${effectiveGranter ?? "none"})`
+    );
+    return this.contract.addNewKey({
+      signer,
+      contractAddress,
+      pubkey,
+      nullifier: nullifierStr,
+      d,
+      groth16Proof: proof,
+      granter: effectiveGranter,
+      funds: signupFunds,
+      fee
+    });
   }
   async rawPreAddNewKey({
     signer,
@@ -6590,88 +6282,47 @@ var MACI = class {
     granter,
     fee = "auto"
   }) {
-    const client = await this.contract.amaciClient({
-      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()
-      }
+    const pubkey = {
+      x: newPubkey[0].toString(),
+      y: newPubkey[1].toString()
     };
+    const nullifierStr = nullifier.toString();
     if (gasStation === true && granter === this.contract.apiSaasAddress) {
+      console.log("[rawPreAddNewKey] path: viaSaas (gasStation=true, granter=apiSaasAddress)");
       return this.contract.preAddNewKeyViaSaas({
         signer,
         contractAddress,
-        pubkey: keyParams.pubkey,
-        nullifier: keyParams.nullifier,
+        pubkey,
+        nullifier: nullifierStr,
         d,
         groth16Proof: proof,
         granter,
         fee
       });
-    } else if (gasStation === true && typeof fee !== "object") {
-      const [{ address }] = await signer.getAccounts();
-      const contractClient = await this.contract.contractClient({ signer });
-      const msg = {
-        pre_add_new_key: {
-          d,
-          groth16_proof: proof,
-          nullifier: nullifier.toString(),
-          pubkey: {
-            x: newPubkey[0].toString(),
-            y: newPubkey[1].toString()
-          }
-        }
-      };
-      const gasEstimation = await contractClient.simulate(
-        address,
-        [
-          {
-            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
-            value: {
-              sender: address,
-              contract: contractAddress,
-              msg: new TextEncoder().encode(JSON.stringify(msg)),
-              funds: signupFunds
-            }
-          }
-        ],
-        ""
-      );
-      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 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(keyParams, grantFee, void 0, signupFunds);
     }
-    return await client.preAddNewKey(keyParams, fee, void 0, signupFunds);
+    const effectiveGranter = gasStation ? granter ?? contractAddress : void 0;
+    console.log(
+      `[rawPreAddNewKey] path: direct (gasStation=${gasStation}, granter=${effectiveGranter ?? "none"})`
+    );
+    return this.contract.preAddNewKey({
+      signer,
+      contractAddress,
+      pubkey,
+      nullifier: nullifierStr,
+      d,
+      groth16Proof: proof,
+      granter: effectiveGranter,
+      funds: signupFunds,
+      fee
+    });
   }
   async claimAMaciRound({
     signer,
     contractAddress,
     fee = "auto"
   }) {
-    const client = await this.contract.amaciClient({
-      signer,
-      contractAddress
-    });
-    return client.claim(fee);
+    return this.contract.claim({ signer, contractAddress, fee });
   }
   async getOracleCertificateConfig() {
     const ecosystems = await this.oracleCertificate.listEcosystems();
@@ -6692,9 +6343,6 @@ var MACI = class {
     amount,
     fee = "auto"
   }) {
-    const client = await this.contract.contractClient({
-      signer
-    });
     if (!address) {
       address = (await signer.getAccounts())[0].address;
     }
@@ -6736,12 +6384,7 @@ var MACI = class {
         })
       }
     ];
-    try {
-      const result = await client.signAndBroadcast(address, msgs, fee);
-      return result;
-    } catch (err) {
-      throw err;
-    }
+    return this.contract.executeWithRetry({ signer, address, msgs, fee });
   }
   /**
    * Batch revoke with withdraw (for maci)
@@ -6756,9 +6399,6 @@ var MACI = class {
     address,
     fee = "auto"
   }) {
-    const client = await this.contract.contractClient({
-      signer
-    });
     if (!address) {
       address = (await signer.getAccounts())[0].address;
     }
@@ -6792,12 +6432,7 @@ var MACI = class {
         })
       }
     ];
-    try {
-      const result = await client.signAndBroadcast(address, msgs, fee);
-      return result;
-    } catch (err) {
-      throw err;
-    }
+    return this.contract.executeWithRetry({ signer, address, msgs, fee });
   }
 };
 
@@ -7081,14 +6716,6 @@ var MaciApiClient = class {
     });
   }
   // ==================== Pre-deactivate APIs ====================
-  /**
-   * Get pre-deactivate data by contract address
-   */
-  async getPreDeactivate(params) {
-    return this.fetch(`/v1/pre-deactivate/${params.contractAddress}`, {
-      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.
@@ -7146,8 +6773,8 @@ var MaciClient = class {
   constructor({
     signer,
     network,
-    rpcEndpoint,
-    restEndpoint,
+    rpcEndpoints,
+    restEndpoints,
     apiEndpoint,
     saasApiEndpoint,
     saasApiKey,
@@ -7161,13 +6788,17 @@ var MaciClient = class {
     feegrantOperator,
     whitelistBackendPubkey,
     certificateApiEndpoint,
-    maciKeypair
+    maciKeypair,
+    retries,
+    retryDelay
   }) {
     this.signer = signer;
     this.network = network;
     const defaultParams = getDefaultParams(network);
-    this.rpcEndpoint = rpcEndpoint || defaultParams.rpcEndpoint;
-    this.restEndpoint = restEndpoint || defaultParams.restEndpoint;
+    const rpcUrls = rpcEndpoints ?? defaultParams.rpcEndpoints;
+    const restUrls = restEndpoints ?? defaultParams.restEndpoints;
+    this.rpcEndpoints = rpcUrls;
+    this.restEndpoints = restUrls;
     this.apiEndpoint = apiEndpoint || defaultParams.apiEndpoint;
     this.saasApiEndpoint = saasApiEndpoint || defaultParams.saasApiEndpoint;
     this.certificateApiEndpoint = certificateApiEndpoint || defaultParams.certificateApiEndpoint;
@@ -7179,9 +6810,9 @@ var MaciClient = class {
     this.feegrantOperator = feegrantOperator || defaultParams.oracleFeegrantOperator;
     this.whitelistBackendPubkey = whitelistBackendPubkey || defaultParams.oracleWhitelistBackendPubkey;
     this.maciKeypair = maciKeypair ?? genKeypair();
-    this.http = new Http(this.apiEndpoint, this.restEndpoint, customFetch, defaultOptions);
+    this.http = new Http(this.apiEndpoint, restUrls, customFetch, defaultOptions, retries, retryDelay);
     this.indexer = new Indexer({
-      restEndpoint: this.restEndpoint,
+      restEndpoint: restUrls[0],
       apiEndpoint: this.apiEndpoint,
       // Indexer GraphQL API
       registryAddress: this.registryAddress,
@@ -7189,14 +6820,16 @@ var MaciClient = class {
     });
     this.contract = new Contract({
       network: this.network,
-      rpcEndpoint: this.rpcEndpoint,
+      rpcEndpoints: rpcUrls,
       registryAddress: this.registryAddress,
       saasAddress: this.saasAddress,
       apiSaasAddress: this.apiSaasAddress,
       maciCodeId: this.maciCodeId,
       oracleCodeId: this.oracleCodeId,
       feegrantOperator: this.feegrantOperator,
-      whitelistBackendPubkey: this.whitelistBackendPubkey
+      whitelistBackendPubkey: this.whitelistBackendPubkey,
+      retries,
+      retryDelay
     });
     this.oracleCertificate = new OracleCertificate({
       certificateApiEndpoint: this.certificateApiEndpoint,
@@ -8250,23 +7883,28 @@ var VoterClient = class _VoterClient {
     mnemonic,
     secretKey,
     apiEndpoint,
-    restEndpoint,
+    rpcEndpoints,
+    restEndpoints,
     saasApiEndpoint,
     saasApiKey,
     registryAddress,
     customFetch,
-    defaultOptions
+    defaultOptions,
+    retries,
+    retryDelay
   }) {
     this.network = network;
     this.accountManager = new MaciAccount({ mnemonic, secretKey });
     const defaultParams = getDefaultParams(network);
-    this.restEndpoint = restEndpoint || defaultParams.restEndpoint;
+    const rpcUrls = rpcEndpoints ?? defaultParams.rpcEndpoints;
+    const restUrls = restEndpoints ?? defaultParams.restEndpoints;
+    this.restEndpoints = restUrls;
     this.apiEndpoint = apiEndpoint || defaultParams.apiEndpoint;
     this.saasApiEndpoint = saasApiEndpoint || defaultParams.saasApiEndpoint;
     this.registryAddress = registryAddress || defaultParams.registryAddress;
-    this.http = new Http(this.apiEndpoint, this.restEndpoint, customFetch, defaultOptions);
+    this.http = new Http(this.apiEndpoint, restUrls, customFetch, defaultOptions, retries, retryDelay);
     this.indexer = new Indexer({
-      restEndpoint: this.restEndpoint,
+      restEndpoint: restUrls[0],
       apiEndpoint: this.apiEndpoint,
       // Indexer GraphQL API
       registryAddress: this.registryAddress,
@@ -8279,14 +7917,16 @@ var VoterClient = class _VoterClient {
     });
     this.contract = new Contract({
       network: this.network,
-      rpcEndpoint: defaultParams.rpcEndpoint,
+      rpcEndpoints: rpcUrls,
       registryAddress: this.registryAddress,
       saasAddress: defaultParams.saasAddress,
       apiSaasAddress: defaultParams.apiSaasAddress,
       maciCodeId: defaultParams.maciCodeId,
       oracleCodeId: defaultParams.oracleCodeId,
       feegrantOperator: defaultParams.oracleFeegrantOperator,
-      whitelistBackendPubkey: defaultParams.oracleWhitelistBackendPubkey
+      whitelistBackendPubkey: defaultParams.oracleWhitelistBackendPubkey,
+      retries,
+      retryDelay
     });
   }
   /**
@@ -9056,16 +8696,6 @@ var VoterClient = class _VoterClient {
     }
     return await this.saasApiClient.createAmaciRound(params);
   }
-  /**
-   * Get pre-deactivate data via SaaS API
-   * @param contractAddress - Contract address
-   */
-  async saasGetPreDeactivate(contractAddress) {
-    if (!this.saasApiClient) {
-      throw new Error("SaaS API client not initialized");
-    }
-    return await this.saasApiClient.getPreDeactivate({ contractAddress });
-  }
   /**
    * Signup via SaaS API
    * @param params - Signup parameters (including ticket)
@@ -9126,10 +8756,14 @@ var VoterClient = class _VoterClient {
    * Poll the chain REST endpoint until the given transaction is committed on-chain,
    * then return its `tx_response` object with an added `status` field.
    *
+   * The underlying REST client automatically rotates through all configured
+   * `restEndpoints` on failure, so a single unavailable node will not block polling.
+   *
    * @param txHash - On-chain transaction hash to wait for.
    * @param options.timeout  - Max wait time in milliseconds (default: 60 000 ms).
    * @param options.interval - Polling interval in milliseconds (default: 2 000 ms).
    * @returns The Cosmos `tx_response` record plus `status`: `'success'` when `code === 0`, `'failed'` otherwise.
+   *          The `events` array can be parsed with helpers such as `parseCreatedRoundEvent`.
    * @throws If the transaction is not found within the timeout period.
    */
   async waitForTransaction(txHash, options = {}) {
@@ -9182,7 +8816,7 @@ var VoterClient = class _VoterClient {
   }) {
     const newVoterClient = new _VoterClient({
       network: this.network,
-      restEndpoint: this.restEndpoint,
+      restEndpoints: this.restEndpoints,
       apiEndpoint: this.apiEndpoint,
       saasApiEndpoint: this.saasApiEndpoint,
       registryAddress: this.registryAddress
@@ -9289,10 +8923,12 @@ var OperatorClient = class {
     mnemonic,
     secretKey,
     apiEndpoint,
-    restEndpoint,
+    restEndpoints,
     registryAddress,
     customFetch,
-    defaultOptions
+    defaultOptions,
+    retries,
+    retryDelay
   }) {
     // State
     this.deactivateSize = 0;
@@ -9314,12 +8950,13 @@ var OperatorClient = class {
     this.network = network;
     this.accountManager = new MaciAccount({ mnemonic, secretKey });
     const defaultParams = getDefaultParams(network);
-    this.restEndpoint = restEndpoint || defaultParams.restEndpoint;
+    const restUrls = restEndpoints ?? defaultParams.restEndpoints;
+    this.restEndpoints = restUrls;
     this.apiEndpoint = apiEndpoint || defaultParams.apiEndpoint;
     this.registryAddress = registryAddress || defaultParams.registryAddress;
-    this.http = new Http(this.apiEndpoint, this.restEndpoint, customFetch, defaultOptions);
+    this.http = new Http(this.apiEndpoint, restUrls, customFetch, defaultOptions, retries, retryDelay);
     this.indexer = new Indexer({
-      restEndpoint: this.restEndpoint,
+      restEndpoint: restUrls[0],
       apiEndpoint: this.apiEndpoint,
       // Indexer GraphQL API
       registryAddress: this.registryAddress,
@@ -9327,14 +8964,16 @@ var OperatorClient = class {
     });
     this.contract = new Contract({
       network: this.network,
-      rpcEndpoint: defaultParams.rpcEndpoint,
+      rpcEndpoints: defaultParams.rpcEndpoints,
       registryAddress: this.registryAddress,
       saasAddress: defaultParams.saasAddress,
       apiSaasAddress: defaultParams.apiSaasAddress,
       maciCodeId: defaultParams.maciCodeId,
       oracleCodeId: defaultParams.oracleCodeId,
       feegrantOperator: defaultParams.oracleFeegrantOperator,
-      whitelistBackendPubkey: defaultParams.oracleWhitelistBackendPubkey
+      whitelistBackendPubkey: defaultParams.oracleWhitelistBackendPubkey,
+      retries,
+      retryDelay
     });
   }
   /**