chore: 版本问题修复

Yuejian · Yuejian · commit 3aa97eda16a5 · 2026-02-27T11:20:14.000+08:00
diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -45,11 +45,13 @@
   "dependencies": {
     "@ant-design/web3-common": "workspace:*",
     "@ant-design/web3-icons": "workspace:*",
-    "@ledgerhq/device-management-kit": "^0.9.1",
-    "@ledgerhq/device-signer-kit-ethereum": "^1.8.0",
-    "@ledgerhq/device-transport-kit-web-hid": "^1.2.0",
-    "@walletconnect/universal-provider": "^2.14.0",
-    "rxjs": "^7.8.1"
+    "@ledgerhq/device-management-kit": "^1.0.0",
+    "@ledgerhq/device-signer-kit-ethereum": "^1.11.0",
+    "@ledgerhq/device-transport-kit-web-hid": "^1.2.3",
+    "@ledgerhq/context-module": "^1.14.1",
+    "@walletconnect/core": "^2.23.4",
+    "@walletconnect/universal-provider": "^2.23.4",
+    "rxjs": "^7.8.2"
   },
   "devDependencies": {
     "father": "^4.6.2",
diff --git a/packages/ledger/src/ledger/index.tsx b/packages/ledger/src/ledger/index.tsx
@@ -41,6 +41,8 @@ export class Ledger {
   private _getWalletConnectProvider?: () => Promise<any>;
   private _walletConnectAccount?: Account;
   private _sessionDeleteHandler?: () => void;
+  /** 由 provider 注入，用于 signMessage/signTypedData 根据连接类型分支 */
+  private _getConnectType?: () => 'USB' | 'WalletConnect' | undefined;
 
   constructor(name?: string, derivationPath?: string) {
     this.wallet.name = name || 'Ledger';
@@ -57,7 +59,10 @@ export class Ledger {
     this.ethereumSigner = new EthereumSigner();
   }
 
-  public connect = async (returnWhenNoDevice?: boolean) => {
+  /**
+   * USB 连接：发现设备、建立 session、检查 Ethereum app。
+   */
+  public connectUSB = async (returnWhenNoDevice?: boolean) => {
     if (this.availableDevices.devices.length === 0) {
       if (returnWhenNoDevice) {
         throw new LedgerError('NO_DEVICE', 'No available devices to connect');
@@ -172,54 +177,92 @@ export class Ledger {
     }
   };
 
-  public signMessage = async (message: string) => {
-    // Check if using WalletConnect
-    if (this._walletConnectAccount) {
-      return this._signMessageWithWalletConnect(message);
-    }
-
-    // Use hardware wallet signing
+  /**
+   * USB 签名：仅走 USB 通道（personal_sign 或 EIP-712）。
+   * 与 WalletConnect 签名完全独立。
+   */
+  public signWithUSB = async (
+    params: { type: 'message'; message: string } | { type: 'typedData'; typedData: any },
+  ): Promise<any> => {
     if (!this.sessionId) {
       throw new LedgerError(
         'NO_SESSION',
-        'No session ID available. Please connect to Ledger device first.',
+        'No session. Please connect to Ledger device via USB first.',
       );
     }
-    try {
-      return await this.ethereumSigner.signMessage(this.sessionId, this.derivationPath, message);
-    } catch {
-      throw new LedgerError('SIGN_MESSAGE_FAILED', 'Failed to sign message');
-    }
-  };
-
-  public signTypedData = async (typedData: any) => {
-    // Check if using WalletConnect
-    if (this._walletConnectAccount) {
-      return this._signTypedDataWithWalletConnect(typedData);
-    }
-
-    // Use hardware wallet signing
-    if (!this.sessionId) {
-      throw new LedgerError(
-        'NO_SESSION',
-        'No session ID available. Please connect to Ledger device first.',
-      );
+    if (params.type === 'message') {
+      try {
+        return await this.ethereumSigner.signMessage(
+          this.sessionId,
+          this.derivationPath,
+          params.message,
+        );
+      } catch {
+        throw new LedgerError('SIGN_MESSAGE_FAILED', 'Failed to sign message');
+      }
     }
     try {
       return await this.ethereumSigner.signTypedData(
         this.sessionId,
         this.derivationPath,
-        typedData,
+        params.typedData,
       );
     } catch {
       throw new LedgerError('SIGN_TYPED_DATA_FAILED', 'Failed to sign typed data');
     }
   };
 
+  /**
+   * WalletConnect 签名：仅走 WalletConnect 通道（personal_sign 或 EIP-712）。
+   * 与 USB 签名完全独立。
+   */
+  public signWithWalletConnect = async (
+    params: { type: 'message'; message: string } | { type: 'typedData'; typedData: any },
+  ): Promise<any> => {
+    if (params.type === 'message') {
+      return this._signMessageWithWalletConnect(params.message);
+    }
+    return this._signTypedDataWithWalletConnect(params.typedData);
+  };
+
+  /**
+   * 统一签名入口：优先根据 connectType（由 provider 通过 setConnectTypeGetter 注入 latestConnectTypeRef）委托；
+   * 未注入时回退为根据 _walletConnectAccount 判断。
+   */
+  public signMessage = async (message: string) => {
+    const connectType = this._getConnectType?.();
+    const useWalletConnect = connectType === 'WalletConnect' && this._walletConnectAccount;
+    if (useWalletConnect) {
+      return this.signWithWalletConnect({ type: 'message', message });
+    }
+    return this.signWithUSB({ type: 'message', message });
+  };
+
+  /**
+   * 统一签名入口：优先根据 connectType（由 provider 通过 setConnectTypeGetter 注入 latestConnectTypeRef）委托；
+   * 未注入时回退为根据 _walletConnectAccount 判断。
+   */
+  public signTypedData = async (typedData: any) => {
+    const connectType = this._getConnectType?.();
+    const useWalletConnect = connectType === 'WalletConnect' && this._walletConnectAccount;
+    if (useWalletConnect) {
+      return this.signWithWalletConnect({ type: 'typedData', typedData });
+    }
+    return this.signWithUSB({ type: 'typedData', typedData });
+  };
+
+  /** 由 provider 注入 latestConnectTypeRef 的 getter，用于签名分支判断 */
+  public setConnectTypeGetter = (getter: () => 'USB' | 'WalletConnect' | undefined) => {
+    this._getConnectType = getter;
+  };
+
   public setWalletConnectProviderGetter = (providerGetter: () => Promise<any>) => {
     this._getWalletConnectProvider = providerGetter;
   };
 
+  /**
+   * WalletConnect 连接：配对/复用 session、解析账户。
+   */
   public connectWalletConnect = async () => {
     if (!this._getWalletConnectProvider) {
       throw new LedgerError('WALLETCONNECT_NOT_CONFIGURED', 'WalletConnect is not configured');
diff --git a/packages/ledger/src/provider/LedgerAddressIndexModal.tsx b/packages/ledger/src/provider/LedgerAddressIndexModal.tsx
@@ -94,7 +94,7 @@ export const LedgerAddressIndexModal: FC<LedgerAddressIndexModalProps> = ({
           Confirm
         </Button>,
       ]}
-      destroyOnClose
+      destroyOnHidden
       maskClosable={false}
     >
       <div style={{ marginBottom: 16 }}>
diff --git a/packages/ledger/src/provider/index.tsx b/packages/ledger/src/provider/index.tsx
@@ -61,7 +61,11 @@ export const LedgerWeb3ConfigProvider: FC<PropsWithChildren<LedgerWeb3ConfigProv
   const accountRef = useRef(account);
   accountRef.current = account;
 
-  // Set WalletConnect provider getter on ledger instance
+  // Set WalletConnect provider getter and connect type getter on ledger instance
+  useEffect(() => {
+    ledger.setConnectTypeGetter(() => latestConnectTypeRef.current);
+  }, [ledger, latestConnectTypeRef]);
+
   useEffect(() => {
     if (!hasWalletConnect) return;
     ledger.setWalletConnectProviderGetter(getWalletConnectProvider);
@@ -86,7 +90,7 @@ export const LedgerWeb3ConfigProvider: FC<PropsWithChildren<LedgerWeb3ConfigProv
       } else {
         // USB: connect device then show address-index modal (ConnectModal will close)
         await ledger.disconnect();
-        await ledger.connect();
+        await ledger.connectUSB();
         cacheSelectedWallet({ walletName: selected.name, latestConnectType: 'USB' });
         setAwaitingAddressIndex(true);
         return undefined;
@@ -233,7 +237,7 @@ export const LedgerWeb3ConfigProvider: FC<PropsWithChildren<LedgerWeb3ConfigProv
       const addressIndex = savedIndex ?? '0';
       try {
         await ledger.disconnect();
-        await ledger.connect(true);
+        await ledger.connectUSB(true);
         await ledger.setAddressIndex(addressIndex);
         setAccount(ledger.accounts[0]);
       } catch (e: any) {
diff --git a/packages/web3/src/connect-modal/__tests__/basic.test.tsx b/packages/web3/src/connect-modal/__tests__/basic.test.tsx
@@ -138,7 +138,7 @@ describe('ConnectModal with guide', () => {
           }}
           walletList={walletList}
           guide={guide}
-          destroyOnClose={true}
+          destroyOnHidden
           onCancel={() => setOpen(false)}
         />
       );
diff --git a/packages/web3/src/ledger/demos/basic.tsx b/packages/web3/src/ledger/demos/basic.tsx
@@ -81,6 +81,7 @@ const AccountSelector: React.FC = () => {
 
   const handleSignTypedData = async () => {
     try {
+      // 格式需符合 @ledgerhq/device-signer-kit-ethereum 的 TypedData：domain.chainId 为 number
       const typedData = {
         types: {
           EIP712Domain: [
@@ -115,6 +116,8 @@ const AccountSelector: React.FC = () => {
       const signature = await ledger.signTypedData(typedData);
       messageApi.success(`Typed data signed! ${String(signature).slice(0, 20)}...`);
     } catch (error: any) {
+      // 便于排查「无法唤起设备」：若为解析/SDK 错误会在此打出
+      console.error('[handleSignTypedData]', error);
       messageApi.error(`Sign failed: ${error?.message || error}`);
     }
   };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ export const LedgerAddressIndexModal: FC<LedgerAddressIndexModalProps> = ({`
`94`	`94`	`Confirm`
`95`	`95`	`</Button>,`
`96`	`96`	`]}`
`97`		`- destroyOnClose`
	`97`	`+ destroyOnHidden`
`98`	`98`	`maskClosable={false}`
`99`	`99`	`>`
`100`	`100`	`<div style={{ marginBottom: 16 }}>`