@enclave-hq/wallet-sdk 1.1.3 → 1.1.5

package/dist/index.d.mts

@@ -37,7 +37,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$1;
     readonly name: string;
@@ -150,6 +154,8 @@ interface WalletHistoryRecord {
 }
 interface StorageData {
     current: UniversalAddress | null;
+    primaryWalletType?: WalletType;
+    primaryChainId?: number;
     history: WalletHistoryRecord[];
 }
 interface WalletAvailability {
@@ -199,7 +205,7 @@ declare class WalletManager extends TypedEventEmitter<WalletManagerEvents> {
     private setupAdapterListeners;
     private removeAdapterListeners;
     private saveToStorage;
-    private restoreFromStorage;
+    restoreFromStorage(): Promise<Account | null>;
     private clearStorage;
     private getHistoryRecords;
 }
@@ -259,6 +265,7 @@ declare abstract class WalletAdapter extends EventEmitter implements IWalletAdap
     abstract disconnect(): Promise<void>;
     abstract isAvailable(): Promise<boolean>;
     abstract signMessage(message: string): Promise<string>;
+    getAddress(): Promise<string>;
     signTransaction?(_transaction: any): Promise<string>;
     signTypedData?(_typedData: any): Promise<string>;
     switchChain?(_chainId: number): Promise<void>;
@@ -463,4 +470,4 @@ declare function hexToNumber(hex: string): number;
 declare function ensureHexPrefix(value: string): string;
 declare function removeHexPrefix(value: string): string;
 
-export { type Account, AdapterRegistry, type AddChainParams, AuthMessageGenerator, type AuthMessageParams, BrowserWalletAdapter, CHAIN_INFO, type ChainInfo, ChainNotSupportedError, ChainType$1 as ChainType, ConfigurationError, type ConnectedWallet, ConnectionRejectedError, type ContractReadParams, type ContractWriteParams, EVMPrivateKeyAdapter, type EVMTransaction, type IWalletAdapter, MetaMaskAdapter, MethodNotSupportedError, NetworkError, SUPPORTED_WALLETS, SignatureRejectedError, SignatureVerifier, type StorageData, type Transaction, TransactionFailedError, type TransactionReceipt, TronLinkAdapter, type TronTransaction, type UniversalAddress, WalletAdapter, type WalletAvailability, WalletDetector, type WalletHistoryRecord, WalletManager, type WalletManagerConfig, type WalletManagerEvents, type WalletMetadata, WalletNotAvailableError, WalletNotConnectedError, WalletSDKError, WalletState, WalletType, compareEVMAddresses, compareTronAddresses, compareUniversalAddresses, createUniversalAddress, WalletManager as default, ensureHexPrefix, formatEVMAddress, fromHex, getAddressFromUniversalAddress, getChainIdFromUniversalAddress, getChainInfo, getChainType, getEVMWallets, getTronWallets, getWalletMetadata, hexToNumber, isEVMChain, isHex, isTronChain, isValidChainId, isValidEVMAddress, isValidSignature, isValidTransactionHash, isValidTronAddress, isValidTronHexAddress, isValidUniversalAddress, numberToHex, parseUniversalAddress, removeHexPrefix, shortenAddress, shortenTronAddress, toHex, validateAddress, validateAddressForChain };
+export { type Account, AdapterRegistry, type AddChainParams, AuthMessageGenerator, type AuthMessageParams, BrowserWalletAdapter, CHAIN_INFO, type ChainInfo, ChainNotSupportedError, ChainType$1 as ChainType, ConfigurationError, type ConnectedWallet, ConnectionRejectedError, type ContractReadParams, type ContractWriteParams, EVMPrivateKeyAdapter, type EVMTransaction, type ISigner, type IWalletAdapter, MetaMaskAdapter, MethodNotSupportedError, NetworkError, SUPPORTED_WALLETS, SignatureRejectedError, SignatureVerifier, type StorageData, type Transaction, TransactionFailedError, type TransactionReceipt, TronLinkAdapter, type TronTransaction, type UniversalAddress, WalletAdapter, type WalletAvailability, WalletDetector, type WalletHistoryRecord, WalletManager, type WalletManagerConfig, type WalletManagerEvents, type WalletMetadata, WalletNotAvailableError, WalletNotConnectedError, WalletSDKError, WalletState, WalletType, compareEVMAddresses, compareTronAddresses, compareUniversalAddresses, createUniversalAddress, WalletManager as default, ensureHexPrefix, formatEVMAddress, fromHex, getAddressFromUniversalAddress, getChainIdFromUniversalAddress, getChainInfo, getChainType, getEVMWallets, getTronWallets, getWalletMetadata, hexToNumber, isEVMChain, isHex, isTronChain, isValidChainId, isValidEVMAddress, isValidSignature, isValidTransactionHash, isValidTronAddress, isValidTronHexAddress, isValidUniversalAddress, numberToHex, parseUniversalAddress, removeHexPrefix, shortenAddress, shortenTronAddress, toHex, validateAddress, validateAddressForChain };

package/dist/index.d.ts

@@ -37,7 +37,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$1;
     readonly name: string;
@@ -150,6 +154,8 @@ interface WalletHistoryRecord {
 }
 interface StorageData {
     current: UniversalAddress | null;
+    primaryWalletType?: WalletType;
+    primaryChainId?: number;
     history: WalletHistoryRecord[];
 }
 interface WalletAvailability {
@@ -199,7 +205,7 @@ declare class WalletManager extends TypedEventEmitter<WalletManagerEvents> {
     private setupAdapterListeners;
     private removeAdapterListeners;
     private saveToStorage;
-    private restoreFromStorage;
+    restoreFromStorage(): Promise<Account | null>;
     private clearStorage;
     private getHistoryRecords;
 }
@@ -259,6 +265,7 @@ declare abstract class WalletAdapter extends EventEmitter implements IWalletAdap
     abstract disconnect(): Promise<void>;
     abstract isAvailable(): Promise<boolean>;
     abstract signMessage(message: string): Promise<string>;
+    getAddress(): Promise<string>;
     signTransaction?(_transaction: any): Promise<string>;
     signTypedData?(_typedData: any): Promise<string>;
     switchChain?(_chainId: number): Promise<void>;
@@ -463,4 +470,4 @@ declare function hexToNumber(hex: string): number;
 declare function ensureHexPrefix(value: string): string;
 declare function removeHexPrefix(value: string): string;
 
-export { type Account, AdapterRegistry, type AddChainParams, AuthMessageGenerator, type AuthMessageParams, BrowserWalletAdapter, CHAIN_INFO, type ChainInfo, ChainNotSupportedError, ChainType$1 as ChainType, ConfigurationError, type ConnectedWallet, ConnectionRejectedError, type ContractReadParams, type ContractWriteParams, EVMPrivateKeyAdapter, type EVMTransaction, type IWalletAdapter, MetaMaskAdapter, MethodNotSupportedError, NetworkError, SUPPORTED_WALLETS, SignatureRejectedError, SignatureVerifier, type StorageData, type Transaction, TransactionFailedError, type TransactionReceipt, TronLinkAdapter, type TronTransaction, type UniversalAddress, WalletAdapter, type WalletAvailability, WalletDetector, type WalletHistoryRecord, WalletManager, type WalletManagerConfig, type WalletManagerEvents, type WalletMetadata, WalletNotAvailableError, WalletNotConnectedError, WalletSDKError, WalletState, WalletType, compareEVMAddresses, compareTronAddresses, compareUniversalAddresses, createUniversalAddress, WalletManager as default, ensureHexPrefix, formatEVMAddress, fromHex, getAddressFromUniversalAddress, getChainIdFromUniversalAddress, getChainInfo, getChainType, getEVMWallets, getTronWallets, getWalletMetadata, hexToNumber, isEVMChain, isHex, isTronChain, isValidChainId, isValidEVMAddress, isValidSignature, isValidTransactionHash, isValidTronAddress, isValidTronHexAddress, isValidUniversalAddress, numberToHex, parseUniversalAddress, removeHexPrefix, shortenAddress, shortenTronAddress, toHex, validateAddress, validateAddressForChain };
+export { type Account, AdapterRegistry, type AddChainParams, AuthMessageGenerator, type AuthMessageParams, BrowserWalletAdapter, CHAIN_INFO, type ChainInfo, ChainNotSupportedError, ChainType$1 as ChainType, ConfigurationError, type ConnectedWallet, ConnectionRejectedError, type ContractReadParams, type ContractWriteParams, EVMPrivateKeyAdapter, type EVMTransaction, type ISigner, type IWalletAdapter, MetaMaskAdapter, MethodNotSupportedError, NetworkError, SUPPORTED_WALLETS, SignatureRejectedError, SignatureVerifier, type StorageData, type Transaction, TransactionFailedError, type TransactionReceipt, TronLinkAdapter, type TronTransaction, type UniversalAddress, WalletAdapter, type WalletAvailability, WalletDetector, type WalletHistoryRecord, WalletManager, type WalletManagerConfig, type WalletManagerEvents, type WalletMetadata, WalletNotAvailableError, WalletNotConnectedError, WalletSDKError, WalletState, WalletType, compareEVMAddresses, compareTronAddresses, compareUniversalAddresses, createUniversalAddress, WalletManager as default, ensureHexPrefix, formatEVMAddress, fromHex, getAddressFromUniversalAddress, getChainIdFromUniversalAddress, getChainInfo, getChainType, getEVMWallets, getTronWallets, getWalletMetadata, hexToNumber, isEVMChain, isHex, isTronChain, isValidChainId, isValidEVMAddress, isValidSignature, isValidTransactionHash, isValidTronAddress, isValidTronHexAddress, isValidUniversalAddress, numberToHex, parseUniversalAddress, removeHexPrefix, shortenAddress, shortenTronAddress, toHex, validateAddress, validateAddressForChain };

package/dist/index.js

@@ -158,6 +158,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);
   }
