@dorafactory/maci-sdk 0.1.1 → 0.1.2-pre.0

package/src/libs/maci/maci.ts

@@ -473,7 +473,7 @@ export class MACI {
       signature: string;
     };
     gasStation?: boolean;
-    fee?: StdFee;
+    fee?: StdFee | 'auto' | number;
   }) {
     try {
       if (!address) {
@@ -561,6 +561,7 @@ export class MACI {
     operatorCoordPubKey,
     maciKeypair,
     gasStation = false,
+    fee = 1.8,
   }: {
     signer: OfflineSigner;
     address?: string;
@@ -572,6 +573,7 @@ export class MACI {
     operatorCoordPubKey: PubKey;
     maciKeypair?: Keypair;
     gasStation?: boolean;
+    fee?: StdFee | 'auto' | number;
   }) {
     if (maciKeypair === undefined) {
       maciKeypair = this.maciKeypair;
@@ -664,6 +666,7 @@ export class MACI {
         payload,
         contractAddress,
         gasStation,
+        fee,
       });
     } catch (error) {
       throw Error(`Vote failed! ${error}`);
@@ -676,6 +679,7 @@ export class MACI {
     payload,
     contractAddress,
     gasStation,
+    fee = 1.8,
   }: {
     client: SigningCosmWasmClient;
     address: string;
@@ -685,6 +689,7 @@ export class MACI {
     }[];
     contractAddress: string;
     gasStation: boolean;
+    fee?: StdFee | 'auto' | number;
   }) {
     const msgs: MsgExecuteContractEncodeObject[] = payload.map(
       ({ msg, encPubkeys }) => ({
@@ -711,17 +716,30 @@ export class MACI {
       })
     );
 
-    const gasPrice = GasPrice.fromString('100000000000peaka');
-    const fee = calculateFee(20000000 * msgs.length, gasPrice);
-
-    if (gasStation) {
+    if (gasStation && typeof fee !== 'object') {
+      // When gasStation is true and fee is not StdFee, we need to simulate first then add granter
+      const gasEstimation = await client.simulate(address, msgs, '');
+      const multiplier = typeof fee === 'number' ? fee : 1.8;
+      const gasPrice = GasPrice.fromString('10000000000peaka');
+      const calculatedFee = calculateFee(
+        Math.round(gasEstimation * multiplier),
+        gasPrice
+      );
+      const grantFee: StdFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: contractAddress,
+      };
+      return client.signAndBroadcast(address, msgs, grantFee);
+    } else if (gasStation && typeof fee === 'object') {
+      // When gasStation is true and fee is StdFee, add granter
       const grantFee: StdFee = {
-        amount: fee.amount,
-        gas: fee.gas,
+        ...fee,
         granter: contractAddress,
       };
       return client.signAndBroadcast(address, msgs, grantFee);
     }
+
     return client.signAndBroadcast(address, msgs, fee);
   }
 
@@ -731,52 +749,62 @@ export class MACI {
     pubKey,
     contractAddress,
     gasStation,
-    fee,
+    fee = 1.8,
   }: {
     client: SigningCosmWasmClient;
     address: string;
     pubKey: PubKey;
     contractAddress: string;
     gasStation?: boolean;
-    fee?: StdFee;
+    fee?: StdFee | 'auto' | number;
   }) {
-    const gasPrice = GasPrice.fromString('100000000000peaka');
-    fee = fee || calculateFee(60000000, gasPrice);
+    const msg = {
+      sign_up: {
+        pubkey: {
+          x: pubKey[0].toString(),
+          y: pubKey[1].toString(),
+        },
+      },
+    };
 
-    if (gasStation === true) {
-      const grantFee: StdFee = {
-        amount: fee.amount,
-        gas: fee.gas,
-        granter: contractAddress,
-      };
-      return client.execute(
+    if (gasStation === true && typeof fee !== 'object') {
+      // When gasStation is true and fee is not StdFee, we need to simulate first then add granter
+      const gasEstimation = await client.simulate(
         address,
-        contractAddress,
-        {
-          sign_up: {
-            pubkey: {
-              x: pubKey[0].toString(),
-              y: pubKey[1].toString(),
+        [
+          {
+            typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
+            value: {
+              sender: address,
+              contract: contractAddress,
+              msg: new TextEncoder().encode(JSON.stringify(msg)),
             },
           },
-        },
-        grantFee
+        ],
+        ''
+      );
+      const multiplier = typeof fee === 'number' ? fee : 1.8;
+      const gasPrice = GasPrice.fromString('10000000000peaka');
+      const calculatedFee = calculateFee(
+        Math.round(gasEstimation * multiplier),
+        gasPrice
       );
+      const grantFee: StdFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: contractAddress,
+      };
+      return client.execute(address, contractAddress, msg, grantFee);
+    } else if (gasStation === true && typeof fee === 'object') {
+      // When gasStation is true and fee is StdFee, add granter
+      const grantFee: StdFee = {
+        ...fee,
+        granter: contractAddress,
+      };
+      return client.execute(address, contractAddress, msg, grantFee);
     }
 
-    return client.execute(
-      address,
-      contractAddress,
-      {
-        sign_up: {
-          pubkey: {
-            x: pubKey[0].toString(),
-            y: pubKey[1].toString(),
-          },
-        },
-      },
-      fee
-    );
+    return client.execute(address, contractAddress, msg, fee);
   }
 
   async signupOracle({
@@ -786,7 +814,7 @@ export class MACI {
     contractAddress,
     oracleCertificate,
     gasStation,
-    fee,
+    fee = 1.8,
   }: {
     client: SigningCosmWasmClient;
     address: string;
@@ -797,32 +825,57 @@ export class MACI {
       signature: string;
     };
     gasStation?: boolean;
-    fee?: StdFee;
+    fee?: StdFee | 'auto' | number;
   }) {
-    const gasPrice = GasPrice.fromString('100000000000peaka');
-    fee = fee || calculateFee(60000000, gasPrice);
-
-    return client.execute(
-      address,
-      contractAddress,
-      {
-        sign_up: {
-          pubkey: {
-            x: pubKey[0].toString(),
-            y: pubKey[1].toString(),
-          },
-          amount: oracleCertificate.amount,
-          certificate: oracleCertificate.signature,
+    const msg = {
+      sign_up: {
+        pubkey: {
+          x: pubKey[0].toString(),
+          y: pubKey[1].toString(),
         },
+        amount: oracleCertificate.amount,
+        certificate: oracleCertificate.signature,
       },
-      gasStation === true
-        ? {
-            amount: fee.amount,
-            gas: fee.gas,
-            granter: contractAddress,
-          }
-        : fee
-    );
+    };
+
+    if (gasStation === true && typeof fee !== 'object') {
+      // When gasStation is true and fee is not StdFee, we need to simulate first then add granter
+      const gasEstimation = await client.simulate(
+        address,
+        [
+          {
+            typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
+            value: {
+              sender: address,
+              contract: contractAddress,
+              msg: new TextEncoder().encode(JSON.stringify(msg)),
+            },
+          },
+        ],
+        ''
+      );
+      const multiplier = typeof fee === 'number' ? fee : 1.8;
+      const gasPrice = GasPrice.fromString('10000000000peaka');
+      const calculatedFee = calculateFee(
+        Math.round(gasEstimation * multiplier),
+        gasPrice
+      );
+      const grantFee: StdFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: contractAddress,
+      };
+      return client.execute(address, contractAddress, msg, grantFee);
+    } else if (gasStation === true && typeof fee === 'object') {
+      // When gasStation is true and fee is StdFee, add granter
+      const grantFee: StdFee = {
+        ...fee,
+        granter: contractAddress,
+      };
+      return client.execute(address, contractAddress, msg, grantFee);
+    }
+
+    return client.execute(address, contractAddress, msg, fee);
   }
 
   async deactivate({
@@ -831,14 +884,14 @@ export class MACI {
     maciKeypair,
     contractAddress,
     gasStation,
-    fee,
+    fee = 1.8,
   }: {
     signer: OfflineSigner;
     address?: string;
     maciKeypair?: Keypair;
     contractAddress: string;
     gasStation?: boolean;
-    fee?: StdFee;
+    fee?: StdFee | 'auto' | number;
   }) {
     try {
       address = address || (await signer.getAccounts())[0].address;
@@ -873,31 +926,66 @@ export class MACI {
 
       const { msg, encPubkeys } = payload[0];
 
-      const gasPrice = GasPrice.fromString('100000000000peaka');
-      fee = fee || calculateFee(20000000, gasPrice);
+      const deactivateMsg = stringizing({
+        publish_deactivate_message: {
+          enc_pub_key: {
+            x: encPubkeys[0],
+            y: encPubkeys[1],
+          },
+          message: {
+            data: msg,
+          },
+        },
+      });
 
-      return client.execute(
-        address,
-        contractAddress,
-        stringizing({
-          publish_deactivate_message: {
-            enc_pub_key: {
-              x: encPubkeys[0],
-              y: encPubkeys[1],
-            },
-            message: {
-              data: msg,
+      if (gasStation === true && typeof fee !== 'object') {
+        // When gasStation is true and fee is not StdFee, we need to simulate first then add granter
+        const gasEstimation = await client.simulate(
+          address,
+          [
+            {
+              typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
+              value: {
+                sender: address,
+                contract: contractAddress,
+                msg: new TextEncoder().encode(JSON.stringify(deactivateMsg)),
+              },
             },
-          },
-        }),
-        gasStation === true
-          ? {
-              amount: fee.amount,
-              gas: fee.gas,
-              granter: contractAddress,
-            }
-          : fee
-      );
+          ],
+          ''
+        );
+        const multiplier = typeof fee === 'number' ? fee : 1.8;
+        const gasPrice = GasPrice.fromString('10000000000peaka');
+        const calculatedFee = calculateFee(
+          Math.round(gasEstimation * multiplier),
+          gasPrice
+        );
+        const grantFee: StdFee = {
+          amount: calculatedFee.amount,
+          gas: calculatedFee.gas,
+          granter: contractAddress,
+        };
+        return client.execute(
+          address,
+          contractAddress,
+          deactivateMsg,
+          grantFee
+        );
+      } else if (gasStation === true && typeof fee === 'object') {
+        // When gasStation is true and fee is StdFee, add granter
+        const grantFee: StdFee = {
+          ...fee,
+          granter: contractAddress,
+        };
+        return client.execute(
+          address,
+          contractAddress,
+          deactivateMsg,
+          grantFee
+        );
+      }
+
+      return client.execute(address, contractAddress, deactivateMsg, fee);
     } catch (error) {
       throw Error(`Submit deactivate failed! ${error}`);
     }

package/src/maci.ts

@@ -5,6 +5,7 @@ import {
   CreateAMaciRoundParams,
   CreateMaciRoundParams,
   CreateOracleMaciRoundParams,
+  CreateSaasOracleMaciRoundParams,
 } from './libs/contract/types';
 import { OfflineSigner } from '@cosmjs/proto-signing';
 import {
@@ -33,8 +34,10 @@ export class MaciClient {
   public certificateApiEndpoint: string;
 
   public registryAddress: string;
+  public saasAddress: string;
   public maciCodeId: number;
   public oracleCodeId: number;
+  public saasOracleCodeId: number;
   public feegrantOperator: string;
   public whitelistBackendPubkey: string;
 
@@ -58,8 +61,10 @@ export class MaciClient {
     restEndpoint,
     apiEndpoint,
     registryAddress,
+    saasAddress,
     maciCodeId,
     oracleCodeId,
+    saasOracleCodeId,
     customFetch,
     defaultOptions,
     feegrantOperator,
@@ -77,8 +82,10 @@ export class MaciClient {
     this.certificateApiEndpoint =
       certificateApiEndpoint || defaultParams.certificateApiEndpoint;
     this.registryAddress = registryAddress || defaultParams.registryAddress;
+    this.saasAddress = saasAddress || defaultParams.saasAddress;
     this.maciCodeId = maciCodeId || defaultParams.maciCodeId;
     this.oracleCodeId = oracleCodeId || defaultParams.oracleCodeId;
+    this.saasOracleCodeId = saasOracleCodeId || defaultParams.saasCodeId;
     this.feegrantOperator =
       feegrantOperator || defaultParams.oracleFeegrantOperator;
     this.whitelistBackendPubkey =
@@ -101,8 +108,10 @@ export class MaciClient {
       network: this.network,
       rpcEndpoint: this.rpcEndpoint,
       registryAddress: this.registryAddress,
+      saasAddress: this.saasAddress,
       maciCodeId: this.maciCodeId,
       oracleCodeId: this.oracleCodeId,
+      saasOracleCodeId: this.saasOracleCodeId,
       feegrantOperator: this.feegrantOperator,
       whitelistBackendPubkey: this.whitelistBackendPubkey,
     });
@@ -217,6 +226,13 @@ export class MaciClient {
     });
   }
 
+  async createSaasOracleMaciRound(params: CreateSaasOracleMaciRoundParams) {
+    return await this.contract.createSaasOracleMaciRound({
+      signer: this.getSigner(params.signer),
+      ...params,
+    });
+  }
+
   async genKeypairFromSign({
     signer,
     address,

package/src/types/index.ts

@@ -30,8 +30,10 @@ export type ClientParams = {
   apiEndpoint?: string;
   certificateApiEndpoint?: string;
   registryAddress?: string;
+  saasAddress?: string;
   maciCodeId?: number;
   oracleCodeId?: number;
+  saasOracleCodeId?: number;
   customFetch?: typeof fetch;
   defaultOptions?: FetchOptions;
   feegrantOperator?: string;
@@ -45,8 +47,10 @@ export type ContractParams = {
   network: 'mainnet' | 'testnet';
   rpcEndpoint: string;
   registryAddress: string;
+  saasAddress: string;
   maciCodeId: number;
   oracleCodeId: number;
+  saasOracleCodeId: number;
   whitelistBackendPubkey: string;
   feegrantOperator: string;
 };