@dorafactory/maci-sdk 0.1.3-pre.46.beta.15 → 0.1.3-pre.46.beta.16

package/dist/index.js

@@ -5161,6 +5161,198 @@ var Contract = class {
       pollId
     };
   }
+  async signupViaSaas({
+    signer,
+    contractAddress,
+    pubkey,
+    certificate,
+    amount,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    const signUpParams = {
+      contractAddr: contractAddress,
+      pubkey,
+      certificate,
+      amount
+    };
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        sign_up: {
+          contract_addr: contractAddress,
+          pubkey,
+          certificate: certificate ?? null,
+          amount: amount ?? null
+        }
+      };
+      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 grantFee2 = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.signUp(signUpParams, grantFee2);
+    }
+    const grantFee = {
+      ...fee,
+      granter: saasGranter
+    };
+    return client.signUp(signUpParams, grantFee);
+  }
+  async preAddNewKeyViaSaas({
+    signer,
+    contractAddress,
+    pubkey,
+    nullifier,
+    d,
+    groth16Proof,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    const keyParams = {
+      contractAddr: contractAddress,
+      pubkey,
+      nullifier,
+      d,
+      groth16Proof
+    };
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        pre_add_new_key: {
+          contract_addr: contractAddress,
+          pubkey,
+          nullifier,
+          d,
+          groth16_proof: groth16Proof
+        }
+      };
+      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 grantFee2 = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.preAddNewKey(keyParams, grantFee2);
+    }
+    const grantFee = {
+      ...fee,
+      granter: saasGranter
+    };
+    return client.preAddNewKey(keyParams, grantFee);
+  }
+  async addNewKeyViaSaas({
+    signer,
+    contractAddress,
+    pubkey,
+    nullifier,
+    d,
+    groth16Proof,
+    granter,
+    fee = 1.8
+  }) {
+    const client = await createApiSaasClientBy({
+      rpcEndpoint: this.rpcEndpoint,
+      wallet: signer,
+      contractAddress: this.apiSaasAddress
+    });
+    const saasGranter = granter || this.apiSaasAddress;
+    const keyParams = {
+      contractAddr: contractAddress,
+      pubkey,
+      nullifier,
+      d,
+      groth16Proof
+    };
+    if (typeof fee !== "object") {
+      const [{ address }] = await signer.getAccounts();
+      const contractClient = await this.contractClient({ signer });
+      const msg = {
+        add_new_key: {
+          contract_addr: contractAddress,
+          pubkey,
+          nullifier,
+          d,
+          groth16_proof: groth16Proof
+        }
+      };
+      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 grantFee2 = {
+        amount: calculatedFee.amount,
+        gas: calculatedFee.gas,
+        granter: saasGranter
+      };
+      return client.addNewKey(keyParams, grantFee2);
+    }
+    const grantFee = {
+      ...fee,
+      granter: saasGranter
+    };
+    return client.addNewKey(keyParams, grantFee);
+  }
   async publishMessageViaSaas({
     signer,
     contractAddress,
@@ -5714,7 +5906,20 @@ var MACI = class {
         }
       };
       const signupFunds = [{ denom: FEE_DENOM, amount: this.feeConfig.signupFee }];
-      if (gasStation === true && typeof fee !== "object") {
+      if (gasStation === true && granter === this.contract.apiSaasAddress) {
+        return this.contract.signupViaSaas({
+          signer,
+          contractAddress,
+          pubkey: {
+            x: pubKey[0].toString(),
+            y: pubKey[1].toString()
+          },
+          certificate: oracleCertificate?.signature,
+          amount: oracleCertificate?.amount,
+          granter,
+          fee
+        });
+      } else if (gasStation === true && typeof fee !== "object") {
         const gasEstimation = await client.simulate(
           address,
           [
@@ -6316,7 +6521,18 @@ var MACI = class {
         y: newPubkey[1].toString()
       }
     };
-    if (gasStation === true && typeof fee !== "object") {
+    if (gasStation === true && granter === this.contract.apiSaasAddress) {
+      return this.contract.addNewKeyViaSaas({
+        signer,
+        contractAddress,
+        pubkey: keyParams.pubkey,
+        nullifier: keyParams.nullifier,
+        d,
+        groth16Proof: proof,
+        granter,
+        fee
+      });
+    } else if (gasStation === true && typeof fee !== "object") {
       const [{ address }] = await signer.getAccounts();
       const contractClient = await this.contract.contractClient({ signer });
       const msg = {
@@ -6388,7 +6604,18 @@ var MACI = class {
         y: newPubkey[1].toString()
       }
     };
-    if (gasStation === true && typeof fee !== "object") {
+    if (gasStation === true && granter === this.contract.apiSaasAddress) {
+      return this.contract.preAddNewKeyViaSaas({
+        signer,
+        contractAddress,
+        pubkey: keyParams.pubkey,
+        nullifier: keyParams.nullifier,
+        d,
+        groth16Proof: proof,
+        granter,
+        fee
+      });
+    } else if (gasStation === true && typeof fee !== "object") {
       const [{ address }] = await signer.getAccounts();
       const contractClient = await this.contract.contractClient({ signer });
       const msg = {
@@ -7020,6 +7247,38 @@ var MaciClient = class {
     }
     return this.saasApiClient;
   }
+  /**
+   * Poll the chain REST endpoint until the given transaction is committed on-chain,
+   * then return its `tx_response` object with an added `status` field.
+   *
+   * @param txHash - On-chain transaction hash to wait for.
+   * @param options.timeout  - Max wait time in milliseconds (default: 60 000 ms).
+   * @param options.interval - Polling interval in milliseconds (default: 2 000 ms).
+   * @returns The Cosmos `tx_response` record plus `status`: `'success'` when `code === 0`, `'failed'` otherwise.
+   * @throws If the transaction is not found within the timeout period.
+   */
+  async waitForTransaction(txHash, options = {}) {
+    const timeout = options.timeout ?? 6e4;
+    const interval = options.interval ?? 2e3;
+    const deadline = Date.now() + timeout;
+    while (Date.now() < deadline) {
+      try {
+        const data = await this.http.fetchRest(`/cosmos/tx/v1beta1/txs/${txHash}`);
+        if (data?.tx_response) {
+          const txResponse = data.tx_response;
+          return {
+            ...txResponse,
+            status: txResponse.code === 0 ? "success" : "failed"
+          };
+        }
+      } catch {
+      }
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+    throw new Error(
+      `waitForTransaction: transaction ${txHash} not found on chain within ${timeout}ms`
+    );
+  }
   getMaciKeypair() {
     return this.maciKeypair;
   }
@@ -8862,6 +9121,39 @@ var VoterClient = class _VoterClient {
     }
     return await this.saasApiClient.preAddNewKey(params);
   }
+  // ==================== Transaction Utilities ====================
+  /**
+   * Poll the chain REST endpoint until the given transaction is committed on-chain,
+   * then return its `tx_response` object with an added `status` field.
+   *
+   * @param txHash - On-chain transaction hash to wait for.
+   * @param options.timeout  - Max wait time in milliseconds (default: 60 000 ms).
+   * @param options.interval - Polling interval in milliseconds (default: 2 000 ms).
+   * @returns The Cosmos `tx_response` record plus `status`: `'success'` when `code === 0`, `'failed'` otherwise.
+   * @throws If the transaction is not found within the timeout period.
+   */
+  async waitForTransaction(txHash, options = {}) {
+    const timeout = options.timeout ?? 6e4;
+    const interval = options.interval ?? 2e3;
+    const deadline = Date.now() + timeout;
+    while (Date.now() < deadline) {
+      try {
+        const data = await this.http.fetchRest(`/cosmos/tx/v1beta1/txs/${txHash}`);
+        if (data?.tx_response) {
+          const txResponse = data.tx_response;
+          return {
+            ...txResponse,
+            status: txResponse.code === 0 ? "success" : "failed"
+          };
+        }
+      } catch {
+      }
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+    throw new Error(
+      `waitForTransaction: transaction ${txHash} not found on chain within ${timeout}ms`
+    );
+  }
   // ==================== Maci Voter Methods ====================
   /**
    * Pre-create a new account for AMACI voting (pre-deactivate mode).