version b

packages/hardware-ledger/src/LedgerKeyAgent.ts

@@ -168,11 +168,10 @@ const isMultiSig = (tx: Transaction): boolean => {
   return result;
 };
 
-type LedgerConnectionWithCommunicationTypeAndDevicePath = {
-  communicationType: CommunicationType;
-  device?: LedgerDevice;
+type DeviceConnectionWithInitializationParams = {
   deviceConnection: LedgerConnection;
-  nodeHidDevicePath?: string;
+  communicationType: CommunicationType;
+  nodeHidDevicePathOrDevice: LedgerDevice | string | undefined;
 };
 
 type OpenTransportForDeviceParams = {
@@ -183,7 +182,7 @@ type OpenTransportForDeviceParams = {
 export class LedgerKeyAgent extends KeyAgentBase {
   readonly deviceConnection?: LedgerConnection;
   readonly #communicationType: CommunicationType;
-  static deviceConnections: LedgerConnectionWithCommunicationTypeAndDevicePath[] = [];
+  static deviceConnections: DeviceConnectionWithInitializationParams[] = [];
 
   constructor({ deviceConnection, ...serializableData }: LedgerKeyAgentProps, dependencies: KeyAgentDependencies) {
     super({ ...serializableData, __typename: KeyAgentType.Ledger }, dependencies);
@@ -193,14 +192,12 @@ export class LedgerKeyAgent extends KeyAgentBase {
 
   private static async findConnectionByCommunicationTypeAndDevicePath(
     communicationType: CommunicationType,
-    nodeHidDevicePath?: string,
-    device?: LedgerDevice
+    nodeHidDevicePathOrDevice?: LedgerDevice | string
   ): Promise<LedgerConnection | null> {
     const matchingConnectionData = this.deviceConnections?.find(
       (connection) =>
         connection.communicationType === communicationType &&
-        connection.nodeHidDevicePath === nodeHidDevicePath &&
-        connection.device === device
+        connection.nodeHidDevicePathOrDevice === nodeHidDevicePathOrDevice
     );
     if (!matchingConnectionData) return null;
 
@@ -331,8 +328,7 @@ export class LedgerKeyAgent extends KeyAgentBase {
 
     const matchingOpenConnection = await this.findConnectionByCommunicationTypeAndDevicePath(
       communicationType,
-      nodeHidDevicePath,
-      device
+      nodeHidDevicePathOrDevice
     );
     if (matchingOpenConnection) return matchingOpenConnection;
 
@@ -352,9 +348,8 @@ export class LedgerKeyAgent extends KeyAgentBase {
       const newConnection = await LedgerKeyAgent.createDeviceConnection(transport);
       this.deviceConnections.push({
         communicationType,
-        device,
         deviceConnection: newConnection,
-        nodeHidDevicePath
+        nodeHidDevicePathOrDevice
       });
 
       return newConnection;