chore(hardware-trezor): apply requested changes

Author: tomislavhoracek

packages/hardware-trezor/src/transformers/keyPaths.ts

@@ -1,7 +1,7 @@
 import { BIP32Path } from '@cardano-sdk/crypto';
 import { Cardano } from '@cardano-sdk/core';
+import { GroupedAddress, TxInId, util } from '@cardano-sdk/key-management';
 import { TrezorTxTransformerContext } from '../types';
-import { TxInId, util } from '@cardano-sdk/key-management';
 
 /** Uses the given Trezor input resolver to resolve the payment key path for known addresses for given input transaction. */
 export const resolvePaymentKeyPathForTxIn = (
@@ -16,12 +16,10 @@ export const resolvePaymentKeyPathForTxIn = (
 };
 
 export const resolveStakeKeyPath = (
-  rewardAddress: Cardano.RewardAddress | undefined,
-  context?: TrezorTxTransformerContext
+  rewardAddress: Cardano.RewardAddress,
+  knownAddresses: GroupedAddress[]
 ): BIP32Path | null => {
-  if (!rewardAddress) return null;
-
-  const knownAddress = context?.knownAddresses.find(
+  const knownAddress = knownAddresses.find(
     ({ rewardAccount }) => rewardAccount === rewardAddress.toAddress().toBech32()
   );
   return util.stakeKeyPathFromGroupedAddress(knownAddress);

packages/hardware-trezor/src/transformers/withdrawals.ts

@@ -22,7 +22,7 @@ export const toTrezorWithdrawal: Transform<Cardano.Withdrawal, Trezor.CardanoWit
    * - The script hash, blake2b-224 hash digests of serialized monetary scripts.
    */
   if (rewardAddress.getPaymentCredential().type === Cardano.CredentialType.KeyHash) {
-    const keyPath = resolveStakeKeyPath(rewardAddress, context);
+    const keyPath = context?.knownAddresses ? resolveStakeKeyPath(rewardAddress, context.knownAddresses) : null;
     trezorWithdrawal = keyPath
       ? {
           amount: withdrawal.quantity.toString(),

packages/hardware-trezor/test/testData.ts

@@ -115,7 +115,7 @@ export const txOutWithReferenceScriptAndInlineDatum: Cardano.TxOut = {
 export const rewardKey = 'stake1u89sasnfyjtmgk8ydqfv3fdl52f36x3djedfnzfc9rkgzrcss5vgr';
 export const rewardScript = 'stake178phkx6acpnf78fuvxn0mkew3l0fd058hzquvz7w36x4gtcccycj5';
 export const rewardAccount = Cardano.RewardAccount(rewardKey);
-export const rewardAddress = Cardano.Address.fromBech32(rewardAccount)?.asReward();
+export const rewardAddress = Cardano.Address.fromBech32(rewardAccount)?.asReward() as Cardano.RewardAddress;
 export const rewardAccountWithPaymentScriptCredential = Cardano.RewardAccount(rewardScript);
 export const stakeKeyHash = Cardano.RewardAccount.toHash(rewardAccount);
 export const stakeCredential = {

packages/hardware-trezor/test/transformers/keyPaths.test.ts

@@ -22,7 +22,9 @@ describe('key-paths', () => {
   });
   describe('resolveStakeKeyPath', () => {
     it('returns the stake key path for a known address', async () => {
-      expect(resolveStakeKeyPath(rewardAddress, contextWithKnownAddresses)).toEqual(knownAddressStakeKeyPath);
+      expect(resolveStakeKeyPath(rewardAddress, contextWithKnownAddresses.knownAddresses)).toEqual(
+        knownAddressStakeKeyPath
+      );
     });
   });
 });