@dorafactory/maci-sdk 0.0.39 → 0.0.41

package/dist/libs/contract/contract.d.ts

@@ -10,7 +10,7 @@ export declare class Contract {
     feegrantOperator: string;
     whitelistBackendPubkey: string;
     constructor({ rpcEndpoint, registryAddress, maciCodeId, oracleCodeId, feegrantOperator, whitelistBackendPubkey, }: ContractParams);
-    createAMaciRound({ signer, startVoting, endVoting, operator, whitelist, title, description, link, maxVoter, maxOption, voiceCreditAmount, circuitType, preDeactivateRoot, }: CreateAMaciRoundParams & {
+    createAMaciRound({ signer, startVoting, endVoting, operator, whitelist, title, description, link, maxVoter, maxOption, voiceCreditAmount, circuitType, preDeactivateRoot, fee, }: CreateAMaciRoundParams & {
         signer: OfflineSigner;
     }): Promise<{
         contractAddress: string;
@@ -21,10 +21,10 @@ export declare class Contract {
         gasWanted: bigint;
         gasUsed: bigint;
     }>;
-    createMaciRound({ signer, operatorPubkey, startVoting, endVoting, whitelist, title, description, link, maxVoter, maxOption, circuitType, certSystemType, }: CreateMaciRoundParams & {
+    createMaciRound({ signer, operatorPubkey, startVoting, endVoting, whitelist, title, description, link, maxVoter, maxOption, circuitType, certSystemType, fee, }: CreateMaciRoundParams & {
         signer: OfflineSigner;
     }): Promise<import("@cosmjs/cosmwasm-stargate").InstantiateResult>;
-    createOracleMaciRound({ signer, operatorPubkey, startVoting, endVoting, title, description, link, voteOptionMap, circuitType, whitelistEcosystem, whitelistSnapshotHeight, whitelistVotingPowerArgs, }: CreateOracleMaciRoundParams & {
+    createOracleMaciRound({ signer, operatorPubkey, startVoting, endVoting, title, description, link, voteOptionMap, circuitType, whitelistEcosystem, whitelistSnapshotHeight, whitelistVotingPowerArgs, fee, }: CreateOracleMaciRoundParams & {
         signer: OfflineSigner;
     }): Promise<import("@cosmjs/cosmwasm-stargate").InstantiateResult>;
     queryRoundInfo({ signer, roundAddress, }: {

package/dist/libs/contract/types.d.ts

@@ -1,6 +1,7 @@
+import { OfflineSigner } from '@cosmjs/proto-signing';
+import { StdFee } from '@cosmjs/amino';
 import { Whitelist as RegistryWhitelist } from './ts/Registry.types';
 import { Whitelist as MaciWhitelist } from './ts/Maci.types';
-import { OfflineSigner } from '@cosmjs/proto-signing';
 import { MaciCircuitType, MaciCertSystemType, CertificateEcosystem } from '../../types';
 export type CreateRoundParams = {
     signer?: OfflineSigner;
@@ -10,6 +11,7 @@ export type CreateRoundParams = {
     startVoting: Date;
     endVoting: Date;
     circuitType: MaciCircuitType;
+    fee?: number | StdFee | 'auto';
 };
 export type CreateAMaciRoundParams = {
     maxVoter: number;

package/dist/libs/crypto/keys.d.ts

@@ -72,3 +72,4 @@ export declare const genAddKeyProof: (depth: number, { coordPubKey, oldKey, deac
     nullifier: bigint;
     oldPrivateKey: bigint;
 } | null>;
+export declare const genRandomKey: () => string;

package/dist/libs/http/http.d.ts

@@ -13,4 +13,5 @@ export declare class Http {
     fetch(url: string, options?: any): Promise<Response>;
     fetchGraphql<T>(query: string, after: string, limit?: number | null): Promise<T>;
     fetchRest(path: string, options?: any): Promise<any>;
+    fetchAllGraphqlPages<T>(query: string, variables: any): Promise<T[]>;
 }

package/dist/libs/indexer/indexer.d.ts

@@ -1,4 +1,4 @@
-import { BalanceResponse, RoundResponse, RoundsResponse, OperatorResponse, OperatorsResponse, CircuitResponse, TransactionResponse, TransactionsResponse, CircuitsResponse, ProofResponse, SignUpEventsResponse, OperatorDelayOperationsResponse, MissRateResponse, SelectiveRoundResponse } from '../../types';
+import { BalanceResponse, RoundResponse, RoundsResponse, OperatorResponse, OperatorsResponse, CircuitResponse, TransactionResponse, TransactionsResponse, CircuitsResponse, ProofResponse, SignUpEventsResponse, OperatorDelayOperationsResponse, MissRateResponse, SelectiveRoundResponse, DeactivateMessage } from '../../types';
 import { IndexerParams } from './types';
 import { Http } from '../http';
 import { Round, UserAccount, Circuit, Operator, Proof, Transaction, Event } from '../query';
@@ -149,4 +149,5 @@ export declare class Indexer {
      * @returns {Promise<SignUpEventsResponse>} The sign up events response.
      */
     getSignUpEventByPubKey(contractAddress: string, pubKey: bigint[]): Promise<SignUpEventsResponse>;
+    fetchAllDeactivateLogs(contractAddress: string): Promise<DeactivateMessage[]>;
 }

package/dist/libs/maci/maci.d.ts

@@ -4,6 +4,7 @@ import { Contract } from '../contract';
 import { Indexer } from '../indexer';
 import { OracleCertificate } from '../oracle-certificate';
 import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+import { StdFee } from '@cosmjs/stargate';
 import { CertificateEcosystem, ErrorResponse, RoundType } from '../../types';
 import { SignatureResponse } from '../oracle-certificate/types';
 import { OracleWhitelistConfig } from '../contract/ts/OracleMaci.types';
@@ -95,7 +96,7 @@ export declare class MACI {
         address?: string;
         contractAddress: string;
     }): Promise<SignatureResponse>;
-    signup({ signer, address, contractAddress, maciKeypair, oracleCertificate, gasStation, }: {
+    signup({ signer, address, contractAddress, maciKeypair, oracleCertificate, gasStation, fee, }: {
         signer: OfflineSigner;
         address?: string;
         contractAddress: string;
@@ -105,6 +106,7 @@ export declare class MACI {
             signature: string;
         };
         gasStation?: boolean;
+        fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     private processVoteOptions;
     vote({ signer, address, stateIdx, contractAddress, selectedOptions, operatorCoordPubKey, maciKeypair, gasStation, }: {
@@ -130,14 +132,15 @@ export declare class MACI {
         contractAddress: string;
         gasStation: boolean;
     }): Promise<import("@cosmjs/cosmwasm-stargate").DeliverTxResponse>;
-    signupSimple({ client, address, pubKey, contractAddress, gasStation, }: {
+    signupSimple({ client, address, pubKey, contractAddress, gasStation, fee, }: {
         client: SigningCosmWasmClient;
         address: string;
         pubKey: PubKey;
         contractAddress: string;
         gasStation?: boolean;
+        fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
-    signupOracle({ client, address, pubKey, contractAddress, oracleCertificate, gasStation, }: {
+    signupOracle({ client, address, pubKey, contractAddress, oracleCertificate, gasStation, fee, }: {
         client: SigningCosmWasmClient;
         address: string;
         pubKey: PubKey;
@@ -147,10 +150,15 @@ export declare class MACI {
             signature: string;
         };
         gasStation?: boolean;
+        fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
-    claimAMaciRound({ signer, contractAddress, }: {
+    fetchAllDeactivateLogs({ contractAddress, }: {
+        contractAddress: string;
+    }): Promise<import("../../types").DeactivateMessage[]>;
+    claimAMaciRound({ signer, contractAddress, fee, }: {
         signer: OfflineSigner;
         contractAddress: string;
+        fee?: number | StdFee | 'auto';
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     getOracleCertificateConfig(): Promise<import("../oracle-certificate/types").EcosystemsResponse>;
     /**
@@ -161,11 +169,12 @@ export declare class MACI {
      * @param amount
      * @returns
      */
-    batchGrantWithBond({ signer, contractAddress, address, amount, }: {
+    batchGrantWithBond({ signer, contractAddress, address, amount, fee, }: {
         signer: OfflineSigner;
         contractAddress: string;
         amount: string;
         address?: string;
+        fee?: number | StdFee | 'auto';
     }): Promise<import("@cosmjs/cosmwasm-stargate").DeliverTxResponse>;
     /**
      * Batch revoke with withdraw (for maci)
@@ -174,9 +183,10 @@ export declare class MACI {
      * @param address
      * @returns
      */
-    batchRevokeWithdraw({ signer, contractAddress, address, }: {
+    batchRevokeWithdraw({ signer, contractAddress, address, fee, }: {
         signer: OfflineSigner;
         contractAddress: string;
         address?: string;
+        fee?: number | StdFee | 'auto';
     }): Promise<import("@cosmjs/cosmwasm-stargate").DeliverTxResponse>;
 }

package/dist/libs/query/event.d.ts

@@ -4,4 +4,5 @@ export declare class Event {
     http: Http;
     constructor(http: Http);
     getSignUpEventByPubKey(contractAddress: string, pubKey: bigint[]): Promise<SignUpEventsResponse>;
+    fetchAllDeactivateLogs(contractAddress: string): Promise<any[]>;
 }

package/dist/maci.d.ts

@@ -5,6 +5,7 @@ import { OfflineSigner } from '@cosmjs/proto-signing';
 import { Keypair, PubKey } from './libs/crypto';
 import { OracleWhitelistConfig } from './libs/contract/ts/OracleMaci.types';
 import { SignatureResponse } from './libs/oracle-certificate/types';
+import { StdFee } from '@cosmjs/amino';
 /**
  * @class MaciClient
  * @description This class is used to interact with Maci Client.
@@ -147,7 +148,7 @@ export declare class MaciClient {
         address?: string;
         contractAddress: string;
     }): Promise<SignatureResponse>;
-    signup({ signer, address, contractAddress, maciKeypair, oracleCertificate, gasStation, }: {
+    signup({ signer, address, contractAddress, maciKeypair, oracleCertificate, gasStation, fee, }: {
         signer?: OfflineSigner;
         address?: string;
         contractAddress: string;
@@ -157,6 +158,7 @@ export declare class MaciClient {
             signature: string;
         };
         gasStation?: boolean;
+        fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     vote({ signer, address, stateIdx, contractAddress, selectedOptions, operatorCoordPubKey, maciKeypair, gasStation, }: {
         signer?: OfflineSigner;
@@ -171,20 +173,23 @@ export declare class MaciClient {
         maciKeypair?: Keypair;
         gasStation?: boolean;
     }): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
-    claimAMaciRound({ signer, contractAddress, }: {
+    claimAMaciRound({ signer, contractAddress, fee, }: {
         signer?: OfflineSigner;
         contractAddress: string;
+        fee?: number | StdFee | 'auto';
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     getOracleCertificateConfig(): Promise<import("./libs/oracle-certificate/types").EcosystemsResponse>;
-    batchGrantWithBond({ signer, contractAddress, address, amount, }: {
+    batchGrantWithBond({ signer, contractAddress, address, amount, fee, }: {
         signer?: OfflineSigner;
         contractAddress: string;
         address?: string;
         amount: string;
+        fee?: number | StdFee | 'auto';
     }): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
-    batchRevokeWithdraw({ signer, contractAddress, address, }: {
+    batchRevokeWithdraw({ signer, contractAddress, address, fee, }: {
         signer?: OfflineSigner;
         contractAddress: string;
         address?: string;
+        fee?: number | StdFee | 'auto';
     }): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
 }

package/dist/types/index.d.ts

@@ -381,3 +381,12 @@ export type MissRateType = {
     deactivateCount: number;
     missRate: number;
 };
+export type DeactivateMessage = {
+    id: string;
+    blockHeight: string;
+    timestamp: string;
+    txHash: string;
+    deactivateMessage: string;
+    maciContractAddress: string;
+    maciOperator: string;
+};

package/dist/utils/index.d.ts

@@ -5,3 +5,20 @@ export declare function isValidAddress(address: string): boolean;
  * @returns The decimal string representation of the input.
  */
 export declare function hexToDecimalString(hexString: string): string;
+/**
+ * Converts a hexadecimal string to a BigInt.
+ * @param hexString - The hexadecimal string to convert.
+ * @returns The BigInt representation of the input.
+ */
+export declare function hexToBigInt(hexString: string): bigint;
+/**
+ * Parses a public key string into its x and y coordinates.
+ * @param publickKey - The public key string to parse (128 characters long).
+ * @returns An object containing the x and y coordinates as decimal strings.
+ */
+export declare function decompressPublicKey(compressedPubkey: string): {
+    x: string;
+    y: string;
+};
+export declare function compressPublicKey(decompressedPubkey: any[]): string;
+export declare function transformPubkey(oldPubkey: string): bigint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorafactory/maci-sdk",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "SDK for interacting with maci",
   "keywords": [
     "maci",

package/src/libs/contract/contract.ts

@@ -57,6 +57,7 @@ export class Contract {
     voiceCreditAmount,
     circuitType,
     preDeactivateRoot,
+    fee = 'auto',
   }: CreateAMaciRoundParams & { signer: OfflineSigner }) {
     const start_time = (startVoting.getTime() * 10 ** 6).toString();
     const end_time = (endVoting.getTime() * 10 ** 6).toString();
@@ -89,7 +90,7 @@ export class Contract {
         certificationSystem: '0',
         circuitType,
       },
-      'auto',
+      fee,
       undefined,
       [requiredFee]
     );
@@ -125,6 +126,7 @@ export class Contract {
     maxOption,
     circuitType,
     certSystemType,
+    fee = 'auto',
   }: CreateMaciRoundParams & { signer: OfflineSigner }) {
     const start_time = (startVoting.getTime() * 10 ** 6).toString();
     const end_time = (endVoting.getTime() * 10 ** 6).toString();
@@ -148,6 +150,7 @@ export class Contract {
       maxVoter,
       maxOption
     );
+
     const instantiateResponse = await client.instantiate(
       address,
       this.maciCodeId,
@@ -173,7 +176,7 @@ export class Contract {
         qtr_lib: QTR_LIB,
       },
       `[MACI] ${title}`,
-      'auto'
+      fee
     );
 
     return instantiateResponse;
@@ -192,6 +195,7 @@ export class Contract {
     whitelistEcosystem,
     whitelistSnapshotHeight,
     whitelistVotingPowerArgs,
+    fee = 'auto',
   }: CreateOracleMaciRoundParams & { signer: OfflineSigner }) {
     const start_time = (startVoting.getTime() * 1_000_000).toString();
     const end_time = (endVoting.getTime() * 1_000_000).toString();
@@ -207,6 +211,7 @@ export class Contract {
       0,
       0
     );
+
     const instantiateResponse = await client.instantiate(
       address,
       this.oracleCodeId,
@@ -230,7 +235,7 @@ export class Contract {
         feegrant_operator: this.feegrantOperator,
       },
       `[Oracle MACI] ${title}`,
-      'auto'
+      fee
     );
 
     return instantiateResponse;

package/src/libs/contract/types.ts

@@ -1,6 +1,8 @@
+import { OfflineSigner } from '@cosmjs/proto-signing';
+import { StdFee } from '@cosmjs/amino';
+
 import { Whitelist as RegistryWhitelist } from './ts/Registry.types';
 import { Whitelist as MaciWhitelist } from './ts/Maci.types';
-import { OfflineSigner } from '@cosmjs/proto-signing';
 import {
   MaciCircuitType,
   MaciCertSystemType,
@@ -15,6 +17,7 @@ export type CreateRoundParams = {
   startVoting: Date;
   endVoting: Date;
   circuitType: MaciCircuitType;
+  fee?: number | StdFee | 'auto';
 };
 
 export type CreateAMaciRoundParams = {

package/src/libs/crypto/keys.ts

@@ -296,3 +296,26 @@ export const genAddKeyProof = async (
 
   return input;
 };
+
+// LIB
+function randomUint256() {
+  const buffer = [];
+  for (let i = 0; i < 64; i++) {
+    buffer.push(
+      Math.floor(Math.random() * 256)
+        .toString(16)
+        .padStart(2, '0')
+    );
+  }
+  return buffer.join('');
+}
+
+export const genRandomKey = () => {
+  const key = [
+    randomUint256(),
+    randomUint256(),
+    randomUint256(),
+    randomUint256(),
+  ].join('');
+  return ['-----BEGIN MACI KEY-----', key, '-----END MACI KEY-----'].join('\n');
+};

package/src/libs/http/http.ts

@@ -146,4 +146,34 @@ export class Http {
       );
     }
   }
+
+  async fetchAllGraphqlPages<T>(query: string, variables: any): Promise<T[]> {
+    let hasNextPage = true;
+    let offset = 0;
+    const limit = 100; // Adjust the limit as needed
+    const allData: T[] = [];
+
+    while (hasNextPage) {
+      const response = await this.fetch(this.apiEndpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+        body: JSON.stringify({
+          query,
+          variables: { ...variables, limit, offset },
+        }),
+      }).then((res) => res.json());
+
+      const key = Object.keys(response.data)[0];
+
+      const { nodes, pageInfo } = response.data[key];
+      allData.push(...nodes);
+      hasNextPage = pageInfo.hasNextPage;
+      offset += limit;
+    }
+
+    return allData;
+  }
 }

package/src/libs/indexer/indexer.ts

@@ -13,6 +13,7 @@ import {
   OperatorDelayOperationsResponse,
   MissRateResponse,
   SelectiveRoundResponse,
+  DeactivateMessage,
 } from '../../types';
 import { IndexerParams } from './types';
 import { Http } from '../http';
@@ -291,4 +292,10 @@ export class Indexer {
   ): Promise<SignUpEventsResponse> {
     return await this.event.getSignUpEventByPubKey(contractAddress, pubKey);
   }
+
+  async fetchAllDeactivateLogs(
+    contractAddress: string
+  ): Promise<DeactivateMessage[]> {
+    return await this.event.fetchAllDeactivateLogs(contractAddress);
+  }
 }

package/src/libs/maci/maci.ts

@@ -1,5 +1,11 @@
 import { OfflineSigner } from '@cosmjs/proto-signing';
-import { Keypair, batchGenMessage, PubKey, stringizing } from '../crypto';
+import {
+  Keypair,
+  batchGenMessage,
+  PubKey,
+  stringizing,
+  genAddKeyProof,
+} from '../crypto';
 import { Contract } from '../contract';
 import { Indexer } from '../indexer';
 import { OracleCertificate } from '../oracle-certificate';
@@ -444,6 +450,7 @@ export class MACI {
     maciKeypair,
     oracleCertificate,
     gasStation = false,
+    fee,
   }: {
     signer: OfflineSigner;
     address?: string;
@@ -454,6 +461,7 @@ export class MACI {
       signature: string;
     };
     gasStation?: boolean;
+    fee?: StdFee;
   }) {
     try {
       if (!address) {
@@ -477,6 +485,7 @@ export class MACI {
           contractAddress,
           oracleCertificate,
           gasStation,
+          fee,
         });
       } else {
         return await this.signupSimple({
@@ -485,6 +494,7 @@ export class MACI {
           pubKey: maciKeypair.pubKey,
           contractAddress,
           gasStation,
+          fee,
         });
       }
     } catch (error) {
@@ -667,15 +677,17 @@ export class MACI {
     pubKey,
     contractAddress,
     gasStation,
+    fee,
   }: {
     client: SigningCosmWasmClient;
     address: string;
     pubKey: PubKey;
     contractAddress: string;
     gasStation?: boolean;
+    fee?: StdFee;
   }) {
     const gasPrice = GasPrice.fromString('100000000000peaka');
-    const fee = calculateFee(60000000, gasPrice);
+    fee = fee || calculateFee(60000000, gasPrice);
 
     if (gasStation === true) {
       const grantFee: StdFee = {
@@ -720,6 +732,7 @@ export class MACI {
     contractAddress,
     oracleCertificate,
     gasStation,
+    fee,
   }: {
     client: SigningCosmWasmClient;
     address: string;
@@ -730,9 +743,10 @@ export class MACI {
       signature: string;
     };
     gasStation?: boolean;
+    fee?: StdFee;
   }) {
     const gasPrice = GasPrice.fromString('100000000000peaka');
-    const fee = calculateFee(60000000, gasPrice);
+    fee = fee || calculateFee(60000000, gasPrice);
 
     if (gasStation === true) {
       const grantFee: StdFee = {
@@ -774,19 +788,138 @@ export class MACI {
     );
   }
 
+  // async submitDeactivate({
+  //   signer,
+  //   client,
+  //   address,
+  //   maciAccount,
+  //   contractAddress,
+  //   gasStation,
+  //   fee,
+  // }: {
+  //   signer: OfflineSigner;
+  //   client: SigningCosmWasmClient;
+  //   address?: string;
+  //   maciAccount: Keypair;
+  //   contractAddress: string;
+  //   gasStation: boolean;
+  //   fee?: StdFee;
+  // }) {
+  //   try {
+  //     address = address || (await signer.getAccounts())[0].address;
+
+  //     const stateIdx = await this.getStateIdxInc({
+  //       signer,
+  //       address,
+  //       contractAddress,
+  //     });
+
+  //     const operatorCoordPubKey = await this.getRoundInfo({
+  //       contractAddress,
+  //     });
+
+  //     const payload = batchGenMessage(
+  //       Number(stateIdx),
+  //       maciAccount,
+  //       [
+  //         BigInt(operatorCoordPubKey.coordinatorPubkeyX),
+  //         BigInt(operatorCoordPubKey.coordinatorPubkeyY),
+  //       ],
+  //       [[0, 0]]
+  //     );
+
+  //     const { msg, encPubkeys } = payload[0];
+
+  //     const gasPrice = GasPrice.fromString('100000000000peaka');
+  //     fee = fee || calculateFee(20000000, gasPrice);
+
+  //     return client.execute(
+  //       address,
+  //       contractAddress,
+  //       stringizing({
+  //         publish_deactivate_message: {
+  //           enc_pub_key: {
+  //             x: encPubkeys[0],
+  //             y: encPubkeys[1],
+  //           },
+  //           message: {
+  //             data: msg,
+  //           },
+  //         },
+  //       }),
+  //       gasStation === true
+  //         ? {
+  //             amount: fee.amount,
+  //             gas: fee.gas,
+  //             granter: contractAddress,
+  //           }
+  //         : fee
+  //     );
+  //   } catch (error) {
+  //     throw Error(`Submit deactivate failed! ${error}`);
+  //   }
+  // }
+
+  async fetchAllDeactivateLogs({
+    contractAddress,
+  }: {
+    contractAddress: string;
+  }) {
+    const deactivates =
+      await this.indexer.fetchAllDeactivateLogs(contractAddress);
+    return deactivates;
+  }
+
+  // async addNewKey({
+  //   signer,
+  //   client,
+  //   address,
+  //   maciAccount,
+  //   contractAddress,
+  //   gasStation,
+  //   fee,
+  // }: {
+  //   signer: OfflineSigner;
+  //   client: SigningCosmWasmClient;
+  //   address?: string;
+  //   maciAccount: Keypair;
+  //   contractAddress: string;
+  //   gasStation: boolean;
+  //   fee?: StdFee;
+  // }) {
+  //   const deactivates = await this.fetchAllDeactivateLogs({
+  //     contractAddress,
+  //   });
+
+  //   const roundInfo = await this.getRoundInfo({
+  //     contractAddress,
+  //   });
+
+  //   const inputObj = await genAddKeyProof(4, {
+  //     coordPubKey: [
+  //       BigInt(roundInfo.coordinatorPubkeyX),
+  //       BigInt(roundInfo.coordinatorPubkeyY),
+  //     ],
+  //     oldKey: maciAccount,
+  //     deactivates: deactivates.map((d: any) => d.map(BigInt)),
+  //   });
+  // }
+
   async claimAMaciRound({
     signer,
     contractAddress,
+    fee = 'auto',
   }: {
     signer: OfflineSigner;
     contractAddress: string;
+    fee?: number | StdFee | 'auto';
   }) {
     const client = await this.contract.amaciClient({
       signer,
       contractAddress,
     });
 
-    return client.claim();
+    return client.claim(fee);
   }
 
   async getOracleCertificateConfig() {
@@ -807,11 +940,13 @@ export class MACI {
     contractAddress,
     address,
     amount,
+    fee = 'auto',
   }: {
     signer: OfflineSigner;
     contractAddress: string;
     amount: string;
     address?: string;
+    fee?: number | StdFee | 'auto';
   }) {
     const client = await this.contract.contractClient({
       signer,
@@ -861,7 +996,7 @@ export class MACI {
     ];
 
     try {
-      const result = await client.signAndBroadcast(address, msgs, 'auto');
+      const result = await client.signAndBroadcast(address, msgs, fee);
       return result;
     } catch (err) {
       throw err;
@@ -879,10 +1014,12 @@ export class MACI {
     signer,
     contractAddress,
     address,
+    fee = 'auto',
   }: {
     signer: OfflineSigner;
     contractAddress: string;
     address?: string;
+    fee?: number | StdFee | 'auto';
   }) {
     const client = await this.contract.contractClient({
       signer,
@@ -924,7 +1061,7 @@ export class MACI {
     ];
 
     try {
-      const result = await client.signAndBroadcast(address, msgs, 'auto');
+      const result = await client.signAndBroadcast(address, msgs, fee);
       return result;
     } catch (err) {
       throw err;