btc-wallet 0.5.27-beta → 0.5.29-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

@@ -24,18 +24,6 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -3938,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) {
@@ -4196,13 +4186,13 @@ function getWithdrawTransaction(_0) {
     const config = getWalletConfig(env);
     const _btcAddress = btcAddress || getBtcProvider().account;
     const _csna = csna || (yield getCsnaAccountId(env));
-    const _a = yield calculateWithdraw({
+    const { inputs, outputs, isError, errorMsg, fromAmount, gasFee } = yield calculateWithdraw({
       amount,
       feeRate,
       csna: _csna,
       btcAddress: _btcAddress,
       env
-    }), { inputs, outputs, isError, errorMsg } = _a, rest = __objRest(_a, ["inputs", "outputs", "isError", "errorMsg"]);
+    });
     if (isError || !inputs || !outputs) {
       throw new Error(errorMsg);
     }
@@ -4210,7 +4200,7 @@ function getWithdrawTransaction(_0) {
     console.log("outputs:", JSON.stringify(outputs));
     console.log("inputs - outputs = gas");
     console.log(
-      `(${inputs.map((item) => item.value).join(" + ")}) - (${outputs.map((item) => item.value).join(" + ")}) = ${rest.gasFee}`
+      `(${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;
@@ -4263,7 +4253,7 @@ function getWithdrawTransaction(_0) {
             methodName: "ft_transfer_call",
             args: {
               receiver_id: config.bridgeContractId,
-              amount: amount.toString(),
+              amount: fromAmount == null ? void 0 : fromAmount.toString(),
               msg: JSON.stringify(msg)
             },
             gas: "300000000000000",
@@ -4438,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;
@@ -4457,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;
@@ -4488,7 +4483,9 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
           { targetOrigin: event.origin }
         );
       }
-    }));
+    });
+    currentMessageHandler = handleWalletMessage;
+    window.addEventListener("message", handleWalletMessage);
   });
 }
 function removeWalletButton() {
@@ -4909,7 +4906,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.27-beta";
+  return "0.5.29-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();