btc-wallet 0.3.20 → 0.3.22

package/dist/core/btcUtils.d.ts

@@ -1,3 +1,4 @@
+import type { FinalExecutionOutcome } from '@near-wallet-selector/core';
 export interface DebtInfo {
     gas_token_id: string;
     transfer_amount: string;
@@ -40,19 +41,21 @@ export declare function getDepositAmount(amount: string, option?: {
     receiveAmount: number;
     fee: number;
 }>;
-interface ExecuteBTCDepositAndActionParams {
+interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
     action?: {
         receiver_id: string;
         amount: string;
         msg: string;
     };
     amount?: string;
-    /** fee rate, if not provided, will use the recommended fee rate from the btc node */
     feeRate?: number;
-    /** fixed amount, if true, in arrears mode, amount is fixed, otherwise it is depositAmount-repayAction.amount */
     fixedAmount?: boolean;
-    /** is dev environment */
     isDev?: boolean;
+    pollResult?: T;
 }
-export declare function executeBTCDepositAndAction({ action, amount, feeRate, fixedAmount, isDev, }: ExecuteBTCDepositAndActionParams): Promise<any[]>;
+/**
+ * @param T - if true, return the poll result, otherwise return the btcTxHash
+ */
+type ExecuteBTCDepositAndActionReturn<T extends boolean> = T extends true ? FinalExecutionOutcome[] : string;
+export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, fixedAmount, pollResult, isDev, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
 export {};

package/dist/index.js

@@ -2832,10 +2832,10 @@ function pollTransactionStatuses(network, hashes) {
       currentAttempt++;
       const promises = Array.from(pendingHashes).map((hash) => __async(this, null, function* () {
         try {
-          const result = yield provider.txStatus(hash, "unused", "FINAL");
-          if (result && result.status) {
-            console.log(`Transaction ${hash} result:`, result);
-            results.set(hash, result);
+          const result2 = yield provider.txStatus(hash, "unused", "FINAL");
+          if (result2 && result2.status) {
+            console.log(`Transaction ${hash} result:`, result2);
+            results.set(hash, result2);
             pendingHashes.delete(hash);
           }
         } catch (error) {
@@ -2855,7 +2855,8 @@ function pollTransactionStatuses(network, hashes) {
         yield delay(1e4);
       }
     }
-    return hashes.map((hash) => results.get(hash));
+    const result = hashes.map((hash) => results.get(hash)).filter(Boolean);
+    return result;
   });
 }
 
@@ -3387,6 +3388,7 @@ function executeBTCDepositAndAction(_0) {
     amount,
     feeRate,
     fixedAmount = true,
+    pollResult = true,
     isDev = false
   }) {
     var _a;
@@ -3470,6 +3472,9 @@ function executeBTCDepositAndAction(_0) {
         postActions: postActionsStr,
         extraMsg: depositMsg.extra_msg
       });
+      if (!pollResult) {
+        return txHash;
+      }
       const checkTransactionStatusRes = yield checkBridgeTransactionStatus(config.base_url, txHash);
       console.log("checkBridgeTransactionStatus resp:", checkTransactionStatusRes);
       const network = yield getNetwork();
@@ -3967,7 +3972,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.20";
+  return "0.3.22";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();