btc-wallet 0.2.6 → 0.2.8

package/dist/utils/ethereumUtils.d.ts

@@ -1,7 +1,4 @@
-import type { SmartAccount, UserOp } from '@particle-network/aa';
-import type { AccountInfo } from '../types/accountInfo';
+import type { UserOp } from '@particle-network/aa';
 export declare const pubKeyToEVMAddress: (pubKey: string) => `0x${string}`;
 export declare const convertSignature: (signature: string) => string;
 export declare function caculateNativeFee(userOp: UserOp): bigint;
-export declare const getBTCAAAddress: (smartAccount: SmartAccount, btcAddress: string, name: string, version: string) => Promise<string>;
-export declare const getBTCAccountInfo: (smartAccount: SmartAccount, btcAddress: string, name: string, version: string) => Promise<AccountInfo>;

package/dist/utils/index.d.ts

@@ -1,10 +1,5 @@
 import type { AAOptions } from '@particle-network/aa';
 export declare function shortString(str: any): string;
-/**
- * 复制到剪贴板
- * @param {string} text
- * @returns {Promise<void>}
- */
 export declare function copyToClipboard(text: string): Promise<unknown>;
 export declare const defaultTokenIcon = "https://static.particle.network/token-list/defaultToken/default.png";
 export declare const ipfsToSrc: (ipfs: string) => string;

package/esm/index.js

