@ledgerhq/live-common 34.38.1-hotfix.0 → 34.38.2-nightly.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/__tests__/hw/getLatestFirmwareForDevice.js +4 -0
- package/lib/__tests__/hw/getLatestFirmwareForDevice.js.map +1 -1
- package/lib/__tests__/test-helpers/deviceInfos.d.ts.map +1 -1
- package/lib/__tests__/test-helpers/deviceInfos.js +5 -0
- package/lib/__tests__/test-helpers/deviceInfos.js.map +1 -1
- package/lib/apps/mock.d.ts +2 -32
- package/lib/apps/mock.d.ts.map +1 -1
- package/lib/apps/mock.js +3 -0
- package/lib/apps/mock.js.map +1 -1
- package/lib/apps/polyfill.d.ts +4 -1
- package/lib/apps/polyfill.d.ts.map +1 -1
- package/lib/bridge/cache.d.ts.map +1 -1
- package/lib/bridge/cache.js +2 -2
- package/lib/bridge/cache.js.map +1 -1
- package/lib/bridge/cache.test.d.ts +2 -0
- package/lib/bridge/cache.test.d.ts.map +1 -0
- package/lib/bridge/cache.test.js +63 -0
- package/lib/bridge/cache.test.js.map +1 -0
- package/lib/deposit/deposit.test.js +418 -74
- package/lib/deposit/deposit.test.js.map +1 -1
- package/lib/deposit/helper.d.ts +1 -0
- package/lib/deposit/helper.d.ts.map +1 -1
- package/lib/deposit/helper.js +19 -6
- package/lib/deposit/helper.js.map +1 -1
- package/lib/deviceSDK/tasks/getDeviceInfo.d.ts.map +1 -1
- package/lib/deviceSDK/tasks/getDeviceInfo.js +3 -1
- package/lib/deviceSDK/tasks/getDeviceInfo.js.map +1 -1
- package/lib/e2e/enum/Provider.d.ts +1 -1
- package/lib/e2e/enum/Provider.d.ts.map +1 -1
- package/lib/e2e/enum/Provider.js +1 -1
- package/lib/e2e/enum/Provider.js.map +1 -1
- package/lib/e2e/index.d.ts +5 -0
- package/lib/e2e/index.d.ts.map +1 -1
- package/lib/e2e/swap.d.ts.map +1 -1
- package/lib/e2e/swap.js +10 -7
- package/lib/e2e/swap.js.map +1 -1
- package/lib/env.react.d.ts +1 -1
- package/lib/env.react.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.js +35 -0
- package/lib/featureFlags/defaultFeatures.js.map +1 -1
- package/lib/featureFlags/useFeature.d.ts +1 -1
- package/lib/featureFlags/useFeature.d.ts.map +1 -1
- package/lib/hooks/useAppVersionBlockCheck.d.ts +11 -0
- package/lib/hooks/useAppVersionBlockCheck.d.ts.map +1 -0
- package/lib/hooks/useAppVersionBlockCheck.js +32 -0
- package/lib/hooks/useAppVersionBlockCheck.js.map +1 -0
- package/lib/hooks/useAppVersionBlockCheck.test.d.ts +2 -0
- package/lib/hooks/useAppVersionBlockCheck.test.d.ts.map +1 -0
- package/lib/hooks/useAppVersionBlockCheck.test.js +133 -0
- package/lib/hooks/useAppVersionBlockCheck.test.js.map +1 -0
- package/lib/hw/connectAppEventMapper.d.ts.map +1 -1
- package/lib/hw/connectAppEventMapper.js +3 -1
- package/lib/hw/connectAppEventMapper.js.map +1 -1
- package/lib/hw/connectManager.d.ts.map +1 -1
- package/lib/hw/connectManager.js +9 -0
- package/lib/hw/connectManager.js.map +1 -1
- package/lib/hw/customLockScreenLoad.d.ts.map +1 -1
- package/lib/hw/customLockScreenLoad.js +22 -18
- package/lib/hw/customLockScreenLoad.js.map +1 -1
- package/lib/hw/customLockScreenLoad.test.d.ts +2 -0
- package/lib/hw/customLockScreenLoad.test.d.ts.map +1 -0
- package/lib/hw/customLockScreenLoad.test.js +63 -0
- package/lib/hw/customLockScreenLoad.test.js.map +1 -0
- package/lib/hw/extractOnboardingState.d.ts +15 -2
- package/lib/hw/extractOnboardingState.d.ts.map +1 -1
- package/lib/hw/extractOnboardingState.js +67 -19
- package/lib/hw/extractOnboardingState.js.map +1 -1
- package/lib/hw/extractOnboardingState.test.js +96 -1
- package/lib/hw/extractOnboardingState.test.js.map +1 -1
- package/lib/hw/getDeviceInfo.d.ts.map +1 -1
- package/lib/hw/getDeviceInfo.js +3 -1
- package/lib/hw/getDeviceInfo.js.map +1 -1
- package/lib/hw/getGenuineCheckFromDeviceId.test.js +1 -0
- package/lib/hw/getGenuineCheckFromDeviceId.test.js.map +1 -1
- package/lib/hw/getOnboardingStatePolling.js +1 -1
- package/lib/hw/getOnboardingStatePolling.js.map +1 -1
- package/lib/hw/getOnboardingStatePolling.test.js +2 -0
- package/lib/hw/getOnboardingStatePolling.test.js.map +1 -1
- package/lib/hw/isFirmwareUpdateVersionSupported.test.js +2 -1
- package/lib/hw/isFirmwareUpdateVersionSupported.test.js.map +1 -1
- package/lib/mock/fixtures/aDeviceInfo.d.ts.map +1 -1
- package/lib/mock/fixtures/aDeviceInfo.js +1 -0
- package/lib/mock/fixtures/aDeviceInfo.js.map +1 -1
- package/lib/modularDrawer/__test__/useModularDrawerVisibility.test.d.ts +2 -0
- package/lib/modularDrawer/__test__/useModularDrawerVisibility.test.d.ts.map +1 -0
- package/lib/modularDrawer/__test__/useModularDrawerVisibility.test.js +107 -0
- package/lib/modularDrawer/__test__/useModularDrawerVisibility.test.js.map +1 -0
- package/lib/modularDrawer/enums.d.ts +8 -0
- package/lib/modularDrawer/enums.d.ts.map +1 -0
- package/lib/modularDrawer/enums.js +12 -0
- package/lib/modularDrawer/enums.js.map +1 -0
- package/lib/modularDrawer/useModularDrawerVisibility.d.ts +9 -0
- package/lib/modularDrawer/useModularDrawerVisibility.d.ts.map +1 -0
- package/lib/modularDrawer/useModularDrawerVisibility.js +18 -0
- package/lib/modularDrawer/useModularDrawerVisibility.js.map +1 -0
- package/lib/onboarding/hooks/useOnboardingStatePolling.test.js +2 -0
- package/lib/onboarding/hooks/useOnboardingStatePolling.test.js.map +1 -1
- package/lib/wallet-api/types.d.ts +1 -1
- package/lib/wallet-api/types.d.ts.map +1 -1
- package/lib/wallet-api/useDappLogic.d.ts.map +1 -1
- package/lib/wallet-api/useDappLogic.js +3 -24
- package/lib/wallet-api/useDappLogic.js.map +1 -1
- package/lib/wallet-api/utils/txTrackingHelper.d.ts +3 -0
- package/lib/wallet-api/utils/txTrackingHelper.d.ts.map +1 -0
- package/lib/wallet-api/utils/txTrackingHelper.js +16 -0
- package/lib/wallet-api/utils/txTrackingHelper.js.map +1 -0
- package/lib/wallet-api/utils/txTrackingHelper.test.d.ts +2 -0
- package/lib/wallet-api/utils/txTrackingHelper.test.d.ts.map +1 -0
- package/lib/wallet-api/utils/txTrackingHelper.test.js +70 -0
- package/lib/wallet-api/utils/txTrackingHelper.test.js.map +1 -0
- package/lib-es/__tests__/hw/getLatestFirmwareForDevice.js +4 -0
- package/lib-es/__tests__/hw/getLatestFirmwareForDevice.js.map +1 -1
- package/lib-es/__tests__/test-helpers/deviceInfos.d.ts.map +1 -1
- package/lib-es/__tests__/test-helpers/deviceInfos.js +5 -0
- package/lib-es/__tests__/test-helpers/deviceInfos.js.map +1 -1
- package/lib-es/apps/mock.d.ts +2 -32
- package/lib-es/apps/mock.d.ts.map +1 -1
- package/lib-es/apps/mock.js +3 -0
- package/lib-es/apps/mock.js.map +1 -1
- package/lib-es/apps/polyfill.d.ts +4 -1
- package/lib-es/apps/polyfill.d.ts.map +1 -1
- package/lib-es/bridge/cache.d.ts.map +1 -1
- package/lib-es/bridge/cache.js +2 -2
- package/lib-es/bridge/cache.js.map +1 -1
- package/lib-es/bridge/cache.test.d.ts +2 -0
- package/lib-es/bridge/cache.test.d.ts.map +1 -0
- package/lib-es/bridge/cache.test.js +38 -0
- package/lib-es/bridge/cache.test.js.map +1 -0
- package/lib-es/deposit/deposit.test.js +419 -75
- package/lib-es/deposit/deposit.test.js.map +1 -1
- package/lib-es/deposit/helper.d.ts +1 -0
- package/lib-es/deposit/helper.d.ts.map +1 -1
- package/lib-es/deposit/helper.js +18 -6
- package/lib-es/deposit/helper.js.map +1 -1
- package/lib-es/deviceSDK/tasks/getDeviceInfo.d.ts.map +1 -1
- package/lib-es/deviceSDK/tasks/getDeviceInfo.js +3 -1
- package/lib-es/deviceSDK/tasks/getDeviceInfo.js.map +1 -1
- package/lib-es/e2e/enum/Provider.d.ts +1 -1
- package/lib-es/e2e/enum/Provider.d.ts.map +1 -1
- package/lib-es/e2e/enum/Provider.js +1 -1
- package/lib-es/e2e/enum/Provider.js.map +1 -1
- package/lib-es/e2e/index.d.ts +5 -0
- package/lib-es/e2e/index.d.ts.map +1 -1
- package/lib-es/e2e/swap.d.ts.map +1 -1
- package/lib-es/e2e/swap.js +10 -7
- package/lib-es/e2e/swap.js.map +1 -1
- package/lib-es/env.react.d.ts +1 -1
- package/lib-es/env.react.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.js +35 -0
- package/lib-es/featureFlags/defaultFeatures.js.map +1 -1
- package/lib-es/featureFlags/useFeature.d.ts +1 -1
- package/lib-es/featureFlags/useFeature.d.ts.map +1 -1
- package/lib-es/hooks/useAppVersionBlockCheck.d.ts +11 -0
- package/lib-es/hooks/useAppVersionBlockCheck.d.ts.map +1 -0
- package/lib-es/hooks/useAppVersionBlockCheck.js +25 -0
- package/lib-es/hooks/useAppVersionBlockCheck.js.map +1 -0
- package/lib-es/hooks/useAppVersionBlockCheck.test.d.ts +2 -0
- package/lib-es/hooks/useAppVersionBlockCheck.test.d.ts.map +1 -0
- package/lib-es/hooks/useAppVersionBlockCheck.test.js +131 -0
- package/lib-es/hooks/useAppVersionBlockCheck.test.js.map +1 -0
- package/lib-es/hw/connectAppEventMapper.d.ts.map +1 -1
- package/lib-es/hw/connectAppEventMapper.js +3 -1
- package/lib-es/hw/connectAppEventMapper.js.map +1 -1
- package/lib-es/hw/connectManager.d.ts.map +1 -1
- package/lib-es/hw/connectManager.js +9 -0
- package/lib-es/hw/connectManager.js.map +1 -1
- package/lib-es/hw/customLockScreenLoad.d.ts.map +1 -1
- package/lib-es/hw/customLockScreenLoad.js +22 -18
- package/lib-es/hw/customLockScreenLoad.js.map +1 -1
- package/lib-es/hw/customLockScreenLoad.test.d.ts +2 -0
- package/lib-es/hw/customLockScreenLoad.test.d.ts.map +1 -0
- package/lib-es/hw/customLockScreenLoad.test.js +58 -0
- package/lib-es/hw/customLockScreenLoad.test.js.map +1 -0
- package/lib-es/hw/extractOnboardingState.d.ts +15 -2
- package/lib-es/hw/extractOnboardingState.d.ts.map +1 -1
- package/lib-es/hw/extractOnboardingState.js +66 -18
- package/lib-es/hw/extractOnboardingState.js.map +1 -1
- package/lib-es/hw/extractOnboardingState.test.js +97 -2
- package/lib-es/hw/extractOnboardingState.test.js.map +1 -1
- package/lib-es/hw/getDeviceInfo.d.ts.map +1 -1
- package/lib-es/hw/getDeviceInfo.js +3 -1
- package/lib-es/hw/getDeviceInfo.js.map +1 -1
- package/lib-es/hw/getGenuineCheckFromDeviceId.test.js +1 -0
- package/lib-es/hw/getGenuineCheckFromDeviceId.test.js.map +1 -1
- package/lib-es/hw/getOnboardingStatePolling.js +1 -1
- package/lib-es/hw/getOnboardingStatePolling.js.map +1 -1
- package/lib-es/hw/getOnboardingStatePolling.test.js +2 -0
- package/lib-es/hw/getOnboardingStatePolling.test.js.map +1 -1
- package/lib-es/hw/isFirmwareUpdateVersionSupported.test.js +2 -1
- package/lib-es/hw/isFirmwareUpdateVersionSupported.test.js.map +1 -1
- package/lib-es/mock/fixtures/aDeviceInfo.d.ts.map +1 -1
- package/lib-es/mock/fixtures/aDeviceInfo.js +1 -0
- package/lib-es/mock/fixtures/aDeviceInfo.js.map +1 -1
- package/lib-es/modularDrawer/__test__/useModularDrawerVisibility.test.d.ts +2 -0
- package/lib-es/modularDrawer/__test__/useModularDrawerVisibility.test.d.ts.map +1 -0
- package/lib-es/modularDrawer/__test__/useModularDrawerVisibility.test.js +105 -0
- package/lib-es/modularDrawer/__test__/useModularDrawerVisibility.test.js.map +1 -0
- package/lib-es/modularDrawer/enums.d.ts +8 -0
- package/lib-es/modularDrawer/enums.d.ts.map +1 -0
- package/lib-es/modularDrawer/enums.js +9 -0
- package/lib-es/modularDrawer/enums.js.map +1 -0
- package/lib-es/modularDrawer/useModularDrawerVisibility.d.ts +9 -0
- package/lib-es/modularDrawer/useModularDrawerVisibility.d.ts.map +1 -0
- package/lib-es/modularDrawer/useModularDrawerVisibility.js +14 -0
- package/lib-es/modularDrawer/useModularDrawerVisibility.js.map +1 -0
- package/lib-es/onboarding/hooks/useOnboardingStatePolling.test.js +2 -0
- package/lib-es/onboarding/hooks/useOnboardingStatePolling.test.js.map +1 -1
- package/lib-es/wallet-api/types.d.ts +1 -1
- package/lib-es/wallet-api/types.d.ts.map +1 -1
- package/lib-es/wallet-api/useDappLogic.d.ts.map +1 -1
- package/lib-es/wallet-api/useDappLogic.js +3 -24
- package/lib-es/wallet-api/useDappLogic.js.map +1 -1
- package/lib-es/wallet-api/utils/txTrackingHelper.d.ts +3 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.d.ts.map +1 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.js +12 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.js.map +1 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.test.d.ts +2 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.test.d.ts.map +1 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.test.js +68 -0
- package/lib-es/wallet-api/utils/txTrackingHelper.test.js.map +1 -0
- package/package.json +50 -50
- package/src/__tests__/hw/getLatestFirmwareForDevice.ts +8 -3
- package/src/__tests__/test-helpers/deviceInfos.ts +5 -0
- package/src/apps/mock.ts +5 -2
- package/src/bridge/cache.test.ts +46 -0
- package/src/bridge/cache.ts +5 -2
- package/src/deposit/deposit.test.ts +611 -136
- package/src/deposit/helper.ts +27 -9
- package/src/deviceSDK/tasks/getDeviceInfo.ts +3 -0
- package/src/e2e/enum/Provider.ts +1 -1
- package/src/e2e/swap.ts +12 -7
- package/src/featureFlags/defaultFeatures.ts +35 -0
- package/src/hooks/useAppVersionBlockCheck.test.ts +134 -0
- package/src/hooks/useAppVersionBlockCheck.ts +65 -0
- package/src/hw/connectAppEventMapper.ts +3 -1
- package/src/hw/connectManager.ts +18 -0
- package/src/hw/customLockScreenLoad.test.ts +86 -0
- package/src/hw/customLockScreenLoad.ts +31 -17
- package/src/hw/extractOnboardingState.test.ts +122 -2
- package/src/hw/extractOnboardingState.ts +81 -18
- package/src/hw/getDeviceInfo.ts +4 -1
- package/src/hw/getGenuineCheckFromDeviceId.test.ts +2 -1
- package/src/hw/getOnboardingStatePolling.test.ts +2 -0
- package/src/hw/getOnboardingStatePolling.ts +1 -1
- package/src/hw/isFirmwareUpdateVersionSupported.test.ts +3 -1
- package/src/mock/fixtures/aDeviceInfo.ts +1 -0
- package/src/modularDrawer/__test__/useModularDrawerVisibility.test.ts +149 -0
- package/src/modularDrawer/enums.ts +7 -0
- package/src/modularDrawer/useModularDrawerVisibility.ts +25 -0
- package/src/onboarding/hooks/useOnboardingStatePolling.test.ts +2 -0
- package/src/wallet-api/types.ts +1 -1
- package/src/wallet-api/useDappLogic.ts +4 -27
- package/src/wallet-api/utils/txTrackingHelper.test.ts +80 -0
- package/src/wallet-api/utils/txTrackingHelper.ts +14 -0
@@ -0,0 +1,131 @@
|
|
1
|
+
import { useAppVersionBlockCheck } from "./useAppVersionBlockCheck";
|
2
|
+
describe("useAppVersionBlockCheck", () => {
|
3
|
+
describe("LLM", () => {
|
4
|
+
it("should update if current version is not compatible on android", () => {
|
5
|
+
// given
|
6
|
+
const getConfigValue = () => ({
|
7
|
+
llm: {
|
8
|
+
android: [
|
9
|
+
{
|
10
|
+
minOsVersion: "32",
|
11
|
+
version: "2.0.3",
|
12
|
+
},
|
13
|
+
],
|
14
|
+
},
|
15
|
+
});
|
16
|
+
// when
|
17
|
+
const { shouldUpdate } = useAppVersionBlockCheck({
|
18
|
+
appVersion: "2.0.1",
|
19
|
+
osVersion: "32",
|
20
|
+
platform: "android",
|
21
|
+
appKey: "llm",
|
22
|
+
getConfigValue,
|
23
|
+
});
|
24
|
+
//then
|
25
|
+
expect(shouldUpdate).toBe(true);
|
26
|
+
});
|
27
|
+
it("should update if current version is not compatible on ios", () => {
|
28
|
+
const getConfigValue = () => ({
|
29
|
+
llm: {
|
30
|
+
ios: [
|
31
|
+
{
|
32
|
+
minOsVersion: "32",
|
33
|
+
version: "2.0.3",
|
34
|
+
},
|
35
|
+
],
|
36
|
+
},
|
37
|
+
});
|
38
|
+
// when
|
39
|
+
const { shouldUpdate } = useAppVersionBlockCheck({
|
40
|
+
appVersion: "2.0.1",
|
41
|
+
osVersion: "32",
|
42
|
+
platform: "ios",
|
43
|
+
appKey: "llm",
|
44
|
+
getConfigValue,
|
45
|
+
});
|
46
|
+
//then
|
47
|
+
expect(shouldUpdate).toBe(true);
|
48
|
+
});
|
49
|
+
it("should not update the app if current version is not compatible on android with another os version", () => {
|
50
|
+
// given
|
51
|
+
const getConfigValue = () => ({
|
52
|
+
llm: {
|
53
|
+
android: [
|
54
|
+
{
|
55
|
+
minOsVersion: "33",
|
56
|
+
version: "2.0.3",
|
57
|
+
},
|
58
|
+
],
|
59
|
+
},
|
60
|
+
});
|
61
|
+
// when
|
62
|
+
const { shouldUpdate } = useAppVersionBlockCheck({
|
63
|
+
appVersion: "2.0.1",
|
64
|
+
osVersion: "32",
|
65
|
+
platform: "android",
|
66
|
+
appKey: "llm",
|
67
|
+
getConfigValue,
|
68
|
+
});
|
69
|
+
//then
|
70
|
+
expect(shouldUpdate).toBe(false);
|
71
|
+
});
|
72
|
+
it("should not update the app if current version is not compatible on ios with another os version", () => {
|
73
|
+
// given
|
74
|
+
const getConfigValue = () => ({
|
75
|
+
llm: {
|
76
|
+
ios: [
|
77
|
+
{
|
78
|
+
minOsVersion: "33",
|
79
|
+
version: "2.0.3",
|
80
|
+
},
|
81
|
+
],
|
82
|
+
},
|
83
|
+
});
|
84
|
+
// when
|
85
|
+
const { shouldUpdate } = useAppVersionBlockCheck({
|
86
|
+
appVersion: "2.0.1",
|
87
|
+
osVersion: "32",
|
88
|
+
platform: "ios",
|
89
|
+
appKey: "llm",
|
90
|
+
getConfigValue,
|
91
|
+
});
|
92
|
+
//then
|
93
|
+
expect(shouldUpdate).toBe(false);
|
94
|
+
});
|
95
|
+
it.each([
|
96
|
+
["android", "2.1.3"],
|
97
|
+
["ios", "2.1.3"],
|
98
|
+
["android", "2.1.3-rc.2"],
|
99
|
+
["ios", "2.1.3-rc.2"],
|
100
|
+
["android", "2.2.3-next.0"],
|
101
|
+
["ios", "2.2.3-next.0"],
|
102
|
+
["android", "2.0.3-rc2"],
|
103
|
+
["ios", "2.0.3-rc2"],
|
104
|
+
["android", "2.0.3-next.3"],
|
105
|
+
["ios", "2.0.3-next.3"],
|
106
|
+
])("should not update the app on %s for version %s compatible with 2.0.3", (platform, appVersion) => {
|
107
|
+
// given
|
108
|
+
const getConfigValue = () => ({
|
109
|
+
llm: {
|
110
|
+
[platform]: [
|
111
|
+
{
|
112
|
+
minOsVersion: "32",
|
113
|
+
version: "2.0.3",
|
114
|
+
},
|
115
|
+
],
|
116
|
+
},
|
117
|
+
});
|
118
|
+
// when
|
119
|
+
const { shouldUpdate } = useAppVersionBlockCheck({
|
120
|
+
appVersion,
|
121
|
+
osVersion: "32",
|
122
|
+
platform: platform,
|
123
|
+
appKey: "llm",
|
124
|
+
getConfigValue,
|
125
|
+
});
|
126
|
+
// then
|
127
|
+
expect(shouldUpdate).toBe(false);
|
128
|
+
});
|
129
|
+
});
|
130
|
+
});
|
131
|
+
//# sourceMappingURL=useAppVersionBlockCheck.test.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"useAppVersionBlockCheck.test.js","sourceRoot":"","sources":["../../src/hooks/useAppVersionBlockCheck.test.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connectAppEventMapper.d.ts","sourceRoot":"","sources":["../../src/hw/connectAppEventMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EACV,mBAAmB,EAGnB,6BAA6B,EAI9B,MAAM,iCAAiC,CAAC;AAWzC,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAWnC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBAAa,qBAAqB;IAQ9B,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IAVhB,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,kBAAkB,CAAkB;IAC5C,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,YAAY,CAAkC;gBAG5C,GAAG,EAAE,mBAAmB,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,6BAA6B,CAC3C,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,CAC9B;IAGH,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC;IAqClC,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,WAAW;IAqBnB,OAAO,CAAC,kBAAkB;IAoC1B,OAAO,CAAC,iBAAiB;
|
1
|
+
{"version":3,"file":"connectAppEventMapper.d.ts","sourceRoot":"","sources":["../../src/hw/connectAppEventMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EACV,mBAAmB,EAGnB,6BAA6B,EAI9B,MAAM,iCAAiC,CAAC;AAWzC,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAWnC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBAAa,qBAAqB;IAQ9B,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IAVhB,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,kBAAkB,CAAkB;IAC5C,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,YAAY,CAAkC;gBAG5C,GAAG,EAAE,mBAAmB,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,6BAA6B,CAC3C,kBAAkB,EAClB,iBAAiB,EACjB,6BAA6B,CAC9B;IAGH,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC;IAqClC,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,WAAW;IAqBnB,OAAO,CAAC,kBAAkB;IAoC1B,OAAO,CAAC,iBAAiB;IA2CzB,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,gBAAgB;IAsCxB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,iBAAiB;CAmD1B"}
|
@@ -138,7 +138,9 @@ export class ConnectAppEventMapper {
|
|
138
138
|
type: "install",
|
139
139
|
name: installPlan.installPlan[installPlan.currentIndex].versionName,
|
140
140
|
},
|
141
|
-
installQueue: installPlan.installPlan
|
141
|
+
installQueue: installPlan.installPlan
|
142
|
+
.map(app => app.versionName)
|
143
|
+
.slice(installPlan.currentIndex),
|
142
144
|
});
|
143
145
|
this.installPlan = installPlan;
|
144
146
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connectAppEventMapper.js","sourceRoot":"","sources":["../../src/hw/connectAppEventMapper.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"connectAppEventMapper.js","sourceRoot":"","sources":["../../src/hw/connectAppEventMapper.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connectManager.d.ts","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA4C,MAAM,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"connectManager.d.ts","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA4C,MAAM,MAAM,CAAC;AAU5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7C,OAAyB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAC3B,qBAAqB,GACrB;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,UAAU,CAAC;CACxB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;CACxB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,GACD,aAAa,GACb,iBAAiB,CAAC;AA0GtB,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,EACE,uBAAuB,GACxB,GAAE;IACD,uBAAuB,EAAE,OAAO,CAAC;CACG,2BAGL,KAAK,KAAG,WAAW,mBAAmB,CAAC,CAsBzE"}
|
@@ -1,6 +1,8 @@
|
|
1
1
|
import { Observable, concat, concatWith, from, of, throwError } from "rxjs";
|
2
2
|
import { concatMap, catchError, delay } from "rxjs/operators";
|
3
3
|
import { TransportStatusError, DeviceOnDashboardExpected, StatusCodes, LockedDeviceError, } from "@ledgerhq/errors";
|
4
|
+
import { isCharonSupported } from "@ledgerhq/device-core";
|
5
|
+
import { identifyTargetId } from "@ledgerhq/devices";
|
4
6
|
import { PrepareConnectManagerDeviceAction } from "@ledgerhq/live-dmk-shared";
|
5
7
|
import { listAppsUseCase } from "../device/use-cases/listAppsUseCase";
|
6
8
|
import { withDevice } from "./deviceAccess";
|
@@ -10,6 +12,7 @@ import { isDashboardName } from "./isDashboardName";
|
|
10
12
|
import { DeviceNotOnboarded } from "../errors";
|
11
13
|
import attemptToQuitApp from "./attemptToQuitApp";
|
12
14
|
import { PrepareConnectManagerEventMapper } from "./connectManagerEventMapper";
|
15
|
+
import { extractOnboardingState, OnboardingStep } from "./extractOnboardingState";
|
13
16
|
const cmd = (transport, { request }) => new Observable(o => {
|
14
17
|
const timeoutSub = of({
|
15
18
|
type: "unresponsiveDevice",
|
@@ -22,6 +25,12 @@ const cmd = (transport, { request }) => new Observable(o => {
|
|
22
25
|
if (!deviceInfo.onboarded && !deviceInfo.isRecoveryMode) {
|
23
26
|
throw new DeviceNotOnboarded();
|
24
27
|
}
|
28
|
+
if (isCharonSupported(deviceInfo.seVersion ?? "", identifyTargetId(deviceInfo.seTargetId ?? 0)?.id)) {
|
29
|
+
const onboardingState = extractOnboardingState(deviceInfo.seFlags, deviceInfo.charonState);
|
30
|
+
if (onboardingState.currentOnboardingStep === OnboardingStep.BackupCharon) {
|
31
|
+
throw new DeviceNotOnboarded();
|
32
|
+
}
|
33
|
+
}
|
25
34
|
if (deviceInfo.isBootloader) {
|
26
35
|
return of({
|
27
36
|
type: "bootloader",
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connectManager.js","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,WAAW,EACX,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;
|
1
|
+
{"version":3,"file":"connectManager.js","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"customLockScreenLoad.d.ts","sourceRoot":"","sources":["../../src/hw/customLockScreenLoad.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAwB,MAAM,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"customLockScreenLoad.d.ts","sourceRoot":"","sources":["../../src/hw/customLockScreenLoad.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAwB,MAAM,MAAM,CAAC;AAgBxD,OAAyB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAI7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAQ5F,MAAM,MAAM,cAAc,GACtB,qBAAqB,GACrB;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACD;IACE,IAAI,EAAE,8BAA8B,CAAC;CACtC,GACD;IACE,IAAI,EAAE,gCAAgC,CAAC;CACxC,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAaN,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,yBAAyB,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,KAAK,GAAG,UAAU,CAAC,cAAc,CAAC,CA6J1F;AA+BD,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,OAAO,EACtB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,WAAW,mBAmDzB"}
|
@@ -2,7 +2,6 @@ import { Observable, from, of, throwError } from "rxjs";
|
|
2
2
|
import { catchError, concatMap, delay, mergeMap } from "rxjs/operators";
|
3
3
|
import { DeviceOnDashboardExpected, ManagerNotEnoughSpaceError, StatusCodes, TransportError, TransportStatusError, DisconnectedDevice, } from "@ledgerhq/errors";
|
4
4
|
import { getDeviceModel } from "@ledgerhq/devices";
|
5
|
-
import { withDevice } from "./deviceAccess";
|
6
5
|
import getDeviceInfo from "./getDeviceInfo";
|
7
6
|
import { ImageLoadRefusedOnDevice, ImageCommitRefusedOnDevice } from "../errors";
|
8
7
|
import getAppAndVersion from "./getAppAndVersion";
|
@@ -12,16 +11,27 @@ import customLockScreenFetchSize from "./customLockScreenFetchSize";
|
|
12
11
|
import customLockScreenFetchHash from "./customLockScreenFetchHash";
|
13
12
|
import { gzip } from "pako";
|
14
13
|
import { getScreenSpecs } from "../device/use-cases/screenSpecs";
|
14
|
+
import { DeviceDisconnectedWhileSendingError } from "@ledgerhq/device-management-kit";
|
15
|
+
import { withTransport } from "../deviceSDK/transports/core";
|
15
16
|
const MAX_APDU_SIZE = 255;
|
16
17
|
const COMPRESS_CHUNK_SIZE = 2048;
|
18
|
+
/**
|
19
|
+
* Type guard to check if the given error is a DeviceDisconnectedWhileSendingError.
|
20
|
+
* Ensures that the error is an object, is not null, and matches the expected structure.
|
21
|
+
* This is used to identify specific disconnection errors from the DMK device.
|
22
|
+
*/
|
23
|
+
const isDmkDeviceDisconnectedError = (err) => typeof err === "object" &&
|
24
|
+
err !== null &&
|
25
|
+
(err instanceof DeviceDisconnectedWhileSendingError ||
|
26
|
+
("_tag" in err && err._tag === "DeviceDisconnectedWhileSendingError"));
|
17
27
|
export default function loadImage({ deviceId, request }) {
|
18
28
|
const { hexImage, padImage = true, deviceModelId } = request;
|
19
29
|
const screenSpecs = getScreenSpecs(deviceModelId);
|
20
|
-
const sub =
|
30
|
+
const sub = withTransport(deviceId)(({ transportRef }) => new Observable(subscriber => {
|
21
31
|
const timeoutSub = of({ type: "unresponsiveDevice" })
|
22
32
|
.pipe(delay(1000))
|
23
33
|
.subscribe(e => subscriber.next(e));
|
24
|
-
const sub = from(getDeviceInfo(
|
34
|
+
const sub = from(getDeviceInfo(transportRef.current))
|
25
35
|
.pipe(mergeMap(async () => {
|
26
36
|
timeoutSub.unsubscribe();
|
27
37
|
const imageData = await generateCustomLockScreenImageFormat(hexImage, true, !!padImage, screenSpecs);
|
@@ -29,11 +39,7 @@ export default function loadImage({ deviceId, request }) {
|
|
29
39
|
const imageSize = Buffer.alloc(4);
|
30
40
|
imageSize.writeUIntBE(imageLength, 0, 4);
|
31
41
|
subscriber.next({ type: "loadImagePermissionRequested" });
|
32
|
-
const createImageResponse = await
|
33
|
-
StatusCodes.NOT_ENOUGH_SPACE,
|
34
|
-
StatusCodes.USER_REFUSED_ON_DEVICE,
|
35
|
-
StatusCodes.OK,
|
36
|
-
]);
|
42
|
+
const createImageResponse = await transportRef.current.send(0xe0, 0x60, 0x00, 0x00, imageSize, [StatusCodes.NOT_ENOUGH_SPACE, StatusCodes.USER_REFUSED_ON_DEVICE, StatusCodes.OK]);
|
37
43
|
const createImageStatus = createImageResponse.readUInt16BE(createImageResponse.length - 2);
|
38
44
|
const createImageStatusStr = createImageStatus.toString(16);
|
39
45
|
// reads last 2 bytes which correspond to the status
|
@@ -63,11 +69,11 @@ export default function loadImage({ deviceId, request }) {
|
|
63
69
|
const chunkOffsetBuffer = Buffer.alloc(4);
|
64
70
|
chunkOffsetBuffer.writeUIntBE(currentOffset, 0, 4);
|
65
71
|
const apduData = Buffer.concat([chunkOffsetBuffer, chunkDataBuffer]);
|
66
|
-
await
|
72
|
+
await transportRef.current.send(0xe0, 0x61, 0x00, 0x00, apduData);
|
67
73
|
currentOffset += chunkSize;
|
68
74
|
}
|
69
75
|
subscriber.next({ type: "commitImagePermissionRequested" });
|
70
|
-
const commitResponse = await
|
76
|
+
const commitResponse = await transportRef.current.send(0xe0, 0x62, 0x00, 0x00, Buffer.from([]), [0x9000, 0x5501]);
|
71
77
|
const commitStatus = commitResponse.readUInt16BE(commitResponse.length - 2);
|
72
78
|
const commitStatusStr = commitStatus.toString(16);
|
73
79
|
// reads last 2 bytes which correspond to the status
|
@@ -80,9 +86,9 @@ export default function loadImage({ deviceId, request }) {
|
|
80
86
|
return subscriber.error(new TransportError("Unexpected device response", commitStatusStr));
|
81
87
|
}
|
82
88
|
// Fetch image size
|
83
|
-
const imageBytes = await customLockScreenFetchSize(
|
89
|
+
const imageBytes = await customLockScreenFetchSize(transportRef.current);
|
84
90
|
// Fetch image hash
|
85
|
-
const imageHash = await customLockScreenFetchHash(
|
91
|
+
const imageHash = await customLockScreenFetchHash(transportRef.current);
|
86
92
|
subscriber.next({
|
87
93
|
type: "imageLoaded",
|
88
94
|
imageSize: imageBytes,
|
@@ -94,9 +100,9 @@ export default function loadImage({ deviceId, request }) {
|
|
94
100
|
(e &&
|
95
101
|
e instanceof TransportStatusError &&
|
96
102
|
[0x6e00, 0x6d00, 0x6e01, 0x6d01, 0x6d02].includes(e.statusCode))) {
|
97
|
-
return from(getAppAndVersion(
|
103
|
+
return from(getAppAndVersion(transportRef.current)).pipe(concatMap(appAndVersion => {
|
98
104
|
return !isDashboardName(appAndVersion.name)
|
99
|
-
? attemptToQuitApp(
|
105
|
+
? attemptToQuitApp(transportRef.current, appAndVersion)
|
100
106
|
: of({
|
101
107
|
type: "appDetected",
|
102
108
|
});
|
@@ -109,10 +115,8 @@ export default function loadImage({ deviceId, request }) {
|
|
109
115
|
timeoutSub.unsubscribe();
|
110
116
|
sub.unsubscribe();
|
111
117
|
};
|
112
|
-
})).pipe(
|
113
|
-
|
114
|
-
catchError(err => {
|
115
|
-
if (err.name === "TimeoutError") {
|
118
|
+
})).pipe(catchError(err => {
|
119
|
+
if (err.name === "TimeoutError" || isDmkDeviceDisconnectedError(err)) {
|
116
120
|
return throwError(() => new DisconnectedDevice());
|
117
121
|
}
|
118
122
|
return throwError(() => err);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"customLockScreenLoad.js","sourceRoot":"","sources":["../../src/hw/customLockScreenLoad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,WAAW,EACX,cAAc,EACd,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,
|
1
|
+
{"version":3,"file":"customLockScreenLoad.js","sourceRoot":"","sources":["../../src/hw/customLockScreenLoad.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"customLockScreenLoad.test.d.ts","sourceRoot":"","sources":["../../src/hw/customLockScreenLoad.test.ts"],"names":[],"mappings":""}
|
@@ -0,0 +1,58 @@
|
|
1
|
+
import customLockScreenLoad from "./customLockScreenLoad";
|
2
|
+
import { DeviceModelId } from "@ledgerhq/devices";
|
3
|
+
import { lastValueFrom, of } from "rxjs";
|
4
|
+
import { ManagerNotEnoughSpaceError, StatusCodes, TransportError } from "@ledgerhq/errors";
|
5
|
+
import { ImageLoadRefusedOnDevice } from "../errors";
|
6
|
+
const mockTransport = {
|
7
|
+
send: jest.fn(),
|
8
|
+
getTraceContext: jest.fn(),
|
9
|
+
};
|
10
|
+
jest.mock("../deviceSDK/transports/core", () => ({
|
11
|
+
withTransport: () => callback => callback({ transportRef: { current: mockTransport } }),
|
12
|
+
}));
|
13
|
+
jest.mock("./getDeviceInfo", () => jest.fn(() => of([])));
|
14
|
+
describe("customLockScreenLoad", () => {
|
15
|
+
it("should load image on device", async () => {
|
16
|
+
// given
|
17
|
+
const request = {
|
18
|
+
deviceModelId: DeviceModelId.stax,
|
19
|
+
hexImage: "hello_world",
|
20
|
+
};
|
21
|
+
mockTransport.send.mockResolvedValue(Buffer.from([0x42, 0x42, 0x43, 0x90, 0x00]));
|
22
|
+
// when
|
23
|
+
const ret = await lastValueFrom(await customLockScreenLoad({ deviceId: "deviceId", request }));
|
24
|
+
// then
|
25
|
+
expect(mockTransport.send).toHaveBeenNthCalledWith(1, 0xe0, 0x60, 0x00, 0x00, Buffer.from([0x00, 0x00, 0x00, 0x08]), [StatusCodes.NOT_ENOUGH_SPACE, StatusCodes.USER_REFUSED_ON_DEVICE, StatusCodes.OK]);
|
26
|
+
expect(mockTransport.send).toHaveBeenNthCalledWith(2, 0xe0, 0x61, 0x00, 0x00, Buffer.from([0x00, 0x00, 0x00, 0x00, 0x90, 0x01, 0xa0, 0x02, 0x21, 0x00, 0x00, 0x00]));
|
27
|
+
expect(mockTransport.send).toHaveBeenNthCalledWith(3, 0xe0, 0x62, 0x00, 0x00, Buffer.from([]), [0x9000, 0x5501]);
|
28
|
+
expect(ret).toStrictEqual({
|
29
|
+
type: "imageLoaded",
|
30
|
+
imageSize: 1111638928,
|
31
|
+
imageHash: "424243",
|
32
|
+
});
|
33
|
+
});
|
34
|
+
it.each([
|
35
|
+
[
|
36
|
+
"user refused on device",
|
37
|
+
[0x55, 0x01],
|
38
|
+
new ImageLoadRefusedOnDevice("5501", { productName: "Ledger Stax" }),
|
39
|
+
],
|
40
|
+
["not enough space", [0x51, 0x02], new ManagerNotEnoughSpaceError()],
|
41
|
+
["unexpected error", [0x42, 0x32], new TransportError("Unexpected device response", "4232")],
|
42
|
+
])("should return an error if %s", async (_errorStr, statusCode, error) => {
|
43
|
+
// given
|
44
|
+
const request = {
|
45
|
+
deviceModelId: DeviceModelId.stax,
|
46
|
+
hexImage: "hello_world",
|
47
|
+
};
|
48
|
+
mockTransport.send.mockResolvedValue(Buffer.from(statusCode));
|
49
|
+
// when
|
50
|
+
try {
|
51
|
+
await lastValueFrom(await customLockScreenLoad({ deviceId: "nanoX", request }));
|
52
|
+
}
|
53
|
+
catch (err) {
|
54
|
+
expect(err).toStrictEqual(error);
|
55
|
+
}
|
56
|
+
});
|
57
|
+
});
|
58
|
+
//# sourceMappingURL=customLockScreenLoad.test.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"customLockScreenLoad.test.js","sourceRoot":"","sources":["../../src/hw/customLockScreenLoad.test.ts"],"names":[],"mappings":"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"}
|
@@ -18,7 +18,9 @@ export declare enum OnboardingStep {
|
|
18
18
|
RestoreSeed = "RESTORE_SEED",
|
19
19
|
RecoverRestore = "RECOVER_RESTORE",
|
20
20
|
SafetyWarning = "SAFETY WARNING",
|
21
|
-
Ready = "READY"
|
21
|
+
Ready = "READY",
|
22
|
+
BackupCharon = "BACKUP_CHARON",
|
23
|
+
RestoreCharon = "RESTORE_CHARON"
|
22
24
|
}
|
23
25
|
export type OnboardingState = {
|
24
26
|
isOnboarded: boolean;
|
@@ -26,11 +28,22 @@ export type OnboardingState = {
|
|
26
28
|
seedPhraseType: SeedPhraseType;
|
27
29
|
currentOnboardingStep: OnboardingStep;
|
28
30
|
currentSeedWordIndex: number;
|
31
|
+
charonSupported: boolean;
|
32
|
+
charonStatus: CharonStatus | null;
|
29
33
|
};
|
34
|
+
export declare enum CharonStatus {
|
35
|
+
Rejected = 1,
|
36
|
+
Choice = 2,
|
37
|
+
Running = 3,
|
38
|
+
Naming = 4,
|
39
|
+
Ready = 5
|
40
|
+
}
|
41
|
+
export declare const fromBitsToCharonStatusMap: Map<number, CharonStatus>;
|
30
42
|
/**
|
31
43
|
* Extracts the onboarding state of the device
|
32
44
|
* @param flagsBytes Buffer of bytes of length onboardingFlagsBytesLength representing the device state flags
|
45
|
+
* @param charonStatusFlags Buffer of bytes of length charonStatusFlagsLength representing the charon status flags
|
33
46
|
* @returns An OnboardingState
|
34
47
|
*/
|
35
|
-
export declare const extractOnboardingState: (flagsBytes: Buffer) => OnboardingState;
|
48
|
+
export declare const extractOnboardingState: (flagsBytes: Buffer, charonState?: Buffer) => OnboardingState;
|
36
49
|
//# sourceMappingURL=extractOnboardingState.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"extractOnboardingState.d.ts","sourceRoot":"","sources":["../../src/hw/extractOnboardingState.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
1
|
+
{"version":3,"file":"extractOnboardingState.d.ts","sourceRoot":"","sources":["../../src/hw/extractOnboardingState.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAkBtD,eAAO,MAAM,iCAAiC,6BAI5C,CAAC;AAEH,oBAAY,cAAc;IACxB,cAAc,qBAAqB;IACnC,cAAc,qBAAqB;IACnC,cAAc,qBAAqB;IACnC,cAAc,qBAAqB;IACnC,qBAAqB,4BAA4B;IACjD,oBAAoB,2BAA2B;IAC/C,UAAU,gBAAgB;IAC1B,GAAG,QAAQ;IACX,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,mBAAmB,0BAA0B;IAC7C,kBAAkB,yBAAyB;IAC3C,WAAW,iBAAiB;IAC5B,cAAc,oBAAoB;IAClC,aAAa,mBAAmB;IAChC,KAAK,UAAU;IACf,YAAY,kBAAkB;IAC9B,aAAa,mBAAmB;CACjC;AA4BD,MAAM,MAAM,eAAe,GAAG;IAE5B,WAAW,EAAE,OAAO,CAAC;IAErB,gBAAgB,EAAE,OAAO,CAAC;IAE1B,cAAc,EAAE,cAAc,CAAC;IAE/B,qBAAqB,EAAE,cAAc,CAAC;IACtC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;CACnC,CAAC;AAEF,oBAAY,YAAY;IACtB,QAAQ,IAAI;IACZ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,MAAM,IAAA;IACN,KAAK,IAAA;CACN;AAED,eAAO,MAAM,yBAAyB,2BAMpC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,eACrB,MAAM,gBACJ,MAAM,KACnB,eAiEF,CAAC"}
|