btc-wallet 0.3.19 → 0.3.21

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

@@ -3387,6 +3387,7 @@ function executeBTCDepositAndAction(_0) {
     amount,
     feeRate,
     fixedAmount = true,
+    pollResult = true,
     isDev = false
   }) {
     var _a;
@@ -3470,6 +3471,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();
@@ -3917,10 +3921,12 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         return;
       const btcNetwork = yield btcContext.getNetwork();
       console.log("btcNetwork:", btcNetwork, network);
-      if (network === "mainnet" && btcNetwork !== "livenet") {
-        yield btcContext.switchNetwork("livenet");
-      } else if (network === "testnet" && btcNetwork !== "testnet") {
-        yield btcContext.switchNetwork("testnet");
+      const networkMap = {
+        livenet: ["mainnet"],
+        testnet: ["testnet", "dev"]
+      };
+      if (!networkMap[btcNetwork].includes(network)) {
+        yield btcContext.switchNetwork(btcNetwork === "livenet" ? "testnet" : "livenet");
       }
     });
   }
@@ -3965,7 +3971,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.19";
+  return "0.3.21";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();