btc-wallet 0.5.87-beta → 0.5.89-beta

package/esm/index.js

@@ -3800,12 +3800,8 @@ function checkGasTokenDebt(_0) {
     autoDeposit
   }) {
     var _a, _b, _c;
+    const isNewAccount = yield checkNewAccount({ csna, btcAccount, env });
     const accountInfo = yield getAccountInfo({ csna, env });
-    const bridgeTransactions = yield hasBridgeTransaction({
-      env,
-      btcAccount
-    });
-    const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && !bridgeTransactions;
     const debtAmount = new Big2(((_a = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _a.near_gas_debt_amount) || 0).plus(((_b = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _b.protocol_fee_debt_amount) || 0).toString();
     const relayerFeeAmount = isNewAccount ? NBTC_STORAGE_DEPOSIT_AMOUNT : ((_c = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _c.amount) || 0;
     const hasDebtArrears = new Big2(debtAmount).gt(0);
@@ -3841,14 +3837,14 @@ function checkGasTokenDebt(_0) {
     }
   });
 }
-function getBtcGasPrice() {
+function getBtcGasPrice(type = "halfHour") {
   return __async(this, null, function* () {
     const network = yield getNetwork();
     const defaultFeeRate = network === "mainnet" ? 5 : 2500;
     try {
       const btcRpcUrl = yield getBtcRpcUrl();
       const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
-      const feeRate = res.fastestFee ? Number(res.fastestFee) + 1 : defaultFeeRate;
+      const feeRate = res[type + "Fee"] ? Number(res[type + "Fee"]) : defaultFeeRate;
       return feeRate;
     } catch (error) {
       return defaultFeeRate;
@@ -3869,7 +3865,7 @@ function calculateGasFee(account, amount, feeRate) {
     const _feeRate = feeRate || (yield getBtcGasPrice());
     const utxos = yield getBtcUtxos(account);
     const { fee } = coinselect(utxos, [{ address: account, value: amount }], Math.ceil(_feeRate));
-    console.log("calculateGasFee fee:", fee);
+    console.log("calculateGasFee fee:", fee, "feeRate:", _feeRate);
     return fee;
   });
 }
@@ -3968,6 +3964,30 @@ function getCsnaAccountId(env) {
     return csna;
   });
 }
+function checkNewAccount(_0) {
+  return __async(this, arguments, function* ({
+    csna,
+    btcAccount,
+    env = "mainnet"
+  }) {
+    try {
+      const _csna = csna || (yield getCsnaAccountId(env));
+      const _btcAccount = btcAccount || getBtcProvider().account;
+      if (!_csna || !_btcAccount)
+        return false;
+      const accountInfo = yield getAccountInfo({ csna: _csna, env });
+      const bridgeTransactions = yield hasBridgeTransaction({
+        env,
+        btcAccount: _btcAccount
+      });
+      const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && !bridgeTransactions;
+      return isNewAccount;
+    } catch (error) {
+      console.error("checkNewAccount error:", error);
+      return false;
+    }
+  });
+}
 function checkDepositDisabledAddress() {
   var _a;
   const data = (_a = storageStore("SATOSHI_WALLET_XVERSE")) == null ? void 0 : _a.get(
@@ -5320,7 +5340,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.87-beta";
+  return "0.5.89-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();
@@ -5346,6 +5366,7 @@ export {
   calculateWithdraw,
   checkBridgeTransactionStatus,
   checkGasTokenDebt,
+  checkNewAccount,
   checkSatoshiWhitelist,
   estimateDepositAmount,
   executeBTCDepositAndAction,