btc-wallet 0.5.28-beta → 0.5.30-beta

package/dist/core/btcUtils.d.ts

@@ -9,7 +9,12 @@ type CheckGasTokenDebtReturnType<T extends boolean> = T extends true ? void : {
 } | undefined;
 export declare function checkGasTokenDebt<T extends boolean>(csna: string, env: ENV, autoDeposit?: T): Promise<CheckGasTokenDebtReturnType<T>>;
 export declare function getBtcGasPrice(): Promise<number>;
-export declare function getBtcUtxos(account: string): Promise<any>;
+export declare function getBtcUtxos(account: string): Promise<{
+    value: number;
+    status: {
+        confirmed: boolean;
+    };
+}[]>;
 export declare function calculateGasFee(account: string, amount: number, feeRate?: number): Promise<any>;
 export declare function getBtcBalance(account?: string): Promise<{
     rawBalance: number;

package/dist/index.js

@@ -3838,10 +3838,10 @@ function calculateWithdraw(_0) {
 }
 
 // src/core/btcUtils.ts
-var import_bitcoinjs_lib = __toESM(require("bitcoinjs-lib"), 1);
+var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
 var import_coinselect2 = __toESM(require("coinselect"), 1);
 var ecc = __toESM(require("@bitcoinerlab/secp256k1"), 1);
-import_bitcoinjs_lib.default.initEccLib(ecc);
+bitcoin.initEccLib(ecc);
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
 var NBTC_STORAGE_DEPOSIT_AMOUNT = "3000";
 var GAS_LIMIT = "50000000000000";
@@ -3926,8 +3926,10 @@ function getBtcGasPrice() {
 function getBtcUtxos(account) {
   return __async(this, null, function* () {
     const btcRpcUrl = yield getBtcRpcUrl();
-    const utxos = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res) => res.json());
-    return utxos;
+    const utxos = yield fetch(
+      `${btcRpcUrl}/address/${account}/utxo`
+    ).then((res) => res.json());
+    return utxos.filter((item) => item.status.confirmed);
   });
 }
 function calculateGasFee(account, amount, feeRate) {
@@ -4201,8 +4203,8 @@ function getWithdrawTransaction(_0) {
       `(${inputs.map((item) => item.value).join(" + ")}) - (${outputs.map((item) => item.value).join(" + ")}) = ${gasFee}`
     );
     const network = yield getNetwork();
-    const btcNetwork = network === "mainnet" ? import_bitcoinjs_lib.default.networks.bitcoin : import_bitcoinjs_lib.default.networks.testnet;
-    const psbt = new import_bitcoinjs_lib.default.Psbt({ network: btcNetwork });
+    const btcNetwork = network === "mainnet" ? bitcoin.networks.bitcoin : bitcoin.networks.testnet;
+    const psbt = new bitcoin.Psbt({ network: btcNetwork });
     const btcRpcUrl = yield getBtcRpcUrl();
     yield Promise.all(
       inputs.map((input) => __async(this, null, function* () {
@@ -4251,7 +4253,7 @@ function getWithdrawTransaction(_0) {
             methodName: "ft_transfer_call",
             args: {
               receiver_id: config.bridgeContractId,
-              amount: fromAmount,
+              amount: fromAmount == null ? void 0 : fromAmount.toString(),
               msg: JSON.stringify(msg)
             },
             gas: "300000000000000",
@@ -4426,6 +4428,7 @@ function createIframe({
   document.body.appendChild(iframe);
   return iframe;
 }
+var currentMessageHandler = null;
 function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
   return __async(this, null, function* () {
     var _a;
@@ -4445,7 +4448,11 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
       executeBTCDepositAndAction,
       getWithdrawTransaction
     };
-    window.addEventListener("message", (event) => __async(this, null, function* () {
+    if (currentMessageHandler) {
+      window.removeEventListener("message", currentMessageHandler);
+      currentMessageHandler = null;
+    }
+    const handleWalletMessage = (event) => __async(this, null, function* () {
       var _a2, _b;
       if (event.origin !== iframeSrc.origin)
         return;
@@ -4476,7 +4483,9 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
           { targetOrigin: event.origin }
         );
       }
-    }));
+    });
+    currentMessageHandler = handleWalletMessage;
+    window.addEventListener("message", handleWalletMessage);
   });
 }
 function removeWalletButton() {
@@ -4897,7 +4906,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.28-beta";
+  return "0.5.30-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();