@meshconnect/uwc-injected-connector 0.27.4 → 0.27.5
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/dist/injected-connector.d.ts.map +1 -1
- package/dist/injected-connector.js +7 -3
- package/dist/injected-connector.js.map +1 -1
- package/dist/services/connection-manager.d.ts +37 -1
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js +104 -9
- package/dist/services/connection-manager.js.map +1 -1
- package/dist/utils/error-utils.d.ts +9 -0
- package/dist/utils/error-utils.d.ts.map +1 -1
- package/dist/utils/error-utils.js +17 -0
- package/dist/utils/error-utils.js.map +1 -1
- package/package.json +6 -6
- package/src/injected-connector.test.ts +13 -1
- package/src/injected-connector.ts +14 -3
- package/src/services/connection-manager.test.ts +441 -0
- package/src/services/connection-manager.ts +190 -34
- package/src/utils/error-utils.test.ts +55 -1
- package/src/utils/error-utils.ts +17 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/utils/error-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/utils/error-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@meshconnect/uwc-injected-connector",
|
|
3
|
-
"version": "0.27.
|
|
3
|
+
"version": "0.27.5",
|
|
4
4
|
"description": "Injected connector for Universal Wallet Connector",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"uuid": "^14.0.2",
|
|
29
29
|
"viem": "^2.56.5",
|
|
30
30
|
"@meshconnect/uwc-bridge-child": "0.6.1",
|
|
31
|
-
"@meshconnect/uwc-constants": "0.8.
|
|
32
|
-
"@meshconnect/uwc-ton-connector": "0.9.
|
|
33
|
-
"@meshconnect/uwc-bitcoin": "0.5.
|
|
34
|
-
"@meshconnect/uwc-tron-connector": "0.7.
|
|
35
|
-
"@meshconnect/uwc-types": "0.33.
|
|
31
|
+
"@meshconnect/uwc-constants": "0.8.7",
|
|
32
|
+
"@meshconnect/uwc-ton-connector": "0.9.15",
|
|
33
|
+
"@meshconnect/uwc-bitcoin": "0.5.9",
|
|
34
|
+
"@meshconnect/uwc-tron-connector": "0.7.19",
|
|
35
|
+
"@meshconnect/uwc-types": "0.33.3"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"typescript": "^7.0.2"
|
|
@@ -378,11 +378,23 @@ describe('InjectedConnector', () => {
|
|
|
378
378
|
]
|
|
379
379
|
})
|
|
380
380
|
|
|
381
|
+
// The attempt begun for this connect reaches its EVM request
|
|
382
|
+
// (ONC-2390).
|
|
383
|
+
const attempt = { generation: 1 }
|
|
384
|
+
mockConnManager.beginAttempt.mockReturnValue(attempt)
|
|
385
|
+
|
|
381
386
|
const result = await connector.connect(mockNetwork, mockEthProvider)
|
|
382
387
|
|
|
388
|
+
expect(mockConnManager.checkExistingConnections).toHaveBeenCalledWith(
|
|
389
|
+
'eip155',
|
|
390
|
+
mockEthProvider,
|
|
391
|
+
undefined,
|
|
392
|
+
{ silentOnly: false }
|
|
393
|
+
)
|
|
383
394
|
expect(mockConnManager.connectEthereum).toHaveBeenCalledWith(
|
|
384
395
|
mockNetwork,
|
|
385
|
-
mockEthProvider
|
|
396
|
+
mockEthProvider,
|
|
397
|
+
attempt
|
|
386
398
|
)
|
|
387
399
|
expect(result.address).toBe('0xnewaddress')
|
|
388
400
|
})
|
|
@@ -51,6 +51,7 @@ import {
|
|
|
51
51
|
} from './services/bitcoin/bitcoin-wallet-service'
|
|
52
52
|
import { StorageService } from './services/storage-service'
|
|
53
53
|
import {
|
|
54
|
+
type ConnectAttempt,
|
|
54
55
|
ConnectionManager,
|
|
55
56
|
DEFAULT_SECONDARY_GATHER_TIMEOUT_MS
|
|
56
57
|
} from './services/connection-manager'
|
|
@@ -408,6 +409,10 @@ export class InjectedConnector implements Connector {
|
|
|
408
409
|
// doesn't satisfy the caller's pin must NOT be reported as an existing
|
|
409
410
|
// connection, or the prompting connect that could authorize the right one
|
|
410
411
|
// is skipped and the caller is stuck with an address it already rejected.
|
|
412
|
+
//
|
|
413
|
+
// Begun first, so an earlier attempt still running stops being live; its
|
|
414
|
+
// generation is carried to the primary request (ONC-2390).
|
|
415
|
+
const attempt = this.connectionManager.beginAttempt()
|
|
411
416
|
const { address: existingAddress, availableAddresses } =
|
|
412
417
|
await this.connectionManager.checkExistingConnections(
|
|
413
418
|
targetNamespace,
|
|
@@ -438,7 +443,8 @@ export class InjectedConnector implements Connector {
|
|
|
438
443
|
targetNamespace,
|
|
439
444
|
network,
|
|
440
445
|
provider,
|
|
441
|
-
requiredAddresses
|
|
446
|
+
requiredAddresses,
|
|
447
|
+
attempt
|
|
442
448
|
)
|
|
443
449
|
}
|
|
444
450
|
|
|
@@ -463,11 +469,16 @@ export class InjectedConnector implements Connector {
|
|
|
463
469
|
targetNamespace: Namespace,
|
|
464
470
|
network: Network,
|
|
465
471
|
provider: ExtensionInjectedProvider | IntegratedBrowserInjectedProvider,
|
|
466
|
-
requiredAddresses?: readonly string[]
|
|
472
|
+
requiredAddresses?: readonly string[],
|
|
473
|
+
attempt?: ConnectAttempt
|
|
467
474
|
): Promise<ConnectorResult> {
|
|
468
475
|
switch (targetNamespace) {
|
|
469
476
|
case 'eip155':
|
|
470
|
-
return await this.connectionManager.connectEthereum(
|
|
477
|
+
return await this.connectionManager.connectEthereum(
|
|
478
|
+
network,
|
|
479
|
+
provider,
|
|
480
|
+
attempt
|
|
481
|
+
)
|
|
471
482
|
|
|
472
483
|
case 'solana':
|
|
473
484
|
return await this.connectionManager.connectSolana(network, provider)
|
|
@@ -2372,3 +2372,444 @@ describe('ConnectionManager.checkExistingConnections — silentOnly, other targe
|
|
|
2372
2372
|
})
|
|
2373
2373
|
})
|
|
2374
2374
|
})
|
|
2375
|
+
|
|
2376
|
+
describe('ConnectionManager — EVM connect behind an open wallet window (ONC-2390)', () => {
|
|
2377
|
+
// Production's MetaMask config: the pre-connect Solana gather opens
|
|
2378
|
+
// MetaMask's permission window before EVM is asked. If the user takes longer
|
|
2379
|
+
// than the gather deadline, UWC used to ask for EVM straight away and
|
|
2380
|
+
// MetaMask refused it with -32002 because the window was still open
|
|
2381
|
+
// (ONC-2254). Now the EVM connect waits for that window, then asks again.
|
|
2382
|
+
let ethService: ReturnType<typeof makeEthService>
|
|
2383
|
+
let solanaService: ReturnType<typeof makeSolanaService>
|
|
2384
|
+
let onConnectStep: ReturnType<typeof vi.fn>
|
|
2385
|
+
|
|
2386
|
+
const ALREADY_PENDING = Object.assign(
|
|
2387
|
+
new Error(
|
|
2388
|
+
"Request of type 'wallet_requestPermissions' already pending for origin https://link.example. Please wait."
|
|
2389
|
+
),
|
|
2390
|
+
{ code: -32002 }
|
|
2391
|
+
)
|
|
2392
|
+
const provider = () =>
|
|
2393
|
+
makeProvider({
|
|
2394
|
+
eip155: { detectedWallet: { uuid: 'mm-eip155' } },
|
|
2395
|
+
solana: { detectedWallet: { uuid: 'mm-solana' } }
|
|
2396
|
+
})
|
|
2397
|
+
const network = makeNetwork('eip155:1', 'eip155')
|
|
2398
|
+
|
|
2399
|
+
function build(
|
|
2400
|
+
bitcoinService = makeBitcoinService(),
|
|
2401
|
+
tonService = makeTonService()
|
|
2402
|
+
) {
|
|
2403
|
+
return new ConnectionManager(
|
|
2404
|
+
ethService as any,
|
|
2405
|
+
solanaService as any,
|
|
2406
|
+
makeTronService() as any,
|
|
2407
|
+
tonService as any,
|
|
2408
|
+
bitcoinService as any,
|
|
2409
|
+
{ onConnectStep, secondaryGatherTimeoutMs: 1000 }
|
|
2410
|
+
)
|
|
2411
|
+
}
|
|
2412
|
+
|
|
2413
|
+
/** A pre-connect check, as InjectedConnector.connect runs it. */
|
|
2414
|
+
function check(manager: ConnectionManager, withProvider = provider()) {
|
|
2415
|
+
return manager.checkExistingConnections('eip155', withProvider)
|
|
2416
|
+
}
|
|
2417
|
+
|
|
2418
|
+
/**
|
|
2419
|
+
* Starts an attempt whose Solana window opens and stays open, unanswered.
|
|
2420
|
+
* Returns the attempt and a way to answer the window.
|
|
2421
|
+
*/
|
|
2422
|
+
function openSolanaPrompt(
|
|
2423
|
+
manager: ConnectionManager,
|
|
2424
|
+
withProvider = provider()
|
|
2425
|
+
) {
|
|
2426
|
+
let answer!: (address: string | Error) => void
|
|
2427
|
+
solanaService.connect.mockImplementationOnce(
|
|
2428
|
+
() =>
|
|
2429
|
+
new Promise((resolve, reject) => {
|
|
2430
|
+
answer = value =>
|
|
2431
|
+
value instanceof Error ? reject(value) : resolve(value)
|
|
2432
|
+
})
|
|
2433
|
+
)
|
|
2434
|
+
const attempt = manager.beginAttempt()
|
|
2435
|
+
const checking = check(manager, withProvider)
|
|
2436
|
+
return {
|
|
2437
|
+
attempt,
|
|
2438
|
+
checking,
|
|
2439
|
+
answer: (value: string | Error) => answer(value)
|
|
2440
|
+
}
|
|
2441
|
+
}
|
|
2442
|
+
|
|
2443
|
+
/**
|
|
2444
|
+
* Starts an attempt whose Solana window stays open past its gather
|
|
2445
|
+
* deadline. Returns the attempt and a way to answer the window.
|
|
2446
|
+
*/
|
|
2447
|
+
async function timeOutSolanaPrompt(manager: ConnectionManager) {
|
|
2448
|
+
let answer!: (address: string | Error) => void
|
|
2449
|
+
solanaService.connect.mockImplementationOnce(
|
|
2450
|
+
() =>
|
|
2451
|
+
new Promise((resolve, reject) => {
|
|
2452
|
+
answer = value =>
|
|
2453
|
+
value instanceof Error ? reject(value) : resolve(value)
|
|
2454
|
+
})
|
|
2455
|
+
)
|
|
2456
|
+
const attempt = manager.beginAttempt()
|
|
2457
|
+
const checking = check(manager)
|
|
2458
|
+
await vi.advanceTimersByTimeAsync(1000)
|
|
2459
|
+
expect(await checking).toEqual({ address: null, availableAddresses: [] })
|
|
2460
|
+
return { attempt, answer: (value: string | Error) => answer(value) }
|
|
2461
|
+
}
|
|
2462
|
+
|
|
2463
|
+
function stepsOf(step: string) {
|
|
2464
|
+
return onConnectStep.mock.calls
|
|
2465
|
+
.map(([info]) => info)
|
|
2466
|
+
.filter(info => info.step === step)
|
|
2467
|
+
}
|
|
2468
|
+
|
|
2469
|
+
beforeEach(() => {
|
|
2470
|
+
vi.useFakeTimers()
|
|
2471
|
+
ethService = makeEthService()
|
|
2472
|
+
ethService.findWalletByUuid.mockReturnValue({ provider: {} })
|
|
2473
|
+
solanaService = makeSolanaService()
|
|
2474
|
+
solanaService.findWalletByUuid.mockReturnValue({ adapter: {} })
|
|
2475
|
+
// A gathered Solana account is read back through getAccount().
|
|
2476
|
+
solanaService.setConnectionState.mockImplementation((_a, address) =>
|
|
2477
|
+
solanaService.getAccount.mockReturnValue(address)
|
|
2478
|
+
)
|
|
2479
|
+
onConnectStep = vi.fn()
|
|
2480
|
+
})
|
|
2481
|
+
|
|
2482
|
+
afterEach(() => {
|
|
2483
|
+
vi.useRealTimers()
|
|
2484
|
+
})
|
|
2485
|
+
|
|
2486
|
+
it.each([
|
|
2487
|
+
['direct', ALREADY_PENDING],
|
|
2488
|
+
// Embedded (bridge) mode keeps only the message.
|
|
2489
|
+
['bridged', new Error(ALREADY_PENDING.message)]
|
|
2490
|
+
])(
|
|
2491
|
+
'waits for the open Solana window, then connects EVM with the Solana address (%s)',
|
|
2492
|
+
async (_mode, refusal) => {
|
|
2493
|
+
const manager = build()
|
|
2494
|
+
const { attempt, answer } = await timeOutSolanaPrompt(manager)
|
|
2495
|
+
ethService.connect.mockRejectedValueOnce(refusal)
|
|
2496
|
+
|
|
2497
|
+
const connecting = manager.connectEthereum(network, provider(), attempt)
|
|
2498
|
+
await vi.advanceTimersByTimeAsync(5000)
|
|
2499
|
+
// Still waiting on the user: no second EVM request while the window is open.
|
|
2500
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2501
|
+
|
|
2502
|
+
answer('SolAddr1')
|
|
2503
|
+
const result = await connecting
|
|
2504
|
+
|
|
2505
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2506
|
+
expect(result.address).toBe('0xABC')
|
|
2507
|
+
expect(result.availableAddresses).toEqual(
|
|
2508
|
+
expect.arrayContaining([
|
|
2509
|
+
{ address: '0xABC', networkId: 'eip155:1' },
|
|
2510
|
+
{
|
|
2511
|
+
address: 'SolAddr1',
|
|
2512
|
+
networkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
|
|
2513
|
+
}
|
|
2514
|
+
])
|
|
2515
|
+
)
|
|
2516
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([
|
|
2517
|
+
expect.objectContaining({ outcome: 'ok', namespace: 'solana' })
|
|
2518
|
+
])
|
|
2519
|
+
}
|
|
2520
|
+
)
|
|
2521
|
+
|
|
2522
|
+
it('asks for EVM again when the user declines the late Solana window', async () => {
|
|
2523
|
+
const manager = build()
|
|
2524
|
+
const { attempt, answer } = await timeOutSolanaPrompt(manager)
|
|
2525
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2526
|
+
|
|
2527
|
+
const connecting = manager.connectEthereum(network, provider(), attempt)
|
|
2528
|
+
answer(new Error('User rejected the request.'))
|
|
2529
|
+
const result = await connecting
|
|
2530
|
+
|
|
2531
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2532
|
+
expect(result.address).toBe('0xABC')
|
|
2533
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([
|
|
2534
|
+
expect.objectContaining({ outcome: 'ok', namespace: 'solana' })
|
|
2535
|
+
])
|
|
2536
|
+
})
|
|
2537
|
+
|
|
2538
|
+
it('retries only once', async () => {
|
|
2539
|
+
const manager = build()
|
|
2540
|
+
const { attempt, answer } = await timeOutSolanaPrompt(manager)
|
|
2541
|
+
ethService.connect.mockRejectedValue(ALREADY_PENDING)
|
|
2542
|
+
|
|
2543
|
+
const connecting = manager.connectEthereum(network, provider(), attempt)
|
|
2544
|
+
const outcome = expect(connecting).rejects.toThrow()
|
|
2545
|
+
answer('SolAddr1')
|
|
2546
|
+
await outcome
|
|
2547
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2548
|
+
})
|
|
2549
|
+
|
|
2550
|
+
it("reports the wallet's own steps for both EVM requests", async () => {
|
|
2551
|
+
const manager = build()
|
|
2552
|
+
const { attempt, answer } = await timeOutSolanaPrompt(manager)
|
|
2553
|
+
type OnStep = (info: Record<string, unknown>) => void
|
|
2554
|
+
ethService.connect
|
|
2555
|
+
.mockImplementationOnce(
|
|
2556
|
+
async (_p: unknown, _u: unknown, onStep: OnStep) => {
|
|
2557
|
+
onStep({
|
|
2558
|
+
step: 'primaryConnect',
|
|
2559
|
+
outcome: 'failed',
|
|
2560
|
+
namespace: 'eip155',
|
|
2561
|
+
durationMs: 1
|
|
2562
|
+
})
|
|
2563
|
+
throw ALREADY_PENDING
|
|
2564
|
+
}
|
|
2565
|
+
)
|
|
2566
|
+
.mockImplementationOnce(
|
|
2567
|
+
async (_p: unknown, _u: unknown, onStep: OnStep) => {
|
|
2568
|
+
onStep({
|
|
2569
|
+
step: 'primaryConnect',
|
|
2570
|
+
outcome: 'ok',
|
|
2571
|
+
namespace: 'eip155',
|
|
2572
|
+
durationMs: 1
|
|
2573
|
+
})
|
|
2574
|
+
return '0xABC'
|
|
2575
|
+
}
|
|
2576
|
+
)
|
|
2577
|
+
|
|
2578
|
+
const connecting = manager.connectEthereum(network, provider(), attempt)
|
|
2579
|
+
answer('SolAddr1')
|
|
2580
|
+
await connecting
|
|
2581
|
+
|
|
2582
|
+
expect(stepsOf('primaryConnect').map(({ outcome }) => outcome)).toEqual([
|
|
2583
|
+
'failed',
|
|
2584
|
+
'ok'
|
|
2585
|
+
])
|
|
2586
|
+
})
|
|
2587
|
+
|
|
2588
|
+
it('does not wait when no window is open', async () => {
|
|
2589
|
+
const manager = build()
|
|
2590
|
+
const attempt = manager.beginAttempt()
|
|
2591
|
+
await check(manager)
|
|
2592
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2593
|
+
|
|
2594
|
+
await expect(
|
|
2595
|
+
manager.connectEthereum(network, provider(), attempt)
|
|
2596
|
+
).rejects.toThrow(/already pending/)
|
|
2597
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2598
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([])
|
|
2599
|
+
})
|
|
2600
|
+
|
|
2601
|
+
it('does not wait without an attempt', async () => {
|
|
2602
|
+
const manager = build()
|
|
2603
|
+
await timeOutSolanaPrompt(manager)
|
|
2604
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2605
|
+
|
|
2606
|
+
await expect(manager.connectEthereum(network, provider())).rejects.toThrow(
|
|
2607
|
+
/already pending/
|
|
2608
|
+
)
|
|
2609
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2610
|
+
})
|
|
2611
|
+
|
|
2612
|
+
it('does not wait on any other EVM error', async () => {
|
|
2613
|
+
const manager = build()
|
|
2614
|
+
const { attempt } = await timeOutSolanaPrompt(manager)
|
|
2615
|
+
ethService.connect.mockRejectedValueOnce(
|
|
2616
|
+
Object.assign(new Error('User rejected the request.'), { code: 4001 })
|
|
2617
|
+
)
|
|
2618
|
+
|
|
2619
|
+
await expect(
|
|
2620
|
+
manager.connectEthereum(network, provider(), attempt)
|
|
2621
|
+
).rejects.toThrow(/rejected/)
|
|
2622
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2623
|
+
})
|
|
2624
|
+
|
|
2625
|
+
it("does not wait on Phantom's -32002 resource error, which is not an open window", async () => {
|
|
2626
|
+
const manager = build()
|
|
2627
|
+
const { attempt, answer } = await timeOutSolanaPrompt(manager)
|
|
2628
|
+
ethService.connect.mockRejectedValueOnce(
|
|
2629
|
+
Object.assign(new Error('Requested resource not available.'), {
|
|
2630
|
+
code: -32002
|
|
2631
|
+
})
|
|
2632
|
+
)
|
|
2633
|
+
|
|
2634
|
+
const connecting = manager.connectEthereum(network, provider(), attempt)
|
|
2635
|
+
const outcome = expect(connecting).rejects.toThrow(
|
|
2636
|
+
/Requested resource not available/
|
|
2637
|
+
)
|
|
2638
|
+
// Fails at once, as before this change: it does not wait for the Solana
|
|
2639
|
+
// window still open, which may never be answered.
|
|
2640
|
+
await vi.advanceTimersByTimeAsync(0)
|
|
2641
|
+
await outcome
|
|
2642
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2643
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([])
|
|
2644
|
+
|
|
2645
|
+
answer('SolAddr1')
|
|
2646
|
+
await vi.advanceTimersByTimeAsync(0)
|
|
2647
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2648
|
+
})
|
|
2649
|
+
|
|
2650
|
+
it('does not ask again once the attempt was disconnected while waiting', async () => {
|
|
2651
|
+
const manager = build()
|
|
2652
|
+
const { attempt, answer } = await timeOutSolanaPrompt(manager)
|
|
2653
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2654
|
+
|
|
2655
|
+
const connecting = manager.connectEthereum(network, provider(), attempt)
|
|
2656
|
+
const outcome = expect(connecting).rejects.toThrow(/already pending/)
|
|
2657
|
+
// Refused, now waiting on the open window.
|
|
2658
|
+
await vi.advanceTimersByTimeAsync(5000)
|
|
2659
|
+
await manager.disconnect()
|
|
2660
|
+
// A late answer must not open a new EVM prompt nobody waits for.
|
|
2661
|
+
answer(new Error('User rejected the request.'))
|
|
2662
|
+
await outcome
|
|
2663
|
+
|
|
2664
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2665
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([
|
|
2666
|
+
expect.objectContaining({ outcome: 'skipped', namespace: 'solana' })
|
|
2667
|
+
])
|
|
2668
|
+
})
|
|
2669
|
+
|
|
2670
|
+
it('waits for a window an earlier connect left open, then connects (Try Again)', async () => {
|
|
2671
|
+
const manager = build()
|
|
2672
|
+
// Connect A opens the Solana window; the user has not answered it and its
|
|
2673
|
+
// deadline has not passed when connect B starts (Link's return-user
|
|
2674
|
+
// "Open MetaMask", or Try Again).
|
|
2675
|
+
const a = openSolanaPrompt(manager)
|
|
2676
|
+
await vi.advanceTimersByTimeAsync(500)
|
|
2677
|
+
// MetaMask refuses B's own requests while A's window is open.
|
|
2678
|
+
solanaService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2679
|
+
const b = manager.beginAttempt()
|
|
2680
|
+
await check(manager)
|
|
2681
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2682
|
+
|
|
2683
|
+
const connecting = manager.connectEthereum(network, provider(), b)
|
|
2684
|
+
await vi.advanceTimersByTimeAsync(5000)
|
|
2685
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2686
|
+
|
|
2687
|
+
a.answer('SolAddr1')
|
|
2688
|
+
const result = await connecting
|
|
2689
|
+
|
|
2690
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2691
|
+
expect(result.address).toBe('0xABC')
|
|
2692
|
+
expect(result.availableAddresses).toEqual(
|
|
2693
|
+
expect.arrayContaining([
|
|
2694
|
+
{
|
|
2695
|
+
address: 'SolAddr1',
|
|
2696
|
+
networkId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
|
|
2697
|
+
}
|
|
2698
|
+
])
|
|
2699
|
+
)
|
|
2700
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([
|
|
2701
|
+
expect.objectContaining({ outcome: 'ok', namespace: 'solana' })
|
|
2702
|
+
])
|
|
2703
|
+
})
|
|
2704
|
+
|
|
2705
|
+
it('still asks again when the refusal arrives after the window was answered', async () => {
|
|
2706
|
+
const manager = build()
|
|
2707
|
+
const a = openSolanaPrompt(manager)
|
|
2708
|
+
await vi.advanceTimersByTimeAsync(500)
|
|
2709
|
+
solanaService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2710
|
+
const b = manager.beginAttempt()
|
|
2711
|
+
await check(manager)
|
|
2712
|
+
// The refusal was sent while A's window was open, but reaches UWC only
|
|
2713
|
+
// after the user answered it (a slow bridge).
|
|
2714
|
+
let refuse!: () => void
|
|
2715
|
+
ethService.connect.mockImplementationOnce(
|
|
2716
|
+
() => new Promise((_, reject) => (refuse = () => reject(ALREADY_PENDING)))
|
|
2717
|
+
)
|
|
2718
|
+
|
|
2719
|
+
const connecting = manager.connectEthereum(network, provider(), b)
|
|
2720
|
+
a.answer('SolAddr1')
|
|
2721
|
+
await vi.advanceTimersByTimeAsync(0)
|
|
2722
|
+
refuse()
|
|
2723
|
+
|
|
2724
|
+
expect((await connecting).address).toBe('0xABC')
|
|
2725
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2726
|
+
})
|
|
2727
|
+
|
|
2728
|
+
it('after a disconnect, the next connect waits for the window left open', async () => {
|
|
2729
|
+
const manager = build()
|
|
2730
|
+
const a = openSolanaPrompt(manager)
|
|
2731
|
+
await vi.advanceTimersByTimeAsync(500)
|
|
2732
|
+
await manager.disconnect()
|
|
2733
|
+
solanaService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2734
|
+
const b = manager.beginAttempt()
|
|
2735
|
+
await check(manager)
|
|
2736
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2737
|
+
|
|
2738
|
+
const connecting = manager.connectEthereum(network, provider(), b)
|
|
2739
|
+
a.answer('SolAddr1')
|
|
2740
|
+
|
|
2741
|
+
expect((await connecting).address).toBe('0xABC')
|
|
2742
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2743
|
+
})
|
|
2744
|
+
|
|
2745
|
+
it("does not wait on another wallet's open window", async () => {
|
|
2746
|
+
const manager = build()
|
|
2747
|
+
// Another wallet's connect left its Solana window open.
|
|
2748
|
+
openSolanaPrompt(
|
|
2749
|
+
manager,
|
|
2750
|
+
makeProvider({
|
|
2751
|
+
eip155: { detectedWallet: { uuid: 'phantom-eip155' } },
|
|
2752
|
+
solana: { detectedWallet: { uuid: 'phantom-solana' } }
|
|
2753
|
+
})
|
|
2754
|
+
)
|
|
2755
|
+
await vi.advanceTimersByTimeAsync(500)
|
|
2756
|
+
const b = manager.beginAttempt()
|
|
2757
|
+
await check(manager)
|
|
2758
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2759
|
+
|
|
2760
|
+
await expect(
|
|
2761
|
+
manager.connectEthereum(network, provider(), b)
|
|
2762
|
+
).rejects.toThrow(/already pending/)
|
|
2763
|
+
expect(ethService.connect).toHaveBeenCalledTimes(1)
|
|
2764
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([])
|
|
2765
|
+
})
|
|
2766
|
+
|
|
2767
|
+
it('a superseded connect does not send its EVM request', async () => {
|
|
2768
|
+
const manager = build()
|
|
2769
|
+
const a = await timeOutSolanaPrompt(manager)
|
|
2770
|
+
// Connect B supersedes A before A reaches its EVM request: a request from
|
|
2771
|
+
// A now would open a prompt no one waits for, or collide with B's.
|
|
2772
|
+
manager.beginAttempt()
|
|
2773
|
+
|
|
2774
|
+
await expect(
|
|
2775
|
+
manager.connectEthereum(network, provider(), a.attempt)
|
|
2776
|
+
).rejects.toThrow()
|
|
2777
|
+
expect(ethService.connect).not.toHaveBeenCalled()
|
|
2778
|
+
})
|
|
2779
|
+
it('does not wait on a timed-out passive gather that opens no window', async () => {
|
|
2780
|
+
const bitcoinService = makeBitcoinService()
|
|
2781
|
+
bitcoinService.findWalletByUuid.mockReturnValue({})
|
|
2782
|
+
// Bitcoin's gather only reads; here the read never answers.
|
|
2783
|
+
bitcoinService.checkExistingConnection.mockReturnValue(
|
|
2784
|
+
new Promise(() => {})
|
|
2785
|
+
)
|
|
2786
|
+
const manager = build(bitcoinService)
|
|
2787
|
+
const withBitcoin = () =>
|
|
2788
|
+
makeProvider({
|
|
2789
|
+
eip155: { detectedWallet: { uuid: 'mm-eip155' } },
|
|
2790
|
+
solana: { detectedWallet: { uuid: 'mm-solana' } },
|
|
2791
|
+
bip122: { detectedWallet: { uuid: 'mm-bip122' } }
|
|
2792
|
+
})
|
|
2793
|
+
let answer!: (address: string) => void
|
|
2794
|
+
solanaService.connect.mockImplementationOnce(
|
|
2795
|
+
() => new Promise(resolve => (answer = resolve))
|
|
2796
|
+
)
|
|
2797
|
+
const attempt = manager.beginAttempt()
|
|
2798
|
+
const checking = check(manager, withBitcoin())
|
|
2799
|
+
await vi.advanceTimersByTimeAsync(2000)
|
|
2800
|
+
await checking
|
|
2801
|
+
ethService.connect.mockRejectedValueOnce(ALREADY_PENDING)
|
|
2802
|
+
|
|
2803
|
+
const connecting = manager.connectEthereum(network, withBitcoin(), attempt)
|
|
2804
|
+
answer('SolAddr1')
|
|
2805
|
+
// The post-connect Bitcoin gather hangs too, bounded by its own deadline.
|
|
2806
|
+
await vi.advanceTimersByTimeAsync(1000)
|
|
2807
|
+
const result = await connecting
|
|
2808
|
+
|
|
2809
|
+
expect(ethService.connect).toHaveBeenCalledTimes(2)
|
|
2810
|
+
expect(result.address).toBe('0xABC')
|
|
2811
|
+
expect(stepsOf('awaitOpenPrompt')).toEqual([
|
|
2812
|
+
expect.objectContaining({ namespace: 'solana' })
|
|
2813
|
+
])
|
|
2814
|
+
})
|
|
2815
|
+
})
|