btc-wallet 0.2.5 → 0.2.7

package/esm/index.js

@@ -85,6 +85,7 @@ var InjectedConnector = class extends BaseConnector {
   requestAccounts() {
     return __async(this, null, function* () {
       const accounts = yield this.getProviderOrThrow().requestAccounts();
+      console.log("\u{1F680} ~ InjectedConnector ~ requestAccounts ~ accounts:", accounts);
       return accounts;
     });
   }
@@ -485,7 +486,7 @@ var useAccounts = () => {
 // src/hooks/useBTCProvider.ts
 import { useCallback } from "react";
 var useBTCProvider = () => {
-  const { connector, provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin } = useConnectProvider();
+  const { connector, provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin: sendBitcoin2 } = useConnectProvider();
   const sendInscription = useCallback(
     (address, inscriptionId, options) => __async(void 0, null, function* () {
       if (!connector) {
@@ -496,7 +497,7 @@ var useBTCProvider = () => {
     }),
     [connector]
   );
-  return { provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin, sendInscription, connector };
+  return { provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin: sendBitcoin2, sendInscription, connector };
 };
 
 // src/hooks/useConnectModal.ts
@@ -650,6 +651,7 @@ var WalletClientProvider = class {
         }
       }
       if (method === "personal_sign" /* personalSign */) {
+        console.log("personal_sign ---- ", arg);
         return new Promise((resolve, reject) => {
           eventUtils_default.emit("personalSign" /* personalSign */, arg);
           eventUtils_default.once("personalSignResult" /* personalSignResult */, ({ result, error }) => {
@@ -679,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) {
@@ -773,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(() => {
@@ -785,7 +791,6 @@ var useETHProvider = () => {
     provider,
     evmAccount,
     account: evmAccount,
-    getSmartAccountInfo,
     switchChain,
     chainId,
     getFeeQuotes,
@@ -955,6 +960,7 @@ var ConnectModal = ({ open, onClose }) => {
         yield connect(connector.metadata.id);
         closeConnectModal();
       } catch (error) {
+        console.error("onConnect error", error);
         if (error.code === 4001) {
           setRetryVisible(true);
         }
@@ -1082,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)));
@@ -1097,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";
@@ -1417,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);
@@ -1497,10 +1462,13 @@ var SignModal = ({ open, onClose, onOpen }) => {
   }), [userOpBundle, smartAccount, accountContract]);
   useEffect4(() => {
     if (userOpBundle && open) {
+      console.log("deserializeUserOp start");
       setDeserializeLoading(true);
       deserializeUserOp().then((result) => {
+        console.log("\u{1F680} ~ deserializeUserOp ~ result:", result);
         setDeserializeResult(result);
       }).catch((error) => {
+        console.log("\u{1F680} ~ deserializeUserOp ~ error:", error);
         eventUtils_default.emit("sendUserOpResult" /* sendUserOpResult */, {
           error
         });
@@ -1511,6 +1479,7 @@ var SignModal = ({ open, onClose, onOpen }) => {
   useEffect4(() => {
     if (open && publicClient && evmAccount && userOpBundle) {
       publicClient.getBalance({ address: evmAccount }).then((result) => setNativeBalance(result)).catch((error) => {
+        console.log("\u{1F680} ~ getBalance ~ error:", error);
         eventUtils_default.emit("sendUserOpResult" /* sendUserOpResult */, {
           error
         });
@@ -1595,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 {
@@ -1620,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;
 
@@ -1683,6 +1669,7 @@ var AASignerProvider = class {
     this.getPublicClient = () => {
       var _a, _b;
       const rpcUrl = ((_a = this == null ? void 0 : this.rpcUrls) == null ? void 0 : _a[this.chainId]) || ((_b = chains3.getEVMChainInfoById(this.chainId || 1)) == null ? void 0 : _b.rpcUrl);
+      console.log("rpcUrl", rpcUrl);
       return createPublicClient({
         transport: http(rpcUrl)
       });
@@ -1717,8 +1704,10 @@ var AASignerProvider = class {
         return `0x${this.chainId.toString(16)}`;
       } else if (arg.method === "personal_sign" /* personalSign */) {
         let message = (_a = arg.params) == null ? void 0 : _a[0];
+        console.log("personal_sign message:", message);
         if (message.length !== 66) {
           const hash = hashMessage({ raw: message });
+          console.log("personal_sign hash:", hash);
           message = hash;
         }
         const result = yield this.personalSign(message || "");
@@ -1726,15 +1715,19 @@ var AASignerProvider = class {
         if (!convertResult) {
           throw new Error("sign error");
         }
+        console.log(`personal_sign result(${convertResult.length}): `, convertResult);
         return convertResult;
       } else if (arg.method === "eth_signTypedData" || arg.method === "eth_signTypedData_v4") {
         const typedData = (_b = arg.params) == null ? void 0 : _b[1];
+        console.log("signTypedData typedData", typedData);
         const hash = hashTypedData(typeof typedData === "string" ? JSON.parse(typedData) : typedData);
+        console.log("signTypedData hash", hash);
         const result = yield this.personalSign(hash || "");
         const convertResult = convertSignature(result);
         if (!convertResult) {
           throw new Error("sign error");
         }
+        console.log(`eth_signTypedData result(${convertResult.length}): `, convertResult);
         return convertResult;
       } else if (arg.method === "wallet_switchEthereumChain") {
         if (arg.params && arg.params instanceof Array && arg.params[0] && arg.params[0].chainId) {
@@ -1805,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();
@@ -1814,12 +1811,12 @@ var ConnectProvider = ({
     version: ((_c = options.aaOptions.accountContracts[((_b = Object.keys(options.aaOptions.accountContracts)) == null ? void 0 : _b[0]) || "BTC"]) == null ? void 0 : _c[0].version) || "1.0.0"
   });
   const setAccountContract = useCallback7(
-    (config2) => {
-      if (!checkBTCVersion(options.aaOptions.accountContracts, config2.name, config2.version)) {
+    (config) => {
+      if (!checkBTCVersion(options.aaOptions.accountContracts, config.name, config.version)) {
         throw new Error("Invalid Account Contract");
       }
-      localStorage.setItem(SAContractKey, JSON.stringify(config2));
-      _setAccountContract(config2);
+      localStorage.setItem(SAContractKey, JSON.stringify(config));
+      _setAccountContract(config);
     },
     [options.aaOptions.accountContracts, _setAccountContract]
   );
@@ -1858,7 +1855,7 @@ var ConnectProvider = ({
     }),
     [connector]
   );
-  const sendBitcoin = useCallback7(
+  const sendBitcoin2 = useCallback7(
     (toAddress, satoshis, options2) => __async(void 0, null, function* () {
       if (!connector) {
         throw new Error("Wallet not connected!");
@@ -1890,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);
@@ -1900,30 +1902,6 @@ 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);
-      });
-    } 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();
@@ -1934,20 +1912,18 @@ var ConnectProvider = ({
     }),
     [autoConnect]
   );
-  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;
-    }),
-    []
-  );
+  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.error("get account error", e);
         setAccounts([]);
       });
     } else {
@@ -1978,9 +1954,9 @@ var ConnectProvider = ({
     setConnectorId(void 0);
   }, [connector]);
   useEffect5(() => {
-    const config2 = JSON.parse(localStorage.getItem(SAContractKey) || "{}");
-    if (config2.name && config2.version && checkBTCVersion(options.aaOptions.accountContracts, config2.name, config2.version)) {
-      _setAccountContract(config2);
+    const config = JSON.parse(localStorage.getItem(SAContractKey) || "{}");
+    if (config.name && config.version && checkBTCVersion(options.aaOptions.accountContracts, config.name, config.version)) {
+      _setAccountContract(config);
     }
   }, [options.aaOptions.accountContracts, _setAccountContract]);
   useEffect5(() => {
@@ -2003,6 +1979,7 @@ var ConnectProvider = ({
           })
         })
       );
+      console.log("walletEntryPlugin init");
     }
   }, [options, evmSupportChainIds, accountContract]);
   useEffect5(() => {
@@ -2011,6 +1988,7 @@ var ConnectProvider = ({
       walletEntryPlugin.setWalletCore({
         ethereum: smartAccount.provider
       });
+      console.log("walletEntryPlugin setWalletCore");
     }
   }, [smartAccount, options]);
   useEffect5(() => {
@@ -2018,8 +1996,10 @@ var ConnectProvider = ({
     if (((_a2 = options.walletOptions) == null ? void 0 : _a2.visible) !== false) {
       if (evmAccount) {
         walletEntryPlugin.walletEntryCreate();
+        console.log("walletEntryPlugin walletEntryCreate");
       } else {
         walletEntryPlugin.walletEntryDestroy();
+        console.log("walletEntryPlugin walletEntryDestroy");
       }
     }
   }, [evmAccount, smartAccount, options]);
@@ -2071,10 +2051,9 @@ var ConnectProvider = ({
         smartAccount,
         getNetwork,
         switchNetwork,
-        sendBitcoin,
+        sendBitcoin: sendBitcoin2,
         accountContract,
-        setAccountContract,
-        getSmartAccountInfo
+        setAccountContract
       },
       children: [
         children,
@@ -2089,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";
@@ -2144,20 +2123,13 @@ 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({ children, autoConnect = false }) {
+function BtcWalletSelectorContextProvider({
+  children,
+  autoConnect = false
+}) {
   const [isProcessing, setIsProcessing] = useState8(false);
   const walletSelectorContextValue = useMemo6(() => {
     const simpleFn = {};
@@ -2201,24 +2173,38 @@ function BtcWalletSelectorContextProvider({ children, autoConnect = false }) {
       connectors: [new UnisatConnector()],
       children: [
         children,
-        isProcessing && /* @__PURE__ */ jsx12(ComfirmBox, { hash: "", status: 0, onClose: () => {
-          setIsProcessing(false);
-        } }),
-        /* @__PURE__ */ jsx12(InitContextHook, {})
+        isProcessing && /* @__PURE__ */ jsx12(
+          ComfirmBox,
+          {
+            hash: "",
+            status: 0,
+            onClose: () => {
+              setIsProcessing(false);
+            }
+          }
+        ),
+        /* @__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, getPublicKey, provider, signMessage, connector } = useBTCProvider();
+  const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector } = 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);
-  useEffect7(() => {
+  useEffect6(() => {
     if (provider) {
       getPublicKey().then((res) => {
         publicKey.current = res;
@@ -2226,10 +2212,10 @@ function useBtcWalletSelector() {
       providerRef.current = provider;
     }
   }, [provider, updater]);
-  useEffect7(() => {
+  useEffect6(() => {
     signMessageFn.current = signMessage;
   }, [signMessage]);
-  useEffect7(() => {
+  useEffect6(() => {
     const fn = (account) => {
       if (account) {
         getPublicKey().then((res) => {
@@ -2263,7 +2249,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;
         }
@@ -2280,7 +2266,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;
         }
@@ -2296,23 +2282,19 @@ function useBtcWalletSelector() {
     getBalance: () => __async(this, null, function* () {
       let times = 0;
       while (!providerRef.current) {
-        yield sleep(500);
+        yield delay(500);
         if (times++ > 10) {
           return null;
         }
       }
       const { total } = yield providerRef.current.getBalance();
       return total;
-    })
+    }),
+    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";
@@ -2328,6 +2310,7 @@ var walletUrlConfig = {
   mainnet: "https://wallet.satoshibridge.top"
 };
 function setupWalletButton(network, wallet, originalWallet) {
+  console.log("setupWalletButton");
   if (document.getElementById("satoshi-wallet-button")) {
     return;
   }
@@ -2404,7 +2387,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;
@@ -2415,6 +2399,7 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
     const accountId = (_a = yield wallet == null ? void 0 : wallet.getAccounts()) == null ? void 0 : _a[0].accountId;
     const originalAccountId = originalWallet.account;
     const originalPublicKey = yield originalWallet.getPublicKey();
+    console.log({ accountId, originalAccountId, originalPublicKey });
     const iframeSrc = new URL(iframe.src);
     iframeSrc.searchParams.set("origin", window.location.origin);
     accountId && iframeSrc.searchParams.set("accountId", accountId);
@@ -2427,8 +2412,10 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
         return;
       const { action, requestId, data } = event.data;
       if (action === "signAndSendTransaction") {
+        console.log("signAndSendTransaction message", event.data);
         try {
           const result = yield wallet.signAndSendTransaction(data);
+          console.log("signAndSendTransaction result", result);
           (_a2 = event.source) == null ? void 0 : _a2.postMessage(
             {
               requestId,
@@ -2438,6 +2425,7 @@ function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
             { targetOrigin: event.origin }
           );
         } catch (error) {
+          console.error("signAndSendTransaction error", error);
           (_b = event.source) == null ? void 0 : _b.postMessage(
             {
               requestId,
@@ -2458,25 +2446,117 @@ function removeWalletButton() {
   iframe == null ? void 0 : iframe.remove();
 }
 
-// src/utils/setupBTCWallet.ts
-var { transfer, functionCall } = actionCreators;
-var config = {
+// src/config.ts
+var walletConfig = {
   dev: {
-    base_url: "https://api.dev.satoshibridge.top/v1",
+    base_url: "https://api.dev.satoshibridge.top",
     token: "nbtc1-nsp.testnet",
-    contractId: "dev1-nsp.testnet"
+    contractId: "dev1-nsp.testnet",
+    walletUrl: "https://wallet-dev.satoshibridge.top"
   },
   testnet: {
-    base_url: "https://api.testnet.satoshibridge.top/v1",
+    base_url: "https://api.testnet.satoshibridge.top",
     token: "nbtc2-nsp.testnet",
-    contractId: "dev2-nsp.testnet"
+    contractId: "dev2-nsp.testnet",
+    walletUrl: "https://wallet-test.satoshibridge.top"
   },
   mainnet: {
-    base_url: "https://api.mainnet.satoshibridge.top/v1",
+    base_url: "https://api.mainnet.satoshibridge.top",
     token: "",
-    contractId: ""
+    contractId: "",
+    walletUrl: "https://wallet.satoshibridge.top"
   }
 };
+var nearRpcUrls = {
+  mainnet: [
+    "https://near.lava.build",
+    "https://rpc.mainnet.near.org",
+    "https://free.rpc.fastnear.com",
+    "https://near.drpc.org"
+  ],
+  testnet: [
+    "https://near-testnet.lava.build",
+    "https://rpc.testnet.near.org",
+    "https://near-testnet.drpc.org"
+  ]
+};
+var btcRpcUrls = {
+  mainnet: "https://mempool.space/api",
+  testnet: "https://mempool.space/testnet/api"
+};
+
+// src/utils/request.ts
+var cache = /* @__PURE__ */ new Map();
+var defaultCacheTimeout = 3e3;
+function request(url, options) {
+  return __async(this, null, function* () {
+    var _a;
+    const defaultHeaders = {
+      "Content-Type": "application/json"
+    };
+    const cacheTimeout = (options == null ? void 0 : options.cacheTimeout) || defaultCacheTimeout;
+    const headers = __spreadValues(__spreadValues({}, defaultHeaders), options == null ? void 0 : options.headers);
+    let body = options == null ? void 0 : options.body;
+    if (headers["Content-Type"] === "application/json" && body && typeof body !== "string") {
+      body = JSON.stringify(body);
+    }
+    const method = (options == null ? void 0 : options.method) || "GET";
+    const cacheKey = method.toUpperCase() === "GET" ? url : null;
+    if (cacheKey) {
+      const cached = cache.get(cacheKey);
+      const isCacheValid = cached && Date.now() - cached.timestamp < cacheTimeout;
+      if (isCacheValid) {
+        return Promise.resolve(cached.data);
+      }
+    }
+    const newOptions = __spreadProps(__spreadValues({}, options), {
+      headers,
+      body,
+      method
+    });
+    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);
+    try {
+      const res = yield fetch(url, __spreadProps(__spreadValues({}, newOptions), { signal: controller.signal })).finally(
+        () => clearTimeout(timeoutId)
+      );
+      if (!res.ok)
+        throw new Error(res.statusText);
+      const data = yield res.json();
+      if (cacheKey) {
+        cache.set(cacheKey, { timestamp: Date.now(), data });
+        setTimeout(() => {
+          cache.delete(cacheKey);
+        }, cacheTimeout);
+      }
+      if ((options == null ? void 0 : options.shouldStopPolling) && options.shouldStopPolling(data)) {
+        return data;
+      }
+      return data;
+    } catch (err) {
+      console.error(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) {
+          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
+          }));
+        }
+      }
+      return Promise.reject(err);
+    }
+  });
+}
+
+// src/core/setupBTCWallet.ts
+var { transfer, functionCall } = actionCreators;
 var state = {
   saveAccount(account) {
     window.localStorage.setItem("btc-wallet-account", account);
@@ -2534,7 +2614,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     signAndSendTransaction,
     signAndSendTransactions
   };
-  const currentConfig = "isDev" in metadata && metadata.isDev ? config.dev : config[options.network.networkId];
+  const currentConfig = "isDev" in metadata && metadata.isDev ? walletConfig.dev : walletConfig[options.network.networkId];
   const walletNetwork = "isDev" in metadata && metadata.isDev ? "dev" : options.network.networkId;
   initWalletButton(walletNetwork, wallet);
   if (!inter) {
@@ -2713,6 +2793,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           txBytes,
           (byte) => ("0" + (byte & 255).toString(16)).slice(-2)
         ).join("");
+        console.log("txHex:", txHex);
         const hash = bs58.encode(new Uint8Array(sha256.array(txBytes)));
         return { txBytes, txHex, hash };
       });
@@ -2749,6 +2830,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       });
       if (result.result_code === 0) {
         const hash = newTransactions.map((t) => t.hash);
+        console.log("txHash:", hash);
         const result2 = yield pollTransactionStatuses(options.network.networkId, hash);
         return result2;
       } else {
@@ -2761,6 +2843,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const checkAndSetupWalletButton = () => {
         const accountId = state.getAccount();
         const btcContext = window.btcContext;
+        console.log("checkAndSetupWalletButton:", {
+          nearAccountId: accountId,
+          btcAccountId: btcContext.account
+        });
         if (accountId && btcContext.account) {
           setupWalletButton(network, wallet2, btcContext);
         } else {
@@ -2777,29 +2863,16 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   return wallet;
 });
 function getNonceFromApi(url, accountId) {
-  return fetch(`${url}/nonce?csna=${accountId}`, {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json"
-    }
-  }).then((res) => res.json());
+  return request(`${url}/v1/nonce?csna=${accountId}`);
 }
 function getNearNonceFromApi(url, accountId) {
-  return fetch(`${url}/nonceNear?csna=${accountId}`, {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json"
-    }
-  }).then((res) => res.json());
+  return request(`${url}/v1/nonceNear?csna=${accountId}`);
 }
 function uploadBTCTx(url, data) {
-  return fetch(`${url}/receiveTransaction`, {
+  return request(`${url}/v1/receiveTransaction`, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify(data)
-  }).then((res) => res.json());
+    body: data
+  });
 }
 function setupBTCWallet({
   iconUrl = "https://assets.deltatrade.ai/assets/chain/btc.svg",
@@ -2836,23 +2909,10 @@ function toHex(originalString) {
   hexString = hexString.replace(/(^0+)/g, "");
   return hexString;
 }
-var rcpUrls = {
-  mainnet: [
-    "https://near.lava.build",
-    "https://rpc.mainnet.near.org",
-    "https://free.rpc.fastnear.com",
-    "https://near.drpc.org"
-  ],
-  testnet: [
-    "https://near-testnet.lava.build",
-    "https://rpc.testnet.near.org",
-    "https://near-testnet.drpc.org"
-  ]
-};
 function pollTransactionStatuses(network, hashes) {
   return __async(this, null, function* () {
     const provider = new providers.FailoverRpcProvider(
-      Object.values(rcpUrls[network]).map(
+      Object.values(nearRpcUrls[network]).map(
         (url) => new providers.JsonRpcProvider({ url })
       )
     );
@@ -2864,14 +2924,17 @@ function pollTransactionStatuses(network, hashes) {
         try {
           const result = yield provider.txStatus(hash, "unused", "FINAL");
           if (result && result.status) {
+            console.log(`Transaction ${hash} result:`, result);
             return result;
           }
         } catch (error) {
+          console.error(`Failed to fetch transaction status for ${hash}: ${error.message}`);
         }
         if (attempt === maxAttempts) {
           throw new Error(`Transaction not found after max attempts: ${hash}`);
         }
         yield delay(1e4);
+        console.log(`RPC request failed for ${hash}, retrying ${maxAttempts - attempt} more times`);
       }
     });
     const results = yield Promise.all(hashes.map((hash) => pollStatus(hash)));
@@ -2879,9 +2942,119 @@ function pollTransactionStatuses(network, hashes) {
   });
 }
 
+// src/core/bridgeSupplyUtils.ts
+import { providers as providers2 } from "near-api-js";
+import Big from "big.js";
+function nearViewMethod(contractId, methodName, args, network) {
+  return __async(this, null, function* () {
+    const nearProvider = new providers2.FailoverRpcProvider(
+      nearRpcUrls[network].map(
+        (url) => new providers2.JsonRpcProvider({ url })
+      )
+    );
+    const res = yield nearProvider.query({
+      request_type: "call_function",
+      account_id: contractId,
+      method_name: methodName,
+      args_base64: Buffer.from(JSON.stringify(args)).toString("base64"),
+      finality: "optimistic"
+    });
+    return JSON.parse(Buffer.from(res.result).toString());
+  });
+}
+function getDepositAddress(btcPublicKey, contractId, network) {
+  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
+    );
+    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,
+    txHash,
+    depositType = 1
+  }) {
+    const res = yield request(`${baseUrl}/v1/receiveDepositMsg`, {
+      method: "POST",
+      body: { btcPublicKey, txHash, depositType }
+    });
+    return res;
+  });
+}
+function checkTransactionStatus(baseUrl, txHash) {
+  return __async(this, null, function* () {
+    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(_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.");
+      }
+      const btcProvider = window.btcContext;
+      const network = environment === "dev" ? "testnet" : environment;
+      const config = walletConfig[environment];
+      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 = 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);
+    }
+  });
+}
+
 // src/index.ts
 var getVersion = () => {
-  return "0.2.5";
+  return "0.2.7";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();
@@ -2892,13 +3065,13 @@ export {
   BtcWalletSelectorContextProvider,
   BybitConnector,
   ConnectProvider,
-  InitContextHook,
   InjectedConnector,
   OKXConnector,
   TokenPocketConnector,
   UnisatConnector,
   WizzConnector,
   XverseConnector,
+  executeBurrowSupply,
   getVersion,
   setupBTCWallet,
   useAccountContract,