@ledgerhq/vault-cli 1.11.3 → 1.11.6
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 +2 -2
- package/CHANGELOG.md +22 -0
- package/__mocks__/@ledgerhq/vault-common.ts +59 -1
- package/bin/__patchGateOptionsWithEnvVariables.js.map +1 -1
- package/bin/__tests__/approve.test.js +19 -69
- package/bin/__tests__/approve.test.js.map +1 -1
- package/bin/__tests__/reject.test.js +2 -2
- package/bin/__tests__/reject.test.js.map +1 -1
- package/bin/__tests__/send.test.js +60 -0
- package/bin/__tests__/send.test.js.map +1 -1
- package/bin/commands/approve.d.ts +1 -9
- package/bin/commands/approve.d.ts.map +1 -1
- package/bin/commands/approve.js +21 -61
- package/bin/commands/approve.js.map +1 -1
- package/bin/commands/create.js.map +1 -1
- package/bin/commands/index.d.ts +0 -19
- package/bin/commands/index.d.ts.map +1 -1
- package/bin/commands/send.js +5 -5
- package/bin/commands/send.js.map +1 -1
- package/package.json +2 -2
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
@ledgerhq/vault-cli:build: cache hit, replaying output
|
|
1
|
+
@ledgerhq/vault-cli:build: cache hit, replaying output bcf85b35139fafd8
|
|
2
2
|
@ledgerhq/vault-cli:build:
|
|
3
|
-
@ledgerhq/vault-cli:build: > @ledgerhq/vault-cli@1.11.
|
|
3
|
+
@ledgerhq/vault-cli:build: > @ledgerhq/vault-cli@1.11.6 build /home/runner/work/vault-ts/vault-ts/apps/cli
|
|
4
4
|
@ledgerhq/vault-cli:build: > tsc && chmod +x bin/index.js
|
|
5
5
|
@ledgerhq/vault-cli:build:
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @ledgerhq/vault-cli
|
|
2
2
|
|
|
3
|
+
## 1.11.6
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 58e71a8: Fix inverted gas limit and gas price for CUSTOM_FEES
|
|
8
|
+
|
|
9
|
+
## 1.11.5
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- 7a97c24: Fix test coverage to reach 100%
|
|
14
|
+
- 99004fb: VG-8395 Fix multiple approvals
|
|
15
|
+
- Updated dependencies [7a97c24]
|
|
16
|
+
- @ledgerhq/vault-common@1.11.5
|
|
17
|
+
|
|
18
|
+
## 1.11.4
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- Updated dependencies [a14c914]
|
|
23
|
+
- @ledgerhq/vault-common@1.11.4
|
|
24
|
+
|
|
3
25
|
## 1.11.3
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -4,7 +4,7 @@ export const bakeManifest = jest.fn();
|
|
|
4
4
|
export const validateManifest = jest.fn();
|
|
5
5
|
export const recipeManifest = jest.fn().mockImplementation(() => ({
|
|
6
6
|
manifest: { accounts: undefined },
|
|
7
|
-
rawData: { usersWithDevice: [{ user: { id: 2 } }] },
|
|
7
|
+
rawData: { usersWithDevice: [{ deviceIndex: 5, user: { pub_key: "pub_key", id: 2 } }] },
|
|
8
8
|
}));
|
|
9
9
|
export const wipeBackend = jest.fn();
|
|
10
10
|
export const fetchTokens = jest.fn().mockReturnValue(["token1", "token2"]);
|
|
@@ -69,6 +69,64 @@ export const createDevicesPool = jest.fn().mockReturnValue({
|
|
|
69
69
|
],
|
|
70
70
|
},
|
|
71
71
|
},
|
|
72
|
+
{
|
|
73
|
+
node: {
|
|
74
|
+
id: 3,
|
|
75
|
+
name: "Alice",
|
|
76
|
+
username: "Alice In Wonderland",
|
|
77
|
+
role: "Admin",
|
|
78
|
+
user_id: "Wonderland",
|
|
79
|
+
currency: "westend",
|
|
80
|
+
balance: 10,
|
|
81
|
+
status: "status",
|
|
82
|
+
description: "description",
|
|
83
|
+
notes: [],
|
|
84
|
+
type: "CREATE_TRANSACTION",
|
|
85
|
+
created_by: { id: 2 },
|
|
86
|
+
approvals: [
|
|
87
|
+
{
|
|
88
|
+
created_by: {
|
|
89
|
+
id: 4,
|
|
90
|
+
entityType: "USER",
|
|
91
|
+
pub_key: "pub_key",
|
|
92
|
+
username: "user",
|
|
93
|
+
user_id: "id",
|
|
94
|
+
created_on: "created_on",
|
|
95
|
+
status: "status",
|
|
96
|
+
role: "OPERATOR",
|
|
97
|
+
},
|
|
98
|
+
created_on: "created_on",
|
|
99
|
+
type: "APPROVE",
|
|
100
|
+
step: 1,
|
|
101
|
+
},
|
|
102
|
+
],
|
|
103
|
+
approvals_steps: [
|
|
104
|
+
{
|
|
105
|
+
group: {
|
|
106
|
+
id: 0,
|
|
107
|
+
name: "group",
|
|
108
|
+
entityType: "GROUP",
|
|
109
|
+
created_on: "created_on",
|
|
110
|
+
created_by: {
|
|
111
|
+
id: 0,
|
|
112
|
+
entityType: "USER",
|
|
113
|
+
pub_key: "pub_key",
|
|
114
|
+
username: "user",
|
|
115
|
+
user_id: "id",
|
|
116
|
+
created_on: "created_on",
|
|
117
|
+
status: "status",
|
|
118
|
+
role: "OPERATOR",
|
|
119
|
+
},
|
|
120
|
+
status: "PENDING",
|
|
121
|
+
is_internal: false,
|
|
122
|
+
members: [],
|
|
123
|
+
is_under_edit: false,
|
|
124
|
+
},
|
|
125
|
+
quorum: 1,
|
|
126
|
+
},
|
|
127
|
+
],
|
|
128
|
+
},
|
|
129
|
+
},
|
|
72
130
|
],
|
|
73
131
|
}),
|
|
74
132
|
getToken: jest.fn().mockReturnValue("authToken"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"__patchGateOptionsWithEnvVariables.js","sourceRoot":"","sources":["../src/__patchGateOptionsWithEnvVariables.ts"],"names":[],"mappings":";;;;;;AAAA,uFAAyF;AACzF,sDAA8B;AAGjB,QAAA,sBAAsB,GAA2B;IAC5D,UAAU,EAAE,MAAM;IAClB,cAAc,EAAE,MAAM;CACvB,CAAC;AAEF,SAAwB,kCAAkC,CAAC,IAAiB;IAC1E,MAAM,CAAC,IAAI,CAAC,8BAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,KAAK,GAAG,8BAAsB,CAAC,GAAG,CAAC,CAAC;QAG1C,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,QAAQ,EAAE;YAEZ,IAAI,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,SAAS;QAAE,gBAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IACjF,IAAI,IAAI,CAAC,YAAY,EAAE;QACrB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,YAAY;YACnB,CAAC,
|
|
1
|
+
{"version":3,"file":"__patchGateOptionsWithEnvVariables.js","sourceRoot":"","sources":["../src/__patchGateOptionsWithEnvVariables.ts"],"names":[],"mappings":";;;;;;AAAA,uFAAyF;AACzF,sDAA8B;AAGjB,QAAA,sBAAsB,GAA2B;IAC5D,UAAU,EAAE,MAAM;IAClB,cAAc,EAAE,MAAM;CACvB,CAAC;AAEF,SAAwB,kCAAkC,CAAC,IAAiB;IAC1E,MAAM,CAAC,IAAI,CAAC,8BAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,KAAK,GAAG,8BAAsB,CAAC,GAAG,CAAC,CAAC;QAG1C,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,QAAQ,EAAE;YAEZ,IAAI,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,SAAS;QAAE,gBAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IACjF,IAAI,IAAI,CAAC,YAAY,EAAE;QACrB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,YAAY;YACnB,CAAC,CAA4B,GAAG,IAAI,CAAC,YAAY,GAAG,CAAC;QACvD,IAAA,sCAAoB,EAAC,GAAG,OAAO,YAAY,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,gBAAgB,CAAC;QACvC,IAAI,CAAC,GAAG,GAAG,GAAG,OAAO,KAAK,CAAC;KAC5B;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAzBD,qDAyBC"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -31,8 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
9
|
});
|
|
33
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
34
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
const approve_1 =
|
|
15
|
+
const approve_1 = __importDefault(require("../commands/approve"));
|
|
36
16
|
const test_utils_1 = require("./test-utils");
|
|
37
17
|
const opts = {
|
|
38
18
|
device: 5,
|
|
@@ -46,6 +26,7 @@ describe("approve", () => {
|
|
|
46
26
|
});
|
|
47
27
|
afterEach(() => {
|
|
48
28
|
spyConsole.mockRestore();
|
|
29
|
+
jest.clearAllMocks();
|
|
49
30
|
});
|
|
50
31
|
it("should display usage if none of --all and --requestID is specified", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
51
32
|
yield approve_1.default.run(opts);
|
|
@@ -58,6 +39,12 @@ describe("approve", () => {
|
|
|
58
39
|
yield approve_1.default.run(Object.assign(Object.assign({}, opts), { requestID: 1 }));
|
|
59
40
|
expect(admin.approveRequest).toHaveBeenCalledWith({ id: 1 });
|
|
60
41
|
}));
|
|
42
|
+
it("should not approve request of specified id if already approved", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
|
+
const { login } = (0, test_utils_1.createTestDevicesPool)();
|
|
44
|
+
const admin = yield login(opts.device);
|
|
45
|
+
yield approve_1.default.run(Object.assign(Object.assign({}, opts), { requestID: 3 }));
|
|
46
|
+
expect(admin.approveRequest).not.toHaveBeenCalled();
|
|
47
|
+
}));
|
|
61
48
|
it("should approve all requests", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
49
|
const { login } = (0, test_utils_1.createTestDevicesPool)();
|
|
63
50
|
const admin = yield login(opts.device);
|
|
@@ -68,56 +55,19 @@ describe("approve", () => {
|
|
|
68
55
|
const { login } = (0, test_utils_1.createTestDevicesPool)();
|
|
69
56
|
const admin = yield login(opts.device);
|
|
70
57
|
yield approve_1.default.run(Object.assign(Object.assign({}, opts), { requestID: 2 }));
|
|
71
|
-
expect(admin.approveRequest).toHaveBeenCalledWith({ id:
|
|
58
|
+
expect(admin.approveRequest).toHaveBeenCalledWith({ id: 2 });
|
|
72
59
|
}));
|
|
73
60
|
(0, test_utils_1.testErrorCommand)({
|
|
74
61
|
description: "should throw if request ID is not found",
|
|
75
62
|
task: approve_1.default.run,
|
|
76
|
-
options: Object.assign(Object.assign({}, opts), { requestID:
|
|
77
|
-
errorMessage: "Couldn't find request
|
|
63
|
+
options: Object.assign(Object.assign({}, opts), { requestID: 4 }),
|
|
64
|
+
errorMessage: "Couldn't find request 4",
|
|
78
65
|
});
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
target_id: 0,
|
|
85
|
-
created_by: null,
|
|
86
|
-
created_on: "",
|
|
87
|
-
entityType: "REQUEST",
|
|
88
|
-
expired_at: new Date(),
|
|
89
|
-
target_type: "target",
|
|
90
|
-
current_step: 0,
|
|
91
|
-
approvals_steps: [
|
|
92
|
-
{
|
|
93
|
-
group: {
|
|
94
|
-
id: 0,
|
|
95
|
-
name: "group",
|
|
96
|
-
entityType: "GROUP",
|
|
97
|
-
created_on: "created_on",
|
|
98
|
-
created_by: {
|
|
99
|
-
id: 0,
|
|
100
|
-
entityType: "USER",
|
|
101
|
-
pub_key: "pub_key",
|
|
102
|
-
username: "user",
|
|
103
|
-
user_id: "id",
|
|
104
|
-
created_on: "created_on",
|
|
105
|
-
status: "status",
|
|
106
|
-
role: "OPERATOR",
|
|
107
|
-
},
|
|
108
|
-
status: "PENDING",
|
|
109
|
-
is_internal: false,
|
|
110
|
-
members: [],
|
|
111
|
-
is_under_edit: false,
|
|
112
|
-
},
|
|
113
|
-
quorum: 1,
|
|
114
|
-
},
|
|
115
|
-
],
|
|
116
|
-
};
|
|
117
|
-
it("should throw if no user is found", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
118
|
-
const pool = (0, test_utils_1.createTestDevicesPool)();
|
|
119
|
-
yield expect((0, approve_1.approveTransactionRequest)({ pool, request, usersWithDevice: [] })).rejects.toThrowError("Not enough users to approve the request");
|
|
120
|
-
}));
|
|
66
|
+
(0, test_utils_1.testErrorCommand)({
|
|
67
|
+
description: "should throw if no user device is not found",
|
|
68
|
+
task: approve_1.default.run,
|
|
69
|
+
options: Object.assign(Object.assign({}, opts), { device: 10, requestID: 3 }),
|
|
70
|
+
errorMessage: "No user found for this device",
|
|
121
71
|
});
|
|
122
72
|
});
|
|
123
73
|
//# sourceMappingURL=approve.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approve.test.js","sourceRoot":"","sources":["../../src/__tests__/approve.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"approve.test.js","sourceRoot":"","sources":["../../src/__tests__/approve.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,8 +78,8 @@ describe("reject", () => {
|
|
|
78
78
|
(0, test_utils_1.testErrorCommand)({
|
|
79
79
|
description: "should throw if request ID is not found",
|
|
80
80
|
task: reject_1.default.run,
|
|
81
|
-
options: Object.assign(Object.assign({}, opts), { requestID:
|
|
82
|
-
errorMessage: "Couldn't find request
|
|
81
|
+
options: Object.assign(Object.assign({}, opts), { requestID: 10 }),
|
|
82
|
+
errorMessage: "Couldn't find request 10",
|
|
83
83
|
});
|
|
84
84
|
describe("rejectTransactionRequest", () => {
|
|
85
85
|
const request = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reject.test.js","sourceRoot":"","sources":["../../src/__tests__/reject.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAAsE;AAEtE,6CAAuE;AAEvE,MAAM,IAAI,GAAkB;IAC1B,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IACxB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;IACf,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE;CAC3B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,IAAI,UAA4B,CAAC;IAEjC,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,GAAS,EAAE;QAC7F,MAAM,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,kCAAkC,CAAC,CAAC;QAC5E,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,6CAA6C,CAAC,CAAC;IACzF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAS,EAAE;QAChD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,kCAAqB,GAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,gBAAM,CAAC,GAAG,iCAAM,IAAI,KAAE,GAAG,EAAE,IAAI,IAAG,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAS,EAAE;QACvD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,kCAAqB,GAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,gBAAM,CAAC,GAAG,iCAAM,IAAI,KAAE,SAAS,EAAE,CAAC,IAAG,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAS,EAAE;QACnE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,kCAAqB,GAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,gBAAM,CAAC,GAAG,iCAAM,IAAI,KAAE,SAAS,EAAE,CAAC,IAAG,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAA,CAAC,CAAC;IAEH,IAAA,6BAAgB,EAAC;QACf,WAAW,EAAE,yCAAyC;QACtD,IAAI,EAAE,gBAAM,CAAC,GAAG;QAChB,OAAO,kCAAO,IAAI,KAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"reject.test.js","sourceRoot":"","sources":["../../src/__tests__/reject.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,5 +128,65 @@ describe("send", () => {
|
|
|
128
128
|
}),
|
|
129
129
|
}), expect.any(Object));
|
|
130
130
|
}));
|
|
131
|
+
it("should send a transaction with custom fees", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
132
|
+
const manifestAccount = { name: "fooETH", currency: "ethereum" };
|
|
133
|
+
jest.spyOn(vaultCommon, "recipeManifest").mockResolvedValueOnce(Object.assign(Object.assign({}, MOCK_RECIPE), { manifest: { accounts: [manifestAccount] } }));
|
|
134
|
+
const spySend = jest.spyOn(vaultCommon, "send").mockResolvedValueOnce(FAKE_TRANSACTION);
|
|
135
|
+
jest.spyOn(utils, "displayTable").mockReturnValue();
|
|
136
|
+
yield send_1.default.run(Object.assign(Object.assign({}, opts), { account: "fooETH", feesLevel: "CUSTOM", gasPrice: "100", gasLimit: "1000" }));
|
|
137
|
+
expect(spySend).toHaveBeenCalledWith(expect.objectContaining({
|
|
138
|
+
transaction: expect.objectContaining({
|
|
139
|
+
gasPrice: "100",
|
|
140
|
+
gasLimit: "1000",
|
|
141
|
+
}),
|
|
142
|
+
}), expect.any(Object));
|
|
143
|
+
}));
|
|
144
|
+
it("should throw if passing a wicked fees level", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
145
|
+
const feesLevel = "HELLO_I_AM_A_QA";
|
|
146
|
+
let err;
|
|
147
|
+
try {
|
|
148
|
+
yield send_1.default.run({
|
|
149
|
+
account: "foo",
|
|
150
|
+
recipient: "bar",
|
|
151
|
+
amount: "1",
|
|
152
|
+
noApproval: false,
|
|
153
|
+
feesLevel,
|
|
154
|
+
salt: "",
|
|
155
|
+
gate: "",
|
|
156
|
+
txType: "SEND",
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
catch (e) {
|
|
160
|
+
err = e;
|
|
161
|
+
}
|
|
162
|
+
expect(err).toEqual(new Error("Fees level should be one of the following SLOW, NORMAL, FAST, CUSTOM"));
|
|
163
|
+
}));
|
|
164
|
+
it("should throw if passing CUSTOM fees level without the required props", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
165
|
+
const opts = {
|
|
166
|
+
account: "foo",
|
|
167
|
+
recipient: "bar",
|
|
168
|
+
amount: "1",
|
|
169
|
+
noApproval: false,
|
|
170
|
+
feesLevel: "CUSTOM",
|
|
171
|
+
salt: "",
|
|
172
|
+
gate: "",
|
|
173
|
+
txType: "SEND",
|
|
174
|
+
};
|
|
175
|
+
let err;
|
|
176
|
+
try {
|
|
177
|
+
yield send_1.default.run(opts);
|
|
178
|
+
}
|
|
179
|
+
catch (e) {
|
|
180
|
+
err = e;
|
|
181
|
+
}
|
|
182
|
+
expect(err).toEqual(new Error("Gas price and gas limit are required when using custom fees"));
|
|
183
|
+
try {
|
|
184
|
+
yield send_1.default.run(Object.assign(Object.assign({}, opts), { gasPrice: "1234" }));
|
|
185
|
+
}
|
|
186
|
+
catch (e) {
|
|
187
|
+
err = e;
|
|
188
|
+
}
|
|
189
|
+
expect(err).toEqual(new Error("Gas price and gas limit are required when using custom fees"));
|
|
190
|
+
}));
|
|
131
191
|
});
|
|
132
192
|
//# sourceMappingURL=send.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.test.js","sourceRoot":"","sources":["../../src/__tests__/send.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"send.test.js","sourceRoot":"","sources":["../../src/__tests__/send.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,9 @@
|
|
|
1
|
-
import { DevicesPool } from "@ledgerhq/vault-common";
|
|
2
|
-
import type { GateGenericRequest, UserWithDevice } from "@ledgerhq/vault-common/lib/types";
|
|
3
1
|
import { GateOptions } from "../types";
|
|
4
2
|
export declare type ApproveOptions = GateOptions & {
|
|
5
|
-
device: number
|
|
3
|
+
device: number;
|
|
6
4
|
requestID?: number;
|
|
7
5
|
all?: boolean;
|
|
8
6
|
};
|
|
9
|
-
declare type ApproveTransactionRequest = {
|
|
10
|
-
pool: DevicesPool;
|
|
11
|
-
request: GateGenericRequest;
|
|
12
|
-
usersWithDevice: UserWithDevice[];
|
|
13
|
-
};
|
|
14
|
-
export declare const approveTransactionRequest: (params: ApproveTransactionRequest) => Promise<void>;
|
|
15
7
|
declare const _default: {
|
|
16
8
|
command: string;
|
|
17
9
|
description: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approve.d.ts","sourceRoot":"","sources":["../../src/commands/approve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"approve.d.ts","sourceRoot":"","sources":["../../src/commands/approve.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,oBAAY,cAAc,GAAG,WAAW,GAAG;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AA8DF,wBAoBE"}
|
package/bin/commands/approve.js
CHANGED
|
@@ -19,7 +19,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
19
19
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.approveTransactionRequest = void 0;
|
|
23
22
|
const vault_common_1 = require("@ledgerhq/vault-common");
|
|
24
23
|
const cliOptions_1 = __importDefault(require("../cliOptions"));
|
|
25
24
|
const deviceOption_1 = __importDefault(require("../deviceOption"));
|
|
@@ -28,36 +27,35 @@ const lamOptions_1 = __importDefault(require("../lamOptions"));
|
|
|
28
27
|
const logger_1 = __importDefault(require("../logger"));
|
|
29
28
|
const runApprove = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
29
|
var e_1, _a;
|
|
31
|
-
const { all, requestID } = options;
|
|
30
|
+
const { device, all, requestID } = options;
|
|
32
31
|
if (!all && !requestID) {
|
|
33
32
|
console.log("Usage: ledger-vault approve --all");
|
|
34
33
|
console.log("Usage: ledger-vault approve --requestID 1303");
|
|
35
34
|
return;
|
|
36
35
|
}
|
|
37
36
|
const pool = (0, vault_common_1.createDevicesPool)(Object.assign(Object.assign({}, options), { deviceAPIURL: options.deviceAPI }));
|
|
38
|
-
const
|
|
39
|
-
const
|
|
40
|
-
const
|
|
37
|
+
const userDevice = yield pool.login(options.device);
|
|
38
|
+
const requestsConnection = yield userDevice.network("GET", "/requests?meta_status=PENDING&pageSize=-1");
|
|
39
|
+
const manifestFromGate = yield (0, vault_common_1.recipeManifest)(pool);
|
|
40
|
+
const gateUsers = manifestFromGate.rawData.usersWithDevice;
|
|
41
|
+
const user = gateUsers.find((gateUser) => gateUser.deviceIndex === device);
|
|
42
|
+
if (!user)
|
|
43
|
+
throw new Error("No user found for this device");
|
|
41
44
|
const requests = requestsConnection.edges.map((elt) => elt.node);
|
|
42
|
-
const hasPendingTransactions = requests.some(isTransactionRequest);
|
|
43
|
-
let usersWithDevice = [];
|
|
44
|
-
if (hasPendingTransactions) {
|
|
45
|
-
const manifestFromGate = yield (0, vault_common_1.recipeManifest)(pool);
|
|
46
|
-
usersWithDevice = manifestFromGate.rawData.usersWithDevice;
|
|
47
|
-
}
|
|
48
45
|
if (all) {
|
|
49
|
-
if (requests.length === 0)
|
|
46
|
+
if (requests.length === 0) {
|
|
47
|
+
logger_1.default.info("No request to approve");
|
|
50
48
|
return;
|
|
49
|
+
}
|
|
51
50
|
logger_1.default.info("Approving all pending requests");
|
|
52
51
|
try {
|
|
53
52
|
for (var requests_1 = __asyncValues(requests), requests_1_1; requests_1_1 = yield requests_1.next(), !requests_1_1.done;) {
|
|
54
53
|
const request = requests_1_1.value;
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
else {
|
|
59
|
-
yield admin.approveRequest({ id: request.id });
|
|
54
|
+
if (hasUserApprovedRequest(user, request)) {
|
|
55
|
+
logger_1.default.info(`User width device ${device} already approved request ${request.id}`);
|
|
56
|
+
continue;
|
|
60
57
|
}
|
|
58
|
+
yield userDevice.approveRequest({ id: request.id });
|
|
61
59
|
logger_1.default.success(`Approved request ${request.id}: ${request.type}`);
|
|
62
60
|
}
|
|
63
61
|
}
|
|
@@ -73,53 +71,15 @@ const runApprove = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
73
71
|
const request = requests.find((request) => request.id === requestID);
|
|
74
72
|
if (!request)
|
|
75
73
|
throw new Error(`Couldn't find request ${requestID}`);
|
|
76
|
-
if (
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
else {
|
|
80
|
-
yield admin.approveRequest({ id: request.id });
|
|
81
|
-
}
|
|
82
|
-
logger_1.default.success(`Approve request ${request.id}: ${request.type}`);
|
|
83
|
-
});
|
|
84
|
-
const approveTransactionRequest = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
85
|
-
var e_2, _b;
|
|
86
|
-
const { pool, request, usersWithDevice } = params;
|
|
87
|
-
const currentStepId = request.current_step;
|
|
88
|
-
const currentStep = request.approvals_steps[currentStepId];
|
|
89
|
-
if (!currentStep)
|
|
74
|
+
if (hasUserApprovedRequest(user, request)) {
|
|
75
|
+
logger_1.default.info(`User width device ${device} already approved request ${request.id}`);
|
|
90
76
|
return;
|
|
91
|
-
const numberOfApprovals = (request.approvals || []).filter((a) => a.step === currentStepId).length;
|
|
92
|
-
const totalApprovalsRequired = currentStep.quorum;
|
|
93
|
-
logger_1.default.info(`Request ${request.id} - ${numberOfApprovals} of ${totalApprovalsRequired} approvals done`);
|
|
94
|
-
const users = usersWithDevice.filter(({ user }) => {
|
|
95
|
-
if (!request.created_by)
|
|
96
|
-
return;
|
|
97
|
-
return user.id !== request.created_by.id;
|
|
98
|
-
});
|
|
99
|
-
if (users.length < totalApprovalsRequired - numberOfApprovals) {
|
|
100
|
-
throw new Error("Not enough users to approve the request");
|
|
101
|
-
}
|
|
102
|
-
let currentApprovalNumber = numberOfApprovals;
|
|
103
|
-
try {
|
|
104
|
-
for (var users_1 = __asyncValues(users), users_1_1; users_1_1 = yield users_1.next(), !users_1_1.done;) {
|
|
105
|
-
const user = users_1_1.value;
|
|
106
|
-
if (currentApprovalNumber++ >= totalApprovalsRequired)
|
|
107
|
-
break;
|
|
108
|
-
logger_1.default.info(`Processing ${currentApprovalNumber} of ${totalApprovalsRequired} approval...`);
|
|
109
|
-
const deviceIndex = user.deviceIndex;
|
|
110
|
-
const operator = yield pool.login(deviceIndex);
|
|
111
|
-
yield operator.approveRequest({ id: request.id });
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
115
|
-
finally {
|
|
116
|
-
try {
|
|
117
|
-
if (users_1_1 && !users_1_1.done && (_b = users_1.return)) yield _b.call(users_1);
|
|
118
|
-
}
|
|
119
|
-
finally { if (e_2) throw e_2.error; }
|
|
120
77
|
}
|
|
78
|
+
yield userDevice.approveRequest({ id: request.id });
|
|
79
|
+
logger_1.default.success(`Approved request ${request.id}: ${request.type}`);
|
|
121
80
|
});
|
|
122
|
-
|
|
81
|
+
const hasUserApprovedRequest = (user, request) => request.approvals &&
|
|
82
|
+
request.approvals.filter((approval) => { var _a; return ((_a = approval.created_by) === null || _a === void 0 ? void 0 : _a.pub_key) === user.user.pub_key && approval.type === "APPROVE"; }).length > 0;
|
|
123
83
|
exports.default = {
|
|
124
84
|
command: "approve",
|
|
125
85
|
description: "Approve specific request or all request",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approve.js","sourceRoot":"","sources":["../../src/commands/approve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"approve.js","sourceRoot":"","sources":["../../src/commands/approve.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAyE;AAQzE,+DAAuC;AACvC,iEAAyC;AACzC,+DAAuC;AAEvC,+BAAkD;AA+ClD,MAAM,mBAAmB,GAA+B;IACtD,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,cAAc;CACvB,CAAC;AAEK,MAAM,YAAY,GAAG,CAAO,IAAkB,EAAiB,EAAE;IACtE,MAAM,WAAW,GAAgB;QAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,IAAI,CAAC,GAAG;QAChB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,IAAI,CAAC,SAAS;KAC7B,CAAC;IACF,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAE1C,MAAM,IAAI,GAAG,IAAA,gCAAiB,kCACzB,WAAW,KACd,MAAM,EAAE,IAAI,CAAC,GAAG,EAChB,YAAY,IACZ,CAAC;IAEH,IAAI,QAAQ,GAAoB,IAAI,CAAC;IAErC,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE;QAC5B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAE1C,QAAQ,GAAG;YACT,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,KAAK;yBACT,KAAK,CAAC,GAAG,CAAC;yBAEV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACjD,WAAW,EAAE,WAAW;oBACxB,MAAM,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAyE;AAQzE,+DAAuC;AACvC,iEAAyC;AACzC,+DAAuC;AAEvC,+BAAkD;AA+ClD,MAAM,mBAAmB,GAA+B;IACtD,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,cAAc;CACvB,CAAC;AAEK,MAAM,YAAY,GAAG,CAAO,IAAkB,EAAiB,EAAE;IACtE,MAAM,WAAW,GAAgB;QAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,IAAI,CAAC,GAAG;QAChB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,IAAI,CAAC,SAAS;KAC7B,CAAC;IACF,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAE1C,MAAM,IAAI,GAAG,IAAA,gCAAiB,kCACzB,WAAW,KACd,MAAM,EAAE,IAAI,CAAC,GAAG,EAChB,YAAY,IACZ,CAAC;IAEH,IAAI,QAAQ,GAAoB,IAAI,CAAC;IAErC,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE;QAC5B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAE1C,QAAQ,GAAG;YACT,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,KAAK;yBACT,KAAK,CAAC,GAAG,CAAC;yBAEV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACjD,WAAW,EAAE,WAAW;oBACxB,MAAM,EAA6B,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACtE;aACF;SACF,CAAC;KACH;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,EAAE;QAC3B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,KAAK,GAAG,EAAE,CAAC;QAEjB,QAAQ,GAAG,EAAE,CAAC;QACd,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;gBACnB,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAA4B,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aACrE,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,kBAAkB,MAAM,gDAAgD,CAAC,CAAC;aAC3F;YACD,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;aACnF;YACD,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC9C,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAAC,CAAC;aAC7C;YACD,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC;YACvB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;SAClE;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;KACpC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,WAAW,EAAE;QAChC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAEjC,QAAQ,GAAG;YACT,UAAU,EAAE;gBACV;oBACE,IAAI;oBACJ,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC7B,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAGvB,MAAM,MAAM,GAA6B;4BACvC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;4BACpB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;4BAChB,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;yBACpB,CAAC;wBAEF,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;4BAClB,MAAM,gBAAgB,GAAa,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;4BACrD,uCAAY,MAAM,KAAE,gBAAgB,IAAG;yBACxC;wBAED,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;4BAChB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;wBAE7E,OAAO,MAAM,CAAC;oBAChB,CAAC,CAAC;oBACF,MAAM,EAAE,UAAU,CAA4B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACtE;aACF;SACF,CAAC;KACH;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;QAC9B,IAAI,KAAK,CAAC;QACV,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI;gBACF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAChC;YAAC,WAAM;gBACN,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;aACxC;SACF;QAED,MAAM,eAAe,iCACnB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IACvC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACxB,CAAC,IAAI,CAAC,eAAe;YACtB,CAAC,iBACG,eAAe,EAAE,IAAI,CAAC,eAAe,IAClC,CAAC,IAAI,CAAC,aAAa;gBACpB,CAAC,CAA4B;oBACzB,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC;gBACH,CAAC,CAA4B,EAAE,CAAC,EAEtC,CAAC,CAAC,IAAI,CAAC,QAAQ;YACf,CAAC,iBACG,QAAQ,EAAE,IAAI,CAAC,QAAQ,IACpB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAE3E,CAAC,CAAC,CAAC,GAAG,EAAE;YACJ,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC,CAAC,EAAE,CAAC,CACV,CAAC;QAEF,QAAQ,GAAG;YACT,QAAQ,EAAE,CAAC,eAAe,CAAC;SAC5B,CAAC;KACH;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;QAC7B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAEhC,QAAQ,GAAG;YACT,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;oBAC7B,MAAM,EAA6B,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACtE;aACF;SACF,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IAED,MAAM,IAAA,2BAAY,EAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IAEnD,MAAM,IAAA,+BAAyB,EAE7B,WAAW,EACX,IAAI,CAAC,IAAI,EACT,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAClC,CAAC;AACJ,CAAC,CAAA,CAAC;AAhKW,QAAA,YAAY,gBAgKvB;AAEF,kBAAe;IACb,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,6CAA6C;IAC1D,OAAO,EAAE;QACP,GAAG,qBAAW;QACd,GAAG,oBAAU;QACb,GAAG,oBAAU;QACb;YACE,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,yCAAyC;SACvD;KACF;IACD,WAAW,EAAE;QACX;YACE,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,iCAAiC;YAC9C,IAAI,EAAE;gBACJ;oBACE,MAAM,EAAE,UAAU;oBAClB,OAAO,EAAE;wBACP,iCAAiC;wBACjC,4FAA4F;wBAC5F,EAAE;wBACF,8BAA8B;wBAC9B,4EAA4E;qBAC7E;iBACF;aACF;YACD,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,kBAAkB;oBAC7B,WAAW,EAAE,yBAAyB;oBACtC,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,sDAAsD;oBACnE,OAAO,EAAE,CAAC;oBACV,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,0BAA0B;oBACvC,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,OAAO;iBACd;aACF;YACD,GAAG,EAAE,oBAAY;SAClB;QACD;YACE,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,iBAAiB;YAC9B,IAAI,EAAE;gBACJ;oBACE,MAAM,EAAE,UAAU;oBAClB,OAAO,EAAE;wBACP,sGAAsG;qBACvG;iBACF;aACF;YACD,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,YAAY;oBACzB,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,aAAa;oBACnB,WAAW,EAAE,mBAAmB;oBAChC,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,4BAA4B;oBACzC,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;iBACf;aACF;YACD,GAAG,EAAE,oBAAY;SAClB;QACD;YACE,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,mBAAmB;YAChC,IAAI,EAAE;gBACJ;oBACE,MAAM,EAAE,UAAU;oBAClB,OAAO,EAAE;wBACP,mFAAmF;wBACnF,yJAAyJ;qBAC1J;iBACF;aACF;YACD,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,cAAc;oBAC3B,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,kBAAkB;oBAC/B,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,iBAAiB;oBACvB,WAAW,EAAE,0BAA0B;oBACvC,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,eAAe;oBACrB,WAAW,EAAE,gBAAgB;oBAC7B,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,MAAM;oBACZ,WAAW,EACT,kIAAkI;iBACrI;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,MAAM;iBACb;aACF;YACD,GAAG,EAAE,oBAAY;SAClB;QACD;YACE,OAAO,EAAE,WAAW;YACpB,WAAW,EAAE,oBAAoB;YACjC,IAAI,EAAE;gBACJ;oBACE,MAAM,EAAE,UAAU;oBAClB,OAAO,EAAE;wBACP,4LAA4L;qBAC7L;iBACF;aACF;YACD,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,gBAAgB;oBAC7B,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,aAAa;oBACnB,WAAW,EAAE,uBAAuB;oBACpC,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,WAAW;oBACjB,WAAW,EACT,gFAAgF;oBAClF,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAI;iBACf;aACF;YACD,GAAG,EAAE,oBAAY;SAClB;QACD;YACE,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE;gBACJ;oBACE,MAAM,EAAE,UAAU;oBAClB,OAAO,EAAE;wBACP,6FAA6F;qBAC9F;iBACF;aACF;YACD,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,aAAa;oBAC1B,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,6CAA6C;oBAC1D,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;iBACf;aACF;YACD,GAAG,EAAE,oBAAY;SAClB;KACF;CACF,CAAC"}
|
package/bin/commands/index.d.ts
CHANGED
|
@@ -380,25 +380,6 @@ declare const _default: {
|
|
|
380
380
|
required?: undefined;
|
|
381
381
|
})[];
|
|
382
382
|
run: (options: import("./faucet").FaucetOptions) => Promise<void>;
|
|
383
|
-
} | {
|
|
384
|
-
command: string;
|
|
385
|
-
description: string;
|
|
386
|
-
options: ({
|
|
387
|
-
name: string;
|
|
388
|
-
type: BooleanConstructor;
|
|
389
|
-
description: string;
|
|
390
|
-
} | {
|
|
391
|
-
name: string;
|
|
392
|
-
description: string;
|
|
393
|
-
type: StringConstructor;
|
|
394
|
-
} | {
|
|
395
|
-
name: string;
|
|
396
|
-
alias: string;
|
|
397
|
-
type: NumberConstructor;
|
|
398
|
-
description: string;
|
|
399
|
-
defaultValue: number;
|
|
400
|
-
})[];
|
|
401
|
-
run: (options: import("./getAuthToken").GetAuthTokenOptions) => Promise<void>;
|
|
402
383
|
} | {
|
|
403
384
|
command: string;
|
|
404
385
|
description: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6DA,wBA+BE"}
|
package/bin/commands/send.js
CHANGED
|
@@ -19,9 +19,6 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
19
19
|
const utils_1 = require("../utils");
|
|
20
20
|
function sendTransaction(options) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const pool = (0, vault_common_1.createDevicesPool)(Object.assign(Object.assign({}, options), { deviceAPIURL: options.deviceAPI }));
|
|
23
|
-
const recipe = yield (0, vault_common_1.recipeManifest)(pool);
|
|
24
|
-
const { manifest, rawData } = recipe;
|
|
25
22
|
const { feesLevel, gasPrice, gasLimit } = options;
|
|
26
23
|
if (!vault_common_1.feesLevels.includes(feesLevel)) {
|
|
27
24
|
throw new Error(`Fees level should be one of the following ${vault_common_1.feesLevels
|
|
@@ -31,6 +28,9 @@ function sendTransaction(options) {
|
|
|
31
28
|
if (feesLevel === "CUSTOM" && (!gasPrice || !gasLimit)) {
|
|
32
29
|
throw new Error("Gas price and gas limit are required when using custom fees");
|
|
33
30
|
}
|
|
31
|
+
const pool = (0, vault_common_1.createDevicesPool)(Object.assign(Object.assign({}, options), { deviceAPIURL: options.deviceAPI }));
|
|
32
|
+
const recipe = yield (0, vault_common_1.recipeManifest)(pool);
|
|
33
|
+
const { manifest, rawData } = recipe;
|
|
34
34
|
if (!manifest.accounts) {
|
|
35
35
|
throw new Error("No accounts found");
|
|
36
36
|
}
|
|
@@ -44,8 +44,8 @@ function sendTransaction(options) {
|
|
|
44
44
|
amount: options.amount,
|
|
45
45
|
transactionType: options.txType,
|
|
46
46
|
feesLevel: options.feesLevel,
|
|
47
|
-
gasLimit: options.
|
|
48
|
-
gasPrice: options.
|
|
47
|
+
gasLimit: options.gasLimit,
|
|
48
|
+
gasPrice: options.gasPrice,
|
|
49
49
|
title: options.title,
|
|
50
50
|
comment: options.comment,
|
|
51
51
|
};
|
package/bin/commands/send.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/commands/send.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,yDAQgC;AAChC,+DAAuC;AACvC,iEAAyC;AACzC,uDAA+B;AAE/B,oCAAwC;AAiBxC,SAAe,eAAe,CAAC,OAAiB;;QAC9C,MAAM,
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/commands/send.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/vault-cli",
|
|
3
|
-
"version": "1.11.
|
|
3
|
+
"version": "1.11.6",
|
|
4
4
|
"description": "A various utility command-line for Vault development",
|
|
5
5
|
"homepage": "https://github.com/LedgerHQ/vault-js",
|
|
6
6
|
"license": "BSD-2-Clause",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"@ledgerhq/cryptoassets": "^6.28.2",
|
|
19
19
|
"@ledgerhq/hw-transport-node-hid": "^6.24.1",
|
|
20
20
|
"@ledgerhq/live-common-stub": "1.4.6",
|
|
21
|
-
"@ledgerhq/vault-common": "1.11.
|
|
21
|
+
"@ledgerhq/vault-common": "1.11.5",
|
|
22
22
|
"axios": "^0.21.0",
|
|
23
23
|
"bignumber.js": "^9.0.1",
|
|
24
24
|
"body-parser": "^1.19.0",
|