@meshconnect/uwc-injected-connector 0.23.2 → 0.23.3
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.map +1 -1
- package/dist/eip6963-discovery.js +5 -10
- package/dist/eip6963-discovery.js.map +1 -1
- package/dist/injected-connector.d.ts.map +1 -1
- package/dist/injected-connector.js.map +1 -1
- package/dist/legacy-injected-solana-adapter.d.ts.map +1 -1
- package/dist/legacy-injected-solana-adapter.js.map +1 -1
- package/dist/services/bitcoin/bitcoin-wallet-service.d.ts.map +1 -1
- package/dist/services/bitcoin/bitcoin-wallet-service.js.map +1 -1
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js.map +1 -1
- package/dist/services/ethereum/ethereum-transaction-builder.d.ts.map +1 -1
- package/dist/services/ethereum/ethereum-transaction-service.d.ts.map +1 -1
- package/dist/services/ethereum/ethereum-wallet-service.d.ts.map +1 -1
- package/dist/services/signature-service.d.ts.map +1 -1
- package/dist/services/signature-service.js +1 -2
- package/dist/services/signature-service.js.map +1 -1
- package/dist/services/solana/solana-transaction-builder.d.ts.map +1 -1
- package/dist/services/solana/solana-transaction-service.d.ts.map +1 -1
- package/dist/services/solana/solana-transaction-service.js.map +1 -1
- package/dist/services/solana/solana-wallet-service.d.ts.map +1 -1
- package/dist/services/solana/solana-wallet-service.js.map +1 -1
- package/dist/services/storage-service.d.ts.map +1 -1
- package/dist/services/ton/ton-transaction-builder.d.ts.map +1 -1
- package/dist/services/ton/ton-transaction-service.d.ts.map +1 -1
- package/dist/services/ton/ton-wallet-service.d.ts.map +1 -1
- package/dist/services/ton/ton-wallet-service.js.map +1 -1
- package/dist/services/transaction-service.d.ts.map +1 -1
- package/dist/services/transaction-service.js.map +1 -1
- package/dist/services/tron/tron-transaction-builder.d.ts.map +1 -1
- package/dist/services/tron/tron-transaction-service.d.ts.map +1 -1
- package/dist/services/tron/tron-wallet-service.d.ts.map +1 -1
- package/dist/services/tron/tron-wallet-service.js.map +1 -1
- package/dist/ton-discovery.d.ts.map +1 -1
- package/dist/ton-discovery.js +3 -6
- package/dist/ton-discovery.js.map +1 -1
- package/dist/tron-discovery.d.ts.map +1 -1
- package/dist/tron-discovery.js +3 -6
- package/dist/tron-discovery.js.map +1 -1
- package/dist/wallet-standard-discovery.d.ts.map +1 -1
- package/dist/wallet-standard-discovery.js +8 -16
- package/dist/wallet-standard-discovery.js.map +1 -1
- package/package.json +10 -10
- package/src/eip6963-discovery.ts +5 -10
- package/src/injected-connector.test.ts +270 -180
- package/src/injected-connector.ts +20 -7
- package/src/legacy-injected-solana-adapter.test.ts +39 -26
- package/src/legacy-injected-solana-adapter.ts +2 -1
- package/src/services/connection-manager.ts +12 -6
- package/src/services/signature-service.ts +1 -2
- package/src/services/ton/ton-wallet-service.ts +2 -1
- package/src/signSolanaTransactionBytes.test.ts +3 -2
- package/src/ton-discovery.ts +3 -6
- package/src/tron-discovery.ts +3 -6
- package/src/wallet-standard-discovery.ts +8 -16
|
@@ -88,7 +88,8 @@ export interface InjectedConnectorOptions {
|
|
|
88
88
|
networks?: Network[] | undefined
|
|
89
89
|
/** Optional sink for BridgeChild discovery failures (wired to UWC's observer). */
|
|
90
90
|
onBridgeError?:
|
|
91
|
-
((info: { namespace: string; message: string }) => void)
|
|
91
|
+
| ((info: { namespace: string; message: string }) => void)
|
|
92
|
+
| undefined
|
|
92
93
|
/**
|
|
93
94
|
* Whether this session runs inside a wallet's in-app browser. Selects which
|
|
94
95
|
* injected provider's Solana name the legacy fallback surfaces.
|
|
@@ -106,21 +107,24 @@ export interface InjectedConnectorOptions {
|
|
|
106
107
|
* the Solana namespace (see `ConnectionManager`).
|
|
107
108
|
*/
|
|
108
109
|
onSecondarySolanaConnectSkipped?:
|
|
109
|
-
((info: SecondarySolanaConnectSkippedInfo) => void)
|
|
110
|
+
| ((info: SecondarySolanaConnectSkippedInfo) => void)
|
|
111
|
+
| undefined
|
|
110
112
|
/**
|
|
111
113
|
* Positive telemetry sink (ONC-231): a legacy-`injectedId` wallet's secondary
|
|
112
114
|
* Solana address WAS gathered (see `ConnectionManager`). Verifies the framed
|
|
113
115
|
* gather works; filter `framed:true` in prod to confirm the fix.
|
|
114
116
|
*/
|
|
115
117
|
onSecondarySolanaConnectGathered?:
|
|
116
|
-
((info: SecondarySolanaConnectGatheredInfo) => void)
|
|
118
|
+
| ((info: SecondarySolanaConnectGatheredInfo) => void)
|
|
119
|
+
| undefined
|
|
117
120
|
/**
|
|
118
121
|
* Telemetry sink: the wallet-switch guard released live per-namespace state
|
|
119
122
|
* that belonged to a different wallet (see `ConnectionManager`). Carries
|
|
120
123
|
* only the released namespaces — never an address.
|
|
121
124
|
*/
|
|
122
125
|
onWalletConnectionsReleased?:
|
|
123
|
-
((info: { namespaces: Namespace[] }) => void)
|
|
126
|
+
| ((info: { namespaces: Namespace[] }) => void)
|
|
127
|
+
| undefined
|
|
124
128
|
/**
|
|
125
129
|
* Step-level telemetry sink (ONC-183): one call per named phase of a connect
|
|
126
130
|
* — provider detection, the authorizing wallet call, the chain read, and each
|
|
@@ -170,7 +174,8 @@ export class InjectedConnector implements Connector {
|
|
|
170
174
|
*/
|
|
171
175
|
private usingIntegratedBrowser: boolean
|
|
172
176
|
private onLegacyDiscoveryFailure?:
|
|
173
|
-
|
|
177
|
+
| LegacyInjectedSolanaDiscoveryFailure
|
|
178
|
+
| undefined
|
|
174
179
|
/** injectedIds already reported this session — dedupes the emit across the
|
|
175
180
|
* repeated Solana detection cycles (mirrors the bridgeError source dedup). */
|
|
176
181
|
private readonly reportedLegacyFailures = new Set<string>()
|
|
@@ -663,7 +668,11 @@ export class InjectedConnector implements Connector {
|
|
|
663
668
|
|
|
664
669
|
// Determine namespace from network ID (format: "namespace:chainId")
|
|
665
670
|
const namespace = currentNetworkId.split(':')[0] as
|
|
666
|
-
|
|
671
|
+
| 'eip155'
|
|
672
|
+
| 'solana'
|
|
673
|
+
| 'tron'
|
|
674
|
+
| 'tvm'
|
|
675
|
+
| 'bip122'
|
|
667
676
|
|
|
668
677
|
// Get current address for the namespace
|
|
669
678
|
const currentAddress = this.connectionManager.getCurrentAccount()
|
|
@@ -864,7 +873,11 @@ export class InjectedConnector implements Connector {
|
|
|
864
873
|
|
|
865
874
|
// Determine namespace from network ID (format: "namespace:chainId")
|
|
866
875
|
const namespace = currentNetworkId.split(':')[0] as
|
|
867
|
-
|
|
876
|
+
| 'eip155'
|
|
877
|
+
| 'solana'
|
|
878
|
+
| 'tron'
|
|
879
|
+
| 'tvm'
|
|
880
|
+
| 'bip122'
|
|
868
881
|
|
|
869
882
|
if (namespace === 'eip155') {
|
|
870
883
|
// Get the actual Ethereum provider
|
|
@@ -104,8 +104,9 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
104
104
|
})
|
|
105
105
|
|
|
106
106
|
async function createInstalledAdapter(injectedId = INJECTED_ID) {
|
|
107
|
-
const { LegacyInjectedSolanaWalletAdapter } =
|
|
108
|
-
|
|
107
|
+
const { LegacyInjectedSolanaWalletAdapter } = await import(
|
|
108
|
+
'./legacy-injected-solana-adapter'
|
|
109
|
+
)
|
|
109
110
|
// Place the provider at the (possibly nested) injectedId path.
|
|
110
111
|
if (injectedId.includes('.')) {
|
|
111
112
|
const [head, tail] = injectedId.split('.')
|
|
@@ -120,35 +121,40 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
120
121
|
|
|
121
122
|
describe('provider resolution helpers', () => {
|
|
122
123
|
it('getInjectedSolanaProvider returns undefined when absent', async () => {
|
|
123
|
-
const { getInjectedSolanaProvider } =
|
|
124
|
-
|
|
124
|
+
const { getInjectedSolanaProvider } = await import(
|
|
125
|
+
'./legacy-injected-solana-adapter'
|
|
126
|
+
)
|
|
125
127
|
expect(getInjectedSolanaProvider(INJECTED_ID)).toBeUndefined()
|
|
126
128
|
})
|
|
127
129
|
|
|
128
130
|
it('getInjectedSolanaProvider returns the provider when present + valid', async () => {
|
|
129
|
-
const { getInjectedSolanaProvider } =
|
|
130
|
-
|
|
131
|
+
const { getInjectedSolanaProvider } = await import(
|
|
132
|
+
'./legacy-injected-solana-adapter'
|
|
133
|
+
)
|
|
131
134
|
;(window as any)[INJECTED_ID] = mockWallet
|
|
132
135
|
expect(getInjectedSolanaProvider(INJECTED_ID)).toBe(mockWallet)
|
|
133
136
|
})
|
|
134
137
|
|
|
135
138
|
it('getInjectedSolanaProvider rejects a global that is not a Solana provider', async () => {
|
|
136
|
-
const { getInjectedSolanaProvider } =
|
|
137
|
-
|
|
139
|
+
const { getInjectedSolanaProvider } = await import(
|
|
140
|
+
'./legacy-injected-solana-adapter'
|
|
141
|
+
)
|
|
138
142
|
;(window as any)[INJECTED_ID] = { foo: 'bar' } // no connect/signTransaction
|
|
139
143
|
expect(getInjectedSolanaProvider(INJECTED_ID)).toBeUndefined()
|
|
140
144
|
})
|
|
141
145
|
|
|
142
146
|
it('resolves a dot-nested injectedId path', async () => {
|
|
143
|
-
const { getInjectedSolanaProvider } =
|
|
144
|
-
|
|
147
|
+
const { getInjectedSolanaProvider } = await import(
|
|
148
|
+
'./legacy-injected-solana-adapter'
|
|
149
|
+
)
|
|
145
150
|
;(window as any).nested = { solana: mockWallet }
|
|
146
151
|
expect(getInjectedSolanaProvider('nested.solana')).toBe(mockWallet)
|
|
147
152
|
})
|
|
148
153
|
|
|
149
154
|
it('isLegacyInjectedSolanaProvider requires the full invoked method surface', async () => {
|
|
150
|
-
const { isLegacyInjectedSolanaProvider } =
|
|
151
|
-
|
|
155
|
+
const { isLegacyInjectedSolanaProvider } = await import(
|
|
156
|
+
'./legacy-injected-solana-adapter'
|
|
157
|
+
)
|
|
152
158
|
// mockWallet implements connect/disconnect/on/off/sign* → valid
|
|
153
159
|
expect(isLegacyInjectedSolanaProvider(mockWallet)).toBe(true)
|
|
154
160
|
expect(isLegacyInjectedSolanaProvider({ connect: () => {} })).toBe(false)
|
|
@@ -170,8 +176,9 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
170
176
|
|
|
171
177
|
describe('constructor', () => {
|
|
172
178
|
it('uses the name passed in (no hardcoded wallet name)', async () => {
|
|
173
|
-
const { LegacyInjectedSolanaWalletAdapter } =
|
|
174
|
-
|
|
179
|
+
const { LegacyInjectedSolanaWalletAdapter } = await import(
|
|
180
|
+
'./legacy-injected-solana-adapter'
|
|
181
|
+
)
|
|
175
182
|
const adapter = new LegacyInjectedSolanaWalletAdapter(
|
|
176
183
|
INJECTED_ID,
|
|
177
184
|
'Some Other Wallet'
|
|
@@ -185,10 +192,12 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
185
192
|
})
|
|
186
193
|
|
|
187
194
|
it('is Installed synchronously when the provider is already present (no poll tick)', async () => {
|
|
188
|
-
const { scopePollingDetectionStrategy } =
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
195
|
+
const { scopePollingDetectionStrategy } = await import(
|
|
196
|
+
'@solana/wallet-adapter-base'
|
|
197
|
+
)
|
|
198
|
+
const { LegacyInjectedSolanaWalletAdapter } = await import(
|
|
199
|
+
'./legacy-injected-solana-adapter'
|
|
200
|
+
)
|
|
192
201
|
// Provider present before construction (the discovery path guarantees this):
|
|
193
202
|
// readyState must be Installed immediately so the synchronous auto-reconnect
|
|
194
203
|
// connect() doesn't race the first polling tick and throw WalletNotReadyError.
|
|
@@ -202,10 +211,12 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
202
211
|
})
|
|
203
212
|
|
|
204
213
|
it('flips readyState to Installed only once its injectedId global appears', async () => {
|
|
205
|
-
const { scopePollingDetectionStrategy } =
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
214
|
+
const { scopePollingDetectionStrategy } = await import(
|
|
215
|
+
'@solana/wallet-adapter-base'
|
|
216
|
+
)
|
|
217
|
+
const { LegacyInjectedSolanaWalletAdapter } = await import(
|
|
218
|
+
'./legacy-injected-solana-adapter'
|
|
219
|
+
)
|
|
209
220
|
const adapter = new LegacyInjectedSolanaWalletAdapter(
|
|
210
221
|
INJECTED_ID,
|
|
211
222
|
WALLET_NAME
|
|
@@ -221,8 +232,9 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
221
232
|
|
|
222
233
|
describe('connect', () => {
|
|
223
234
|
it('throws when not installed', async () => {
|
|
224
|
-
const { LegacyInjectedSolanaWalletAdapter } =
|
|
225
|
-
|
|
235
|
+
const { LegacyInjectedSolanaWalletAdapter } = await import(
|
|
236
|
+
'./legacy-injected-solana-adapter'
|
|
237
|
+
)
|
|
226
238
|
const adapter = new LegacyInjectedSolanaWalletAdapter(
|
|
227
239
|
INJECTED_ID,
|
|
228
240
|
WALLET_NAME
|
|
@@ -302,8 +314,9 @@ describe('LegacyInjectedSolanaWalletAdapter (generic, metadata-driven)', () => {
|
|
|
302
314
|
})
|
|
303
315
|
|
|
304
316
|
it('signTransaction throws when not connected', async () => {
|
|
305
|
-
const { LegacyInjectedSolanaWalletAdapter } =
|
|
306
|
-
|
|
317
|
+
const { LegacyInjectedSolanaWalletAdapter } = await import(
|
|
318
|
+
'./legacy-injected-solana-adapter'
|
|
319
|
+
)
|
|
307
320
|
const adapter = new LegacyInjectedSolanaWalletAdapter(
|
|
308
321
|
INJECTED_ID,
|
|
309
322
|
WALLET_NAME
|
|
@@ -53,7 +53,8 @@ interface LegacyInjectedSolanaEvents {
|
|
|
53
53
|
* De-facto shape of a legacy injected-Solana provider. Only the members UWC
|
|
54
54
|
* relies on are declared.
|
|
55
55
|
*/
|
|
56
|
-
export interface LegacyInjectedSolanaProvider
|
|
56
|
+
export interface LegacyInjectedSolanaProvider
|
|
57
|
+
extends EventEmitter<LegacyInjectedSolanaEvents> {
|
|
57
58
|
publicKey?: PublicKey
|
|
58
59
|
signTransaction<T extends Transaction | VersionedTransaction>(
|
|
59
60
|
transaction: T
|
|
@@ -208,14 +208,16 @@ export interface ConnectionManagerOptions {
|
|
|
208
208
|
* injectedId (`connectSuppressed` and `alreadyConnected`).
|
|
209
209
|
*/
|
|
210
210
|
onSecondarySolanaConnectSkipped?:
|
|
211
|
-
((info: SecondarySolanaConnectSkippedInfo) => void)
|
|
211
|
+
| ((info: SecondarySolanaConnectSkippedInfo) => void)
|
|
212
|
+
| undefined
|
|
212
213
|
/**
|
|
213
214
|
* Positive telemetry sink (ONC-231): invoked when a legacy-`injectedId`
|
|
214
215
|
* wallet's secondary Solana address IS gathered. Fires once per
|
|
215
216
|
* injectedId × source per instance. Verifies the framed gather works.
|
|
216
217
|
*/
|
|
217
218
|
onSecondarySolanaConnectGathered?:
|
|
218
|
-
((info: SecondarySolanaConnectGatheredInfo) => void)
|
|
219
|
+
| ((info: SecondarySolanaConnectGatheredInfo) => void)
|
|
220
|
+
| undefined
|
|
219
221
|
/**
|
|
220
222
|
* Telemetry sink: the wallet-switch guard released live per-namespace state
|
|
221
223
|
* that belonged to a different wallet (see
|
|
@@ -224,7 +226,8 @@ export interface ConnectionManagerOptions {
|
|
|
224
226
|
* never an address. Observability only; the release happens regardless.
|
|
225
227
|
*/
|
|
226
228
|
onWalletConnectionsReleased?:
|
|
227
|
-
((info: { namespaces: Namespace[] }) => void)
|
|
229
|
+
| ((info: { namespaces: Namespace[] }) => void)
|
|
230
|
+
| undefined
|
|
228
231
|
/**
|
|
229
232
|
* Step-level telemetry sink (ONC-183) — see {@link WalletStepInfo}. Invoked
|
|
230
233
|
* once per named phase of a connect. Unlike the dedup'd sinks above this
|
|
@@ -287,11 +290,14 @@ export class ConnectionManager {
|
|
|
287
290
|
|
|
288
291
|
private readonly usingIntegratedBrowser: boolean
|
|
289
292
|
private readonly onSecondarySolanaConnectSkipped?:
|
|
290
|
-
((info: SecondarySolanaConnectSkippedInfo) => void)
|
|
293
|
+
| ((info: SecondarySolanaConnectSkippedInfo) => void)
|
|
294
|
+
| undefined
|
|
291
295
|
private readonly onSecondarySolanaConnectGathered?:
|
|
292
|
-
((info: SecondarySolanaConnectGatheredInfo) => void)
|
|
296
|
+
| ((info: SecondarySolanaConnectGatheredInfo) => void)
|
|
297
|
+
| undefined
|
|
293
298
|
private readonly onWalletConnectionsReleased?:
|
|
294
|
-
((info: { namespaces: Namespace[] }) => void)
|
|
299
|
+
| ((info: { namespaces: Namespace[] }) => void)
|
|
300
|
+
| undefined
|
|
295
301
|
private readonly steps: StepReporter
|
|
296
302
|
private readonly secondaryGatherTimeoutMs: number
|
|
297
303
|
|
|
@@ -91,8 +91,7 @@ export class SignatureService {
|
|
|
91
91
|
const encoder = new TextEncoder()
|
|
92
92
|
const messageBytes = encoder.encode(message)
|
|
93
93
|
|
|
94
|
-
//
|
|
95
|
-
// @ts-ignore
|
|
94
|
+
// @ts-expect-error
|
|
96
95
|
const signedMessage = await adapter.signMessage(messageBytes)
|
|
97
96
|
|
|
98
97
|
// Encode signature using base58 for Solana (standard encoding for Solana)
|
|
@@ -33,7 +33,8 @@ export class TonWalletService {
|
|
|
33
33
|
private manifestUrl: string | (() => string) | undefined
|
|
34
34
|
private onSessionRestored: (() => void) | undefined
|
|
35
35
|
private toUserFriendlyAddress:
|
|
36
|
-
((hex: string, testOnly?: boolean) => string)
|
|
36
|
+
| ((hex: string, testOnly?: boolean) => string)
|
|
37
|
+
| null = null
|
|
37
38
|
private UserRejectsError: (new (...args: never[]) => Error) | null = null
|
|
38
39
|
private transactionService: TonTransactionService
|
|
39
40
|
// Restore preflight bookkeeping — mirrors TonConnectConnector.
|
|
@@ -100,8 +100,9 @@ describe('InjectedConnector.signSolanaTransactionBytes', () => {
|
|
|
100
100
|
connector = new InjectedConnector()
|
|
101
101
|
|
|
102
102
|
const { ConnectionManager } = await import('./services/connection-manager')
|
|
103
|
-
const { SolanaWalletService } =
|
|
104
|
-
|
|
103
|
+
const { SolanaWalletService } = await import(
|
|
104
|
+
'./services/solana/solana-wallet-service'
|
|
105
|
+
)
|
|
105
106
|
|
|
106
107
|
mockConnManager = (vi.mocked(ConnectionManager).mock.results[0] as any)
|
|
107
108
|
.value
|
package/src/ton-discovery.ts
CHANGED
|
@@ -88,11 +88,9 @@ async function pollForBridgeTonWallets(): Promise<DetectedTonWallet[]> {
|
|
|
88
88
|
return
|
|
89
89
|
}
|
|
90
90
|
|
|
91
|
-
//
|
|
92
|
-
// @ts-ignore - window.tonWallets is set by the bridge
|
|
91
|
+
// @ts-expect-error - window.tonWallets is set by the bridge
|
|
93
92
|
if (window.tonWallets && Array.isArray(window.tonWallets)) {
|
|
94
|
-
//
|
|
95
|
-
// @ts-ignore
|
|
93
|
+
// @ts-expect-error
|
|
96
94
|
const bridgeWallets = window.tonWallets as DetectedTonWallet[]
|
|
97
95
|
resolve(bridgeWallets)
|
|
98
96
|
return
|
|
@@ -118,8 +116,7 @@ export async function getTonWallets(
|
|
|
118
116
|
// Bridge mode: prefer this frame's own provider (window[jsBridgeKey]) so connect
|
|
119
117
|
// attributes to the iframe origin; fall back to the parent list only
|
|
120
118
|
// when none is present.
|
|
121
|
-
//
|
|
122
|
-
// @ts-ignore - window.UWCBridgeChildInitialized is set by the bridge
|
|
119
|
+
// @ts-expect-error - window.UWCBridgeChildInitialized is set by the bridge
|
|
123
120
|
if (window.UWCBridgeChildInitialized === true) {
|
|
124
121
|
const local = discoverTonProviders(jsBridgeKeys)
|
|
125
122
|
if (local.length > 0) {
|
package/src/tron-discovery.ts
CHANGED
|
@@ -140,11 +140,9 @@ async function pollForBridgeTronWallets(): Promise<DetectedTronWallet[]> {
|
|
|
140
140
|
return
|
|
141
141
|
}
|
|
142
142
|
|
|
143
|
-
//
|
|
144
|
-
// @ts-ignore - window.tronWallets is set by the bridge
|
|
143
|
+
// @ts-expect-error - window.tronWallets is set by the bridge
|
|
145
144
|
if (window.tronWallets && Array.isArray(window.tronWallets)) {
|
|
146
|
-
//
|
|
147
|
-
// @ts-ignore
|
|
145
|
+
// @ts-expect-error
|
|
148
146
|
const bridgeWallets = window.tronWallets as DetectedTronWallet[]
|
|
149
147
|
resolve(bridgeWallets)
|
|
150
148
|
return
|
|
@@ -172,8 +170,7 @@ export async function getTronWallets(
|
|
|
172
170
|
)
|
|
173
171
|
.filter((id): id is string => !!id)
|
|
174
172
|
|
|
175
|
-
//
|
|
176
|
-
// @ts-ignore - window.UWCBridgeChildInitialized is set by the bridge
|
|
173
|
+
// @ts-expect-error - window.UWCBridgeChildInitialized is set by the bridge
|
|
177
174
|
const bridgeMode = window.UWCBridgeChildInitialized === true
|
|
178
175
|
|
|
179
176
|
// Check for bridge-proxied wallets first (iframe mode)
|
|
@@ -102,16 +102,13 @@ async function pollForBridgeWallets(): Promise<WalletStandardInfo[]> {
|
|
|
102
102
|
|
|
103
103
|
// Check if window.walletStandardWallets is available
|
|
104
104
|
if (
|
|
105
|
-
//
|
|
106
|
-
// @ts-ignore - window.eip6963Wallets is set by the bridge
|
|
105
|
+
// @ts-expect-error - window.eip6963Wallets is set by the bridge
|
|
107
106
|
window.walletStandardWallets &&
|
|
108
|
-
//
|
|
109
|
-
// @ts-ignore - window.eip6963Wallets is set by the bridge
|
|
107
|
+
// @ts-expect-error - window.eip6963Wallets is set by the bridge
|
|
110
108
|
Array.isArray(window.walletStandardWallets)
|
|
111
109
|
) {
|
|
112
110
|
const bridgeWallets =
|
|
113
|
-
//
|
|
114
|
-
// @ts-ignore
|
|
111
|
+
// @ts-expect-error
|
|
115
112
|
window.walletStandardWallets as WalletStandardInfo[]
|
|
116
113
|
resolve(bridgeWallets)
|
|
117
114
|
return
|
|
@@ -139,8 +136,7 @@ export async function getSolanaWallets(
|
|
|
139
136
|
if (typeof window === 'undefined') return []
|
|
140
137
|
|
|
141
138
|
// UWCBridgeChildInitialized is only initialized if app runs in an iframe. We can skip checking for bridge proxy providers when it's not necessary.
|
|
142
|
-
//
|
|
143
|
-
// @ts-ignore - window.UWCBridgeInitialized is set by the bridge
|
|
139
|
+
// @ts-expect-error - window.UWCBridgeInitialized is set by the bridge
|
|
144
140
|
if (window.UWCBridgeChildInitialized === true) {
|
|
145
141
|
const wallets = await pollForBridgeWallets()
|
|
146
142
|
|
|
@@ -368,16 +364,13 @@ async function pollForBridgeBitcoinWallets(): Promise<DetectedBitcoinWallet[]> {
|
|
|
368
364
|
}
|
|
369
365
|
|
|
370
366
|
if (
|
|
371
|
-
//
|
|
372
|
-
// @ts-ignore - window.walletStandardBitcoinWallets is set by the bridge
|
|
367
|
+
// @ts-expect-error - window.walletStandardBitcoinWallets is set by the bridge
|
|
373
368
|
window.walletStandardBitcoinWallets &&
|
|
374
|
-
//
|
|
375
|
-
// @ts-ignore
|
|
369
|
+
// @ts-expect-error
|
|
376
370
|
Array.isArray(window.walletStandardBitcoinWallets)
|
|
377
371
|
) {
|
|
378
372
|
const bridgeWallets =
|
|
379
|
-
//
|
|
380
|
-
// @ts-ignore
|
|
373
|
+
// @ts-expect-error
|
|
381
374
|
window.walletStandardBitcoinWallets as DetectedBitcoinWallet[]
|
|
382
375
|
resolve(bridgeWallets)
|
|
383
376
|
return
|
|
@@ -412,8 +405,7 @@ export async function getBitcoinWallets(
|
|
|
412
405
|
enabledWallets
|
|
413
406
|
)
|
|
414
407
|
|
|
415
|
-
//
|
|
416
|
-
// @ts-ignore - window.UWCBridgeChildInitialized is set by the bridge
|
|
408
|
+
// @ts-expect-error - window.UWCBridgeChildInitialized is set by the bridge
|
|
417
409
|
if (window.UWCBridgeChildInitialized === true) {
|
|
418
410
|
const bridgeWallets = await pollForBridgeBitcoinWallets()
|
|
419
411
|
|