btc-wallet 0.3.3 → 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/dist/utils/request.d.ts

@@ -7,5 +7,5 @@ interface RequestOptions<T> extends RequestInit {
     maxPollingAttempts?: number;
     shouldStopPolling?: (response: T) => boolean;
 }
-export default function request<T>(url: string, options?: RequestOptions<T>): Promise<T>;
+export default function request<T = any>(url: string, options?: RequestOptions<T>): Promise<T>;
 export {};

package/esm/index.js

@@ -270,7 +270,7 @@ var _network, _event;
 var XverseConnector = class extends BaseConnector {
   constructor() {
     super();
-    __privateAdd(this, _network, "Mainnet");
+    __privateAdd(this, _network, "Testnet");
     __privateAdd(this, _event, new EventEmitter());
     this.metadata = {
       id: "xverse",
@@ -690,7 +690,16 @@ var useAccounts = () => {
 // src/hooks/useBTCProvider.ts
 import { useCallback } from "react";
 var useBTCProvider = () => {
-  const { connector, provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin: sendBitcoin2 } = useConnectProvider();
+  const {
+    connector,
+    provider,
+    accounts,
+    getPublicKey,
+    signMessage,
+    getNetwork: getNetwork2,
+    switchNetwork,
+    sendBitcoin: sendBitcoin2
+  } = useConnectProvider();
   const sendInscription = useCallback(
     (address, inscriptionId, options) => __async(void 0, null, function* () {
       if (!connector) {
@@ -701,7 +710,17 @@ var useBTCProvider = () => {
     }),
     [connector]
   );
-  return { provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin: sendBitcoin2, sendInscription, connector };
+  return {
+    provider,
+    accounts,
+    getPublicKey,
+    signMessage,
+    getNetwork: getNetwork2,
+    switchNetwork,
+    sendBitcoin: sendBitcoin2,
+    sendInscription,
+    connector
+  };
 };
 
 // src/hooks/useConnectModal.ts
@@ -1290,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 {
@@ -2069,7 +2109,7 @@ var ConnectProvider = ({
     }),
     [connector]
   );
-  const getNetwork = useCallback7(() => __async(void 0, null, function* () {
+  const getNetwork2 = useCallback7(() => __async(void 0, null, function* () {
     if (!connector) {
       throw new Error("Wallet not connected!");
     }
@@ -2253,7 +2293,7 @@ var ConnectProvider = ({
         signMessage,
         evmAccount,
         smartAccount,
-        getNetwork,
+        getNetwork: getNetwork2,
         switchNetwork,
         sendBitcoin: sendBitcoin2,
         accountContract,
@@ -2407,21 +2447,18 @@ function InitBtcWalletSelectorContext() {
 }
 function useBtcWalletSelector() {
   const { openConnectModal, openConnectModalAsync, disconnect, requestDirectAccount } = useConnectModal();
-  const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector } = useBTCProvider();
+  const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector, getNetwork: getNetwork2 } = useBTCProvider();
   const publicKey = useRef(null);
   const signMessageFn = useRef(null);
   const connectorRef = useRef(null);
-  const providerRef = useRef(null);
-  const [updater, setUpdater] = useState8(1);
   const context = useContext2(WalletSelectorContext);
   useEffect6(() => {
     if (provider) {
       getPublicKey().then((res) => {
         publicKey.current = res;
       });
-      providerRef.current = provider;
     }
-  }, [provider, updater]);
+  }, [provider]);
   useEffect6(() => {
     signMessageFn.current = signMessage;
   }, [signMessage]);
@@ -2444,67 +2481,53 @@ function useBtcWalletSelector() {
       }
     };
   }, [connector]);
-  return {
-    login: () => __async(this, null, function* () {
-      const account = accounts && accounts.length ? accounts[0] : null;
-      if (account) {
-        return account;
-      }
-      setUpdater(updater + 1);
-      if (openConnectModal) {
-        yield openConnectModal();
-      }
-      return null;
-    }),
-    autoConnect: () => __async(this, null, function* () {
-      let times = 0;
-      while (!connectorRef.current) {
-        yield delay(500);
-        if (times++ > 10) {
-          return null;
-        }
-      }
-      requestDirectAccount(connectorRef.current).catch((e) => {
-        context.emit("btcLoginError");
-      });
-    }),
-    logout: () => {
-      const accountId = accounts && accounts.length ? accounts[0] : null;
-      if (!accountId)
-        return;
-      disconnect == null ? void 0 : disconnect();
-      context.emit("btcLogOut");
-    },
-    account: accounts && accounts.length ? accounts[0] : null,
-    getPublicKey: () => __async(this, null, function* () {
-      let times = 0;
-      while (!publicKey.current) {
-        yield delay(1e3);
-        if (times++ > 10) {
-          return null;
+  const hook = useMemo6(() => {
+    return {
+      login: () => __async(this, null, function* () {
+        const account = accounts && accounts.length ? accounts[0] : null;
+        if (account) {
+          return account;
         }
-      }
-      return publicKey.current;
-    }),
-    signMessage: (msg) => {
-      return signMessageFn.current(msg);
-    },
-    getContext: () => {
-      return context;
-    },
-    getBalance: () => __async(this, null, function* () {
-      let times = 0;
-      while (!providerRef.current) {
-        yield delay(500);
-        if (times++ > 10) {
-          return null;
+        if (openConnectModal) {
+          yield openConnectModal();
         }
-      }
-      const { total } = yield providerRef.current.getBalance();
-      return total;
-    }),
-    sendBitcoin: sendBitcoin2
-  };
+        return null;
+      }),
+      autoConnect: () => __async(this, null, function* () {
+        requestDirectAccount(connectorRef.current).catch((e) => {
+          context.emit("btcLoginError");
+        });
+      }),
+      logout: () => {
+        const accountId = accounts && accounts.length ? accounts[0] : null;
+        if (!accountId)
+          return;
+        disconnect == null ? void 0 : disconnect();
+        context.emit("btcLogOut");
+      },
+      account: accounts && accounts.length ? accounts[0] : null,
+      getPublicKey: () => {
+        return publicKey.current;
+      },
+      signMessage: (msg) => {
+        return signMessageFn.current(msg);
+      },
+      getContext: () => {
+        return context;
+      },
+      getNetwork: getNetwork2,
+      sendBitcoin: sendBitcoin2
+    };
+  }, [
+    accounts,
+    context,
+    disconnect,
+    getNetwork2,
+    openConnectModal,
+    requestDirectAccount,
+    sendBitcoin2
+  ]);
+  return hook;
 }
 
 // src/core/setupBTCWallet.ts
@@ -2910,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 [
         {
@@ -3146,11 +3176,31 @@ function pollTransactionStatuses(network, hashes) {
   });
 }
 
-// src/core/bridgeSupplyUtils.ts
+// src/core/btcUtils.ts
 import { providers as providers2 } from "near-api-js";
 import Big from "big.js";
-function nearViewMethod(contractId, methodName, args, network) {
+function getBtcProvider() {
+  if (typeof window === "undefined" || !window.btcContext) {
+    throw new Error("BTC Provider is not initialized.");
+  }
+  return window.btcContext;
+}
+function getNetwork() {
   return __async(this, null, function* () {
+    const network = yield getBtcProvider().getNetwork();
+    console.log("btc network:", network);
+    return network === "livenet" ? "mainnet" : "testnet";
+  });
+}
+function getBtcRpcUrl() {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
+    return btcRpcUrls[network];
+  });
+}
+function nearViewMethod(contractId, methodName, args) {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
     const nearProvider = new providers2.FailoverRpcProvider(
       nearRpcUrls[network].map(
         (url) => new providers2.JsonRpcProvider({ url })
@@ -3166,41 +3216,16 @@ function nearViewMethod(contractId, methodName, args, network) {
     return JSON.parse(Buffer.from(res.result).toString());
   });
 }
-function getDepositAddress(btcPublicKey, contractId, network) {
+function getDepositAddress(btcPublicKey, contractId) {
   return __async(this, null, function* () {
-    const res = yield nearViewMethod(
-      contractId,
-      "get_user_dapp_deposit_address",
-      {
-        deposit_type: {
-          BtcPublicKey: { btc_public_key: btcPublicKey, dapp_operation: "Burrowland->Supply" }
-        }
-      },
-      network
-    );
+    const res = yield nearViewMethod(contractId, "get_user_dapp_deposit_address", {
+      deposit_type: {
+        BtcPublicKey: { btc_public_key: btcPublicKey, dapp_operation: "Burrowland->Supply" }
+      }
+    });
     return res;
   });
 }
-function getGasPrice(network) {
-  return __async(this, null, function* () {
-    const defaultFeeRate = 100;
-    try {
-      const btcRpcUrl = btcRpcUrls[network];
-      const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
-      const feeRate = res.fastestFee;
-      return feeRate || defaultFeeRate;
-    } catch (error) {
-      return defaultFeeRate;
-    }
-  });
-}
-function sendBitcoin(btcProvider, address, amount, feeRate) {
-  return __async(this, null, function* () {
-    const satoshis = new Big(amount).mul(__pow(10, 8)).toNumber();
-    const txHash = yield btcProvider.sendBitcoin(address, satoshis, { feeRate });
-    return txHash;
-  });
-}
 function receiveDepositMsg(_0, _1) {
   return __async(this, arguments, function* (baseUrl, {
     btcPublicKey,
@@ -3225,27 +3250,63 @@ function checkTransactionStatus(baseUrl, txHash) {
     return res;
   });
 }
+function getBtcGasPrice() {
+  return __async(this, null, function* () {
+    const defaultFeeRate = 100;
+    try {
+      const btcRpcUrl = yield getBtcRpcUrl();
+      const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
+      const feeRate = res.fastestFee;
+      return feeRate || defaultFeeRate;
+    } catch (error) {
+      return defaultFeeRate;
+    }
+  });
+}
+function getBtcBalance() {
+  return __async(this, null, function* () {
+    var _a;
+    const { account } = yield retryOperation(getBtcProvider, (res2) => !!res2.account);
+    if (!account) {
+      console.error("BTC Account is not available.");
+      return { rawBalance: 0, balance: 0 };
+    }
+    const btcRpcUrl = yield getBtcRpcUrl();
+    const res = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res2) => res2.json());
+    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);
+    return { rawBalance, balance };
+  });
+}
+function sendBitcoin(address, amount, feeRate) {
+  return __async(this, null, function* () {
+    const { sendBitcoin: sendBitcoin2 } = getBtcProvider();
+    const satoshis = new Big(amount).mul(__pow(10, 8)).toNumber();
+    const txHash = yield sendBitcoin2(address, satoshis, { feeRate });
+    return txHash;
+  });
+}
 function executeBurrowSupply(_0) {
   return __async(this, arguments, function* ({
     amount,
     feeRate,
-    environment = "mainnet"
+    isDev = false
   }) {
     try {
-      if (typeof window === "undefined" || !window.btcContext) {
-        throw new Error("BTC Provider is not initialized.");
-      }
-      const btcProvider = window.btcContext;
-      const network = environment === "dev" ? "testnet" : environment;
-      const config = walletConfig[environment];
-      const btcPublicKey = yield btcProvider.getPublicKey();
+      const { getPublicKey } = getBtcProvider();
+      const network = yield getNetwork();
+      const config = walletConfig[isDev ? "dev" : network];
+      const btcPublicKey = yield getPublicKey();
       if (!btcPublicKey) {
         throw new Error("BTC Public Key is not available.");
       }
-      const address = yield getDepositAddress(btcPublicKey, config.contractId, network);
-      const _feeRate = feeRate || (yield getGasPrice(network));
+      const address = yield getDepositAddress(btcPublicKey, config.contractId);
+      const _feeRate = feeRate || (yield getBtcGasPrice());
       console.log("feeRate", _feeRate);
-      const txHash = yield sendBitcoin(btcProvider, address, amount, _feeRate);
+      const txHash = yield sendBitcoin(address, amount, _feeRate);
       const receiveDepositMsgRes = yield receiveDepositMsg(config.base_url, { btcPublicKey, txHash });
       console.log("receiveDepositMsg resp:", receiveDepositMsgRes);
       const checkTransactionStatusRes = yield checkTransactionStatus(config.base_url, txHash);
@@ -3258,7 +3319,7 @@ function executeBurrowSupply(_0) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.3";
+  return "0.3.5";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();
@@ -3277,7 +3338,10 @@ export {
   WizzConnector,
   XverseConnector,
   executeBurrowSupply,
+  getBtcBalance,
+  getBtcGasPrice,
   getVersion,
+  sendBitcoin,
   setupBTCWallet,
   useAccountContract,
   useAccounts,