@ledgerhq/live-common 33.2.0-next.1 → 33.2.0-next.3
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/apps/listApps/v1.js +4 -3
- package/lib/apps/listApps/v1.js.map +1 -1
- package/lib/apps/listApps/v2.d.ts.map +1 -1
- package/lib/apps/listApps/v2.js +12 -6
- package/lib/apps/listApps/v2.js.map +1 -1
- package/lib/families/evm/platformAdapter.d.ts +1 -1
- package/lib/families/evm/platformAdapter.d.ts.map +1 -1
- package/lib/families/evm/platformAdapter.js +2 -1
- package/lib/families/evm/platformAdapter.js.map +1 -1
- package/lib/families/evm/platformAdapter.test.js +27 -3
- package/lib/families/evm/platformAdapter.test.js.map +1 -1
- package/lib/families/evm/walletApiAdapter.d.ts +1 -1
- package/lib/families/evm/walletApiAdapter.d.ts.map +1 -1
- package/lib/families/evm/walletApiAdapter.js +2 -1
- package/lib/families/evm/walletApiAdapter.js.map +1 -1
- package/lib/families/evm/walletApiAdapter.test.js +30 -4
- package/lib/families/evm/walletApiAdapter.test.js.map +1 -1
- package/lib/hw/getDeviceName.d.ts.map +1 -1
- package/lib/hw/getDeviceName.js +15 -2
- package/lib/hw/getDeviceName.js.map +1 -1
- package/lib/hw/getDeviceName.test.js +9 -15
- package/lib/hw/getDeviceName.test.js.map +1 -1
- package/lib-es/apps/listApps/v1.js +5 -4
- package/lib-es/apps/listApps/v1.js.map +1 -1
- package/lib-es/apps/listApps/v2.d.ts.map +1 -1
- package/lib-es/apps/listApps/v2.js +13 -7
- package/lib-es/apps/listApps/v2.js.map +1 -1
- package/lib-es/families/evm/platformAdapter.d.ts +1 -1
- package/lib-es/families/evm/platformAdapter.d.ts.map +1 -1
- package/lib-es/families/evm/platformAdapter.js +2 -1
- package/lib-es/families/evm/platformAdapter.js.map +1 -1
- package/lib-es/families/evm/platformAdapter.test.js +27 -3
- package/lib-es/families/evm/platformAdapter.test.js.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.d.ts +1 -1
- package/lib-es/families/evm/walletApiAdapter.d.ts.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.js +2 -1
- package/lib-es/families/evm/walletApiAdapter.js.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.test.js +30 -4
- package/lib-es/families/evm/walletApiAdapter.test.js.map +1 -1
- package/lib-es/hw/getDeviceName.d.ts.map +1 -1
- package/lib-es/hw/getDeviceName.js +15 -2
- package/lib-es/hw/getDeviceName.js.map +1 -1
- package/lib-es/hw/getDeviceName.test.js +9 -15
- package/lib-es/hw/getDeviceName.test.js.map +1 -1
- package/package.json +13 -13
- package/src/apps/listApps/v1.ts +5 -5
- package/src/apps/listApps/v2.ts +14 -7
- package/src/families/evm/platformAdapter.test.ts +34 -3
- package/src/families/evm/platformAdapter.ts +3 -2
- package/src/families/evm/walletApiAdapter.test.ts +37 -4
- package/src/families/evm/walletApiAdapter.ts +4 -3
- package/src/hw/getDeviceName.test.ts +16 -17
- package/src/hw/getDeviceName.ts +15 -2
package/lib/apps/listApps/v1.js
CHANGED
|
@@ -53,7 +53,8 @@ const emptyHashData = "000000000000000000000000000000000000000000000000000000000
|
|
|
53
53
|
//to simplify this a lot. Stay calm.
|
|
54
54
|
const listApps = (transport, deviceInfo) => {
|
|
55
55
|
var _a;
|
|
56
|
-
|
|
56
|
+
const tracer = new logs_1.LocalTracer("list-apps", { transport: transport.getTraceContext() });
|
|
57
|
+
tracer.trace("Using legacy version", { deviceInfo });
|
|
57
58
|
if (deviceInfo.isOSU || deviceInfo.isBootloader) {
|
|
58
59
|
return (0, rxjs_1.throwError)(() => new errors_1.UnexpectedBootloader(""));
|
|
59
60
|
}
|
|
@@ -89,7 +90,7 @@ const listApps = (transport, deviceInfo) => {
|
|
|
89
90
|
blocks: 0,
|
|
90
91
|
})))
|
|
91
92
|
.catch(e => {
|
|
92
|
-
|
|
93
|
+
tracer.trace(`Failed to HSM list apps ${e}`, { error: e });
|
|
93
94
|
throw e;
|
|
94
95
|
})
|
|
95
96
|
.then(apps => [apps, true]);
|
|
@@ -195,7 +196,7 @@ const listApps = (transport, deviceInfo) => {
|
|
|
195
196
|
return app;
|
|
196
197
|
})
|
|
197
198
|
.filter(Boolean);
|
|
198
|
-
|
|
199
|
+
tracer.trace(`${installedList.length} apps installed. ${applicationsList.length} apps store total. ${apps.length} available.`, {
|
|
199
200
|
installedList,
|
|
200
201
|
});
|
|
201
202
|
const deviceModel = (0, devices_1.getDeviceModel)(deviceModelId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v1.js","sourceRoot":"","sources":["../../../src/apps/listApps/v1.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAoF;AACpF,6CAAwD;AACxD,+BAA8C;AAC9C,qDAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"v1.js","sourceRoot":"","sources":["../../../src/apps/listApps/v1.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v2.d.ts","sourceRoot":"","sources":["../../../src/apps/listApps/v2.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAE,UAAU,EAA4B,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAO,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAmC,MAAM,UAAU,CAAC;AAqB/E,QAAA,MAAM,QAAQ,cAAe,SAAS,cAAc,UAAU,KAAG,WAAW,aAAa,
|
|
1
|
+
{"version":3,"file":"v2.d.ts","sourceRoot":"","sources":["../../../src/apps/listApps/v2.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAE,UAAU,EAA4B,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAO,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAmC,MAAM,UAAU,CAAC;AAqB/E,QAAA,MAAM,QAAQ,cAAe,SAAS,cAAc,UAAU,KAAG,WAAW,aAAa,CA2PxF,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
package/lib/apps/listApps/v2.js
CHANGED
|
@@ -53,7 +53,8 @@ const appsWithDynamicHashes = ["Fido U2F", "Security Key"];
|
|
|
53
53
|
const emptyHashData = "0".repeat(64);
|
|
54
54
|
const listApps = (transport, deviceInfo) => {
|
|
55
55
|
var _a;
|
|
56
|
-
|
|
56
|
+
const tracer = new logs_1.LocalTracer("list-apps", { transport: transport.getTraceContext() });
|
|
57
|
+
tracer.trace("Using new version", { deviceInfo });
|
|
57
58
|
if (deviceInfo.isOSU || deviceInfo.isBootloader) {
|
|
58
59
|
return (0, rxjs_1.throwError)(() => new errors_1.UnexpectedBootloader(""));
|
|
59
60
|
}
|
|
@@ -80,12 +81,12 @@ const listApps = (transport, deviceInfo) => {
|
|
|
80
81
|
// If the user has already allowed a secure channel during this session we can directly
|
|
81
82
|
// ask the device for the installed applications instead of going through a scriptrunner,
|
|
82
83
|
// this is a performance optimization, part of a larger rework with Manager API v2.
|
|
83
|
-
|
|
84
|
+
tracer.trace("Using direct apdu listapps");
|
|
84
85
|
listAppsResponsePromise = (0, listApps_1.default)(transport);
|
|
85
86
|
}
|
|
86
87
|
else {
|
|
87
88
|
// Fallback to original web-socket list apps
|
|
88
|
-
|
|
89
|
+
tracer.trace("Using scriptrunner listapps");
|
|
89
90
|
listAppsResponsePromise = new Promise((resolve, reject) => {
|
|
90
91
|
sub = api_1.default.listInstalledApps(transport, {
|
|
91
92
|
targetId: deviceInfo.targetId,
|
|
@@ -171,13 +172,18 @@ const listApps = (transport, deviceInfo) => {
|
|
|
171
172
|
}
|
|
172
173
|
// If the hash is not static (ex: Fido app) we need to find the app by its name using the catalog
|
|
173
174
|
const matchFromCatalog = catalogForDevice.find(({ name }) => name === localName);
|
|
174
|
-
|
|
175
|
+
tracer.trace(`Falling back to catalog for ${localName}`, {
|
|
176
|
+
localName,
|
|
177
|
+
matchFromCatalog: Boolean(matchFromCatalog),
|
|
178
|
+
});
|
|
175
179
|
if (matchFromCatalog) {
|
|
176
180
|
installedList.push(matchFromCatalog);
|
|
177
181
|
}
|
|
178
182
|
});
|
|
179
|
-
|
|
180
|
-
|
|
183
|
+
tracer.trace("Installed and in catalog apps", {
|
|
184
|
+
installedApps: installedList.length,
|
|
185
|
+
inCatalogApps: catalogForDevice.length,
|
|
186
|
+
});
|
|
181
187
|
// Abused somewhere else
|
|
182
188
|
const appByName = catalogForDevice.reduce((result, app) => {
|
|
183
189
|
result[app.name] = app;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v2.js","sourceRoot":"","sources":["../../../src/apps/listApps/v2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAoF;AACpF,6CAAwD;AACxD,+BAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"v2.js","sourceRoot":"","sources":["../../../src/apps/listApps/v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EthereumTransaction as PlatformTransaction } from "@ledgerhq/live-app-sdk";
|
|
2
1
|
import { Transaction } from "@ledgerhq/coin-evm/types/index";
|
|
2
|
+
import { EthereumTransaction as PlatformTransaction } from "@ledgerhq/live-app-sdk";
|
|
3
3
|
declare const _default: {
|
|
4
4
|
getPlatformTransactionSignFlowInfos: (tx: PlatformTransaction) => {
|
|
5
5
|
canEditFees: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAdapter.d.ts","sourceRoot":"","sources":["../../../src/families/evm/platformAdapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"platformAdapter.d.ts","sourceRoot":"","sources":["../../../src/families/evm/platformAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,mBAAmB,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;;;;;;;;AAkDpF,wBAAuD"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// TODO: to remove once live-app-sdk is depreciated and removed from LL
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
const createTransaction_1 = require("@ledgerhq/coin-evm/createTransaction");
|
|
4
5
|
const CAN_EDIT_FEES = true;
|
|
5
6
|
const areFeesProvided = (tx) => !!(tx.gasLimit && tx.gasPrice);
|
|
6
7
|
const convertToLiveTransaction = (tx) => {
|
|
7
8
|
const hasFeesProvided = areFeesProvided(tx);
|
|
8
9
|
const params = {
|
|
9
10
|
family: "evm",
|
|
10
|
-
nonce: tx.nonce,
|
|
11
|
+
nonce: tx.nonce === undefined ? createTransaction_1.DEFAULT_NONCE : tx.nonce,
|
|
11
12
|
amount: tx.amount,
|
|
12
13
|
recipient: tx.recipient,
|
|
13
14
|
data: tx.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAdapter.js","sourceRoot":"","sources":["../../../src/families/evm/platformAdapter.ts"],"names":[],"mappings":";AAAA,uEAAuE;;
|
|
1
|
+
{"version":3,"file":"platformAdapter.js","sourceRoot":"","sources":["../../../src/families/evm/platformAdapter.ts"],"names":[],"mappings":";AAAA,uEAAuE;;AAEvE,4EAAqE;AAIrE,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,MAAM,eAAe,GAAG,CAAC,EAAuB,EAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;AAE7F,MAAM,wBAAwB,GAAG,CAAC,EAAuB,EAAwB,EAAE;IACjF,MAAM,eAAe,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,KAAc;QACtB,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,iCAAa,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK;QACxD,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,SAAS,EAAE,EAAE,CAAC,SAAS;QACvB,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,cAAc,EAAE,EAAE,CAAC,QAAQ;QAC3B,YAAY,EAAE,SAAS;QACvB,oBAAoB,EAAE,SAAS;KAChC,CAAC;IAEF,mFAAmF;IACnF,MAAM,MAAM,GAAyB,EAAE,CAAC,QAAQ;QAC9C,CAAC,iCACM,MAAM;YACT,gFAAgF;YAChF,oEAAoE;YACpE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAE,QAAkB,CAAC,CAAC,CAAC,SAAS,EAC/D,QAAQ,EAAE,EAAE,CAAC,QAAQ,EACrB,IAAI,EAAE,CAAC,IAEX,CAAC,iCAAM,MAAM,KAAE,IAAI,EAAE,CAAC,GAAE,CAAC;IAE3B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,mCAAmC,GAAG,CAC1C,EAAuB,EAKvB,EAAE;IACF,OAAO;QACL,WAAW,EAAE,aAAa;QAC1B,MAAM,EAAE,wBAAwB,CAAC,EAAE,CAAC;QACpC,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC;KACrC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,EAAE,mCAAmC,EAAE,CAAC"}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const createTransaction_1 = require("@ledgerhq/coin-evm/createTransaction");
|
|
6
7
|
const live_app_sdk_1 = require("@ledgerhq/live-app-sdk");
|
|
7
8
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
9
|
const platformAdapter_1 = __importDefault(require("./platformAdapter"));
|
|
@@ -20,7 +21,7 @@ describe("getPlatformTransactionSignFlowInfos", () => {
|
|
|
20
21
|
recipient: ethPlatformTx.recipient,
|
|
21
22
|
data: undefined,
|
|
22
23
|
gasLimit: undefined,
|
|
23
|
-
nonce:
|
|
24
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
24
25
|
customGasLimit: undefined,
|
|
25
26
|
feesStrategy: undefined,
|
|
26
27
|
type: 2,
|
|
@@ -46,7 +47,7 @@ describe("getPlatformTransactionSignFlowInfos", () => {
|
|
|
46
47
|
gasPrice: ethPlatformTx.gasPrice,
|
|
47
48
|
gasLimit: ethPlatformTx.gasLimit,
|
|
48
49
|
customGasLimit: ethPlatformTx.gasLimit,
|
|
49
|
-
nonce:
|
|
50
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
50
51
|
data: undefined,
|
|
51
52
|
feesStrategy: "custom",
|
|
52
53
|
type: 0,
|
|
@@ -69,7 +70,7 @@ describe("getPlatformTransactionSignFlowInfos", () => {
|
|
|
69
70
|
recipient: ethPlatformTx.recipient,
|
|
70
71
|
gasLimit: ethPlatformTx.gasLimit,
|
|
71
72
|
customGasLimit: ethPlatformTx.gasLimit,
|
|
72
|
-
nonce:
|
|
73
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
73
74
|
data: undefined,
|
|
74
75
|
type: 2,
|
|
75
76
|
};
|
|
@@ -78,6 +79,29 @@ describe("getPlatformTransactionSignFlowInfos", () => {
|
|
|
78
79
|
expect(hasFeesProvided).toBe(false);
|
|
79
80
|
expect(liveTx).toEqual(expectedLiveTx);
|
|
80
81
|
});
|
|
82
|
+
test("with nonce provided", () => {
|
|
83
|
+
const ethPlatformTx = {
|
|
84
|
+
family: live_app_sdk_1.FAMILIES.ETHEREUM,
|
|
85
|
+
amount: new bignumber_js_1.default(100000),
|
|
86
|
+
recipient: "0xABCDEF",
|
|
87
|
+
nonce: 1,
|
|
88
|
+
};
|
|
89
|
+
const expectedLiveTx = {
|
|
90
|
+
family: "evm",
|
|
91
|
+
amount: ethPlatformTx.amount,
|
|
92
|
+
recipient: ethPlatformTx.recipient,
|
|
93
|
+
data: undefined,
|
|
94
|
+
gasLimit: undefined,
|
|
95
|
+
nonce: 1,
|
|
96
|
+
customGasLimit: undefined,
|
|
97
|
+
feesStrategy: undefined,
|
|
98
|
+
type: 2,
|
|
99
|
+
};
|
|
100
|
+
const { canEditFees, hasFeesProvided, liveTx } = platformAdapter_1.default.getPlatformTransactionSignFlowInfos(ethPlatformTx);
|
|
101
|
+
expect(canEditFees).toBe(true);
|
|
102
|
+
expect(hasFeesProvided).toBe(false);
|
|
103
|
+
expect(liveTx).toEqual(expectedLiveTx);
|
|
104
|
+
});
|
|
81
105
|
});
|
|
82
106
|
});
|
|
83
107
|
//# sourceMappingURL=platformAdapter.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAdapter.test.js","sourceRoot":"","sources":["../../../src/families/evm/platformAdapter.test.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"platformAdapter.test.js","sourceRoot":"","sources":["../../../src/families/evm/platformAdapter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EthereumTransaction as WalletAPIEthereumTransaction } from "@ledgerhq/wallet-api-core";
|
|
2
1
|
import { Transaction } from "@ledgerhq/coin-evm/types/index";
|
|
2
|
+
import { EthereumTransaction as WalletAPIEthereumTransaction } from "@ledgerhq/wallet-api-core";
|
|
3
3
|
import { GetWalletAPITransactionSignFlowInfos } from "../../wallet-api/types";
|
|
4
4
|
declare const _default: {
|
|
5
5
|
getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos<WalletAPIEthereumTransaction, Transaction>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"walletApiAdapter.d.ts","sourceRoot":"","sources":["../../../src/families/evm/walletApiAdapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"walletApiAdapter.d.ts","sourceRoot":"","sources":["../../../src/families/evm/walletApiAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,mBAAmB,IAAI,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAChG,OAAO,EAGL,oCAAoC,EACrC,MAAM,wBAAwB,CAAC;;;;AAwEhC,wBAAwD"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const createTransaction_1 = require("@ledgerhq/coin-evm/createTransaction");
|
|
3
4
|
const CAN_EDIT_FEES = true;
|
|
4
5
|
const areFeesProvided = tx => !!((tx.gasLimit && tx.gasPrice) || (tx.gasLimit && tx.maxFeePerGas && tx.maxPriorityFeePerGas));
|
|
5
6
|
const convertToLiveTransaction = tx => {
|
|
6
7
|
const hasFeesProvided = areFeesProvided(tx);
|
|
7
8
|
const params = {
|
|
8
9
|
family: "evm",
|
|
9
|
-
nonce: tx.nonce,
|
|
10
|
+
nonce: tx.nonce === undefined ? createTransaction_1.DEFAULT_NONCE : tx.nonce,
|
|
10
11
|
amount: tx.amount,
|
|
11
12
|
recipient: tx.recipient,
|
|
12
13
|
data: tx.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"walletApiAdapter.js","sourceRoot":"","sources":["../../../src/families/evm/walletApiAdapter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"walletApiAdapter.js","sourceRoot":"","sources":["../../../src/families/evm/walletApiAdapter.ts"],"names":[],"mappings":";;AAAA,4EAAqE;AASrE,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,MAAM,eAAe,GAAkD,EAAE,CAAC,EAAE,CAC1E,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,YAAY,IAAI,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAElG,MAAM,wBAAwB,GAG1B,EAAE,CAAC,EAAE;IACP,MAAM,eAAe,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAyB;QACnC,MAAM,EAAE,KAAc;QACtB,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,iCAAa,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK;QACxD,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,SAAS,EAAE,EAAE,CAAC,SAAS;QACvB,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,YAAY,EAAE,eAAe,CAAC,CAAC,CAAE,QAAkB,CAAC,CAAC,CAAE,QAAkB;QACzE,cAAc,EAAE,EAAE,CAAC,QAAQ;KAC5B,CAAC;IAEF,mFAAmF;IAEnF;;;;;;;;;;;;;;OAcG;IAEH,MAAM,MAAM,GAAyB,EAAE,CAAC,QAAQ;QAC9C,CAAC,iCACM,MAAM,KACT,QAAQ,EAAE,EAAE,CAAC,QAAQ,EACrB,YAAY,EAAE,SAAS,EACvB,oBAAoB,EAAE,SAAS,EAC/B,IAAI,EAAE,CAAC,IAEX,CAAC,iCACM,MAAM,KACT,QAAQ,EAAE,SAAS,EACnB,YAAY,EAAE,EAAE,CAAC,YAAY,EAC7B,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,EAC7C,IAAI,EAAE,CAAC,GACR,CAAC;IAEN,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,oCAAoC,GAGtC,EAAE,CAAC,EAAE;IACP,OAAO;QACL,WAAW,EAAE,aAAa;QAC1B,MAAM,EAAE,wBAAwB,CAAC,EAAE,CAAC;QACpC,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC;KACrC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,EAAE,oCAAoC,EAAE,CAAC"}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const createTransaction_1 = require("@ledgerhq/coin-evm/createTransaction");
|
|
6
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
7
8
|
const walletApiAdapter_1 = __importDefault(require("./walletApiAdapter"));
|
|
8
9
|
describe("getWalletAPITransactionSignFlowInfos", () => {
|
|
@@ -19,7 +20,7 @@ describe("getWalletAPITransactionSignFlowInfos", () => {
|
|
|
19
20
|
recipient: ethPlatformTx.recipient,
|
|
20
21
|
data: undefined,
|
|
21
22
|
gasLimit: undefined,
|
|
22
|
-
nonce:
|
|
23
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
23
24
|
customGasLimit: undefined,
|
|
24
25
|
feesStrategy: "medium",
|
|
25
26
|
maxFeePerGas: undefined,
|
|
@@ -46,7 +47,7 @@ describe("getWalletAPITransactionSignFlowInfos", () => {
|
|
|
46
47
|
gasPrice: ethPlatformTx.gasPrice,
|
|
47
48
|
gasLimit: ethPlatformTx.gasLimit,
|
|
48
49
|
customGasLimit: ethPlatformTx.gasLimit,
|
|
49
|
-
nonce:
|
|
50
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
50
51
|
data: undefined,
|
|
51
52
|
feesStrategy: "custom",
|
|
52
53
|
type: 0,
|
|
@@ -73,7 +74,7 @@ describe("getWalletAPITransactionSignFlowInfos", () => {
|
|
|
73
74
|
customGasLimit: ethPlatformTx.gasLimit,
|
|
74
75
|
maxFeePerGas: ethPlatformTx.maxFeePerGas,
|
|
75
76
|
maxPriorityFeePerGas: ethPlatformTx.maxPriorityFeePerGas,
|
|
76
|
-
nonce:
|
|
77
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
77
78
|
data: undefined,
|
|
78
79
|
feesStrategy: "custom",
|
|
79
80
|
type: 2,
|
|
@@ -99,7 +100,7 @@ describe("getWalletAPITransactionSignFlowInfos", () => {
|
|
|
99
100
|
feesStrategy: "medium",
|
|
100
101
|
maxFeePerGas: undefined,
|
|
101
102
|
maxPriorityFeePerGas: undefined,
|
|
102
|
-
nonce:
|
|
103
|
+
nonce: createTransaction_1.DEFAULT_NONCE,
|
|
103
104
|
data: undefined,
|
|
104
105
|
type: 2,
|
|
105
106
|
};
|
|
@@ -108,6 +109,31 @@ describe("getWalletAPITransactionSignFlowInfos", () => {
|
|
|
108
109
|
expect(hasFeesProvided).toBe(false);
|
|
109
110
|
expect(liveTx).toEqual(expectedLiveTx);
|
|
110
111
|
});
|
|
112
|
+
test("with nonce provided", () => {
|
|
113
|
+
const ethPlatformTx = {
|
|
114
|
+
family: "ethereum",
|
|
115
|
+
amount: new bignumber_js_1.default(100000),
|
|
116
|
+
recipient: "0xABCDEF",
|
|
117
|
+
nonce: 1,
|
|
118
|
+
};
|
|
119
|
+
const expectedLiveTx = {
|
|
120
|
+
family: "evm",
|
|
121
|
+
amount: ethPlatformTx.amount,
|
|
122
|
+
recipient: ethPlatformTx.recipient,
|
|
123
|
+
data: undefined,
|
|
124
|
+
gasLimit: undefined,
|
|
125
|
+
nonce: 1,
|
|
126
|
+
customGasLimit: undefined,
|
|
127
|
+
feesStrategy: "medium",
|
|
128
|
+
maxFeePerGas: undefined,
|
|
129
|
+
maxPriorityFeePerGas: undefined,
|
|
130
|
+
type: 2,
|
|
131
|
+
};
|
|
132
|
+
const { canEditFees, hasFeesProvided, liveTx } = walletApiAdapter_1.default.getWalletAPITransactionSignFlowInfos(ethPlatformTx);
|
|
133
|
+
expect(canEditFees).toBe(true);
|
|
134
|
+
expect(hasFeesProvided).toBe(false);
|
|
135
|
+
expect(liveTx).toEqual(expectedLiveTx);
|
|
136
|
+
});
|
|
111
137
|
});
|
|
112
138
|
});
|
|
113
139
|
//# sourceMappingURL=walletApiAdapter.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"walletApiAdapter.test.js","sourceRoot":"","sources":["../../../src/families/evm/walletApiAdapter.test.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"walletApiAdapter.test.js","sourceRoot":"","sources":["../../../src/families/evm/walletApiAdapter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeviceName.d.ts","sourceRoot":"","sources":["../../src/hw/getDeviceName.ts"],"names":[],"mappings":"AAAA,OAAO,SAAgD,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"getDeviceName.d.ts","sourceRoot":"","sources":["../../src/hw/getDeviceName.ts"],"names":[],"mappings":"AAAA,OAAO,SAAgD,MAAM,wBAAwB,CAAC;oCAGrD,SAAS,KAAG,QAAQ,MAAM,CAAC;AAA5D,wBAiCE"}
|
package/lib/hw/getDeviceName.js
CHANGED
|
@@ -10,15 +10,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const hw_transport_1 = require("@ledgerhq/hw-transport");
|
|
13
|
+
const logs_1 = require("@ledgerhq/logs");
|
|
13
14
|
exports.default = (transport) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
const tracer = new logs_1.LocalTracer("hw", {
|
|
16
|
+
transport: transport.getTraceContext(),
|
|
17
|
+
function: "getDeviceName",
|
|
18
|
+
});
|
|
19
|
+
tracer.trace("Start");
|
|
20
|
+
try {
|
|
21
|
+
// Legacy: prevents bad apdu response for LNX
|
|
22
|
+
yield transport.send(0xe0, 0x50, 0x00, 0x00);
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
tracer.trace(`Error on 0xe0500000: ${error}`, { error });
|
|
26
|
+
}
|
|
27
|
+
tracer.trace("Sent cleaning 0xe0500000");
|
|
16
28
|
const res = yield transport.send(0xe0, 0xd2, 0x00, 0x00, Buffer.from([]), [
|
|
17
29
|
hw_transport_1.StatusCodes.OK,
|
|
18
30
|
hw_transport_1.StatusCodes.DEVICE_NOT_ONBOARDED,
|
|
19
31
|
hw_transport_1.StatusCodes.DEVICE_NOT_ONBOARDED_2,
|
|
20
32
|
]);
|
|
21
33
|
const status = res.readUInt16BE(res.length - 2);
|
|
34
|
+
tracer.trace("Result status from 0xe0d20000", { status });
|
|
22
35
|
switch (status) {
|
|
23
36
|
case hw_transport_1.StatusCodes.OK:
|
|
24
37
|
return res.slice(0, res.length - 2).toString("utf-8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeviceName.js","sourceRoot":"","sources":["../../src/hw/getDeviceName.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,yDAAsF;
|
|
1
|
+
{"version":3,"file":"getDeviceName.js","sourceRoot":"","sources":["../../src/hw/getDeviceName.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,yDAAsF;AACtF,yCAA6C;AAE7C,kBAAe,CAAO,SAAoB,EAAmB,EAAE;IAC7D,MAAM,MAAM,GAAG,IAAI,kBAAW,CAAC,IAAI,EAAE;QACnC,SAAS,EAAE,SAAS,CAAC,eAAe,EAAE;QACtC,QAAQ,EAAE,eAAe;KAC1B,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEtB,IAAI;QACF,6CAA6C;QAC7C,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC9C;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,wBAAwB,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;KAC1D;IACD,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEzC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QACxE,0BAAW,CAAC,EAAE;QACd,0BAAW,CAAC,oBAAoB;QAChC,0BAAW,CAAC,sBAAsB;KACnC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1D,QAAQ,MAAM,EAAE;QACd,KAAK,0BAAW,CAAC,EAAE;YACjB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACxD,KAAK,0BAAW,CAAC,oBAAoB,CAAC;QACtC,KAAK,0BAAW,CAAC,sBAAsB;YACrC,OAAO,EAAE,CAAC;KACb;IAED,MAAM,IAAI,mCAAoB,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC,CAAA,CAAC"}
|
|
@@ -12,34 +12,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const hw_transport_mocker_1 = require("@ledgerhq/hw-transport-mocker");
|
|
15
16
|
const getDeviceName_1 = __importDefault(require("./getDeviceName"));
|
|
16
|
-
const
|
|
17
|
+
const mockedSend = jest.fn();
|
|
18
|
+
const mockedTransport = (0, hw_transport_mocker_1.aTransportBuilder)({ send: mockedSend });
|
|
17
19
|
describe("getDeviceName", () => {
|
|
18
20
|
test("should return name if available", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
|
-
|
|
20
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
21
|
-
// @ts-ignore next-line
|
|
21
|
+
mockedSend.mockResolvedValue(Buffer.from("646576696365206e616d659000", "hex"));
|
|
22
22
|
const res = yield (0, getDeviceName_1.default)(mockedTransport);
|
|
23
23
|
expect(res).toMatch("device name");
|
|
24
24
|
}));
|
|
25
25
|
test("should return empty name when the device is not onboarded", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
|
-
|
|
27
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
28
|
-
// @ts-ignore next-line
|
|
26
|
+
mockedSend.mockResolvedValue(Buffer.from("bababababababa6d07", "hex"));
|
|
29
27
|
const res = yield (0, getDeviceName_1.default)(mockedTransport);
|
|
30
|
-
|
|
28
|
+
expect(res).toMatch("");
|
|
31
29
|
}));
|
|
32
30
|
test("should return empty name when the device is not onboarded #2", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
33
|
-
|
|
34
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
35
|
-
// @ts-ignore next-line
|
|
31
|
+
mockedSend.mockResolvedValue(Buffer.from("bababababababa6611", "hex"));
|
|
36
32
|
const res = yield (0, getDeviceName_1.default)(mockedTransport);
|
|
37
|
-
|
|
33
|
+
expect(res).toMatch("");
|
|
38
34
|
}));
|
|
39
35
|
test("unexpected bootloader or any other code, should throw", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
|
-
|
|
41
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
42
|
-
// @ts-ignore next-line
|
|
36
|
+
mockedSend.mockResolvedValue(Buffer.from("662d", "hex"));
|
|
43
37
|
yield expect((0, getDeviceName_1.default)(mockedTransport)).rejects.toThrow(Error);
|
|
44
38
|
}));
|
|
45
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeviceName.test.js","sourceRoot":"","sources":["../../src/hw/getDeviceName.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA4C;AAE5C,MAAM,
|
|
1
|
+
{"version":3,"file":"getDeviceName.test.js","sourceRoot":"","sources":["../../src/hw/getDeviceName.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uEAAkE;AAClE,oEAA4C;AAE5C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AAC7B,MAAM,eAAe,GAAG,IAAA,uCAAiB,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;AAEhE,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,iCAAiC,EAAE,GAAS,EAAE;QACjD,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;QAE/E,MAAM,GAAG,GAAG,MAAM,IAAA,uBAAa,EAAC,eAAe,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC,CAAA,CAAC,CAAC;IAEH,IAAI,CAAC,2DAA2D,EAAE,GAAS,EAAE;QAC3E,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC,CAAC;QAEvE,MAAM,GAAG,GAAG,MAAM,IAAA,uBAAa,EAAC,eAAe,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAA,CAAC,CAAC;IAEH,IAAI,CAAC,8DAA8D,EAAE,GAAS,EAAE;QAC9E,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC,CAAC;QAEvE,MAAM,GAAG,GAAG,MAAM,IAAA,uBAAa,EAAC,eAAe,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAA,CAAC,CAAC;IAEH,IAAI,CAAC,uDAAuD,EAAE,GAAS,EAAE;QACvE,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAEzD,MAAM,MAAM,CAAC,IAAA,uBAAa,EAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -11,7 +11,7 @@ import { DeviceModelId, getDeviceModel, identifyTargetId } from "@ledgerhq/devic
|
|
|
11
11
|
import { UnexpectedBootloader } from "@ledgerhq/errors";
|
|
12
12
|
import { Observable, throwError } from "rxjs";
|
|
13
13
|
import { AppType } from "@ledgerhq/types-live";
|
|
14
|
-
import {
|
|
14
|
+
import { LocalTracer } from "@ledgerhq/logs";
|
|
15
15
|
import manager, { getProviderId } from "../../manager";
|
|
16
16
|
import staxFetchImageSize from "../../hw/staxFetchImageSize";
|
|
17
17
|
import { listCryptoCurrencies, currenciesByMarketcap, findCryptoCurrencyById, } from "../../currencies";
|
|
@@ -25,7 +25,8 @@ const emptyHashData = "000000000000000000000000000000000000000000000000000000000
|
|
|
25
25
|
//to simplify this a lot. Stay calm.
|
|
26
26
|
const listApps = (transport, deviceInfo) => {
|
|
27
27
|
var _a;
|
|
28
|
-
|
|
28
|
+
const tracer = new LocalTracer("list-apps", { transport: transport.getTraceContext() });
|
|
29
|
+
tracer.trace("Using legacy version", { deviceInfo });
|
|
29
30
|
if (deviceInfo.isOSU || deviceInfo.isBootloader) {
|
|
30
31
|
return throwError(() => new UnexpectedBootloader(""));
|
|
31
32
|
}
|
|
@@ -61,7 +62,7 @@ const listApps = (transport, deviceInfo) => {
|
|
|
61
62
|
blocks: 0,
|
|
62
63
|
})))
|
|
63
64
|
.catch(e => {
|
|
64
|
-
|
|
65
|
+
tracer.trace(`Failed to HSM list apps ${e}`, { error: e });
|
|
65
66
|
throw e;
|
|
66
67
|
})
|
|
67
68
|
.then(apps => [apps, true]);
|
|
@@ -167,7 +168,7 @@ const listApps = (transport, deviceInfo) => {
|
|
|
167
168
|
return app;
|
|
168
169
|
})
|
|
169
170
|
.filter(Boolean);
|
|
170
|
-
|
|
171
|
+
tracer.trace(`${installedList.length} apps installed. ${applicationsList.length} apps store total. ${apps.length} available.`, {
|
|
171
172
|
installedList,
|
|
172
173
|
});
|
|
173
174
|
const deviceModel = getDeviceModel(deviceModelId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v1.js","sourceRoot":"","sources":["../../../src/apps/listApps/v1.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAO,OAAO,EAAc,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"v1.js","sourceRoot":"","sources":["../../../src/apps/listApps/v1.ts"],"names":[],"mappings":"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"}
|