@meshconnect/uwc-injected-connector 0.20.3 → 0.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/dist/eip6963-discovery.d.ts +13 -0
  2. package/dist/eip6963-discovery.d.ts.map +1 -1
  3. package/dist/eip6963-discovery.js +12 -3
  4. package/dist/eip6963-discovery.js.map +1 -1
  5. package/dist/injected-connector.d.ts +39 -2
  6. package/dist/injected-connector.d.ts.map +1 -1
  7. package/dist/injected-connector.js +170 -19
  8. package/dist/injected-connector.js.map +1 -1
  9. package/dist/services/connection-manager.d.ts +84 -5
  10. package/dist/services/connection-manager.d.ts.map +1 -1
  11. package/dist/services/connection-manager.js +172 -30
  12. package/dist/services/connection-manager.js.map +1 -1
  13. package/dist/services/ethereum/ethereum-transaction-builder.d.ts.map +1 -1
  14. package/dist/services/ethereum/ethereum-transaction-builder.js +3 -2
  15. package/dist/services/ethereum/ethereum-transaction-builder.js.map +1 -1
  16. package/dist/services/ethereum/ethereum-wallet-service.d.ts +86 -7
  17. package/dist/services/ethereum/ethereum-wallet-service.d.ts.map +1 -1
  18. package/dist/services/ethereum/ethereum-wallet-service.js +201 -28
  19. package/dist/services/ethereum/ethereum-wallet-service.js.map +1 -1
  20. package/dist/services/solana/solana-wallet-service.d.ts +57 -0
  21. package/dist/services/solana/solana-wallet-service.d.ts.map +1 -1
  22. package/dist/services/solana/solana-wallet-service.js +118 -0
  23. package/dist/services/solana/solana-wallet-service.js.map +1 -1
  24. package/dist/services/ton/ton-wallet-service.d.ts +9 -0
  25. package/dist/services/ton/ton-wallet-service.d.ts.map +1 -1
  26. package/dist/services/ton/ton-wallet-service.js +15 -0
  27. package/dist/services/ton/ton-wallet-service.js.map +1 -1
  28. package/dist/services/tron/tron-wallet-service.d.ts +11 -0
  29. package/dist/services/tron/tron-wallet-service.d.ts.map +1 -1
  30. package/dist/services/tron/tron-wallet-service.js +21 -0
  31. package/dist/services/tron/tron-wallet-service.js.map +1 -1
  32. package/dist/utils/step-reporter.d.ts +33 -0
  33. package/dist/utils/step-reporter.d.ts.map +1 -0
  34. package/dist/utils/step-reporter.js +54 -0
  35. package/dist/utils/step-reporter.js.map +1 -0
  36. package/dist/utils/with-deadline.d.ts +30 -0
  37. package/dist/utils/with-deadline.d.ts.map +1 -0
  38. package/dist/utils/with-deadline.js +67 -0
  39. package/dist/utils/with-deadline.js.map +1 -0
  40. package/package.json +6 -6
  41. package/src/eip6963-discovery.test.ts +111 -2
  42. package/src/eip6963-discovery.ts +28 -4
  43. package/src/injected-connector.test.ts +574 -16
  44. package/src/injected-connector.ts +210 -23
  45. package/src/services/connection-manager.test.ts +338 -1
  46. package/src/services/connection-manager.ts +236 -41
  47. package/src/services/ethereum/ethereum-transaction-builder.test.ts +97 -0
  48. package/src/services/ethereum/ethereum-transaction-builder.ts +3 -2
  49. package/src/services/ethereum/ethereum-wallet-service.test.ts +495 -17
  50. package/src/services/ethereum/ethereum-wallet-service.ts +248 -32
  51. package/src/services/solana/solana-wallet-service.lifecycle.test.ts +156 -6
  52. package/src/services/solana/solana-wallet-service.reconnect.test.ts +175 -0
  53. package/src/services/solana/solana-wallet-service.ts +132 -0
  54. package/src/services/ton/ton-wallet-service.test.ts +25 -0
  55. package/src/services/ton/ton-wallet-service.ts +15 -0
  56. package/src/services/tron/tron-wallet-service.test.ts +45 -0
  57. package/src/services/tron/tron-wallet-service.ts +20 -0
  58. package/src/signSolanaTransactionBytes.test.ts +1 -1
  59. package/src/utils/step-reporter.test.ts +56 -0
  60. package/src/utils/step-reporter.ts +83 -0
  61. package/src/utils/with-deadline.test.ts +80 -0
  62. package/src/utils/with-deadline.ts +67 -0
