@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
@@ -35,6 +35,7 @@ function makeNetwork(id: string, namespace: string): Network {
35
35
  function makeEthService() {
36
36
  return {
37
37
  getAccount: vi.fn().mockReturnValue(null),
38
+ getLiveAccount: vi.fn().mockResolvedValue(null),
38
39
  findWalletByUuid: vi.fn().mockReturnValue(null),
39
40
  checkExistingConnection: vi.fn().mockResolvedValue(null),
40
41
  connect: vi.fn().mockResolvedValue('0xABC'),
@@ -55,6 +56,7 @@ function makeEthService() {
55
56
  function makeSolanaService() {
56
57
  return {
57
58
  getAccount: vi.fn().mockReturnValue(null),
59
+ getLiveAccount: vi.fn().mockResolvedValue(null),
58
60
  findWalletByUuid: vi.fn().mockReturnValue(null),
59
61
  checkExistingConnection: vi.fn().mockResolvedValue(null),
60
62
  connect: vi.fn().mockResolvedValue('SolAddr1'),
@@ -74,6 +76,7 @@ function makeSolanaService() {
74
76
  function makeTronService() {
75
77
  return {
76
78
  getAccount: vi.fn().mockReturnValue(null),
79
+ getLiveAccount: vi.fn().mockResolvedValue(null),
77
80
  findWalletByUuid: vi.fn().mockReturnValue(null),
78
81
  checkExistingConnection: vi.fn().mockResolvedValue(null),
79
82
  connect: vi.fn().mockResolvedValue('TronAddr1'),
@@ -1114,9 +1117,13 @@ describe('ConnectionManager — wallet switch releases the other wallet’s conn
1114
1117
  walletBProvider
1115
1118
  )
1116
1119
  expect(result.address).toBe('0xBBB')
1120
+ // Third arg is the connected wallet's uuid — captured for provenance /
1121
+ // account-sync (MFS-778 branch's `setConnectionState(provider, account,
1122
+ // uuid)`), which post-dates this main-side test.
1117
1123
  expect(ethService.setConnectionState).toHaveBeenCalledWith(
1118
1124
  walletBProvider,
1119
- '0xBBB'
1125
+ '0xBBB',
1126
+ 'wallet-b-eip155'
1120
1127
  )
1121
1128
  // The release is surfaced to the telemetry sink with the namespaces dropped.
1122
1129
  expect(onWalletConnectionsReleased).toHaveBeenCalledTimes(1)
@@ -1210,3 +1217,333 @@ describe('ConnectionManager — wallet switch releases the other wallet’s conn
1210
1217
  expect(onWalletConnectionsReleased).not.toHaveBeenCalled()
1211
1218
  })
1212
1219
  })
1220
+
1221
+ // Root cause: on an in-wallet account switch, switchNetwork's return used to
1222
+ // read the frozen connect-time cache (service.getAccount()) for both `address`
1223
+ // and `availableAddresses`, so a post-switch verify/re-auth got bound to the
1224
+ // STALE account while signMessage reported the LIVE one ("Wallet mismatch").
1225
+ // switchNetwork must return LIVE reads (service.getLiveAccount()) instead.
1226
+ describe('ConnectionManager — switchNetwork returns LIVE addresses (not connect-time cache)', () => {
1227
+ let ethService: ReturnType<typeof makeEthService>
1228
+ let solanaService: ReturnType<typeof makeSolanaService>
1229
+ let tronService: ReturnType<typeof makeTronService>
1230
+ let tonService: ReturnType<typeof makeTonService>
1231
+ let manager: ConnectionManager
1232
+
1233
+ beforeEach(() => {
1234
+ ethService = makeEthService()
1235
+ solanaService = makeSolanaService()
1236
+ tronService = makeTronService()
1237
+ tonService = makeTonService()
1238
+ manager = new ConnectionManager(
1239
+ ethService as any,
1240
+ solanaService as any,
1241
+ tronService as any,
1242
+ tonService as any
1243
+ )
1244
+ })
1245
+
1246
+ it('returns the LIVE eip155 address, not the stale connect-time cache, on a same-namespace switch', async () => {
1247
+ // Already connected on eip155 (same-namespace switch path).
1248
+ ethService.getConnectedProvider.mockReturnValue({})
1249
+ // Cached/connect-time account is stale...
1250
+ ethService.getAccount.mockReturnValue('0xOLD')
1251
+ // ...but the wallet's live account has since switched.
1252
+ ethService.getLiveAccount.mockResolvedValue('0xNEW')
1253
+
1254
+ const provider = makeProvider({ eip155: {} })
1255
+
1256
+ const result = await manager.switchNetwork(
1257
+ makeNetwork('eip155:1', 'eip155'),
1258
+ provider
1259
+ )
1260
+
1261
+ expect(result.address).toBe('0xNEW')
1262
+ expect(result.availableAddresses).toEqual([
1263
+ { address: '0xNEW', networkId: 'eip155:1' }
1264
+ ])
1265
+ // The stale cache must not leak into the result.
1266
+ expect(result.availableAddresses.some(a => a.address === '0xOLD')).toBe(
1267
+ false
1268
+ )
1269
+ })
1270
+
1271
+ it('omits a namespace whose live account is null, even if it has a cached account (parity with the cached collector)', async () => {
1272
+ ethService.getConnectedProvider.mockReturnValue({})
1273
+ ethService.getAccount.mockReturnValue('0xOLD')
1274
+ ethService.getLiveAccount.mockResolvedValue('0xNEW')
1275
+
1276
+ // Solana was connected in this session (has a cached account)...
1277
+ solanaService.getAccount.mockReturnValue('SolCachedAddr')
1278
+ // ...but its live read now resolves null (e.g. disconnected wallet).
1279
+ solanaService.getLiveAccount.mockResolvedValue(null)
1280
+
1281
+ const provider = makeProvider({ eip155: {}, solana: {} })
1282
+
1283
+ const result = await manager.switchNetwork(
1284
+ makeNetwork('eip155:1', 'eip155'),
1285
+ provider
1286
+ )
1287
+
1288
+ const namespaces = result.availableAddresses.map(
1289
+ a => a.networkId.split(':')[0]
1290
+ )
1291
+ expect(namespaces).toContain('eip155')
1292
+ expect(namespaces).not.toContain('solana')
1293
+ expect(
1294
+ result.availableAddresses.some(a => a.address === 'SolCachedAddr')
1295
+ ).toBe(false)
1296
+ })
1297
+
1298
+ it('behaves identically to the cached path when the live account equals the cached account (no regression)', async () => {
1299
+ ethService.getConnectedProvider.mockReturnValue({})
1300
+ ethService.getAccount.mockReturnValue('0xSAME')
1301
+ ethService.getLiveAccount.mockResolvedValue('0xSAME')
1302
+
1303
+ const provider = makeProvider({ eip155: {} })
1304
+
1305
+ const result = await manager.switchNetwork(
1306
+ makeNetwork('eip155:1', 'eip155'),
1307
+ provider
1308
+ )
1309
+
1310
+ expect(result.address).toBe('0xSAME')
1311
+ expect(result.availableAddresses).toEqual([
1312
+ { address: '0xSAME', networkId: 'eip155:1' }
1313
+ ])
1314
+ })
1315
+ })
1316
+
1317
+ describe('ConnectionManager — bounded secondary gathers + step telemetry (ONC-183)', () => {
1318
+ let ethService: ReturnType<typeof makeEthService>
1319
+ let solanaService: ReturnType<typeof makeSolanaService>
1320
+ let tronService: ReturnType<typeof makeTronService>
1321
+ let tonService: ReturnType<typeof makeTonService>
1322
+ let onConnectStep: ReturnType<typeof vi.fn>
1323
+
1324
+ function build(secondaryGatherTimeoutMs?: number) {
1325
+ return new ConnectionManager(
1326
+ ethService as any,
1327
+ solanaService as any,
1328
+ tronService as any,
1329
+ tonService as any,
1330
+ {
1331
+ onConnectStep,
1332
+ ...(secondaryGatherTimeoutMs !== undefined && {
1333
+ secondaryGatherTimeoutMs
1334
+ })
1335
+ }
1336
+ )
1337
+ }
1338
+
1339
+ /** Steps of one kind, in emit order. */
1340
+ function stepsOf(step: string) {
1341
+ return onConnectStep.mock.calls
1342
+ .map(([info]) => info)
1343
+ .filter(info => info.step === step)
1344
+ }
1345
+
1346
+ beforeEach(() => {
1347
+ vi.useFakeTimers()
1348
+ ethService = makeEthService()
1349
+ solanaService = makeSolanaService()
1350
+ tronService = makeTronService()
1351
+ tonService = makeTonService()
1352
+ onConnectStep = vi.fn()
1353
+ })
1354
+
1355
+ afterEach(() => {
1356
+ vi.useRealTimers()
1357
+ })
1358
+
1359
+ it('completes the connect when a secondary Solana gather never answers', async () => {
1360
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1361
+ // The motivating hang: MetaMask's Solana Snap prompt is opened and never
1362
+ // answered, AFTER the user already approved EVM.
1363
+ solanaService.findWalletByUuid.mockReturnValue({ adapter: {} })
1364
+ solanaService.connect.mockReturnValue(new Promise(() => {}))
1365
+
1366
+ const manager = build(1000)
1367
+ const provider = makeProvider({
1368
+ eip155: { detectedWallet: { uuid: 'mm-eip155' } },
1369
+ solana: { detectedWallet: { uuid: 'mm-solana' } }
1370
+ })
1371
+
1372
+ const pending = manager.connectEthereum(
1373
+ makeNetwork('eip155:1', 'eip155'),
1374
+ provider
1375
+ )
1376
+ await vi.advanceTimersByTimeAsync(1000)
1377
+ const result = await pending
1378
+
1379
+ // The namespace the user asked for still connects; only the abandoned
1380
+ // secondary leg is dropped.
1381
+ expect(result.address).toBe('0xABC')
1382
+ expect(result.availableAddresses).toEqual([
1383
+ { address: '0xABC', networkId: 'eip155:1' }
1384
+ ])
1385
+ })
1386
+
1387
+ it('reports the abandoned gather as a timedOut secondaryGather step', async () => {
1388
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1389
+ solanaService.findWalletByUuid.mockReturnValue({ adapter: {} })
1390
+ solanaService.connect.mockReturnValue(new Promise(() => {}))
1391
+
1392
+ const manager = build(1000)
1393
+ const pending = manager.connectEthereum(
1394
+ makeNetwork('eip155:1', 'eip155'),
1395
+ makeProvider({
1396
+ eip155: { detectedWallet: { uuid: 'mm-eip155' } },
1397
+ solana: { detectedWallet: { uuid: 'mm-solana' } }
1398
+ })
1399
+ )
1400
+ await vi.advanceTimersByTimeAsync(1000)
1401
+ await pending
1402
+
1403
+ const solanaGather = stepsOf('secondaryGather').find(
1404
+ s => s.namespace === 'solana'
1405
+ )
1406
+ expect(solanaGather).toMatchObject({
1407
+ outcome: 'timedOut',
1408
+ namespace: 'solana',
1409
+ timeoutMs: 1000
1410
+ })
1411
+ })
1412
+
1413
+ it('gives each namespace its own budget — a hung leg does not starve later ones', async () => {
1414
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1415
+ solanaService.findWalletByUuid.mockReturnValue({ adapter: {} })
1416
+ solanaService.connect.mockReturnValue(new Promise(() => {}))
1417
+ // Tron is gathered AFTER the hung Solana leg and must still be reached.
1418
+ tronService.findWalletByUuid.mockReturnValue({ provider: {} })
1419
+ tronService.checkExistingConnection.mockResolvedValue('TronAddr1')
1420
+
1421
+ const manager = build(1000)
1422
+ const pending = manager.connectEthereum(
1423
+ makeNetwork('eip155:1', 'eip155'),
1424
+ makeProvider({
1425
+ eip155: { detectedWallet: { uuid: 'mm-eip155' } },
1426
+ solana: { detectedWallet: { uuid: 'mm-solana' } },
1427
+ tron: { detectedWallet: { uuid: 'mm-tron' } }
1428
+ })
1429
+ )
1430
+ await vi.advanceTimersByTimeAsync(1000)
1431
+ const result = await pending
1432
+
1433
+ expect(
1434
+ result.availableAddresses.some(a => a.networkId.startsWith('tron:'))
1435
+ ).toBe(true)
1436
+ })
1437
+
1438
+ it('reports providerDetection as failed when the wallet was never detected', async () => {
1439
+ // No detectedWallet uuid — the retryable "provider was not detected" class.
1440
+ const manager = build()
1441
+ await expect(
1442
+ manager.connectEthereum(
1443
+ makeNetwork('eip155:1', 'eip155'),
1444
+ makeProvider({ eip155: { injectedId: 'isMetaMask' } })
1445
+ )
1446
+ ).rejects.toThrow()
1447
+
1448
+ expect(stepsOf('providerDetection')).toEqual([
1449
+ expect.objectContaining({ outcome: 'failed', namespace: 'eip155' })
1450
+ ])
1451
+ // The wallet was never reached, so no authorizing call was attempted.
1452
+ expect(stepsOf('primaryConnect')).toEqual([])
1453
+ })
1454
+
1455
+ it('does not let a throwing telemetry sink break a connect', async () => {
1456
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1457
+ onConnectStep.mockImplementation(() => {
1458
+ throw new Error('sink exploded')
1459
+ })
1460
+
1461
+ const manager = build()
1462
+ const result = await manager.connectEthereum(
1463
+ makeNetwork('eip155:1', 'eip155'),
1464
+ makeProvider({ eip155: { detectedWallet: { uuid: 'mm-eip155' } } })
1465
+ )
1466
+ expect(result.address).toBe('0xABC')
1467
+ })
1468
+ })
1469
+
1470
+ describe('ConnectionManager — secondary gather outcome fidelity (ONC-183 review)', () => {
1471
+ let ethService: ReturnType<typeof makeEthService>
1472
+ let solanaService: ReturnType<typeof makeSolanaService>
1473
+ let tronService: ReturnType<typeof makeTronService>
1474
+ let tonService: ReturnType<typeof makeTonService>
1475
+ let onConnectStep: ReturnType<typeof vi.fn>
1476
+
1477
+ function build() {
1478
+ return new ConnectionManager(
1479
+ ethService as any,
1480
+ solanaService as any,
1481
+ tronService as any,
1482
+ tonService as any,
1483
+ { onConnectStep }
1484
+ )
1485
+ }
1486
+
1487
+ function gatherStep(namespace: string) {
1488
+ return onConnectStep.mock.calls
1489
+ .map(([info]) => info)
1490
+ .find(i => i.step === 'secondaryGather' && i.namespace === namespace)
1491
+ }
1492
+
1493
+ beforeEach(() => {
1494
+ ethService = makeEthService()
1495
+ solanaService = makeSolanaService()
1496
+ tronService = makeTronService()
1497
+ tonService = makeTonService()
1498
+ onConnectStep = vi.fn()
1499
+ })
1500
+
1501
+ it('reports a DECLINED secondary Solana prompt as failed, not ok', async () => {
1502
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1503
+ solanaService.findWalletByUuid.mockReturnValue({ adapter: {} })
1504
+ solanaService.checkExistingConnection.mockResolvedValue(null)
1505
+ // The helper swallows this internally — it must NOT surface as `ok`.
1506
+ solanaService.connect.mockRejectedValue(
1507
+ new Error('User rejected the request')
1508
+ )
1509
+
1510
+ const result = await build().connectEthereum(
1511
+ makeNetwork('eip155:1', 'eip155'),
1512
+ makeProvider({
1513
+ eip155: { detectedWallet: { uuid: 'mm-eip155' } },
1514
+ solana: { detectedWallet: { uuid: 'mm-solana' } }
1515
+ })
1516
+ )
1517
+
1518
+ // Connect still succeeds — the swallow keeps best-effort behaviour intact.
1519
+ expect(result.address).toBe('0xABC')
1520
+ expect(gatherStep('solana')).toMatchObject({ outcome: 'failed' })
1521
+ })
1522
+
1523
+ it('still reports ok for a clean gather', async () => {
1524
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1525
+ solanaService.findWalletByUuid.mockReturnValue({ adapter: {} })
1526
+ solanaService.checkExistingConnection.mockResolvedValue('SolAddr1')
1527
+
1528
+ await build().connectEthereum(
1529
+ makeNetwork('eip155:1', 'eip155'),
1530
+ makeProvider({
1531
+ eip155: { detectedWallet: { uuid: 'mm-eip155' } },
1532
+ solana: { detectedWallet: { uuid: 'mm-solana' } }
1533
+ })
1534
+ )
1535
+
1536
+ expect(gatherStep('solana')).toMatchObject({ outcome: 'ok' })
1537
+ })
1538
+
1539
+ it('reports ok for a namespace with nothing to gather (no wallet detected)', async () => {
1540
+ ethService.findWalletByUuid.mockReturnValue({ provider: {} })
1541
+ // No solana detectedWallet → the helper is a clean no-op, not a failure.
1542
+ await build().connectEthereum(
1543
+ makeNetwork('eip155:1', 'eip155'),
1544
+ makeProvider({ eip155: { detectedWallet: { uuid: 'mm-eip155' } } })
1545
+ )
1546
+
1547
+ expect(gatherStep('solana')).toMatchObject({ outcome: 'ok' })
1548
+ })
1549
+ })