@@ -1572,9 +1583,6 @@ var WalletManager = class extends TypedEventEmitter {
       walletConnectProjectId: config.walletConnectProjectId ?? ""
     };
     this.registry = new AdapterRegistry();
-    if (this.config.enableStorage) {
-      this.restoreFromStorage();
-    }
   }
   // ===== Connection Management =====
   /**
@@ -1685,13 +1693,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) => ({
@@ -1704,14 +1712,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) {
@@ -1720,7 +1728,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) {
@@ -1733,7 +1741,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;
@@ -1746,7 +1754,7 @@ var WalletManager = class extends TypedEventEmitter {
     return adapter.signTypedData(typedData);
   }
   /**
-   * 签名交易（使用主钱包）
+   * Sign transaction (with primary wallet)
    */
   async signTransaction(transaction) {
     if (!this.primaryWallet) {
@@ -1758,7 +1766,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) {
@@ -1773,9 +1781,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) {
@@ -1796,9 +1804,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;
@@ -1811,7 +1819,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;
@@ -1830,7 +1838,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;
@@ -1843,7 +1851,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;
@@ -1855,9 +1863,9 @@ var WalletManager = class extends TypedEventEmitter {
     }
     return adapter.waitForTransaction(txHash, confirmations);
   }
-  // ===== Provider 访问 =====
+  // ===== Provider Access =====
   /**
-   * 获取主钱包 Provider
+   * Get primary wallet Provider
    */
   getProvider() {
     if (!this.primaryWallet) {
@@ -1866,7 +1874,7 @@ var WalletManager = class extends TypedEventEmitter {
     return this.primaryWallet.getProvider();
   }
   /**
-   * 获取指定链类型的 Provider
+   * Get Provider by chain type
    */
   getProviderByChainType(chainType) {
     const adapter = this.connectedWallets.get(chainType);
@@ -1875,21 +1883,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) => {
@@ -1930,15 +1938,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) {
@@ -1946,6 +1954,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 {
@@ -1958,12 +1968,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") {
@@ -1976,7 +2075,7 @@ var WalletManager = class extends TypedEventEmitter {
     }
   }
   /**
-   * 获取历史记录
+   * Get history records
    */
   getHistoryRecords() {
     const records = [];