@meshconnect/uwc-injected-connector 0.6.2 → 0.7.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../src/services/connection-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,iCAAiC,EACjC,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAGpE;;GAEG;AACH,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,aAAa;IAJvB,OAAO,CAAC,gBAAgB,CAAsB;gBAGpC,eAAe,EAAE,qBAAqB,EACtC,aAAa,EAAE,mBAAmB;IAG5C;;OAEG;IACG,wBAAwB,CAC5B,eAAe,EAAE,QAAQ,GAAG,QAAQ,EACpC,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC;QACT,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;QACtB,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;KACvC,CAAC;IAqFF;;OAEG;YACW,4BAA4B;IAqC1C;;OAEG;YACW,0BAA0B;
|
|
1
|
+
{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../src/services/connection-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,iCAAiC,EACjC,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AAGpE;;GAEG;AACH,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,aAAa;IAJvB,OAAO,CAAC,gBAAgB,CAAsB;gBAGpC,eAAe,EAAE,qBAAqB,EACtC,aAAa,EAAE,mBAAmB;IAG5C;;OAEG;IACG,wBAAwB,CAC5B,eAAe,EAAE,QAAQ,GAAG,QAAQ,EACpC,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC;QACT,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;QACtB,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;KACvC,CAAC;IAqFF;;OAEG;YACW,4BAA4B;IAqC1C;;OAEG;YACW,0BAA0B;IA6CxC;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC;IAwC3B;;OAEG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC;IA2C3B;;OAEG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,mBAAmB,CAAC;IA0G/B;;OAEG;IACH,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAIpC;;OAEG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAInD;;OAEG;IACH,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAYlC;;OAEG;IACH,UAAU,IAAI,IAAI;CAKnB"}
|
|
@@ -112,7 +112,8 @@ export class ConnectionManager {
|
|
|
112
112
|
if (solanaWalletUuid) {
|
|
113
113
|
const solanaWallet = this.solanaService.findWalletByUuid(solanaWalletUuid);
|
|
114
114
|
if (solanaWallet?.adapter) {
|
|
115
|
-
const solanaAddress = await this.solanaService.checkExistingConnection(solanaWallet.adapter, solanaWalletUuid)
|
|
115
|
+
const solanaAddress = (await this.solanaService.checkExistingConnection(solanaWallet.adapter, solanaWalletUuid)) ||
|
|
116
|
+
(await this.solanaService.connect(solanaWallet.adapter, solanaWalletUuid));
|
|
116
117
|
if (solanaAddress) {
|
|
117
118
|
solanaAccount = solanaAddress;
|
|
118
119
|
this.solanaService.setConnectionState(solanaWallet.adapter, solanaAddress, solanaWalletUuid);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../src/services/connection-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../src/services/connection-manager.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.
|
|
3
|
+
"version": "0.7.0",
|
|
4
4
|
"description": "Injected connector for Universal Wallet Connector",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -16,22 +16,22 @@
|
|
|
16
16
|
"src"
|
|
17
17
|
],
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@solana/spl-token": "^0.4.
|
|
19
|
+
"@solana/spl-token": "^0.4.14",
|
|
20
20
|
"@solana/wallet-adapter-base": "^0.9.23",
|
|
21
21
|
"@solana/wallet-adapter-wallets": "^0.19.37",
|
|
22
22
|
"@solana/wallet-standard-wallet-adapter-base": "^1.1.2",
|
|
23
23
|
"@solana/web3.js": "^1.98.4",
|
|
24
24
|
"@wallet-standard/app": "^1.1.0",
|
|
25
25
|
"@wallet-standard/base": "^1.1.0",
|
|
26
|
-
"bs58": "
|
|
26
|
+
"bs58": "6.0.0",
|
|
27
27
|
"buffer": "^6.0.3",
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"@meshconnect/uwc-
|
|
31
|
-
"@meshconnect/uwc-
|
|
28
|
+
"uuid": "^13.0.0",
|
|
29
|
+
"viem": "^2.44.4",
|
|
30
|
+
"@meshconnect/uwc-constants": "0.3.3",
|
|
31
|
+
"@meshconnect/uwc-types": "0.5.3"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"typescript": "^5.9.
|
|
34
|
+
"typescript": "^5.9.3"
|
|
35
35
|
},
|
|
36
36
|
"publishConfig": {
|
|
37
37
|
"access": "public"
|
|
@@ -71,20 +71,16 @@ describe('InjectedConnector', () => {
|
|
|
71
71
|
})
|
|
72
72
|
|
|
73
73
|
it('should initialize all services', async () => {
|
|
74
|
-
const { EthereumWalletService } =
|
|
75
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
'./services/solana/solana-wallet-service'
|
|
79
|
-
)
|
|
74
|
+
const { EthereumWalletService } =
|
|
75
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
76
|
+
const { SolanaWalletService } =
|
|
77
|
+
await import('./services/solana/solana-wallet-service')
|
|
80
78
|
const { StorageService } = await import('./services/storage-service')
|
|
81
|
-
const { ConnectionManager } =
|
|
82
|
-
'./services/connection-manager'
|
|
83
|
-
)
|
|
79
|
+
const { ConnectionManager } =
|
|
80
|
+
await import('./services/connection-manager')
|
|
84
81
|
const { SignatureService } = await import('./services/signature-service')
|
|
85
|
-
const { TransactionService } =
|
|
86
|
-
'./services/transaction-service'
|
|
87
|
-
)
|
|
82
|
+
const { TransactionService } =
|
|
83
|
+
await import('./services/transaction-service')
|
|
88
84
|
|
|
89
85
|
new InjectedConnector()
|
|
90
86
|
|
|
@@ -99,9 +95,8 @@ describe('InjectedConnector', () => {
|
|
|
99
95
|
|
|
100
96
|
describe('getAvailableWallets', () => {
|
|
101
97
|
it('should return Ethereum wallets for eip155 namespace', async () => {
|
|
102
|
-
const { EthereumWalletService } =
|
|
103
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
104
|
-
)
|
|
98
|
+
const { EthereumWalletService } =
|
|
99
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
105
100
|
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
106
101
|
.value
|
|
107
102
|
|
|
@@ -128,9 +123,8 @@ describe('InjectedConnector', () => {
|
|
|
128
123
|
})
|
|
129
124
|
|
|
130
125
|
it('should re-fetch Ethereum wallets if none detected', async () => {
|
|
131
|
-
const { EthereumWalletService } =
|
|
132
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
133
|
-
)
|
|
126
|
+
const { EthereumWalletService } =
|
|
127
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
134
128
|
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
135
129
|
.value
|
|
136
130
|
|
|
@@ -155,9 +149,8 @@ describe('InjectedConnector', () => {
|
|
|
155
149
|
})
|
|
156
150
|
|
|
157
151
|
it('should return Solana wallets for solana namespace', async () => {
|
|
158
|
-
const { SolanaWalletService } =
|
|
159
|
-
'./services/solana/solana-wallet-service'
|
|
160
|
-
)
|
|
152
|
+
const { SolanaWalletService } =
|
|
153
|
+
await import('./services/solana/solana-wallet-service')
|
|
161
154
|
const mockSolService =
|
|
162
155
|
vi.mocked(SolanaWalletService).mock.results[0].value
|
|
163
156
|
|
|
@@ -190,9 +183,8 @@ describe('InjectedConnector', () => {
|
|
|
190
183
|
|
|
191
184
|
describe('connect', () => {
|
|
192
185
|
it('should return existing connection if already connected', async () => {
|
|
193
|
-
const { ConnectionManager } =
|
|
194
|
-
'./services/connection-manager'
|
|
195
|
-
)
|
|
186
|
+
const { ConnectionManager } =
|
|
187
|
+
await import('./services/connection-manager')
|
|
196
188
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
197
189
|
|
|
198
190
|
mockConnManager.checkExistingConnections.mockResolvedValue({
|
|
@@ -216,9 +208,8 @@ describe('InjectedConnector', () => {
|
|
|
216
208
|
})
|
|
217
209
|
|
|
218
210
|
it('should connect to Ethereum wallet if not already connected', async () => {
|
|
219
|
-
const { ConnectionManager } =
|
|
220
|
-
'./services/connection-manager'
|
|
221
|
-
)
|
|
211
|
+
const { ConnectionManager } =
|
|
212
|
+
await import('./services/connection-manager')
|
|
222
213
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
223
214
|
|
|
224
215
|
mockConnManager.checkExistingConnections.mockResolvedValue({
|
|
@@ -243,9 +234,8 @@ describe('InjectedConnector', () => {
|
|
|
243
234
|
})
|
|
244
235
|
|
|
245
236
|
it('should connect to Solana wallet for solana namespace', async () => {
|
|
246
|
-
const { ConnectionManager } =
|
|
247
|
-
'./services/connection-manager'
|
|
248
|
-
)
|
|
237
|
+
const { ConnectionManager } =
|
|
238
|
+
await import('./services/connection-manager')
|
|
249
239
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
250
240
|
|
|
251
241
|
const solanaNetwork: Network = {
|
|
@@ -287,9 +277,8 @@ describe('InjectedConnector', () => {
|
|
|
287
277
|
})
|
|
288
278
|
|
|
289
279
|
it('should throw error for unsupported namespace', async () => {
|
|
290
|
-
const { ConnectionManager } =
|
|
291
|
-
'./services/connection-manager'
|
|
292
|
-
)
|
|
280
|
+
const { ConnectionManager } =
|
|
281
|
+
await import('./services/connection-manager')
|
|
293
282
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
294
283
|
|
|
295
284
|
const unsupportedNetwork: Network = {
|
|
@@ -321,9 +310,8 @@ describe('InjectedConnector', () => {
|
|
|
321
310
|
|
|
322
311
|
describe('switchNetwork', () => {
|
|
323
312
|
it('should delegate to connection manager', async () => {
|
|
324
|
-
const { ConnectionManager } =
|
|
325
|
-
'./services/connection-manager'
|
|
326
|
-
)
|
|
313
|
+
const { ConnectionManager } =
|
|
314
|
+
await import('./services/connection-manager')
|
|
327
315
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
328
316
|
|
|
329
317
|
const expectedResult = {
|
|
@@ -349,9 +337,8 @@ describe('InjectedConnector', () => {
|
|
|
349
337
|
|
|
350
338
|
describe('disconnect', () => {
|
|
351
339
|
it('should delegate to connection manager', async () => {
|
|
352
|
-
const { ConnectionManager } =
|
|
353
|
-
'./services/connection-manager'
|
|
354
|
-
)
|
|
340
|
+
const { ConnectionManager } =
|
|
341
|
+
await import('./services/connection-manager')
|
|
355
342
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
356
343
|
|
|
357
344
|
await connector.disconnect()
|
|
@@ -374,9 +361,8 @@ describe('InjectedConnector', () => {
|
|
|
374
361
|
})
|
|
375
362
|
|
|
376
363
|
it('should throw error if no active network connection', async () => {
|
|
377
|
-
const { ConnectionManager } =
|
|
378
|
-
'./services/connection-manager'
|
|
379
|
-
)
|
|
364
|
+
const { ConnectionManager } =
|
|
365
|
+
await import('./services/connection-manager')
|
|
380
366
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
381
367
|
|
|
382
368
|
mockConnManager.getCurrentNetworkId.mockReturnValue(null)
|
|
@@ -387,12 +373,10 @@ describe('InjectedConnector', () => {
|
|
|
387
373
|
})
|
|
388
374
|
|
|
389
375
|
it('should sign Ethereum message successfully', async () => {
|
|
390
|
-
const { ConnectionManager } =
|
|
391
|
-
'./services/connection-manager'
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
395
|
-
)
|
|
376
|
+
const { ConnectionManager } =
|
|
377
|
+
await import('./services/connection-manager')
|
|
378
|
+
const { EthereumWalletService } =
|
|
379
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
396
380
|
const { SignatureService } = await import('./services/signature-service')
|
|
397
381
|
|
|
398
382
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
@@ -424,9 +408,8 @@ describe('InjectedConnector', () => {
|
|
|
424
408
|
})
|
|
425
409
|
|
|
426
410
|
it('should throw error if no Ethereum address for signing', async () => {
|
|
427
|
-
const { ConnectionManager } =
|
|
428
|
-
'./services/connection-manager'
|
|
429
|
-
)
|
|
411
|
+
const { ConnectionManager } =
|
|
412
|
+
await import('./services/connection-manager')
|
|
430
413
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
431
414
|
|
|
432
415
|
mockConnManager.getCurrentNetworkId.mockReturnValue('eip155:1')
|
|
@@ -438,12 +421,10 @@ describe('InjectedConnector', () => {
|
|
|
438
421
|
})
|
|
439
422
|
|
|
440
423
|
it('should throw error if no connected Ethereum provider', async () => {
|
|
441
|
-
const { ConnectionManager } =
|
|
442
|
-
'./services/connection-manager'
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
446
|
-
)
|
|
424
|
+
const { ConnectionManager } =
|
|
425
|
+
await import('./services/connection-manager')
|
|
426
|
+
const { EthereumWalletService } =
|
|
427
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
447
428
|
|
|
448
429
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
449
430
|
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
@@ -459,12 +440,10 @@ describe('InjectedConnector', () => {
|
|
|
459
440
|
})
|
|
460
441
|
|
|
461
442
|
it('should sign Solana message successfully', async () => {
|
|
462
|
-
const { ConnectionManager } =
|
|
463
|
-
'./services/connection-manager'
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
'./services/solana/solana-wallet-service'
|
|
467
|
-
)
|
|
443
|
+
const { ConnectionManager } =
|
|
444
|
+
await import('./services/connection-manager')
|
|
445
|
+
const { SolanaWalletService } =
|
|
446
|
+
await import('./services/solana/solana-wallet-service')
|
|
468
447
|
const { SignatureService } = await import('./services/signature-service')
|
|
469
448
|
|
|
470
449
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
@@ -494,12 +473,10 @@ describe('InjectedConnector', () => {
|
|
|
494
473
|
})
|
|
495
474
|
|
|
496
475
|
it('should throw error if no connected Solana adapter', async () => {
|
|
497
|
-
const { ConnectionManager } =
|
|
498
|
-
'./services/connection-manager'
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
'./services/solana/solana-wallet-service'
|
|
502
|
-
)
|
|
476
|
+
const { ConnectionManager } =
|
|
477
|
+
await import('./services/connection-manager')
|
|
478
|
+
const { SolanaWalletService } =
|
|
479
|
+
await import('./services/solana/solana-wallet-service')
|
|
503
480
|
|
|
504
481
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
505
482
|
const mockSolService =
|
|
@@ -514,9 +491,8 @@ describe('InjectedConnector', () => {
|
|
|
514
491
|
})
|
|
515
492
|
|
|
516
493
|
it('should throw error for unsupported namespace', async () => {
|
|
517
|
-
const { ConnectionManager } =
|
|
518
|
-
'./services/connection-manager'
|
|
519
|
-
)
|
|
494
|
+
const { ConnectionManager } =
|
|
495
|
+
await import('./services/connection-manager')
|
|
520
496
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
521
497
|
|
|
522
498
|
mockConnManager.getCurrentNetworkId.mockReturnValue('cosmos:hub')
|
|
@@ -541,9 +517,8 @@ describe('InjectedConnector', () => {
|
|
|
541
517
|
})
|
|
542
518
|
|
|
543
519
|
it('should throw error if no active network connection', async () => {
|
|
544
|
-
const { ConnectionManager } =
|
|
545
|
-
'./services/connection-manager'
|
|
546
|
-
)
|
|
520
|
+
const { ConnectionManager } =
|
|
521
|
+
await import('./services/connection-manager')
|
|
547
522
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
548
523
|
|
|
549
524
|
mockConnManager.getCurrentNetworkId.mockReturnValue(null)
|
|
@@ -554,15 +529,12 @@ describe('InjectedConnector', () => {
|
|
|
554
529
|
})
|
|
555
530
|
|
|
556
531
|
it('should send Ethereum transaction successfully', async () => {
|
|
557
|
-
const { ConnectionManager } =
|
|
558
|
-
'./services/connection-manager'
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
const { TransactionService } = await import(
|
|
564
|
-
'./services/transaction-service'
|
|
565
|
-
)
|
|
532
|
+
const { ConnectionManager } =
|
|
533
|
+
await import('./services/connection-manager')
|
|
534
|
+
const { EthereumWalletService } =
|
|
535
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
536
|
+
const { TransactionService } =
|
|
537
|
+
await import('./services/transaction-service')
|
|
566
538
|
|
|
567
539
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
568
540
|
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
@@ -590,12 +562,10 @@ describe('InjectedConnector', () => {
|
|
|
590
562
|
})
|
|
591
563
|
|
|
592
564
|
it('should throw error if no connected Ethereum provider', async () => {
|
|
593
|
-
const { ConnectionManager } =
|
|
594
|
-
'./services/connection-manager'
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
598
|
-
)
|
|
565
|
+
const { ConnectionManager } =
|
|
566
|
+
await import('./services/connection-manager')
|
|
567
|
+
const { EthereumWalletService } =
|
|
568
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
599
569
|
|
|
600
570
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
601
571
|
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
@@ -610,15 +580,12 @@ describe('InjectedConnector', () => {
|
|
|
610
580
|
})
|
|
611
581
|
|
|
612
582
|
it('should send Solana transaction successfully', async () => {
|
|
613
|
-
const { ConnectionManager } =
|
|
614
|
-
'./services/connection-manager'
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
const { TransactionService } = await import(
|
|
620
|
-
'./services/transaction-service'
|
|
621
|
-
)
|
|
583
|
+
const { ConnectionManager } =
|
|
584
|
+
await import('./services/connection-manager')
|
|
585
|
+
const { SolanaWalletService } =
|
|
586
|
+
await import('./services/solana/solana-wallet-service')
|
|
587
|
+
const { TransactionService } =
|
|
588
|
+
await import('./services/transaction-service')
|
|
622
589
|
|
|
623
590
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
624
591
|
const mockSolService =
|
|
@@ -646,12 +613,10 @@ describe('InjectedConnector', () => {
|
|
|
646
613
|
})
|
|
647
614
|
|
|
648
615
|
it('should throw error if no connected Solana adapter', async () => {
|
|
649
|
-
const { ConnectionManager } =
|
|
650
|
-
'./services/connection-manager'
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
'./services/solana/solana-wallet-service'
|
|
654
|
-
)
|
|
616
|
+
const { ConnectionManager } =
|
|
617
|
+
await import('./services/connection-manager')
|
|
618
|
+
const { SolanaWalletService } =
|
|
619
|
+
await import('./services/solana/solana-wallet-service')
|
|
655
620
|
|
|
656
621
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
657
622
|
const mockSolService =
|
|
@@ -666,9 +631,8 @@ describe('InjectedConnector', () => {
|
|
|
666
631
|
})
|
|
667
632
|
|
|
668
633
|
it('should throw error for unsupported namespace', async () => {
|
|
669
|
-
const { ConnectionManager } =
|
|
670
|
-
'./services/connection-manager'
|
|
671
|
-
)
|
|
634
|
+
const { ConnectionManager } =
|
|
635
|
+
await import('./services/connection-manager')
|
|
672
636
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
673
637
|
|
|
674
638
|
mockConnManager.getCurrentNetworkId.mockReturnValue('cosmos:hub')
|
|
@@ -681,9 +645,8 @@ describe('InjectedConnector', () => {
|
|
|
681
645
|
|
|
682
646
|
describe('getWalletCapabilities', () => {
|
|
683
647
|
it('should delegate to ethereum service', async () => {
|
|
684
|
-
const { EthereumWalletService } =
|
|
685
|
-
'./services/ethereum/ethereum-wallet-service'
|
|
686
|
-
)
|
|
648
|
+
const { EthereumWalletService } =
|
|
649
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
687
650
|
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
688
651
|
.value
|
|
689
652
|
|
|
@@ -173,10 +173,14 @@ export class ConnectionManager {
|
|
|
173
173
|
this.solanaService.findWalletByUuid(solanaWalletUuid)
|
|
174
174
|
if (solanaWallet?.adapter) {
|
|
175
175
|
const solanaAddress =
|
|
176
|
-
await this.solanaService.checkExistingConnection(
|
|
176
|
+
(await this.solanaService.checkExistingConnection(
|
|
177
177
|
solanaWallet.adapter,
|
|
178
178
|
solanaWalletUuid
|
|
179
|
-
)
|
|
179
|
+
)) ||
|
|
180
|
+
(await this.solanaService.connect(
|
|
181
|
+
solanaWallet.adapter,
|
|
182
|
+
solanaWalletUuid
|
|
183
|
+
))
|
|
180
184
|
if (solanaAddress) {
|
|
181
185
|
solanaAccount = solanaAddress
|
|
182
186
|
this.solanaService.setConnectionState(
|