@@ -681,7 +681,7 @@ var WalletClientProvider = class {
 
 // src/hooks/useETHProvider.ts
 var useETHProvider = () => {
-  const { evmAccount, smartAccount, getSmartAccountInfo } = useConnectProvider();
+  const { evmAccount, smartAccount } = useConnectProvider();
   const [chainId, setChainId] = useState();
   useEffect(() => {
     if (smartAccount) {
@@ -775,7 +775,11 @@ var useETHProvider = () => {
     return (smartAccount == null ? void 0 : smartAccount.provider).publicClient;
   }, [smartAccount, chainId]);
   const provider = useMemo(() => {
-    const ethereumProvider = new EthereumProvider(sendUserOp, smartAccount == null ? void 0 : smartAccount.provider, evmAccount);
+    const ethereumProvider = new EthereumProvider(
+      sendUserOp,
+      smartAccount == null ? void 0 : smartAccount.provider,
+      evmAccount
+    );
     return ethereumProvider;
   }, [evmAccount, sendUserOp, smartAccount == null ? void 0 : smartAccount.provider]);
   const walletClient = useMemo(() => {
@@ -787,7 +791,6 @@ var useETHProvider = () => {
     provider,
     evmAccount,
     account: evmAccount,
-    getSmartAccountInfo,
     switchChain,
     chainId,
     getFeeQuotes,
@@ -1085,7 +1088,13 @@ var checkBTCVersion = (accountContracts, accountContractKey, version) => {
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 // src/utils/ethereumUtils.ts
-import { bytesToHex, publicToAddress, toBytes, toChecksumAddress, toRpcSig } from "@ethereumjs/util";
+import {
+  bytesToHex,
+  publicToAddress,
+  toBytes,
+  toChecksumAddress,
+  toRpcSig
+} from "@ethereumjs/util";
 import bitcore from "bitcore-lib";
 var pubKeyToEVMAddress = (pubKey) => {
   const address = toChecksumAddress(bytesToHex(publicToAddress(toBytes(`0x${pubKey}`), true)));
@@ -1100,57 +1109,6 @@ var convertSignature = (signature) => {
 function caculateNativeFee(userOp) {
   return (BigInt(userOp.callGasLimit) + BigInt(userOp.verificationGasLimit) + BigInt(userOp.preVerificationGas)) * BigInt(userOp.maxFeePerGas);
 }
-var getBTCAAAddress = (smartAccount, btcAddress, name, version) => __async(void 0, null, function* () {
-  var _a;
-  const addresses = yield smartAccount.provider.request({ method: "eth_accounts" });
-  const owner = addresses[0];
-  const localKey = `particle_${name}_${version}_${owner}`;
-  if (typeof window !== "undefined" && localStorage) {
-    const localAA = localStorage.getItem(localKey);
-    if (localAA) {
-      return localAA;
-    }
-  }
-  const btcPublicKey = yield smartAccount.provider.getPublicKey();
-  const accountInfo = yield smartAccount.sendRpc({
-    method: "particle_aa_getBTCAccount",
-    params: [
-      {
-        name,
-        version,
-        btcPublicKey,
-        btcAddress
-      }
-    ]
-  });
-  const address = (_a = accountInfo == null ? void 0 : accountInfo[0]) == null ? void 0 : _a.smartAccountAddress;
-  if (typeof window !== "undefined" && localStorage && address) {
-    localStorage.setItem(localKey, address);
-  }
-  return address;
-});
-var getBTCAccountInfo = (smartAccount, btcAddress, name, version) => __async(void 0, null, function* () {
-  const btcPublicKey = yield smartAccount.provider.getPublicKey();
-  const [accountInfo] = yield smartAccount.sendRpc({
-    method: "particle_aa_getBTCAccount",
-    params: [
-      {
-        name,
-        version,
-        btcPublicKey,
-        btcAddress
-      }
-    ]
-  });
-  const address = accountInfo.smartAccountAddress;
-  const addresses = yield smartAccount.provider.request({ method: "eth_accounts" });
-  const owner = addresses[0];
-  const localKey = `particle_${name}_${version}_${owner}`;
-  if (typeof window !== "undefined" && localStorage && address) {
-    localStorage.setItem(localKey, address);
-  }
-  return accountInfo;
-});
 
 // src/components/copyText/index.tsx
 import { useState as useState4 } from "react";
@@ -1420,7 +1378,11 @@ var sign_module_default = classes8;
 
 // src/components/signModal/index.tsx
 import { Fragment as Fragment3, jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
-var SignModal = ({ open, onClose, onOpen }) => {
+var SignModal = ({
+  open,
+  onClose,
+  onOpen
+}) => {
   const [userOpBundle, setUserOpBundle] = useState5();
   const [notRemindChecked, setNotRemindChecked] = useState5(false);
   const [loading, setLoading] = useState5(false);
@@ -1602,10 +1564,12 @@ var SignModal = ({ open, onClose, onOpen }) => {
           var _a, _b;
           return ((_b = (_a = item.estimatedChanges.natives) == null ? void 0 : _a[0]) == null ? void 0 : _b.nativeChange) && item.estimatedChanges.natives[0].nativeChange.startsWith("-");
         }
-      ).map((item) => {
-        var _a, _b, _c, _d;
-        return BigInt(((_d = (_c = (_b = (_a = item.estimatedChanges) == null ? void 0 : _a.natives) == null ? void 0 : _b[0]) == null ? void 0 : _c.nativeChange) == null ? void 0 : _d.replace("-", "")) || 0);
-      }).reduce((accumulator, currentValue) => accumulator + currentValue, BigInt(0));
+      ).map(
+        (item) => {
+          var _a, _b, _c, _d;
+          return BigInt(((_d = (_c = (_b = (_a = item.estimatedChanges) == null ? void 0 : _a.natives) == null ? void 0 : _b[0]) == null ? void 0 : _c.nativeChange) == null ? void 0 : _d.replace("-", "")) || 0);
+        }
+      ).reduce((accumulator, currentValue) => accumulator + currentValue, BigInt(0));
       if (userOpBundle.userOp.paymasterAndData.length > 2) {
         setDisabled(nativeBalance < nativeChange);
       } else {
@@ -1627,37 +1591,52 @@ var SignModal = ({ open, onClose, onOpen }) => {
       return JSON.stringify(obj, null, 2);
     }
   }, [requestArguments]);
-  return /* @__PURE__ */ jsx8(modal_default, { open, onClose, isDismissable: false, contentClassName: sign_module_default.modalContent, children: /* @__PURE__ */ jsxs5(Fragment3, { children: [
-    /* @__PURE__ */ jsx8("img", { className: sign_module_default.closeBtn, src: close_default, onClick: closeModal }),
-    requestArguments && /* @__PURE__ */ jsx8("div", { className: sign_module_default.signTitle, children: requestArguments.method == "personal_sign" /* personalSign */ ? "Sign Message" : "Sign Typed Data" }),
-    /* @__PURE__ */ jsxs5("div", { className: sign_module_default.chainInfo, children: [
-      /* @__PURE__ */ jsx8("img", { src: chainInfo == null ? void 0 : chainInfo.icon }),
-      chainInfo == null ? void 0 : chainInfo.fullname.replace("Mainnet", "")
-    ] }),
-    /* @__PURE__ */ jsx8("div", { className: sign_module_default.addressContainer, children: /* @__PURE__ */ jsx8(CopyText, { value: evmAccount, style: { textDecorationLine: "none" }, children: /* @__PURE__ */ jsxs5("div", { className: sign_module_default.addressInfo, children: [
-      shortString(evmAccount),
-      /* @__PURE__ */ jsx8("img", { src: copy_default })
-    ] }) }) }),
-    /* @__PURE__ */ jsxs5("div", { className: sign_module_default.detailsContent + (deserializeResult || requestArguments ? ` ${sign_module_default.fill}` : ""), children: [
-      deserializeResult && deserializeResult.map((details, index) => /* @__PURE__ */ jsx8(transactionDetails_default, { details }, `${details.type}-${index}`)),
-      unsignedMessage && /* @__PURE__ */ jsx8("div", { className: sign_module_default.unsignedMessage, children: unsignedMessage })
-    ] }),
-    gasFee && /* @__PURE__ */ jsx8("div", { className: sign_module_default.estimatedGas, children: `Estimated gas fee: ${formatEther(gasFee)} ${chainInfo == null ? void 0 : chainInfo.nativeCurrency.symbol}` }),
-    /* @__PURE__ */ jsx8(
-      button_default,
-      {
-        onClick: confirmTx,
-        className: sign_module_default.signBtn,
-        isLoading: loading || deserializeLoading,
-        isDisabled: disabled,
-        children: deserializeLoading ? "LOADING" : disabled ? "INSUFFICIENT FEE" : "CONFIRM"
-      }
-    ),
-    showNotRemind && /* @__PURE__ */ jsxs5("div", { className: sign_module_default.notRemind, onClick: toggleNotRemind, children: [
-      /* @__PURE__ */ jsx8("img", { src: notRemindChecked ? check_box_default : check_box_blank_default }),
-      "Do not remind me again"
-    ] })
-  ] }) });
+  return /* @__PURE__ */ jsx8(
+    modal_default,
+    {
+      open,
+      onClose,
+      isDismissable: false,
+      contentClassName: sign_module_default.modalContent,
+      children: /* @__PURE__ */ jsxs5(Fragment3, { children: [
+        /* @__PURE__ */ jsx8("img", { className: sign_module_default.closeBtn, src: close_default, onClick: closeModal }),
+        requestArguments && /* @__PURE__ */ jsx8("div", { className: sign_module_default.signTitle, children: requestArguments.method == "personal_sign" /* personalSign */ ? "Sign Message" : "Sign Typed Data" }),
+        /* @__PURE__ */ jsxs5("div", { className: sign_module_default.chainInfo, children: [
+          /* @__PURE__ */ jsx8("img", { src: chainInfo == null ? void 0 : chainInfo.icon }),
+          chainInfo == null ? void 0 : chainInfo.fullname.replace("Mainnet", "")
+        ] }),
+        /* @__PURE__ */ jsx8("div", { className: sign_module_default.addressContainer, children: /* @__PURE__ */ jsx8(CopyText, { value: evmAccount, style: { textDecorationLine: "none" }, children: /* @__PURE__ */ jsxs5("div", { className: sign_module_default.addressInfo, children: [
+          shortString(evmAccount),
+          /* @__PURE__ */ jsx8("img", { src: copy_default })
+        ] }) }) }),
+        /* @__PURE__ */ jsxs5(
+          "div",
+          {
+            className: sign_module_default.detailsContent + (deserializeResult || requestArguments ? ` ${sign_module_default.fill}` : ""),
+            children: [
+              deserializeResult && deserializeResult.map((details, index) => /* @__PURE__ */ jsx8(transactionDetails_default, { details }, `${details.type}-${index}`)),
+              unsignedMessage && /* @__PURE__ */ jsx8("div", { className: sign_module_default.unsignedMessage, children: unsignedMessage })
+            ]
+          }
+        ),
+        gasFee && /* @__PURE__ */ jsx8("div", { className: sign_module_default.estimatedGas, children: `Estimated gas fee: ${formatEther(gasFee)} ${chainInfo == null ? void 0 : chainInfo.nativeCurrency.symbol}` }),
+        /* @__PURE__ */ jsx8(
+          button_default,
+          {
+            onClick: confirmTx,
+            className: sign_module_default.signBtn,
+            isLoading: loading || deserializeLoading,
+            isDisabled: disabled,
+            children: deserializeLoading ? "LOADING" : disabled ? "INSUFFICIENT FEE" : "CONFIRM"
+          }
+        ),
+        showNotRemind && /* @__PURE__ */ jsxs5("div", { className: sign_module_default.notRemind, onClick: toggleNotRemind, children: [
+          /* @__PURE__ */ jsx8("img", { src: notRemindChecked ? check_box_default : check_box_blank_default }),
+          "Do not remind me again"
+        ] })
+      ] })
+    }
+  );
 };
 var signModal_default = SignModal;
 
@@ -1819,7 +1798,11 @@ var ConnectProvider = ({
     isModalOpen: connectModalOpen,
     openModal: openConnectModal
   } = useModalStateValue_default();
-  const { closeModal: closeSignModal, isModalOpen: signModalOpen, openModal: openSignModal } = useModalStateValue_default();
+  const {
+    closeModal: closeSignModal,
+    isModalOpen: signModalOpen,
+    openModal: openSignModal
+  } = useModalStateValue_default();
   const [connectorId, setConnectorId] = useState7();
   const [accounts, setAccounts] = useState7([]);
   const [evmAccount, setEVMAccount] = useState7();
@@ -1904,7 +1887,12 @@ var ConnectProvider = ({
     }
     if (!window.__bitcoinSmartAccount || (window == null ? void 0 : window.__bitcoinSmartAccount) && ((window == null ? void 0 : window.__bitcoinSmartAccount.smartAccountContract.version) !== accountContract.version || (window == null ? void 0 : window.__bitcoinSmartAccount.smartAccountContract.name) !== accountContract.name)) {
       const smartAccount2 = new SmartAccount(
-        new AASignerProvider(evmSupportChainIds, options.projectId, options.clientKey, options.rpcUrls),
+        new AASignerProvider(
+          evmSupportChainIds,
+          options.projectId,
+          options.clientKey,
+          options.rpcUrls
+        ),
         options
       );
       smartAccount2.setSmartAccountContract(accountContract);
@@ -1914,35 +1902,9 @@ var ConnectProvider = ({
     window.__bitcoinSmartAccount.provider.personalSign = signMessage;
     return window.__bitcoinSmartAccount;
   }, [options, evmSupportChainIds, getPublicKey, signMessage, accountContract]);
-  useEffect5(() => {
-    if (accounts.length > 0 && smartAccount) {
-      getBTCAAAddress(smartAccount, accounts[0], accountContract.name, accountContract.version).then((res) => {
-        setEVMAccount(res);
-      }).catch((e) => {
-        setEVMAccount(void 0);
-        console.error("smartAccount getAddress error", e);
-      });
-    } else {
-      setEVMAccount(void 0);
-    }
-  }, [accountContract, accounts, smartAccount]);
-  const getSmartAccountInfo = useCallback7(() => __async(void 0, null, function* () {
-    if (accounts.length > 0 && smartAccount) {
-      const accountInfo = yield getBTCAccountInfo(
-        smartAccount,
-        accounts[0],
-        accountContract.name,
-        accountContract.version
-      );
-      setEVMAccount(accountInfo.smartAccountAddress);
-      return accountInfo;
-    }
-    return void 0;
-  }), [accounts, smartAccount, accountContract, setEVMAccount]);
   const requestAccount = useCallback7(
     (connector2) => __async(void 0, null, function* () {
       let accounts2 = yield connector2.getAccounts();
-      console.log("requestAccount start, autoConnect", accounts2, autoConnect);
       if (accounts2.length === 0 && autoConnect) {
         accounts2 = yield connector2.requestAccounts();
       }
@@ -1950,23 +1912,18 @@ var ConnectProvider = ({
     }),
     [autoConnect]
   );
-  const requestDirectAccount = useCallback7(
-    (connector2) => __async(void 0, null, function* () {
-      console.log(111);
-      let accounts2 = yield connector2.getAccounts();
-      console.log("requestAccount start, autoConnect", accounts2, autoConnect);
-      if (accounts2.length === 0) {
-        accounts2 = yield connector2.requestAccounts();
-      }
-      setAccounts(accounts2);
-      return accounts2;
-    }),
-    []
-  );
+  const requestDirectAccount = useCallback7((connector2) => __async(void 0, null, function* () {
+    let accounts2 = yield connector2.getAccounts();
+    if (accounts2.length === 0) {
+      accounts2 = yield connector2.requestAccounts();
+    }
+    setAccounts(accounts2);
+    return accounts2;
+  }), []);
   useEffect5(() => {
     if (connector) {
       requestAccount(connector).catch((e) => {
-        console.log("get account error", e);
+        console.error("get account error", e);
         setAccounts([]);
       });
     } else {
@@ -2096,8 +2053,7 @@ var ConnectProvider = ({
         switchNetwork,
         sendBitcoin: sendBitcoin2,
         accountContract,
-        setAccountContract,
-        getSmartAccountInfo
+        setAccountContract
       },
       children: [
         children,
@@ -2112,8 +2068,8 @@ var useConnectProvider = () => {
   return context;
 };
 
-// src/components/btcWalletSelectorContext.tsx
-import React, { useContext as useContext2, useEffect as useEffect7, useMemo as useMemo6, useRef, useState as useState8 } from "react";
+// src/core/btcWalletSelectorContext.tsx
+import React, { useContext as useContext2, useEffect as useEffect6, useMemo as useMemo6, useRef, useState as useState8 } from "react";
 
 // src/components/confirmBox/Modal.tsx
 import { jsx as jsx10, jsxs as jsxs7 } from "react/jsx-runtime";
@@ -2167,17 +2123,7 @@ function ComfirmBox({ onClose, status = 1, fromChain = {
   ] });
 }
 
-// src/components/hook.tsx
-import { useEffect as useEffect6 } from "react";
-function InitContextHook() {
-  const btcContext = useBtcWalletSelector();
-  useEffect6(() => {
-    window.btcContext = btcContext;
-  }, [btcContext]);
-  return null;
-}
-
-// src/components/btcWalletSelectorContext.tsx
+// src/core/btcWalletSelectorContext.tsx
 import { jsx as jsx12, jsxs as jsxs9 } from "react/jsx-runtime";
 var WalletSelectorContext = React.createContext(null);
 function BtcWalletSelectorContextProvider({
@@ -2185,6 +2131,7 @@ function BtcWalletSelectorContextProvider({
   autoConnect = false
 }) {
   const [isProcessing, setIsProcessing] = useState8(false);
+  const connectors = [new UnisatConnector(), new XverseConnector()];
   const walletSelectorContextValue = useMemo6(() => {
     const simpleFn = {};
     return {
@@ -2224,7 +2171,7 @@ function BtcWalletSelectorContextProvider({
         }
       },
       autoConnect: false,
-      connectors: [new UnisatConnector()],
+      connectors,
       children: [
         children,
         isProcessing && /* @__PURE__ */ jsx12(
@@ -2237,11 +2184,18 @@ function BtcWalletSelectorContextProvider({
             }
           }
         ),
-        /* @__PURE__ */ jsx12(InitContextHook, {})
+        /* @__PURE__ */ jsx12(InitBtcWalletSelectorContext, {})
       ]
     }
   ) });
 }
+function InitBtcWalletSelectorContext() {
+  const context = useBtcWalletSelector();
+  useEffect6(() => {
+    window.btcContext = context;
+  }, [context]);
+  return null;
+}
 function useBtcWalletSelector() {
   const { openConnectModal, openConnectModalAsync, disconnect, requestDirectAccount } = useConnectModal();
   const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector } = useBTCProvider();
@@ -2251,7 +2205,7 @@ function useBtcWalletSelector() {
   const providerRef = useRef(null);
   const [updater, setUpdater] = useState8(1);
   const context = useContext2(WalletSelectorContext);
-  useEffect7(() => {
+  useEffect6(() => {
     if (provider) {
       getPublicKey().then((res) => {
         publicKey.current = res;
@@ -2259,10 +2213,10 @@ function useBtcWalletSelector() {
       providerRef.current = provider;
     }
   }, [provider, updater]);
-  useEffect7(() => {
+  useEffect6(() => {
     signMessageFn.current = signMessage;
   }, [signMessage]);
-  useEffect7(() => {
+  useEffect6(() => {
     const fn = (account) => {
       if (account) {
         getPublicKey().then((res) => {
@@ -2296,7 +2250,7 @@ function useBtcWalletSelector() {
     autoConnect: () => __async(this, null, function* () {
       let times = 0;
       while (!connectorRef.current) {
-        yield sleep(500);
+        yield delay(500);
         if (times++ > 10) {
           return null;
         }
@@ -2313,7 +2267,7 @@ function useBtcWalletSelector() {
     getPublicKey: () => __async(this, null, function* () {
       let times = 0;
       while (!publicKey.current) {
-        yield sleep(1e3);
+        yield delay(1e3);
         if (times++ > 10) {
           return null;
         }
@@ -2329,7 +2283,7 @@ function useBtcWalletSelector() {
     getBalance: () => __async(this, null, function* () {
       let times = 0;
       while (!providerRef.current) {
-        yield sleep(500);
+        yield delay(500);
         if (times++ > 10) {
           return null;
         }
@@ -2340,13 +2294,8 @@ function useBtcWalletSelector() {
     sendBitcoin: sendBitcoin2
   };
 }
-function sleep(time) {
-  return new Promise(function(resolve) {
-    setTimeout(resolve, time);
-  });
-}
 
-// src/utils/setupBTCWallet.ts
+// src/core/setupBTCWallet.ts
 import { providers, transactions } from "near-api-js";
 import { actionCreators } from "@near-js/transactions";
 import { PublicKey } from "near-api-js/lib/utils/key_pair";
@@ -2439,7 +2388,8 @@ function createIframe({
     zIndex: "100000",
     boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
     borderRadius: "10px",
-    display: "block"
+    display: "block",
+    border: "none"
   }, iframeStyle));
   document.body.appendChild(iframe);
   return iframe;
@@ -2457,7 +2407,6 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
     originalAccountId && iframeSrc.searchParams.set("originalAccountId", originalAccountId);
     originalPublicKey && iframeSrc.searchParams.set("originalPublicKey", originalPublicKey);
     iframe.src = iframeSrc.toString();
-    console.log("iframe src", iframe.src);
     window.addEventListener("message", (event) => __async(this, null, function* () {
       var _a2, _b;
       if (event.origin !== iframeSrc.origin)
@@ -2533,8 +2482,8 @@ var nearRpcUrls = {
   ]
 };
 var btcRpcUrls = {
-  mainnet: "https://blockstream.info/api",
-  testnet: "https://blockstream.info/testnet/api"
+  mainnet: "https://mempool.space/api",
+  testnet: "https://mempool.space/testnet/api"
 };
 
 // src/utils/request.ts
@@ -2607,7 +2556,7 @@ function request(url, options) {
   });
 }
 
-// src/utils/setupBTCWallet.ts
+// src/core/setupBTCWallet.ts
 var { transfer, functionCall } = actionCreators;
 var state = {
   saveAccount(account) {
@@ -2672,7 +2621,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   if (!inter) {
     inter = setInterval(() => __async(void 0, null, function* () {
       const btcContext = window.btcContext;
-      console.log("inter btcContext:", btcContext);
       if (btcContext) {
         clearInterval(inter);
         const context = btcContext.getContext();
@@ -2694,12 +2642,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           });
         }));
         context.on("btcLogOut", (e) => __async(void 0, null, function* () {
-          console.log(3333);
           emitter.emit("accountsChanged", {
             accounts: []
           });
         }));
-        console.log("metadata.autoConnect:", metadata);
         if ("autoConnect" in metadata && metadata.autoConnect && localStorage.getItem("near-wallet-selector:selectedWalletId") === '"btc-wallet"') {
           yield btcContext.autoConnect();
         }
@@ -2883,7 +2829,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         btcPubKey: state.getBtcPublicKey(),
         data: toHex(strIntention)
       });
-      console.log("result:", result);
       if (result.result_code === 0) {
         const hash = newTransactions.map((t) => t.hash);
         console.log("txHash:", hash);
@@ -2899,7 +2844,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const checkAndSetupWalletButton = () => {
         const accountId = state.getAccount();
         const btcContext = window.btcContext;
-        console.log("checkAndSetupWalletButton:", accountId, btcContext.account);
+        console.log("checkAndSetupWalletButton:", {
+          nearAccountId: accountId,
+          btcAccountId: btcContext.account
+        });
         if (accountId && btcContext.account) {
           setupWalletButton(network, wallet2, btcContext);
         } else {
@@ -2995,7 +2943,7 @@ function pollTransactionStatuses(network, hashes) {
   });
 }
 
-// src/utils/bridgeSupplyUtils.ts
+// src/core/bridgeSupplyUtils.ts
 import { providers as providers2 } from "near-api-js";
 import Big from "big.js";
 function nearViewMethod(contractId, methodName, args, network) {
@@ -3030,12 +2978,13 @@ function getDepositAddress(btcPublicKey, contractId, network) {
     return res;
   });
 }
-function getGasPrice(btcRpcUrl) {
+function getGasPrice(network) {
   return __async(this, null, function* () {
     const defaultFeeRate = 100;
     try {
-      const res = yield request(`${btcRpcUrl}/fee-estimates`);
-      const feeRate = res[6];
+      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;
@@ -3064,12 +3013,21 @@ function receiveDepositMsg(_0, _1) {
 }
 function checkTransactionStatus(baseUrl, txHash) {
   return __async(this, null, function* () {
-    const res = yield request(`${baseUrl}/v1/bridgeFromTx?fromTxHash=${txHash}`);
+    const res = yield request(`${baseUrl}/v1/bridgeFromTx?fromTxHash=${txHash}`, {
+      timeout: 6e4,
+      pollingInterval: 5e3,
+      maxPollingAttempts: 10,
+      shouldStopPolling: (res2) => res2.result_code === 0
+    });
     return res;
   });
 }
-function executeBurrowSupply(amount, environment) {
-  return __async(this, null, function* () {
+function executeBurrowSupply(_0) {
+  return __async(this, arguments, function* ({
+    amount,
+    feeRate,
+    environment = "mainnet"
+  }) {
     try {
       if (typeof window === "undefined" || !window.btcContext) {
         throw new Error("BTC Provider is not initialized.");
@@ -3077,17 +3035,18 @@ function executeBurrowSupply(amount, environment) {
       const btcProvider = window.btcContext;
       const network = environment === "dev" ? "testnet" : environment;
       const config = walletConfig[environment];
-      const btcRpcUrl = btcRpcUrls[network];
       const btcPublicKey = yield btcProvider.getPublicKey();
       if (!btcPublicKey) {
         throw new Error("BTC Public Key is not available.");
       }
       const address = yield getDepositAddress(btcPublicKey, config.contractId, network);
-      const feeRate = yield getGasPrice(btcRpcUrl);
-      const txHash = yield sendBitcoin(btcProvider, address, amount, feeRate);
-      yield receiveDepositMsg(config.base_url, { btcPublicKey, txHash });
-      const status = yield checkTransactionStatus(config.base_url, txHash);
-      console.log("Transaction Status:", status);
+      const _feeRate = feeRate || (yield getGasPrice(network));
+      console.log("feeRate", _feeRate);
+      const txHash = yield sendBitcoin(btcProvider, 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);
+      console.log("checkTransactionStatus resp:", checkTransactionStatusRes);
     } catch (error) {
       console.error("Error executing Bridge+BurrowSupply:", error);
     }
@@ -3096,7 +3055,7 @@ function executeBurrowSupply(amount, environment) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.2.6";
+  return "0.2.8";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();
@@ -3107,7 +3066,6 @@ export {
   BtcWalletSelectorContextProvider,
   BybitConnector,
   ConnectProvider,
-  InitContextHook,
   InjectedConnector,
   OKXConnector,
   TokenPocketConnector,