@enclave-hq/wallet-sdk 1.1.3 → 1.1.5

package/dist/react/index.d.mts

@@ -36,7 +36,11 @@ interface Account {
     balance?: string;
     name?: string;
 }
-interface IWalletAdapter {
+interface ISigner {
+    signMessage(message: string): Promise<string>;
+    getAddress(): Promise<string>;
+}
+interface IWalletAdapter extends ISigner {
     readonly type: WalletType;
     readonly chainType: ChainType;
     readonly name: string;
@@ -178,7 +182,7 @@ declare class WalletManager extends TypedEventEmitter<WalletManagerEvents> {
     private setupAdapterListeners;
     private removeAdapterListeners;
     private saveToStorage;
-    private restoreFromStorage;
+    restoreFromStorage(): Promise<Account | null>;
     private clearStorage;
     private getHistoryRecords;
 }
@@ -188,6 +192,7 @@ interface WalletContextValue {
     account: Account | null;
     isConnected: boolean;
     connectedWallets: ConnectedWallet[];
+    isRestoring: boolean;
     connect: (type: WalletType, chainId?: number) => Promise<Account>;
     connectAdditional: (type: WalletType, chainId?: number) => Promise<Account>;
     disconnect: () => Promise<void>;

package/dist/react/index.d.ts

@@ -36,7 +36,11 @@ interface Account {
     balance?: string;
     name?: string;
 }
-interface IWalletAdapter {
+interface ISigner {
+    signMessage(message: string): Promise<string>;
+    getAddress(): Promise<string>;
+}
+interface IWalletAdapter extends ISigner {
     readonly type: WalletType;
     readonly chainType: ChainType;
     readonly name: string;
@@ -178,7 +182,7 @@ declare class WalletManager extends TypedEventEmitter<WalletManagerEvents> {
     private setupAdapterListeners;
     private removeAdapterListeners;
     private saveToStorage;
-    private restoreFromStorage;
+    restoreFromStorage(): Promise<Account | null>;
     private clearStorage;
     private getHistoryRecords;
 }
@@ -188,6 +192,7 @@ interface WalletContextValue {
     account: Account | null;
     isConnected: boolean;
     connectedWallets: ConnectedWallet[];
+    isRestoring: boolean;
     connect: (type: WalletType, chainId?: number) => Promise<Account>;
     connectAdditional: (type: WalletType, chainId?: number) => Promise<Account>;
     disconnect: () => Promise<void>;

package/dist/react/index.js

@@ -120,6 +120,17 @@ var WalletAdapter = class extends EventEmitter__default.default {
     this.state = "disconnected" /* DISCONNECTED */;
     this.currentAccount = null;
   }
+  /**
+   * Get the signer's address (implements ISigner interface)
+   * Returns the native address of the current account
+   */
+  async getAddress() {
+    this.ensureConnected();
+    if (!this.currentAccount) {
+      throw new WalletNotConnectedError(this.type);
+    }
+    return this.currentAccount.nativeAddress;
+  }
   signTransaction(_transaction) {
     throw new MethodNotSupportedError("signTransaction", this.type);
   }
@@ -1480,9 +1491,6 @@ var WalletManager = class extends TypedEventEmitter {
       walletConnectProjectId: config.walletConnectProjectId ?? ""
     };
     this.registry = new AdapterRegistry();
-    if (this.config.enableStorage) {
-      this.restoreFromStorage();
-    }
   }
   // ===== Connection Management =====
   /**
@@ -1593,13 +1601,13 @@ var WalletManager = class extends TypedEventEmitter {
     return adapter.currentAccount;
   }
   /**
-   * 获取主钱包账户
+   * Get primary wallet account
    */
   getPrimaryAccount() {
     return this.primaryWallet?.currentAccount || null;
   }
   /**
-   * 获取所有已连接的钱包
+   * Get all connected wallets
    */
   getConnectedWallets() {
     return Array.from(this.connectedWallets.values()).map((adapter) => ({
@@ -1612,14 +1620,14 @@ var WalletManager = class extends TypedEventEmitter {
     }));
   }
   /**
-   * 根据链类型获取钱包
+   * Get wallet by chain type
    */
   getWalletByChainType(chainType) {
     return this.connectedWallets.get(chainType) || null;
   }
-  // ===== 签名 =====
+  // ===== Signing =====
   /**
-   * 使用主钱包签名
+   * Sign message with primary wallet
    */
   async signMessage(message) {
     if (!this.primaryWallet) {
@@ -1628,7 +1636,7 @@ var WalletManager = class extends TypedEventEmitter {
     return this.primaryWallet.signMessage(message);
   }
   /**
-   * 使用指定链类型的钱包签名
+   * Sign message with wallet of specified chain type
    */
   async signMessageWithChainType(message, chainType) {
     if (!chainType) {
@@ -1641,7 +1649,7 @@ var WalletManager = class extends TypedEventEmitter {
     return adapter.signMessage(message);
   }
   /**
-   * 签名 TypedData（仅 EVM）
+   * Sign TypedData (EVM only)
    */
   async signTypedData(typedData, chainType) {
     const adapter = chainType ? this.connectedWallets.get(chainType) : this.primaryWallet;
@@ -1654,7 +1662,7 @@ var WalletManager = class extends TypedEventEmitter {
     return adapter.signTypedData(typedData);
   }
   /**
-   * 签名交易（使用主钱包）
+   * Sign transaction (with primary wallet)
    */
   async signTransaction(transaction) {
     if (!this.primaryWallet) {
@@ -1666,7 +1674,7 @@ var WalletManager = class extends TypedEventEmitter {
     return this.primaryWallet.signTransaction(transaction);
   }
   /**
-   * 使用指定链类型的钱包签名交易
+   * Sign transaction with wallet of specified chain type
    */
   async signTransactionWithChainType(transaction, chainType) {
     if (!chainType) {
@@ -1681,9 +1689,9 @@ var WalletManager = class extends TypedEventEmitter {
     }
     return adapter.signTransaction(transaction);
   }
-  // ===== 链切换 =====
+  // ===== Chain Switching =====
   /**
-   * 请求切换链（仅 EVM）
+   * Request chain switch (EVM only)
    */
   async requestSwitchChain(chainId, options) {
     if (!this.primaryWallet) {
@@ -1704,9 +1712,9 @@ var WalletManager = class extends TypedEventEmitter {
       throw error;
     }
   }
-  // ===== 合约调用 =====
+  // ===== Contract Calls =====
   /**
-   * 读取合约
+   * Read contract
    */
   async readContract(address, abi, functionName, args, chainType) {
     const adapter = chainType ? this.connectedWallets.get(chainType) : this.primaryWallet;
@@ -1719,7 +1727,7 @@ var WalletManager = class extends TypedEventEmitter {
     return adapter.readContract({ address, abi, functionName, args });
   }
   /**
-   * 写入合约
+   * Write contract
    */
   async writeContract(address, abi, functionName, args, options, chainType) {
     const adapter = chainType ? this.connectedWallets.get(chainType) : this.primaryWallet;
@@ -1738,7 +1746,7 @@ var WalletManager = class extends TypedEventEmitter {
     });
   }
   /**
-   * 估算 Gas
+   * Estimate gas
    */
   async estimateGas(address, abi, functionName, args, chainType) {
     const adapter = chainType ? this.connectedWallets.get(chainType) : this.primaryWallet;
@@ -1751,7 +1759,7 @@ var WalletManager = class extends TypedEventEmitter {
     return adapter.estimateGas({ address, abi, functionName, args });
   }
   /**
-   * 等待交易确认
+   * Wait for transaction confirmation
    */
   async waitForTransaction(txHash, confirmations, chainType) {
     const adapter = chainType ? this.connectedWallets.get(chainType) : this.primaryWallet;
@@ -1763,9 +1771,9 @@ var WalletManager = class extends TypedEventEmitter {
     }
     return adapter.waitForTransaction(txHash, confirmations);
   }
-  // ===== Provider 访问 =====
+  // ===== Provider Access =====
   /**
-   * 获取主钱包 Provider
+   * Get primary wallet Provider
    */
   getProvider() {
     if (!this.primaryWallet) {
@@ -1774,7 +1782,7 @@ var WalletManager = class extends TypedEventEmitter {
     return this.primaryWallet.getProvider();
   }
   /**
-   * 获取指定链类型的 Provider
+   * Get Provider by chain type
    */
   getProviderByChainType(chainType) {
     const adapter = this.connectedWallets.get(chainType);
@@ -1783,21 +1791,21 @@ var WalletManager = class extends TypedEventEmitter {
     }
     return adapter.getProvider();
   }
-  // ===== 私有方法 =====
+  // ===== Private Methods =====
   /**
-   * 设置主钱包
+   * Set primary wallet
    */
   setPrimaryWallet(adapter) {
     this.primaryWallet = adapter;
   }
   /**
-   * 判断钱包是否支持链切换
+   * Check if wallet supports chain switching
    */
   canSwitchChain(adapter) {
     return !!adapter.switchChain;
   }
   /**
-   * 设置适配器事件监听
+   * Setup adapter event listeners
    */
   setupAdapterListeners(adapter, isPrimary) {
     adapter.on("accountChanged", (account) => {
@@ -1838,15 +1846,15 @@ var WalletManager = class extends TypedEventEmitter {
     });
   }
   /**
-   * 移除适配器事件监听
+   * Remove adapter event listeners
    */
   removeAdapterListeners(adapter) {
     if (!adapter) return;
     adapter.removeAllListeners();
   }
-  // ===== 存储 =====
+  // ===== Storage =====
   /**
-   * 保存到存储
+   * Save to storage
    */
   saveToStorage() {
     if (typeof window === "undefined" || !this.config.enableStorage) {
@@ -1854,6 +1862,8 @@ var WalletManager = class extends TypedEventEmitter {
     }
     const data = {
       current: this.primaryWallet?.currentAccount?.universalAddress || null,
+      primaryWalletType: this.primaryWallet?.type,
+      primaryChainId: this.primaryWallet?.currentAccount?.chainId,
       history: this.getHistoryRecords()
     };
     try {
@@ -1866,12 +1876,101 @@ var WalletManager = class extends TypedEventEmitter {
     }
   }
   /**
-   * 从存储恢复
+   * Restore from storage
+   * Returns a Promise that can be used for auto-reconnection
    */
-  restoreFromStorage() {
+  async restoreFromStorage() {
+    if (typeof window === "undefined" || !this.config.enableStorage) {
+      return null;
+    }
+    try {
+      const stored = localStorage.getItem(`${this.config.storagePrefix}data`);
+      if (!stored) {
+        console.debug("[WalletManager] No stored wallet data found");
+        return null;
+      }
+      const data = JSON.parse(stored);
+      console.debug("[WalletManager] Restoring from storage:", data);
+      if (!data.primaryWalletType || !data.current) {
+        console.debug("[WalletManager] Missing primary wallet info in storage");
+        return null;
+      }
+      const adapter = this.registry.getAdapter(data.primaryWalletType);
+      if (!adapter) {
+        console.debug("[WalletManager] Adapter not found for type:", data.primaryWalletType);
+        return null;
+      }
+      const isAvailable = await adapter.isAvailable();
+      if (!isAvailable) {
+        console.debug("[WalletManager] Wallet not available:", data.primaryWalletType);
+        return null;
+      }
+      console.debug("[WalletManager] Wallet is available, attempting restoration");
+      if (adapter.chainType === ChainType.EVM && data.primaryWalletType === "metamask" /* METAMASK */) {
+        try {
+          const provider = typeof window !== "undefined" ? window.ethereum : null;
+          if (provider) {
+            const accounts = await provider.request({
+              method: "eth_accounts"
+            });
+            console.debug("[WalletManager] Checking authorized accounts:", accounts);
+            if (accounts && accounts.length > 0) {
+              const savedAddress = data.current.split(":")[1];
+              const currentAddress = accounts[0].toLowerCase();
+              console.debug("[WalletManager] Comparing addresses - saved:", savedAddress, "current:", currentAddress);
+              if (currentAddress === savedAddress.toLowerCase()) {
+                console.debug("[WalletManager] Address matches, attempting connect (should be silent if already authorized)");
+                try {
+                  const account2 = await adapter.connect(data.primaryChainId);
+                  this.setPrimaryWallet(adapter);
+                  this.connectedWallets.set(adapter.chainType, adapter);
+                  this.setupAdapterListeners(adapter, true);
+                  this.emit("accountChanged", account2);
+                  console.debug("[WalletManager] Connect successful");
+                  return account2;
+                } catch (connectError) {
+                  console.debug("[WalletManager] Connect failed (might be user rejection):", connectError?.message);
+                  return null;
+                }
+              } else {
+                console.debug("[WalletManager] Address mismatch, will try normal connect");
+              }
+            } else {
+              console.debug("[WalletManager] No authorized accounts found");
+            }
+          }
+        } catch (silentError) {
+          console.debug("Silent connection failed, trying normal connection:", silentError);
+        }
+      }
+      if (adapter.chainType === ChainType.TRON && data.primaryWalletType === "tronlink" /* TRONLINK */) {
+        try {
+          const tronWeb = adapter.getTronWeb?.();
+          if (tronWeb && tronWeb.defaultAddress?.base58) {
+            const account2 = await adapter.connect(data.primaryChainId);
+            this.setPrimaryWallet(adapter);
+            this.connectedWallets.set(adapter.chainType, adapter);
+            this.setupAdapterListeners(adapter, true);
+            this.emit("accountChanged", account2);
+            return account2;
+          }
+        } catch (silentError) {
+          console.debug("Silent TronLink connection failed:", silentError);
+        }
+      }
+      const account = await adapter.connect(data.primaryChainId);
+      this.setPrimaryWallet(adapter);
+      this.connectedWallets.set(adapter.chainType, adapter);
+      this.setupAdapterListeners(adapter, true);
+      this.emit("accountChanged", account);
+      return account;
+    } catch (error) {
+      console.debug("Failed to restore wallet from storage:", error);
+      return null;
+    }
   }
   /**
-   * 清除存储
+   * Clear storage
    */
   clearStorage() {
     if (typeof window === "undefined") {
@@ -1884,7 +1983,7 @@ var WalletManager = class extends TypedEventEmitter {
     }
   }
   /**
-   * 获取历史记录
+   * Get history records
    */
   getHistoryRecords() {
     const records = [];
@@ -1911,6 +2010,7 @@ function WalletProvider({ children, walletManager: externalWalletManager }) {
   const [walletManager] = React.useState(() => externalWalletManager || new WalletManager());
   const [account, setAccount] = React.useState(null);
   const [connectedWallets, setConnectedWallets] = React.useState([]);
+  const [isRestoring, setIsRestoring] = React.useState(true);
   const updateConnectedWallets = React.useCallback(() => {
     setConnectedWallets(walletManager.getConnectedWallets());
   }, [walletManager]);
@@ -1942,6 +2042,22 @@ function WalletProvider({ children, walletManager: externalWalletManager }) {
   const signTransaction = React.useCallback(async (transaction) => {
     return walletManager.signTransaction(transaction);
   }, [walletManager]);
+  React.useEffect(() => {
+    const restoreConnection = async () => {
+      try {
+        const restoredAccount = await walletManager.restoreFromStorage();
+        if (restoredAccount) {
+          setAccount(restoredAccount);
+          updateConnectedWallets();
+        }
+      } catch (error) {
+        console.debug("Failed to restore wallet connection:", error);
+      } finally {
+        setIsRestoring(false);
+      }
+    };
+    restoreConnection();
+  }, [walletManager, updateConnectedWallets]);
   React.useEffect(() => {
     const handleAccountChanged = (newAccount) => {
       setAccount(newAccount);
@@ -1963,20 +2079,26 @@ function WalletProvider({ children, walletManager: externalWalletManager }) {
     walletManager.on("chainChanged", handleChainChanged);
     walletManager.on("disconnected", handleDisconnected);
     walletManager.on("primaryWalletSwitched", handlePrimaryWalletSwitched);
-    setAccount(walletManager.getPrimaryAccount());
-    updateConnectedWallets();
+    if (!isRestoring) {
+      const primaryAccount = walletManager.getPrimaryAccount();
+      if (primaryAccount) {
+        setAccount(primaryAccount);
+        updateConnectedWallets();
+      }
+    }
     return () => {
       walletManager.off("accountChanged", handleAccountChanged);
       walletManager.off("chainChanged", handleChainChanged);
       walletManager.off("disconnected", handleDisconnected);
       walletManager.off("primaryWalletSwitched", handlePrimaryWalletSwitched);
     };
-  }, [walletManager, updateConnectedWallets]);
+  }, [walletManager, updateConnectedWallets, isRestoring]);
   const value = {
     walletManager,
     account,
     isConnected: account !== null,
     connectedWallets,
+    isRestoring,
     connect,
     connectAdditional,
     disconnect,