@ledgerhq/hw-ledger-key-ring-protocol 0.3.1-next.0 → 0.3.2-next.2
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 +28 -0
- package/lib/ApduDevice.d.ts +1 -0
- package/lib/ApduDevice.d.ts.map +1 -1
- package/lib/ApduDevice.js +195 -240
- package/lib/ApduDevice.js.map +1 -1
- package/lib/CommandBlock.js +26 -2
- package/lib/CommandBlock.js.map +1 -1
- package/lib/CommandStream.js +69 -85
- package/lib/CommandStream.js.map +1 -1
- package/lib/CommandStreamResolver.js +42 -56
- package/lib/CommandStreamResolver.js.map +1 -1
- package/lib/Device.js +115 -131
- package/lib/Device.js.map +1 -1
- package/lib/IndexedTree.js +2 -0
- package/lib/IndexedTree.js.map +1 -1
- package/lib/PublicKey.js +1 -0
- package/lib/PublicKey.js.map +1 -1
- package/lib/SeedId.js +12 -0
- package/lib/SeedId.js.map +1 -1
- package/lib/StreamTree.js +56 -72
- package/lib/StreamTree.js.map +1 -1
- package/lib/StreamTreeCipher.js +62 -75
- package/lib/StreamTreeCipher.js.map +1 -1
- package/lib/__tests__/codec.js +3 -12
- package/lib/__tests__/codec.js.map +1 -1
- package/lib/__tests__/crypto.js +22 -31
- package/lib/__tests__/crypto.js.map +1 -1
- package/lib/__tests__/indexed_tree.js +2 -3
- package/lib/__tests__/indexed_tree.js.map +1 -1
- package/lib/__tests__/key_exchange.js +40 -49
- package/lib/__tests__/key_exchange.js.map +1 -1
- package/lib/__tests__/shared_object.js +34 -47
- package/lib/__tests__/shared_object.js.map +1 -1
- package/lib-es/ApduDevice.d.ts +1 -0
- package/lib-es/ApduDevice.d.ts.map +1 -1
- package/lib-es/ApduDevice.js +195 -240
- package/lib-es/ApduDevice.js.map +1 -1
- package/lib-es/CommandBlock.js +26 -2
- package/lib-es/CommandBlock.js.map +1 -1
- package/lib-es/CommandStream.js +69 -85
- package/lib-es/CommandStream.js.map +1 -1
- package/lib-es/CommandStreamResolver.js +42 -56
- package/lib-es/CommandStreamResolver.js.map +1 -1
- package/lib-es/Device.js +115 -131
- package/lib-es/Device.js.map +1 -1
- package/lib-es/IndexedTree.js +2 -0
- package/lib-es/IndexedTree.js.map +1 -1
- package/lib-es/PublicKey.js +1 -0
- package/lib-es/PublicKey.js.map +1 -1
- package/lib-es/SeedId.js +12 -0
- package/lib-es/SeedId.js.map +1 -1
- package/lib-es/StreamTree.js +56 -72
- package/lib-es/StreamTree.js.map +1 -1
- package/lib-es/StreamTreeCipher.js +62 -75
- package/lib-es/StreamTreeCipher.js.map +1 -1
- package/lib-es/__tests__/codec.js +3 -12
- package/lib-es/__tests__/codec.js.map +1 -1
- package/lib-es/__tests__/crypto.js +22 -31
- package/lib-es/__tests__/crypto.js.map +1 -1
- package/lib-es/__tests__/indexed_tree.js +2 -3
- package/lib-es/__tests__/indexed_tree.js.map +1 -1
- package/lib-es/__tests__/key_exchange.js +40 -49
- package/lib-es/__tests__/key_exchange.js.map +1 -1
- package/lib-es/__tests__/shared_object.js +34 -47
- package/lib-es/__tests__/shared_object.js.map +1 -1
- package/package.json +4 -4
- package/tsconfig.json +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandBlock.js","sourceRoot":"","sources":["../src/CommandBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASlC;;GAEG;AACH,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,8CAAW,CAAA;IACX,wDAAgB,CAAA;IAChB,0DAAiB,CAAA;IACjB,0DAAiB,CAAA;IACjB,kDAAa,CAAA;IACb,4DAAkB,CAAA;AACpB,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,IAAI;IACnB,yBAAyB,EAAE,IAAI;IAC/B,kBAAkB,EAAE,IAAI;IAExB,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,UAAU;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,OAAO,IAAI;
|
|
1
|
+
{"version":3,"file":"CommandBlock.js","sourceRoot":"","sources":["../src/CommandBlock.ts"],"names":[],"mappings":"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"}
|
package/lib-es/CommandStream.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { createCommandBlock, hashCommandBlock, CommandType, Seed, Derive, AddMember, PublishKey, CloseStream, } from "./CommandBlock";
|
|
11
2
|
import CommandStreamResolver from "./CommandStreamResolver";
|
|
12
3
|
import { DerivationPath } from "./Crypto";
|
|
@@ -16,33 +7,34 @@ const EMPTY = new Uint8Array();
|
|
|
16
7
|
*
|
|
17
8
|
*/
|
|
18
9
|
export class CommandStreamIssuer {
|
|
10
|
+
_stream;
|
|
11
|
+
_steps = [];
|
|
19
12
|
constructor(stream) {
|
|
20
|
-
this._steps = [];
|
|
21
13
|
this._stream = stream;
|
|
22
14
|
}
|
|
23
15
|
seed(topic = null) {
|
|
24
|
-
const step = (device, tempStream, streamTree) =>
|
|
16
|
+
const step = async (device, tempStream, streamTree) => {
|
|
25
17
|
device;
|
|
26
18
|
tempStream;
|
|
27
19
|
streamTree;
|
|
28
20
|
return [new Seed(topic, 0, EMPTY, EMPTY, EMPTY, EMPTY)];
|
|
29
|
-
}
|
|
21
|
+
};
|
|
30
22
|
this._steps.push(step);
|
|
31
23
|
return this;
|
|
32
24
|
}
|
|
33
25
|
derive(path) {
|
|
34
|
-
const step = (device, tempStream, streamTree) =>
|
|
26
|
+
const step = async (device, tempStream, streamTree) => {
|
|
35
27
|
device;
|
|
36
28
|
tempStream;
|
|
37
29
|
streamTree;
|
|
38
30
|
const derivationPath = DerivationPath.toIndexArray(path);
|
|
39
31
|
return [new Derive(derivationPath, EMPTY, EMPTY, EMPTY, EMPTY)];
|
|
40
|
-
}
|
|
32
|
+
};
|
|
41
33
|
this._steps.push(step);
|
|
42
34
|
return this;
|
|
43
35
|
}
|
|
44
36
|
addMember(name, publicKey, permissions, publishKey = true) {
|
|
45
|
-
const step = (device, tempStream, streamTree) =>
|
|
37
|
+
const step = async (device, tempStream, streamTree) => {
|
|
46
38
|
device;
|
|
47
39
|
tempStream;
|
|
48
40
|
streamTree;
|
|
@@ -55,54 +47,52 @@ export class CommandStreamIssuer {
|
|
|
55
47
|
else {
|
|
56
48
|
return [new AddMember(name, publicKey, permissions)];
|
|
57
49
|
}
|
|
58
|
-
}
|
|
50
|
+
};
|
|
59
51
|
this._steps.push(step);
|
|
60
52
|
return this;
|
|
61
53
|
}
|
|
62
54
|
publishKey(publicKey) {
|
|
63
|
-
const step = (device, tempStream, streamTree) =>
|
|
55
|
+
const step = async (device, tempStream, streamTree) => {
|
|
64
56
|
device;
|
|
65
57
|
tempStream;
|
|
66
58
|
streamTree;
|
|
67
59
|
return [new PublishKey(EMPTY, EMPTY, publicKey, EMPTY)];
|
|
68
|
-
}
|
|
60
|
+
};
|
|
69
61
|
this._steps.push(step);
|
|
70
62
|
return this;
|
|
71
63
|
}
|
|
72
64
|
close() {
|
|
73
|
-
const step = (device, tempStream, streamTree) =>
|
|
65
|
+
const step = async (device, tempStream, streamTree) => {
|
|
74
66
|
device;
|
|
75
67
|
tempStream;
|
|
76
68
|
streamTree;
|
|
77
69
|
return [new CloseStream()];
|
|
78
|
-
}
|
|
70
|
+
};
|
|
79
71
|
this._steps.push(step);
|
|
80
72
|
return this;
|
|
81
73
|
}
|
|
82
|
-
issue(device, streamTree, parentHash) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
return yield stream.issue(device, commands, streamTree, parentHash);
|
|
97
|
-
});
|
|
74
|
+
async issue(device, streamTree, parentHash) {
|
|
75
|
+
const lastBlockHash = this._stream.blocks.length > 0
|
|
76
|
+
? hashCommandBlock(this._stream.blocks[this._stream.blocks.length - 1])
|
|
77
|
+
: null;
|
|
78
|
+
const block = createCommandBlock(ISSUER_PLACEHOLDER, [], new Uint8Array(), parentHash || lastBlockHash);
|
|
79
|
+
const stream = new CommandStream(this._stream.blocks.concat([]));
|
|
80
|
+
const tempStream = new CommandStream(this._stream.blocks.concat([block]));
|
|
81
|
+
let commands = [];
|
|
82
|
+
for (const step of this._steps) {
|
|
83
|
+
const newCommands = await step(device, tempStream, streamTree);
|
|
84
|
+
commands = commands.concat(newCommands);
|
|
85
|
+
tempStream.blocks[tempStream.blocks.length - 1].commands = commands;
|
|
86
|
+
}
|
|
87
|
+
return await stream.issue(device, commands, streamTree, parentHash);
|
|
98
88
|
}
|
|
99
89
|
}
|
|
100
90
|
/**
|
|
101
91
|
*
|
|
102
92
|
*/
|
|
103
93
|
export default class CommandStream {
|
|
94
|
+
_blocks = [];
|
|
104
95
|
constructor(blocks = []) {
|
|
105
|
-
this._blocks = [];
|
|
106
96
|
this._blocks = blocks;
|
|
107
97
|
}
|
|
108
98
|
resolve(incomplete = false) {
|
|
@@ -125,60 +115,54 @@ export default class CommandStream {
|
|
|
125
115
|
throw new Error("Malformed CommandStream");
|
|
126
116
|
}
|
|
127
117
|
}
|
|
128
|
-
push(block, issuer, tree) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
throw new Error("Null or empty tree cannot be used to sign the new block");
|
|
140
|
-
}
|
|
141
|
-
stream = [root.blocks[0]].concat(this._blocks);
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
stream = this._blocks;
|
|
145
|
-
}
|
|
146
|
-
if (block.commands[0].getType() === CommandType.Derive) {
|
|
147
|
-
// Set the parent hash of the block to the root hash
|
|
148
|
-
const b = Object.assign({}, block);
|
|
149
|
-
b.parent = hashCommandBlock(stream[0]);
|
|
150
|
-
stream = stream.concat([b]);
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
stream = stream.concat([block]);
|
|
118
|
+
async push(block, issuer, tree) {
|
|
119
|
+
let stream = [];
|
|
120
|
+
if (block.commands.length === 0) {
|
|
121
|
+
throw new Error("Attempts to create an empty block");
|
|
122
|
+
}
|
|
123
|
+
// If the first command of the new block is not a seed and the first command of the stream is not a seed either, prepend the root block
|
|
124
|
+
if ((this._blocks.length == 0 || this._blocks[0].commands[0].getType() !== CommandType.Seed) &&
|
|
125
|
+
block.commands[0].getType() !== CommandType.Seed) {
|
|
126
|
+
const root = tree?.getRoot();
|
|
127
|
+
if (!root || root.blocks.length === 0) {
|
|
128
|
+
throw new Error("Null or empty tree cannot be used to sign the new block");
|
|
154
129
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
130
|
+
stream = [root.blocks[0]].concat(this._blocks);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
stream = this._blocks;
|
|
134
|
+
}
|
|
135
|
+
if (block.commands[0].getType() === CommandType.Derive) {
|
|
136
|
+
// Set the parent hash of the block to the root hash
|
|
137
|
+
const b = { ...block };
|
|
138
|
+
b.parent = hashCommandBlock(stream[0]);
|
|
139
|
+
stream = stream.concat([b]);
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
stream = stream.concat([block]);
|
|
143
|
+
}
|
|
144
|
+
const signedBlock = await issuer.sign(stream, tree || undefined);
|
|
145
|
+
return new CommandStream(this._blocks.concat([signedBlock]));
|
|
158
146
|
}
|
|
159
|
-
issue(
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
return this.push(block, device, tree);
|
|
164
|
-
});
|
|
147
|
+
async issue(device, commands, tree = null, parentHash = null) {
|
|
148
|
+
const lastBlockHash = this._blocks.length > 0 ? hashCommandBlock(this._blocks[this._blocks.length - 1]) : null;
|
|
149
|
+
const block = createCommandBlock(ISSUER_PLACEHOLDER, commands, new Uint8Array(), parentHash || lastBlockHash);
|
|
150
|
+
return this.push(block, device, tree);
|
|
165
151
|
}
|
|
166
152
|
edit() {
|
|
167
153
|
return new CommandStreamIssuer(this);
|
|
168
154
|
}
|
|
169
|
-
getStreamPublicKey() {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
throw new Error("Malformed CommandStream");
|
|
181
|
-
});
|
|
155
|
+
async getStreamPublicKey() {
|
|
156
|
+
// Group public must be the first command in the first block othwerwise it is malformed
|
|
157
|
+
if (this._blocks.length === 0 || this._blocks[0].commands.length === 0)
|
|
158
|
+
throw new Error("Empty CommandStream");
|
|
159
|
+
if (this._blocks[0].commands[0].getType() === CommandType.Seed) {
|
|
160
|
+
return this._blocks[0].commands[0].groupKey;
|
|
161
|
+
}
|
|
162
|
+
if (this._blocks[0].commands[0].getType() === CommandType.Derive) {
|
|
163
|
+
return this._blocks[0].commands[0].groupKey;
|
|
164
|
+
}
|
|
165
|
+
throw new Error("Malformed CommandStream");
|
|
182
166
|
}
|
|
183
167
|
get blocks() {
|
|
184
168
|
return this._blocks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandStream.js","sourceRoot":"","sources":["../src/CommandStream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CommandStream.js","sourceRoot":"","sources":["../src/CommandStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,21 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { verifyCommandBlock, CommandType, hashCommandBlock, Permissions, } from "./CommandBlock";
|
|
11
2
|
import { crypto } from "./Crypto";
|
|
12
3
|
class ResolvedCommandStreamInternals {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.derivationPath = [];
|
|
26
|
-
}
|
|
4
|
+
isCreated = false;
|
|
5
|
+
members = [];
|
|
6
|
+
membersData = [];
|
|
7
|
+
topic = null;
|
|
8
|
+
keys = new Map();
|
|
9
|
+
permission = new Map();
|
|
10
|
+
height = 0;
|
|
11
|
+
streamId = "";
|
|
12
|
+
hashes = [];
|
|
13
|
+
names = new Map();
|
|
14
|
+
groupPublicKey = new Uint8Array();
|
|
15
|
+
derivationPath = [];
|
|
27
16
|
}
|
|
28
17
|
export class ResolvedCommandStream {
|
|
18
|
+
_internals;
|
|
29
19
|
constructor(internals) {
|
|
30
20
|
this._internals = internals;
|
|
31
21
|
}
|
|
@@ -177,40 +167,36 @@ export default class CommandStreamResolver {
|
|
|
177
167
|
}
|
|
178
168
|
return internals;
|
|
179
169
|
}
|
|
180
|
-
static resolveBlock(block, height, internals) {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
if (height > 0 &&
|
|
205
|
-
crypto.to_hex(block.parent) !== crypto.to_hex(yield hashCommandBlock(stream[height - 1]))) {
|
|
206
|
-
throw new Error("Command stream has been tampered with (invalid parent hash) at height " + height);
|
|
207
|
-
}
|
|
208
|
-
if (block.signature.length === 0)
|
|
209
|
-
break;
|
|
210
|
-
internals = yield CommandStreamResolver.resolveBlock(block, height, internals);
|
|
170
|
+
static async resolveBlock(block, height, internals) {
|
|
171
|
+
// Check signature
|
|
172
|
+
if ((await verifyCommandBlock(block)) === false) {
|
|
173
|
+
throw new Error("Invalid block signature at height " + height);
|
|
174
|
+
}
|
|
175
|
+
// Check if issuer is part of the group
|
|
176
|
+
if (height > 0 && !exists(internals.members, block.issuer)) {
|
|
177
|
+
throw new Error("Issuer is not part of the group at height " + height);
|
|
178
|
+
}
|
|
179
|
+
const blockHash = crypto.to_hex(await hashCommandBlock(block));
|
|
180
|
+
for (const command of block.commands) {
|
|
181
|
+
internals = CommandStreamResolver.replayCommand(command, block, blockHash, height, internals);
|
|
182
|
+
}
|
|
183
|
+
internals.hashes.push(blockHash);
|
|
184
|
+
return internals;
|
|
185
|
+
}
|
|
186
|
+
static async resolve(stream) {
|
|
187
|
+
let internals = new ResolvedCommandStreamInternals();
|
|
188
|
+
for (let height = 0; height < stream.length; height++) {
|
|
189
|
+
internals.height = height;
|
|
190
|
+
const block = stream[height];
|
|
191
|
+
if (height > 0 &&
|
|
192
|
+
crypto.to_hex(block.parent) !== crypto.to_hex(await hashCommandBlock(stream[height - 1]))) {
|
|
193
|
+
throw new Error("Command stream has been tampered with (invalid parent hash) at height " + height);
|
|
211
194
|
}
|
|
212
|
-
|
|
213
|
-
|
|
195
|
+
if (block.signature.length === 0)
|
|
196
|
+
break;
|
|
197
|
+
internals = await CommandStreamResolver.resolveBlock(block, height, internals);
|
|
198
|
+
}
|
|
199
|
+
return new ResolvedCommandStream(internals);
|
|
214
200
|
}
|
|
215
201
|
}
|
|
216
202
|
//# sourceMappingURL=CommandStreamResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandStreamResolver.js","sourceRoot":"","sources":["../src/CommandStreamResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CommandStreamResolver.js","sourceRoot":"","sources":["../src/CommandStreamResolver.ts"],"names":[],"mappings":"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"}
|