@meshconnect/uwc-ton-connector 0.7.2-snapshot.dcfdbbf → 0.7.2-snapshot.efff07b
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/ton-connect-connector.d.ts +2 -2
- package/dist/ton-connect-connector.d.ts.map +1 -1
- package/dist/ton-connect-connector.js +46 -7
- package/dist/ton-connect-connector.js.map +1 -1
- package/package.json +3 -3
- package/src/ton-connect-connector.test.ts +96 -6
- package/src/ton-connect-connector.ts +52 -9
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Network, Connector, ConnectorResult, SwitchNetworkResult, TonConnectConfig, TonConnectWalletProvider, TransactionRequest, TransactionResult,
|
|
1
|
+
import type { Network, Connector, ConnectorResult, SwitchNetworkResult, TonConnectConfig, TonConnectWalletProvider, TransactionRequest, TransactionResult, SignatureResult, WalletLifecycleEvent, WalletLifecycleContext } from '@meshconnect/uwc-types';
|
|
2
2
|
export declare class TonConnectConnector implements Connector {
|
|
3
3
|
private config;
|
|
4
4
|
private sdk;
|
|
@@ -19,7 +19,7 @@ export declare class TonConnectConnector implements Connector {
|
|
|
19
19
|
/** Return the connection URI generated by the last connect() call. */
|
|
20
20
|
getConnectionURI(): string;
|
|
21
21
|
/** Sign a message using TON Connect signData. */
|
|
22
|
-
signMessage(message: string): Promise<
|
|
22
|
+
signMessage(message: string): Promise<SignatureResult>;
|
|
23
23
|
/** Send a TON transaction via the connected wallet. */
|
|
24
24
|
sendTransaction(request: TransactionRequest): Promise<TransactionResult>;
|
|
25
25
|
/** TON is single-chain — switchNetwork returns the current state. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-connect-connector.d.ts","sourceRoot":"","sources":["../src/ton-connect-connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,wBAAwB,EAExB,kBAAkB,EAClB,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"ton-connect-connector.d.ts","sourceRoot":"","sources":["../src/ton-connect-connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,wBAAwB,EAExB,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EAEf,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,wBAAwB,CAAA;AAmC/B,qBAAa,mBAAoB,YAAW,SAAS;IACnD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,GAAG,CAA2B;IACtC,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,uBAAuB,CAEhB;IACf,OAAO,CAAC,qBAAqB,CAAiD;IAC9E,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,qBAAqB,CAAwC;IACrE,OAAO,CAAC,iBAAiB,CAAI;gBAEjB,MAAM,EAAE,gBAAgB;IAIpC,oEAAoE;IAC9D,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,wBAAwB,GAClC,OAAO,CAAC,eAAe,CAAC;YA6Bb,cAAc;IAqG5B,sEAAsE;IACtE,gBAAgB,IAAI,MAAM;IAO1B,iDAAiD;IAC3C,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0C5D,uDAAuD;IACjD,eAAe,CACnB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC;IA8B7B,qEAAqE;IAC/D,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAOnE,yDAAyD;IACnD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBjC;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,EAG/C,QAAQ,EAAE,sBAAsB,GAC/B,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IAiB3B;;;;;;;;;OASG;IACH,iBAAiB,CACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,EAGtC,QAAQ,EAAE,sBAAsB,GAC/B,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IA6C3B,4DAA4D;IACtD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAIhB,qBAAqB;IA2FnC,OAAO,CAAC,sBAAsB;YAWhB,UAAU;IAWxB,OAAO,CAAC,mBAAmB;CAM5B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { WalletConnectorError } from '@meshconnect/uwc-types';
|
|
2
2
|
import { NamespacedStorage } from './namespaced-storage';
|
|
3
|
-
import { buildTonTransactionRequest, buildSignDataPayload, executeSignData, unwrapBoc, bocToHash } from './ton-transaction-utils';
|
|
3
|
+
import { buildTonTransactionRequest, buildSignDataPayload, executeSignData, unwrapBoc, bocToHash, toFriendlyAddress } from './ton-transaction-utils';
|
|
4
4
|
import { TON_CONNECT_STORAGE_PREFIX, buildConnectorResult, connectionCancelledError, tryRestoreSession, withWalletResponseTimeout } from './ton-connect-session-restore';
|
|
5
5
|
// TonConnect has no built-in connect timeout; bound the pending handshake so
|
|
6
6
|
// it can't hang indefinitely.
|
|
@@ -127,9 +127,24 @@ export class TonConnectConnector {
|
|
|
127
127
|
if (!this.sdk) {
|
|
128
128
|
throw new Error('No active TON connection');
|
|
129
129
|
}
|
|
130
|
+
// The returned address MUST be the account that actually signs — a
|
|
131
|
+
// downstream verify flow claims it to the backend. Read the LIVE SDK
|
|
132
|
+
// account (mirrors sendTransaction), which reflects an in-wallet account
|
|
133
|
+
// switch, and normalize to the user-friendly form the connect handoff
|
|
134
|
+
// returned. Fall back to the connect-time cache only if the SDK has no
|
|
135
|
+
// live account. Never claim an empty address.
|
|
136
|
+
const liveRawAddress = this.sdk.account?.address;
|
|
137
|
+
const liveFriendlyAddress = liveRawAddress && this.toUserFriendlyAddressFn
|
|
138
|
+
? toFriendlyAddress(liveRawAddress, this.toUserFriendlyAddressFn)
|
|
139
|
+
: liveRawAddress;
|
|
140
|
+
const address = liveFriendlyAddress ?? this.connectedAddress;
|
|
141
|
+
if (!address) {
|
|
142
|
+
throw new Error('No connected TON address for signing');
|
|
143
|
+
}
|
|
130
144
|
const payload = buildSignDataPayload(message);
|
|
131
145
|
try {
|
|
132
|
-
|
|
146
|
+
const signature = await withWalletResponseTimeout(executeSignData(this.sdk, payload), TON_CONNECT_STORAGE_PREFIX);
|
|
147
|
+
return { signature, address };
|
|
133
148
|
}
|
|
134
149
|
catch (error) {
|
|
135
150
|
if (this.UserRejectsErrorClass &&
|
|
@@ -242,14 +257,38 @@ export class TonConnectConnector {
|
|
|
242
257
|
const sdk = this.sdk;
|
|
243
258
|
if (!sdk)
|
|
244
259
|
return undefined;
|
|
245
|
-
|
|
260
|
+
const toFriendly = (raw) => raw && this.toUserFriendlyAddressFn
|
|
261
|
+
? toFriendlyAddress(raw, this.toUserFriendlyAddressFn)
|
|
262
|
+
: raw;
|
|
263
|
+
// Seed from the friendly connected address (matching the connect-time
|
|
264
|
+
// representation) so the initial `onStatusChange` replay isn't misread as a
|
|
265
|
+
// change, and so a disconnect ([]) is only emitted after a real
|
|
266
|
+
// connected→disconnected transition.
|
|
267
|
+
let lastKnownAddress = this.connectedAddress ?? toFriendly(sdk.account?.address);
|
|
246
268
|
return sdk.onStatusChange(wallet => {
|
|
247
|
-
const
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
269
|
+
const rawAddress = wallet?.account?.address;
|
|
270
|
+
if (!rawAddress) {
|
|
271
|
+
// Wallet-initiated disconnect. Forward [] so core's active-stream
|
|
272
|
+
// disconnect path runs (clears the session) — matching the other
|
|
273
|
+
// connectors; `onLifecycleEvent` only EMITS `walletDisconnected` and
|
|
274
|
+
// never clears core state. Only surface it after a real connected
|
|
275
|
+
// state so a spurious pre-connect null can't clear a session that
|
|
276
|
+
// never existed.
|
|
277
|
+
if (lastKnownAddress === undefined)
|
|
278
|
+
return;
|
|
279
|
+
lastKnownAddress = undefined;
|
|
280
|
+
this.connectedAddress = null;
|
|
281
|
+
listener([]);
|
|
282
|
+
return;
|
|
283
|
+
}
|
|
284
|
+
// Normalize to the same user-friendly form connect returns, so core's
|
|
285
|
+
// activeAddress/availableAddresses keep ONE representation across a
|
|
286
|
+
// switch (raw `0:<hex>` vs friendly `UQ…` otherwise diverge mid-session).
|
|
287
|
+
const address = toFriendly(rawAddress) ?? rawAddress;
|
|
288
|
+
if (address === lastKnownAddress)
|
|
251
289
|
return;
|
|
252
290
|
lastKnownAddress = address;
|
|
291
|
+
this.connectedAddress = address;
|
|
253
292
|
listener([address]);
|
|
254
293
|
}, () => {
|
|
255
294
|
// errorsHandler is required by the signature; lifecycle errors are not
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-connect-connector.js","sourceRoot":"","sources":["../src/ton-connect-connector.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ton-connect-connector.js","sourceRoot":"","sources":["../src/ton-connect-connector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@meshconnect/uwc-ton-connector",
|
|
3
|
-
"version": "0.7.2-snapshot.
|
|
3
|
+
"version": "0.7.2-snapshot.efff07b",
|
|
4
4
|
"description": "TON Connect connector for Universal Wallet Connector — mobile QR/URI wallet connections",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@ton/core": "^0.63.1",
|
|
20
20
|
"@tonconnect/sdk": "^3.0.5",
|
|
21
|
-
"@meshconnect/uwc-constants": "0.6.10-snapshot.
|
|
22
|
-
"@meshconnect/uwc-types": "0.19.0-snapshot.
|
|
21
|
+
"@meshconnect/uwc-constants": "0.6.10-snapshot.efff07b",
|
|
22
|
+
"@meshconnect/uwc-types": "0.19.0-snapshot.efff07b"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"typescript": "^5.9.3"
|
|
@@ -663,11 +663,14 @@ describe('TonConnectConnector', () => {
|
|
|
663
663
|
|
|
664
664
|
expect(mockSignData).toHaveBeenCalled()
|
|
665
665
|
expect(result).toEqual({
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
666
|
+
signature: {
|
|
667
|
+
type: 'tvm',
|
|
668
|
+
signature: 'sig123',
|
|
669
|
+
timestamp: 1700000000,
|
|
670
|
+
domain: 'example.com',
|
|
671
|
+
payload: { type: 'text', text: 'test message' }
|
|
672
|
+
},
|
|
673
|
+
address: 'UQ_converted_abcdef12'
|
|
671
674
|
})
|
|
672
675
|
})
|
|
673
676
|
|
|
@@ -696,6 +699,48 @@ describe('TonConnectConnector', () => {
|
|
|
696
699
|
'network failure'
|
|
697
700
|
)
|
|
698
701
|
})
|
|
702
|
+
|
|
703
|
+
it('returns the LIVE signer address after an in-wallet account switch, not the stale connect-time one', async () => {
|
|
704
|
+
// Connect with account A.
|
|
705
|
+
simulateSuccessfulConnect()
|
|
706
|
+
await connector.connect(TON_NETWORK, PROVIDER)
|
|
707
|
+
|
|
708
|
+
// Simulate an in-wallet account switch: the live SDK account now points
|
|
709
|
+
// at a DIFFERENT raw address B (mirrors how sendTransaction reads the
|
|
710
|
+
// live sdk.account). connectedAddress still holds A's friendly form.
|
|
711
|
+
getLastSdkInstance().account = {
|
|
712
|
+
address: '0:switched_to_b_9999',
|
|
713
|
+
chain: '-239'
|
|
714
|
+
}
|
|
715
|
+
|
|
716
|
+
mockSignData.mockResolvedValue({
|
|
717
|
+
signature: 'sigB',
|
|
718
|
+
timestamp: 1700000000,
|
|
719
|
+
domain: 'example.com'
|
|
720
|
+
})
|
|
721
|
+
|
|
722
|
+
const result = await connector.signMessage!('test message')
|
|
723
|
+
|
|
724
|
+
// Must be B's friendly form (converted from the live account), NOT A's
|
|
725
|
+
// stale connect-time cache 'UQ_converted_abcdef12'.
|
|
726
|
+
expect(result.address).toBe('UQ_converted_switched')
|
|
727
|
+
expect(result.address).not.toBe('UQ_converted_abcdef12')
|
|
728
|
+
})
|
|
729
|
+
|
|
730
|
+
it('throws when there is no connected address instead of claiming an empty address', async () => {
|
|
731
|
+
// Force an active SDK with no account and no cached connect-time address.
|
|
732
|
+
;(connector as unknown as { sdk: unknown }).sdk = {
|
|
733
|
+
account: null,
|
|
734
|
+
signData: mockSignData
|
|
735
|
+
}
|
|
736
|
+
;(
|
|
737
|
+
connector as unknown as { connectedAddress: string | null }
|
|
738
|
+
).connectedAddress = null
|
|
739
|
+
|
|
740
|
+
await expect(connector.signMessage!('test message')).rejects.toThrow(
|
|
741
|
+
'No connected TON address for signing'
|
|
742
|
+
)
|
|
743
|
+
})
|
|
699
744
|
})
|
|
700
745
|
|
|
701
746
|
describe('sendTransaction', () => {
|
|
@@ -1320,7 +1365,7 @@ describe('TonConnectConnector', () => {
|
|
|
1320
1365
|
expect(seen).toEqual([['0:new']])
|
|
1321
1366
|
})
|
|
1322
1367
|
|
|
1323
|
-
it('
|
|
1368
|
+
it('forwards [] on a wallet-initiated disconnect after a connected state (so core clears the session)', () => {
|
|
1324
1369
|
let statusCb: ((w: unknown) => void) | undefined
|
|
1325
1370
|
;(connector as unknown as { sdk: unknown }).sdk = {
|
|
1326
1371
|
account: { address: '0:abc' },
|
|
@@ -1334,10 +1379,55 @@ describe('TonConnectConnector', () => {
|
|
|
1334
1379
|
connectionMode: 'tonConnect'
|
|
1335
1380
|
})
|
|
1336
1381
|
|
|
1382
|
+
statusCb?.(null) // wallet ended the session on its side
|
|
1383
|
+
expect(seen).toEqual([[]])
|
|
1384
|
+
})
|
|
1385
|
+
|
|
1386
|
+
it('does NOT forward [] for a pre-connect null status (no session to clear)', () => {
|
|
1387
|
+
let statusCb: ((w: unknown) => void) | undefined
|
|
1388
|
+
;(connector as unknown as { sdk: unknown }).sdk = {
|
|
1389
|
+
account: null,
|
|
1390
|
+
onStatusChange: (cb: (w: unknown) => void) => {
|
|
1391
|
+
statusCb = cb
|
|
1392
|
+
return vi.fn()
|
|
1393
|
+
}
|
|
1394
|
+
}
|
|
1395
|
+
const seen: string[][] = []
|
|
1396
|
+
connector.onAccountsChanged!(accounts => seen.push(accounts), {
|
|
1397
|
+
connectionMode: 'tonConnect'
|
|
1398
|
+
})
|
|
1399
|
+
|
|
1337
1400
|
statusCb?.(null)
|
|
1338
1401
|
expect(seen).toEqual([])
|
|
1339
1402
|
})
|
|
1340
1403
|
|
|
1404
|
+
it('normalizes a switched raw address to the same friendly form connect returns', () => {
|
|
1405
|
+
let statusCb: ((w: unknown) => void) | undefined
|
|
1406
|
+
;(connector as unknown as { sdk: unknown }).sdk = {
|
|
1407
|
+
account: { address: '0:abc' },
|
|
1408
|
+
onStatusChange: (cb: (w: unknown) => void) => {
|
|
1409
|
+
statusCb = cb
|
|
1410
|
+
return vi.fn()
|
|
1411
|
+
}
|
|
1412
|
+
}
|
|
1413
|
+
// Match the fn wired during initializeSdk (mirrors the SDK mock above).
|
|
1414
|
+
;(
|
|
1415
|
+
connector as unknown as {
|
|
1416
|
+
toUserFriendlyAddressFn: (h: string) => string
|
|
1417
|
+
}
|
|
1418
|
+
).toUserFriendlyAddressFn = (hex: string) =>
|
|
1419
|
+
`UQ_converted_${hex.split(':')[1]?.slice(0, 8)}`
|
|
1420
|
+
const seen: string[][] = []
|
|
1421
|
+
connector.onAccountsChanged!(accounts => seen.push(accounts), {
|
|
1422
|
+
connectionMode: 'tonConnect'
|
|
1423
|
+
})
|
|
1424
|
+
|
|
1425
|
+
statusCb?.({ account: { address: '0:def45678ff' } })
|
|
1426
|
+
// Forwarded in friendly form (UQ…), never the raw 0:<hex>.
|
|
1427
|
+
expect(seen).toEqual([['UQ_converted_def45678']])
|
|
1428
|
+
expect(JSON.stringify(seen)).not.toContain('0:def')
|
|
1429
|
+
})
|
|
1430
|
+
|
|
1341
1431
|
it('teardown calls the SDK unsub', () => {
|
|
1342
1432
|
const unsub = vi.fn()
|
|
1343
1433
|
;(connector as unknown as { sdk: unknown }).sdk = {
|
|
@@ -8,7 +8,7 @@ import type {
|
|
|
8
8
|
TonNativeTransferRequest,
|
|
9
9
|
TransactionRequest,
|
|
10
10
|
TransactionResult,
|
|
11
|
-
|
|
11
|
+
SignatureResult,
|
|
12
12
|
NetworkId,
|
|
13
13
|
WalletLifecycleEvent,
|
|
14
14
|
WalletLifecycleContext
|
|
@@ -25,7 +25,8 @@ import {
|
|
|
25
25
|
buildSignDataPayload,
|
|
26
26
|
executeSignData,
|
|
27
27
|
unwrapBoc,
|
|
28
|
-
bocToHash
|
|
28
|
+
bocToHash,
|
|
29
|
+
toFriendlyAddress
|
|
29
30
|
} from './ton-transaction-utils'
|
|
30
31
|
import {
|
|
31
32
|
TON_CONNECT_STORAGE_PREFIX,
|
|
@@ -209,17 +210,34 @@ export class TonConnectConnector implements Connector {
|
|
|
209
210
|
}
|
|
210
211
|
|
|
211
212
|
/** Sign a message using TON Connect signData. */
|
|
212
|
-
async signMessage(message: string): Promise<
|
|
213
|
+
async signMessage(message: string): Promise<SignatureResult> {
|
|
213
214
|
if (!this.sdk) {
|
|
214
215
|
throw new Error('No active TON connection')
|
|
215
216
|
}
|
|
216
217
|
|
|
218
|
+
// The returned address MUST be the account that actually signs — a
|
|
219
|
+
// downstream verify flow claims it to the backend. Read the LIVE SDK
|
|
220
|
+
// account (mirrors sendTransaction), which reflects an in-wallet account
|
|
221
|
+
// switch, and normalize to the user-friendly form the connect handoff
|
|
222
|
+
// returned. Fall back to the connect-time cache only if the SDK has no
|
|
223
|
+
// live account. Never claim an empty address.
|
|
224
|
+
const liveRawAddress = this.sdk.account?.address
|
|
225
|
+
const liveFriendlyAddress =
|
|
226
|
+
liveRawAddress && this.toUserFriendlyAddressFn
|
|
227
|
+
? toFriendlyAddress(liveRawAddress, this.toUserFriendlyAddressFn)
|
|
228
|
+
: liveRawAddress
|
|
229
|
+
const address = liveFriendlyAddress ?? this.connectedAddress
|
|
230
|
+
if (!address) {
|
|
231
|
+
throw new Error('No connected TON address for signing')
|
|
232
|
+
}
|
|
233
|
+
|
|
217
234
|
const payload = buildSignDataPayload(message)
|
|
218
235
|
try {
|
|
219
|
-
|
|
236
|
+
const signature = await withWalletResponseTimeout(
|
|
220
237
|
executeSignData(this.sdk, payload),
|
|
221
238
|
TON_CONNECT_STORAGE_PREFIX
|
|
222
239
|
)
|
|
240
|
+
return { signature, address }
|
|
223
241
|
} catch (error) {
|
|
224
242
|
if (
|
|
225
243
|
this.UserRejectsErrorClass &&
|
|
@@ -349,14 +367,39 @@ export class TonConnectConnector implements Connector {
|
|
|
349
367
|
): (() => void) | undefined {
|
|
350
368
|
const sdk = this.sdk
|
|
351
369
|
if (!sdk) return undefined
|
|
352
|
-
|
|
370
|
+
const toFriendly = (raw: string | undefined): string | undefined =>
|
|
371
|
+
raw && this.toUserFriendlyAddressFn
|
|
372
|
+
? toFriendlyAddress(raw, this.toUserFriendlyAddressFn)
|
|
373
|
+
: raw
|
|
374
|
+
// Seed from the friendly connected address (matching the connect-time
|
|
375
|
+
// representation) so the initial `onStatusChange` replay isn't misread as a
|
|
376
|
+
// change, and so a disconnect ([]) is only emitted after a real
|
|
377
|
+
// connected→disconnected transition.
|
|
378
|
+
let lastKnownAddress: string | undefined =
|
|
379
|
+
this.connectedAddress ?? toFriendly(sdk.account?.address)
|
|
353
380
|
return sdk.onStatusChange(
|
|
354
381
|
wallet => {
|
|
355
|
-
const
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
382
|
+
const rawAddress = wallet?.account?.address
|
|
383
|
+
if (!rawAddress) {
|
|
384
|
+
// Wallet-initiated disconnect. Forward [] so core's active-stream
|
|
385
|
+
// disconnect path runs (clears the session) — matching the other
|
|
386
|
+
// connectors; `onLifecycleEvent` only EMITS `walletDisconnected` and
|
|
387
|
+
// never clears core state. Only surface it after a real connected
|
|
388
|
+
// state so a spurious pre-connect null can't clear a session that
|
|
389
|
+
// never existed.
|
|
390
|
+
if (lastKnownAddress === undefined) return
|
|
391
|
+
lastKnownAddress = undefined
|
|
392
|
+
this.connectedAddress = null
|
|
393
|
+
listener([])
|
|
394
|
+
return
|
|
395
|
+
}
|
|
396
|
+
// Normalize to the same user-friendly form connect returns, so core's
|
|
397
|
+
// activeAddress/availableAddresses keep ONE representation across a
|
|
398
|
+
// switch (raw `0:<hex>` vs friendly `UQ…` otherwise diverge mid-session).
|
|
399
|
+
const address = toFriendly(rawAddress) ?? rawAddress
|
|
400
|
+
if (address === lastKnownAddress) return
|
|
359
401
|
lastKnownAddress = address
|
|
402
|
+
this.connectedAddress = address
|
|
360
403
|
listener([address])
|
|
361
404
|
},
|
|
362
405
|
() => {
|