@dorafactory/maci-sdk 0.0.21 → 0.0.23

package/package.json

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

package/src/libs/contract/ts/AMaci.client.ts

@@ -20,17 +20,22 @@ import {
   MaciParameters,
   RoundInfo,
   VotingTime,
-  Whitelist,
-  WhitelistConfig,
+  WhitelistBase,
+  WhitelistBaseConfig,
   ExecuteMsg,
-  Uint128,
   MessageData,
   Groth16ProofType,
   QueryMsg,
+  Boolean,
+  DelayType,
+  DelayRecords,
+  DelayRecord,
   PeriodStatus,
   Period,
-  Boolean,
+  Uint128,
   ArrayOfString,
+  Whitelist,
+  WhitelistConfig,
 } from './AMaci.types';
 export interface AMaciReadOnlyInterface {
   contractAddress: string;
@@ -51,7 +56,9 @@ export interface AMaciReadOnlyInterface {
   getVoiceCreditBalance: ({ index }: { index: Uint256 }) => Promise<Uint256>;
   getVoiceCreditAmount: () => Promise<Uint256>;
   whiteList: () => Promise<Whitelist>;
+  canSignUp: ({ sender }: { sender: Addr }) => Promise<Boolean>;
   isWhiteList: ({ sender }: { sender: Addr }) => Promise<Boolean>;
+  isRegister: ({ sender }: { sender: Addr }) => Promise<Boolean>;
   signuped: ({ pubkeyX }: { pubkeyX: Uint256 }) => Promise<Uint256>;
   voteOptionMap: () => Promise<ArrayOfString>;
   maxVoteOptions: () => Promise<Uint256>;
@@ -59,6 +66,7 @@ export interface AMaciReadOnlyInterface {
   queryCircuitType: () => Promise<Uint256>;
   queryCertSystem: () => Promise<Uint256>;
   queryPreDeactivateRoot: () => Promise<Uint256>;
+  getDelayRecords: () => Promise<DelayRecords>;
 }
 export class AMaciQueryClient implements AMaciReadOnlyInterface {
   client: CosmWasmClient;
@@ -83,7 +91,9 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
     this.getVoiceCreditBalance = this.getVoiceCreditBalance.bind(this);
     this.getVoiceCreditAmount = this.getVoiceCreditAmount.bind(this);
     this.whiteList = this.whiteList.bind(this);
+    this.canSignUp = this.canSignUp.bind(this);
     this.isWhiteList = this.isWhiteList.bind(this);
+    this.isRegister = this.isRegister.bind(this);
     this.signuped = this.signuped.bind(this);
     this.voteOptionMap = this.voteOptionMap.bind(this);
     this.maxVoteOptions = this.maxVoteOptions.bind(this);
@@ -91,6 +101,7 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
     this.queryCircuitType = this.queryCircuitType.bind(this);
     this.queryCertSystem = this.queryCertSystem.bind(this);
     this.queryPreDeactivateRoot = this.queryPreDeactivateRoot.bind(this);
+    this.getDelayRecords = this.getDelayRecords.bind(this);
   }
   admin = async (): Promise<Addr> => {
     return this.client.queryContractSmart(this.contractAddress, {
@@ -187,6 +198,13 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
       white_list: {},
     });
   };
+  canSignUp = async ({ sender }: { sender: Addr }): Promise<Boolean> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      can_sign_up: {
+        sender,
+      },
+    });
+  };
   isWhiteList = async ({ sender }: { sender: Addr }): Promise<Boolean> => {
     return this.client.queryContractSmart(this.contractAddress, {
       is_white_list: {
@@ -194,6 +212,13 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
       },
     });
   };