@@ -21,6 +21,12 @@ Object.defineProperty(globalThis, 'window', {
21
21
  describe('EIP-6963 Discovery', () => {
22
22
  beforeEach(() => {
23
23
  vi.clearAllMocks()
24
+ // Reset addEventListener/dispatchEvent implementations too — some tests
25
+ // install a mockImplementation on these to simulate a real announcement,
26
+ // and clearAllMocks only clears call history, not the implementation.
27
+ mockWindow.addEventListener.mockReset()
28
+ mockWindow.removeEventListener.mockReset()
29
+ mockWindow.dispatchEvent.mockReset()
24
30
  // Reset window properties
25
31
  mockWindow.ethereum = undefined
26
32
  mockWindow.UWCBridgeChildInitialized = false
@@ -66,7 +72,9 @@ describe('EIP-6963 Discovery', () => {
66
72
 
67
73
  const result = await discoverWallets()
68
74
 
69
- expect(result).toEqual(mockBridgeWallets)
75
+ expect(result).toEqual(
76
+ mockBridgeWallets.map(wallet => ({ ...wallet, source: 'bridge' }))
77
+ )
70
78
  })
71
79
 
72
80
  it('should return empty array when bridge polling times out', async () => {
@@ -306,7 +314,108 @@ describe('EIP-6963 Discovery', () => {
306
314
 
307
315
  const result = await discoverWallets()
308
316
 
309
- expect(result).toEqual(mockBridgeWallets)
317
+ expect(result).toEqual(
318
+ mockBridgeWallets.map(wallet => ({ ...wallet, source: 'bridge' }))
319
+ )
320
+ })
321
+ })
322
+
323
+ describe('wallet provenance tagging', () => {
324
+ it('tags bridge-sourced wallets as "bridge"', async () => {
325
+ mockWindow.UWCBridgeChildInitialized = true
326
+ mockWindow.eip6963Wallets = [
327
+ {
328
+ uuid: 'bridge-wallet-1',
329
+ name: 'Bridge Wallet',
330
+ icon: 'bridge-icon',
331
+ rdns: 'com.bridge.wallet',
332
+ provider: { request: vi.fn() }
333
+ }
334
+ ]
335
+
336
+ const result = await discoverWallets()
337
+
338
+ expect(result).toHaveLength(1)
339
+ expect(result[0].source).toBe('bridge')
340
+ })
341
+
342
+ it('tags locally-announced wallets as "local"', async () => {
343
+ mockWindow.UWCBridgeChildInitialized = false
344
+
345
+ let announceHandler: ((event: unknown) => void) | undefined
346
+ mockWindow.addEventListener.mockImplementation(
347
+ (type: string, handler: (event: unknown) => void) => {
348
+ if (type === 'eip6963:announceProvider') announceHandler = handler
349
+ }
350
+ )
351
+ mockWindow.dispatchEvent.mockImplementation((event: Event) => {
352
+ if (event.type === 'eip6963:requestProvider' && announceHandler) {
353
+ announceHandler({
354
+ type: 'eip6963:announceProvider',
355
+ detail: {
356
+ info: {
357
+ uuid: 'local-wallet-1',
358
+ name: 'Local Wallet',
359
+ icon: 'local-icon',
360
+ rdns: 'io.local.wallet'
361
+ },
362
+ provider: { request: vi.fn() }
363
+ }
364
+ })
365
+ }
366
+ })
367
+
368
+ const result = await discoverWallets()
369
+
370
+ expect(result).toHaveLength(1)
371
+ expect(result[0].source).toBe('local')
372
+ })
373
+
374
+ it('tags the legacy window.ethereum match as "local"', async () => {
375
+ const mockDetectedWallets: any[] = []
376
+ const mockLegacyProvider = {
377
+ request: vi.fn(),
378
+ on: vi.fn(),
379
+ removeListener: vi.fn(),
380
+ isMetaMask: true
381
+ }
382
+ mockWindow.ethereum = mockLegacyProvider
383
+
384
+ vi.doMock('./eip6963-discovery', async () => {
385
+ const actual = await vi.importActual('./eip6963-discovery')
386
+ return {
387
+ ...actual,
388
+ discoverWallets: vi.fn().mockResolvedValue(mockDetectedWallets)
389
+ }
390
+ })
391
+
392
+ const { getAvailableWallets } = await import('./eip6963-discovery')
393
+ const result = await getAvailableWallets([
394
+ {
395
+ id: 'metamask',
396
+ name: 'MetaMask',
397
+ metadata: {
398
+ uuid: 'metamask-uuid',
399
+ icon: 'metamask-icon',
400
+ rdns: 'io.metamask'
401
+ },
402
+ extensionInjectedProvider: {
403
+ supportedNetworkIds: ['eip155:1'] as const,
404
+ namespaceMetaData: {
405
+ eip155: {
406
+ eip155Name: 'MetaMask',
407
+ injectedId: 'isMetaMask',
408
+ supportsAddingNetworks: true,
409
+ requiresUserApprovalOnNetworkSwitch: false
410
+ }
411
+ },
412
+ requiresUserApprovalOnNamespaceSwitch: false
413
+ }
414
+ }
415
+ ])
416
+
417
+ expect(result).toHaveLength(1)
418
+ expect(result[0].source).toBe('local')
310
419
  })
311
420
  })
312
421
  })
@@ -61,6 +61,19 @@ export interface DetectedWallet {
61
61
  icon: string
62
62
  rdns: string
63
63
  provider: EthereumProvider
64
+ /**
65
+ * Which injection context this wallet's uuid/provider came from. `'bridge'`
66
+ * means the provider lives in the TOP frame (marshalled via
67
+ * `window.eip6963Wallets` by `@meshconnect/uwc-bridge-child`) — connecting
68
+ * through it grants the wallet permission to the embedder's origin.
69
+ * `'local'` means it was discovered by THIS frame's own EIP-6963 listener
70
+ * (either the bridge yielded nothing and we fell back, or we're not
71
+ * bridged at all) — connecting through it grants permission to the
72
+ * iframe's own origin. The two are never interchangeable: a listener
73
+ * attached to the wrong context's provider silently never fires, since
74
+ * wallet extensions scope `accountsChanged` per origin.
75
+ */
76
+ source: 'bridge' | 'local'
64
77
  }
65
78
 
66
79
  /**
@@ -89,8 +102,13 @@ async function pollForBridgeWallets(): Promise<DetectedWallet[]> {
89
102
  if (window.eip6963Wallets && Array.isArray(window.eip6963Wallets)) {
90
103
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
91
104
  // @ts-ignore
92
- const bridgeWallets = window.eip6963Wallets as DetectedWallet[]
93
- resolve(bridgeWallets)
105
+ const bridgeWallets = window.eip6963Wallets as Array<
106
+ Omit<DetectedWallet, 'source'>
107
+ >
108
+ // The bridge child marshals entries without a `source` tag (it predates
109
+ // this field) — every entry it produces is, by construction, sourced
110
+ // from the TOP frame's BridgeParent discovery.
111
+ resolve(bridgeWallets.map(wallet => ({ ...wallet, source: 'bridge' })))
94
112
  return
95
113
  }
96
114
 
@@ -142,7 +160,10 @@ export async function discoverWallets(): Promise<DetectedWallet[]> {
142
160
  name: info.name,
143
161
  icon: info.icon,
144
162
  rdns: info.rdns,
145
- provider
163
+ provider,
164
+ // Announced directly to THIS frame's own listener, not relayed via
165
+ // the bridge — see the DetectedWallet.source doc above.
166
+ source: 'local'
146
167
  })
147
168
  }
148
169
  }
@@ -207,7 +228,10 @@ export async function getAvailableWallets(
207
228
  ?.eip155Name || matchedWallet.name,
208
229
  icon: matchedWallet.metadata['icon'] || '',
209
230
  rdns: matchedWallet.metadata['rdns'] || '',
210
- provider: legacyProvider
231
+ provider: legacyProvider,
232
+ // window.ethereum is always read from THIS frame's own global —
233
+ // see the DetectedWallet.source doc above.
234
+ source: 'local'
211
235
  })
212
236
  }
213
237
  }