@dorafactory/maci-sdk 0.0.32 → 0.0.34

package/package.json

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

package/src/libs/maci/maci.ts

@@ -58,9 +58,13 @@ export class MACI {
     contractAddress,
   }: {
     signer: OfflineSigner;
-    address: string;
+    address?: string;
     contractAddress: string;
   }) {
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+
     const client = await this.contract.maciClient({
       signer,
       contractAddress,
@@ -157,11 +161,15 @@ export class MACI {
     mode = 'maci',
   }: {
     signer: OfflineSigner;
-    address: string;
+    address?: string;
     contractAddress: string;
     certificate?: string;
     mode?: 'maci' | 'amaci';
   }): Promise<string> {
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+
     if (mode === 'amaci') {
       const isWhiteListed = await this.isWhitelisted({
         signer,
@@ -223,9 +231,13 @@ export class MACI {
     contractAddress,
   }: {
     signer: OfflineSigner;
-    address: string;
+    address?: string;
     contractAddress: string;
   }) {
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+
     const client = await this.contract.amaciClient({
       signer,
       contractAddress,
@@ -406,7 +418,7 @@ export class MACI {
   }: {
     signer: OfflineSigner;
     ecosystem: CertificateEcosystem;
-    address: string;
+    address?: string;
     contractAddress: string;
   }): Promise<SignatureResponse> {
     const oracleWhitelistConfig = await this.getOracleWhitelistConfig({
@@ -414,6 +426,10 @@ export class MACI {
       contractAddress,
     });
 
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+
     const signResponse = await this.oracleCertificate.sign({
       ecosystem,
       address,
@@ -433,7 +449,7 @@ export class MACI {
     gasStation = false,
   }: {
     signer: OfflineSigner;
-    address: string;
+    address?: string;
     contractAddress: string;
     maciAccount?: Account;
     oracleCertificate?: {
@@ -443,6 +459,10 @@ export class MACI {
     gasStation?: boolean;
   }) {
     try {
+      if (!address) {
+        address = (await signer.getAccounts())[0].address;
+      }
+
       if (maciAccount === undefined) {
         maciAccount = await this.circom.genKeypairFromSign(signer, address);
       }
@@ -524,7 +544,7 @@ export class MACI {
     gasStation = false,
   }: {
     signer: OfflineSigner;
-    address: string;
+    address?: string;
     stateIdx: number;
     contractAddress: string;
     selectedOptions: {
@@ -552,6 +572,10 @@ export class MACI {
         voiceCreditBalance,
       });
 
+      if (!address) {
+        address = (await signer.getAccounts())[0].address;
+      }
+
       if (maciAccount === undefined) {
         maciAccount = await this.circom.genKeypairFromSign(signer, address);
       }
@@ -773,18 +797,31 @@ export class MACI {
 
   /**
    * Batch grant with bond (for maci)
-   * @param client
+   * @param signer
    * @param contractAddress
    * @param address
    * @param amount
    * @returns
    */
-  async batchGrantWithBond(
-    client: SigningCosmWasmClient,
-    contractAddress: string,
-    address: string,
-    amount: string
-  ) {
+  async batchGrantWithBond({
+    signer,
+    contractAddress,
+    address,
+    amount,
+  }: {
+    signer: OfflineSigner;
+    contractAddress: string;
+    amount: string;
+    address?: string;
+  }) {
+    const client = await this.contract.contractClient({
+      signer,
+    });
+
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+
     const msgs: MsgExecuteContractEncodeObject[] = [
       {
         typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
@@ -839,11 +876,23 @@ export class MACI {
    * @param address
    * @returns
    */
-  async batchRevokeWithdraw(
-    client: SigningCosmWasmClient,
-    contractAddress: string,
-    address: string
-  ) {
+  async batchRevokeWithdraw({
+    signer,
+    contractAddress,
+    address,
+  }: {
+    signer: OfflineSigner;
+    contractAddress: string;
+    address?: string;
+  }) {
+    const client = await this.contract.contractClient({
+      signer,
+    });
+
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+
     const msgs: MsgExecuteContractEncodeObject[] = [
       {
         typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',

package/src/maci.ts

@@ -483,29 +483,38 @@ export class MaciClient {
     return await this.maci.getOracleCertificateConfig();
   }
 
-  async batchGrantWithBond(
-    client: SigningCosmWasmClient,
-    contractAddress: string,
-    address: string,
-    amount: string
-  ) {
-    return await this.maci.batchGrantWithBond(
-      client,
+  async batchGrantWithBond({
+    signer,
+    contractAddress,
+    address,
+    amount,
+  }: {
+    signer: OfflineSigner;
+    contractAddress: string;
+    address: string;
+    amount: string;
+  }) {
+    return await this.maci.batchGrantWithBond({
+      signer,
       contractAddress,
       address,
-      amount
-    );
+      amount,
+    });
   }
 
-  async batchRevokeWithdraw(
-    client: SigningCosmWasmClient,
-    contractAddress: string,
-    address: string
-  ) {
-    return await this.maci.batchRevokeWithdraw(
-      client,
+  async batchRevokeWithdraw({
+    signer,
+    contractAddress,
+    address,
+  }: {
+    signer: OfflineSigner;
+    contractAddress: string;
+    address: string;
+  }) {
+    return await this.maci.batchRevokeWithdraw({
+      signer,
       contractAddress,
-      address
-    );
+      address,
+    });
   }
 }