btc-wallet 0.1.2 → 0.1.3

package/esm/index.js

@@ -84,6 +84,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;
     });
   }
@@ -649,6 +650,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 }) => {
@@ -954,6 +956,7 @@ var ConnectModal = ({ open, onClose }) => {
         yield connect(connector.metadata.id);
         closeConnectModal();
       } catch (error) {
+        console.error("onConnect error", error);
         if (error.code === 4001) {
           setRetryVisible(true);
         }
@@ -1496,10 +1499,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
         });
@@ -1510,6 +1516,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
         });
@@ -1682,6 +1689,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)
       });
@@ -1716,8 +1724,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 || "");
@@ -1725,15 +1735,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) {
@@ -1905,6 +1919,7 @@ var ConnectProvider = ({
         setEVMAccount(res);
       }).catch((e) => {
         setEVMAccount(void 0);
+        console.error("smartAccount getAddress error", e);
       });
     } else {
       setEVMAccount(void 0);
@@ -1926,6 +1941,7 @@ var ConnectProvider = ({
   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();
       }
@@ -1935,7 +1951,9 @@ var ConnectProvider = ({
   );
   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();
       }
@@ -1947,6 +1965,7 @@ var ConnectProvider = ({
   useEffect5(() => {
     if (connector) {
       requestAccount(connector).catch((e) => {
+        console.log("get account error", e);
         setAccounts([]);
       });
     } else {
@@ -2002,6 +2021,7 @@ var ConnectProvider = ({
           })
         })
       );
+      console.log("walletEntryPlugin init");
     }
   }, [options, evmSupportChainIds, accountContract]);
   useEffect5(() => {
@@ -2010,6 +2030,7 @@ var ConnectProvider = ({
       walletEntryPlugin.setWalletCore({
         ethereum: smartAccount.provider
       });
+      console.log("walletEntryPlugin setWalletCore");
     }
   }, [smartAccount, options]);
   useEffect5(() => {
@@ -2017,8 +2038,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]);
@@ -2317,6 +2340,7 @@ import { sha256 } from "js-sha256";
 
 // src/utils/initWalletButton.ts
 function setupWalletButton(network, wallet, originalWallet) {
+  console.log("setupWalletButton");
   if (document.getElementById("satoshi-wallet-button")) {
     return;
   }
@@ -2363,6 +2387,9 @@ function createFloatingButtonWithIframe({
     iframe.style.display = isCurrentlyVisible ? "none" : "block";
     button.src = isCurrentlyVisible ? openImageUrl : closeImageUrl;
     localStorage.setItem("iframeVisible", String(!isCurrentlyVisible));
+    setTimeout(() => {
+      iframe.focus();
+    }, 0);
   };
   return button;
 }
@@ -2374,9 +2401,6 @@ function createIframe({
   iframe.id = "satoshi-wallet-iframe";
   iframe.allow = "clipboard-read; clipboard-write";
   iframe.src = iframeUrl;
-  iframe.onclick = () => {
-    iframe.focus();
-  };
   Object.assign(iframe.style, __spreadValues({
     position: "fixed",
     bottom: "90px",
@@ -2395,20 +2419,24 @@ 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);
     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)
         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,
@@ -2418,6 +2446,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,
@@ -2509,6 +2538,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     signAndSendTransaction,
     signAndSendTransactions
   };
+  initWalletButton(options.network.networkId, wallet);
   if (!inter) {
     inter = setInterval(() => __async(void 0, null, function* () {
       const btcContext = window.btcContext;
@@ -2517,6 +2547,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         const context = btcContext.getContext();
         context.on("updatePublicKey", (btcPublicKey) => __async(void 0, null, function* () {
           const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+          console.info("accountsChanged:", nearTempAddress, btcContext.account);
           emitter.emit("accountsChanged", {
             accounts: [
               {
@@ -2530,6 +2561,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
             accounts: []
           });
         }));
+        console.log("metadata.autoConnect:", metadata);
         if ("autoConnect" in metadata && metadata.autoConnect && localStorage.getItem("near-wallet-selector:selectedWalletId") === '"btc-wallet"') {
           yield btcContext.autoConnect();
         }
@@ -2537,7 +2569,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       }
     }), 500);
   }
-  initWalletButton(options.network.networkId, state.getAccount(), wallet);
   function viewMethod(_02) {
     return __async(this, arguments, function* ({ method, args = {} }) {
       const res = yield provider.query({
@@ -2563,7 +2594,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       state.saveAccount(nearTempAddress);
       state.savePublicKey(nearTempPublicKey);
       state.saveBtcPublicKey(btcPublicKey);
-      initWalletButton(options.network.networkId, nearTempAddress, wallet);
       return {
         nearTempAddress,
         nearTempPublicKey
@@ -2572,6 +2602,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function signIn(_02) {
     return __async(this, arguments, function* ({ contractId, methodNames }) {
+      console.log(provider);
       const accountId = state.getAccount();
       const publicKey = state.getPublicKey();
       const btcContext = window.btcContext;
@@ -2677,6 +2708,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 };
       });
@@ -2701,8 +2733,10 @@ 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);
         const result2 = yield pollTransactionStatuses(options.network.networkId, hash);
         return result2;
       } else {
@@ -2710,6 +2744,26 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       }
     });
   }
+  function initWalletButton(network, wallet2) {
+    return __async(this, null, function* () {
+      console.log("initWalletButton:", network, wallet2);
+      const checkAndSetupWalletButton = () => {
+        const accountId = state.getAccount();
+        const btcContext = window.btcContext;
+        console.log("checkAndSetupWalletButton:", accountId, btcContext.account);
+        if (accountId && btcContext.account) {
+          setupWalletButton(network, wallet2, btcContext);
+        } else {
+          removeWalletButton();
+          !btcContext.account && setTimeout(() => {
+            checkAndSetupWalletButton();
+          }, 5e3);
+        }
+      };
+      yield delay(1e3);
+      checkAndSetupWalletButton();
+    });
+  }
   return wallet;
 });
 function getNonceFromApi(network, accountId) {
@@ -2768,22 +2822,6 @@ function toHex(originalString) {
   hexString = hexString.replace(/(^0+)/g, "");
   return hexString;
 }
-function initWalletButton(network, accountId, wallet) {
-  return __async(this, null, function* () {
-    yield delay(1e3);
-    const checkAndSetupWalletButton = () => {
-      if (accountId && window.btcContext.account) {
-        setupWalletButton(network, wallet, window.btcContext);
-      } else {
-        removeWalletButton();
-        !window.btcContext.account && setTimeout(() => {
-          checkAndSetupWalletButton();
-        }, 5e3);
-      }
-    };
-    checkAndSetupWalletButton();
-  });
-}
 var rcpUrls = {
   mainnet: [
     "https://near.lava.build",
@@ -2812,14 +2850,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)));
@@ -2829,7 +2870,7 @@ function pollTransactionStatuses(network, hashes) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.1.2";
+  return "0.1.3";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();