btc-wallet 0.5.92-beta → 0.5.94-beta

package/esm/index.js

@@ -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;
   });
 }
@@ -3606,12 +3603,12 @@ function calculateGasStrategy(_0) {
       { near: new Big(0), btc: new Big(0) }
     );
     const nearAvailableBalance = new Big(nearBalance).minus(transferAmount.near).toNumber();
-    if (nearAvailableBalance < 0.25) {
-      throw new Error("NEAR balance is insufficient, please deposit more NEAR");
-    }
     console.log("available near balance:", nearAvailableBalance);
     console.log("available gas token balance:", gasTokenBalance);
     console.log("gas strategy:", gasStrategy);
+    if (nearAvailableBalance < 0.25) {
+      throw new Error("NEAR balance is insufficient, please deposit more NEAR");
+    }
     const convertTx = yield Promise.all(
       transactions2.map(
         (transaction, index) => convertTransactionToTxHex({
@@ -4301,7 +4298,7 @@ function calculateWithdraw(_0) {
                     amount: "100",
                     msg: ""
                   },
-                  gas: "300000000000000",
+                  gas: "30000000000000",
                   deposit: "1"
                 }
               }
@@ -5343,7 +5340,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.92-beta";
+  return "0.5.94-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();