@dorafactory/maci-sdk 0.1.3-pre.46.beta.1 → 0.1.3-pre.46.beta.3

package/dist/index.js

@@ -4342,6 +4342,46 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
         _funds
       );
     };
+    this.publishMessage = async ({
+      contractAddr,
+      encPubKeys,
+      messages
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          publish_message: {
+            contract_addr: contractAddr,
+            enc_pub_keys: encPubKeys,
+            messages
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
+    this.publishDeactivateMessage = async ({
+      contractAddr,
+      encPubKey,
+      message
+    }, fee = "auto", memo, _funds) => {
+      return await this.client.execute(
+        this.sender,
+        this.contractAddress,
+        {
+          publish_deactivate_message: {
+            contract_addr: contractAddr,
+            enc_pub_key: encPubKey,
+            message
+          }
+        },
+        fee,
+        memo,
+        _funds
+      );
+    };
     this.client = client;
     this.sender = sender;
     this.contractAddress = contractAddress;
@@ -4354,6 +4394,8 @@ var ApiSaasClient = class extends ApiSaasQueryClient {
     this.createAmaciRound = this.createAmaciRound.bind(this);
     this.setRoundInfo = this.setRoundInfo.bind(this);
     this.setVoteOptionsMap = this.setVoteOptionsMap.bind(this);
+    this.publishMessage = this.publishMessage.bind(this);
+    this.publishDeactivateMessage = this.publishDeactivateMessage.bind(this);
   }
 };
 
@@ -4965,6 +5007,122 @@ var Contract = class {
       contractAddress
     };
   }
+  async publishMessageViaSaas({
+    signer,
+    contractAddress,
+    encPubKeys,
+    messages,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        publish_message: {
+          contract_addr: contractAddress,
+          enc_pub_keys: encPubKeys,
+          messages
+        }
+      };
+      const gasEstimation = await contractClient.simulate(
+        address,
+        [
+          {
+            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+            value: {
+              sender: address,
+              contract: this.apiSaasAddress,
+              msg: new TextEncoder().encode(JSON.stringify(msg))
+            }
+          }
+        ],
+        ""
+      );
+      const multiplier = typeof fee === "number" ? fee : 1.8;
+      const gasPrice = import_stargate2.GasPrice.fromString("10000000000peaka");
+      const calculatedFee = (0, import_stargate2.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
+      const grantFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.publishMessage({ contractAddr: contractAddress, encPubKeys, messages }, grantFee);
+    } else {
+      const grantFee = {
+        ...fee,
+        granter: saasGranter
+      };
+      return client.publishMessage({ contractAddr: contractAddress, encPubKeys, messages }, grantFee);
+    }
+  }
+  async publishDeactivateMessageViaSaas({
+    signer,
+    contractAddress,
+    encPubKey,
+    message,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        publish_deactivate_message: {
+          contract_addr: contractAddress,
+          enc_pub_key: encPubKey,
+          message
+        }
+      };
+      const gasEstimation = await contractClient.simulate(
+        address,
+        [
+          {
+            typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+            value: {
+              sender: address,
+              contract: this.apiSaasAddress,
+              msg: new TextEncoder().encode(JSON.stringify(msg))
+            }
+          }
+        ],
+        ""
+      );
+      const multiplier = typeof fee === "number" ? fee : 1.8;
+      const gasPrice = import_stargate2.GasPrice.fromString("10000000000peaka");
+      const calculatedFee = (0, import_stargate2.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
+      const grantFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.publishDeactivateMessage(
+        { contractAddr: contractAddress, encPubKey, message },
+        grantFee
+      );
+    } else {
+      const grantFee = {
+        ...fee,
+        granter: saasGranter
+      };
+      return client.publishDeactivateMessage(
+        { contractAddr: contractAddress, encPubKey, message },
+        grantFee
+      );
+    }
+  }
 };
 
 // src/libs/oracle-certificate/oracle-certificate.ts
