@ledgerhq/live-cli 22.0.3 → 22.1.0-next.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/cli.js +1 -1
- package/lib/cli.js.map +1 -1
- package/lib/commands/app.js +9 -9
- package/lib/commands/app.js.map +1 -1
- package/lib/commands/appUninstallAll.d.ts +1 -1
- package/lib/commands/appUninstallAll.js +6 -6
- package/lib/commands/appUninstallAll.js.map +1 -1
- package/lib/commands/appsCheckAllAppVersions.js +14 -14
- package/lib/commands/appsCheckAllAppVersions.js.map +1 -1
- package/lib/commands/appsInstallAll.d.ts +1 -1
- package/lib/commands/appsInstallAll.js +7 -7
- package/lib/commands/appsInstallAll.js.map +1 -1
- package/lib/commands/appsUpdateTestAll.js +11 -11
- package/lib/commands/appsUpdateTestAll.js.map +1 -1
- package/lib/commands/balanceHistory.js +10 -10
- package/lib/commands/balanceHistory.js.map +1 -1
- package/lib/commands/bot.js +3 -3
- package/lib/commands/bot.js.map +1 -1
- package/lib/commands/botPortfolio.js +7 -7
- package/lib/commands/botPortfolio.js.map +1 -1
- package/lib/commands/botTransfer.js +16 -16
- package/lib/commands/botTransfer.js.map +1 -1
- package/lib/commands/broadcast.js +4 -4
- package/lib/commands/broadcast.js.map +1 -1
- package/lib/commands/countervalues.js +14 -14
- package/lib/commands/countervalues.js.map +1 -1
- package/lib/commands/derivation.js +6 -6
- package/lib/commands/derivation.js.map +1 -1
- package/lib/commands/devDeviceAppsScenario.d.ts.map +1 -1
- package/lib/commands/devDeviceAppsScenario.js +30 -10
- package/lib/commands/devDeviceAppsScenario.js.map +1 -1
- package/lib/commands/deviceAppVersion.js +2 -2
- package/lib/commands/deviceAppVersion.js.map +1 -1
- package/lib/commands/deviceInfo.js +2 -2
- package/lib/commands/deviceInfo.js.map +1 -1
- package/lib/commands/deviceVersion.js +2 -2
- package/lib/commands/deviceVersion.js.map +1 -1
- package/lib/commands/discoverDevices.d.ts.map +1 -1
- package/lib/commands/discoverDevices.js +2 -2
- package/lib/commands/discoverDevices.js.map +1 -1
- package/lib/commands/envs.d.ts.map +1 -1
- package/lib/commands/envs.js +1 -1
- package/lib/commands/envs.js.map +1 -1
- package/lib/commands/estimateMaxSpendable.js +7 -7
- package/lib/commands/estimateMaxSpendable.js.map +1 -1
- package/lib/commands/exportAccounts.js +1 -1
- package/lib/commands/exportAccounts.js.map +1 -1
- package/lib/commands/firmwareRepair.js +1 -1
- package/lib/commands/firmwareRepair.js.map +1 -1
- package/lib/commands/firmwareUpdate.js +10 -10
- package/lib/commands/firmwareUpdate.js.map +1 -1
- package/lib/commands/generateTestScanAccounts.js +2 -2
- package/lib/commands/generateTestScanAccounts.js.map +1 -1
- package/lib/commands/generateTestTransaction.js +9 -9
- package/lib/commands/generateTestTransaction.js.map +1 -1
- package/lib/commands/genuineCheck.js +3 -3
- package/lib/commands/genuineCheck.js.map +1 -1
- package/lib/commands/getAddress.js +4 -4
- package/lib/commands/getAddress.js.map +1 -1
- package/lib/commands/getTransactionStatus.js +9 -9
- package/lib/commands/getTransactionStatus.js.map +1 -1
- package/lib/commands/liveData.js +1 -1
- package/lib/commands/liveData.js.map +1 -1
- package/lib/commands/makeCompoundSummary.d.ts +1 -1
- package/lib/commands/makeCompoundSummary.d.ts.map +1 -1
- package/lib/commands/makeCompoundSummary.js +7 -7
- package/lib/commands/makeCompoundSummary.js.map +1 -1
- package/lib/commands/managerListApps.js +3 -3
- package/lib/commands/managerListApps.js.map +1 -1
- package/lib/commands/portfolio.js +14 -14
- package/lib/commands/portfolio.js.map +1 -1
- package/lib/commands/proxy.d.ts.map +1 -1
- package/lib/commands/proxy.js +4 -4
- package/lib/commands/proxy.js.map +1 -1
- package/lib/commands/receive.js +3 -3
- package/lib/commands/receive.js.map +1 -1
- package/lib/commands/repl.js +1 -1
- package/lib/commands/repl.js.map +1 -1
- package/lib/commands/satstack.js +5 -5
- package/lib/commands/satstack.js.map +1 -1
- package/lib/commands/satstackStatus.d.ts +1 -1
- package/lib/commands/satstackStatus.js +2 -2
- package/lib/commands/satstackStatus.js.map +1 -1
- package/lib/commands/scanDescriptors.d.ts +1 -1
- package/lib/commands/scanDescriptors.js +3 -3
- package/lib/commands/scanDescriptors.js.map +1 -1
- package/lib/commands/send.js +14 -14
- package/lib/commands/send.js.map +1 -1
- package/lib/commands/signMessage.js +3 -3
- package/lib/commands/signMessage.js.map +1 -1
- package/lib/commands/speculosList.js +3 -3
- package/lib/commands/speculosList.js.map +1 -1
- package/lib/commands/swap.d.ts.map +1 -1
- package/lib/commands/swap.js +18 -19
- package/lib/commands/swap.js.map +1 -1
- package/lib/commands/sync.js +8 -8
- package/lib/commands/sync.js.map +1 -1
- package/lib/commands/synchronousOnboarding.d.ts +1 -1
- package/lib/commands/synchronousOnboarding.d.ts.map +1 -1
- package/lib/commands/synchronousOnboarding.js +1 -1
- package/lib/commands/synchronousOnboarding.js.map +1 -1
- package/lib/commands/testDetectOpCollision.d.ts +1 -1
- package/lib/commands/testDetectOpCollision.js +2 -2
- package/lib/commands/testDetectOpCollision.js.map +1 -1
- package/lib/commands/testGetTrustedInputFromTxHash.d.ts.map +1 -1
- package/lib/commands/testGetTrustedInputFromTxHash.js +6 -4
- package/lib/commands/testGetTrustedInputFromTxHash.js.map +1 -1
- package/lib/commands/user.js +1 -1
- package/lib/commands/user.js.map +1 -1
- package/lib/commands/walletconnect.js +8 -8
- package/lib/commands/walletconnect.js.map +1 -1
- package/lib/live-common-setup-base.js +6 -5
- package/lib/live-common-setup-base.js.map +1 -1
- package/lib/live-common-setup.d.ts.map +1 -1
- package/lib/live-common-setup.js +14 -13
- package/lib/live-common-setup.js.map +1 -1
- package/lib/scan.d.ts +1 -1
- package/lib/scan.d.ts.map +1 -1
- package/lib/scan.js +25 -25
- package/lib/scan.js.map +1 -1
- package/lib/signedOperation.d.ts +1 -1
- package/lib/signedOperation.d.ts.map +1 -1
- package/lib/signedOperation.js +2 -2
- package/lib/signedOperation.js.map +1 -1
- package/lib/transaction.d.ts +1 -1
- package/lib/transaction.d.ts.map +1 -1
- package/lib/transaction.js +8 -8
- package/lib/transaction.js.map +1 -1
- package/package.json +16 -13
|
@@ -43,15 +43,15 @@ var invariant_1 = __importDefault(require("invariant"));
|
|
|
43
43
|
var rxjs_1 = require("rxjs");
|
|
44
44
|
var operators_1 = require("rxjs/operators");
|
|
45
45
|
var errors_1 = require("@ledgerhq/errors");
|
|
46
|
-
var Manager_1 = __importDefault(require("@ledgerhq/live-common/
|
|
47
|
-
var network_1 = __importDefault(require("@ledgerhq/live-common/
|
|
48
|
-
var env_1 = require("@ledgerhq/live-common/
|
|
49
|
-
var provider_1 = require("@ledgerhq/live-common/
|
|
50
|
-
var
|
|
51
|
-
var deviceAccess_1 = require("@ledgerhq/live-common/
|
|
52
|
-
var getDeviceInfo_1 = __importDefault(require("@ledgerhq/live-common/
|
|
53
|
-
var firmwareUpdate_prepare_1 = __importDefault(require("@ledgerhq/live-common/
|
|
54
|
-
var firmwareUpdate_main_1 = __importDefault(require("@ledgerhq/live-common/
|
|
46
|
+
var Manager_1 = __importDefault(require("@ledgerhq/live-common/api/Manager"));
|
|
47
|
+
var network_1 = __importDefault(require("@ledgerhq/live-common/network"));
|
|
48
|
+
var env_1 = require("@ledgerhq/live-common/env");
|
|
49
|
+
var provider_1 = require("@ledgerhq/live-common/manager/provider");
|
|
50
|
+
var index_1 = __importDefault(require("@ledgerhq/live-common/manager/index"));
|
|
51
|
+
var deviceAccess_1 = require("@ledgerhq/live-common/hw/deviceAccess");
|
|
52
|
+
var getDeviceInfo_1 = __importDefault(require("@ledgerhq/live-common/hw/getDeviceInfo"));
|
|
53
|
+
var firmwareUpdate_prepare_1 = __importDefault(require("@ledgerhq/live-common/hw/firmwareUpdate-prepare"));
|
|
54
|
+
var firmwareUpdate_main_1 = __importDefault(require("@ledgerhq/live-common/hw/firmwareUpdate-main"));
|
|
55
55
|
var scan_1 = require("../scan");
|
|
56
56
|
var listFirmwareOSU = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
57
57
|
var data;
|
|
@@ -144,7 +144,7 @@ exports["default"] = {
|
|
|
144
144
|
? function (deviceInfo) {
|
|
145
145
|
return customGetLatestFirmwareForDevice(deviceInfo, osuVersion);
|
|
146
146
|
}
|
|
147
|
-
:
|
|
147
|
+
: index_1["default"].getLatestFirmwareForDevice), (0, operators_1.mergeMap)(function (firmware) {
|
|
148
148
|
if (!firmware)
|
|
149
149
|
return (0, rxjs_1.of)("already up to date");
|
|
150
150
|
return (0, rxjs_1.concat)((0, rxjs_1.of)("firmware: ".concat(firmware.final.name, "\nOSU: ").concat(firmware.osu.name, " (hash: ").concat(firmware.osu.hash, ")")), (0, firmwareUpdate_prepare_1["default"])(device || "", firmware), (0, firmwareUpdate_main_1["default"])(device || "", firmware));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firmwareUpdate.js","sourceRoot":"","sources":["../../src/commands/firmwareUpdate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAkC;AAClC,6BAAwC;AACxC,4CAA0C;AAK1C,2CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"firmwareUpdate.js","sourceRoot":"","sources":["../../src/commands/firmwareUpdate.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
27
27
|
exports.__esModule = true;
|
|
28
28
|
var logs_1 = require("@ledgerhq/logs");
|
|
29
29
|
var operators_1 = require("rxjs/operators");
|
|
30
|
-
var
|
|
30
|
+
var index_1 = require("@ledgerhq/live-common/account/index");
|
|
31
31
|
var scan_1 = require("../scan");
|
|
32
32
|
exports["default"] = {
|
|
33
33
|
description: "Generate a test for scan accounts (live-common dataset)",
|
|
@@ -36,7 +36,7 @@ exports["default"] = {
|
|
|
36
36
|
name: "format",
|
|
37
37
|
alias: "f",
|
|
38
38
|
type: String,
|
|
39
|
-
typeDesc: Object.keys(
|
|
39
|
+
typeDesc: Object.keys(index_1.accountFormatters).join(" | "),
|
|
40
40
|
desc: "how to display the data"
|
|
41
41
|
},
|
|
42
42
|
], false),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateTestScanAccounts.js","sourceRoot":"","sources":["../../src/commands/generateTestScanAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwC;AACxC,4CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"generateTestScanAccounts.js","sourceRoot":"","sources":["../../src/commands/generateTestScanAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwC;AACxC,4CAA6C;AAC7C,6DAAwE;AACxE,gCAA+C;AAG/C,qBAAe;IACb,WAAW,EAAE,yDAAyD;IACtE,IAAI,yCACC,qBAAc;QACjB;YACE,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YACpD,IAAI,EAAE,yBAAyB;SAChC;aACF;IACD,GAAG,EAAE,UACH,IAEC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9D,IAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAA,aAAM,EAAC,UAAC,GAAG;YACT,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE;gBACtC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACzB;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,CAAC,IAAI,CACpB,IAAA,kBAAM,EAAqB,UAAC,GAAG,EAAE,CAAC,IAAK,OAAA,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAb,CAAa,EAAE,EAAE,CAAC,EACzD,IAAA,eAAG,EAAoB,UAAC,QAAQ;YAC9B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;YACnD,IAAA,QAAQ,GAAK,QAAQ,CAAC,CAAC,CAAC,SAAhB,CAAiB;YACjC,OAAO,oUASA,QAAQ,CAAC,EAAE,yCACP,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,QAAQ,GAAG,CAAC,EAAZ,CAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,2DAM3D,CAAC;QACI,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -37,14 +37,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
37
37
|
};
|
|
38
38
|
exports.__esModule = true;
|
|
39
39
|
var bignumber_js_1 = require("bignumber.js");
|
|
40
|
-
var
|
|
41
|
-
var
|
|
40
|
+
var index_1 = require("@ledgerhq/live-common/account/index");
|
|
41
|
+
var index_2 = require("@ledgerhq/live-common/transaction/index");
|
|
42
42
|
var logs_1 = require("@ledgerhq/logs");
|
|
43
43
|
var rxjs_1 = require("rxjs");
|
|
44
44
|
var operators_1 = require("rxjs/operators");
|
|
45
45
|
var scan_1 = require("../scan");
|
|
46
|
-
var
|
|
47
|
-
var
|
|
46
|
+
var index_3 = require("@ledgerhq/live-common/bridge/index");
|
|
47
|
+
var transaction_1 = require("../transaction");
|
|
48
48
|
var toJS = function (obj) {
|
|
49
49
|
if (typeof obj === "object" && obj) {
|
|
50
50
|
if (Array.isArray(obj)) {
|
|
@@ -74,10 +74,10 @@ var toJS = function (obj) {
|
|
|
74
74
|
var toTransactionStatusJS = function (status) { return toJS(status); };
|
|
75
75
|
exports["default"] = {
|
|
76
76
|
description: "Generate a test for transaction (live-common dataset)",
|
|
77
|
-
args: __spreadArray(__spreadArray([], __read(scan_1.scanCommonOpts), false), __read(
|
|
77
|
+
args: __spreadArray(__spreadArray([], __read(scan_1.scanCommonOpts), false), __read(transaction_1.inferTransactionsOpts), false),
|
|
78
78
|
job: function (opts) {
|
|
79
79
|
return (0, scan_1.scan)(opts).pipe((0, operators_1.switchMap)(function (account) {
|
|
80
|
-
return (0, rxjs_1.from)((0,
|
|
80
|
+
return (0, rxjs_1.from)((0, transaction_1.inferTransactions)(account, opts)).pipe((0, operators_1.concatMap)(function (inferred) {
|
|
81
81
|
return inferred.reduce(function (acc, _a) {
|
|
82
82
|
var _b = __read(_a, 1), t = _b[0];
|
|
83
83
|
return (0, rxjs_1.concat)(acc, (0, rxjs_1.from)((0, rxjs_1.defer)(function () {
|
|
@@ -87,7 +87,7 @@ exports["default"] = {
|
|
|
87
87
|
apdus.push(log.message);
|
|
88
88
|
}
|
|
89
89
|
});
|
|
90
|
-
var bridge = (0,
|
|
90
|
+
var bridge = (0, index_3.getAccountBridge)(account);
|
|
91
91
|
return bridge
|
|
92
92
|
.signOperation({
|
|
93
93
|
account: account,
|
|
@@ -107,11 +107,11 @@ exports["default"] = {
|
|
|
107
107
|
}), (0, operators_1.map)(function (_a) {
|
|
108
108
|
var _b = __read(_a, 2), signedOperation = _b[0], status = _b[1];
|
|
109
109
|
unsubscribe();
|
|
110
|
-
return "\n{\n name: \"NO_NAME\",\n transaction: fromTransactionRaw(".concat(JSON.stringify((0,
|
|
110
|
+
return "\n{\n name: \"NO_NAME\",\n transaction: fromTransactionRaw(".concat(JSON.stringify((0, index_2.toTransactionRaw)(t)), "),\n expectedStatus: (account, transaction) => (\n // you can use account and transaction for smart logic. drop the =>fn otherwise\n ").concat(toTransactionStatusJS(status), "\n ),\n // WARNING: DO NOT commit this test publicly unless you're ok with possibility tx could leak out. (do self txs)\n testSignedOperation: (expect, signedOperation) => {\n expect(toSignedOperationRaw(signedOperation)).toMatchObject(").concat(JSON.stringify((0, index_2.toSignedOperationRaw)(signedOperation)), ")\n },\n apdus: `\n").concat(apdus.map(function (a) { return " " + a; }).join("\n"), "\n `\n}");
|
|
111
111
|
}));
|
|
112
112
|
})));
|
|
113
113
|
}, rxjs_1.EMPTY);
|
|
114
|
-
}), (0, operators_1.reduce)(function (jsCodes, code) { return jsCodes.concat(code); }, []), (0, operators_1.map)(function (codes) { return "{\n name: \"".concat(account.name, "\",\n raw: ").concat(JSON.stringify((0,
|
|
114
|
+
}), (0, operators_1.reduce)(function (jsCodes, code) { return jsCodes.concat(code); }, []), (0, operators_1.map)(function (codes) { return "{\n name: \"".concat(account.name, "\",\n raw: ").concat(JSON.stringify((0, index_1.toAccountRaw)(__assign(__assign({}, account), { operations: [], balanceHistory: undefined, freshAddresses: [] }))), ",\n transactions: [\n ").concat(codes.join(","), "\n ]\n }"); }));
|
|
115
115
|
}));
|
|
116
116
|
}
|
|
117
117
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateTestTransaction.js","sourceRoot":"","sources":["../../src/commands/generateTestTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"generateTestTransaction.js","sourceRoot":"","sources":["../../src/commands/generateTestTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
var rxjs_1 = require("rxjs");
|
|
7
7
|
var operators_1 = require("rxjs/operators");
|
|
8
|
-
var deviceAccess_1 = require("@ledgerhq/live-common/
|
|
9
|
-
var getDeviceInfo_1 = __importDefault(require("@ledgerhq/live-common/
|
|
10
|
-
var genuineCheck_1 = __importDefault(require("@ledgerhq/live-common/
|
|
8
|
+
var deviceAccess_1 = require("@ledgerhq/live-common/hw/deviceAccess");
|
|
9
|
+
var getDeviceInfo_1 = __importDefault(require("@ledgerhq/live-common/hw/getDeviceInfo"));
|
|
10
|
+
var genuineCheck_1 = __importDefault(require("@ledgerhq/live-common/hw/genuineCheck"));
|
|
11
11
|
var scan_1 = require("../scan");
|
|
12
12
|
exports["default"] = {
|
|
13
13
|
description: "Perform a genuine check with Ledger's HSM",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genuineCheck.js","sourceRoot":"","sources":["../../src/commands/genuineCheck.ts"],"names":[],"mappings":";;;;;AAAA,6BAA4B;AAC5B,4CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"genuineCheck.js","sourceRoot":"","sources":["../../src/commands/genuineCheck.ts"],"names":[],"mappings":";;;;;AAAA,6BAA4B;AAC5B,4CAA0C;AAC1C,sEAAmE;AACnE,yFAAmE;AACnE,uFAAiE;AACjE,gCAAoC;AACpC,qBAAe;IACb,WAAW,EAAE,2CAA2C;IACxD,IAAI,EAAE,CAAC,gBAAS,CAAC;IACjB,GAAG,EAAE,UAAC,EAIJ;YAHA,MAAM,YAAA;QAIN,OAAA,IAAA,yBAAU,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC,UAAC,CAAC;YACzB,OAAA,IAAA,WAAI,EAAC,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACzB,IAAA,oBAAQ,EAAC,UAAC,UAAU,IAAK,OAAA,IAAA,yBAAY,EAAC,CAAC,EAAE,UAAU,CAAC,EAA3B,CAA2B,CAAC,CACtD;QAFD,CAEC,CACF;IAJD,CAIC;CACJ,CAAC"}
|
|
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
var rxjs_1 = require("rxjs");
|
|
7
7
|
var operators_1 = require("rxjs/operators");
|
|
8
|
-
var derivation_1 = require("@ledgerhq/live-common/
|
|
9
|
-
var deviceAccess_1 = require("@ledgerhq/live-common/
|
|
10
|
-
var
|
|
8
|
+
var derivation_1 = require("@ledgerhq/live-common/derivation");
|
|
9
|
+
var deviceAccess_1 = require("@ledgerhq/live-common/hw/deviceAccess");
|
|
10
|
+
var index_1 = __importDefault(require("@ledgerhq/live-common/hw/getAddress/index"));
|
|
11
11
|
var scan_1 = require("../scan");
|
|
12
12
|
exports["default"] = {
|
|
13
13
|
description: "Get an address with the device on specific derivations (advanced)",
|
|
@@ -41,7 +41,7 @@ exports["default"] = {
|
|
|
41
41
|
}
|
|
42
42
|
(0, derivation_1.asDerivationMode)(arg.derivationMode);
|
|
43
43
|
return (0, deviceAccess_1.withDevice)(arg.device || "")(function (t) {
|
|
44
|
-
return (0, rxjs_1.from)((0,
|
|
44
|
+
return (0, rxjs_1.from)((0, index_1["default"])(t, {
|
|
45
45
|
currency: currency,
|
|
46
46
|
path: arg.path,
|
|
47
47
|
derivationMode: (0, derivation_1.asDerivationMode)(arg.derivationMode || ""),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAddress.js","sourceRoot":"","sources":["../../src/commands/getAddress.ts"],"names":[],"mappings":";;;;;AAAA,6BAA4B;AAC5B,4CAA0C;AAC1C
|
|
1
|
+
{"version":3,"file":"getAddress.js","sourceRoot":"","sources":["../../src/commands/getAddress.ts"],"names":[],"mappings":";;;;;AAAA,6BAA4B;AAC5B,4CAA0C;AAC1C,+DAAoE;AACpE,sEAAmE;AACnE,oFAAmE;AACnE,gCAAgE;AAChE,qBAAe;IACb,WAAW,EACT,mEAAmE;IACrE,IAAI,EAAE;QACJ,kBAAW;QACX,gBAAS;QACT;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,qBAAqB;SAC5B;QACD;YACE,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uBAAuB;SAC9B;QACD;YACE,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,iCAAiC;SACxC;KACF;IACD,GAAG,EAAE,UACH,GAME;QAEF,OAAA,IAAA,oBAAa,EAAC,GAAG,CAAC,CAAC,IAAI,CACrB,IAAA,oBAAQ,EAAC,UAAC,QAAQ;YAChB,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YAED,IAAA,6BAAgB,EAAC,GAAG,CAAC,cAAwB,CAAC,CAAC;YAC/C,OAAO,IAAA,yBAAU,EAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,UAAC,CAAC;gBACpC,OAAA,IAAA,WAAI,EACF,IAAA,kBAAU,EAAC,CAAC,EAAE;oBACZ,QAAQ,UAAA;oBACR,IAAI,EAAE,GAAG,CAAC,IAAc;oBACxB,cAAc,EAAE,IAAA,6BAAgB,EAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;oBAC1D,MAAM,EAAE,GAAG,CAAC,MAAM;iBACnB,CAAC,CACH;YAPD,CAOC,CACF,CAAC;QACJ,CAAC,CAAC,CACH;IAtBD,CAsBC;CACJ,CAAC"}
|
|
@@ -27,31 +27,31 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
27
27
|
exports.__esModule = true;
|
|
28
28
|
var rxjs_1 = require("rxjs");
|
|
29
29
|
var operators_1 = require("rxjs/operators");
|
|
30
|
-
var
|
|
30
|
+
var index_1 = require("@ledgerhq/live-common/transaction/index");
|
|
31
31
|
var scan_1 = require("../scan");
|
|
32
|
-
var
|
|
32
|
+
var transaction_1 = require("../transaction");
|
|
33
33
|
var getTransactionStatusFormatters = {
|
|
34
34
|
"default": function (_a) {
|
|
35
35
|
var status = _a.status, transaction = _a.transaction, account = _a.account;
|
|
36
36
|
return "TRANSACTION " +
|
|
37
|
-
((0,
|
|
38
|
-
JSON.stringify((0,
|
|
37
|
+
((0, index_1.formatTransaction)(transaction, account) ||
|
|
38
|
+
JSON.stringify((0, index_1.toTransactionRaw)(transaction))) +
|
|
39
39
|
"\n" +
|
|
40
40
|
"STATUS " +
|
|
41
|
-
(0,
|
|
41
|
+
(0, index_1.formatTransactionStatus)(transaction, status, account);
|
|
42
42
|
},
|
|
43
43
|
json: function (_a) {
|
|
44
44
|
var status = _a.status, transaction = _a.transaction;
|
|
45
45
|
return "TRANSACTION " +
|
|
46
|
-
JSON.stringify((0,
|
|
46
|
+
JSON.stringify((0, index_1.toTransactionRaw)(transaction)) +
|
|
47
47
|
"\n" +
|
|
48
48
|
"STATUS " +
|
|
49
|
-
JSON.stringify((0,
|
|
49
|
+
JSON.stringify((0, index_1.toTransactionStatusRaw)(status));
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
52
|
exports["default"] = {
|
|
53
53
|
description: "Prepare a transaction and returns 'TransactionStatus' meta information",
|
|
54
|
-
args: __spreadArray(__spreadArray(__spreadArray([], __read(scan_1.scanCommonOpts), false), __read(
|
|
54
|
+
args: __spreadArray(__spreadArray(__spreadArray([], __read(scan_1.scanCommonOpts), false), __read(transaction_1.inferTransactionsOpts), false), [
|
|
55
55
|
{
|
|
56
56
|
name: "format",
|
|
57
57
|
alias: "f",
|
|
@@ -62,7 +62,7 @@ exports["default"] = {
|
|
|
62
62
|
], false),
|
|
63
63
|
job: function (opts) {
|
|
64
64
|
return (0, scan_1.scan)(opts).pipe((0, operators_1.concatMap)(function (account) {
|
|
65
|
-
return (0, rxjs_1.from)((0,
|
|
65
|
+
return (0, rxjs_1.from)((0, transaction_1.inferTransactions)(account, opts)).pipe((0, operators_1.mergeMap)(function (inferred) {
|
|
66
66
|
return inferred.reduce(function (acc, _a) {
|
|
67
67
|
var _b = __read(_a, 2), transaction = _b[0], status = _b[1];
|
|
68
68
|
return (0, rxjs_1.concat)(acc, (0, rxjs_1.of)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/commands/getTransactionStatus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA2D;AAC3D,4CAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/commands/getTransactionStatus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA2D;AAC3D,4CAA0D;AAC1D,iEAKiD;AACjD,gCAA+C;AAG/C,8CAA0E;AAC1E,IAAM,8BAA8B,GAAG;IACrC,SAAO,EAAE,UAAC,EAAgC;YAA9B,MAAM,YAAA,EAAE,WAAW,iBAAA,EAAE,OAAO,aAAA;QACtC,OAAA,cAAc;YACd,CAAC,IAAA,yBAAiB,EAAC,WAAW,EAAE,OAAO,CAAC;gBACtC,IAAI,CAAC,SAAS,CAAC,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC,CAAC;YAChD,IAAI;YACJ,SAAS;YACT,IAAA,+BAAuB,EAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC;IALrD,CAKqD;IACvD,IAAI,EAAE,UAAC,EAAuB;YAArB,MAAM,YAAA,EAAE,WAAW,iBAAA;QAC1B,OAAA,cAAc;YACd,IAAI,CAAC,SAAS,CAAC,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC;YAC7C,IAAI;YACJ,SAAS;YACT,IAAI,CAAC,SAAS,CAAC,IAAA,8BAAsB,EAAC,MAAM,CAAC,CAAC;IAJ9C,CAI8C;CACjD,CAAC;AACF,qBAAe;IACb,WAAW,EACT,wEAAwE;IAC1E,IAAI,uDACC,qBAAc,kBACd,mCAAqB;QACxB;YACE,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YACjE,IAAI,EAAE,yBAAyB;SAChC;aACF;IACD,GAAG,EAAE,UACH,IAGG;QAEH,OAAA,IAAA,WAAI,EAAC,IAAI,CAAC,CAAC,IAAI,CACb,IAAA,qBAAS,EAAC,UAAC,OAAO;YAChB,OAAA,IAAA,WAAI,EAAC,IAAA,+BAAiB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACzC,IAAA,oBAAQ,EAAC,UAAC,QAAQ;gBAChB,OAAA,QAAQ,CAAC,MAAM,CACb,UAAC,GAAG,EAAE,EAAqB;wBAArB,KAAA,aAAqB,EAApB,WAAW,QAAA,EAAE,MAAM,QAAA;oBACxB,OAAA,IAAA,aAAM,EACJ,GAAG,EACH,IAAA,SAAE,EAAC;wBACD,WAAW,aAAA;wBACX,MAAM,QAAA;wBACN,OAAO,SAAA;qBACR,CAAC,CACH;gBAPD,CAOC,EACH,YAAwB,CACzB;YAXD,CAWC,CACF,EACD,IAAA,eAAG,EAAC,UAAC,CAAC;gBACJ,IAAM,CAAC,GAAG,8BAA8B,CAAC,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC;gBAEnE,IAAI,CAAC,CAAC,EAAE;oBACN,MAAM,IAAI,KAAK,CACb,qDAAqD;wBACnD,IAAI,CAAC,MAAM;wBACX,GAAG,CACN,CAAC;iBACH;gBAED,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACd,CAAC,CAAC,CACH;QA5BD,CA4BC,CACF,CACF;IAhCD,CAgCC;CACJ,CAAC"}
|
package/lib/commands/liveData.js
CHANGED
|
@@ -32,7 +32,7 @@ var rxjs_1 = require("rxjs");
|
|
|
32
32
|
var operators_1 = require("rxjs/operators");
|
|
33
33
|
var fs_1 = __importDefault(require("fs"));
|
|
34
34
|
var scan_1 = require("../scan");
|
|
35
|
-
var serialization_1 = require("@ledgerhq/live-common/
|
|
35
|
+
var serialization_1 = require("@ledgerhq/live-common/account/serialization");
|
|
36
36
|
exports["default"] = {
|
|
37
37
|
description: "utility for Ledger Live app.json file",
|
|
38
38
|
args: __spreadArray(__spreadArray([], __read(scan_1.scanCommonOpts), false), [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveData.js","sourceRoot":"","sources":["../../src/commands/liveData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAsC;AACtC,4CAAkD;AAClD,0CAAoB;AACpB,gCAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"liveData.js","sourceRoot":"","sources":["../../src/commands/liveData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAsC;AACtC,4CAAkD;AAClD,0CAAoB;AACpB,gCAA+C;AAE/C,6EAA2E;AAE3E,qBAAe;IACb,WAAW,EAAE,uCAAuC;IACpD,IAAI,yCACC,qBAAc;QACjB;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,UAAU;YACpB,IAAI,EAAE,iCAAiC;SACxC;QACD;YACE,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,2BAA2B;SAClC;aACF;IACD,GAAG,EAAE,UACH,IAII;QAEJ,OAAA,IAAA,WAAI,EAAC,IAAI,CAAC,CAAC,IAAI,CACb,IAAA,kBAAM,EACJ,UAAC,QAAQ,EAAE,OAAO,IAAK,OAAA,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAxB,CAAwB,EAC/C,EAAE,CACH,EACD,IAAA,oBAAQ,EAAC,UAAC,QAAQ;YAChB,IAAM,WAAW,GAAG,IAAI,CAAC,OAAO;gBAC9B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACpD,CAAC,CAAC;oBACE,IAAI,EAAE;wBACJ,QAAQ,EAAE,EAAE;qBACb;iBACF,CAAC;YAEN,IAAI,OAAO,WAAW,CAAC,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACjD,OAAO,IAAA,iBAAU,EACf,IAAI,KAAK,CAAC,6CAA6C,CAAC,CACzD,CAAC;aACH;YAED,IAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,CAAC,EAAE,EAAT,CAAS,CAAC,CAAC;YACpE,IAAM,MAAM,GAAG,QAAQ;iBACpB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAA3B,CAA2B,CAAC;iBAC1C,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,CAAC;gBACjB,IAAI,EAAE,IAAA,4BAAY,EAAC,OAAO,CAAC;gBAC3B,OAAO,EAAE,CAAC;aACX,CAAC,EAHgB,CAGhB,CAAC,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAErE,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,eAAE,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;gBACrE,OAAO,IAAA,SAAE,EAAC,MAAM,CAAC,MAAM,GAAG,kBAAkB,CAAC,CAAC;aAC/C;iBAAM;gBACL,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;aACxC;QACH,CAAC,CAAC,CACH;IApCD,CAoCC;CACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CompoundAccountSummary } from "@ledgerhq/live-common/
|
|
1
|
+
import type { CompoundAccountSummary } from "@ledgerhq/live-common/compound/types";
|
|
2
2
|
import type { ScanCommonOpts } from "../scan";
|
|
3
3
|
declare const compoundSummaryFormatter: {
|
|
4
4
|
summary: (summary: CompoundAccountSummary) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeCompoundSummary.d.ts","sourceRoot":"","sources":["../../src/commands/makeCompoundSummary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,
|
|
1
|
+
{"version":3,"file":"makeCompoundSummary.d.ts","sourceRoot":"","sources":["../../src/commands/makeCompoundSummary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,sCAAsC,CAAC;AAQ9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAgH9C,QAAA,MAAM,wBAAwB;uBACT,sBAAsB,KAAG,MAAM;uBA6B/B,sBAAsB,KAAG,MAAM;CAUnD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAcQ,cAAc,GAAG;QACrB,MAAM,EAAE,MAAM,+BAA+B,CAAC;KAC/C;;AAfL,wBAiCE"}
|
|
@@ -37,8 +37,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
37
37
|
};
|
|
38
38
|
exports.__esModule = true;
|
|
39
39
|
var operators_1 = require("rxjs/operators");
|
|
40
|
-
var
|
|
41
|
-
var logic_1 = require("@ledgerhq/live-common/
|
|
40
|
+
var index_1 = require("@ledgerhq/live-common/currencies/index");
|
|
41
|
+
var logic_1 = require("@ledgerhq/live-common/compound/logic");
|
|
42
42
|
var scan_1 = require("../scan");
|
|
43
43
|
var formatDate = function (date) {
|
|
44
44
|
var ye = new Intl.DateTimeFormat("en", {
|
|
@@ -68,9 +68,9 @@ var createLoanHeader = function (summary, strings, account, parentAccount) {
|
|
|
68
68
|
strings.push("".concat(account.token.ticker, " earned").padStart(16));
|
|
69
69
|
strings.push(" | ");
|
|
70
70
|
strings.push("\n");
|
|
71
|
-
strings.push("".concat((0,
|
|
71
|
+
strings.push("".concat((0, index_1.formatCurrencyUnit)(account.token.units[0], totalSupplied)).padStart(16));
|
|
72
72
|
strings.push(" | ");
|
|
73
|
-
strings.push("".concat((0,
|
|
73
|
+
strings.push("".concat((0, index_1.formatCurrencyUnit)(account.token.units[0], allTimeEarned)).padStart(16));
|
|
74
74
|
strings.push(" | ");
|
|
75
75
|
strings.push("\n");
|
|
76
76
|
strings.push("-------------------------------");
|
|
@@ -99,9 +99,9 @@ var createLoanDisplay = function (loans, strings, title, account) {
|
|
|
99
99
|
strings.push(" | ");
|
|
100
100
|
strings.push((endDate ? formatDate(endDate) : "-").padStart(16));
|
|
101
101
|
strings.push(" | ");
|
|
102
|
-
strings.push("".concat((0,
|
|
102
|
+
strings.push("".concat((0, index_1.formatCurrencyUnit)(account.token.units[0], amountSupplied)).padStart(16));
|
|
103
103
|
strings.push(" | ");
|
|
104
|
-
strings.push("".concat((0,
|
|
104
|
+
strings.push("".concat((0, index_1.formatCurrencyUnit)(account.token.units[0], interestsEarned)).padStart(16));
|
|
105
105
|
strings.push(" | ");
|
|
106
106
|
strings.push("".concat(Math.round(percentageEarned * 100) / 100).padStart(22));
|
|
107
107
|
strings.push(" | ");
|
|
@@ -175,7 +175,7 @@ exports["default"] = {
|
|
|
175
175
|
account.subAccounts.forEach(function (s) {
|
|
176
176
|
if (s.type !== "TokenAccount")
|
|
177
177
|
return;
|
|
178
|
-
if (!(0,
|
|
178
|
+
if (!(0, index_1.findCompoundToken)(s.token))
|
|
179
179
|
return;
|
|
180
180
|
var sum = (0, logic_1.makeCompoundSummaryForAccount)(s, account);
|
|
181
181
|
if (!sum)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeCompoundSummary.js","sourceRoot":"","sources":["../../src/commands/makeCompoundSummary.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAqC;AAKrC,
|
|
1
|
+
{"version":3,"file":"makeCompoundSummary.js","sourceRoot":"","sources":["../../src/commands/makeCompoundSummary.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
var rxjs_1 = require("rxjs");
|
|
7
7
|
var operators_1 = require("rxjs/operators");
|
|
8
|
-
var deviceAccess_1 = require("@ledgerhq/live-common/
|
|
9
|
-
var getDeviceInfo_1 = __importDefault(require("@ledgerhq/live-common/
|
|
10
|
-
var hw_1 = require("@ledgerhq/live-common/
|
|
8
|
+
var deviceAccess_1 = require("@ledgerhq/live-common/hw/deviceAccess");
|
|
9
|
+
var getDeviceInfo_1 = __importDefault(require("@ledgerhq/live-common/hw/getDeviceInfo"));
|
|
10
|
+
var hw_1 = require("@ledgerhq/live-common/apps/hw");
|
|
11
11
|
var scan_1 = require("../scan");
|
|
12
12
|
exports["default"] = {
|
|
13
13
|
description: "List apps that can be installed on the device",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managerListApps.js","sourceRoot":"","sources":["../../src/commands/managerListApps.ts"],"names":[],"mappings":";;;;;AAAA,6BAA4B;AAC5B,4CAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"managerListApps.js","sourceRoot":"","sources":["../../src/commands/managerListApps.ts"],"names":[],"mappings":";;;;;AAAA,6BAA4B;AAC5B,4CAAuD;AACvD,sEAAmE;AACnE,yFAAmE;AACnE,oDAAyD;AACzD,gCAAoC;AACpC,qBAAe;IACb,WAAW,EAAE,+CAA+C;IAC5D,IAAI,EAAE;QACJ,gBAAS;QACT;YACE,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,sBAAsB;SACjC;KACF;IACD,GAAG,EAAE,UAAC,EAMJ;YALA,MAAM,YAAA,EACN,MAAM,YAAA;QAKN,OAAA,IAAA,yBAAU,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC,UAAC,CAAC;YACzB,OAAA,IAAA,WAAI,EAAC,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACzB,IAAA,oBAAQ,EAAC,UAAC,UAAU;gBAClB,OAAA,IAAA,aAAQ,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,CAC1B,IAAA,kBAAM,EAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAnB,CAAmB,CAAC;gBAClC,wEAAwE;gBACxE,IAAA,eAAG,EAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC,CACrB;YAJD,CAIC,CACF,EACD,IAAA,eAAG,EAAC,UAAC,CAAC;gBACJ,OAAA,MAAM,KAAK,KAAK;oBACd,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,MAAM,KAAK,MAAM;wBACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;wBACnB,CAAC,CAAC,CAAC,CAAC,aAAa;6BACZ,GAAG,CAAC,UAAC,IAAI;4BACR,IAAM,IAAI,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;4BAC/B,IAAM,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAApB,CAAoB,CAAC,CAAC;4BAC1D,OAAO,CACL,YAAK,IAAI,CAAC,IAAI,cAAI,IAAI,CAAC,OAAO,CAAE;gCAChC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC7D,CAAC;wBACJ,CAAC,CAAC;6BACD,IAAI,CAAC,IAAI,CAAC;YAbjB,CAaiB,CAClB,CACF;QAxBD,CAwBC,CACF;IA1BD,CA0BC;CACJ,CAAC"}
|
|
@@ -33,12 +33,12 @@ var asciichart_1 = __importDefault(require("asciichart"));
|
|
|
33
33
|
var invariant_1 = __importDefault(require("invariant"));
|
|
34
34
|
var rxjs_1 = require("rxjs");
|
|
35
35
|
var operators_1 = require("rxjs/operators");
|
|
36
|
-
var
|
|
37
|
-
var
|
|
38
|
-
var range_1 = require("@ledgerhq/live-common/
|
|
39
|
-
var
|
|
36
|
+
var index_1 = require("@ledgerhq/live-common/account/index");
|
|
37
|
+
var index_2 = require("@ledgerhq/live-common/portfolio/v2/index");
|
|
38
|
+
var range_1 = require("@ledgerhq/live-common/portfolio/v2/range");
|
|
39
|
+
var index_3 = require("@ledgerhq/live-common/currencies/index");
|
|
40
40
|
var scan_1 = require("../scan");
|
|
41
|
-
var logic_1 = require("@ledgerhq/live-common/
|
|
41
|
+
var logic_1 = require("@ledgerhq/live-common/countervalues/logic");
|
|
42
42
|
function asPortfolioRange(period) {
|
|
43
43
|
var ranges = (0, range_1.getRanges)();
|
|
44
44
|
(0, invariant_1["default"])(ranges.includes(period), "invalid period. valid values are %s", ranges.join(" | "));
|
|
@@ -66,23 +66,23 @@ exports["default"] = {
|
|
|
66
66
|
},
|
|
67
67
|
], false),
|
|
68
68
|
job: function (opts) {
|
|
69
|
-
var countervalue = (0,
|
|
69
|
+
var countervalue = (0, index_3.findCurrencyByTicker)(opts.countervalue || "USD");
|
|
70
70
|
(0, invariant_1["default"])(countervalue, "currency not found with ticker=" + opts.countervalue);
|
|
71
71
|
return (0, scan_1.scan)(opts).pipe((0, operators_1.reduce)(function (all, a) { return all.concat(a); }, []), (0, operators_1.concatMap)(function (accounts) {
|
|
72
72
|
return (0, rxjs_1.from)((0, logic_1.loadCountervalues)(logic_1.initialState, {
|
|
73
73
|
trackingPairs: (0, logic_1.inferTrackingPairForAccounts)(accounts, countervalue),
|
|
74
74
|
autofillGaps: !opts.disableAutofillGaps
|
|
75
75
|
})).pipe((0, operators_1.map)(function (state) {
|
|
76
|
-
var all = (0,
|
|
76
|
+
var all = (0, index_1.flattenAccounts)(accounts);
|
|
77
77
|
var period = asPortfolioRange(opts.period || "month");
|
|
78
78
|
var unit = countervalue.units[0];
|
|
79
79
|
function render(title, accounts) {
|
|
80
|
-
var portfolio = (0,
|
|
80
|
+
var portfolio = (0, index_2.getPortfolio)(accounts, period, state, countervalue);
|
|
81
81
|
var balance = portfolio.balanceHistory[portfolio.balanceHistory.length - 1]
|
|
82
82
|
.value;
|
|
83
83
|
return (title +
|
|
84
84
|
" " +
|
|
85
|
-
(0,
|
|
85
|
+
(0, index_3.formatCurrencyUnit)(unit, new bignumber_js_1.BigNumber(balance), {
|
|
86
86
|
showCode: true,
|
|
87
87
|
disableRounding: true
|
|
88
88
|
}) +
|
|
@@ -93,7 +93,7 @@ exports["default"] = {
|
|
|
93
93
|
" period: " +
|
|
94
94
|
Math.round(portfolio.countervalueChange.percentage * 100).toString() +
|
|
95
95
|
"% (" +
|
|
96
|
-
(0,
|
|
96
|
+
(0, index_3.formatCurrencyUnit)(unit, new bignumber_js_1.BigNumber(portfolio.countervalueChange.value), {
|
|
97
97
|
showCode: true
|
|
98
98
|
}) +
|
|
99
99
|
")"
|
|
@@ -106,7 +106,7 @@ exports["default"] = {
|
|
|
106
106
|
}), {
|
|
107
107
|
height: 10,
|
|
108
108
|
format: function (value) {
|
|
109
|
-
return (0,
|
|
109
|
+
return (0, index_3.formatCurrencyUnit)(unit, new bignumber_js_1.BigNumber(value).times(new bignumber_js_1.BigNumber(10).pow(unit.magnitude)), {
|
|
110
110
|
showCode: true,
|
|
111
111
|
disableRounding: true
|
|
112
112
|
}).padStart(20);
|
|
@@ -115,14 +115,14 @@ exports["default"] = {
|
|
|
115
115
|
}
|
|
116
116
|
var str = "";
|
|
117
117
|
accounts.forEach(function (top) {
|
|
118
|
-
str += render("Account " + (0,
|
|
118
|
+
str += render("Account " + (0, index_1.getAccountName)(top), [top]);
|
|
119
119
|
str += "\n";
|
|
120
120
|
if (top.subAccounts) {
|
|
121
121
|
top.subAccounts.forEach(function (sub) {
|
|
122
122
|
str += render("Account " +
|
|
123
|
-
(0,
|
|
123
|
+
(0, index_1.getAccountName)(top) +
|
|
124
124
|
" > " +
|
|
125
|
-
(0,
|
|
125
|
+
(0, index_1.getAccountName)(sub), [sub]).replace(/\n/s, " \n");
|
|
126
126
|
str += "\n";
|
|
127
127
|
});
|
|
128
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portfolio.js","sourceRoot":"","sources":["../../src/commands/portfolio.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyC;AACzC,0DAAoC;AACpC,wDAAkC;AAClC,6BAA4B;AAC5B,4CAAwD;AAMxD,
|
|
1
|
+
{"version":3,"file":"portfolio.js","sourceRoot":"","sources":["../../src/commands/portfolio.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/commands/proxy.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/commands/proxy.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+UlC,wBAGE"}
|
package/lib/commands/proxy.js
CHANGED
|
@@ -67,7 +67,7 @@ exports.__esModule = true;
|
|
|
67
67
|
/* eslint-disable global-require */
|
|
68
68
|
var hw_transport_mocker_1 = require("@ledgerhq/hw-transport-mocker");
|
|
69
69
|
var logs_1 = require("@ledgerhq/logs");
|
|
70
|
-
var
|
|
70
|
+
var index_1 = require("@ledgerhq/live-common/hw/index");
|
|
71
71
|
var fs_1 = __importDefault(require("fs"));
|
|
72
72
|
var http_1 = __importDefault(require("http"));
|
|
73
73
|
var express_1 = __importDefault(require("express"));
|
|
@@ -131,8 +131,8 @@ var job = function (_a) {
|
|
|
131
131
|
var recordStore;
|
|
132
132
|
var getTransportLike = function () {
|
|
133
133
|
return {
|
|
134
|
-
open: function () { return (0,
|
|
135
|
-
create: function () { return (0,
|
|
134
|
+
open: function () { return (0, index_1.open)(device || ""); },
|
|
135
|
+
create: function () { return (0, index_1.open)(device || ""); }
|
|
136
136
|
};
|
|
137
137
|
};
|
|
138
138
|
// --file <file>
|
|
@@ -247,7 +247,7 @@ var job = function (_a) {
|
|
|
247
247
|
case 6: return [3 /*break*/, 8];
|
|
248
248
|
case 7:
|
|
249
249
|
e_1 = _a.sent();
|
|
250
|
-
error = e_1
|
|
250
|
+
error = e_1;
|
|
251
251
|
return [3 /*break*/, 8];
|
|
252
252
|
case 8:
|
|
253
253
|
pending = false;
|