@aztec/wallet-sdk 0.0.1-commit.7b97ef96e → 0.0.1-commit.7cbc774
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/dest/base-wallet/base_wallet.d.ts +65 -39
- package/dest/base-wallet/base_wallet.d.ts.map +1 -1
- package/dest/base-wallet/base_wallet.js +192 -84
- package/dest/base-wallet/index.d.ts +2 -2
- package/dest/base-wallet/index.d.ts.map +1 -1
- package/dest/base-wallet/utils.d.ts +7 -4
- package/dest/base-wallet/utils.d.ts.map +1 -1
- package/dest/base-wallet/utils.js +11 -5
- package/dest/crypto.d.ts +39 -1
- package/dest/crypto.d.ts.map +1 -1
- package/dest/crypto.js +88 -0
- package/dest/extension/handlers/background_connection_handler.d.ts +12 -2
- package/dest/extension/handlers/background_connection_handler.d.ts.map +1 -1
- package/dest/extension/handlers/background_connection_handler.js +44 -8
- package/dest/extension/handlers/content_script_connection_handler.d.ts +2 -1
- package/dest/extension/handlers/content_script_connection_handler.d.ts.map +1 -1
- package/dest/extension/handlers/content_script_connection_handler.js +19 -0
- package/dest/extension/handlers/internal_message_types.d.ts +3 -1
- package/dest/extension/handlers/internal_message_types.d.ts.map +1 -1
- package/dest/extension/handlers/internal_message_types.js +3 -1
- package/dest/extension/provider/extension_wallet.d.ts +26 -6
- package/dest/extension/provider/extension_wallet.d.ts.map +1 -1
- package/dest/extension/provider/extension_wallet.js +80 -9
- package/dest/extension/provider/index.d.ts +2 -2
- package/dest/extension/provider/index.d.ts.map +1 -1
- package/dest/iframe/handlers/iframe_connection_handler.d.ts +122 -0
- package/dest/iframe/handlers/iframe_connection_handler.d.ts.map +1 -0
- package/dest/iframe/handlers/iframe_connection_handler.js +239 -0
- package/dest/iframe/handlers/index.d.ts +2 -0
- package/dest/iframe/handlers/index.d.ts.map +1 -0
- package/dest/iframe/handlers/index.js +1 -0
- package/dest/iframe/provider/iframe_discovery.d.ts +25 -0
- package/dest/iframe/provider/iframe_discovery.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_discovery.js +167 -0
- package/dest/iframe/provider/iframe_provider.d.ts +65 -0
- package/dest/iframe/provider/iframe_provider.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_provider.js +257 -0
- package/dest/iframe/provider/iframe_wallet.d.ts +85 -0
- package/dest/iframe/provider/iframe_wallet.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_wallet.js +269 -0
- package/dest/iframe/provider/index.d.ts +4 -0
- package/dest/iframe/provider/index.d.ts.map +1 -0
- package/dest/iframe/provider/index.js +3 -0
- package/dest/manager/types.d.ts +3 -2
- package/dest/manager/types.d.ts.map +1 -1
- package/dest/manager/wallet_manager.d.ts +1 -1
- package/dest/manager/wallet_manager.d.ts.map +1 -1
- package/dest/manager/wallet_manager.js +46 -16
- package/dest/types.d.ts +64 -2
- package/dest/types.d.ts.map +1 -1
- package/dest/types.js +29 -0
- package/package.json +12 -8
- package/src/base-wallet/base_wallet.ts +276 -139
- package/src/base-wallet/index.ts +6 -1
- package/src/base-wallet/utils.ts +15 -5
- package/src/crypto.ts +104 -0
- package/src/extension/handlers/background_connection_handler.ts +42 -9
- package/src/extension/handlers/content_script_connection_handler.ts +18 -0
- package/src/extension/handlers/internal_message_types.ts +2 -0
- package/src/extension/provider/extension_wallet.ts +94 -13
- package/src/extension/provider/index.ts +1 -1
- package/src/iframe/handlers/iframe_connection_handler.ts +341 -0
- package/src/iframe/handlers/index.ts +7 -0
- package/src/iframe/provider/iframe_discovery.ts +185 -0
- package/src/iframe/provider/iframe_provider.ts +331 -0
- package/src/iframe/provider/iframe_wallet.ts +323 -0
- package/src/iframe/provider/index.ts +3 -0
- package/src/manager/types.ts +2 -1
- package/src/manager/wallet_manager.ts +48 -14
- package/src/types.ts +72 -0
package/dest/crypto.js
CHANGED
|
@@ -392,3 +392,91 @@ const FINGERPRINT_DATA = new TextEncoder().encode('aztec-wallet-verification-ver
|
|
|
392
392
|
}
|
|
393
393
|
return emojis.join('');
|
|
394
394
|
}
|
|
395
|
+
// ─── Passphrase-based encryption (PBKDF2 + AES-256-GCM) ───────────────────
|
|
396
|
+
/** Default PBKDF2 iteration count. High to compensate for short PINs (~1-2s on modern hardware). */ const DEFAULT_PBKDF2_ITERATIONS = 2_000_000;
|
|
397
|
+
const PBKDF2_SALT_BYTES = 16;
|
|
398
|
+
const PBKDF2_IV_BYTES = 12;
|
|
399
|
+
/**
|
|
400
|
+
* Derives an AES-256-GCM key from a passphrase using PBKDF2-SHA256.
|
|
401
|
+
*
|
|
402
|
+
* @param passphrase - The user-provided passphrase or PIN
|
|
403
|
+
* @param salt - Random salt bytes
|
|
404
|
+
* @param iterations - PBKDF2 iteration count (default: 2,000,000)
|
|
405
|
+
* @returns An AES-256-GCM CryptoKey
|
|
406
|
+
*/ export async function deriveKeyFromPassphrase(passphrase, salt, iterations = DEFAULT_PBKDF2_ITERATIONS) {
|
|
407
|
+
const keyMaterial = await crypto.subtle.importKey('raw', new TextEncoder().encode(passphrase), 'PBKDF2', false, [
|
|
408
|
+
'deriveKey'
|
|
409
|
+
]);
|
|
410
|
+
return crypto.subtle.deriveKey({
|
|
411
|
+
name: 'PBKDF2',
|
|
412
|
+
salt: salt,
|
|
413
|
+
iterations,
|
|
414
|
+
hash: 'SHA-256'
|
|
415
|
+
}, keyMaterial, {
|
|
416
|
+
name: 'AES-GCM',
|
|
417
|
+
length: 256
|
|
418
|
+
}, false, [
|
|
419
|
+
'encrypt',
|
|
420
|
+
'decrypt'
|
|
421
|
+
]);
|
|
422
|
+
}
|
|
423
|
+
/**
|
|
424
|
+
* Encrypts arbitrary bytes with a passphrase using PBKDF2 + AES-256-GCM.
|
|
425
|
+
*
|
|
426
|
+
* Output layout: `[salt (16)] [iv (12)] [ciphertext (...)]`
|
|
427
|
+
*
|
|
428
|
+
* @param plaintext - Data to encrypt
|
|
429
|
+
* @param passphrase - User passphrase or PIN
|
|
430
|
+
* @param iterations - PBKDF2 iteration count (default: 2,000,000)
|
|
431
|
+
* @returns A Uint8Array containing salt + iv + ciphertext
|
|
432
|
+
*/ export async function encryptWithPassphrase(plaintext, passphrase, iterations = DEFAULT_PBKDF2_ITERATIONS) {
|
|
433
|
+
const salt = crypto.getRandomValues(new Uint8Array(PBKDF2_SALT_BYTES));
|
|
434
|
+
const iv = crypto.getRandomValues(new Uint8Array(PBKDF2_IV_BYTES));
|
|
435
|
+
const key = await deriveKeyFromPassphrase(passphrase, salt, iterations);
|
|
436
|
+
const ciphertext = new Uint8Array(await crypto.subtle.encrypt({
|
|
437
|
+
name: 'AES-GCM',
|
|
438
|
+
iv
|
|
439
|
+
}, key, plaintext));
|
|
440
|
+
const result = new Uint8Array(PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES + ciphertext.length);
|
|
441
|
+
result.set(salt, 0);
|
|
442
|
+
result.set(iv, PBKDF2_SALT_BYTES);
|
|
443
|
+
result.set(ciphertext, PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES);
|
|
444
|
+
return result;
|
|
445
|
+
}
|
|
446
|
+
/**
|
|
447
|
+
* Decrypts data produced by {@link encryptWithPassphrase}.
|
|
448
|
+
*
|
|
449
|
+
* @param data - The encrypted blob (salt + iv + ciphertext)
|
|
450
|
+
* @param passphrase - The passphrase used during encryption
|
|
451
|
+
* @param iterations - PBKDF2 iteration count (must match encryption)
|
|
452
|
+
* @returns The decrypted plaintext bytes
|
|
453
|
+
* @throws On wrong passphrase (AES-GCM auth tag mismatch)
|
|
454
|
+
*/ export async function decryptWithPassphrase(data, passphrase, iterations = DEFAULT_PBKDF2_ITERATIONS) {
|
|
455
|
+
const salt = data.slice(0, PBKDF2_SALT_BYTES);
|
|
456
|
+
const iv = data.slice(PBKDF2_SALT_BYTES, PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES);
|
|
457
|
+
const ciphertext = data.slice(PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES);
|
|
458
|
+
const key = await deriveKeyFromPassphrase(passphrase, salt, iterations);
|
|
459
|
+
return new Uint8Array(await crypto.subtle.decrypt({
|
|
460
|
+
name: 'AES-GCM',
|
|
461
|
+
iv
|
|
462
|
+
}, key, ciphertext));
|
|
463
|
+
}
|
|
464
|
+
/**
|
|
465
|
+
* Converts a Uint8Array to a base64 string.
|
|
466
|
+
*/ export function uint8ToBase64(bytes) {
|
|
467
|
+
let binary = '';
|
|
468
|
+
for (const b of bytes){
|
|
469
|
+
binary += String.fromCharCode(b);
|
|
470
|
+
}
|
|
471
|
+
return btoa(binary);
|
|
472
|
+
}
|
|
473
|
+
/**
|
|
474
|
+
* Converts a base64 string to a Uint8Array.
|
|
475
|
+
*/ export function base64ToUint8(b64) {
|
|
476
|
+
const binary = atob(b64);
|
|
477
|
+
const bytes = new Uint8Array(binary.length);
|
|
478
|
+
for(let i = 0; i < binary.length; i++){
|
|
479
|
+
bytes[i] = binary.charCodeAt(i);
|
|
480
|
+
}
|
|
481
|
+
return bytes;
|
|
482
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ChainInfo } from '@aztec/aztec.js/account';
|
|
2
2
|
import { type EncryptedPayload } from '../../crypto.js';
|
|
3
|
-
import { type DiscoveryRequest, type KeyExchangeRequest, type WalletInfo, type WalletMessage, type WalletResponse } from '../../types.js';
|
|
3
|
+
import { type DiscoveryRequest, type KeyExchangeRequest, type WalletInfo, type WalletMessage, type WalletResponse, type WalletSdkLogger } from '../../types.js';
|
|
4
4
|
import { type BackgroundMessage, type MessageSender } from './internal_message_types.js';
|
|
5
5
|
/**
|
|
6
6
|
* Status of a pending discovery request.
|
|
@@ -98,6 +98,8 @@ export interface BackgroundConnectionConfig {
|
|
|
98
98
|
walletVersion: string;
|
|
99
99
|
/** Optional wallet icon URL. */
|
|
100
100
|
walletIcon?: string;
|
|
101
|
+
/** Logger used for diagnostics. */
|
|
102
|
+
logger: WalletSdkLogger;
|
|
101
103
|
}
|
|
102
104
|
/**
|
|
103
105
|
* Handles wallet session flow in the extension background script.
|
|
@@ -115,6 +117,7 @@ export interface BackgroundConnectionConfig {
|
|
|
115
117
|
* walletId: 'my-wallet',
|
|
116
118
|
* walletName: 'My Wallet',
|
|
117
119
|
* walletVersion: '1.0.0',
|
|
120
|
+
* logger: console,
|
|
118
121
|
* },
|
|
119
122
|
* {
|
|
120
123
|
* sendToTab: (tabId, message) => browser.tabs.sendMessage(tabId, message),
|
|
@@ -136,9 +139,16 @@ export declare class BackgroundConnectionHandler {
|
|
|
136
139
|
private callbacks;
|
|
137
140
|
private pendingDiscoveries;
|
|
138
141
|
private activeSessions;
|
|
142
|
+
private log;
|
|
139
143
|
constructor(config: BackgroundConnectionConfig, transport: BackgroundTransport, callbacks?: BackgroundConnectionCallbacks);
|
|
140
144
|
initialize(): void;
|
|
141
145
|
private handleMessage;
|
|
146
|
+
/**
|
|
147
|
+
* Reply to a dApp PING with a PONG. Used as a liveness probe so the dApp can
|
|
148
|
+
* tell the difference between a slow request and a dead extension.
|
|
149
|
+
* @param sessionId - The session that sent the PING.
|
|
150
|
+
*/
|
|
151
|
+
private handlePing;
|
|
142
152
|
getWalletInfo(): WalletInfo;
|
|
143
153
|
handleDiscoveryRequest(request: DiscoveryRequest, tabId: number, origin: string): void;
|
|
144
154
|
approveDiscovery(requestId: string): boolean;
|
|
@@ -155,4 +165,4 @@ export declare class BackgroundConnectionHandler {
|
|
|
155
165
|
getSession(sessionId: string): ActiveSession | undefined;
|
|
156
166
|
getPendingDiscovery(requestId: string): PendingDiscovery | undefined;
|
|
157
167
|
}
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leHRlbnNpb24vaGFuZGxlcnMvYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBT3RCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssVUFBVSxFQUNmLEtBQUssYUFBYSxFQUVsQixLQUFLLGNBQWMsRUFDbkIsS0FBSyxlQUFlLEVBQ3JCLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBSXRCLEtBQUssYUFBYSxFQUNuQixNQUFNLDZCQUE2QixDQUFDO0FBRXJDOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FBRyxTQUFTLEdBQUcsVUFBVSxHQUFHLFVBQVUsQ0FBQztBQUVsRTs7R0FFRztBQUNILE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsaUNBQWlDO0lBQ2pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsOEJBQThCO0lBQzlCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxpQ0FBaUM7SUFDakMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLHlDQUF5QztJQUN6QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsMkJBQTJCO0lBQzNCLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsc0JBQXNCO0lBQ3RCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCx5QkFBeUI7SUFDekIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixzQkFBc0I7SUFDdEIsTUFBTSxFQUFFLGVBQWUsQ0FBQztDQUN6QjtBQUVEOzs7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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"background_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/background_connection_handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EACL,KAAK,gBAAgB,EAOtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,UAAU,EACf,KAAK,aAAa,EAElB,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"background_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/background_connection_handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
17
17
|
* walletId: 'my-wallet',
|
|
18
18
|
* walletName: 'My Wallet',
|
|
19
19
|
* walletVersion: '1.0.0',
|
|
20
|
+
* logger: console,
|
|
20
21
|
* },
|
|
21
22
|
* {
|
|
22
23
|
* sendToTab: (tabId, message) => browser.tabs.sendMessage(tabId, message),
|
|
@@ -37,6 +38,7 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
37
38
|
callbacks;
|
|
38
39
|
pendingDiscoveries;
|
|
39
40
|
activeSessions;
|
|
41
|
+
log;
|
|
40
42
|
constructor(config, transport, callbacks = {}){
|
|
41
43
|
this.config = config;
|
|
42
44
|
this.transport = transport;
|
|
@@ -60,8 +62,11 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
60
62
|
break;
|
|
61
63
|
case InternalMessageType.KEY_EXCHANGE_REQUEST:
|
|
62
64
|
if (sessionId) {
|
|
63
|
-
this.handleKeyExchangeRequest(sessionId, content).catch(()=>{
|
|
64
|
-
|
|
65
|
+
this.handleKeyExchangeRequest(sessionId, content).catch((err)=>{
|
|
66
|
+
this.log.warn('Key exchange failed — session will not be established', {
|
|
67
|
+
sessionId,
|
|
68
|
+
err
|
|
69
|
+
});
|
|
65
70
|
});
|
|
66
71
|
}
|
|
67
72
|
break;
|
|
@@ -75,13 +80,34 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
75
80
|
void this.handleEncryptedMessage(sessionId, content);
|
|
76
81
|
}
|
|
77
82
|
break;
|
|
83
|
+
case InternalMessageType.PING:
|
|
84
|
+
if (sessionId) {
|
|
85
|
+
this.handlePing(sessionId);
|
|
86
|
+
}
|
|
87
|
+
break;
|
|
78
88
|
}
|
|
79
89
|
};
|
|
90
|
+
this.log = config.logger;
|
|
80
91
|
}
|
|
81
92
|
initialize() {
|
|
82
93
|
this.transport.addContentListener(this.handleMessage);
|
|
83
94
|
}
|
|
84
95
|
handleMessage;
|
|
96
|
+
/**
|
|
97
|
+
* Reply to a dApp PING with a PONG. Used as a liveness probe so the dApp can
|
|
98
|
+
* tell the difference between a slow request and a dead extension.
|
|
99
|
+
* @param sessionId - The session that sent the PING.
|
|
100
|
+
*/ handlePing(sessionId) {
|
|
101
|
+
const session = this.activeSessions.get(sessionId);
|
|
102
|
+
if (!session) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
this.transport.sendToTab(session.tabId, {
|
|
106
|
+
origin: MessageOrigin.BACKGROUND,
|
|
107
|
+
type: InternalMessageType.PONG,
|
|
108
|
+
sessionId
|
|
109
|
+
});
|
|
110
|
+
}
|
|
85
111
|
getWalletInfo() {
|
|
86
112
|
return {
|
|
87
113
|
id: this.config.walletId,
|
|
@@ -164,8 +190,11 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
164
190
|
content: response
|
|
165
191
|
});
|
|
166
192
|
this.callbacks.onSessionEstablished?.(session);
|
|
167
|
-
} catch
|
|
168
|
-
|
|
193
|
+
} catch (err) {
|
|
194
|
+
this.log.warn('Key exchange failed — session will not be established', {
|
|
195
|
+
sessionId,
|
|
196
|
+
err
|
|
197
|
+
});
|
|
169
198
|
}
|
|
170
199
|
}
|
|
171
200
|
async handleEncryptedMessage(sessionId, encrypted) {
|
|
@@ -176,8 +205,11 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
176
205
|
try {
|
|
177
206
|
const message = await decrypt(session.sharedKey, encrypted);
|
|
178
207
|
this.callbacks.onWalletMessage?.(session, message);
|
|
179
|
-
} catch
|
|
180
|
-
|
|
208
|
+
} catch (err) {
|
|
209
|
+
this.log.warn('Failed to decrypt incoming wallet message', {
|
|
210
|
+
sessionId,
|
|
211
|
+
err
|
|
212
|
+
});
|
|
181
213
|
}
|
|
182
214
|
}
|
|
183
215
|
async sendResponse(sessionId, response) {
|
|
@@ -193,8 +225,12 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
193
225
|
sessionId,
|
|
194
226
|
content: encrypted
|
|
195
227
|
});
|
|
196
|
-
} catch
|
|
197
|
-
|
|
228
|
+
} catch (err) {
|
|
229
|
+
this.log.error('Failed to encrypt wallet response — response will not be sent', {
|
|
230
|
+
sessionId,
|
|
231
|
+
messageId: response.messageId,
|
|
232
|
+
err
|
|
233
|
+
});
|
|
198
234
|
}
|
|
199
235
|
}
|
|
200
236
|
terminateSession(sessionId) {
|
|
@@ -44,6 +44,7 @@ export declare class ContentScriptConnectionHandler {
|
|
|
44
44
|
constructor(transport: ContentScriptTransport);
|
|
45
45
|
start(): void;
|
|
46
46
|
private handleBackgroundMessage;
|
|
47
|
+
private handlePong;
|
|
47
48
|
private handleDiscoveryRequest;
|
|
48
49
|
private handleDiscoveryApproved;
|
|
49
50
|
private handleKeyExchangeResponse;
|
|
@@ -53,4 +54,4 @@ export declare class ContentScriptConnectionHandler {
|
|
|
53
54
|
closeAllConnections(): void;
|
|
54
55
|
getConnectionCount(): number;
|
|
55
56
|
}
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudF9zY3JpcHRfY29ubmVjdGlvbl9oYW5kbGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZXh0ZW5zaW9uL2hhbmRsZXJzL2NvbnRlbnRfc2NyaXB0X2Nvbm5lY3Rpb25faGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFDdEIsS0FBSyxvQkFBb0IsRUFHMUIsTUFBTSw2QkFBNkIsQ0FBQztBQW9DckM7O0dBRUc7QUFDSCxNQUFNLFdBQVcsc0JBQXNCO0lBQ3JDOzs7T0FHRztJQUNILGdCQUFnQixFQUFFLENBQUMsT0FBTyxFQUFFLG9CQUFvQixLQUFLLElBQUksQ0FBQztJQUUxRDs7O09BR0c7SUFDSCxxQkFBcUIsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsS0FBSyxJQUFJLEtBQUssSUFBSSxDQUFDO0NBQ2hGO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXFCRztBQUNILHFCQUFhLDhCQUE4QjtJQUs3QixPQUFPLENBQUMsU0FBUztJQUo3QixPQUFPLENBQUMsS0FBSyxDQUFxQztJQUNsRCxPQUFPLENBQUMsU0FBUyxDQUFTO0lBQzFCLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBZ0Q7SUFFMUUsWUFBb0IsU0FBUyxFQUFFLHNCQUFzQixFQUFJO0lBRXpELEtBQUssSUFBSSxJQUFJLENBOEJaO0lBRUQsT0FBTyxDQUFDLHVCQUF1QixDQXdCN0I7SUFFRixPQUFPLENBQUMsVUFBVTtJQVFsQixPQUFPLENBQUMsc0JBQXNCO0lBUTlCLE9BQU8sQ0FBQyx1QkFBdUI7SUF3RC9CLE9BQU8sQ0FBQyx5QkFBeUI7SUFRakMsT0FBTyxDQUFDLG9CQUFvQjtJQVE1QixPQUFPLENBQUMseUJBQXlCO0lBVWpDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNdkM7SUFFRCxtQkFBbUIsSUFBSSxJQUFJLENBSzFCO0lBRUQsa0JBQWtCLElBQUksTUFBTSxDQUUzQjtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content_script_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/content_script_connection_handler.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EAG1B,MAAM,6BAA6B,CAAC;AAoCrC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAE1D;;;OAGG;IACH,qBAAqB,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,KAAK,IAAI,CAAC;CAChF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,8BAA8B;IAK7B,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,kBAAkB,CAAgD;IAE1E,YAAoB,SAAS,EAAE,sBAAsB,EAAI;IAEzD,KAAK,IAAI,IAAI,CA8BZ;IAED,OAAO,CAAC,uBAAuB,
|
|
1
|
+
{"version":3,"file":"content_script_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/content_script_connection_handler.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EAG1B,MAAM,6BAA6B,CAAC;AAoCrC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAE1D;;;OAGG;IACH,qBAAqB,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,KAAK,IAAI,CAAC;CAChF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,8BAA8B;IAK7B,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,kBAAkB,CAAgD;IAE1E,YAAoB,SAAS,EAAE,sBAAsB,EAAI;IAEzD,KAAK,IAAI,IAAI,CA8BZ;IAED,OAAO,CAAC,uBAAuB,CAwB7B;IAEF,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,uBAAuB;IAwD/B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,yBAAyB;IAUjC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAMvC;IAED,mBAAmB,IAAI,IAAI,CAK1B;IAED,kBAAkB,IAAI,MAAM,CAE3B;CACF"}
|
|
@@ -49,6 +49,9 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
49
49
|
case InternalMessageType.SESSION_DISCONNECTED:
|
|
50
50
|
this.handleSessionDisconnected(sessionId);
|
|
51
51
|
break;
|
|
52
|
+
case InternalMessageType.PONG:
|
|
53
|
+
this.handlePong(sessionId);
|
|
54
|
+
break;
|
|
52
55
|
}
|
|
53
56
|
};
|
|
54
57
|
}
|
|
@@ -78,6 +81,15 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
78
81
|
this.listening = true;
|
|
79
82
|
}
|
|
80
83
|
handleBackgroundMessage;
|
|
84
|
+
handlePong(sessionId) {
|
|
85
|
+
const connection = this.ports.get(sessionId);
|
|
86
|
+
if (!connection) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
connection.port.postMessage({
|
|
90
|
+
type: WalletMessageType.PONG
|
|
91
|
+
});
|
|
92
|
+
}
|
|
81
93
|
handleDiscoveryRequest(request) {
|
|
82
94
|
this.transport.sendToBackground({
|
|
83
95
|
origin: MessageOrigin.CONTENT_SCRIPT,
|
|
@@ -110,6 +122,13 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
110
122
|
content: data
|
|
111
123
|
});
|
|
112
124
|
break;
|
|
125
|
+
case WalletMessageType.PING:
|
|
126
|
+
this.transport.sendToBackground({
|
|
127
|
+
origin: MessageOrigin.CONTENT_SCRIPT,
|
|
128
|
+
type: InternalMessageType.PING,
|
|
129
|
+
sessionId
|
|
130
|
+
});
|
|
131
|
+
break;
|
|
113
132
|
default:
|
|
114
133
|
this.transport.sendToBackground({
|
|
115
134
|
origin: MessageOrigin.CONTENT_SCRIPT,
|
|
@@ -8,10 +8,12 @@ export declare const InternalMessageType: {
|
|
|
8
8
|
readonly KEY_EXCHANGE_REQUEST: "key-exchange-request";
|
|
9
9
|
readonly SECURE_MESSAGE: "secure-message";
|
|
10
10
|
readonly DISCONNECT_REQUEST: "disconnect-request";
|
|
11
|
+
readonly PING: "ping";
|
|
11
12
|
readonly DISCOVERY_APPROVED: "discovery-approved";
|
|
12
13
|
readonly KEY_EXCHANGE_RESPONSE: "key-exchange-response";
|
|
13
14
|
readonly SECURE_RESPONSE: "secure-response";
|
|
14
15
|
readonly SESSION_DISCONNECTED: "session-disconnected";
|
|
16
|
+
readonly PONG: "pong";
|
|
15
17
|
};
|
|
16
18
|
/**
|
|
17
19
|
* Message origins for internal extension communication.
|
|
@@ -60,4 +62,4 @@ export interface MessageSender {
|
|
|
60
62
|
url?: string;
|
|
61
63
|
};
|
|
62
64
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJuYWxfbWVzc2FnZV90eXBlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2V4dGVuc2lvbi9oYW5kbGVycy9pbnRlcm5hbF9tZXNzYWdlX3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sbUJBQW1COzs7Ozs7Ozs7OztDQWF0QixDQUFDO0FBRVg7O0dBRUc7QUFDSCxlQUFPLE1BQU0sYUFBYTs7O0NBR2hCLENBQUM7QUFFWCxxQ0FBcUM7QUFDckMsTUFBTSxNQUFNLGlCQUFpQixHQUFHLENBQUMsT0FBTyxhQUFhLENBQUMsQ0FBQyxNQUFNLE9BQU8sYUFBYSxDQUFDLENBQUM7QUFFbkY7O0dBRUc7QUFDSCxNQUFNLFdBQVcsb0JBQW9CO0lBQ25DLGlDQUFpQztJQUNqQyxNQUFNLEVBQUUsT0FBTyxhQUFhLENBQUMsY0FBYyxDQUFDO0lBQzVDLG9CQUFvQjtJQUNwQixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsbUNBQW1DO0lBQ25DLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuQixnQ0FBZ0M7SUFDaEMsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsaUJBQWlCO0lBQ2hDLGlDQUFpQztJQUNqQyxNQUFNLEVBQUUsT0FBTyxhQUFhLENBQUMsVUFBVSxDQUFDO0lBQ3hDLG9CQUFvQjtJQUNwQixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsMEJBQTBCO0lBQzFCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZ0NBQWdDO0lBQ2hDLE9BQU8sQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUNuQjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGFBQWE7SUFDNUIsb0NBQW9DO0lBQ3BDLEdBQUcsQ0FBQyxFQUFFO1FBQ0osc0JBQXNCO1FBQ3RCLEVBQUUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNaLGVBQWU7UUFDZixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDZCxDQUFDO0NBQ0gifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal_message_types.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/internal_message_types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"internal_message_types.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/internal_message_types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;CAatB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,aAAa;;;CAGhB,CAAC;AAEX,qCAAqC;AACrC,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,OAAO,aAAa,CAAC,CAAC;AAEnF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,iCAAiC;IACjC,MAAM,EAAE,OAAO,aAAa,CAAC,cAAc,CAAC;IAC5C,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,iCAAiC;IACjC,MAAM,EAAE,OAAO,aAAa,CAAC,UAAU,CAAC;IACxC,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,oCAAoC;IACpC,GAAG,CAAC,EAAE;QACJ,sBAAsB;QACtB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,eAAe;QACf,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACH"}
|
|
@@ -8,11 +8,13 @@
|
|
|
8
8
|
KEY_EXCHANGE_REQUEST: 'key-exchange-request',
|
|
9
9
|
SECURE_MESSAGE: 'secure-message',
|
|
10
10
|
DISCONNECT_REQUEST: 'disconnect-request',
|
|
11
|
+
PING: 'ping',
|
|
11
12
|
// Background → Content script
|
|
12
13
|
DISCOVERY_APPROVED: 'discovery-approved',
|
|
13
14
|
KEY_EXCHANGE_RESPONSE: 'key-exchange-response',
|
|
14
15
|
SECURE_RESPONSE: 'secure-response',
|
|
15
|
-
SESSION_DISCONNECTED: 'session-disconnected'
|
|
16
|
+
SESSION_DISCONNECTED: 'session-disconnected',
|
|
17
|
+
PONG: 'pong'
|
|
16
18
|
};
|
|
17
19
|
/**
|
|
18
20
|
* Message origins for internal extension communication.
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import type { ChainInfo } from '@aztec/aztec.js/account';
|
|
2
2
|
import { type Wallet } from '@aztec/aztec.js/wallet';
|
|
3
|
-
|
|
4
|
-
* Callback type for wallet disconnect events.
|
|
5
|
-
*/
|
|
6
|
-
export type DisconnectCallback = () => void;
|
|
3
|
+
import { type DisconnectCallback, type HeartbeatOptions, type WalletSdkLogger } from '../../types.js';
|
|
7
4
|
/**
|
|
8
5
|
* A wallet implementation that communicates with browser extension wallets
|
|
9
6
|
* using an encrypted MessageChannel.
|
|
@@ -45,6 +42,11 @@ export declare class ExtensionWallet {
|
|
|
45
42
|
private inFlight;
|
|
46
43
|
private disconnected;
|
|
47
44
|
private disconnectCallbacks;
|
|
45
|
+
private heartbeatTimer;
|
|
46
|
+
private lastInboundAt;
|
|
47
|
+
private log;
|
|
48
|
+
private heartbeatIntervalMs;
|
|
49
|
+
private heartbeatDeadAfterMs;
|
|
48
50
|
/**
|
|
49
51
|
* Private constructor - use {@link ExtensionWallet.create} to instantiate.
|
|
50
52
|
* @param chainInfo - The chain information (chainId and version)
|
|
@@ -52,6 +54,8 @@ export declare class ExtensionWallet {
|
|
|
52
54
|
* @param extensionId - The unique identifier of the target wallet extension
|
|
53
55
|
* @param port - The MessagePort for private communication with the wallet
|
|
54
56
|
* @param sharedKey - The derived AES-256-GCM shared key for encryption
|
|
57
|
+
* @param logger - Optional logger; defaults to a no-op logger
|
|
58
|
+
* @param heartbeatOptions - Optional heartbeat tuning (mostly useful for tests)
|
|
55
59
|
*/
|
|
56
60
|
private constructor();
|
|
57
61
|
/**
|
|
@@ -63,6 +67,8 @@ export declare class ExtensionWallet {
|
|
|
63
67
|
* @param sharedKey - The derived AES-256-GCM shared key for encryption
|
|
64
68
|
* @param chainInfo - The chain information (chainId and version) for request context
|
|
65
69
|
* @param appId - Application identifier used to identify the requesting dApp to the wallet
|
|
70
|
+
* @param logger - Optional logger; defaults to a no-op logger to keep extension/page bundles small
|
|
71
|
+
* @param heartbeatOptions - Optional override for heartbeat tuning (mostly useful for tests)
|
|
66
72
|
* @returns A Wallet interface where all method calls are encrypted
|
|
67
73
|
*
|
|
68
74
|
* @example
|
|
@@ -80,10 +86,24 @@ export declare class ExtensionWallet {
|
|
|
80
86
|
* const accounts = await wallet.getAccounts();
|
|
81
87
|
* ```
|
|
82
88
|
*/
|
|
83
|
-
static create(extensionId: string, port: MessagePort, sharedKey: CryptoKey, chainInfo: ChainInfo, appId: string): ExtensionWallet;
|
|
89
|
+
static create(extensionId: string, port: MessagePort, sharedKey: CryptoKey, chainInfo: ChainInfo, appId: string, logger?: WalletSdkLogger, heartbeatOptions?: HeartbeatOptions): ExtensionWallet;
|
|
84
90
|
asWallet(): Wallet;
|
|
85
91
|
private handleEncryptedResponse;
|
|
86
92
|
private postMessage;
|
|
93
|
+
/**
|
|
94
|
+
* Start the heartbeat probe loop while at least one request is in flight.
|
|
95
|
+
* Idempotent — calling while already running is a no-op.
|
|
96
|
+
*
|
|
97
|
+
* Heartbeat is opt-in via wire protocol: PINGs are unencrypted control messages
|
|
98
|
+
* (like DISCONNECT). Older wallets that do not understand PING simply drop it,
|
|
99
|
+
* which is safe — we only declare disconnect when **no** inbound traffic of any
|
|
100
|
+
* kind (PONG, encrypted response, DISCONNECT) arrives within the dead window.
|
|
101
|
+
* A wallet that is processing a slow request will reset the timer when it
|
|
102
|
+
* eventually responds, so this never causes false disconnects on legacy peers.
|
|
103
|
+
*/
|
|
104
|
+
private startHeartbeat;
|
|
105
|
+
private maybeStopHeartbeat;
|
|
106
|
+
private heartbeatTick;
|
|
87
107
|
/**
|
|
88
108
|
* Handles wallet disconnection.
|
|
89
109
|
* Rejects all pending requests and notifies registered callbacks.
|
|
@@ -129,4 +149,4 @@ export declare class ExtensionWallet {
|
|
|
129
149
|
*/
|
|
130
150
|
disconnect(): Promise<void>;
|
|
131
151
|
}
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5zaW9uX3dhbGxldC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2V4dGVuc2lvbi9wcm92aWRlci9leHRlbnNpb25fd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx3QkFBd0IsQ0FBQztBQU9uRSxPQUFPLEVBR0wsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxnQkFBZ0IsRUFLckIsS0FBSyxlQUFlLEVBQ3JCLE1BQU0sZ0JBQWdCLENBQUM7QUFheEI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQThCRztBQUNILHFCQUFhLGVBQWU7SUFzQnhCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLFdBQVc7SUFDbkIsT0FBTyxDQUFDLElBQUk7SUFDWixPQUFPLENBQUMsU0FBUztJQXpCbkIsc0VBQXNFO0lBQ3RFLE9BQU8sQ0FBQyxRQUFRLENBQW9EO0lBQ3BFLE9BQU8sQ0FBQyxZQUFZLENBQVM7SUFDN0IsT0FBTyxDQUFDLG1CQUFtQixDQUE0QjtJQUN2RCxPQUFPLENBQUMsY0FBYyxDQUErQztJQUNyRSxPQUFPLENBQUMsYUFBYSxDQUFLO0lBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQWtCO0lBQzdCLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBUztJQUNwQyxPQUFPLENBQUMsb0JBQW9CLENBQVM7SUFFckM7Ozs7Ozs7OztPQVNHO0lBQ0gsT0FBTyxlQVlOO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQTJCRztJQUNILE1BQU0sQ0FBQyxNQUFNLENBQ1gsV0FBVyxFQUFFLE1BQU0sRUFDbkIsSUFBSSxFQUFFLFdBQVcsRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsS0FBSyxFQUFFLE1BQU0sRUFDYixNQUFNLENBQUMsRUFBRSxlQUFlLEVBQ3hCLGdCQUFnQixDQUFDLEVBQUUsZ0JBQWdCLEdBQ2xDLGVBQWUsQ0FvQ2pCO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FJakI7WUFVYSx1QkFBdUI7WUFnRHZCLFdBQVc7SUEyQnpCOzs7Ozs7Ozs7O09BVUc7SUFDSCxPQUFPLENBQUMsY0FBYztJQVF0QixPQUFPLENBQUMsa0JBQWtCO0lBTzFCLE9BQU8sQ0FBQyxhQUFhO0lBdUJyQjs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtJQStCeEI7Ozs7Ozs7Ozs7Ozs7OztPQWVHO0lBQ0gsWUFBWSxDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxNQUFNLElBQUksQ0FRckQ7SUFFRDs7OztPQUlHO0lBQ0gsY0FBYyxJQUFJLE9BQU8sQ0FFeEI7SUFFRDs7Ozs7Ozs7Ozs7OztPQWFHO0lBRUcsVUFBVSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FhaEM7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension_wallet.d.ts","sourceRoot":"","sources":["../../../src/extension/provider/extension_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"extension_wallet.d.ts","sourceRoot":"","sources":["../../../src/extension/provider/extension_wallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAOnE,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAKrB,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAaxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,eAAe;IAsBxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,SAAS;IAzBnB,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAoD;IACpE,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,oBAAoB,CAAS;IAErC;;;;;;;;;OASG;IACH,OAAO,eAYN;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,MAAM,CAAC,MAAM,CACX,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,eAAe,EACxB,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,eAAe,CAoCjB;IAED,QAAQ,IAAI,MAAM,CAIjB;YAUa,uBAAuB;YAgDvB,WAAW;IA2BzB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,aAAa;IAuBrB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA+BxB;;;;;;;;;;;;;;;OAeG;IACH,YAAY,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,IAAI,CAQrD;IAED;;;;OAIG;IACH,cAAc,IAAI,OAAO,CAExB;IAED;;;;;;;;;;;;;OAaG;IAEG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAahC;CACF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { WalletSchema } from '@aztec/aztec.js/wallet';
|
|
2
2
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
3
3
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
4
|
-
import { schemaHasMethod } from '@aztec/foundation/schemas';
|
|
4
|
+
import { getSchemaReturnType, schemaHasMethod } from '@aztec/foundation/schemas';
|
|
5
5
|
import { decrypt, encrypt } from '../../crypto.js';
|
|
6
|
-
import { WalletMessageType } from '../../types.js';
|
|
6
|
+
import { DEFAULT_HEARTBEAT_DEAD_AFTER_MS, DEFAULT_HEARTBEAT_INTERVAL_MS, NOOP_LOGGER, WalletMessageType } from '../../types.js';
|
|
7
7
|
/**
|
|
8
8
|
* A wallet implementation that communicates with browser extension wallets
|
|
9
9
|
* using an encrypted MessageChannel.
|
|
@@ -43,6 +43,11 @@ import { WalletMessageType } from '../../types.js';
|
|
|
43
43
|
/** Map of pending requests awaiting responses, keyed by message ID */ inFlight;
|
|
44
44
|
disconnected;
|
|
45
45
|
disconnectCallbacks;
|
|
46
|
+
heartbeatTimer;
|
|
47
|
+
lastInboundAt;
|
|
48
|
+
log;
|
|
49
|
+
heartbeatIntervalMs;
|
|
50
|
+
heartbeatDeadAfterMs;
|
|
46
51
|
/**
|
|
47
52
|
* Private constructor - use {@link ExtensionWallet.create} to instantiate.
|
|
48
53
|
* @param chainInfo - The chain information (chainId and version)
|
|
@@ -50,7 +55,9 @@ import { WalletMessageType } from '../../types.js';
|
|
|
50
55
|
* @param extensionId - The unique identifier of the target wallet extension
|
|
51
56
|
* @param port - The MessagePort for private communication with the wallet
|
|
52
57
|
* @param sharedKey - The derived AES-256-GCM shared key for encryption
|
|
53
|
-
|
|
58
|
+
* @param logger - Optional logger; defaults to a no-op logger
|
|
59
|
+
* @param heartbeatOptions - Optional heartbeat tuning (mostly useful for tests)
|
|
60
|
+
*/ constructor(chainInfo, appId, extensionId, port, sharedKey, logger, heartbeatOptions){
|
|
54
61
|
this.chainInfo = chainInfo;
|
|
55
62
|
this.appId = appId;
|
|
56
63
|
this.extensionId = extensionId;
|
|
@@ -59,6 +66,11 @@ import { WalletMessageType } from '../../types.js';
|
|
|
59
66
|
this.inFlight = new Map();
|
|
60
67
|
this.disconnected = false;
|
|
61
68
|
this.disconnectCallbacks = [];
|
|
69
|
+
this.heartbeatTimer = null;
|
|
70
|
+
this.lastInboundAt = 0;
|
|
71
|
+
this.log = logger ?? NOOP_LOGGER;
|
|
72
|
+
this.heartbeatIntervalMs = heartbeatOptions?.intervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
|
|
73
|
+
this.heartbeatDeadAfterMs = heartbeatOptions?.deadAfterMs ?? DEFAULT_HEARTBEAT_DEAD_AFTER_MS;
|
|
62
74
|
}
|
|
63
75
|
/**
|
|
64
76
|
* Creates a Wallet that communicates with a browser extension
|
|
@@ -69,6 +81,8 @@ import { WalletMessageType } from '../../types.js';
|
|
|
69
81
|
* @param sharedKey - The derived AES-256-GCM shared key for encryption
|
|
70
82
|
* @param chainInfo - The chain information (chainId and version) for request context
|
|
71
83
|
* @param appId - Application identifier used to identify the requesting dApp to the wallet
|
|
84
|
+
* @param logger - Optional logger; defaults to a no-op logger to keep extension/page bundles small
|
|
85
|
+
* @param heartbeatOptions - Optional override for heartbeat tuning (mostly useful for tests)
|
|
72
86
|
* @returns A Wallet interface where all method calls are encrypted
|
|
73
87
|
*
|
|
74
88
|
* @example
|
|
@@ -85,12 +99,13 @@ import { WalletMessageType } from '../../types.js';
|
|
|
85
99
|
*
|
|
86
100
|
* const accounts = await wallet.getAccounts();
|
|
87
101
|
* ```
|
|
88
|
-
*/ static create(extensionId, port, sharedKey, chainInfo, appId) {
|
|
89
|
-
const wallet = new ExtensionWallet(chainInfo, appId, extensionId, port, sharedKey);
|
|
102
|
+
*/ static create(extensionId, port, sharedKey, chainInfo, appId, logger, heartbeatOptions) {
|
|
103
|
+
const wallet = new ExtensionWallet(chainInfo, appId, extensionId, port, sharedKey, logger, heartbeatOptions);
|
|
90
104
|
// Set up message handler for encrypted responses and unencrypted control messages
|
|
91
105
|
wallet.port.onmessage = (event)=>{
|
|
92
106
|
const data = event.data;
|
|
93
|
-
//
|
|
107
|
+
// Any inbound traffic counts as proof of liveness.
|
|
108
|
+
wallet.lastInboundAt = Date.now();
|
|
94
109
|
if (data && typeof data === 'object' && 'type' in data && data.type === WalletMessageType.DISCONNECT) {
|
|
95
110
|
wallet.handleDisconnect();
|
|
96
111
|
return;
|
|
@@ -109,7 +124,7 @@ import { WalletMessageType } from '../../types.js';
|
|
|
109
124
|
type: prop.toString(),
|
|
110
125
|
args
|
|
111
126
|
});
|
|
112
|
-
return WalletSchema[prop.toString()]
|
|
127
|
+
return getSchemaReturnType(WalletSchema[prop.toString()]).parseAsync(result);
|
|
113
128
|
};
|
|
114
129
|
} else {
|
|
115
130
|
return target[prop];
|
|
@@ -152,8 +167,12 @@ import { WalletMessageType } from '../../types.js';
|
|
|
152
167
|
resolve(result);
|
|
153
168
|
}
|
|
154
169
|
this.inFlight.delete(messageId);
|
|
155
|
-
|
|
156
|
-
} catch
|
|
170
|
+
this.maybeStopHeartbeat();
|
|
171
|
+
} catch (err) {
|
|
172
|
+
this.log.warn('Failed to decrypt wallet response', {
|
|
173
|
+
err
|
|
174
|
+
});
|
|
175
|
+
}
|
|
157
176
|
}
|
|
158
177
|
/**
|
|
159
178
|
* Sends an encrypted wallet method call over the secure MessageChannel.
|
|
@@ -190,9 +209,57 @@ import { WalletMessageType } from '../../types.js';
|
|
|
190
209
|
resolve,
|
|
191
210
|
reject
|
|
192
211
|
});
|
|
212
|
+
this.startHeartbeat();
|
|
193
213
|
return promise;
|
|
194
214
|
}
|
|
195
215
|
/**
|
|
216
|
+
* Start the heartbeat probe loop while at least one request is in flight.
|
|
217
|
+
* Idempotent — calling while already running is a no-op.
|
|
218
|
+
*
|
|
219
|
+
* Heartbeat is opt-in via wire protocol: PINGs are unencrypted control messages
|
|
220
|
+
* (like DISCONNECT). Older wallets that do not understand PING simply drop it,
|
|
221
|
+
* which is safe — we only declare disconnect when **no** inbound traffic of any
|
|
222
|
+
* kind (PONG, encrypted response, DISCONNECT) arrives within the dead window.
|
|
223
|
+
* A wallet that is processing a slow request will reset the timer when it
|
|
224
|
+
* eventually responds, so this never causes false disconnects on legacy peers.
|
|
225
|
+
*/ startHeartbeat() {
|
|
226
|
+
if (this.heartbeatTimer !== null || this.disconnected) {
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
this.lastInboundAt = Date.now();
|
|
230
|
+
this.heartbeatTimer = setInterval(()=>this.heartbeatTick(), this.heartbeatIntervalMs);
|
|
231
|
+
}
|
|
232
|
+
maybeStopHeartbeat() {
|
|
233
|
+
if (this.inFlight.size === 0 && this.heartbeatTimer !== null) {
|
|
234
|
+
clearInterval(this.heartbeatTimer);
|
|
235
|
+
this.heartbeatTimer = null;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
heartbeatTick() {
|
|
239
|
+
if (this.disconnected || this.inFlight.size === 0) {
|
|
240
|
+
this.maybeStopHeartbeat();
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
const idleMs = Date.now() - this.lastInboundAt;
|
|
244
|
+
if (idleMs >= this.heartbeatDeadAfterMs) {
|
|
245
|
+
this.log.warn('Wallet channel unresponsive — declaring disconnect', {
|
|
246
|
+
idleMs,
|
|
247
|
+
inFlight: this.inFlight.size
|
|
248
|
+
});
|
|
249
|
+
this.handleDisconnect();
|
|
250
|
+
return;
|
|
251
|
+
}
|
|
252
|
+
try {
|
|
253
|
+
this.port.postMessage({
|
|
254
|
+
type: WalletMessageType.PING
|
|
255
|
+
});
|
|
256
|
+
} catch (err) {
|
|
257
|
+
this.log.warn('Failed to send heartbeat PING', {
|
|
258
|
+
err
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
196
263
|
* Handles wallet disconnection.
|
|
197
264
|
* Rejects all pending requests and notifies registered callbacks.
|
|
198
265
|
* @internal
|
|
@@ -201,6 +268,10 @@ import { WalletMessageType } from '../../types.js';
|
|
|
201
268
|
return;
|
|
202
269
|
}
|
|
203
270
|
this.disconnected = true;
|
|
271
|
+
if (this.heartbeatTimer !== null) {
|
|
272
|
+
clearInterval(this.heartbeatTimer);
|
|
273
|
+
this.heartbeatTimer = null;
|
|
274
|
+
}
|
|
204
275
|
if (this.port) {
|
|
205
276
|
this.port.onmessage = null;
|
|
206
277
|
this.port.close();
|