Skip to content

Commit 7f5f5ce

Browse files
greatertomigreatertomi
committed
test: fix failing tests
1 parent c21d193 commit 7f5f5ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+450
-191
lines changed

‎packages/cardano-services/test/StakePool/TypeormStakePoolProvider/util.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { validateFuzzyOptions, withTextFilter } from '../../../src/StakePool/Typ
44
describe('TypeormStakePoolProvider utils', () => {
55
describe('validateFuzzyOptions', () => {
66
it('throws if value is not a valid JSON encoded string', () =>
7-
expect(() => validateFuzzyOptions('test')).toThrow('Unexpected token e in JSON at position 1'));
7+
expect(() => validateFuzzyOptions('test')).toThrow(/Unexpected token/));
88
it('throws if value is not an object', () =>
99
expect(() => validateFuzzyOptions('"test"')).toThrow('must be an object'));
1010
it('throws without threshold', () =>

‎packages/hardware-ledger/src/transformers/certificates.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const getCredentialType = (knownAddress: GroupedAddress | undefined) => {
104104
const stakeCredentialMapper = (credential: Cardano.Credential, context: LedgerTxTransformerContext) => {
105105
const knownAddress = getKnownAddress(credential, context);
106106
const credentialType = getCredentialType(knownAddress);
107-
const path = util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
107+
const path = util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context.purpose });
108108

109109
return credentialMapper(credential, credentialType, path);
110110
};
@@ -160,7 +160,7 @@ const getPoolOperatorKeyPath = (
160160
context: LedgerTxTransformerContext
161161
): Ledger.BIP32Path | null => {
162162
const knownAddress = context?.knownAddresses.find((address) => address.rewardAccount === operator);
163-
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
163+
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context.purpose });
164164
};
165165

166166
export const poolRegistrationCertificate: Transform<
@@ -270,7 +270,7 @@ const poolRetirementCertificate: Transform<
270270
)
271271
);
272272

273-
const poolKeyPath = util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
273+
const poolKeyPath = util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context?.purpose });
274274

275275
if (!poolKeyPath) throw new InvalidArgumentError('certificate', 'Missing key matching pool retirement certificate.');
276276

