@dorafactory/maci-sdk 0.0.39 → 0.0.40

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/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,12 @@ export declare class MACI {
             signature: string;
         };
         gasStation?: boolean;
+        fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
-    claimAMaciRound({ signer, contractAddress, }: {
+    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 +166,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 +180,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorafactory/maci-sdk",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "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/maci/maci.ts

@@ -444,6 +444,7 @@ export class MACI {
     maciKeypair,
     oracleCertificate,
     gasStation = false,
+    fee,
   }: {
     signer: OfflineSigner;
     address?: string;
@@ -454,6 +455,7 @@ export class MACI {
       signature: string;
     };
     gasStation?: boolean;
+    fee?: StdFee;
   }) {
     try {
       if (!address) {
@@ -477,6 +479,7 @@ export class MACI {
           contractAddress,
           oracleCertificate,
           gasStation,
+          fee,
         });
       } else {
         return await this.signupSimple({
@@ -485,6 +488,7 @@ export class MACI {
           pubKey: maciKeypair.pubKey,
           contractAddress,
           gasStation,
+          fee,
         });
       }
     } catch (error) {
@@ -667,15 +671,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 +726,7 @@ export class MACI {
     contractAddress,
     oracleCertificate,
     gasStation,
+    fee,
   }: {
     client: SigningCosmWasmClient;
     address: string;
@@ -730,9 +737,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 = {
@@ -777,16 +785,18 @@ export class MACI {
   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 +817,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 +873,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 +891,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 +938,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;

package/src/maci.ts

@@ -17,6 +17,7 @@ import {
 } 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
@@ -450,6 +451,7 @@ export class MaciClient {
     maciKeypair,
     oracleCertificate,
     gasStation = false,
+    fee,
   }: {
     signer?: OfflineSigner;
     address?: string;
@@ -460,6 +462,7 @@ export class MaciClient {
       signature: string;
     };
     gasStation?: boolean;
+    fee?: StdFee;
   }) {
     return await this.maci.signup({
       signer: this.getSigner(signer),
@@ -468,6 +471,7 @@ export class MaciClient {
       maciKeypair,
       oracleCertificate,
       gasStation,
+      fee,
     });
   }
 
@@ -508,14 +512,16 @@ export class MaciClient {
   async claimAMaciRound({
     signer,
     contractAddress,
+    fee = 'auto',
   }: {
     signer?: OfflineSigner;
     contractAddress: string;
+    fee?: number | StdFee | 'auto';
   }) {
-    signer = this.getSigner(signer);
     return await this.maci.claimAMaciRound({
-      signer,
+      signer: this.getSigner(signer),
       contractAddress,
+      fee,
     });
   }
 
@@ -528,11 +534,13 @@ export class MaciClient {
     contractAddress,
     address,
     amount,
+    fee = 'auto',
   }: {
     signer?: OfflineSigner;
     contractAddress: string;
     address?: string;
     amount: string;
+    fee?: number | StdFee | 'auto';
   }) {
     if (!address) {
       address = await this.getAddress(signer);
@@ -542,6 +550,7 @@ export class MaciClient {
       contractAddress,
       address,
       amount,
+      fee,
     });
   }
 
@@ -549,10 +558,12 @@ export class MaciClient {
     signer,
     contractAddress,
     address,
+    fee = 'auto',
   }: {
     signer?: OfflineSigner;
     contractAddress: string;
     address?: string;
+    fee?: number | StdFee | 'auto';
   }) {
     if (!address) {
       address = await this.getAddress(signer);
@@ -561,6 +572,7 @@ export class MaciClient {
       signer: this.getSigner(signer),
       contractAddress,
       address,
+      fee,
     });
   }
 }