@sidhujag/sysweb3-keyring 2.1.1 → 2.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +5 -2
- package/README.md +8 -0
- package/cjs/current-vault-refusal.js +6 -0
- package/cjs/current-vault-refusal.js.map +1 -0
- package/cjs/evm-fees.js +29 -1
- package/cjs/evm-fees.js.map +1 -1
- package/cjs/keyring-core.js +349 -84
- package/cjs/keyring-core.js.map +1 -1
- package/cjs/keyring-manager.js +100 -4
- package/cjs/keyring-manager.js.map +1 -1
- package/cjs/software.js +14 -1
- package/cjs/software.js.map +1 -1
- package/cjs/storage-core.js +44 -4
- package/cjs/storage-core.js.map +1 -1
- package/cjs/transactions/ethereum.js +138 -82
- package/cjs/transactions/ethereum.js.map +1 -1
- package/cjs/transactions/evm-cancellation.js +43 -0
- package/cjs/transactions/evm-cancellation.js.map +1 -0
- package/cjs/transactions/evm-local-signer.js +4 -2
- package/cjs/transactions/evm-local-signer.js.map +1 -1
- package/cjs/transactions/evm-submission.js +23 -2
- package/cjs/transactions/evm-submission.js.map +1 -1
- package/cjs/transactions/prepared-evm.js +3 -6
- package/cjs/transactions/prepared-evm.js.map +1 -1
- package/esm/ledger/dmk-host.js +31 -0
- package/esm/ledger/dmk-host.js.map +1 -0
- package/esm/ledger/dmk-selected-host.js +6 -0
- package/esm/ledger/dmk-selected-host.js.map +1 -0
- package/esm/ledger/dmk-session.js +153 -34
- package/esm/ledger/dmk-session.js.map +1 -1
- package/esm/ledger-host.js +3 -27
- package/esm/ledger-host.js.map +1 -1
- package/package.json +13 -1
- package/types/current-vault-refusal.d.ts +2 -0
- package/types/evm-fees.d.ts +25 -0
- package/types/keyring-core.d.ts +36 -3
- package/types/keyring-manager.d.ts +15 -3
- package/types/ledger/dmk-host.d.ts +7 -0
- package/types/ledger/dmk-selected-host.d.ts +7 -0
- package/types/ledger/dmk-session.d.ts +10 -2
- package/types/ledger-host.d.ts +6 -2
- package/types/software.d.ts +4 -3
- package/types/storage-core.d.ts +3 -1
- package/types/storage.d.ts +1 -1
- package/types/transactions/evm-cancellation.d.ts +10 -0
- package/types/transactions/evm-submission.d.ts +4 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-submission.js","sourceRoot":"","sources":["../../../src/transactions/evm-submission.ts"],"names":[],"mappings":";;AAuDA,oDA4CC;AAWD,oDASC;AAGD,4DAKC;AAGD,
|
|
1
|
+
{"version":3,"file":"evm-submission.js","sourceRoot":"","sources":["../../../src/transactions/evm-submission.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const crypto_1 = require("ethers/crypto");
|
|
|
8
8
|
const transaction_1 = require("ethers/transaction");
|
|
9
9
|
const evm_fees_1 = require("../evm-fees");
|
|
10
10
|
const evm_local_signer_1 = require("./evm-local-signer");
|
|
11
|
+
const evm_submission_1 = require("./evm-submission");
|
|
11
12
|
const UINT256 = (1n << 256n) - 1n;
|
|
12
13
|
const UINT64 = (1n << 64n) - 1n;
|
|
13
14
|
const MAX_DATA_BYTES = 16 * 1024;
|
|
@@ -181,12 +182,8 @@ function signPreparedEvmEnvelope(transaction, privateKey) {
|
|
|
181
182
|
};
|
|
182
183
|
const expected = transaction_1.Transaction.from(unsigned);
|
|
183
184
|
const rawTransaction = (0, evm_local_signer_1.signTransaction)(unsigned, privateKey);
|
|
184
|
-
const signed =
|
|
185
|
-
if (
|
|
186
|
-
signed.from !== transaction.from ||
|
|
187
|
-
signed.unsignedSerialized !== expected.unsignedSerialized ||
|
|
188
|
-
signed.unsignedHash !== expected.unsignedHash ||
|
|
189
|
-
signed.hash !== (0, crypto_1.keccak256)(rawTransaction))
|
|
185
|
+
const signed = (0, evm_submission_1.assertSignedEvmTransactionMatches)(rawTransaction, expected.unsignedSerialized, transaction.from);
|
|
186
|
+
if (signed.hash !== (0, crypto_1.keccak256)(rawTransaction))
|
|
190
187
|
throw new Error('Prepared EVM signature does not match requested transaction');
|
|
191
188
|
return Object.freeze({
|
|
192
189
|
rawTransaction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepared-evm.js","sourceRoot":"","sources":["../../../src/transactions/prepared-evm.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"prepared-evm.js","sourceRoot":"","sources":["../../../src/transactions/prepared-evm.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { createLedgerEvmAdapter } from './dmk-evm';
|
|
2
|
+
import { LedgerDmkSession } from './dmk-session';
|
|
3
|
+
import { createLedgerUtxoAdapter } from './dmk-utxo';
|
|
4
|
+
import { ledgerHostError, } from './host-types';
|
|
5
|
+
/** Shared implementation; the default browser host supplies its own transport. */
|
|
6
|
+
export function createLedgerHostForDmk(candidate, config, requireDeviceSelection) {
|
|
7
|
+
for (const method of [
|
|
8
|
+
'connect',
|
|
9
|
+
'disconnect',
|
|
10
|
+
'executeDeviceAction',
|
|
11
|
+
'startDiscovering',
|
|
12
|
+
'listenToAvailableDevices',
|
|
13
|
+
'getDeviceSessionState',
|
|
14
|
+
]) {
|
|
15
|
+
if (typeof candidate?.[method] !==
|
|
16
|
+
'function')
|
|
17
|
+
throw ledgerHostError('LEDGER_INVALID_HOST', 'Invalid Ledger device manager');
|
|
18
|
+
}
|
|
19
|
+
// Keep upstream exports-only types out of the public declaration. A trusted
|
|
20
|
+
// platform supplies its DMK; dapps cannot select this object.
|
|
21
|
+
const session = new LedgerDmkSession(candidate, requireDeviceSelection);
|
|
22
|
+
return {
|
|
23
|
+
connect: (request, options) => session.connect(request, options),
|
|
24
|
+
beginDeviceSelection: (signal) => session.beginDeviceSelection(signal),
|
|
25
|
+
disconnect: () => session.disconnect(),
|
|
26
|
+
getStatus: () => session.getStatus(),
|
|
27
|
+
evm: createLedgerEvmAdapter(session, config),
|
|
28
|
+
utxo: createLedgerUtxoAdapter(session),
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=dmk-host.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dmk-host.js","sourceRoot":"","sources":["../../../src/ledger/dmk-host.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EACL,eAAe,GAGhB,MAAM,cAAc,CAAC;AAStB,kFAAkF;AAClF,MAAM,UAAU,sBAAsB,CACpC,SAAiB,EACjB,MAAuB,EACvB,sBAAgC;IAEhC,KAAK,MAAM,MAAM,IAAI;QACnB,SAAS;QACT,YAAY;QACZ,qBAAqB;QACrB,kBAAkB;QAClB,0BAA0B;QAC1B,uBAAuB;KACxB,EAAE,CAAC;QACF,IACE,OAAQ,SAAiD,EAAE,CAAC,MAAM,CAAC;YACnE,UAAU;YAEV,MAAM,eAAe,CACnB,qBAAqB,EACrB,+BAA+B,CAChC,CAAC;IACN,CAAC;IACD,4EAA4E;IAC5E,8DAA8D;IAC9D,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAClC,SAAgC,EAChC,sBAAsB,CACvB,CAAC;IACF,OAAO;QACL,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;QAChE,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC;QACtE,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE;QACtC,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE;QACpC,GAAG,EAAE,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC;QAC5C,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;KACvC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { createLedgerHostForDmk } from './dmk-host';
|
|
2
|
+
/** A platform-owned transport and explicit user selection are required. */
|
|
3
|
+
export function createSelectedLedgerDmkHost(config) {
|
|
4
|
+
return createLedgerHostForDmk(config.dmk, config, true);
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=dmk-selected-host.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dmk-selected-host.js","sourceRoot":"","sources":["../../../src/ledger/dmk-selected-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAsB,MAAM,YAAY,CAAC;AAGxE,2EAA2E;AAC3E,MAAM,UAAU,2BAA2B,CACzC,MAAyC;IAEzC,OAAO,sBAAsB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -1,15 +1,49 @@
|
|
|
1
1
|
import { ledgerCancelledError, ledgerHostError, } from './host-types';
|
|
2
|
+
function snapshotDiscoveredDevice(candidate) {
|
|
3
|
+
const invalid = () => ledgerHostError('LEDGER_INVALID_DEVICE', 'Invalid Ledger discovery handle');
|
|
4
|
+
if (!candidate ||
|
|
5
|
+
Object.getPrototypeOf(candidate) !== Object.prototype ||
|
|
6
|
+
'sessionId' in candidate)
|
|
7
|
+
throw invalid();
|
|
8
|
+
const ownValue = (key) => Object.getOwnPropertyDescriptor(candidate, key)?.value;
|
|
9
|
+
const id = ownValue('id');
|
|
10
|
+
const transport = ownValue('transport');
|
|
11
|
+
const name = ownValue('name');
|
|
12
|
+
const deviceModel = ownValue('deviceModel');
|
|
13
|
+
if (typeof id !== 'string' ||
|
|
14
|
+
!id.trim() ||
|
|
15
|
+
typeof transport !== 'string' ||
|
|
16
|
+
!transport.trim() ||
|
|
17
|
+
typeof name !== 'string' ||
|
|
18
|
+
!deviceModel ||
|
|
19
|
+
typeof deviceModel !== 'object' ||
|
|
20
|
+
Array.isArray(deviceModel))
|
|
21
|
+
throw invalid();
|
|
22
|
+
// The vendor uses transport and ID to connect. Keep a stable snapshot
|
|
23
|
+
// without copying extra fields, particularly the reconnect discriminator.
|
|
24
|
+
return Object.freeze({
|
|
25
|
+
id,
|
|
26
|
+
transport,
|
|
27
|
+
name,
|
|
28
|
+
deviceModel: deviceModel,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
2
31
|
/** One owner and one semantic operation at a time, across EVM and UTXO apps. */
|
|
3
32
|
export class LedgerDmkSession {
|
|
4
|
-
constructor(dmk) {
|
|
33
|
+
constructor(dmk, requireDeviceSelection = false) {
|
|
5
34
|
this.dmk = dmk;
|
|
35
|
+
this.requireDeviceSelection = requireDeviceSelection;
|
|
6
36
|
this.generation = 0;
|
|
7
37
|
this.queue = Promise.resolve();
|
|
8
38
|
this.closing = Promise.resolve();
|
|
9
39
|
this.invalidationListeners = new Set();
|
|
10
40
|
}
|
|
41
|
+
get readyConnection() {
|
|
42
|
+
// A provisional lease belongs to cleanup until its picker accepts handoff.
|
|
43
|
+
return this.connection?.pendingSelection ? undefined : this.connection;
|
|
44
|
+
}
|
|
11
45
|
getStatus() {
|
|
12
|
-
return { connected: this.
|
|
46
|
+
return { connected: this.readyConnection !== undefined };
|
|
13
47
|
}
|
|
14
48
|
onInvalidated(listener) {
|
|
15
49
|
this.invalidationListeners.add(listener);
|
|
@@ -17,35 +51,95 @@ export class LedgerDmkSession {
|
|
|
17
51
|
}
|
|
18
52
|
invalidate() {
|
|
19
53
|
this.generation++;
|
|
54
|
+
this.deviceSelection = undefined;
|
|
20
55
|
for (const listener of this.invalidationListeners)
|
|
21
56
|
listener();
|
|
22
57
|
}
|
|
58
|
+
/** The platform passes one candidate from its own current DMK picker. */
|
|
59
|
+
beginDeviceSelection(signal) {
|
|
60
|
+
if (signal?.aborted)
|
|
61
|
+
throw ledgerCancelledError();
|
|
62
|
+
if (this.connection || this.connectionAttempt)
|
|
63
|
+
throw this.connectionBusy();
|
|
64
|
+
this.requireDeviceSelection = true;
|
|
65
|
+
const selection = {};
|
|
66
|
+
this.deviceSelection = selection;
|
|
67
|
+
let used = false;
|
|
68
|
+
const assertCurrent = () => {
|
|
69
|
+
if (this.deviceSelection !== selection || signal?.aborted)
|
|
70
|
+
throw ledgerCancelledError();
|
|
71
|
+
};
|
|
72
|
+
return async (candidate) => {
|
|
73
|
+
assertCurrent();
|
|
74
|
+
if (used)
|
|
75
|
+
throw ledgerCancelledError();
|
|
76
|
+
used = true;
|
|
77
|
+
try {
|
|
78
|
+
const device = snapshotDiscoveredDevice(candidate);
|
|
79
|
+
assertCurrent();
|
|
80
|
+
await this.startConnection({}, { signal }, { device, owner: selection });
|
|
81
|
+
const connection = this.connection;
|
|
82
|
+
// The connection listener is gone by this handoff. A close in that
|
|
83
|
+
// interval must still retire this selection's newly acquired session.
|
|
84
|
+
if (connection?.pendingSelection === selection && signal?.aborted)
|
|
85
|
+
await this.disconnect();
|
|
86
|
+
assertCurrent();
|
|
87
|
+
if (connection?.pendingSelection !== selection)
|
|
88
|
+
throw ledgerCancelledError();
|
|
89
|
+
connection.pendingSelection = undefined;
|
|
90
|
+
}
|
|
91
|
+
finally {
|
|
92
|
+
if (this.deviceSelection === selection)
|
|
93
|
+
this.deviceSelection = undefined;
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
}
|
|
23
97
|
/** Device selection belongs to the visible host, never to a dapp request. */
|
|
24
98
|
connect(request = {}, options = {}) {
|
|
25
99
|
if (options.signal?.aborted)
|
|
26
100
|
return Promise.reject(ledgerCancelledError());
|
|
27
|
-
if (this.sessionId)
|
|
101
|
+
if (this.readyConnection?.sessionId)
|
|
28
102
|
return Promise.resolve();
|
|
103
|
+
if (this.requireDeviceSelection)
|
|
104
|
+
return Promise.reject(ledgerHostError('HARDWARE_SIGNER_UNAVAILABLE', 'Select a Ledger device first'));
|
|
105
|
+
return this.startConnection(request, options);
|
|
106
|
+
}
|
|
107
|
+
connectionBusy() {
|
|
108
|
+
return ledgerHostError('HARDWARE_SIGNER_BUSY', 'Ledger connection is already pending or active');
|
|
109
|
+
}
|
|
110
|
+
startConnection(request, options, selected) {
|
|
111
|
+
if (options.signal?.aborted)
|
|
112
|
+
return Promise.reject(ledgerCancelledError());
|
|
29
113
|
if (this.connectionAttempt)
|
|
30
|
-
return Promise.reject(
|
|
114
|
+
return Promise.reject(this.connectionBusy());
|
|
31
115
|
const controller = new AbortController();
|
|
32
116
|
this.connectionAbort = controller;
|
|
33
117
|
const abort = () => controller.abort();
|
|
34
118
|
options.signal?.addEventListener('abort', abort, { once: true });
|
|
35
|
-
const attempt = this.connectDevice(request, controller.signal);
|
|
119
|
+
const attempt = this.connectDevice(request, controller.signal, selected);
|
|
36
120
|
this.connectionAttempt = attempt;
|
|
37
|
-
return attempt.finally(() => {
|
|
121
|
+
return attempt.finally(async () => {
|
|
38
122
|
options.signal?.removeEventListener('abort', abort);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
123
|
+
try {
|
|
124
|
+
if (controller.signal.aborted) {
|
|
125
|
+
if (this.connection)
|
|
126
|
+
await this.disconnect();
|
|
127
|
+
else
|
|
128
|
+
await this.closing;
|
|
129
|
+
throw ledgerCancelledError();
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
if (this.connectionAttempt === attempt)
|
|
134
|
+
this.connectionAttempt = undefined;
|
|
135
|
+
if (this.connectionAbort === controller)
|
|
136
|
+
this.connectionAbort = undefined;
|
|
137
|
+
}
|
|
43
138
|
});
|
|
44
139
|
}
|
|
45
|
-
|
|
46
|
-
const generation = this.generation;
|
|
140
|
+
discoverDevice(request, signal) {
|
|
47
141
|
let subscription;
|
|
48
|
-
|
|
142
|
+
return new Promise((resolve, reject) => {
|
|
49
143
|
let settled = false;
|
|
50
144
|
const timer = request.useGrantedDevices
|
|
51
145
|
? setTimeout(() => finish(ledgerHostError('HARDWARE_SIGNER_UNAVAILABLE', 'Select a Ledger device in the Ledger window')), 3000)
|
|
@@ -89,34 +183,56 @@ export class LedgerDmkSession {
|
|
|
89
183
|
if (settled)
|
|
90
184
|
subscription?.unsubscribe();
|
|
91
185
|
});
|
|
92
|
-
|
|
186
|
+
}
|
|
187
|
+
async connectDevice(request, signal, selected) {
|
|
188
|
+
const generation = this.generation;
|
|
189
|
+
const isCurrent = () => generation === this.generation && !signal.aborted;
|
|
190
|
+
const device = selected?.device ?? (await this.discoverDevice(request, signal));
|
|
191
|
+
if (!isCurrent())
|
|
93
192
|
throw ledgerCancelledError();
|
|
94
193
|
await this.closing;
|
|
194
|
+
if (!isCurrent())
|
|
195
|
+
throw ledgerCancelledError();
|
|
95
196
|
const sessionId = await this.dmk.connect({ device });
|
|
96
|
-
|
|
197
|
+
const connection = { sessionId, pendingSelection: selected?.owner };
|
|
198
|
+
let subscription;
|
|
199
|
+
let ended = false;
|
|
200
|
+
try {
|
|
201
|
+
if (!isCurrent())
|
|
202
|
+
throw ledgerCancelledError();
|
|
203
|
+
subscription = this.dmk.getDeviceSessionState({ sessionId }).subscribe({
|
|
204
|
+
error: () => {
|
|
205
|
+
ended = true;
|
|
206
|
+
if (isCurrent() && this.connection === connection)
|
|
207
|
+
void this.disconnect();
|
|
208
|
+
},
|
|
209
|
+
complete: () => {
|
|
210
|
+
ended = true;
|
|
211
|
+
if (isCurrent() && this.connection === connection) {
|
|
212
|
+
this.connection = undefined;
|
|
213
|
+
this.invalidate();
|
|
214
|
+
this.activeAbort?.abort();
|
|
215
|
+
this.activeCancel?.();
|
|
216
|
+
}
|
|
217
|
+
},
|
|
218
|
+
});
|
|
219
|
+
if (ended || !isCurrent())
|
|
220
|
+
throw ledgerCancelledError();
|
|
221
|
+
}
|
|
222
|
+
catch (error) {
|
|
223
|
+
subscription?.unsubscribe();
|
|
97
224
|
await this.dmk.disconnect({ sessionId }).catch(() => undefined);
|
|
98
|
-
throw
|
|
225
|
+
throw error;
|
|
99
226
|
}
|
|
100
|
-
this.
|
|
101
|
-
this.stateSubscription =
|
|
102
|
-
.getDeviceSessionState({ sessionId })
|
|
103
|
-
.subscribe({
|
|
104
|
-
complete: () => {
|
|
105
|
-
if (this.sessionId === sessionId) {
|
|
106
|
-
this.sessionId = undefined;
|
|
107
|
-
this.invalidate();
|
|
108
|
-
this.activeAbort?.abort();
|
|
109
|
-
this.activeCancel?.();
|
|
110
|
-
}
|
|
111
|
-
},
|
|
112
|
-
});
|
|
227
|
+
this.connection = connection;
|
|
228
|
+
this.stateSubscription = subscription;
|
|
113
229
|
}
|
|
114
230
|
/** Cancel revokes the result and closes I/O; it cannot undo on-device approval. */
|
|
115
231
|
disconnect() {
|
|
116
232
|
this.invalidate();
|
|
117
233
|
this.connectionAbort?.abort();
|
|
118
|
-
const sessionId = this.sessionId;
|
|
119
|
-
this.
|
|
234
|
+
const sessionId = this.connection?.sessionId;
|
|
235
|
+
this.connection = undefined;
|
|
120
236
|
this.activeAbort?.abort();
|
|
121
237
|
this.activeAbort = undefined;
|
|
122
238
|
this.activeCancel?.();
|
|
@@ -131,13 +247,16 @@ export class LedgerDmkSession {
|
|
|
131
247
|
}
|
|
132
248
|
runExclusive(operation, options = {}) {
|
|
133
249
|
const generation = this.generation;
|
|
250
|
+
const admitted = this.readyConnection;
|
|
134
251
|
const run = async () => {
|
|
135
252
|
await this.closing;
|
|
136
|
-
const
|
|
253
|
+
const connection = this.readyConnection;
|
|
137
254
|
const assertCurrent = () => {
|
|
138
255
|
if (generation !== this.generation || options.signal?.aborted)
|
|
139
256
|
throw ledgerCancelledError();
|
|
140
|
-
if (!sessionId ||
|
|
257
|
+
if (!connection?.sessionId ||
|
|
258
|
+
this.readyConnection !== connection ||
|
|
259
|
+
(this.requireDeviceSelection && admitted !== connection))
|
|
141
260
|
throw ledgerHostError('HARDWARE_SIGNER_UNAVAILABLE', 'Connect a Ledger device first');
|
|
142
261
|
};
|
|
143
262
|
assertCurrent();
|
|
@@ -157,7 +276,7 @@ export class LedgerDmkSession {
|
|
|
157
276
|
assertCurrent();
|
|
158
277
|
const context = {
|
|
159
278
|
dmk: this.dmk,
|
|
160
|
-
sessionId: sessionId,
|
|
279
|
+
sessionId: connection.sessionId,
|
|
161
280
|
generation,
|
|
162
281
|
signal: controller.signal,
|
|
163
282
|
assertCurrent,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dmk-session.js","sourceRoot":"","sources":["../../../src/ledger/dmk-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dmk-session.js","sourceRoot":"","sources":["../../../src/ledger/dmk-session.ts"],"names":[],"mappings":"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"}
|
package/esm/ledger-host.js
CHANGED
|
@@ -1,36 +1,12 @@
|
|
|
1
1
|
/** Heavy browser host entry. Do not import from the wallet worker or software entry. */
|
|
2
|
-
import { DeviceManagementKitBuilder
|
|
2
|
+
import { DeviceManagementKitBuilder } from '@ledgerhq/device-management-kit';
|
|
3
3
|
import { webHidTransportFactory } from '@ledgerhq/device-transport-kit-web-hid';
|
|
4
|
-
import {
|
|
5
|
-
import { LedgerDmkSession } from './ledger/dmk-session';
|
|
6
|
-
import { createLedgerUtxoAdapter } from './ledger/dmk-utxo';
|
|
7
|
-
import { ledgerHostError } from './ledger/host-types';
|
|
4
|
+
import { createLedgerHostForDmk } from './ledger/dmk-host';
|
|
8
5
|
export function createLedgerDmkHost(config = {}) {
|
|
9
6
|
const candidate = config.dmk ??
|
|
10
7
|
new DeviceManagementKitBuilder()
|
|
11
8
|
.addTransport(webHidTransportFactory)
|
|
12
9
|
.build();
|
|
13
|
-
|
|
14
|
-
'connect',
|
|
15
|
-
'disconnect',
|
|
16
|
-
'executeDeviceAction',
|
|
17
|
-
'startDiscovering',
|
|
18
|
-
'listenToAvailableDevices',
|
|
19
|
-
'getDeviceSessionState',
|
|
20
|
-
]) {
|
|
21
|
-
if (typeof candidate[method] !== 'function')
|
|
22
|
-
throw ledgerHostError('LEDGER_INVALID_HOST', 'Invalid Ledger device manager');
|
|
23
|
-
}
|
|
24
|
-
// Keep upstream exports-only types out of this public declaration. A trusted
|
|
25
|
-
// platform supplies its concrete DMK here; dapps cannot select this object.
|
|
26
|
-
const dmk = candidate;
|
|
27
|
-
const session = new LedgerDmkSession(dmk);
|
|
28
|
-
return {
|
|
29
|
-
connect: (request, options) => session.connect(request, options),
|
|
30
|
-
disconnect: () => session.disconnect(),
|
|
31
|
-
getStatus: () => session.getStatus(),
|
|
32
|
-
evm: createLedgerEvmAdapter(session, config),
|
|
33
|
-
utxo: createLedgerUtxoAdapter(session),
|
|
34
|
-
};
|
|
10
|
+
return createLedgerHostForDmk(candidate, config, config.requireDeviceSelection);
|
|
35
11
|
}
|
|
36
12
|
//# sourceMappingURL=ledger-host.js.map
|
package/esm/ledger-host.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ledger-host.js","sourceRoot":"","sources":["../../src/ledger-host.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,OAAO,
|
|
1
|
+
{"version":3,"file":"ledger-host.js","sourceRoot":"","sources":["../../src/ledger-host.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,sBAAsB,EAAsB,MAAM,mBAAmB,CAAC;AAU/E,MAAM,UAAU,mBAAmB,CACjC,SAA8B,EAAE;IAEhC,MAAM,SAAS,GACb,MAAM,CAAC,GAAG;QACV,IAAI,0BAA0B,EAAE;aAC7B,YAAY,CAAC,sBAAsB,CAAC;aACpC,KAAK,EAAE,CAAC;IACb,OAAO,sBAAsB,CAC3B,SAAS,EACT,MAAM,EACN,MAAM,CAAC,sBAAsB,CAC9B,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sidhujag/sysweb3-keyring",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.3",
|
|
4
4
|
"description": "Keyring Manager for UTXO and Web3 Wallets",
|
|
5
5
|
"main": "cjs/index.js",
|
|
6
6
|
"types": "types/index.d.ts",
|
|
@@ -24,6 +24,12 @@
|
|
|
24
24
|
"cjs/transactions/evm-submission.js": [
|
|
25
25
|
"types/transactions/evm-submission.d.ts"
|
|
26
26
|
],
|
|
27
|
+
"cjs/transactions/evm-cancellation": [
|
|
28
|
+
"types/transactions/evm-cancellation.d.ts"
|
|
29
|
+
],
|
|
30
|
+
"cjs/transactions/evm-cancellation.js": [
|
|
31
|
+
"types/transactions/evm-cancellation.d.ts"
|
|
32
|
+
],
|
|
27
33
|
"cjs/transactions/ethereum": [
|
|
28
34
|
"types/transactions/ethereum.d.ts"
|
|
29
35
|
],
|
|
@@ -48,6 +54,12 @@
|
|
|
48
54
|
"esm/ledger-host.js": [
|
|
49
55
|
"types/ledger-host.d.ts"
|
|
50
56
|
],
|
|
57
|
+
"esm/ledger/dmk-selected-host": [
|
|
58
|
+
"types/ledger/dmk-selected-host.d.ts"
|
|
59
|
+
],
|
|
60
|
+
"esm/ledger/dmk-selected-host.js": [
|
|
61
|
+
"types/ledger/dmk-selected-host.d.ts"
|
|
62
|
+
],
|
|
51
63
|
"cjs/ledger/host-types": [
|
|
52
64
|
"types/ledger/host-types.d.ts"
|
|
53
65
|
],
|
package/types/evm-fees.d.ts
CHANGED
|
@@ -35,6 +35,31 @@ export declare function parseEvmFeeQuantity(value: unknown, label?: string): big
|
|
|
35
35
|
* the configured minimum if larger. Callers retain chain/resource bounds.
|
|
36
36
|
*/
|
|
37
37
|
export declare function bufferedEvmGasLimit(estimate: bigint, minimum?: bigint): bigint;
|
|
38
|
+
export type EvmCancellationFeeInput = Readonly<{
|
|
39
|
+
type: 0;
|
|
40
|
+
currentGasPrice: bigint;
|
|
41
|
+
originalGasPrice?: bigint;
|
|
42
|
+
} | {
|
|
43
|
+
type: 2;
|
|
44
|
+
currentMaxFeePerGas: bigint;
|
|
45
|
+
currentMaxPriorityFeePerGas: bigint;
|
|
46
|
+
originalMaxFeePerGas?: bigint;
|
|
47
|
+
originalMaxPriorityFeePerGas?: bigint;
|
|
48
|
+
}>;
|
|
49
|
+
export declare const EVM_CANCELLATION_GAS_LIMIT = 42000n;
|
|
50
|
+
/** Plan only the cancellation fees. The host validates the rates and envelope. */
|
|
51
|
+
export declare function planEvmCancellationFees(input: EvmCancellationFeeInput): Readonly<{
|
|
52
|
+
type: 0;
|
|
53
|
+
gasLimit: 42000n;
|
|
54
|
+
gasPrice: bigint;
|
|
55
|
+
maximumFee: bigint;
|
|
56
|
+
}> | Readonly<{
|
|
57
|
+
type: 2;
|
|
58
|
+
gasLimit: 42000n;
|
|
59
|
+
maxFeePerGas: bigint;
|
|
60
|
+
maxPriorityFeePerGas: bigint;
|
|
61
|
+
maximumFee: bigint;
|
|
62
|
+
}>;
|
|
38
63
|
/**
|
|
39
64
|
* No signer, transport, network registry or provider implementation is imported.
|
|
40
65
|
* Reads are serialized and guarded; RPC failures never become fabricated fees.
|