btc-wallet 0.3.4 → 0.3.5

package/dist/utils/index.d.ts

@@ -5,3 +5,7 @@ export declare const defaultTokenIcon = "https://static.particle.network/token-l
 export declare const ipfsToSrc: (ipfs: string) => string;
 export declare const checkBTCVersion: (accountContracts: AAOptions["accountContracts"], accountContractKey: string, version: string) => boolean;
 export declare const delay: (ms: number) => Promise<unknown>;
+export declare function retryOperation<T>(operation: () => Promise<T> | T, shouldStop: (result: T) => boolean, { maxRetries, delayMs, }?: {
+    maxRetries?: number;
+    delayMs?: number;
+}): Promise<T>;

package/esm/index.js

@@ -470,7 +470,7 @@ var _network2, _event2;
 var MagicEdenConnector = class extends BaseConnector {
   constructor() {
     super();
-    __privateAdd(this, _network2, "Testnet");
+    __privateAdd(this, _network2, "Mainnet");
     __privateAdd(this, _event2, new EventEmitter2());
     this.metadata = {
       id: "magicEden",
@@ -1309,6 +1309,27 @@ var checkBTCVersion = (accountContracts, accountContractKey, version) => {
   return accountContracts[accountContractKey].some((item) => item.version === version);
 };
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function retryOperation(_0, _1) {
+  return __async(this, arguments, function* (operation, shouldStop, {
+    maxRetries = 3,
+    delayMs = 1e3
+  } = {}) {
+    let retries = 0;
+    while (retries <= maxRetries) {
+      const result = yield operation();
+      if (shouldStop(result)) {
+        return result;
+      }
+      if (retries === maxRetries) {
+        console.warn("Max retries reached");
+        return result;
+      }
+      retries++;
+      yield delay(delayMs);
+    }
+    throw new Error("Unexpected execution path");
+  });
+}
 
 // src/utils/ethereumUtils.ts
 import {
@@ -2729,7 +2750,7 @@ function request(url, options) {
       body,
       method
     });
-    const retryCount2 = (_a = options == null ? void 0 : options.retryCount) != null ? _a : 1;
+    const retryCount = (_a = options == null ? void 0 : options.retryCount) != null ? _a : 1;
     const controller = new AbortController();
     const timeout = (options == null ? void 0 : options.timeout) || 2e4;
     const timeoutId = setTimeout(() => controller.abort(), timeout);
@@ -2752,16 +2773,16 @@ function request(url, options) {
       return data;
     } catch (err) {
       console.error(err);
-      if (retryCount2 > 0) {
-        console.log(`Retrying... attempts left: ${retryCount2}`);
-        return request(url, __spreadProps(__spreadValues({}, options), { retryCount: retryCount2 - 1 }));
+      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) {
           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: retryCount2
+            retryCount
           }));
         }
       }
@@ -2912,8 +2933,15 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           }
         ];
       }
-      const btcAccount = yield btcContext.login();
-      const btcPublicKey = yield btcContext.getPublicKey();
+      yield btcContext.login();
+      const btcPublicKey = yield retryOperation(btcContext.getPublicKey, (res) => !!res, {
+        maxRetries: 40,
+        delayMs: 3e3
+      });
+      console.log("btcPublicKey:", btcPublicKey);
+      if (!btcPublicKey) {
+        throw new Error("No connected BTC wallet, please connect your BTC wallet first.");
+      }
       const { nearTempAddress, nearTempPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
       return [
         {
@@ -3235,24 +3263,21 @@ function getBtcGasPrice() {
     }
   });
 }
-var retryCount = 0;
 function getBtcBalance() {
   return __async(this, null, function* () {
-    const { account } = getBtcProvider();
+    var _a;
+    const { account } = yield retryOperation(getBtcProvider, (res2) => !!res2.account);
     if (!account) {
-      retryCount++;
-      if (retryCount > 3) {
-        throw new Error("BTC Account is not available.");
-      }
-      yield delay(1e3);
-      return getBtcBalance();
+      console.error("BTC Account is not available.");
+      return { rawBalance: 0, balance: 0 };
     }
-    retryCount = 0;
     const btcRpcUrl = yield getBtcRpcUrl();
     const res = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res2) => res2.json());
-    const rawBalance = res.reduce((acc, cur) => acc + cur.value, 0);
+    const rawBalance = (_a = res.filter((item) => {
+      var _a2;
+      return (_a2 = item == null ? void 0 : item.status) == null ? void 0 : _a2.confirmed;
+    })) == null ? void 0 : _a.reduce((acc, cur) => acc + cur.value, 0);
     const balance = rawBalance / __pow(10, 8);
-    console.log("btc balance:", balance);
     return { rawBalance, balance };
   });
 }
@@ -3294,7 +3319,7 @@ function executeBurrowSupply(_0) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.4";
+  return "0.3.5";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();