btc-wallet 0.5.93-beta → 0.5.95-beta

package/esm/index.js

@@ -2988,7 +2988,7 @@ function getWalletConfig(env) {
   });
 }
 var nearRpcUrls = {
-  mainnet: ["https://free.rpc.fastnear.com", "https://near.lava.build"],
+  mainnet: ["https://near.lava.build", "https://free.rpc.fastnear.com"],
   testnet: ["https://rpc.testnet.near.org"]
 };
 var btcRpcUrls = {
@@ -3021,7 +3021,7 @@ function withCache(key, fetcher, timeout = defaultCacheTimeout) {
 }
 function request(url, options) {
   return __async(this, null, function* () {
-    var _a;
+    var _a, _b;
     const defaultHeaders = {
       "Content-Type": "application/json"
     };
@@ -3040,6 +3040,15 @@ function request(url, options) {
         return Promise.resolve(cached.data);
       }
     }
+    const setCacheAndReturn = (data) => {
+      if (cacheKey) {
+        cache.set(cacheKey, { timestamp: Date.now(), data });
+        setTimeout(() => {
+          cache.delete(cacheKey);
+        }, cacheTimeout);
+      }
+      return data;
+    };
     const newOptions = __spreadProps(__spreadValues({}, options), {
       headers,
       body,
@@ -3056,33 +3065,22 @@ function request(url, options) {
       if (!res.ok)
         throw new Error(res.statusText);
       const data = yield res.json();
-      if (options == null ? void 0 : options.shouldStopPolling) {
-        if (options.shouldStopPolling(data)) {
-          return data;
-        }
-        throw new Error("Polling should continue");
-      }
-      if (cacheKey) {
-        cache.set(cacheKey, { timestamp: Date.now(), data });
-        setTimeout(() => {
-          cache.delete(cacheKey);
-        }, cacheTimeout);
-      }
-      return data;
-    } catch (err) {
-      if (retryCount > 0) {
-        console.log(`Retrying... attempts left: ${retryCount}`);
-        return request(url, __spreadProps(__spreadValues({}, options), { retryCount: retryCount - 1 }));
-      } else if ((options == null ? void 0 : options.pollingInterval) && (options == null ? void 0 : options.maxPollingAttempts)) {
-        if (options.maxPollingAttempts > 0) {
+      if ((options == null ? void 0 : options.shouldStopPolling) && !options.shouldStopPolling(data)) {
+        if ((options == null ? void 0 : options.pollingInterval) && (options == null ? void 0 : options.maxPollingAttempts) && options.maxPollingAttempts > 0) {
           console.log(`Polling... attempts left: ${options.maxPollingAttempts}`);
           yield new Promise((resolve) => setTimeout(resolve, options.pollingInterval));
           return request(url, __spreadProps(__spreadValues({}, options), {
             maxPollingAttempts: options.maxPollingAttempts - 1,
-            retryCount
+            retryCount: (_b = options == null ? void 0 : options.retryCount) != null ? _b : 1
           }));
         }
       }
+      return setCacheAndReturn(data);
+    } catch (err) {
+      if (retryCount > 0) {
+        console.log(`Retrying... attempts left: ${retryCount}`);
+        return request(url, __spreadProps(__spreadValues({}, options), { retryCount: retryCount - 1 }));
+      }
       console.error(err);
       return Promise.reject(err);
     }
@@ -3435,7 +3433,6 @@ function getAccountInfo(_0) {
       console.log(`get_account error, please try again later`, error);
       throw error;
     });
-    console.log("getAccountInfo resp:", accountInfo);
     return accountInfo;
   });
 }
@@ -4365,11 +4362,25 @@ function calculateWithdraw(_0) {
       }
       const userSatoshis = Number(satoshis);
       const maxBtcFee = Number(brgConfig.max_btc_gas_fee);
-      const { inputs, outputs, fee } = coinselect(
+      let { inputs, outputs, fee } = coinselect(
         utxos,
         [{ address: btcAddress, value: userSatoshis }],
         Math.ceil(feeRate)
       );
+      if (inputs && inputs.length > 10) {
+        const filteredUtxos = utxos.filter((utxo) => utxo.value >= userSatoshis);
+        console.log("filteredUtxos", filteredUtxos);
+        if (filteredUtxos.length > 0) {
+          const result = coinselect(
+            filteredUtxos,
+            [{ address: btcAddress, value: userSatoshis }],
+            Math.ceil(feeRate)
+          );
+          inputs = result.inputs;
+          outputs = result.outputs;
+          fee = result.fee;
+        }
+      }
       const newInputs = inputs;
       let newOutputs = outputs;
       let newFee = fee;
@@ -5343,7 +5354,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.93-beta";
+  return "0.5.95-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();