@ledgerhq/live-common 34.40.0-nightly.4 → 34.41.0-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/e2e/index.d.ts +0 -2
- package/lib/e2e/index.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.js +0 -1
- 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/hw/connectManager.js +6 -6
- package/lib/hw/connectManager.js.map +1 -1
- package/lib/hw/extractOnboardingState.d.ts.map +1 -1
- package/lib/hw/extractOnboardingState.js +8 -6
- package/lib/hw/extractOnboardingState.js.map +1 -1
- package/lib/hw/extractOnboardingState.test.js +7 -0
- package/lib/hw/extractOnboardingState.test.js.map +1 -1
- package/lib/hw/getOnboardingStatePolling.d.ts.map +1 -1
- package/lib/hw/getOnboardingStatePolling.js +2 -0
- package/lib/hw/getOnboardingStatePolling.js.map +1 -1
- package/lib/hw/getOnboardingStatePolling.test.js +24 -0
- package/lib/hw/getOnboardingStatePolling.test.js.map +1 -1
- package/lib-es/e2e/index.d.ts +0 -2
- package/lib-es/e2e/index.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.js +0 -1
- 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/hw/connectManager.js +6 -6
- package/lib-es/hw/connectManager.js.map +1 -1
- package/lib-es/hw/extractOnboardingState.d.ts.map +1 -1
- package/lib-es/hw/extractOnboardingState.js +8 -6
- package/lib-es/hw/extractOnboardingState.js.map +1 -1
- package/lib-es/hw/extractOnboardingState.test.js +7 -0
- package/lib-es/hw/extractOnboardingState.test.js.map +1 -1
- package/lib-es/hw/getOnboardingStatePolling.d.ts.map +1 -1
- package/lib-es/hw/getOnboardingStatePolling.js +2 -0
- package/lib-es/hw/getOnboardingStatePolling.js.map +1 -1
- package/lib-es/hw/getOnboardingStatePolling.test.js +24 -0
- package/lib-es/hw/getOnboardingStatePolling.test.js.map +1 -1
- package/package.json +43 -43
- package/src/featureFlags/defaultFeatures.ts +0 -1
- package/src/hw/connectManager.ts +14 -14
- package/src/hw/extractOnboardingState.test.ts +9 -0
- package/src/hw/extractOnboardingState.ts +12 -8
- package/src/hw/getOnboardingStatePolling.test.ts +29 -0
- package/src/hw/getOnboardingStatePolling.ts +2 -0
|
@@ -25,12 +25,6 @@ const cmd = (transport, { request }) => new Observable(o => {
|
|
|
25
25
|
if (!deviceInfo.onboarded && !deviceInfo.isRecoveryMode) {
|
|
26
26
|
throw new DeviceNotOnboarded();
|
|
27
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
|
-
}
|
|
34
28
|
if (deviceInfo.isBootloader) {
|
|
35
29
|
return of({
|
|
36
30
|
type: "bootloader",
|
|
@@ -43,6 +37,12 @@ const cmd = (transport, { request }) => new Observable(o => {
|
|
|
43
37
|
deviceInfo,
|
|
44
38
|
});
|
|
45
39
|
}
|
|
40
|
+
if (isCharonSupported(deviceInfo.seVersion ?? "", identifyTargetId(deviceInfo.seTargetId ?? 0)?.id)) {
|
|
41
|
+
const onboardingState = extractOnboardingState(deviceInfo.seFlags, deviceInfo.charonState);
|
|
42
|
+
if (onboardingState.currentOnboardingStep === OnboardingStep.BackupCharon) {
|
|
43
|
+
throw new DeviceNotOnboarded();
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
46
|
return concat(of({
|
|
47
47
|
type: "listingApps",
|
|
48
48
|
deviceInfo,
|
|
@@ -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;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,gBAA2C,MAAM,oBAAoB,CAAC;AAG7E,OAAO,EAAE,gCAAgC,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAwBlF,MAAM,GAAG,GAAG,CAAC,SAAoB,EAAE,EAAE,OAAO,EAAS,EAAmC,EAAE,CACxF,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;IACjB,MAAM,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,EAAE,oBAAoB;KACJ,CAAC;SACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACjB,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;SACvC,IAAI,CACH,SAAS,CAAC,UAAU,CAAC,EAAE;QACrB,UAAU,CAAC,WAAW,EAAE,CAAC;QAEzB,IAAI,CAAC,UAAU,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE;YACvD,MAAM,IAAI,kBAAkB,EAAE,CAAC;SAChC;QAED,IACE,iBAAiB,CACf,UAAU,CAAC,SAAS,IAAI,EAAE,EAC1B,gBAAgB,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,EAAE,CACjD,EACD;YACA,MAAM,eAAe,GAAG,sBAAsB,CAC5C,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,WAAW,CACvB,CAAC;YACF,IAAI,eAAe,CAAC,qBAAqB,KAAK,cAAc,CAAC,YAAY,EAAE;gBACzE,MAAM,IAAI,kBAAkB,EAAE,CAAC;aAChC;SACF;QAED,
|
|
1
|
+
{"version":3,"file":"connectManager.js","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;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,
|
|
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,eAqEF,CAAC"}
|
|
@@ -101,6 +101,12 @@ export const extractOnboardingState = (flagsBytes, charonState) => {
|
|
|
101
101
|
throw new DeviceExtractOnboardingStateError("Incorrect onboarding bits for the current onboarding step");
|
|
102
102
|
}
|
|
103
103
|
const currentSeedWordIndex = flagsBytes[2] & currentSeedWordIndexMask;
|
|
104
|
+
const charonSupported = charonState !== undefined && charonState.length > 0;
|
|
105
|
+
const charonOnboardingBits = charonSupported ? charonState[0] & 0xf : 0;
|
|
106
|
+
//const charonUpdateBits = charonSupported ? (charonState[0] & 0x30) >> 4 : 0;
|
|
107
|
+
const charonStatus = charonSupported && fromBitsToCharonStatusMap.has(charonOnboardingBits)
|
|
108
|
+
? fromBitsToCharonStatusMap.get(charonOnboardingBits)
|
|
109
|
+
: null;
|
|
104
110
|
/*
|
|
105
111
|
* Once the device is seeded, there are some additional states for backing up with Charon (for devices that support it)
|
|
106
112
|
* There are 2 scenarios:
|
|
@@ -111,16 +117,12 @@ export const extractOnboardingState = (flagsBytes, charonState) => {
|
|
|
111
117
|
*/
|
|
112
118
|
if (isOnboarded &&
|
|
113
119
|
[OnboardingStep.Ready, OnboardingStep.WelcomeScreen1].includes(currentOnboardingStep) &&
|
|
114
|
-
|
|
115
|
-
currentOnboardingStep = fromBitsToOnboardingStep.get(
|
|
120
|
+
charonSupported) {
|
|
121
|
+
currentOnboardingStep = fromBitsToOnboardingStep.get(charonOnboardingBits + CHARON_STEP_BIT_MASK);
|
|
116
122
|
if (!currentOnboardingStep) {
|
|
117
123
|
throw new DeviceExtractOnboardingStateError("Incorrect onboarding bits for the current charon step");
|
|
118
124
|
}
|
|
119
125
|
}
|
|
120
|
-
const charonSupported = charonState !== undefined && charonState.length > 0;
|
|
121
|
-
const charonStatus = charonSupported && fromBitsToCharonStatusMap.has(charonState[0])
|
|
122
|
-
? fromBitsToCharonStatusMap.get(charonState[0])
|
|
123
|
-
: null;
|
|
124
126
|
return {
|
|
125
127
|
isOnboarded,
|
|
126
128
|
isInRecoveryMode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractOnboardingState.js","sourceRoot":"","sources":["../../src/hw/extractOnboardingState.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extractOnboardingState.js","sourceRoot":"","sources":["../../src/hw/extractOnboardingState.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,13 @@ describe("@hw/extractOnboardingState", () => {
|
|
|
25
25
|
expect(onboardingState?.currentOnboardingStep).toBe(OnboardingStep.Ready);
|
|
26
26
|
expect(onboardingState?.charonStatus).toBeNull();
|
|
27
27
|
});
|
|
28
|
+
it("should ignore charon update status", () => {
|
|
29
|
+
const charonState = Buffer.from([0x20]);
|
|
30
|
+
const onboardingState = extractOnboardingState(flagsBytes, charonState);
|
|
31
|
+
expect(onboardingState).not.toBeNull();
|
|
32
|
+
expect(onboardingState?.currentOnboardingStep).toBe(OnboardingStep.Ready);
|
|
33
|
+
expect(onboardingState?.charonStatus).toBeNull();
|
|
34
|
+
});
|
|
28
35
|
});
|
|
29
36
|
describe("and the user refuse to backup the charon", () => {
|
|
30
37
|
it("should return an onboarding step that is set at ready", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractOnboardingState.test.js","sourceRoot":"","sources":["../../src/hw/extractOnboardingState.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extractOnboardingState.test.js","sourceRoot":"","sources":["../../src/hw/extractOnboardingState.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOnboardingStatePolling.d.ts","sourceRoot":"","sources":["../../src/hw/getOnboardingStatePolling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAuB,MAAM,MAAM,CAAC;AAiB7E,OAAO,EAA0B,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"getOnboardingStatePolling.d.ts","sourceRoot":"","sources":["../../src/hw/getOnboardingStatePolling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAuB,MAAM,MAAM,CAAC;AAiB7E,OAAO,EAA0B,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGnF,MAAM,MAAM,4BAA4B,GAAG;IACzC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,YAAY,EAAE,KAAK,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,UAAU,CAAC,4BAA4B,CAAC,CAAC;AAEvF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,EAAE,CAAC;CACtD,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,yBAAyB,oGAMnC,6BAA6B,oCA+E/B,CAAC;AAEF,eAAO,MAAM,oCAAoC,UAAW,OAAO,KAAG,OAmBrE,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { getVersion } from "../device/use-cases/getVersionUseCase";
|
|
|
4
4
|
import { withDevice } from "./deviceAccess";
|
|
5
5
|
import { TransportStatusError, DeviceOnboardingStatePollingError, DeviceExtractOnboardingStateError, DisconnectedDevice, CantOpenDevice, TransportRaceCondition, LockedDeviceError, UnexpectedBootloader, TransportExchangeTimeoutError, DisconnectedDeviceDuringOperation, } from "@ledgerhq/errors";
|
|
6
6
|
import { extractOnboardingState } from "./extractOnboardingState";
|
|
7
|
+
import { DeviceDisconnectedWhileSendingError } from "@ledgerhq/device-management-kit";
|
|
7
8
|
/**
|
|
8
9
|
* Polls the device onboarding state at a given frequency
|
|
9
10
|
*
|
|
@@ -93,6 +94,7 @@ export const isAllowedOnboardingStatePollingError = (error) => {
|
|
|
93
94
|
error instanceof TransportExchangeTimeoutError ||
|
|
94
95
|
error instanceof DisconnectedDevice ||
|
|
95
96
|
error instanceof DisconnectedDeviceDuringOperation ||
|
|
97
|
+
error instanceof DeviceDisconnectedWhileSendingError ||
|
|
96
98
|
error instanceof CantOpenDevice ||
|
|
97
99
|
error instanceof TransportRaceCondition ||
|
|
98
100
|
error instanceof TransportStatusError ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOnboardingStatePolling.js","sourceRoot":"","sources":["../../src/hw/getOnboardingStatePolling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAc,YAAY,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7E,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EACL,oBAAoB,EACpB,iCAAiC,EACjC,iCAAiC,EACjC,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,6BAA6B,EAC7B,iCAAiC,GAClC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,sBAAsB,EAAmB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"getOnboardingStatePolling.js","sourceRoot":"","sources":["../../src/hw/getOnboardingStatePolling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAc,YAAY,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7E,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EACL,oBAAoB,EACpB,iCAAiC,EACjC,iCAAiC,EACjC,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,6BAA6B,EAC7B,iCAAiC,GAClC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,sBAAsB,EAAmB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,mCAAmC,EAAE,MAAM,iCAAiC,CAAC;AAkBtF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACxC,QAAQ,EACR,eAAe,EACf,uBAAuB,GAAG,eAAe,GAAG,GAAG,EAC/C,kBAAkB,GAAG,eAAe,GAAG,EAAE,EAAE,qBAAqB;AAChE,kBAAkB,GAAG,EAAE,GACO,EAAmC,EAAE;IACnE,MAAM,sBAAsB,GAAG,GAA6C,EAAE;QAC5E,OAAO,UAAU,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAC1E,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,cAAc,EAAE,uBAAuB,EAAE,CAAC,CAAC,CACjE,CAAC,IAAI,CACJ,OAAO,CAAC,kBAAkB,CAAC,EAAE,wBAAwB;QACrD,KAAK,EAAE,EACP,UAAU,CAAC,CAAC,KAAc,EAAE,EAAE;YAC5B,IACE,oCAAoC,CAAC,KAAK,CAAC;gBAC3C,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EACzC;gBACA,kFAAkF;gBAClF,OAAO,EAAE,CAAC,KAAc,CAAC,CAAC;aAC3B;YAED,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,EACF,GAAG,CAAC,CAAC,KAA2B,EAAE,EAAE;YAClC,IAAI,OAAO,IAAI,KAAK,EAAE;gBACpB,MAAM,YAAY,GAAG,KAAqB,CAAC;gBAC3C,IAAI,eAAe,GAA2B,IAAI,CAAC;gBAEnD,IAAI,YAAY,CAAC,YAAY,EAAE;oBAC7B,gDAAgD;oBAChD,MAAM,IAAI,oBAAoB,CAAC,yCAAyC,CAAC,CAAC;iBAC3E;gBAED,IAAI;oBACF,eAAe,GAAG,sBAAsB,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;iBACxF;gBAAC,OAAO,KAAc,EAAE;oBACvB,IAAI,KAAK,YAAY,iCAAiC,EAAE;wBACtD,OAAO;4BACL,eAAe,EAAE,IAAI;4BACrB,YAAY,EAAE,KAAK;4BACnB,YAAY,EAAE,KAAK;yBACpB,CAAC;qBACH;yBAAM;wBACL,IAAI,YAAY,GAAG,EAAE,CAAC;wBACtB,IAAI,KAAK,YAAY,KAAK,EAAE;4BAC1B,YAAY,GAAG,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;yBAClD;6BAAM;4BACL,YAAY,GAAG,GAAG,KAAK,EAAE,CAAC;yBAC3B;wBAED,OAAO;4BACL,eAAe,EAAE,IAAI;4BACrB,YAAY,EAAE,IAAI,iCAAiC,CACjD,uEAAuE,YAAY,EAAE,CACtF;4BACD,YAAY,EAAE,KAAK;yBACpB,CAAC;qBACH;iBACF;gBACD,OAAO;oBACL,eAAe;oBACf,YAAY,EAAE,IAAI;oBAClB,YAAY,EAAE,KAAK;iBACpB,CAAC;aACH;iBAAM;gBACL,iEAAiE;gBACjE,mEAAmE;gBACnE,MAAM,YAAY,GAAG,KAAc,CAAC;gBAEpC,OAAO;oBACL,eAAe,EAAE,IAAI;oBACrB,YAAY,EAAE,YAAY;oBAC1B,YAAY,EAAE,YAAY,YAAY,iBAAiB;iBACxD,CAAC;aACH;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,EAAE,CAAC,IAAI,CAClC,MAAM,CAAC;QACL,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC;KACxC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAAC,KAAc,EAAW,EAAE;IAC9E,IACE,KAAK;QACL,4CAA4C;QAC5C,CAAC,KAAK,YAAY,YAAY;YAC5B,KAAK,YAAY,6BAA6B;YAC9C,KAAK,YAAY,kBAAkB;YACnC,KAAK,YAAY,iCAAiC;YAClD,KAAK,YAAY,mCAAmC;YACpD,KAAK,YAAY,cAAc;YAC/B,KAAK,YAAY,sBAAsB;YACvC,KAAK,YAAY,oBAAoB;YACrC,iDAAiD;YACjD,KAAK,YAAY,iBAAiB,CAAC,EACrC;QACA,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { withDevice } from "./deviceAccess";
|
|
|
8
8
|
import { getVersion } from "../device/use-cases/getVersionUseCase";
|
|
9
9
|
import { extractOnboardingState, OnboardingStep } from "./extractOnboardingState";
|
|
10
10
|
import { SeedPhraseType } from "@ledgerhq/types-live";
|
|
11
|
+
import { DeviceDisconnectedWhileSendingError } from "@ledgerhq/device-management-kit";
|
|
11
12
|
jest.mock("./deviceAccess");
|
|
12
13
|
jest.mock("../device/use-cases/getVersionUseCase");
|
|
13
14
|
jest.mock("./extractOnboardingState");
|
|
@@ -78,6 +79,29 @@ describe("getOnboardingStatePolling", () => {
|
|
|
78
79
|
// The timeout is equal to pollingPeriodMs by default
|
|
79
80
|
jest.advanceTimersByTime(pollingPeriodMs - 1);
|
|
80
81
|
});
|
|
82
|
+
it("should update the onboarding state to null and keep track of the allowed DMK error", done => {
|
|
83
|
+
mockedGetVersion.mockRejectedValue(new DeviceDisconnectedWhileSendingError("An allowed error"));
|
|
84
|
+
mockedExtractOnboardingState.mockReturnValue(anOnboardingState);
|
|
85
|
+
const device = aDevice;
|
|
86
|
+
getOnboardingStatePolling({
|
|
87
|
+
deviceId: device.deviceId,
|
|
88
|
+
pollingPeriodMs,
|
|
89
|
+
}).subscribe({
|
|
90
|
+
next: value => {
|
|
91
|
+
try {
|
|
92
|
+
expect(value.onboardingState).toBeNull();
|
|
93
|
+
expect(value.allowedError).toBeInstanceOf(DeviceDisconnectedWhileSendingError);
|
|
94
|
+
expect(value.lockedDevice).toBe(false);
|
|
95
|
+
done();
|
|
96
|
+
}
|
|
97
|
+
catch (expectError) {
|
|
98
|
+
done(expectError);
|
|
99
|
+
}
|
|
100
|
+
},
|
|
101
|
+
});
|
|
102
|
+
// The timeout is equal to pollingPeriodMs by default
|
|
103
|
+
jest.advanceTimersByTime(pollingPeriodMs - 1);
|
|
104
|
+
});
|
|
81
105
|
});
|
|
82
106
|
describe("and when the error is due to a locked device", () => {
|
|
83
107
|
it("should update the lockedDevice, update the onboarding state to null and keep track of the allowed error", done => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOnboardingStatePolling.test.js","sourceRoot":"","sources":["../../src/hw/getOnboardingStatePolling.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,IAAI,EAAgB,YAAY,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,KAAK,aAAa,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EACL,iCAAiC,EACjC,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAmB,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"getOnboardingStatePolling.test.js","sourceRoot":"","sources":["../../src/hw/getOnboardingStatePolling.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/live-common",
|
|
3
3
|
"description": "Common ground for the Ledger Live apps",
|
|
4
|
-
"version": "34.
|
|
4
|
+
"version": "34.41.0-nightly.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/LedgerHQ/ledger-live.git"
|
|
@@ -162,43 +162,43 @@
|
|
|
162
162
|
"xstate": "^5.19.2",
|
|
163
163
|
"yargs": "^17.0.0",
|
|
164
164
|
"zod": "^3.22.4",
|
|
165
|
-
"@ledgerhq/coin-algorand": "^0.9.
|
|
166
|
-
"@ledgerhq/coin-aptos": "^2.5.
|
|
167
|
-
"@ledgerhq/coin-bitcoin": "^0.16.
|
|
168
|
-
"@ledgerhq/coin-cardano": "^0.8.
|
|
169
|
-
"@ledgerhq/coin-casper": "^2.0.
|
|
170
|
-
"@ledgerhq/coin-celo": "^1.1.
|
|
171
|
-
"@ledgerhq/coin-cosmos": "^0.16.
|
|
172
|
-
"@ledgerhq/coin-evm": "^2.
|
|
173
|
-
"@ledgerhq/coin-filecoin": "^1.9.
|
|
174
|
-
"@ledgerhq/coin-framework": "^5.5.
|
|
175
|
-
"@ledgerhq/coin-hedera": "^1.8.
|
|
176
|
-
"@ledgerhq/coin-icon": "^0.
|
|
177
|
-
"@ledgerhq/coin-internet_computer": "^1.7.
|
|
178
|
-
"@ledgerhq/coin-mina": "^1.1.
|
|
179
|
-
"@ledgerhq/coin-multiversx": "^0.4.
|
|
180
|
-
"@ledgerhq/coin-near": "^0.11.
|
|
181
|
-
"@ledgerhq/coin-polkadot": "^6.3.
|
|
182
|
-
"@ledgerhq/coin-solana": "^0.27.
|
|
183
|
-
"@ledgerhq/coin-stacks": "^0.8.
|
|
184
|
-
"@ledgerhq/coin-stellar": "^5.3.
|
|
185
|
-
"@ledgerhq/coin-sui": "^0.6.
|
|
186
|
-
"@ledgerhq/coin-tezos": "^5.
|
|
187
|
-
"@ledgerhq/coin-ton": "^0.13.
|
|
188
|
-
"@ledgerhq/coin-tron": "^4.4.
|
|
189
|
-
"@ledgerhq/coin-vechain": "^2.7.
|
|
190
|
-
"@ledgerhq/coin-xrp": "^6.3.
|
|
165
|
+
"@ledgerhq/coin-algorand": "^0.9.13-nightly.0",
|
|
166
|
+
"@ledgerhq/coin-aptos": "^2.5.1-nightly.0",
|
|
167
|
+
"@ledgerhq/coin-bitcoin": "^0.16.4-nightly.0",
|
|
168
|
+
"@ledgerhq/coin-cardano": "^0.8.13-nightly.0",
|
|
169
|
+
"@ledgerhq/coin-casper": "^2.0.4-nightly.0",
|
|
170
|
+
"@ledgerhq/coin-celo": "^1.1.11-nightly.0",
|
|
171
|
+
"@ledgerhq/coin-cosmos": "^0.16.2-nightly.0",
|
|
172
|
+
"@ledgerhq/coin-evm": "^2.22.7-nightly.0",
|
|
173
|
+
"@ledgerhq/coin-filecoin": "^1.9.13-nightly.0",
|
|
174
|
+
"@ledgerhq/coin-framework": "^5.5.1-nightly.0",
|
|
175
|
+
"@ledgerhq/coin-hedera": "^1.8.2-nightly.0",
|
|
176
|
+
"@ledgerhq/coin-icon": "^0.10.13-nightly.0",
|
|
177
|
+
"@ledgerhq/coin-internet_computer": "^1.7.13-nightly.0",
|
|
178
|
+
"@ledgerhq/coin-mina": "^1.1.12-nightly.0",
|
|
179
|
+
"@ledgerhq/coin-multiversx": "^0.4.13-nightly.0",
|
|
180
|
+
"@ledgerhq/coin-near": "^0.11.13-nightly.0",
|
|
181
|
+
"@ledgerhq/coin-polkadot": "^6.3.1-nightly.0",
|
|
182
|
+
"@ledgerhq/coin-solana": "^0.27.2-nightly.0",
|
|
183
|
+
"@ledgerhq/coin-stacks": "^0.8.13-nightly.0",
|
|
184
|
+
"@ledgerhq/coin-stellar": "^5.3.1-nightly.0",
|
|
185
|
+
"@ledgerhq/coin-sui": "^0.6.1-nightly.0",
|
|
186
|
+
"@ledgerhq/coin-tezos": "^5.6.0-nightly.0",
|
|
187
|
+
"@ledgerhq/coin-ton": "^0.13.2-nightly.0",
|
|
188
|
+
"@ledgerhq/coin-tron": "^4.4.1-nightly.0",
|
|
189
|
+
"@ledgerhq/coin-vechain": "^2.7.13-nightly.0",
|
|
190
|
+
"@ledgerhq/coin-xrp": "^6.3.1-nightly.0",
|
|
191
191
|
"@ledgerhq/crypto-icons-ui": "^1.16.0-nightly.0",
|
|
192
|
-
"@ledgerhq/cryptoassets": "^13.21.0
|
|
193
|
-
"@ledgerhq/device-core": "^0.5.
|
|
192
|
+
"@ledgerhq/cryptoassets": "^13.21.0",
|
|
193
|
+
"@ledgerhq/device-core": "^0.5.2-nightly.0",
|
|
194
194
|
"@ledgerhq/devices": "8.4.7",
|
|
195
195
|
"@ledgerhq/errors": "^6.22.0",
|
|
196
196
|
"@ledgerhq/hw-app-algorand": "^6.31.3",
|
|
197
197
|
"@ledgerhq/hw-app-aptos": "^6.34.3",
|
|
198
198
|
"@ledgerhq/hw-app-btc": "^10.9.3",
|
|
199
|
-
"@ledgerhq/hw-app-celo": "^6.33.
|
|
199
|
+
"@ledgerhq/hw-app-celo": "^6.33.9-nightly.0",
|
|
200
200
|
"@ledgerhq/hw-app-cosmos": "^6.32.3",
|
|
201
|
-
"@ledgerhq/hw-app-eth": "^6.45.
|
|
201
|
+
"@ledgerhq/hw-app-eth": "^6.45.11-nightly.0",
|
|
202
202
|
"@ledgerhq/hw-app-exchange": "^0.10.3",
|
|
203
203
|
"@ledgerhq/hw-app-hedera": "^1.2.3",
|
|
204
204
|
"@ledgerhq/hw-app-icon": "^1.3.3",
|
|
@@ -206,26 +206,26 @@
|
|
|
206
206
|
"@ledgerhq/hw-app-near": "^6.31.3",
|
|
207
207
|
"@ledgerhq/hw-app-polkadot": "^6.34.3",
|
|
208
208
|
"@ledgerhq/hw-app-str": "^7.2.3",
|
|
209
|
-
"@ledgerhq/hw-app-sui": "^1.2.0
|
|
209
|
+
"@ledgerhq/hw-app-sui": "^1.2.0",
|
|
210
210
|
"@ledgerhq/hw-app-tezos": "^6.31.3",
|
|
211
211
|
"@ledgerhq/hw-app-trx": "^6.31.3",
|
|
212
|
-
"@ledgerhq/hw-app-vet": "^0.5.9
|
|
212
|
+
"@ledgerhq/hw-app-vet": "^0.5.9",
|
|
213
213
|
"@ledgerhq/hw-app-xrp": "^6.32.1",
|
|
214
214
|
"@ledgerhq/hw-transport": "^6.31.7",
|
|
215
215
|
"@ledgerhq/hw-transport-mocker": "^6.29.7",
|
|
216
|
-
"@ledgerhq/ledger-cal-service": "^1.
|
|
216
|
+
"@ledgerhq/ledger-cal-service": "^1.2.0",
|
|
217
217
|
"@ledgerhq/live-config": "^3.1.0",
|
|
218
|
-
"@ledgerhq/live-countervalues": "^0.5.
|
|
219
|
-
"@ledgerhq/live-countervalues-react": "^0.2.
|
|
220
|
-
"@ledgerhq/live-dmk-shared": "^0.10.0
|
|
218
|
+
"@ledgerhq/live-countervalues": "^0.5.13-nightly.0",
|
|
219
|
+
"@ledgerhq/live-countervalues-react": "^0.2.42-nightly.0",
|
|
220
|
+
"@ledgerhq/live-dmk-shared": "^0.10.0",
|
|
221
221
|
"@ledgerhq/live-env": "^2.11.0",
|
|
222
222
|
"@ledgerhq/live-hooks": "0.1.0",
|
|
223
223
|
"@ledgerhq/live-network": "^2.0.12",
|
|
224
|
-
"@ledgerhq/live-nft": "^0.8.
|
|
224
|
+
"@ledgerhq/live-nft": "^0.8.13-nightly.0",
|
|
225
225
|
"@ledgerhq/live-promise": "^0.1.1",
|
|
226
|
-
"@ledgerhq/live-signer-evm": "^0.5.
|
|
227
|
-
"@ledgerhq/live-signer-solana": "^0.4.
|
|
228
|
-
"@ledgerhq/live-wallet": "^0.11.
|
|
226
|
+
"@ledgerhq/live-signer-evm": "^0.5.6-nightly.0",
|
|
227
|
+
"@ledgerhq/live-signer-solana": "^0.4.1-nightly.0",
|
|
228
|
+
"@ledgerhq/live-wallet": "^0.11.4-nightly.0",
|
|
229
229
|
"@ledgerhq/logs": "^6.13.0",
|
|
230
230
|
"@ledgerhq/speculos-transport": "^0.2.5",
|
|
231
231
|
"@ledgerhq/wallet-api-acre-module": "^0.5.0",
|
|
@@ -277,10 +277,10 @@
|
|
|
277
277
|
"undici": "6.19.2",
|
|
278
278
|
"uuid": "^8.3.2",
|
|
279
279
|
"ws": "7",
|
|
280
|
-
"@ledgerhq/device-react": "^0.2.
|
|
280
|
+
"@ledgerhq/device-react": "^0.2.37-nightly.0",
|
|
281
281
|
"@ledgerhq/types-cryptoassets": "^7.23.0",
|
|
282
282
|
"@ledgerhq/types-devices": "^6.25.3",
|
|
283
|
-
"@ledgerhq/types-live": "^6.
|
|
283
|
+
"@ledgerhq/types-live": "^6.77.0-nightly.0"
|
|
284
284
|
},
|
|
285
285
|
"scripts": {
|
|
286
286
|
"build": "zx ./scripts/build-ts.mjs",
|
package/src/hw/connectManager.ts
CHANGED
|
@@ -64,6 +64,20 @@ const cmd = (transport: Transport, { request }: Input): Observable<ConnectManage
|
|
|
64
64
|
throw new DeviceNotOnboarded();
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
+
if (deviceInfo.isBootloader) {
|
|
68
|
+
return of({
|
|
69
|
+
type: "bootloader",
|
|
70
|
+
deviceInfo,
|
|
71
|
+
} as ConnectManagerEvent);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
if (deviceInfo.isOSU) {
|
|
75
|
+
return of({
|
|
76
|
+
type: "osu",
|
|
77
|
+
deviceInfo,
|
|
78
|
+
} as ConnectManagerEvent);
|
|
79
|
+
}
|
|
80
|
+
|
|
67
81
|
if (
|
|
68
82
|
isCharonSupported(
|
|
69
83
|
deviceInfo.seVersion ?? "",
|
|
@@ -79,20 +93,6 @@ const cmd = (transport: Transport, { request }: Input): Observable<ConnectManage
|
|
|
79
93
|
}
|
|
80
94
|
}
|
|
81
95
|
|
|
82
|
-
if (deviceInfo.isBootloader) {
|
|
83
|
-
return of({
|
|
84
|
-
type: "bootloader",
|
|
85
|
-
deviceInfo,
|
|
86
|
-
} as ConnectManagerEvent);
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
if (deviceInfo.isOSU) {
|
|
90
|
-
return of({
|
|
91
|
-
type: "osu",
|
|
92
|
-
deviceInfo,
|
|
93
|
-
} as ConnectManagerEvent);
|
|
94
|
-
}
|
|
95
|
-
|
|
96
96
|
return concat(
|
|
97
97
|
of({
|
|
98
98
|
type: "listingApps",
|
|
@@ -35,6 +35,15 @@ describe("@hw/extractOnboardingState", () => {
|
|
|
35
35
|
expect(onboardingState?.currentOnboardingStep).toBe(OnboardingStep.Ready);
|
|
36
36
|
expect(onboardingState?.charonStatus).toBeNull();
|
|
37
37
|
});
|
|
38
|
+
|
|
39
|
+
it("should ignore charon update status", () => {
|
|
40
|
+
const charonState = Buffer.from([0x20]);
|
|
41
|
+
const onboardingState = extractOnboardingState(flagsBytes, charonState);
|
|
42
|
+
|
|
43
|
+
expect(onboardingState).not.toBeNull();
|
|
44
|
+
expect(onboardingState?.currentOnboardingStep).toBe(OnboardingStep.Ready);
|
|
45
|
+
expect(onboardingState?.charonStatus).toBeNull();
|
|
46
|
+
});
|
|
38
47
|
});
|
|
39
48
|
|
|
40
49
|
describe("and the user refuse to backup the charon", () => {
|
|
@@ -137,6 +137,14 @@ export const extractOnboardingState = (
|
|
|
137
137
|
|
|
138
138
|
const currentSeedWordIndex = flagsBytes[2] & currentSeedWordIndexMask;
|
|
139
139
|
|
|
140
|
+
const charonSupported = charonState !== undefined && charonState.length > 0;
|
|
141
|
+
const charonOnboardingBits = charonSupported ? charonState[0] & 0xf : 0;
|
|
142
|
+
//const charonUpdateBits = charonSupported ? (charonState[0] & 0x30) >> 4 : 0;
|
|
143
|
+
const charonStatus =
|
|
144
|
+
charonSupported && fromBitsToCharonStatusMap.has(charonOnboardingBits)
|
|
145
|
+
? fromBitsToCharonStatusMap.get(charonOnboardingBits)!
|
|
146
|
+
: null;
|
|
147
|
+
|
|
140
148
|
/*
|
|
141
149
|
* Once the device is seeded, there are some additional states for backing up with Charon (for devices that support it)
|
|
142
150
|
* There are 2 scenarios:
|
|
@@ -148,9 +156,11 @@ export const extractOnboardingState = (
|
|
|
148
156
|
if (
|
|
149
157
|
isOnboarded &&
|
|
150
158
|
[OnboardingStep.Ready, OnboardingStep.WelcomeScreen1].includes(currentOnboardingStep) &&
|
|
151
|
-
|
|
159
|
+
charonSupported
|
|
152
160
|
) {
|
|
153
|
-
currentOnboardingStep = fromBitsToOnboardingStep.get(
|
|
161
|
+
currentOnboardingStep = fromBitsToOnboardingStep.get(
|
|
162
|
+
charonOnboardingBits + CHARON_STEP_BIT_MASK,
|
|
163
|
+
);
|
|
154
164
|
|
|
155
165
|
if (!currentOnboardingStep) {
|
|
156
166
|
throw new DeviceExtractOnboardingStateError(
|
|
@@ -159,12 +169,6 @@ export const extractOnboardingState = (
|
|
|
159
169
|
}
|
|
160
170
|
}
|
|
161
171
|
|
|
162
|
-
const charonSupported = charonState !== undefined && charonState.length > 0;
|
|
163
|
-
const charonStatus =
|
|
164
|
-
charonSupported && fromBitsToCharonStatusMap.has(charonState[0])
|
|
165
|
-
? fromBitsToCharonStatusMap.get(charonState[0])!
|
|
166
|
-
: null;
|
|
167
|
-
|
|
168
172
|
return {
|
|
169
173
|
isOnboarded,
|
|
170
174
|
isInRecoveryMode,
|
|
@@ -13,6 +13,7 @@ import { withDevice } from "./deviceAccess";
|
|
|
13
13
|
import { getVersion } from "../device/use-cases/getVersionUseCase";
|
|
14
14
|
import { extractOnboardingState, OnboardingState, OnboardingStep } from "./extractOnboardingState";
|
|
15
15
|
import { SeedPhraseType } from "@ledgerhq/types-live";
|
|
16
|
+
import { DeviceDisconnectedWhileSendingError } from "@ledgerhq/device-management-kit";
|
|
16
17
|
|
|
17
18
|
jest.mock("./deviceAccess");
|
|
18
19
|
jest.mock("../device/use-cases/getVersionUseCase");
|
|
@@ -95,6 +96,34 @@ describe("getOnboardingStatePolling", () => {
|
|
|
95
96
|
// The timeout is equal to pollingPeriodMs by default
|
|
96
97
|
jest.advanceTimersByTime(pollingPeriodMs - 1);
|
|
97
98
|
});
|
|
99
|
+
|
|
100
|
+
it("should update the onboarding state to null and keep track of the allowed DMK error", done => {
|
|
101
|
+
mockedGetVersion.mockRejectedValue(
|
|
102
|
+
new DeviceDisconnectedWhileSendingError("An allowed error"),
|
|
103
|
+
);
|
|
104
|
+
mockedExtractOnboardingState.mockReturnValue(anOnboardingState);
|
|
105
|
+
|
|
106
|
+
const device = aDevice;
|
|
107
|
+
|
|
108
|
+
getOnboardingStatePolling({
|
|
109
|
+
deviceId: device.deviceId,
|
|
110
|
+
pollingPeriodMs,
|
|
111
|
+
}).subscribe({
|
|
112
|
+
next: value => {
|
|
113
|
+
try {
|
|
114
|
+
expect(value.onboardingState).toBeNull();
|
|
115
|
+
expect(value.allowedError).toBeInstanceOf(DeviceDisconnectedWhileSendingError);
|
|
116
|
+
expect(value.lockedDevice).toBe(false);
|
|
117
|
+
done();
|
|
118
|
+
} catch (expectError) {
|
|
119
|
+
done(expectError);
|
|
120
|
+
}
|
|
121
|
+
},
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
// The timeout is equal to pollingPeriodMs by default
|
|
125
|
+
jest.advanceTimersByTime(pollingPeriodMs - 1);
|
|
126
|
+
});
|
|
98
127
|
});
|
|
99
128
|
|
|
100
129
|
describe("and when the error is due to a locked device", () => {
|