@@ -5486,6 +5644,18 @@ var MACI = class {
       if (!address) {
         address = (await signer.getAccounts())[0].address;
       }
+      const msgLength = payload[0]?.msg.length ?? 0;
+      if (msgLength === 7) {
+        return await this.publishMessageBatchLegacy({
+          signer,
+          address,
+          payload,
+          contractAddress,
+          gasStation,
+          granter,
+          fee
+        });
+      }
       return await this.publishMessageBatch({
         signer,
         address,
@@ -5571,34 +5741,29 @@ var MACI = class {
     }));
     const totalFee = (BigInt(MESSAGE_FEE) * BigInt(payload.length)).toString();
     const batchFunds = [{ denom: FEE_DENOM, amount: totalFee }];
-    if (gasStation && typeof fee !== "object") {
+    if (gasStation && granter === this.contract.apiSaasAddress) {
+      return this.contract.publishMessageViaSaas({
+        signer,
+        contractAddress,
+        encPubKeys,
+        messages,
+        granter,
+        fee
+      });
+    } else if (gasStation && typeof fee !== "object") {
       const client = await this.contract.contractClient({ signer });
-      const encPubKeysBigInt = payload.map((p) => ({
-        x: p.encPubkeys[0],
-        y: p.encPubkeys[1]
-      }));
-      const messagesBigInt = payload.map((p) => ({
-        data: p.msg
-      }));
-      const msg = {
+      const msgForSimulate = {
         typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
         value: import_tx.MsgExecuteContract.fromPartial({
           sender: address,
           contract: contractAddress,
           msg: new TextEncoder().encode(
-            JSON.stringify(
-              stringizing({
-                publish_message: {
-                  enc_pub_keys: encPubKeysBigInt,
-                  messages: messagesBigInt
-                }
-              })
-            )
+            JSON.stringify({ publish_message: { enc_pub_keys: encPubKeys, messages } })
           ),
           funds: batchFunds
         })
       };
-      const gasEstimation = await client.simulate(address, [msg], "");
+      const gasEstimation = await client.simulate(address, [msgForSimulate], "");
       const multiplier = typeof fee === "number" ? fee : 1.8;
       const gasPrice = import_stargate3.GasPrice.fromString("10000000000peaka");
       const calculatedFee = (0, import_stargate3.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
@@ -5617,6 +5782,63 @@ var MACI = class {
     }
     return amaciClient.publishMessage({ encPubKeys, messages }, fee, void 0, batchFunds);
   }
+  async publishMessageBatchLegacy({
+    signer,
+    address,
+    payload,
+    contractAddress,
+    gasStation,
+    granter,
+    fee = 1.8
+  }) {
+    if (!address) {
+      address = (await signer.getAccounts())[0].address;
+    }
+    const client = await this.contract.contractClient({ signer });
+    const messages = payload.map((p) => ({
+      data: p.msg
+    }));
+    const encPubKeys = payload.map((p) => ({
+      x: p.encPubkeys[0],
+      y: p.encPubkeys[1]
+    }));
+    const msg = {
+      typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
+      value: import_tx.MsgExecuteContract.fromPartial({
+        sender: address,
+        contract: contractAddress,
+        msg: new TextEncoder().encode(
+          JSON.stringify(
+            stringizing({
+              publish_message_batch: {
+                enc_pub_keys: encPubKeys,
+                messages
+              }
+            })
+          )
+        )
+      })
+    };
+    if (gasStation && typeof fee !== "object") {
+      const gasEstimation = await client.simulate(address, [msg], "");
+      const multiplier = typeof fee === "number" ? fee : 1.8;
+      const gasPrice = import_stargate3.GasPrice.fromString("10000000000peaka");
+      const calculatedFee = (0, import_stargate3.calculateFee)(Math.round(gasEstimation * multiplier), gasPrice);
+      const grantFee = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: granter || contractAddress
+      };
+      return client.signAndBroadcast(address, [msg], grantFee);
+    } else if (gasStation && typeof fee === "object") {
+      const grantFee = {
+        ...fee,
+        granter: granter || contractAddress
+      };
+      return client.signAndBroadcast(address, [msg], grantFee);
+    }
+    return client.signAndBroadcast(address, [msg], fee);
+  }
   async deactivate({
     signer,
     address,
@@ -5712,10 +5934,23 @@ var MACI = class {
   }) {
     try {
       address = address || (await signer.getAccounts())[0].address;
-      const client = await this.contract.contractClient({
-        signer
-      });
       const { msg, encPubkeys } = payload;
+      if (gasStation === true && granter === this.contract.apiSaasAddress) {
+        return this.contract.publishDeactivateMessageViaSaas({
+          signer,
+          contractAddress,
+          encPubKey: {
+            x: encPubkeys[0].toString(),
+            y: encPubkeys[1].toString()
+          },
+          message: {
+            data: msg.map((m) => m.toString())
+          },
+          granter,
+          fee
+        });
+      }
+      const client = await this.contract.contractClient({ signer });
       const deactivateMsg = stringizing({
         publish_deactivate_message: {
           enc_pub_key: {