+  isRegister = async ({ sender }: { sender: Addr }): Promise<Boolean> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      is_register: {
+        sender,
+      },
+    });
+  };
   signuped = async ({ pubkeyX }: { pubkeyX: Uint256 }): Promise<Uint256> => {
     return this.client.queryContractSmart(this.contractAddress, {
       signuped: {
@@ -231,6 +256,11 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
       query_pre_deactivate_root: {},
     });
   };
+  getDelayRecords = async (): Promise<DelayRecords> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      get_delay_records: {},
+    });
+  };
 }
 export interface AMaciInterface extends AMaciReadOnlyInterface {
   contractAddress: string;
@@ -249,7 +279,7 @@ export interface AMaciInterface extends AMaciReadOnlyInterface {
     {
       whitelists,
     }: {
-      whitelists: Whitelist;
+      whitelists: WhitelistBase;
     },
     fee?: number | StdFee | 'auto',
     memo?: string,
@@ -393,32 +423,7 @@ export interface AMaciInterface extends AMaciReadOnlyInterface {
     memo?: string,
     _funds?: Coin[]
   ) => Promise<ExecuteResult>;
-  grant: (
-    {
-      maxAmount,
-    }: {
-      maxAmount: Uint128;
-    },
-    fee?: number | StdFee | 'auto',
-    memo?: string,
-    _funds?: Coin[]
-  ) => Promise<ExecuteResult>;
-  revoke: (
-    fee?: number | StdFee | 'auto',
-    memo?: string,
-    _funds?: Coin[]
-  ) => Promise<ExecuteResult>;
-  bond: (
-    fee?: number | StdFee | 'auto',
-    memo?: string,
-    _funds?: Coin[]
-  ) => Promise<ExecuteResult>;
-  withdraw: (
-    {
-      amount,
-    }: {
-      amount?: Uint128;
-    },
+  claim: (
     fee?: number | StdFee | 'auto',
     memo?: string,
     _funds?: Coin[]
@@ -451,10 +456,7 @@ export class AMaciClient extends AMaciQueryClient implements AMaciInterface {
     this.stopProcessingPeriod = this.stopProcessingPeriod.bind(this);
     this.processTally = this.processTally.bind(this);
     this.stopTallyingPeriod = this.stopTallyingPeriod.bind(this);
-    this.grant = this.grant.bind(this);
-    this.revoke = this.revoke.bind(this);
-    this.bond = this.bond.bind(this);
-    this.withdraw = this.withdraw.bind(this);
+    this.claim = this.claim.bind(this);
   }
   setRoundInfo = async (
     {
@@ -483,7 +485,7 @@ export class AMaciClient extends AMaciQueryClient implements AMaciInterface {
     {
       whitelists,
     }: {
-      whitelists: Whitelist;
+      whitelists: WhitelistBase;
     },
     fee: number | StdFee | 'auto' = 'auto',
     memo?: string,
@@ -806,12 +808,7 @@ export class AMaciClient extends AMaciQueryClient implements AMaciInterface {
       _funds
     );
   };
-  grant = async (
-    {
-      maxAmount,
-    }: {
-      maxAmount: Uint128;
-    },
+  claim = async (
     fee: number | StdFee | 'auto' = 'auto',
     memo?: string,
     _funds?: Coin[]
@@ -820,64 +817,7 @@ export class AMaciClient extends AMaciQueryClient implements AMaciInterface {
       this.sender,
       this.contractAddress,
       {
-        grant: {
-          max_amount: maxAmount,
-        },
-      },
-      fee,
-      memo,
-      _funds
-    );
-  };
-  revoke = async (
-    fee: number | StdFee | 'auto' = 'auto',
-    memo?: string,
-    _funds?: Coin[]
-  ): Promise<ExecuteResult> => {
-    return await this.client.execute(
-      this.sender,
-      this.contractAddress,
-      {
-        revoke: {},
-      },
-      fee,
-      memo,
-      _funds
-    );
-  };
-  bond = async (
-    fee: number | StdFee | 'auto' = 'auto',
-    memo?: string,
-    _funds?: Coin[]
-  ): Promise<ExecuteResult> => {
-    return await this.client.execute(
-      this.sender,
-      this.contractAddress,
-      {
-        bond: {},
-      },
-      fee,
-      memo,
-      _funds
-    );
-  };
-  withdraw = async (
-    {
-      amount,
-    }: {
-      amount?: Uint128;
-    },
-    fee: number | StdFee | 'auto' = 'auto',
-    memo?: string,
-    _funds?: Coin[]
-  ): Promise<ExecuteResult> => {
-    return await this.client.execute(
-      this.sender,
-      this.contractAddress,
-      {
-        withdraw: {
-          amount,
-        },
+        claim: {},
       },
       fee,
       memo,

package/src/libs/contract/ts/AMaci.types.ts

@@ -20,7 +20,7 @@ export interface InstantiateMsg {
   round_info: RoundInfo;
   voice_credit_amount: Uint256;
   voting_time: VotingTime;
-  whitelist?: Whitelist | null;
+  whitelist?: WhitelistBase | null;
 }
 export interface PubKey {
   x: Uint256;
@@ -41,10 +41,10 @@ export interface VotingTime {
   end_time: Timestamp;
   start_time: Timestamp;
 }
-export interface Whitelist {
-  users: WhitelistConfig[];
+export interface WhitelistBase {
+  users: WhitelistBaseConfig[];
 }
-export interface WhitelistConfig {
+export interface WhitelistBaseConfig {
   addr: Addr;
 }
 export type ExecuteMsg =
@@ -55,7 +55,7 @@ export type ExecuteMsg =
     }
   | {
       set_whitelists: {
-        whitelists: Whitelist;
+        whitelists: WhitelistBase;
       };
     }
   | {
@@ -129,22 +129,8 @@ export type ExecuteMsg =
       };
     }
   | {
-      grant: {
-        max_amount: Uint128;
-      };
-    }
-  | {
-      revoke: {};
-    }
-  | {
-      bond: {};
-    }
-  | {
-      withdraw: {
-        amount?: Uint128 | null;
-      };
+      claim: {};
     };
-export type Uint128 = string;
 export interface MessageData {
   data: [Uint256, Uint256, Uint256, Uint256, Uint256, Uint256, Uint256];
 }
@@ -211,11 +197,21 @@ export type QueryMsg =
   | {
       white_list: {};
     }
+  | {
+      can_sign_up: {
+        sender: Addr;
+      };
+    }
   | {
       is_white_list: {
         sender: Addr;
       };
     }
+  | {
+      is_register: {
+        sender: Addr;
+      };
+    }
   | {
       signuped: {
         pubkey_x: Uint256;
@@ -238,7 +234,22 @@ export type QueryMsg =
     }
   | {
       query_pre_deactivate_root: {};
+    }
+  | {
+      get_delay_records: {};
     };
+export type Boolean = boolean;
+export type DelayType = 'deactivate_delay' | 'tally_delay';
+export interface DelayRecords {
+  records: DelayRecord[];
+}
+export interface DelayRecord {
+  delay_duration: number;
+  delay_process_dmsg_count: Uint256;
+  delay_reason: string;
+  delay_timestamp: Timestamp;
+  delay_type: DelayType;
+}
 export type PeriodStatus =
   | 'pending'
   | 'voting'
@@ -248,5 +259,12 @@ export type PeriodStatus =
 export interface Period {
   status: PeriodStatus;
 }
-export type Boolean = boolean;
+export type Uint128 = string;
 export type ArrayOfString = string[];
+export interface Whitelist {
+  users: WhitelistConfig[];
+}
+export interface WhitelistConfig {
+  addr: Addr;
+  is_register: boolean;
+}

package/src/libs/maci/maci.ts

@@ -18,6 +18,7 @@ import { MsgExecuteContract } from 'cosmjs-types/cosmwasm/wasm/v1/tx.js';
 import { CertificateEcosystem, ErrorResponse } from '../../types';
 import { SignatureResponse } from '../oracle-certificate/types';
 import { OracleWhitelistConfig } from '../contract/ts/OracleMaci.types';
+import { getAMaciRoundCircuitFee } from '../contract/utils';
 
 export function isErrorResponse(response: unknown): response is ErrorResponse {
   return (
@@ -313,6 +314,17 @@ export class MACI {
     }
   }
 
+  async queryAMaciChargeFee({
+    maxVoter,
+    maxOption,
+  }: {
+    maxVoter: number;
+    maxOption: number;
+  }) {
+    const fee = getAMaciRoundCircuitFee(maxVoter, maxOption);
+    return fee;
+  }
+
   async queryRoundGasStation({ contractAddress }: { contractAddress: string }) {
     const roundInfo = await this.getRoundInfo({ contractAddress });
 
@@ -714,4 +726,19 @@ export class MACI {
       fee
     );
   }
+
+  async claimAMaciRound({
+    signer,
+    contractAddress,
+  }: {
+    signer: OfflineSigner;
+    contractAddress: string;
+  }) {
+    const client = await this.contract.amaciClient({
+      signer,
+      contractAddress,
+    });
+
+    return client.claim();
+  }
 }