@ledgerhq/live-common 34.51.0-nightly.6 → 34.51.0-nightly.7
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/dada-client/state-manager/api.d.ts.map +1 -1
- package/lib/dada-client/state-manager/api.js +10 -5
- package/lib/dada-client/state-manager/api.js.map +1 -1
- package/lib/dada-client/state-manager/types.d.ts +1 -0
- package/lib/dada-client/state-manager/types.d.ts.map +1 -1
- package/lib/device/use-cases/getAppsCatalogForDevice.d.ts +1 -1
- package/lib/device/use-cases/getAppsCatalogForDevice.d.ts.map +1 -1
- package/lib/e2e/data/deviceLabelsData.d.ts.map +1 -1
- package/lib/e2e/data/deviceLabelsData.js +2 -4
- package/lib/e2e/data/deviceLabelsData.js.map +1 -1
- package/lib/e2e/enum/Device.d.ts +5 -4
- package/lib/e2e/enum/Device.d.ts.map +1 -1
- package/lib/e2e/enum/Device.js +6 -4
- package/lib/e2e/enum/Device.js.map +1 -1
- package/lib/e2e/families/bitcoin.d.ts.map +1 -1
- package/lib/e2e/families/bitcoin.js +4 -3
- package/lib/e2e/families/bitcoin.js.map +1 -1
- package/lib/e2e/families/cardano.js +2 -2
- package/lib/e2e/families/cardano.js.map +1 -1
- package/lib/e2e/families/evm.d.ts.map +1 -1
- package/lib/e2e/families/evm.js +3 -2
- package/lib/e2e/families/evm.js.map +1 -1
- package/lib/e2e/families/solana.d.ts.map +1 -1
- package/lib/e2e/families/solana.js +2 -5
- package/lib/e2e/families/solana.js.map +1 -1
- package/lib/e2e/families/tezos.d.ts.map +1 -1
- package/lib/e2e/families/tezos.js +2 -1
- package/lib/e2e/families/tezos.js.map +1 -1
- package/lib/e2e/index.d.ts +2 -0
- package/lib/e2e/index.d.ts.map +1 -1
- package/lib/e2e/speculos.d.ts +1 -1
- package/lib/e2e/speculos.d.ts.map +1 -1
- package/lib/e2e/speculos.js +53 -60
- package/lib/e2e/speculos.js.map +1 -1
- package/lib/e2e/speculosAppVersion.d.ts +7 -0
- package/lib/e2e/speculosAppVersion.d.ts.map +1 -0
- package/lib/e2e/speculosAppVersion.js +104 -0
- package/lib/e2e/speculosAppVersion.js.map +1 -0
- package/lib/env.react.d.ts +1 -1
- package/lib/env.react.d.ts.map +1 -1
- package/lib/load/speculos.d.ts.map +1 -1
- package/lib/load/speculos.js +1 -0
- package/lib/load/speculos.js.map +1 -1
- package/lib-es/dada-client/state-manager/api.d.ts.map +1 -1
- package/lib-es/dada-client/state-manager/api.js +10 -5
- package/lib-es/dada-client/state-manager/api.js.map +1 -1
- package/lib-es/dada-client/state-manager/types.d.ts +1 -0
- package/lib-es/dada-client/state-manager/types.d.ts.map +1 -1
- package/lib-es/device/use-cases/getAppsCatalogForDevice.d.ts +1 -1
- package/lib-es/device/use-cases/getAppsCatalogForDevice.d.ts.map +1 -1
- package/lib-es/e2e/data/deviceLabelsData.d.ts.map +1 -1
- package/lib-es/e2e/data/deviceLabelsData.js +2 -4
- package/lib-es/e2e/data/deviceLabelsData.js.map +1 -1
- package/lib-es/e2e/enum/Device.d.ts +5 -4
- package/lib-es/e2e/enum/Device.d.ts.map +1 -1
- package/lib-es/e2e/enum/Device.js +6 -4
- package/lib-es/e2e/enum/Device.js.map +1 -1
- package/lib-es/e2e/families/bitcoin.d.ts.map +1 -1
- package/lib-es/e2e/families/bitcoin.js +4 -3
- package/lib-es/e2e/families/bitcoin.js.map +1 -1
- package/lib-es/e2e/families/cardano.js +2 -2
- package/lib-es/e2e/families/cardano.js.map +1 -1
- package/lib-es/e2e/families/evm.d.ts.map +1 -1
- package/lib-es/e2e/families/evm.js +3 -2
- package/lib-es/e2e/families/evm.js.map +1 -1
- package/lib-es/e2e/families/solana.d.ts.map +1 -1
- package/lib-es/e2e/families/solana.js +3 -6
- package/lib-es/e2e/families/solana.js.map +1 -1
- package/lib-es/e2e/families/tezos.d.ts.map +1 -1
- package/lib-es/e2e/families/tezos.js +2 -1
- package/lib-es/e2e/families/tezos.js.map +1 -1
- package/lib-es/e2e/index.d.ts +2 -0
- package/lib-es/e2e/index.d.ts.map +1 -1
- package/lib-es/e2e/speculos.d.ts +1 -1
- package/lib-es/e2e/speculos.d.ts.map +1 -1
- package/lib-es/e2e/speculos.js +19 -25
- package/lib-es/e2e/speculos.js.map +1 -1
- package/lib-es/e2e/speculosAppVersion.d.ts +7 -0
- package/lib-es/e2e/speculosAppVersion.d.ts.map +1 -0
- package/lib-es/e2e/speculosAppVersion.js +74 -0
- package/lib-es/e2e/speculosAppVersion.js.map +1 -0
- package/lib-es/env.react.d.ts +1 -1
- package/lib-es/env.react.d.ts.map +1 -1
- package/lib-es/load/speculos.d.ts.map +1 -1
- package/lib-es/load/speculos.js +1 -0
- package/lib-es/load/speculos.js.map +1 -1
- package/package.json +50 -50
- package/src/dada-client/state-manager/api.ts +10 -5
- package/src/dada-client/state-manager/types.ts +1 -0
- package/src/e2e/data/deviceLabelsData.ts +2 -4
- package/src/e2e/enum/Device.ts +7 -4
- package/src/e2e/families/bitcoin.ts +4 -9
- package/src/e2e/families/cardano.ts +2 -2
- package/src/e2e/families/evm.ts +3 -8
- package/src/e2e/families/solana.ts +2 -7
- package/src/e2e/families/tezos.ts +2 -7
- package/src/e2e/speculos.ts +22 -27
- package/src/e2e/speculosAppVersion.ts +86 -0
- package/src/load/speculos.ts +1 -0
package/lib/load/speculos.js
CHANGED
|
@@ -100,6 +100,7 @@ function appCandidatesMatches(appCandidate, search) {
|
|
|
100
100
|
}
|
|
101
101
|
exports.appCandidatesMatches = appCandidatesMatches;
|
|
102
102
|
const findLatestAppCandidate = (appCandidates, search) => {
|
|
103
|
+
search.firmware = process.env.SPECULOS_FIRMWARE_VERSION;
|
|
103
104
|
let apps = appCandidates.filter(c => appCandidatesMatches(c, search));
|
|
104
105
|
if (apps.length === 0) {
|
|
105
106
|
return null;
|
package/lib/load/speculos.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speculos.js","sourceRoot":"","sources":["../../src/load/speculos.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"speculos.js","sourceRoot":"","sources":["../../src/load/speculos.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/dada-client/state-manager/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAI7F,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,mBAAmB,EACnB,SAAS,EACV,MAAM,SAAS,CAAC;AAmBjB,eAAO,MAAM,aAAa;;;
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/dada-client/state-manager/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAI7F,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,mBAAmB,EACnB,SAAS,EACV,MAAM,SAAS,CAAC;AAmBjB,eAAO,MAAM,aAAa;;;gKAyExB,CAAC;AAEH,eAAO,MAAQ,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2CAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAkB,CAAC"}
|
|
@@ -27,16 +27,18 @@ export const assetsDataApi = createApi({
|
|
|
27
27
|
...(pageParam?.cursor && { cursor: pageParam.cursor }),
|
|
28
28
|
...(queryArg?.useCase && { transaction: queryArg.useCase }),
|
|
29
29
|
...(queryArg?.currencyIds &&
|
|
30
|
-
queryArg?.currencyIds.length > 0 &&
|
|
31
|
-
!queryArg?.useCase && { currencyIds: queryArg.currencyIds }),
|
|
30
|
+
queryArg?.currencyIds.length > 0 && { currencyIds: queryArg.currencyIds }),
|
|
32
31
|
...(queryArg?.search && { search: queryArg.search }),
|
|
33
32
|
product: queryArg.product,
|
|
34
33
|
minVersion: queryArg.version,
|
|
35
|
-
additionalData:
|
|
34
|
+
additionalData: queryArg.additionalData || [
|
|
35
|
+
AssetsAdditionalData.Apy,
|
|
36
|
+
AssetsAdditionalData.MarketTrend,
|
|
37
|
+
],
|
|
36
38
|
};
|
|
37
39
|
const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");
|
|
38
40
|
return {
|
|
39
|
-
url: `${baseUrl}assets`,
|
|
41
|
+
url: `${baseUrl}/assets`,
|
|
40
42
|
params,
|
|
41
43
|
};
|
|
42
44
|
},
|
|
@@ -66,7 +68,10 @@ export const assetsDataApi = createApi({
|
|
|
66
68
|
queryArg?.currencyIds.length > 0 && { currencyIds: queryArg.currencyIds }),
|
|
67
69
|
product: queryArg.product,
|
|
68
70
|
minVersion: queryArg.version,
|
|
69
|
-
additionalData:
|
|
71
|
+
additionalData: queryArg.additionalData || [
|
|
72
|
+
AssetsAdditionalData.Apy,
|
|
73
|
+
AssetsAdditionalData.MarketTrend,
|
|
74
|
+
],
|
|
70
75
|
};
|
|
71
76
|
const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");
|
|
72
77
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/dada-client/state-manager/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAsB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EACL,oBAAoB,EACpB,cAAc,GAIf,MAAM,SAAS,CAAC;AAEjB,SAAS,uBAAuB,CAC9B,QAAwB,EACxB,IAAyB;IAEzB,MAAM,+BAA+B,GAAG,gBAAgB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAE3F,MAAM,UAAU,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC;IAE7E,OAAO;QACL,GAAG,QAAQ;QACX,uBAAuB,EAAE,+BAA+B;QACxD,UAAU,EAAE;YACV,UAAU;SACX;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC;IACrC,WAAW,EAAE,eAAe;IAC5B,SAAS,EAAE,cAAc,CAAC;QACxB,OAAO,EAAE,EAAE,EAAE,8BAA8B;KAC5C,CAAC;IACF,QAAQ,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC;IACjC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACnB,aAAa,EAAE,KAAK,CAAC,aAAa,CAA2D;YAC3F,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACjC,MAAM,MAAM,GAAG;oBACb,QAAQ,EAAE,GAAG;oBACb,GAAG,CAAC,SAAS,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC;oBACtD,GAAG,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAC3D,GAAG,CAAC,QAAQ,EAAE,WAAW;wBACvB,QAAQ,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/dada-client/state-manager/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/dada-client/state-manager/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,oBAAY,cAAc;IACxB,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB;IAC9B,GAAG,QAAQ;IACX,WAAW,gBAAgB;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/dada-client/state-manager/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,oBAAY,cAAc;IACxB,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB;IAC9B,GAAG,QAAQ;IACX,WAAW,gBAAgB;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,oBAAoB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,wBAAyB,SAAQ,UAAU;IAC1D,UAAU,EAAE;QACV,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ManagerApiRepository } from "@ledgerhq/device-core";
|
|
2
2
|
import { DeviceInfo } from "@ledgerhq/types-live";
|
|
3
|
-
export declare function getAppsCatalogForDevice(deviceInfo: DeviceInfo, managerApiRepository?: ManagerApiRepository): Promise<import("@ledgerhq/device-core
|
|
3
|
+
export declare function getAppsCatalogForDevice(deviceInfo: DeviceInfo, managerApiRepository?: ManagerApiRepository): Promise<import("@ledgerhq/device-core").ApplicationV2Entity[]>;
|
|
4
4
|
//# sourceMappingURL=getAppsCatalogForDevice.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAppsCatalogForDevice.d.ts","sourceRoot":"","sources":["../../../src/device/use-cases/getAppsCatalogForDevice.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAErB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,UAAU,EACtB,oBAAoB,GAAE,oBAAoE,
|
|
1
|
+
{"version":3,"file":"getAppsCatalogForDevice.d.ts","sourceRoot":"","sources":["../../../src/device/use-cases/getAppsCatalogForDevice.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAErB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,UAAU,EACtB,oBAAoB,GAAE,oBAAoE,kEAK3F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceLabelsData.d.ts","sourceRoot":"","sources":["../../../src/e2e/data/deviceLabelsData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIlD,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE;QACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,cAAc,EAAE;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,cAAc,EAAE;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,WAAW,CAAC;CACtB,GAAG;KACD,GAAG,IAAI,aAAa,CAAC,CAAC,EAAE,WAAW;CACrC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"deviceLabelsData.d.ts","sourceRoot":"","sources":["../../../src/e2e/data/deviceLabelsData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIlD,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE;QACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,cAAc,EAAE;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,cAAc,EAAE;QACd,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,OAAO,EAAE,WAAW,CAAC;CACtB,GAAG;KACD,GAAG,IAAI,aAAa,CAAC,CAAC,EAAE,WAAW;CACrC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAoElC,CAAC"}
|
|
@@ -39,7 +39,7 @@ export const DEVICE_LABELS_CONFIG = {
|
|
|
39
39
|
[AppInfos.ETHEREUM.name]: DeviceLabels.VERIFY_ETHEREUM,
|
|
40
40
|
[AppInfos.POLKADOT.name]: DeviceLabels.PLEASE_REVIEW,
|
|
41
41
|
[AppInfos.POLYGON.name]: DeviceLabels.VERIFY_POLYGON,
|
|
42
|
-
[AppInfos.SOLANA.name]: DeviceLabels.
|
|
42
|
+
[AppInfos.SOLANA.name]: DeviceLabels.PUBKEY,
|
|
43
43
|
default: DeviceLabels.ADDRESS,
|
|
44
44
|
},
|
|
45
45
|
receiveConfirm: {
|
|
@@ -49,14 +49,13 @@ export const DEVICE_LABELS_CONFIG = {
|
|
|
49
49
|
[AppInfos.ETHEREUM.name]: DeviceLabels.CONFIRM,
|
|
50
50
|
[AppInfos.POLKADOT.name]: DeviceLabels.CAPS_APPROVE,
|
|
51
51
|
[AppInfos.POLYGON.name]: DeviceLabels.CONFIRM,
|
|
52
|
-
[AppInfos.SOLANA.name]: DeviceLabels.CONFIRM,
|
|
53
52
|
default: DeviceLabels.APPROVE,
|
|
54
53
|
},
|
|
55
54
|
delegateVerify: {
|
|
56
55
|
[AppInfos.COSMOS.name]: DeviceLabels.PLEASE_REVIEW,
|
|
57
56
|
[AppInfos.MULTIVERS_X.name]: DeviceLabels.RECEIVER,
|
|
58
57
|
[AppInfos.NEAR.name]: DeviceLabels.VIEW_HEADER,
|
|
59
|
-
[AppInfos.SOLANA.name]: DeviceLabels.
|
|
58
|
+
[AppInfos.SOLANA.name]: DeviceLabels.DELEGATE_FROM,
|
|
60
59
|
default: DeviceLabels.REVIEW_OPERATION,
|
|
61
60
|
},
|
|
62
61
|
delegateConfirm: {
|
|
@@ -66,7 +65,6 @@ export const DEVICE_LABELS_CONFIG = {
|
|
|
66
65
|
[AppInfos.INJECTIVE.name]: DeviceLabels.CAPS_APPROVE,
|
|
67
66
|
[AppInfos.MULTIVERS_X.name]: DeviceLabels.SIGN,
|
|
68
67
|
[AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
|
|
69
|
-
[AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
|
|
70
68
|
[AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
|
|
71
69
|
default: DeviceLabels.APPROVE,
|
|
72
70
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceLabelsData.js","sourceRoot":"","sources":["../../../src/e2e/data/deviceLabelsData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AA2BpD,MAAM,CAAC,MAAM,oBAAoB,GAAuB;IACtD,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;QACrB,aAAa,EAAE;YACb,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,cAAc;YACrD,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM;YAC3C,OAAO,EAAE,YAAY,CAAC,OAAO;SAC9B;QACD,cAAc,EAAE;YACd,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,YAAY;YACjD,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,YAAY;YACnD,OAAO,EAAE,YAAY,CAAC,OAAO;SAC9B;QACD,cAAc,EAAE;YACd,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,aAAa;YAClD,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,QAAQ;YAClD,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,WAAW;YAC9C,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,aAAa;YAClD,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,gBAAgB;YACpD,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,QAAQ;YAChD,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,QAAQ;YAC9C,OAAO,EAAE,YAAY,CAAC,gBAAgB;SACvC;QACD,eAAe,EAAE;YACf,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM;YACzC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI;YAC9C,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,kBAAkB;YACrD,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,OAAO;YAC5C,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,WAAW;YAC/C,OAAO,EAAE,YAAY,CAAC,YAAY;SACnC;KACF;IACD,OAAO,EAAE;QACP,aAAa,EAAE;YACb,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,UAAU;YAClD,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,aAAa;YAClD,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,eAAe;YACtD,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,aAAa;YACpD,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,cAAc;YACpD,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"deviceLabelsData.js","sourceRoot":"","sources":["../../../src/e2e/data/deviceLabelsData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export declare class Device {
|
|
2
2
|
readonly name: string;
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
static readonly
|
|
6
|
-
static readonly
|
|
3
|
+
readonly targetId: number;
|
|
4
|
+
constructor(name: string, targetId: number);
|
|
5
|
+
static readonly LNS: Device;
|
|
6
|
+
static readonly LNX: Device;
|
|
7
|
+
static readonly LNSP: Device;
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=Device.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../../src/e2e/enum/Device.ts"],"names":[],"mappings":"AAAA,qBAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../../src/e2e/enum/Device.ts"],"names":[],"mappings":"AAAA,qBAAa,MAAM;aAEC,IAAI,EAAE,MAAM;aACZ,QAAQ,EAAE,MAAM;gBADhB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM;IAGlC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAkC;IACrD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAkC;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAmC;CACxD"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
export class Device {
|
|
2
2
|
name;
|
|
3
|
-
|
|
3
|
+
targetId;
|
|
4
|
+
constructor(name, targetId) {
|
|
4
5
|
this.name = name;
|
|
6
|
+
this.targetId = targetId;
|
|
5
7
|
}
|
|
6
|
-
static LNS = "nanoS";
|
|
7
|
-
static LNX = "nanoX";
|
|
8
|
-
static LNSP = "nanoSP";
|
|
8
|
+
static LNS = new Device("nanoS", 823132164);
|
|
9
|
+
static LNX = new Device("nanoX", 855638020);
|
|
10
|
+
static LNSP = new Device("nanoSP", 856686596);
|
|
9
11
|
}
|
|
10
12
|
//# sourceMappingURL=Device.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../src/e2e/enum/Device.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;
|
|
1
|
+
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../src/e2e/enum/Device.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;IAEC;IACA;IAFlB,YACkB,IAAY,EACZ,QAAgB;QADhB,SAAI,GAAJ,IAAI,CAAQ;QACZ,aAAQ,GAAR,QAAQ,CAAQ;IAC/B,CAAC;IAEJ,MAAM,CAAU,GAAG,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,CAAU,GAAG,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,CAAU,IAAI,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitcoin.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/bitcoin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"bitcoin.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/bitcoin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,WAAW,iBAUrD;AAED,wBAAsB,OAAO,CAAC,EAAE,EAAE,WAAW,iBAsB5C"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import expect from "expect";
|
|
2
|
-
import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent
|
|
2
|
+
import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
|
|
3
|
+
import { getSpeculosModel } from "../speculosAppVersion";
|
|
3
4
|
import { DeviceLabels } from "../enum/DeviceLabels";
|
|
4
5
|
import { Device } from "../enum/Device";
|
|
5
6
|
import invariant from "invariant";
|
|
@@ -17,7 +18,7 @@ export async function sendBTCBasedCoin(tx) {
|
|
|
17
18
|
export async function sendBTC(tx) {
|
|
18
19
|
const speculosDevice = getSpeculosModel();
|
|
19
20
|
try {
|
|
20
|
-
const events = speculosDevice === Device.LNS
|
|
21
|
+
const events = speculosDevice === Device.LNS.name
|
|
21
22
|
? await pressUntilTextFound(DeviceLabels.CONTINUE)
|
|
22
23
|
: await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
|
|
23
24
|
const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
|
|
@@ -25,7 +26,7 @@ export async function sendBTC(tx) {
|
|
|
25
26
|
const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
|
|
26
27
|
expect(isAddressCorrect).toBeTruthy();
|
|
27
28
|
await pressBoth();
|
|
28
|
-
if (speculosDevice === Device.LNS) {
|
|
29
|
+
if (speculosDevice === Device.LNS.name) {
|
|
29
30
|
await pressUntilTextFound(DeviceLabels.SIGN);
|
|
30
31
|
await pressBoth();
|
|
31
32
|
await waitFor(DeviceLabels.BITCOIN_IS_READY);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitcoin.js","sourceRoot":"","sources":["../../../src/e2e/families/bitcoin.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,
|
|
1
|
+
{"version":3,"file":"bitcoin.js","sourceRoot":"","sources":["../../../src/e2e/families/bitcoin.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAe;IACpD,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;IACtC,MAAM,SAAS,EAAE,CAAC;IAClB,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAe;IAC3C,MAAM,cAAc,GAAG,gBAAgB,EAAE,CAAC;IAC1C,IAAI;QACF,MAAM,MAAM,GACV,cAAc,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI;YAChC,CAAC,CAAC,MAAM,mBAAmB,CAAC,YAAY,CAAC,QAAQ,CAAC;YAClD,CAAC,CAAC,MAAM,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC/D,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,SAAS,EAAE,CAAC;QAClB,IAAI,cAAc,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;YACtC,MAAM,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,SAAS,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;SAC9C;aAAM;YACL,MAAM,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;SAChD;KACF;IAAC,OAAO,CAAC,EAAE;QACV,SAAS,CAAC,KAAK,EAAE,wCAAwC,CAAC,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { pressBoth, pressUntilTextFound, containsSubstringInEvent, waitFor, pres
|
|
|
3
3
|
import { DeviceLabels } from "../enum/DeviceLabels";
|
|
4
4
|
import { Device } from "../enum/Device";
|
|
5
5
|
export async function sendCardano(tx) {
|
|
6
|
-
const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS;
|
|
6
|
+
const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS.name;
|
|
7
7
|
await waitFor(DeviceLabels.NEW_ORDINARY);
|
|
8
8
|
await (isNanoS ? pressRightButton() : pressBoth());
|
|
9
9
|
if (isNanoS) {
|
|
@@ -57,7 +57,7 @@ export async function delegateCardano() {
|
|
|
57
57
|
[DeviceLabels.CONFIRM, "right"],
|
|
58
58
|
[DeviceLabels.CONFIRM, "right"],
|
|
59
59
|
];
|
|
60
|
-
const steps = process.env.SPECULOS_DEVICE === Device.LNS ? LNSSpecificSteps : commonSteps;
|
|
60
|
+
const steps = process.env.SPECULOS_DEVICE === Device.LNS.name ? LNSSpecificSteps : commonSteps;
|
|
61
61
|
for (const [label, action] of steps) {
|
|
62
62
|
try {
|
|
63
63
|
await waitFor(label);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cardano.js","sourceRoot":"","sources":["../../../src/e2e/families/cardano.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,wBAAwB,EACxB,OAAO,EACP,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAe;IAC/C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"cardano.js","sourceRoot":"","sources":["../../../src/e2e/families/cardano.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpE,wBAAsB,OAAO,CAAC,EAAE,EAAE,WAAW,iBAgB5C;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,cAAc,iBAMlD"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import expect from "expect";
|
|
2
|
-
import { pressBoth, pressUntilTextFound, containsSubstringInEvent, waitFor
|
|
2
|
+
import { pressBoth, pressUntilTextFound, containsSubstringInEvent, waitFor } from "../speculos";
|
|
3
|
+
import { getSpeculosModel } from "../speculosAppVersion";
|
|
3
4
|
import { DeviceLabels } from "../enum/DeviceLabels";
|
|
4
5
|
import { Device } from "../enum/Device";
|
|
5
6
|
import { DeviceModelId } from "@ledgerhq/types-devices";
|
|
@@ -9,7 +10,7 @@ export async function sendEVM(tx) {
|
|
|
9
10
|
: await pressUntilTextFound(DeviceLabels.ACCEPT);
|
|
10
11
|
const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
|
|
11
12
|
expect(isAmountCorrect).toBeTruthy();
|
|
12
|
-
if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS) {
|
|
13
|
+
if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS.name) {
|
|
13
14
|
const isENSNameCorrect = containsSubstringInEvent(tx.accountToCredit.ensName, events);
|
|
14
15
|
expect(isENSNameCorrect).toBeTruthy();
|
|
15
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,
|
|
1
|
+
{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAe;IAC3C,MAAM,MAAM,GACV,gBAAgB,EAAE,KAAK,aAAa,CAAC,KAAK;QACxC,CAAC,CAAC,MAAM,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC;QAC1D,CAAC,CAAC,MAAM,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACjF,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;SAAM;QACL,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;IAED,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAkB;IACjD,MAAM,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;IACtC,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/solana.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/solana.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wBAAsB,cAAc,CAAC,iBAAiB,EAAE,QAAQ,iBAG/D;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,WAAW,iBAa/C"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
1
|
import expect from "expect";
|
|
2
|
-
import { pressBoth, pressUntilTextFound, containsSubstringInEvent, getDelegateEvents,
|
|
2
|
+
import { pressBoth, pressUntilTextFound, containsSubstringInEvent, getDelegateEvents, } from "../speculos";
|
|
3
3
|
import { DeviceLabels } from "../enum/DeviceLabels";
|
|
4
4
|
import { Device } from "../enum/Device";
|
|
5
|
-
import { DeviceModelId } from "@ledgerhq/types-devices";
|
|
6
5
|
export async function delegateSolana(delegatingAccount) {
|
|
7
6
|
await getDelegateEvents(delegatingAccount);
|
|
8
7
|
await pressBoth();
|
|
9
8
|
}
|
|
10
9
|
export async function sendSolana(tx) {
|
|
11
|
-
const events =
|
|
12
|
-
? await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION)
|
|
13
|
-
: await pressUntilTextFound(DeviceLabels.APPROVE);
|
|
10
|
+
const events = await pressUntilTextFound(DeviceLabels.APPROVE);
|
|
14
11
|
const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
|
|
15
12
|
expect(isAmountCorrect).toBeTruthy();
|
|
16
|
-
if (process.env.SPECULOS_DEVICE !== Device.LNS) {
|
|
13
|
+
if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
|
|
17
14
|
const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.parentAccount?.address ?? tx.accountToCredit.address, events);
|
|
18
15
|
expect(isAddressCorrect).toBeTruthy();
|
|
19
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../src/e2e/families/solana.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../src/e2e/families/solana.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAIxC,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,iBAA2B;IAC9D,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC3C,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAe;IAC9C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACnD,MAAM,gBAAgB,GAAG,wBAAwB,CAC/C,EAAE,CAAC,eAAe,CAAC,aAAa,EAAE,OAAO,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,EACvE,MAAM,CACP,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;IAED,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tezos.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/tezos.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tezos.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/tezos.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,wBAAsB,aAAa,CAAC,iBAAiB,EAAE,QAAQ,iBAW9D"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { getDelegateEvents, getDeviceLabels,
|
|
1
|
+
import { getDelegateEvents, getDeviceLabels, pressBoth, pressUntilTextFound } from "../speculos";
|
|
2
|
+
import { getSpeculosModel } from "../speculosAppVersion";
|
|
2
3
|
import { DeviceModelId } from "@ledgerhq/types-devices";
|
|
3
4
|
import { DeviceLabels } from "../enum/DeviceLabels";
|
|
4
5
|
export async function delegateTezos(delegatingAccount) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tezos.js","sourceRoot":"","sources":["../../../src/e2e/families/tezos.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tezos.js","sourceRoot":"","sources":["../../../src/e2e/families/tezos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,iBAA2B;IAC7D,MAAM,EAAE,oBAAoB,EAAE,GAAG,eAAe,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEjG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC3C,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAChD,MAAM,SAAS,EAAE,CAAC;IAElB,IAAI,gBAAgB,EAAE,IAAI,aAAa,CAAC,KAAK,EAAE;QAC7C,MAAM,mBAAmB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
|
package/lib-es/e2e/index.d.ts
CHANGED
|
@@ -396,6 +396,7 @@ export declare const formatEnvData: (data: {
|
|
|
396
396
|
DISABLE_SYNC_TOKEN: unknown;
|
|
397
397
|
DISABLE_FW_UPDATE_VERSION_CHECK: unknown;
|
|
398
398
|
DETOX: unknown;
|
|
399
|
+
E2E_NANO_APP_VERSION_PATH: unknown;
|
|
399
400
|
EIP1559_MINIMUM_FEES_GATE: unknown;
|
|
400
401
|
EIP1559_PRIORITY_FEE_LOWER_GATE: unknown;
|
|
401
402
|
EIP1559_BASE_FEE_MULTIPLIER: unknown;
|
|
@@ -449,6 +450,7 @@ export declare const formatEnvData: (data: {
|
|
|
449
450
|
SKIP_ONBOARDING: unknown;
|
|
450
451
|
SPECULOS_API_PORT: unknown;
|
|
451
452
|
SPECULOS_DEVICE: unknown;
|
|
453
|
+
SPECULOS_FIRMWARE_VERSION: unknown;
|
|
452
454
|
SPECULOS_PID_OFFSET: unknown;
|
|
453
455
|
SPECULOS_USE_WEBSOCKET: unknown;
|
|
454
456
|
SWAP_API_BASE: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/e2e/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,kBAAkB,iBACf,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASrB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA6B3B,CAAC;AAEF,eAAO,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/e2e/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,kBAAkB,iBACf,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASrB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA6B3B,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAMzB,CAAC"}
|
package/lib-es/e2e/speculos.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ export type Spec = {
|
|
|
13
13
|
appQuery: {
|
|
14
14
|
model: DeviceModelId;
|
|
15
15
|
appName: string;
|
|
16
|
+
appVersion?: string;
|
|
16
17
|
};
|
|
17
18
|
/** @deprecated */
|
|
18
19
|
dependency?: string;
|
|
@@ -28,7 +29,6 @@ export type SpeculosDevice = {
|
|
|
28
29
|
port: number;
|
|
29
30
|
};
|
|
30
31
|
export declare function setExchangeDependencies(dependencies: Dependency[]): void;
|
|
31
|
-
export declare function getSpeculosModel(): DeviceModelId.nanoS | DeviceModelId.nanoSP | DeviceModelId.nanoX;
|
|
32
32
|
type Specs = {
|
|
33
33
|
[key: string]: Spec;
|
|
34
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speculos.d.ts","sourceRoot":"","sources":["../../src/e2e/speculos.ts"],"names":[],"mappings":";;AAEA,OAAO,EAKL,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAK9D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"speculos.d.ts","sourceRoot":"","sources":["../../src/e2e/speculos.ts"],"names":[],"mappings":"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"}
|
package/lib-es/e2e/speculos.js
CHANGED
|
@@ -2,13 +2,11 @@ import invariant from "invariant";
|
|
|
2
2
|
import { log } from "@ledgerhq/logs";
|
|
3
3
|
import { createSpeculosDevice, findLatestAppCandidate, listAppCandidates, releaseSpeculosDevice, } from "../load/speculos";
|
|
4
4
|
import { createSpeculosDeviceCI, releaseSpeculosDeviceCI } from "./speculosCI";
|
|
5
|
-
import { DeviceModelId } from "@ledgerhq/devices";
|
|
6
5
|
import axios from "axios";
|
|
7
6
|
import { getEnv } from "@ledgerhq/live-env";
|
|
8
7
|
import { getCryptoCurrencyById } from "../currencies";
|
|
9
8
|
import { DeviceLabels } from "./enum/DeviceLabels";
|
|
10
9
|
import { Account } from "./enum/Account";
|
|
11
|
-
import { Device as CryptoWallet } from "./enum/Device";
|
|
12
10
|
import { Currency } from "./enum/Currency";
|
|
13
11
|
import expect from "expect";
|
|
14
12
|
import { sendBTC, sendBTCBasedCoin } from "./families/bitcoin";
|
|
@@ -31,6 +29,7 @@ import { delegateMultiversX } from "./families/multiversX";
|
|
|
31
29
|
import { delegateOsmosis } from "./families/osmosis";
|
|
32
30
|
import { DEVICE_LABELS_CONFIG } from "./data/deviceLabelsData";
|
|
33
31
|
import { sendSui } from "./families/sui";
|
|
32
|
+
import { getAppVersionFromCatalog, getSpeculosModel } from "./speculosAppVersion";
|
|
34
33
|
const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
|
|
35
34
|
export function setExchangeDependencies(dependencies) {
|
|
36
35
|
const map = new Map();
|
|
@@ -41,18 +40,6 @@ export function setExchangeDependencies(dependencies) {
|
|
|
41
40
|
}
|
|
42
41
|
specs["Exchange"].dependencies = Array.from(map.values());
|
|
43
42
|
}
|
|
44
|
-
export function getSpeculosModel() {
|
|
45
|
-
const speculosDevice = process.env.SPECULOS_DEVICE;
|
|
46
|
-
switch (speculosDevice) {
|
|
47
|
-
case CryptoWallet.LNS:
|
|
48
|
-
return DeviceModelId.nanoS;
|
|
49
|
-
case CryptoWallet.LNX:
|
|
50
|
-
return DeviceModelId.nanoX;
|
|
51
|
-
case CryptoWallet.LNSP:
|
|
52
|
-
default:
|
|
53
|
-
return DeviceModelId.nanoSP;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
43
|
export const specs = {
|
|
57
44
|
Bitcoin: {
|
|
58
45
|
currency: getCryptoCurrencyById("bitcoin"),
|
|
@@ -316,11 +303,19 @@ export async function startSpeculos(testName, spec) {
|
|
|
316
303
|
invariant(seed, "SEED is not set");
|
|
317
304
|
const coinapps = COINAPPS;
|
|
318
305
|
invariant(coinapps, "COINAPPS is not set");
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
appCandidates = await listAppCandidates(coinapps);
|
|
322
|
-
}
|
|
306
|
+
const appCandidates = await listAppCandidates(coinapps);
|
|
307
|
+
const nanoAppCatalogPath = getEnv("E2E_NANO_APP_VERSION_PATH");
|
|
323
308
|
const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
|
|
309
|
+
try {
|
|
310
|
+
const displayName = spec.currency?.managerAppName || appQuery.appName;
|
|
311
|
+
const catalogVersion = await getAppVersionFromCatalog(displayName, nanoAppCatalogPath);
|
|
312
|
+
if (catalogVersion) {
|
|
313
|
+
appQuery.appVersion = catalogVersion;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
catch (e) {
|
|
317
|
+
console.warn("[speculos] Unable to fetch app version from catalog", e);
|
|
318
|
+
}
|
|
324
319
|
const appCandidate = findLatestAppCandidate(appCandidates, appQuery);
|
|
325
320
|
const { model } = appQuery;
|
|
326
321
|
const { dependencies } = spec;
|
|
@@ -651,9 +646,7 @@ export async function getDelegateEvents(delegatingAccount) {
|
|
|
651
646
|
}
|
|
652
647
|
export async function verifyAmountsAndAcceptSwap(swap, amount) {
|
|
653
648
|
await waitFor(DeviceLabels.REVIEW_TRANSACTION);
|
|
654
|
-
const events =
|
|
655
|
-
? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
|
|
656
|
-
: await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
|
|
649
|
+
const events = await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND);
|
|
657
650
|
verifySwapData(swap, events, amount);
|
|
658
651
|
await pressBoth();
|
|
659
652
|
}
|
|
@@ -670,10 +663,11 @@ export async function verifyAmountsAndRejectSwap(swap, amount) {
|
|
|
670
663
|
await pressBoth();
|
|
671
664
|
}
|
|
672
665
|
function verifySwapData(swap, events, amount) {
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
666
|
+
// Uncoment when new exchange nanoApp is in prod
|
|
667
|
+
// const swapPair = `swap ${swap.getAccountToDebit.currency.ticker} to ${swap.getAccountToCredit.currency.ticker}`;
|
|
668
|
+
// if (getSpeculosModel() !== DeviceModelId.nanoS) {
|
|
669
|
+
// expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
|
|
670
|
+
// }
|
|
677
671
|
expectDeviceScreenContains(amount, events, `Amount ${amount} not found on the device screen`);
|
|
678
672
|
}
|
|
679
673
|
function expectDeviceScreenContains(substring, events, message) {
|