btc-wallet 0.5.22-beta → 0.5.24-beta

package/dist/core/btcUtils.d.ts

@@ -1,7 +1,7 @@
 import type { ENV } from '../config';
-import { calculateGasLimit } from '../utils/satoshi';
+import { calculateWithdraw, calculateGasLimit } from '../utils/satoshi';
 import type { FinalExecutionOutcome, Transaction } from '@near-wallet-selector/core';
-export { calculateGasLimit };
+export { calculateGasLimit, calculateWithdraw };
 type CheckGasTokenDebtReturnType<T extends boolean> = T extends true ? void : {
     receiver_id: string;
     amount: string;
@@ -9,7 +9,9 @@ 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 getBtcBalance(): Promise<{
+export declare function getBtcUtxos(account: string): Promise<any>;
+export declare function calculateGasFee(account: string, amount: number, feeRate?: number): Promise<any>;
+export declare function getBtcBalance(account?: string): Promise<{
     rawBalance: number;
     balance: number;
     availableBalance: number;
@@ -20,6 +22,7 @@ export declare function estimateDepositAmount(amount: string, option?: {
     env?: ENV;
 }): Promise<string>;
 export declare function getDepositAmount(amount: string, option?: {
+    csna?: string;
     env?: ENV;
     /** default is true, if true, new account minimum deposit amount 1000sat, otherwise 0 */
     newAccountMinDepositAmount?: boolean;
@@ -54,6 +57,8 @@ export declare function checkSatoshiWhitelist(btcAccountId: string, env?: ENV):
 interface WithdrawParams {
     amount: string | number;
     feeRate?: number;
+    csna?: string;
+    btcAddress?: string;
     env?: ENV;
 }
-export declare function getWithdrawTransaction({ amount, feeRate, env, }: WithdrawParams): Promise<Transaction>;
+export declare function getWithdrawTransaction({ amount, feeRate, csna, btcAddress, env, }: WithdrawParams): Promise<Transaction>;

package/dist/index.js

@@ -104,13 +104,16 @@ __export(src_exports, {
   WizzConnector: () => WizzConnector,
   XverseConnector: () => XverseConnector,
   btcRpcUrls: () => btcRpcUrls,
+  calculateGasFee: () => calculateGasFee,
   calculateGasLimit: () => calculateGasLimit,
+  calculateWithdraw: () => calculateWithdraw,
   checkGasTokenDebt: () => checkGasTokenDebt,
   checkSatoshiWhitelist: () => checkSatoshiWhitelist,
   estimateDepositAmount: () => estimateDepositAmount,
   executeBTCDepositAndAction: () => executeBTCDepositAndAction,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
+  getBtcUtxos: () => getBtcUtxos,
   getCsnaAccountId: () => getCsnaAccountId,
   getDepositAmount: () => getDepositAmount,
   getVersion: () => getVersion,
@@ -3340,7 +3343,8 @@ function getAccountInfo(_0) {
       },
       { network: config.network }
     ).catch((error) => {
-      return void 0;
+      console.log(`get_account error, please try again later`, error);
+      throw error;
     });
     return accountInfo;
   });
@@ -3415,6 +3419,8 @@ function convertTransactionToTxHex(_0) {
     env,
     index = 0
   }) {
+    if (!publicKey)
+      return { txHex: "", txBytes: new Uint8Array(), hash: "" };
     const publicKeyFormat = import_key_pair.PublicKey.from(publicKey);
     const currentConfig = getWalletConfig(env);
     const provider = getNearProvider({ network: currentConfig.network });
@@ -3634,7 +3640,8 @@ function getPredictedGasAmount(_0) {
     env
   }) {
     const currentConfig = getWalletConfig(env);
-    const predictedGas = yield nearCallFunction(
+    const isValidTransactions = transactions2.every((tx) => tx.length > 0);
+    const predictedGas = isValidTransactions ? yield nearCallFunction(
       accountContractId,
       "predict_txs_gas_token_amount",
       {
@@ -3642,7 +3649,7 @@ function getPredictedGasAmount(_0) {
         near_transactions: transactions2
       },
       { network: currentConfig.network }
-    );
+    ) : "0";
     const predictedGasAmount = new import_big.default(predictedGas).mul(1.2).toFixed(0);
     const miniGasAmount = 200 * transactions2.length;
     const gasAmount = Math.max(Number(predictedGasAmount), miniGasAmount);
@@ -3658,9 +3665,9 @@ function calculateWithdraw(_0) {
     btcAddress,
     env
   }) {
-    console.log("calculateWithdraw feeRate:", feeRate);
     try {
       const config = getWalletConfig(env);
+      const _feeRate = feeRate || (yield getBtcGasPrice());
       const gasLimit = yield calculateGasLimit({
         csna,
         transactions: [
@@ -3697,7 +3704,7 @@ function calculateWithdraw(_0) {
           return {
             withdrawFee: 0,
             isError: true,
-            errorMsg: "Mini withdraw amount is " + (Number(brgConfig.min_withdraw_amount) + Number(gasLimit))
+            errorMsg: `Mini withdraw amount is ${Number(brgConfig.min_withdraw_amount) + Number(gasLimit)} sats`
           };
         }
       }
@@ -3725,7 +3732,7 @@ function calculateWithdraw(_0) {
       const { inputs, outputs, fee } = (0, import_coinselect.default)(
         utxos,
         [{ address: btcAddress, value: userSatoshis }],
-        Math.ceil(feeRate || 0)
+        Math.ceil(_feeRate)
       );
       const newInputs = inputs;
       let newOutputs = outputs;
@@ -3839,6 +3846,7 @@ function calculateWithdraw(_0) {
 
 // src/core/btcUtils.ts
 var import_bitcoinjs_lib = __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);
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
@@ -3853,9 +3861,13 @@ function getBtcProvider() {
 }
 function getNetwork() {
   return __async(this, null, function* () {
-    const network = yield getBtcProvider().getNetwork();
-    console.log("btc network:", network);
-    return network === "livenet" ? "mainnet" : "testnet";
+    try {
+      const network = yield getBtcProvider().getNetwork();
+      console.log("btc network:", network);
+      return network === "livenet" ? "mainnet" : "testnet";
+    } catch (error) {
+      return "mainnet";
+    }
   });
 }
 function getBtcRpcUrl() {
@@ -3918,25 +3930,37 @@ function getBtcGasPrice() {
     }
   });
 }
-function getBtcBalance() {
+function getBtcUtxos(account) {
   return __async(this, null, function* () {
-    const { account } = yield retryOperation(getBtcProvider, (res) => !!res.account);
-    if (!account) {
-      console.error("BTC Account is not available.");
-      return { rawBalance: 0, balance: 0, availableBalance: 0 };
-    }
     const btcRpcUrl = yield getBtcRpcUrl();
     const utxos = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res) => res.json());
+    return utxos;
+  });
+}
+function calculateGasFee(account, amount, feeRate) {
+  return __async(this, null, function* () {
+    const _feeRate = feeRate || (yield getBtcGasPrice());
+    const utxos = yield getBtcUtxos(account);
+    const { fee } = (0, import_coinselect2.default)(utxos, [{ address: account, value: amount }], Math.ceil(_feeRate));
+    console.log("calculateGasFee fee:", fee);
+    return fee;
+  });
+}
+function getBtcBalance(account) {
+  return __async(this, null, function* () {
+    if (!account) {
+      const res = yield retryOperation(getBtcProvider, (res2) => !!res2.account);
+      if (!res.account) {
+        console.error("BTC Account is not available.");
+        return { rawBalance: 0, balance: 0, availableBalance: 0 };
+      }
+      account = res.account;
+    }
+    const utxos = yield getBtcUtxos(account);
     const btcDecimals = 8;
     const rawBalance = (utxos == null ? void 0 : utxos.reduce((acc, cur) => acc + cur.value, 0)) || 0;
     const balance = rawBalance / __pow(10, btcDecimals);
-    const feeRate = yield getBtcGasPrice();
-    const inputSize = ((utxos == null ? void 0 : utxos.length) || 0) * 69;
-    const outputSize = 33 * 2;
-    const overheadSize = 11;
-    const estimatedTxSize = inputSize + outputSize + overheadSize;
-    const estimatedFee = Math.ceil(estimatedTxSize * feeRate);
-    console.log("estimatedFee:", estimatedFee);
+    const estimatedFee = yield calculateGasFee(account, rawBalance);
     const availableRawBalance = (rawBalance - estimatedFee).toFixed(0);
     const availableBalance = new import_big2.default(availableRawBalance).div(__pow(10, btcDecimals)).round(btcDecimals, import_big2.default.roundDown).toNumber();
     return {
@@ -3963,7 +3987,7 @@ function getDepositAmount(amount, option) {
     var _a;
     const env = (option == null ? void 0 : option.env) || "mainnet";
     const _newAccountMinDepositAmount = (_a = option == null ? void 0 : option.newAccountMinDepositAmount) != null ? _a : true;
-    const csna = yield getCsnaAccountId(env);
+    const csna = (option == null ? void 0 : option.csna) || (yield getCsnaAccountId(env));
     const accountInfo = yield getAccountInfo({ csna, env });
     const debtAction = yield checkGasTokenDebt(csna, env, false);
     const repayAmount = (debtAction == null ? void 0 : debtAction.amount) || 0;
@@ -4160,18 +4184,18 @@ function getWithdrawTransaction(_0) {
   return __async(this, arguments, function* ({
     amount,
     feeRate,
+    csna,
+    btcAddress,
     env = "mainnet"
   }) {
     const config = getWalletConfig(env);
-    const provider = getBtcProvider();
-    const btcAddress = provider.account;
-    const csna = yield getCsnaAccountId(env);
-    const _feeRate = feeRate || (yield getBtcGasPrice());
+    const _btcAddress = btcAddress || getBtcProvider().account;
+    const _csna = csna || (yield getCsnaAccountId(env));
     const _a = yield calculateWithdraw({
       amount,
-      feeRate: _feeRate,
-      csna,
-      btcAddress,
+      feeRate,
+      csna: _csna,
+      btcAddress: _btcAddress,
       env
     }), { inputs, outputs, isError, errorMsg } = _a, rest = __objRest(_a, ["inputs", "outputs", "isError", "errorMsg"]);
     if (isError || !inputs || !outputs) {
@@ -4187,7 +4211,7 @@ function getWithdrawTransaction(_0) {
     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 btcRpcUrl = yield getBtcRpcUrl();
-    Promise.all(
+    yield Promise.all(
       inputs.map((input) => __async(this, null, function* () {
         const txData = yield fetch(`${btcRpcUrl}/tx/${input.txid}`).then((res) => res.json());
         const inputOptions = {
@@ -4219,14 +4243,14 @@ function getWithdrawTransaction(_0) {
     });
     const msg = {
       Withdraw: {
-        target_btc_address: btcAddress,
+        target_btc_address: _btcAddress,
         input: _inputs,
         output: txOutputs
       }
     };
     const transaction = {
       receiverId: config.btcToken,
-      signerId: csna,
+      signerId: _csna,
       actions: [
         {
           type: "FunctionCall",
@@ -4301,7 +4325,6 @@ function createFloatingButtonWithIframe({
     zIndex: "100000",
     width: "60px",
     height: "60px",
-    borderRadius: "50%",
     cursor: "grab",
     transition: "transform 0.15s ease",
     userSelect: "none"
@@ -4494,6 +4517,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   id,
   provider
 }) {
+  let initializing = false;
+  let connectionUpdateTimeout;
   const wallet = {
     signIn,
     signOut,
@@ -4517,15 +4542,52 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     }
     return true;
   }
+  function initBtcContext() {
+    return __async(this, null, function* () {
+      if (initializing) {
+        console.log("BTC context initialization already in progress");
+        return;
+      }
+      console.log("initBtcContext");
+      try {
+        initializing = true;
+        const btcContext = yield retryOperation(
+          () => __async(this, null, function* () {
+            const ctx = window.btcContext;
+            if (!ctx) {
+              throw new Error("btcContext not found");
+            }
+            return ctx;
+          }),
+          (res) => !!res,
+          {
+            maxRetries: 10,
+            delayMs: 500
+          }
+        );
+        yield setupBtcContextListeners();
+        return btcContext;
+      } finally {
+        initializing = false;
+      }
+    });
+  }
   function setupBtcContextListeners() {
     return __async(this, null, function* () {
       const handleConnectionUpdate = () => __async(this, null, function* () {
+        if (connectionUpdateTimeout) {
+          clearTimeout(connectionUpdateTimeout);
+        }
         yield checkBtcNetwork(currentConfig.network);
         if (!state_default.isValid()) {
           state_default.clear();
           console.log("setupBtcContextListeners clear");
         }
-        validateWalletState();
+        const valid = validateWalletState();
+        console.log("setupBtcContextListeners wallet state valid:", valid);
+        if (!valid) {
+          return;
+        }
         const btcContext = window.btcContext;
         if (btcContext.account) {
           const btcPublicKey = yield btcContext.getPublicKey();
@@ -4536,7 +4598,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           }
         } else {
           removeWalletButton();
-          setTimeout(() => {
+          connectionUpdateTimeout = setTimeout(() => {
             handleConnectionUpdate();
           }, 5e3);
         }
@@ -4573,27 +4635,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       }
     });
   }
-  function initBtcContext() {
-    return __async(this, null, function* () {
-      console.log("initBtcContext");
-      const btcContext = yield retryOperation(
-        () => __async(this, null, function* () {
-          const ctx = window.btcContext;
-          if (!ctx) {
-            throw new Error("btcContext not found");
-          }
-          return ctx;
-        }),
-        (res) => !!res,
-        {
-          maxRetries: 10,
-          delayMs: 500
-        }
-      );
-      yield setupBtcContextListeners();
-      return btcContext;
-    });
-  }
   function nearCall2(contractId, methodName, args) {
     return __async(this, null, function* () {
       return nearCallFunction(contractId, methodName, args, { provider });
@@ -4791,7 +4832,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.22-beta";
+  return "0.5.24-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();