@ledgerhq/vault-cli 1.26.0 → 1.27.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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +6 -0
- package/README.md +1 -1
- package/bin/__tests__/bake.test.js +23 -17
- package/bin/__tests__/bake.test.js.map +1 -1
- package/bin/commands/bake.d.ts +1 -0
- package/bin/commands/bake.d.ts.map +1 -1
- package/bin/commands/bake.js +36 -27
- package/bin/commands/bake.js.map +1 -1
- package/bin/{presets → manifests}/beatles.json +0 -0
- package/bin/{presets → manifests}/empty.json +0 -0
- package/bin/{presets → manifests}/erc20.json +0 -0
- package/bin/{presets → manifests}/polkadot-staking.json +0 -0
- package/bin/{presets → manifests}/polkadot.json +0 -0
- package/bin/{presets → manifests}/ripple.json +0 -0
- package/bin/{presets → manifests}/sci.json +0 -0
- package/bin/{presets → manifests}/solana-dev.json +0 -0
- package/bin/{presets → manifests}/solana-staking.json +0 -0
- package/bin/{presets → manifests}/solana.json +0 -0
- package/bin/{presets → manifests}/stellar.json +0 -0
- package/bin/{presets → manifests}/tezos.json +0 -0
- package/package.json +1 -1
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
package/README.md
CHANGED
|
@@ -57,4 +57,4 @@ ledger-vault bake <manifest.json> [options]
|
|
|
57
57
|
|
|
58
58
|
The manifest file represents the state we want to apply to the Vault.
|
|
59
59
|
|
|
60
|
-
You can use
|
|
60
|
+
You can use many manifests (`empty`, `beatles`, etc). Or you can pass a custom manifest file, which should be formatted like this one: [beatles](./src/manifests/beatles.json)
|
|
@@ -57,13 +57,13 @@ const opts = {
|
|
|
57
57
|
};
|
|
58
58
|
describe("bake", () => {
|
|
59
59
|
const pool = (0, test_utils_1.createTestDevicesPool)();
|
|
60
|
-
it("should bake using
|
|
61
|
-
yield bake_1.default.run(Object.assign(Object.assign({}, opts), {
|
|
60
|
+
it("should bake using manifest flag", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
61
|
+
yield bake_1.default.run(Object.assign(Object.assign({}, opts), { manifest: "empty" }));
|
|
62
62
|
expect(vault_common_1.bakeManifest).toHaveBeenCalledWith({}, pool, { logger: logger_1.default });
|
|
63
63
|
}));
|
|
64
64
|
it("should wipe if the wipe option is true", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
65
|
const spyWipe = jest.spyOn(wipe, "wipe").mockImplementation();
|
|
66
|
-
yield bake_1.default.run(Object.assign(Object.assign({}, opts), {
|
|
66
|
+
yield bake_1.default.run(Object.assign(Object.assign({}, opts), { manifest: "empty", wipe: true }));
|
|
67
67
|
expect(spyWipe).toHaveBeenCalledTimes(1);
|
|
68
68
|
spyWipe.mockRestore();
|
|
69
69
|
}));
|
|
@@ -72,50 +72,56 @@ describe("bake", () => {
|
|
|
72
72
|
.spyOn(readline_1.default, "createInterface")
|
|
73
73
|
.mockImplementation(() => ["text1", "text2"]);
|
|
74
74
|
const spyParse = jest.spyOn(JSON, "parse").mockImplementation();
|
|
75
|
-
const options = Object.assign(Object.assign({}, opts), {
|
|
75
|
+
const options = Object.assign(Object.assign({}, opts), { manifest: "empty", stdin: true });
|
|
76
76
|
yield bake_1.default.run(options);
|
|
77
77
|
expect(spyReadline).toHaveBeenCalledTimes(1);
|
|
78
78
|
expect(spyParse).toHaveBeenCalledTimes(1);
|
|
79
79
|
spyReadline.mockRestore();
|
|
80
80
|
spyParse.mockRestore();
|
|
81
81
|
}));
|
|
82
|
-
it("should log
|
|
82
|
+
it("should log manifest 'beatles-legacy' doesn't exist anymore", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
83
83
|
const spyConsole = jest.spyOn(console, "log").mockImplementation();
|
|
84
|
-
yield bake_1.default.run(Object.assign(Object.assign({}, opts), {
|
|
85
|
-
expect(spyConsole).toHaveBeenCalledWith(chalk_1.default.bold("INFO"), (0, chalk_1.default) `
|
|
84
|
+
yield bake_1.default.run(Object.assign(Object.assign({}, opts), { manifest: "beatles-legacy" }));
|
|
85
|
+
expect(spyConsole).toHaveBeenCalledWith(chalk_1.default.bold("INFO"), (0, chalk_1.default) `Manifest {yellow beatles-legacy} is not existing anymore. Fallback to manifest {yellow beatles}.`);
|
|
86
|
+
spyConsole.mockRestore();
|
|
87
|
+
}));
|
|
88
|
+
it("should log about deprecated option '--preset' when it is used", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
89
|
+
const spyConsole = jest.spyOn(console, "log").mockImplementation();
|
|
90
|
+
yield bake_1.default.run(Object.assign(Object.assign({}, opts), { preset: "beatles" }));
|
|
91
|
+
expect(spyConsole).toHaveBeenCalledWith(chalk_1.default.bold("INFO"), (0, chalk_1.default) `Option {yellow --preset} is deprecated. Please use {yellow --manifest}.`);
|
|
86
92
|
spyConsole.mockRestore();
|
|
87
93
|
}));
|
|
88
94
|
it("should read manifest from filename", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
89
95
|
const spyParse = jest.spyOn(JSON, "parse").mockImplementation();
|
|
90
96
|
const spyReadFileSync = jest.spyOn(fs_1.default, "readFileSync").mockImplementation();
|
|
91
|
-
yield bake_1.default.run(Object.assign(Object.assign({}, opts), { stdin: false,
|
|
97
|
+
yield bake_1.default.run(Object.assign(Object.assign({}, opts), { stdin: false, manifest: undefined, positionals: ["filename"] }));
|
|
92
98
|
expect(spyReadFileSync).toHaveBeenCalledWith("filename", "utf-8");
|
|
93
99
|
expect(spyParse).toHaveBeenCalledTimes(1);
|
|
94
100
|
spyParse.mockRestore();
|
|
95
101
|
spyReadFileSync.mockRestore();
|
|
96
102
|
}));
|
|
97
103
|
(0, test_utils_1.testErrorCommand)({
|
|
98
|
-
description: "should throw if no
|
|
104
|
+
description: "should throw if no manifest name, manifest file or path to manifest is specified",
|
|
99
105
|
task: bake_1.default.run,
|
|
100
|
-
options: Object.assign(Object.assign({}, opts), { positionals: [],
|
|
101
|
-
errorMessage: "You must
|
|
106
|
+
options: Object.assign(Object.assign({}, opts), { positionals: [], manifest: undefined, stdin: false }),
|
|
107
|
+
errorMessage: "You must either choose a manifest, pass a JSON manifest in stdin or pass a manifest file path",
|
|
102
108
|
});
|
|
103
109
|
(0, test_utils_1.testErrorCommand)({
|
|
104
|
-
description: "should throw if more than 1 manifest is passed",
|
|
110
|
+
description: "should throw if more than 1 manifest file is passed",
|
|
105
111
|
task: bake_1.default.run,
|
|
106
112
|
options: Object.assign(Object.assign({}, opts), { positionals: ["<manifest_1>", "<manifest_2>"] }),
|
|
107
113
|
errorMessage: "You can pass only one manifest file",
|
|
108
114
|
});
|
|
109
115
|
(0, test_utils_1.testErrorCommand)({
|
|
110
|
-
description: "should throw if
|
|
116
|
+
description: "should throw if manifest is invalid",
|
|
111
117
|
task: bake_1.default.run,
|
|
112
|
-
options: Object.assign(Object.assign({}, opts), {
|
|
113
|
-
errorMessage: "Invalid
|
|
118
|
+
options: Object.assign(Object.assign({}, opts), { manifest: "invalid_manifest" }),
|
|
119
|
+
errorMessage: "Invalid manifest invalid_manifest",
|
|
114
120
|
});
|
|
115
121
|
(0, test_utils_1.testErrorCommand)({
|
|
116
|
-
description: "should throw if
|
|
122
|
+
description: "should throw if manifest is undefined and path to manifest is empty",
|
|
117
123
|
task: bake_1.default.run,
|
|
118
|
-
options: Object.assign(Object.assign({}, opts), { stdin: false,
|
|
124
|
+
options: Object.assign(Object.assign({}, opts), { stdin: false, manifest: undefined, positionals: [""] }),
|
|
119
125
|
errorMessage: "No filename given",
|
|
120
126
|
});
|
|
121
127
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bake.test.js","sourceRoot":"","sources":["../../src/__tests__/bake.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAsD;AACtD,kDAA0B;AAC1B,4CAAoB;AACpB,wDAAgC;AAEhC,4DAAoC;AAEpC,uDAAyC;AACzC,uDAA+B;AAC/B,6CAAuE;AAEvE,MAAM,IAAI,GAAgB;IACxB,WAAW,EAAE,CAAC,YAAY,CAAC;IAC3B,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,EAAE;IACf,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,WAAW;IACpB,eAAe,EAAE,mBAAmB;IACpC,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,MAAM,IAAI,GAAG,IAAA,kCAAqB,GAAE,CAAC;IAErC,EAAE,CAAC
|
|
1
|
+
{"version":3,"file":"bake.test.js","sourceRoot":"","sources":["../../src/__tests__/bake.test.ts"],"names":[],"mappings":"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"}
|
package/bin/commands/bake.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { TwoStepsRequestOption } from "../miscOptions";
|
|
|
2
2
|
import { GateOptions } from "../types";
|
|
3
3
|
export declare type BakeOptions = GateOptions & TwoStepsRequestOption & {
|
|
4
4
|
positionals: string[];
|
|
5
|
+
manifest?: string;
|
|
5
6
|
preset?: string;
|
|
6
7
|
stdin: boolean;
|
|
7
8
|
retry: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bake.d.ts","sourceRoot":"","sources":["../../src/commands/bake.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bake.d.ts","sourceRoot":"","sources":["../../src/commands/bake.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,qBAAqB,EAA4B,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AA6BvC,oBAAY,WAAW,GAAG,WAAW,GACnC,qBAAqB,GAAG;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IAEf,KAAK,EAAE,MAAM,CAAC;IAGd,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAoDmB,WAAW,KAAG,QAAQ,IAAI,CAAC;;AAlDlD,wBAiIE"}
|
package/bin/commands/bake.js
CHANGED
|
@@ -27,21 +27,21 @@ const cliOptions_1 = __importDefault(require("../cliOptions"));
|
|
|
27
27
|
const gateOptions_1 = __importDefault(require("../gateOptions"));
|
|
28
28
|
const lamOptions_1 = __importDefault(require("../lamOptions"));
|
|
29
29
|
const logger_1 = __importDefault(require("../logger"));
|
|
30
|
+
const beatles_json_1 = __importDefault(require("../manifests/beatles.json"));
|
|
31
|
+
const empty_json_1 = __importDefault(require("../manifests/empty.json"));
|
|
32
|
+
const erc20_json_1 = __importDefault(require("../manifests/erc20.json"));
|
|
33
|
+
const polkadot_staking_json_1 = __importDefault(require("../manifests/polkadot-staking.json"));
|
|
34
|
+
const polkadot_json_1 = __importDefault(require("../manifests/polkadot.json"));
|
|
35
|
+
const ripple_json_1 = __importDefault(require("../manifests/ripple.json"));
|
|
36
|
+
const sci_json_1 = __importDefault(require("../manifests/sci.json"));
|
|
37
|
+
const solana_dev_json_1 = __importDefault(require("../manifests/solana-dev.json"));
|
|
38
|
+
const solana_staking_json_1 = __importDefault(require("../manifests/solana-staking.json"));
|
|
39
|
+
const solana_json_1 = __importDefault(require("../manifests/solana.json"));
|
|
40
|
+
const stellar_json_1 = __importDefault(require("../manifests/stellar.json"));
|
|
41
|
+
const tezos_json_1 = __importDefault(require("../manifests/tezos.json"));
|
|
30
42
|
const miscOptions_1 = require("../miscOptions");
|
|
31
|
-
const beatles_json_1 = __importDefault(require("../presets/beatles.json"));
|
|
32
|
-
const empty_json_1 = __importDefault(require("../presets/empty.json"));
|
|
33
|
-
const erc20_json_1 = __importDefault(require("../presets/erc20.json"));
|
|
34
|
-
const polkadot_staking_json_1 = __importDefault(require("../presets/polkadot-staking.json"));
|
|
35
|
-
const polkadot_json_1 = __importDefault(require("../presets/polkadot.json"));
|
|
36
|
-
const ripple_json_1 = __importDefault(require("../presets/ripple.json"));
|
|
37
|
-
const sci_json_1 = __importDefault(require("../presets/sci.json"));
|
|
38
|
-
const solana_dev_json_1 = __importDefault(require("../presets/solana-dev.json"));
|
|
39
|
-
const solana_staking_json_1 = __importDefault(require("../presets/solana-staking.json"));
|
|
40
|
-
const solana_json_1 = __importDefault(require("../presets/solana.json"));
|
|
41
|
-
const stellar_json_1 = __importDefault(require("../presets/stellar.json"));
|
|
42
|
-
const tezos_json_1 = __importDefault(require("../presets/tezos.json"));
|
|
43
43
|
const wipe_1 = require("./wipe");
|
|
44
|
-
const
|
|
44
|
+
const MANIFESTS = {
|
|
45
45
|
empty: empty_json_1.default,
|
|
46
46
|
beatles: beatles_json_1.default,
|
|
47
47
|
sci: sci_json_1.default,
|
|
@@ -67,13 +67,19 @@ exports.default = {
|
|
|
67
67
|
positionals: true,
|
|
68
68
|
options: [
|
|
69
69
|
{
|
|
70
|
-
name: "
|
|
71
|
-
alias: "
|
|
72
|
-
description: `Available presets: ${Object.keys(
|
|
70
|
+
name: "manifest",
|
|
71
|
+
alias: "m",
|
|
72
|
+
description: `Available presets: ${Object.keys(MANIFESTS)
|
|
73
73
|
.map((p) => `{yellow ${p}}`)
|
|
74
74
|
.join(", ")}`,
|
|
75
75
|
type: String,
|
|
76
76
|
},
|
|
77
|
+
{
|
|
78
|
+
name: "preset",
|
|
79
|
+
alias: "p",
|
|
80
|
+
description: "Deprecated, please use --manifest",
|
|
81
|
+
type: String,
|
|
82
|
+
},
|
|
77
83
|
{
|
|
78
84
|
name: "retry",
|
|
79
85
|
description: "How many times bake should be retried on error {grey (default: 0)}",
|
|
@@ -102,11 +108,12 @@ exports.default = {
|
|
|
102
108
|
run: (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
103
109
|
const { retry: retryCount, twoStepsRequest } = options;
|
|
104
110
|
const stdin = yield readSTDIN(options);
|
|
105
|
-
|
|
106
|
-
|
|
111
|
+
let manifestName = options.manifest || options.preset;
|
|
112
|
+
if (!(options.positionals && options.positionals.length) &&
|
|
113
|
+
!manifestName &&
|
|
107
114
|
!options.stdin &&
|
|
108
115
|
!stdin) {
|
|
109
|
-
throw new Error(`You must
|
|
116
|
+
throw new Error(`You must either choose a manifest, pass a JSON manifest in stdin or pass a manifest file path`);
|
|
110
117
|
}
|
|
111
118
|
if (options.positionals && options.positionals.length !== 1) {
|
|
112
119
|
throw new Error("You can pass only one manifest file");
|
|
@@ -118,16 +125,18 @@ exports.default = {
|
|
|
118
125
|
if (stdin) {
|
|
119
126
|
manifest = JSON.parse(stdin);
|
|
120
127
|
}
|
|
121
|
-
else if (
|
|
122
|
-
if (options.preset
|
|
123
|
-
logger_1.default.info((0, chalk_1.default) `
|
|
124
|
-
|
|
128
|
+
else if (manifestName) {
|
|
129
|
+
if (options.preset) {
|
|
130
|
+
logger_1.default.info((0, chalk_1.default) `Option {yellow --preset} is deprecated. Please use {yellow --manifest}.`);
|
|
131
|
+
}
|
|
132
|
+
if (manifestName === "beatles-legacy") {
|
|
133
|
+
logger_1.default.info((0, chalk_1.default) `Manifest {yellow beatles-legacy} is not existing anymore. Fallback to manifest {yellow beatles}.`);
|
|
134
|
+
manifestName = "beatles";
|
|
125
135
|
}
|
|
126
|
-
|
|
127
|
-
if (!
|
|
128
|
-
throw new Error(`Invalid
|
|
136
|
+
manifest = MANIFESTS[manifestName];
|
|
137
|
+
if (!manifest) {
|
|
138
|
+
throw new Error(`Invalid manifest ${manifestName}`);
|
|
129
139
|
}
|
|
130
|
-
manifest = preset;
|
|
131
140
|
}
|
|
132
141
|
else {
|
|
133
142
|
const fileName = options.positionals[0];
|
package/bin/commands/bake.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bake.js","sourceRoot":"","sources":["../../src/commands/bake.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,yDAA2F;AAE3F,kDAA0B;AAC1B,4CAAoB;AACpB,wDAAgC;AAEhC,+DAAuC;AACvC,iEAAyC;AACzC,+DAAuC;AACvC,uDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"bake.js","sourceRoot":"","sources":["../../src/commands/bake.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|