fixup! feat(web-extension): support wallet-specific trezorConfig in SigningCoordinator

Author: rhyslbw

packages/web-extension/src/walletManager/SigningCoordinator/SigningCoordinator.ts

@@ -90,11 +90,14 @@ export class SigningCoordinator<WalletMetadata extends {}, AccountMetadata exten
    *    (e.g., derivationType) while inheriting global settings (e.g., communicationType, manifest)
    */
   #getTrezorConfig(wallet: AnyBip32Wallet<WalletMetadata, AccountMetadata>): TrezorConfig {
+    const trezorConfig =
+      wallet.type === WalletType.Trezor && 'trezorConfig' in wallet.metadata
+        ? (wallet.metadata as { trezorConfig?: Partial<TrezorConfig> }).trezorConfig
+        : undefined;
+
     return {
       ...this.#hwOptions, // Global defaults (communicationType, manifest, etc.)
-      ...(wallet.type === WalletType.Trezor && 'trezorConfig' in wallet && wallet.trezorConfig
-        ? wallet.trezorConfig
-        : {}) // Wallet-specific overrides (derivationType, etc.)
+      ...(trezorConfig || {}) // Wallet-specific overrides (derivationType, etc.)
     };
   }
 

packages/web-extension/src/walletManager/types.ts

@@ -29,14 +29,24 @@ export type Bip32Wallet<WalletMetadata extends {}, AccountMetadata extends {}> =
   blockchainName?: Blockchain;
 };
 
-export type HardwareWallet<WalletMetadata extends {}, AccountMetadata extends {}> = Bip32Wallet<
+export type LedgerHardwareWallet<WalletMetadata extends {}, AccountMetadata extends {}> = Bip32Wallet<
   WalletMetadata,
   AccountMetadata
 > & {
-  type: WalletType.Ledger | WalletType.Trezor;
-  trezorConfig?: Partial<TrezorConfig>;
+  type: WalletType.Ledger;
 };
 
+export type TrezorHardwareWallet<
+  WalletMetadata extends { trezorConfig?: Partial<TrezorConfig> },
+  AccountMetadata extends {}
+> = Bip32Wallet<WalletMetadata, AccountMetadata> & {
+  type: WalletType.Trezor;
+};
+
+export type HardwareWallet<WalletMetadata extends {}, AccountMetadata extends {}> =
+  | LedgerHardwareWallet<WalletMetadata, AccountMetadata>
+  | TrezorHardwareWallet<WalletMetadata, AccountMetadata>;
+
 export type InMemoryWallet<WalletMetadata extends {}, AccountMetadata extends {}> = Bip32Wallet<
   WalletMetadata,
   AccountMetadata

packages/web-extension/test/walletManager/SigningCoordinator.test.ts

@@ -6,6 +6,7 @@ import {
   KeyPurpose,
   SignDataContext,
   SignTransactionContext,
+  TrezorConfig,
   cip8,
   errors
 } from '@cardano-sdk/key-management';
@@ -176,12 +177,13 @@ describe('SigningCoordinator', () => {
     });
 
     it('should pass wallet trezorConfig to Trezor key agent factory', async () => {
-      const trezorWallet: HardwareWallet<{}, {}> = {
+      const trezorWallet: HardwareWallet<{ trezorConfig?: Partial<TrezorConfig> }, {}> = {
         accounts: [createAccount(0, 0)],
-        metadata: {},
-        trezorConfig: {
-          communicationType: CommunicationType.Web,
-          derivationType: 'ICARUS_TREZOR'
+        metadata: {
+          trezorConfig: {
+            communicationType: CommunicationType.Web,
+            derivationType: 'ICARUS_TREZOR'
+          }
         },
         type: WalletType.Trezor,
         walletId: Hash28ByteBase16('ad63f855e831d937457afc52a21a7f351137e4a9fff26c217817335a')