@meshconnect/uwc-injected-connector 0.20.2 → 0.21.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.
- package/dist/eip6963-discovery.d.ts +13 -0
- package/dist/eip6963-discovery.d.ts.map +1 -1
- package/dist/eip6963-discovery.js +12 -3
- package/dist/eip6963-discovery.js.map +1 -1
- package/dist/injected-connector.d.ts +22 -2
- package/dist/injected-connector.d.ts.map +1 -1
- package/dist/injected-connector.js +125 -15
- package/dist/injected-connector.js.map +1 -1
- package/dist/services/connection-manager.d.ts +18 -5
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js +43 -13
- package/dist/services/connection-manager.js.map +1 -1
- package/dist/services/ethereum/ethereum-wallet-service.d.ts +78 -6
- package/dist/services/ethereum/ethereum-wallet-service.d.ts.map +1 -1
- package/dist/services/ethereum/ethereum-wallet-service.js +187 -22
- package/dist/services/ethereum/ethereum-wallet-service.js.map +1 -1
- package/dist/services/solana/solana-wallet-service.d.ts +57 -0
- package/dist/services/solana/solana-wallet-service.d.ts.map +1 -1
- package/dist/services/solana/solana-wallet-service.js +118 -0
- package/dist/services/solana/solana-wallet-service.js.map +1 -1
- package/dist/services/ton/ton-wallet-service.d.ts +9 -0
- package/dist/services/ton/ton-wallet-service.d.ts.map +1 -1
- package/dist/services/ton/ton-wallet-service.js +15 -0
- package/dist/services/ton/ton-wallet-service.js.map +1 -1
- package/dist/services/tron/tron-wallet-service.d.ts +11 -0
- package/dist/services/tron/tron-wallet-service.d.ts.map +1 -1
- package/dist/services/tron/tron-wallet-service.js +21 -0
- package/dist/services/tron/tron-wallet-service.js.map +1 -1
- package/package.json +6 -6
- package/src/eip6963-discovery.test.ts +111 -2
- package/src/eip6963-discovery.ts +28 -4
- package/src/injected-connector.test.ts +477 -16
- package/src/injected-connector.ts +142 -18
- package/src/services/connection-manager.test.ts +104 -1
- package/src/services/connection-manager.ts +50 -14
- package/src/services/ethereum/ethereum-wallet-service.test.ts +495 -17
- package/src/services/ethereum/ethereum-wallet-service.ts +221 -25
- package/src/services/solana/solana-wallet-service.lifecycle.test.ts +156 -6
- package/src/services/solana/solana-wallet-service.reconnect.test.ts +175 -0
- package/src/services/solana/solana-wallet-service.ts +132 -0
- package/src/services/ton/ton-wallet-service.test.ts +25 -0
- package/src/services/ton/ton-wallet-service.ts +15 -0
- package/src/services/tron/tron-wallet-service.test.ts +45 -0
- package/src/services/tron/tron-wallet-service.ts +20 -0
- package/src/signSolanaTransactionBytes.test.ts +1 -1
|
@@ -12,6 +12,7 @@ vi.mock('./services/storage-service')
|
|
|
12
12
|
vi.mock('./services/ethereum/ethereum-wallet-service')
|
|
13
13
|
vi.mock('./services/solana/solana-wallet-service')
|
|
14
14
|
vi.mock('./services/tron/tron-wallet-service')
|
|
15
|
+
vi.mock('./services/ton/ton-wallet-service')
|
|
15
16
|
vi.mock('./services/connection-manager')
|
|
16
17
|
vi.mock('./services/signature-service')
|
|
17
18
|
vi.mock('./services/transaction-service')
|
|
@@ -23,6 +24,20 @@ vi.mock('@meshconnect/uwc-bridge-child', async importOriginal => ({
|
|
|
23
24
|
BridgeChild: vi.fn()
|
|
24
25
|
}))
|
|
25
26
|
|
|
27
|
+
// Shared by both the `onLifecycleEvent routing` and `onAccountsChanged
|
|
28
|
+
// routing` describe blocks below — the mocked service classes are the same
|
|
29
|
+
// regardless of which stream is under test.
|
|
30
|
+
const getMocks = async () => {
|
|
31
|
+
const { EthereumWalletService } =
|
|
32
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
33
|
+
const { SolanaWalletService } =
|
|
34
|
+
await import('./services/solana/solana-wallet-service')
|
|
35
|
+
return {
|
|
36
|
+
ethService: vi.mocked(EthereumWalletService).mock.results[0].value,
|
|
37
|
+
solService: vi.mocked(SolanaWalletService).mock.results[0].value
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
26
41
|
describe('InjectedConnector', () => {
|
|
27
42
|
let connector: InjectedConnector
|
|
28
43
|
let mockEthProvider: ExtensionInjectedProvider
|
|
@@ -397,6 +412,30 @@ describe('InjectedConnector', () => {
|
|
|
397
412
|
return c
|
|
398
413
|
}
|
|
399
414
|
|
|
415
|
+
it('routes a tron session to tronConnector.onAccountsChanged', async () => {
|
|
416
|
+
const { TronConnector } =
|
|
417
|
+
await import('@meshconnect/uwc-tron-connector')
|
|
418
|
+
const onAccountsChangedFn = vi.fn().mockReturnValue(vi.fn())
|
|
419
|
+
vi.mocked(TronConnector).mockImplementation(function () {
|
|
420
|
+
return { onAccountsChanged: onAccountsChangedFn } as never
|
|
421
|
+
} as never)
|
|
422
|
+
const c = new InjectedConnector({
|
|
423
|
+
tronConnectorConfig: { enabledWallets: ['trust'] } as never,
|
|
424
|
+
networks: [mockNetwork, tronNetwork]
|
|
425
|
+
})
|
|
426
|
+
|
|
427
|
+
const listener = vi.fn()
|
|
428
|
+
c.onAccountsChanged!(listener, {
|
|
429
|
+
connectionMode: 'injected',
|
|
430
|
+
namespace: 'tron'
|
|
431
|
+
})
|
|
432
|
+
|
|
433
|
+
expect(onAccountsChangedFn).toHaveBeenCalledWith(listener, {
|
|
434
|
+
connectionMode: 'injected',
|
|
435
|
+
namespace: 'tron'
|
|
436
|
+
})
|
|
437
|
+
})
|
|
438
|
+
|
|
400
439
|
it('auto-connects Tron alongside an EVM target and merges the address', async () => {
|
|
401
440
|
const tronConnect = vi.fn().mockResolvedValue({
|
|
402
441
|
networkId: 'tron:0x2b6653dc',
|
|
@@ -626,6 +665,103 @@ describe('InjectedConnector', () => {
|
|
|
626
665
|
})
|
|
627
666
|
})
|
|
628
667
|
|
|
668
|
+
describe('getLiveAccount', () => {
|
|
669
|
+
it('routes eip155 to ethereumService.getLiveAccount()', async () => {
|
|
670
|
+
const { EthereumWalletService } =
|
|
671
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
672
|
+
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]!
|
|
673
|
+
.value
|
|
674
|
+
mockEthService.getLiveAccount.mockResolvedValue('0xLiveEth')
|
|
675
|
+
|
|
676
|
+
const result = await connector.getLiveAccount!('eip155')
|
|
677
|
+
|
|
678
|
+
expect(result).toBe('0xLiveEth')
|
|
679
|
+
})
|
|
680
|
+
|
|
681
|
+
it('routes solana to solanaService.getLiveAccount()', async () => {
|
|
682
|
+
const { SolanaWalletService } =
|
|
683
|
+
await import('./services/solana/solana-wallet-service')
|
|
684
|
+
const mockSolService =
|
|
685
|
+
vi.mocked(SolanaWalletService).mock.results[0]!.value
|
|
686
|
+
mockSolService.getLiveAccount.mockResolvedValue('SoLaNaLiveAddr')
|
|
687
|
+
|
|
688
|
+
const result = await connector.getLiveAccount!('solana')
|
|
689
|
+
|
|
690
|
+
expect(result).toBe('SoLaNaLiveAddr')
|
|
691
|
+
})
|
|
692
|
+
|
|
693
|
+
it('falls back to tronService.getLiveAccount() when no tronConnector is configured', async () => {
|
|
694
|
+
const { TronWalletService } =
|
|
695
|
+
await import('./services/tron/tron-wallet-service')
|
|
696
|
+
const mockTronService =
|
|
697
|
+
vi.mocked(TronWalletService).mock.results[0]!.value
|
|
698
|
+
mockTronService.getLiveAccount.mockResolvedValue('TFallbackTronAddr')
|
|
699
|
+
|
|
700
|
+
// Default `connector` (from the outer beforeEach) has no
|
|
701
|
+
// tronConnectorConfig, so `this.tronConnector` is null and routing must
|
|
702
|
+
// fall through to `tronService.getLiveAccount()`.
|
|
703
|
+
const result = await connector.getLiveAccount!('tron')
|
|
704
|
+
|
|
705
|
+
expect(result).toBe('TFallbackTronAddr')
|
|
706
|
+
})
|
|
707
|
+
|
|
708
|
+
it('prefers tronConnector.getLiveAccount() when a tronConnector is configured', async () => {
|
|
709
|
+
const { TronConnector } = await import('@meshconnect/uwc-tron-connector')
|
|
710
|
+
const tronConnectorLive = vi.fn().mockResolvedValue('TConnectorLiveAddr')
|
|
711
|
+
vi.mocked(TronConnector).mockImplementation(function () {
|
|
712
|
+
return { getLiveAccount: tronConnectorLive } as never
|
|
713
|
+
} as never)
|
|
714
|
+
const c = new InjectedConnector({
|
|
715
|
+
tronConnectorConfig: { enabledWallets: ['trust'] } as never
|
|
716
|
+
})
|
|
717
|
+
|
|
718
|
+
const result = await c.getLiveAccount!('tron')
|
|
719
|
+
|
|
720
|
+
expect(tronConnectorLive).toHaveBeenCalled()
|
|
721
|
+
expect(result).toBe('TConnectorLiveAddr')
|
|
722
|
+
})
|
|
723
|
+
|
|
724
|
+
it('returns tonService.getAccount() for tvm (sync, normalized to null)', async () => {
|
|
725
|
+
const { TonWalletService } =
|
|
726
|
+
await import('./services/ton/ton-wallet-service')
|
|
727
|
+
const mockTonService = vi.mocked(TonWalletService).mock.results[0]!.value
|
|
728
|
+
mockTonService.getAccount.mockReturnValue('EQLiveTonAddr')
|
|
729
|
+
|
|
730
|
+
const result = await connector.getLiveAccount!('tvm')
|
|
731
|
+
|
|
732
|
+
expect(result).toBe('EQLiveTonAddr')
|
|
733
|
+
})
|
|
734
|
+
|
|
735
|
+
it('normalizes an undefined tvm account to null', async () => {
|
|
736
|
+
const { TonWalletService } =
|
|
737
|
+
await import('./services/ton/ton-wallet-service')
|
|
738
|
+
const mockTonService = vi.mocked(TonWalletService).mock.results[0]!.value
|
|
739
|
+
mockTonService.getAccount.mockReturnValue(undefined as never)
|
|
740
|
+
|
|
741
|
+
const result = await connector.getLiveAccount!('tvm')
|
|
742
|
+
|
|
743
|
+
expect(result).toBeNull()
|
|
744
|
+
})
|
|
745
|
+
|
|
746
|
+
it('returns null for an unsupported namespace', async () => {
|
|
747
|
+
const result = await connector.getLiveAccount!('cosmos' as never)
|
|
748
|
+
|
|
749
|
+
expect(result).toBeNull()
|
|
750
|
+
})
|
|
751
|
+
|
|
752
|
+
it('never throws: returns null when the underlying service throws', async () => {
|
|
753
|
+
const { EthereumWalletService } =
|
|
754
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
755
|
+
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]!
|
|
756
|
+
.value
|
|
757
|
+
mockEthService.getLiveAccount.mockRejectedValue(new Error('boom'))
|
|
758
|
+
|
|
759
|
+
const result = await connector.getLiveAccount!('eip155')
|
|
760
|
+
|
|
761
|
+
expect(result).toBeNull()
|
|
762
|
+
})
|
|
763
|
+
})
|
|
764
|
+
|
|
629
765
|
describe('signMessage', () => {
|
|
630
766
|
it('should throw error if provider is not provided', async () => {
|
|
631
767
|
await expect(
|
|
@@ -668,6 +804,7 @@ describe('InjectedConnector', () => {
|
|
|
668
804
|
mockConnManager.getCurrentNetworkId.mockReturnValue('eip155:1')
|
|
669
805
|
mockConnManager.getCurrentAccount.mockReturnValue('0xaddress')
|
|
670
806
|
mockEthService.getConnectedProvider.mockReturnValue(mockEthProvider)
|
|
807
|
+
mockEthService.getLiveAccount.mockResolvedValue('0xaddress')
|
|
671
808
|
mockSigService.signEthereumMessage.mockResolvedValue('0xsignature')
|
|
672
809
|
|
|
673
810
|
const result = await connector.signMessage(
|
|
@@ -681,18 +818,67 @@ describe('InjectedConnector', () => {
|
|
|
681
818
|
mockEthProvider
|
|
682
819
|
)
|
|
683
820
|
expect(result).toEqual({
|
|
684
|
-
|
|
685
|
-
|
|
821
|
+
signature: {
|
|
822
|
+
type: 'standard',
|
|
823
|
+
signature: '0xsignature'
|
|
824
|
+
},
|
|
825
|
+
address: '0xaddress'
|
|
686
826
|
})
|
|
687
827
|
})
|
|
688
828
|
|
|
829
|
+
it('claims the LIVE eip155 signer address at sign time (post-switch), not the connect-time cache', async () => {
|
|
830
|
+
const { ConnectionManager } =
|
|
831
|
+
await import('./services/connection-manager')
|
|
832
|
+
const { EthereumWalletService } =
|
|
833
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
834
|
+
const { SignatureService } = await import('./services/signature-service')
|
|
835
|
+
|
|
836
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
837
|
+
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
838
|
+
.value
|
|
839
|
+
const mockSigService = vi.mocked(SignatureService).mock.results[0].value
|
|
840
|
+
|
|
841
|
+
const mockEthProvider = { request: vi.fn() } as any
|
|
842
|
+
|
|
843
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('eip155:1')
|
|
844
|
+
// Connect-time cache still reports the OLD account A.
|
|
845
|
+
mockConnManager.getCurrentAccount.mockReturnValue('0xOLD_A')
|
|
846
|
+
mockEthService.getConnectedProvider.mockReturnValue(mockEthProvider)
|
|
847
|
+
// Simulate an in-wallet account switch: the live provider now reports B.
|
|
848
|
+
mockEthService.getLiveAccount.mockResolvedValue('0xNEW_B')
|
|
849
|
+
mockSigService.signEthereumMessage.mockResolvedValue('0xsignature')
|
|
850
|
+
|
|
851
|
+
const result = await connector.signMessage(
|
|
852
|
+
'test message',
|
|
853
|
+
mockEthProvider as any
|
|
854
|
+
)
|
|
855
|
+
|
|
856
|
+
// The claimed address AND the `from` used to sign must both be the LIVE
|
|
857
|
+
// account B, guaranteeing claim == from == signer.
|
|
858
|
+
expect(mockSigService.signEthereumMessage).toHaveBeenCalledWith(
|
|
859
|
+
'test message',
|
|
860
|
+
'0xNEW_B',
|
|
861
|
+
mockEthProvider
|
|
862
|
+
)
|
|
863
|
+
expect(result.address).toBe('0xNEW_B')
|
|
864
|
+
})
|
|
865
|
+
|
|
689
866
|
it('should throw error if no Ethereum address for signing', async () => {
|
|
690
867
|
const { ConnectionManager } =
|
|
691
868
|
await import('./services/connection-manager')
|
|
869
|
+
const { EthereumWalletService } =
|
|
870
|
+
await import('./services/ethereum/ethereum-wallet-service')
|
|
871
|
+
|
|
692
872
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
873
|
+
const mockEthService = vi.mocked(EthereumWalletService).mock.results[0]
|
|
874
|
+
.value
|
|
693
875
|
|
|
694
876
|
mockConnManager.getCurrentNetworkId.mockReturnValue('eip155:1')
|
|
695
877
|
mockConnManager.getCurrentAccount.mockReturnValue(null)
|
|
878
|
+
mockEthService.getConnectedProvider.mockReturnValue({
|
|
879
|
+
request: vi.fn()
|
|
880
|
+
} as any)
|
|
881
|
+
mockEthService.getLiveAccount.mockResolvedValue(null)
|
|
696
882
|
|
|
697
883
|
await expect(
|
|
698
884
|
connector.signMessage('test message', mockEthProvider)
|
|
@@ -733,7 +919,9 @@ describe('InjectedConnector', () => {
|
|
|
733
919
|
const mockSolanaAdapter = { signMessage: vi.fn() } as any
|
|
734
920
|
|
|
735
921
|
mockConnManager.getCurrentNetworkId.mockReturnValue('solana:mainnet')
|
|
922
|
+
mockConnManager.getCurrentAccount.mockReturnValue('SoLaNaAddr111')
|
|
736
923
|
mockSolService.getConnectedAdapter.mockReturnValue(mockSolanaAdapter)
|
|
924
|
+
mockSolService.getLiveAccount.mockResolvedValue('SoLaNaAddr111')
|
|
737
925
|
mockSigService.signSolanaMessage.mockResolvedValue('solana-signature')
|
|
738
926
|
|
|
739
927
|
const result = await connector.signMessage(
|
|
@@ -746,22 +934,78 @@ describe('InjectedConnector', () => {
|
|
|
746
934
|
mockSolanaAdapter
|
|
747
935
|
)
|
|
748
936
|
expect(result).toEqual({
|
|
749
|
-
|
|
750
|
-
|
|
937
|
+
signature: {
|
|
938
|
+
type: 'standard',
|
|
939
|
+
signature: 'solana-signature'
|
|
940
|
+
},
|
|
941
|
+
address: 'SoLaNaAddr111'
|
|
751
942
|
})
|
|
752
943
|
})
|
|
753
944
|
|
|
754
|
-
it('
|
|
945
|
+
it('claims the LIVE solana signer address at sign time (post-switch), not the connect-time cache', async () => {
|
|
755
946
|
const { ConnectionManager } =
|
|
756
947
|
await import('./services/connection-manager')
|
|
757
948
|
const { SolanaWalletService } =
|
|
758
949
|
await import('./services/solana/solana-wallet-service')
|
|
950
|
+
const { SignatureService } = await import('./services/signature-service')
|
|
759
951
|
|
|
760
952
|
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
761
953
|
const mockSolService =
|
|
762
954
|
vi.mocked(SolanaWalletService).mock.results[0].value
|
|
955
|
+
const mockSigService = vi.mocked(SignatureService).mock.results[0].value
|
|
956
|
+
|
|
957
|
+
const mockSolanaAdapter = { signMessage: vi.fn() } as any
|
|
763
958
|
|
|
764
959
|
mockConnManager.getCurrentNetworkId.mockReturnValue('solana:mainnet')
|
|
960
|
+
// Connect-time cache still reports OLD account A.
|
|
961
|
+
mockConnManager.getCurrentAccount.mockReturnValue('SoLaNaAddr_A_OLD')
|
|
962
|
+
mockSolService.getConnectedAdapter.mockReturnValue(mockSolanaAdapter)
|
|
963
|
+
// Simulate an in-wallet account switch: the live adapter now reports B.
|
|
964
|
+
mockSolService.getLiveAccount.mockResolvedValue('SoLaNaAddr_B_NEW')
|
|
965
|
+
mockSigService.signSolanaMessage.mockResolvedValue('solana-signature')
|
|
966
|
+
|
|
967
|
+
const result = await connector.signMessage(
|
|
968
|
+
'test message',
|
|
969
|
+
mockEthProvider
|
|
970
|
+
)
|
|
971
|
+
|
|
972
|
+
expect(result.address).toBe('SoLaNaAddr_B_NEW')
|
|
973
|
+
})
|
|
974
|
+
|
|
975
|
+
it('throws for solana when the live adapter exposes no signer address (never claims empty)', async () => {
|
|
976
|
+
const { ConnectionManager } =
|
|
977
|
+
await import('./services/connection-manager')
|
|
978
|
+
const { SolanaWalletService } =
|
|
979
|
+
await import('./services/solana/solana-wallet-service')
|
|
980
|
+
|
|
981
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
982
|
+
const mockSolService =
|
|
983
|
+
vi.mocked(SolanaWalletService).mock.results[0].value
|
|
984
|
+
|
|
985
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('solana:mainnet')
|
|
986
|
+
mockConnManager.getCurrentAccount.mockReturnValue(null)
|
|
987
|
+
mockSolService.getConnectedAdapter.mockReturnValue({
|
|
988
|
+
signMessage: vi.fn()
|
|
989
|
+
} as any)
|
|
990
|
+
mockSolService.getLiveAccount.mockResolvedValue(null)
|
|
991
|
+
|
|
992
|
+
await expect(
|
|
993
|
+
connector.signMessage('test message', mockEthProvider)
|
|
994
|
+
).rejects.toThrow('No active wallet address for signing')
|
|
995
|
+
})
|
|
996
|
+
|
|
997
|
+
it('should throw error if no connected Solana adapter and the rebuild fails', async () => {
|
|
998
|
+
const { ConnectionManager } =
|
|
999
|
+
await import('./services/connection-manager')
|
|
1000
|
+
const { SolanaWalletService } =
|
|
1001
|
+
await import('./services/solana/solana-wallet-service')
|
|
1002
|
+
|
|
1003
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1004
|
+
const mockSolService =
|
|
1005
|
+
vi.mocked(SolanaWalletService).mock.results[0].value
|
|
1006
|
+
|
|
1007
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('solana:mainnet')
|
|
1008
|
+
mockConnManager.getCurrentAccount.mockReturnValue('SoLaNaAddr111')
|
|
765
1009
|
mockSolService.getConnectedAdapter.mockReturnValue(null)
|
|
766
1010
|
|
|
767
1011
|
await expect(
|
|
@@ -769,6 +1013,189 @@ describe('InjectedConnector', () => {
|
|
|
769
1013
|
).rejects.toThrow('No connected Solana adapter')
|
|
770
1014
|
})
|
|
771
1015
|
|
|
1016
|
+
it('re-binds the Solana adapter at sign time when it was cleared by a re-auth teardown (Phantom account-switch regression)', async () => {
|
|
1017
|
+
const { ConnectionManager } =
|
|
1018
|
+
await import('./services/connection-manager')
|
|
1019
|
+
const { SolanaWalletService } =
|
|
1020
|
+
await import('./services/solana/solana-wallet-service')
|
|
1021
|
+
const { SignatureService } = await import('./services/signature-service')
|
|
1022
|
+
|
|
1023
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1024
|
+
const mockSolService =
|
|
1025
|
+
vi.mocked(SolanaWalletService).mock.results[0].value
|
|
1026
|
+
const mockSigService = vi.mocked(SignatureService).mock.results[0].value
|
|
1027
|
+
|
|
1028
|
+
// `getConnectedAdapter()` is null (cleared by a sibling-namespace
|
|
1029
|
+
// re-auth teardown after a Phantom account switch); `ensureConnectedAdapter`
|
|
1030
|
+
// silently rebinds it from the remembered wallet uuid.
|
|
1031
|
+
const rebuiltAdapter = { signMessage: vi.fn() } as any
|
|
1032
|
+
|
|
1033
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('solana:mainnet')
|
|
1034
|
+
mockConnManager.getCurrentAccount.mockReturnValue('SoLaNaAddr_OLD')
|
|
1035
|
+
mockSolService.getConnectedAdapter.mockReturnValue(rebuiltAdapter)
|
|
1036
|
+
mockSolService.getLiveAccount.mockResolvedValue('SoLaNaAddr_NEW')
|
|
1037
|
+
mockSigService.signSolanaMessage.mockResolvedValue('solana-signature')
|
|
1038
|
+
|
|
1039
|
+
const result = await connector.signMessage(
|
|
1040
|
+
'test message',
|
|
1041
|
+
mockEthProvider
|
|
1042
|
+
)
|
|
1043
|
+
|
|
1044
|
+
expect(mockSigService.signSolanaMessage).toHaveBeenCalledWith(
|
|
1045
|
+
'test message',
|
|
1046
|
+
rebuiltAdapter
|
|
1047
|
+
)
|
|
1048
|
+
expect(result.address).toBe('SoLaNaAddr_NEW')
|
|
1049
|
+
})
|
|
1050
|
+
|
|
1051
|
+
it('claims the LIVE tron signer address as of sign completion, not a pre-sign read (closes the TOCTOU window)', async () => {
|
|
1052
|
+
const { ConnectionManager } =
|
|
1053
|
+
await import('./services/connection-manager')
|
|
1054
|
+
const { TronWalletService } =
|
|
1055
|
+
await import('./services/tron/tron-wallet-service')
|
|
1056
|
+
const { SignatureService } = await import('./services/signature-service')
|
|
1057
|
+
|
|
1058
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1059
|
+
const mockTronService = vi.mocked(TronWalletService).mock.results[0].value
|
|
1060
|
+
const mockSigService = vi.mocked(SignatureService).mock.results[0].value
|
|
1061
|
+
|
|
1062
|
+
const mockTronProvider = { tronWeb: {} } as any
|
|
1063
|
+
|
|
1064
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('tron:0x2b6653dc')
|
|
1065
|
+
// Connect-time cache still reports OLD account A.
|
|
1066
|
+
mockConnManager.getCurrentAccount.mockReturnValue('TTronAddr_A_OLD')
|
|
1067
|
+
mockTronService.getConnectedProvider.mockReturnValue(mockTronProvider)
|
|
1068
|
+
|
|
1069
|
+
// Simulate an account switch landing DURING the signTronMessage await:
|
|
1070
|
+
// the live address is A before signing starts, and B by the time
|
|
1071
|
+
// signing resolves. getLiveAccount is called twice (pre- and
|
|
1072
|
+
// post-sign) — return A on the first call, B on every call after.
|
|
1073
|
+
mockTronService.getLiveAccount
|
|
1074
|
+
.mockResolvedValueOnce('TTronAddr_A_OLD')
|
|
1075
|
+
.mockResolvedValue('TTronAddr_B_NEW')
|
|
1076
|
+
|
|
1077
|
+
// signTronMessage itself is where the switch happens: resolve it only
|
|
1078
|
+
// after the account has "changed", so a pre-sign address read would
|
|
1079
|
+
// still see A while a post-sign read sees B.
|
|
1080
|
+
mockSigService.signTronMessage.mockResolvedValue('tron-signature')
|
|
1081
|
+
|
|
1082
|
+
const result = await connector.signMessage(
|
|
1083
|
+
'test message',
|
|
1084
|
+
mockEthProvider
|
|
1085
|
+
)
|
|
1086
|
+
|
|
1087
|
+
// The account that actually signed (as of sign completion) is B, not
|
|
1088
|
+
// the pre-sign snapshot A.
|
|
1089
|
+
expect(result.address).toBe('TTronAddr_B_NEW')
|
|
1090
|
+
})
|
|
1091
|
+
|
|
1092
|
+
it('throws for tron when the live provider exposes no signer address (never claims empty)', async () => {
|
|
1093
|
+
const { ConnectionManager } =
|
|
1094
|
+
await import('./services/connection-manager')
|
|
1095
|
+
const { TronWalletService } =
|
|
1096
|
+
await import('./services/tron/tron-wallet-service')
|
|
1097
|
+
|
|
1098
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1099
|
+
const mockTronService = vi.mocked(TronWalletService).mock.results[0].value
|
|
1100
|
+
|
|
1101
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('tron:0x2b6653dc')
|
|
1102
|
+
mockConnManager.getCurrentAccount.mockReturnValue(null)
|
|
1103
|
+
mockTronService.getConnectedProvider.mockReturnValue({
|
|
1104
|
+
tronWeb: {}
|
|
1105
|
+
} as any)
|
|
1106
|
+
mockTronService.getLiveAccount.mockResolvedValue(null)
|
|
1107
|
+
|
|
1108
|
+
await expect(
|
|
1109
|
+
connector.signMessage('test message', mockEthProvider)
|
|
1110
|
+
).rejects.toThrow('No active wallet address for signing')
|
|
1111
|
+
})
|
|
1112
|
+
|
|
1113
|
+
it('should sign a TON (tvm) message and return the ton service address', async () => {
|
|
1114
|
+
const { ConnectionManager } =
|
|
1115
|
+
await import('./services/connection-manager')
|
|
1116
|
+
const { TonWalletService } =
|
|
1117
|
+
await import('./services/ton/ton-wallet-service')
|
|
1118
|
+
|
|
1119
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1120
|
+
const mockTonService = vi.mocked(TonWalletService).mock.results[0].value
|
|
1121
|
+
|
|
1122
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('tvm:-239')
|
|
1123
|
+
// For tvm the signer address comes from the TON service, not from the
|
|
1124
|
+
// connection manager's active account.
|
|
1125
|
+
mockTonService.getAccount.mockReturnValue('EQTonAddress123')
|
|
1126
|
+
mockTonService.signMessage.mockResolvedValue({
|
|
1127
|
+
type: 'tvm',
|
|
1128
|
+
signature: 'ton-sig',
|
|
1129
|
+
timestamp: 1234,
|
|
1130
|
+
domain: 'example.com',
|
|
1131
|
+
payload: { type: 'text', text: 'test message' }
|
|
1132
|
+
})
|
|
1133
|
+
|
|
1134
|
+
const result = await connector.signMessage(
|
|
1135
|
+
'test message',
|
|
1136
|
+
mockEthProvider
|
|
1137
|
+
)
|
|
1138
|
+
|
|
1139
|
+
expect(mockTonService.signMessage).toHaveBeenCalledWith('test message')
|
|
1140
|
+
expect(result).toEqual({
|
|
1141
|
+
signature: {
|
|
1142
|
+
type: 'tvm',
|
|
1143
|
+
signature: 'ton-sig',
|
|
1144
|
+
timestamp: 1234,
|
|
1145
|
+
domain: 'example.com',
|
|
1146
|
+
payload: { type: 'text', text: 'test message' }
|
|
1147
|
+
},
|
|
1148
|
+
address: 'EQTonAddress123'
|
|
1149
|
+
})
|
|
1150
|
+
})
|
|
1151
|
+
|
|
1152
|
+
it('claims the LIVE tvm signer address at sign time (post-switch), not a stale one', async () => {
|
|
1153
|
+
const { ConnectionManager } =
|
|
1154
|
+
await import('./services/connection-manager')
|
|
1155
|
+
const { TonWalletService } =
|
|
1156
|
+
await import('./services/ton/ton-wallet-service')
|
|
1157
|
+
|
|
1158
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1159
|
+
const mockTonService = vi.mocked(TonWalletService).mock.results[0].value
|
|
1160
|
+
|
|
1161
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('tvm:-239')
|
|
1162
|
+
// Simulate an in-wallet account switch: getAccount() now reports the NEW
|
|
1163
|
+
// signer address B. The connector must read getAccount() at sign time and
|
|
1164
|
+
// claim B, not a previously-cached A.
|
|
1165
|
+
mockTonService.getAccount.mockReturnValue('EQTonAddress_B_NEW')
|
|
1166
|
+
mockTonService.signMessage.mockResolvedValue({
|
|
1167
|
+
type: 'tvm',
|
|
1168
|
+
signature: 'ton-sig-b',
|
|
1169
|
+
timestamp: 5678,
|
|
1170
|
+
domain: 'example.com',
|
|
1171
|
+
payload: { type: 'text', text: 'test message' }
|
|
1172
|
+
})
|
|
1173
|
+
|
|
1174
|
+
const result = await connector.signMessage(
|
|
1175
|
+
'test message',
|
|
1176
|
+
mockEthProvider
|
|
1177
|
+
)
|
|
1178
|
+
|
|
1179
|
+
expect(result.address).toBe('EQTonAddress_B_NEW')
|
|
1180
|
+
})
|
|
1181
|
+
|
|
1182
|
+
it('throws for tvm when there is no active signer address (never claims empty)', async () => {
|
|
1183
|
+
const { ConnectionManager } =
|
|
1184
|
+
await import('./services/connection-manager')
|
|
1185
|
+
const { TonWalletService } =
|
|
1186
|
+
await import('./services/ton/ton-wallet-service')
|
|
1187
|
+
|
|
1188
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
1189
|
+
const mockTonService = vi.mocked(TonWalletService).mock.results[0].value
|
|
1190
|
+
|
|
1191
|
+
mockConnManager.getCurrentNetworkId.mockReturnValue('tvm:-239')
|
|
1192
|
+
mockTonService.getAccount.mockReturnValue(null)
|
|
1193
|
+
|
|
1194
|
+
await expect(
|
|
1195
|
+
connector.signMessage('test message', mockEthProvider)
|
|
1196
|
+
).rejects.toThrow('No active wallet address for signing')
|
|
1197
|
+
})
|
|
1198
|
+
|
|
772
1199
|
it('should throw error for unsupported namespace', async () => {
|
|
773
1200
|
const { ConnectionManager } =
|
|
774
1201
|
await import('./services/connection-manager')
|
|
@@ -1138,17 +1565,6 @@ describe('InjectedConnector', () => {
|
|
|
1138
1565
|
// surface (e.g. a Solana-primary Phantom session with an authorized EVM side
|
|
1139
1566
|
// sets the Ethereum service's connectedProvider too), so lifecycle follows
|
|
1140
1567
|
// context.namespace, never a fixed service preference.
|
|
1141
|
-
const getMocks = async () => {
|
|
1142
|
-
const { EthereumWalletService } =
|
|
1143
|
-
await import('./services/ethereum/ethereum-wallet-service')
|
|
1144
|
-
const { SolanaWalletService } =
|
|
1145
|
-
await import('./services/solana/solana-wallet-service')
|
|
1146
|
-
return {
|
|
1147
|
-
ethService: vi.mocked(EthereumWalletService).mock.results[0].value,
|
|
1148
|
-
solService: vi.mocked(SolanaWalletService).mock.results[0].value
|
|
1149
|
-
}
|
|
1150
|
-
}
|
|
1151
|
-
|
|
1152
1568
|
it('routes a solana session to the Solana service even when the EVM side is live', async () => {
|
|
1153
1569
|
const { ethService, solService } = await getMocks()
|
|
1154
1570
|
const ethUnsub = vi.fn()
|
|
@@ -1223,4 +1639,49 @@ describe('InjectedConnector', () => {
|
|
|
1223
1639
|
expect(solService.onLifecycleEvent).not.toHaveBeenCalled()
|
|
1224
1640
|
})
|
|
1225
1641
|
})
|
|
1642
|
+
|
|
1643
|
+
describe('onAccountsChanged routing (eip155 / solana)', () => {
|
|
1644
|
+
it('routes an eip155 session to ethereumService.onAccountsChanged', async () => {
|
|
1645
|
+
const { ethService, solService } = await getMocks()
|
|
1646
|
+
const ethUnsub = vi.fn()
|
|
1647
|
+
ethService.onAccountsChanged.mockReturnValue(ethUnsub)
|
|
1648
|
+
|
|
1649
|
+
const listener = vi.fn()
|
|
1650
|
+
const teardown = connector.onAccountsChanged!(listener, {
|
|
1651
|
+
connectionMode: 'injected',
|
|
1652
|
+
namespace: 'eip155'
|
|
1653
|
+
})
|
|
1654
|
+
|
|
1655
|
+
expect(ethService.onAccountsChanged).toHaveBeenCalledWith(listener)
|
|
1656
|
+
expect(solService.onAccountsChanged).not.toHaveBeenCalled()
|
|
1657
|
+
expect(teardown).toBe(ethUnsub)
|
|
1658
|
+
})
|
|
1659
|
+
|
|
1660
|
+
it('routes a solana session to solanaService.onAccountsChanged', async () => {
|
|
1661
|
+
const { ethService, solService } = await getMocks()
|
|
1662
|
+
const solUnsub = vi.fn()
|
|
1663
|
+
solService.onAccountsChanged.mockReturnValue(solUnsub)
|
|
1664
|
+
|
|
1665
|
+
const listener = vi.fn()
|
|
1666
|
+
const teardown = connector.onAccountsChanged!(listener, {
|
|
1667
|
+
connectionMode: 'injected',
|
|
1668
|
+
namespace: 'solana'
|
|
1669
|
+
})
|
|
1670
|
+
|
|
1671
|
+
expect(solService.onAccountsChanged).toHaveBeenCalledWith(listener)
|
|
1672
|
+
expect(ethService.onAccountsChanged).not.toHaveBeenCalled()
|
|
1673
|
+
expect(teardown).toBe(solUnsub)
|
|
1674
|
+
})
|
|
1675
|
+
|
|
1676
|
+
it('returns undefined for a tron session when no tronConnectorConfig was supplied', async () => {
|
|
1677
|
+
const { ethService } = await getMocks()
|
|
1678
|
+
expect(
|
|
1679
|
+
connector.onAccountsChanged!(vi.fn(), {
|
|
1680
|
+
connectionMode: 'injected',
|
|
1681
|
+
namespace: 'tron'
|
|
1682
|
+
})
|
|
1683
|
+
).toBeUndefined()
|
|
1684
|
+
expect(ethService.onAccountsChanged).not.toHaveBeenCalled()
|
|
1685
|
+
})
|
|
1686
|
+
})
|
|
1226
1687
|
})
|