‎packages/hardware-ledger/test/LedgerKeyAgent.test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as Crypto from '@cardano-sdk/crypto';
33
import * as Ledger from '@cardano-foundation/ledgerjs-hw-app-cardano';
44
import { Ada, InvalidDataReason } from '@cardano-foundation/ledgerjs-hw-app-cardano';
55
import { Cardano } from '@cardano-sdk/core';
6-
import { CardanoKeyConst, CommunicationType, util } from '@cardano-sdk/key-management';
6+
import { CardanoKeyConst, CommunicationType, KeyPurpose, util } from '@cardano-sdk/key-management';
77
import { LedgerKeyAgent } from '../src';
88
import { dummyLogger } from 'ts-log';
99
import { poolId, poolParameters, pureAdaTxOut, stakeKeyHash, txIn, txOutWithDatum } from './testData';
@@ -366,6 +366,7 @@ describe('LedgerKeyAgent', () => {
366366
const txId = '0000000000000000000000000000000000000000000000000000000000000000' as unknown as Cardano.TransactionId;
367367
const noAddressesOptions = {
368368
knownAddresses: [],
369+
purpose: KeyPurpose.STANDARD,
369370
txInKeyPathMap: {}
370371
};
371372

@@ -379,7 +380,8 @@ describe('LedgerKeyAgent', () => {
379380
communicationType: CommunicationType.Node,
380381
extendedAccountPublicKey: Crypto.Bip32PublicKeyHex(
381382
'00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
382-
)
383+
),
384+
purpose: KeyPurpose.STANDARD
383385
},
384386
{
385387
bip32Ed25519: new Crypto.SodiumBip32Ed25519(),

‎packages/hardware-ledger/test/transformers/certificates.test.ts

+48-15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* eslint-disable sonarjs/no-duplicate-string */
22
import * as Ledger from '@cardano-foundation/ledgerjs-hw-app-cardano';
33
import {
4-
AccountKeyDerivationPath,
54
AddressType,
65
CardanoKeyConst,
76
GroupedAddress,
7+
KeyPurpose,
88
KeyRole,
99
TxInId,
1010
TxInKeyPathMap,
@@ -22,23 +22,26 @@ import {
2222
} from '../testData';
2323
import { Cardano } from '@cardano-sdk/core';
2424
import { Hash28ByteBase16 } from '@cardano-sdk/crypto';
25-
import { LedgerTxTransformerContext } from '../../src';
26-
import { getKnownAddress, mapCerts } from '../../src/transformers/certificates';
25+
import { LedgerTxTransformerContext, getKnownAddress, mapCerts } from '../../src';
2726

2827
export const stakeKeyPath = {
2928
index: 0,
29+
purpose: KeyPurpose.STANDARD,
3030
role: KeyRole.Stake
3131
};
32-
const createGroupedAddress = (
33-
address: Cardano.PaymentAddress,
34-
rewardAccount: Cardano.RewardAccount,
35-
type: AddressType,
36-
index: number,
37-
stakeKeyDerivationPath: AccountKeyDerivationPath
38-
): GroupedAddress =>
32+
33+
const createGroupedAddress = ({
34+
address,
35+
rewardAccount,
36+
stakeKeyDerivationPath,
37+
index,
38+
purpose,
39+
type
40+
}: Omit<GroupedAddress, 'networkId' | 'accountIndex'>): GroupedAddress =>
3941
({
4042
address,
4143
index,
44+
purpose,
4245
rewardAccount,
4346
stakeKeyDerivationPath,
4447
type
@@ -64,6 +67,7 @@ export const createTxInKeyPathMapMock = (knownAddresses: GroupedAddress[]): TxIn
6467
const txInId: TxInId = `MockTxIn_${index}` as TxInId; // Mock TxInId creation
6568
result[txInId] = {
6669
index: address.index,
70+
purpose: address.purpose,
6771
role: KeyRole.Internal
6872
};
6973
}
@@ -78,13 +82,42 @@ const mockContext: LedgerTxTransformerContext = {
7882
handleResolutions: [],
7983

8084
knownAddresses: [
81-
createGroupedAddress(address1, ownRewardAccount, AddressType.External, 0, stakeKeyPath),
82-
createGroupedAddress(address2, ownRewardAccount, AddressType.External, 1, stakeKeyPath)
85+
createGroupedAddress({
86+
address: address1,
87+
index: 0,
88+
purpose: KeyPurpose.STANDARD,
89+
rewardAccount: ownRewardAccount,
90+
stakeKeyDerivationPath: stakeKeyPath,
91+
type: AddressType.External
92+
}),
93+
createGroupedAddress({
94+
address: address2,
95+
index: 1,
96+
purpose: KeyPurpose.STANDARD,
97+
rewardAccount: ownRewardAccount,
98+
stakeKeyDerivationPath: stakeKeyPath,
99+
type: AddressType.External
100+
})
83101
],
102+
purpose: KeyPurpose.STANDARD,
84103
sender: undefined,
85104
txInKeyPathMap: createTxInKeyPathMapMock([
86-
createGroupedAddress(address1, ownRewardAccount, AddressType.External, 0, stakeKeyPath),
87-
createGroupedAddress(address2, ownRewardAccount, AddressType.External, 1, stakeKeyPath)
105+
createGroupedAddress({
106+
address: address1,
107+
index: 0,
108+
purpose: KeyPurpose.STANDARD,
109+
rewardAccount: ownRewardAccount,
110+
stakeKeyDerivationPath: stakeKeyPath,
111+
type: AddressType.External
112+
}),
113+
createGroupedAddress({
114+
address: address2,
115+
index: 1,
116+
purpose: KeyPurpose.STANDARD,
117+
rewardAccount: ownRewardAccount,
118+
stakeKeyDerivationPath: stakeKeyPath,
119+
type: AddressType.External
120+
})
88121
])
89122
};
90123

@@ -140,7 +173,7 @@ describe('certificates', () => {
140173
params: {
141174
stakeCredential: {
142175
keyPath: [
143-
util.harden(CardanoKeyConst.PURPOSE),
176+
util.harden(KeyPurpose.STANDARD),
144177
util.harden(CardanoKeyConst.COIN_TYPE),
145178
util.harden(0),
146179
KeyRole.Stake,

‎packages/hardware-ledger/test/transformers/collateralInputs.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CONTEXT_WITH_KNOWN_ADDRESSES, txIn } from '../testData';
2-
import { CardanoKeyConst, TxInId, util } from '@cardano-sdk/key-management';
2+
import { CardanoKeyConst, KeyPurpose, TxInId, util } from '@cardano-sdk/key-management';
33
import { mapCollateralTxIns } from '../../src/transformers';
44

55
describe('collateralInputs', () => {
@@ -12,6 +12,7 @@ describe('collateralInputs', () => {
1212
it('can map a a set of collateral inputs', async () => {
1313
const keyPath = {
1414
index: 0,
15+
purpose: KeyPurpose.STANDARD,
1516
role: 1
1617
};
1718
const txIns = mapCollateralTxIns([txIn, txIn, txIn], {

‎packages/hardware-ledger/test/transformers/txIn.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { CONTEXT_WITHOUT_KNOWN_ADDRESSES, CONTEXT_WITH_KNOWN_ADDRESSES, txIn } from '../testData';
2-
import { CardanoKeyConst, TxInId, util } from '@cardano-sdk/key-management';
3-
import { mapTxIns, toTxIn } from '../../src/transformers';
2+
import { CardanoKeyConst, KeyPurpose, TxInId, util } from '@cardano-sdk/key-management';
3+
import { mapTxIns, toTxIn } from '../../src';
44

55
describe('txIn', () => {
6-
const paymentKeyPath = { index: 0, role: 1 };
6+
const paymentKeyPath = { index: 0, purpose: KeyPurpose.STANDARD, role: 1 };
77

88
describe('mapTxIns', () => {
99
it('can map a a set of TxIns', async () => {
@@ -52,7 +52,7 @@ describe('txIn', () => {
5252
expect(ledgerTxIn).toEqual({
5353
outputIndex: txIn.index,
5454
path: [
55-
util.harden(CardanoKeyConst.PURPOSE),
55+
util.harden(KeyPurpose.STANDARD),
5656
util.harden(CardanoKeyConst.COIN_TYPE),
5757
util.harden(CONTEXT_WITH_KNOWN_ADDRESSES.accountIndex),
5858
paymentKeyPath.role,

‎packages/hardware-trezor/src/transformers/additionalWitnessRequests.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export const mapAdditionalWitnessRequests: Transform<
2222
const additionalWitnessPaths: Trezor.DerivationPath[] = [...paymentKeyPaths];
2323

2424
if (context?.knownAddresses?.length) {
25-
const stakeKeyPath = util.stakeKeyPathFromGroupedAddress({ address: context.knownAddresses[0] });
25+
const stakeKeyPath = util.stakeKeyPathFromGroupedAddress({
26+
address: context.knownAddresses[0],
27+
purpose: context.purpose
28+
});
2629
if (stakeKeyPath) additionalWitnessPaths.push(stakeKeyPath);
2730
}
2831
return additionalWitnessPaths;

‎packages/hardware-trezor/src/transformers/certificates.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as Crypto from '@cardano-sdk/crypto';
22
import * as Trezor from '@trezor/connect';
33
import { BIP32Path } from '@cardano-sdk/crypto';
44
import { Cardano } from '@cardano-sdk/core';
5-
import { GroupedAddress, util } from '@cardano-sdk/key-management';
5+
import { GroupedAddress, KeyPurpose, util } from '@cardano-sdk/key-management';
66
import {
77
InvalidArgumentError,
88
Transform,
@@ -19,7 +19,8 @@ type CertCredentialsType = {
1919

2020
const getCertCredentials = (
2121
stakeKeyHash: Crypto.Ed25519KeyHashHex,
22-
knownAddresses: GroupedAddress[] | undefined
22+
knownAddresses: GroupedAddress[] | undefined,
23+
purpose: KeyPurpose | undefined
2324
): CertCredentialsType => {
2425
const knownAddress = knownAddresses?.find((address) =>
2526
areStringsEqualInConstantTime(Cardano.RewardAccount.toHash(address.rewardAccount), stakeKeyHash)
@@ -30,7 +31,7 @@ const getCertCredentials = (
3031
!!rewardAddress &&
3132
areNumbersEqualInConstantTime(rewardAddress?.getPaymentCredential().type, Cardano.CredentialType.KeyHash)
3233
) {
33-
const path = util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
34+
const path = util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose });
3435
return path ? { path } : { keyHash: stakeKeyHash };
3536
}
3637
return {
@@ -48,7 +49,7 @@ const getPoolOperatorKeyPath = (
4849
context: TrezorTxTransformerContext
4950
): BIP32Path | null => {
5051
const knownAddress = context?.knownAddresses.find((address) => address.rewardAccount === operator);
51-
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
52+
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context.purpose });
5253
};
5354

5455
export const getStakeAddressCertificate: Transform<
@@ -58,7 +59,8 @@ export const getStakeAddressCertificate: Transform<
5859
> = (certificate, context) => {
5960
const credentials = getCertCredentials(
6061
certificate.stakeCredential.hash as unknown as Crypto.Ed25519KeyHashHex,
61-
context?.knownAddresses
62+
context?.knownAddresses,
63+
context?.purpose
6264
);
6365
const certificateType =
6466
certificate.__typename === Cardano.CertificateType.StakeRegistration
@@ -82,7 +84,8 @@ export const getStakeDelegationCertificate: Transform<
8284
const poolIdKeyHash = Cardano.PoolId.toKeyHash(certificate.poolId);
8385
const credentials = getCertCredentials(
8486
certificate.stakeCredential.hash as unknown as Crypto.Ed25519KeyHashHex,
85-
context?.knownAddresses
87+
context?.knownAddresses,
88+
context?.purpose
8689
);
8790
return {
8891
keyHash: credentials.keyHash,

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BIP32Path } from '@cardano-sdk/crypto';
22
import { Cardano } from '@cardano-sdk/core';
3-
import { GroupedAddress, TxInId, util } from '@cardano-sdk/key-management';
3+
import { GroupedAddress, KeyPurpose, TxInId, util } from '@cardano-sdk/key-management';
44
import { TrezorTxTransformerContext } from '../types';
55

66
/** Uses the given Trezor input resolver to resolve the payment key path for known addresses for given input transaction. */
@@ -17,10 +17,14 @@ export const resolvePaymentKeyPathForTxIn = (
1717

1818
export const resolveStakeKeyPath = (
1919
rewardAddress: Cardano.RewardAddress,
20-
knownAddresses: GroupedAddress[]
20+
knownAddresses: GroupedAddress[],
21+
purpose: KeyPurpose
2122
): BIP32Path | null => {
2223
const knownAddress = knownAddresses.find(
2324
({ rewardAccount }) => rewardAccount === rewardAddress.toAddress().toBech32()
2425
);
25-
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
26+
return util.stakeKeyPathFromGroupedAddress({
27+
address: knownAddress,
28+
purpose
29+
});
2630
};

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ export const toTrezorWithdrawal: Transform<Cardano.Withdrawal, Trezor.CardanoWit
2222
* - The script hash, blake2b-224 hash digests of serialized monetary scripts.
2323
*/
2424
if (areNumbersEqualInConstantTime(rewardAddress.getPaymentCredential().type, Cardano.CredentialType.KeyHash)) {
25-
const keyPath = context?.knownAddresses ? resolveStakeKeyPath(rewardAddress, context.knownAddresses) : null;
25+
const keyPath = context?.knownAddresses
26+
? resolveStakeKeyPath(rewardAddress, context.knownAddresses, context.purpose)
27+
: null;
2628
trezorWithdrawal = keyPath
2729
? {
2830
amount: withdrawal.quantity.toString(),

‎packages/hardware-trezor/test/testData.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,11 @@ export const knownAddress: GroupedAddress = {
154154
type: AddressType.Internal
155155
};
156156

157-
export const knownAddressPaymentKeyPath = { index: knownAddress.index, role: Number(knownAddress.type) };
157+
export const knownAddressPaymentKeyPath = {
158+
index: knownAddress.index,
159+
purpose: knownAddress.purpose,
160+
role: Number(knownAddress.type)
161+
};
158162

159163
export const knownAddressWithoutStakingPath: GroupedAddress = {
160164
accountIndex: 0,

‎packages/hardware-trezor/test/transformers/additionalWitnessRequests.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { TxInId } from '@cardano-sdk/key-management';
1+
import { KeyPurpose, TxInId } from '@cardano-sdk/key-management';
22
import { contextWithKnownAddresses, txIn } from '../testData';
33
import { mapAdditionalWitnessRequests } from '../../src/transformers/additionalWitnessRequests';
44

55
describe('additionalWitnessRequests', () => {
66
it('should include payment key paths and reward account key path from given inputs', async () => {
7-
const paymentKeyPath = { index: 0, role: 1 };
7+
const paymentKeyPath = { index: 0, purpose: KeyPurpose.STANDARD, role: 1 };
88
const result = mapAdditionalWitnessRequests([txIn], {
99
...contextWithKnownAddresses,
1010
txInKeyPathMap: { [TxInId(txIn)]: paymentKeyPath }

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ describe('key-paths', () => {
2222
});
2323
describe('resolveStakeKeyPath', () => {
2424
it('returns the stake key path for a known address', async () => {
25-
expect(resolveStakeKeyPath(rewardAddress, contextWithKnownAddresses.knownAddresses)).toEqual(
26-
knownAddressStakeKeyPath
27-
);
25+
expect(
26+
resolveStakeKeyPath(rewardAddress, contextWithKnownAddresses.knownAddresses, contextWithKnownAddresses.purpose)
27+
).toEqual(knownAddressStakeKeyPath);
2828
});
2929
});
3030
});

‎packages/hardware-trezor/test/transformers/tx.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as Trezor from '@trezor/connect';
2-
import { CardanoKeyConst, TxInId, util } from '@cardano-sdk/key-management';
2+
import { CardanoKeyConst, KeyPurpose, TxInId, util } from '@cardano-sdk/key-management';
33
import {
44
babbageTxBodyWithScripts,
55
contextWithKnownAddresses,
@@ -56,7 +56,7 @@ describe('tx', () => {
5656
},
5757
certificates: [
5858
{
59-
path: [util.harden(CardanoKeyConst.PURPOSE), util.harden(CardanoKeyConst.COIN_TYPE), util.harden(0), 2, 0],
59+
path: [util.harden(KeyPurpose.STANDARD), util.harden(CardanoKeyConst.COIN_TYPE), util.harden(0), 2, 0],
6060
pool: '153806dbcd134ddee69a8c5204e38ac80448f62342f8c23cfe4b7edf',
6161
type: Trezor.PROTO.CardanoCertificateType.STAKE_DELEGATION
6262
}

‎packages/input-selection/test/ChangeAddress/StaticChangeAddressResolver.test.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AddressType, GroupedAddress, KeyRole } from '@cardano-sdk/key-management';
1+
import { AddressType, GroupedAddress, KeyPurpose, KeyRole } from '@cardano-sdk/key-management';
22
import { Cardano } from '@cardano-sdk/core';
33
import { InvalidStateError } from '@cardano-sdk/util';
44
import { StaticChangeAddressResolver } from '../../src';
@@ -10,8 +10,9 @@ export const knownAddresses = () =>
1010
address: 'testAddress' as Cardano.PaymentAddress,
1111
index: 0,
1212
networkId: Cardano.NetworkId.Testnet,
13+
purpose: KeyPurpose.STANDARD,
1314
rewardAccount: '' as Cardano.RewardAccount,
14-
stakeKeyDerivationPath: { index: 0, role: KeyRole.Stake },
15+
stakeKeyDerivationPath: { index: 0, purpose: KeyPurpose.STANDARD, role: KeyRole.Stake },
1516
type: AddressType.External
1617
}
1718
]);

0 commit comments

Comments
 (0)