btc-wallet 0.5.99-beta → 0.6.0-beta

package/dist/core/btcUtils.d.ts

@@ -28,6 +28,12 @@ export declare function getBtcBalance(account?: string): Promise<{
 }>;
 export declare function sendBitcoin(address: string, amount: number, feeRate: number): Promise<string>;
 export declare function getPublicKeyBase58(): Promise<any>;
+export declare function getAddressByPublicKeyBase58(btcPublicKeyBase58: string): {
+    p2pkh: string | undefined;
+    p2sh: string | undefined;
+    p2wpkh: string | undefined;
+    p2wsh: string | undefined;
+};
 export declare function signMessage(message: string): Promise<{
     signature: string;
     publicKey: string;

package/dist/index.js

@@ -115,6 +115,7 @@ __export(src_exports, {
   checkSatoshiWhitelist: () => checkSatoshiWhitelist,
   estimateDepositAmount: () => estimateDepositAmount,
   executeBTCDepositAndAction: () => executeBTCDepositAndAction,
+  getAddressByPublicKeyBase58: () => getAddressByPublicKeyBase58,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
   getBtcUtxos: () => getBtcUtxos,
@@ -2527,12 +2528,22 @@ var ConnectProvider = ({
   }, [options.aaOptions.accountContracts, accountContract]);
   const connector = (0, import_react10.useMemo)(() => getConnector(), [connectorId, connectors]);
   const getPublicKey = (0, import_react10.useCallback)(() => __async(void 0, null, function* () {
+    var _a2;
     const connector2 = getConnector();
     if (!connector2) {
       throw new Error("Wallet not connected!");
     }
-    const pubKey = yield connector2.getPublicKey();
-    return pubKey;
+    try {
+      const pubKey = yield connector2.getPublicKey();
+      return pubKey;
+    } catch (error) {
+      console.error("[BTC Wallet] getPublicKey error:", error);
+      if ((_a2 = error.message) == null ? void 0 : _a2.includes("is not install")) {
+        setConnectorId(void 0);
+        setAccounts([]);
+      }
+      throw error;
+    }
   }), [getConnector]);
   const signMessage2 = (0, import_react10.useCallback)(
     (message) => __async(void 0, null, function* () {
@@ -2555,11 +2566,21 @@ var ConnectProvider = ({
     [connector]
   );
   const getNetwork2 = (0, import_react10.useCallback)(() => __async(void 0, null, function* () {
+    var _a2;
     if (!connector) {
       throw new Error("Wallet not connected!");
     }
-    const network = yield connector.getNetwork();
-    return network;
+    try {
+      const network = yield connector.getNetwork();
+      return network;
+    } catch (error) {
+      console.error("[BTC Wallet] getNetwork error:", error);
+      if ((_a2 = error.message) == null ? void 0 : _a2.includes("is not install")) {
+        setConnectorId(void 0);
+        setAccounts([]);
+      }
+      throw error;
+    }
   }), [connector]);
   const switchNetwork = (0, import_react10.useCallback)(
     (network) => __async(void 0, null, function* () {
@@ -2593,26 +2614,50 @@ var ConnectProvider = ({
   }, [options, evmSupportChainIds, getPublicKey, signMessage2, accountContract]);
   const requestAccount = (0, import_react10.useCallback)(
     (connector2) => __async(void 0, null, function* () {
-      let accounts2 = yield connector2.getAccounts();
-      if (accounts2.length === 0 && autoConnect) {
-        accounts2 = yield connector2.requestAccounts();
+      var _a2;
+      try {
+        let accounts2 = yield connector2.getAccounts();
+        if (accounts2.length === 0 && autoConnect) {
+          accounts2 = yield connector2.requestAccounts();
+        }
+        setAccounts(accounts2);
+      } catch (error) {
+        console.error("[BTC Wallet] requestAccount error:", error);
+        if ((_a2 = error.message) == null ? void 0 : _a2.includes("is not install")) {
+          setConnectorId(void 0);
+        }
+        setAccounts([]);
+        throw error;
       }
-      setAccounts(accounts2);
     }),
     [autoConnect]
   );
   const requestDirectAccount = (0, import_react10.useCallback)((connector2) => __async(void 0, null, function* () {
-    let accounts2 = yield connector2.getAccounts();
-    if (accounts2.length === 0) {
-      accounts2 = yield connector2.requestAccounts();
+    var _a2;
+    try {
+      let accounts2 = yield connector2.getAccounts();
+      if (accounts2.length === 0) {
+        accounts2 = yield connector2.requestAccounts();
+      }
+      setAccounts(accounts2);
+      return accounts2;
+    } catch (error) {
+      console.error("[BTC Wallet] requestDirectAccount error:", error);
+      if ((_a2 = error.message) == null ? void 0 : _a2.includes("is not install")) {
+        setConnectorId(void 0);
+        setAccounts([]);
+      }
+      throw error;
     }
-    setAccounts(accounts2);
-    return accounts2;
   }), []);
   (0, import_react10.useEffect)(() => {
     if (connector) {
       requestAccount(connector).catch((e) => {
-        console.error("get account error", e);
+        var _a2;
+        console.error("[BTC Wallet] requestAccount error:", e);
+        if ((_a2 = e.message) == null ? void 0 : _a2.includes("is not install")) {
+          setConnectorId(void 0);
+        }
         setAccounts([]);
       });
     } else {
@@ -2923,6 +2968,13 @@ function useBtcWalletSelector() {
       eventCache.lastProcessedTime = now;
       getPublicKey().then((res) => {
         context.emit("updatePublicKey", res);
+      }).catch((error) => {
+        var _a;
+        console.error("[BTC Wallet] getPublicKey failed in accountsChanged:", error);
+        if ((_a = error.message) == null ? void 0 : _a.includes("is not install")) {
+          disconnect == null ? void 0 : disconnect();
+          context.emit("btcLogOut");
+        }
       });
     };
     connector == null ? void 0 : connector.on("accountsChanged", handleAccountsChanged);
@@ -2951,7 +3003,6 @@ function useBtcWalletSelector() {
         );
         return account || null;
       } catch (error) {
-        console.error("btcLoginError", error);
         context.emit("btcLoginError");
         return null;
       }
@@ -3998,6 +4049,21 @@ function getPublicKeyBase58() {
     return publicKeyBase58;
   });
 }
+function getAddressByPublicKeyBase58(btcPublicKeyBase58) {
+  const publicKey = import_bs582.default.decode(btcPublicKeyBase58);
+  const uncompressedPublicKey = Buffer.concat([Buffer.from([4]), publicKey]);
+  const compressedPublicKeyUint8 = ecc.pointCompress(uncompressedPublicKey, true);
+  const compressedPublicKey = Buffer.from(compressedPublicKeyUint8);
+  const p2pkh = bitcoin.payments.p2pkh({ pubkey: uncompressedPublicKey }).address;
+  const p2sh = bitcoin.payments.p2sh({
+    redeem: bitcoin.payments.p2pkh({ pubkey: uncompressedPublicKey })
+  }).address;
+  const p2wpkh = bitcoin.payments.p2wpkh({ pubkey: compressedPublicKey }).address;
+  const p2wsh = bitcoin.payments.p2wsh({
+    redeem: bitcoin.payments.p2pkh({ pubkey: compressedPublicKey })
+  }).address;
+  return { p2pkh, p2sh, p2wpkh, p2wsh };
+}
 function signMessage(message) {
   return __async(this, null, function* () {
     const { signMessage: signMessage2, getPublicKey } = getBtcProvider();
@@ -5450,7 +5516,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.99-beta";
+  return "0.6.0-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();