@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oCAAoC,EAC1C,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,cAAc,CAAgB;gBAE1B,cAAc,EAAE,cAAc;IAI1C;;OAEG;IACG,mBAAmB,CACvB,eAAe,GAAE,cAAc,EAAO,EACtC,sBAAsB,UAAQ,EAC9B,wBAAwB,CAAC,EAAE,oCAAoC,GAC9D,OAAO,CAAC,IAAI,CAAC;IAQhB;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;;;;;;;OAQG;IACG,uBAAuB,CAC3B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAmCzB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"solana-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oCAAoC,EAC1C,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,cAAc,CAAgB;gBAE1B,cAAc,EAAE,cAAc;IAI1C;;OAEG;IACG,mBAAmB,CACvB,eAAe,GAAE,cAAc,EAAO,EACtC,sBAAsB,UAAQ,EAC9B,wBAAwB,CAAC,EAAE,oCAAoC,GAC9D,OAAO,CAAC,IAAI,CAAC;IAQhB;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;;;;;;;OAQG;IACG,uBAAuB,CAC3B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,oBAAoB,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAmCzB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoB1E;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,IAAI;IAWP;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW9C;;OAEG;IACH,mBAAmB,IAAI,aAAa,GAAG,IAAI;IAI3C;;;;;;;;;;;;;OAaG;IACG,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBhD;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAC9C,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IAqB3B;;;;;;;;;;;;;;;;;;OAkBG;IACH,iBAAiB,CACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GACrC,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;IAyB3B;;;;;;;;;OASG;IACH,OAAO,CAAC,iCAAiC;IAmBzC;;OAEG;IACH,UAAU,IAAI,IAAI;CAKnB"}
|
|
@@ -7,6 +7,7 @@ export class SolanaWalletService {
|
|
|
7
7
|
detectedWallets = [];
|
|
8
8
|
connectedAdapter = null;
|
|
9
9
|
account = null;
|
|
10
|
+
connectedWalletUuid = null;
|
|
10
11
|
storageService;
|
|
11
12
|
constructor(storageService) {
|
|
12
13
|
this.storageService = storageService;
|
|
@@ -82,6 +83,7 @@ export class SolanaWalletService {
|
|
|
82
83
|
}
|
|
83
84
|
this.connectedAdapter = adapter;
|
|
84
85
|
this.account = address;
|
|
86
|
+
this.connectedWalletUuid = walletUuid;
|
|
85
87
|
// Store this wallet as connected
|
|
86
88
|
this.storageService.storeSolanaWalletUUID(walletUuid);
|
|
87
89
|
return address;
|
|
@@ -109,6 +111,7 @@ export class SolanaWalletService {
|
|
|
109
111
|
this.account = account;
|
|
110
112
|
// Store wallet UUID if provided and connected
|
|
111
113
|
if (adapter && account && walletUuid) {
|
|
114
|
+
this.connectedWalletUuid = walletUuid;
|
|
112
115
|
this.storageService.storeSolanaWalletUUID(walletUuid);
|
|
113
116
|
}
|
|
114
117
|
}
|
|
@@ -118,12 +121,67 @@ export class SolanaWalletService {
|
|
|
118
121
|
getAccount() {
|
|
119
122
|
return this.account;
|
|
120
123
|
}
|
|
124
|
+
/**
|
|
125
|
+
* The LIVE public key of the connected adapter, read at call time from
|
|
126
|
+
* `adapter.publicKey?.toBase58()`. Unlike `getAccount()`'s connect-time
|
|
127
|
+
* cache, this reflects an in-wallet account switch (in bridged mode the
|
|
128
|
+
* publicKey is a live Comlink proxy whose `toBase58()` is async, so this
|
|
129
|
+
* awaits it), letting the signMessage flow claim the account that ACTUALLY
|
|
130
|
+
* signs. Returns null when there is no connected adapter or it exposes no
|
|
131
|
+
* public key; the caller decides whether to throw.
|
|
132
|
+
*/
|
|
133
|
+
async getLiveAccount() {
|
|
134
|
+
const adapter = this.connectedAdapter;
|
|
135
|
+
if (!adapter)
|
|
136
|
+
return null;
|
|
137
|
+
try {
|
|
138
|
+
const base58 = await adapter.publicKey?.toBase58();
|
|
139
|
+
return base58 ?? null;
|
|
140
|
+
}
|
|
141
|
+
catch {
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
121
145
|
/**
|
|
122
146
|
* Get connected adapter
|
|
123
147
|
*/
|
|
124
148
|
getConnectedAdapter() {
|
|
125
149
|
return this.connectedAdapter;
|
|
126
150
|
}
|
|
151
|
+
/**
|
|
152
|
+
* (Re)bind the connected adapter if the reference was cleared (e.g. a re-auth
|
|
153
|
+
* teardown after an in-wallet account switch) but the wallet is still
|
|
154
|
+
* authorized. Silent: uses the no-prompt `checkExistingConnection` path, so
|
|
155
|
+
* signing after a switch never surfaces an extra approval popup.
|
|
156
|
+
*
|
|
157
|
+
* Returns a BOOLEAN, never the adapter itself: in bridge mode the adapter is
|
|
158
|
+
* a Comlink proxy, and `await`ing that proxy value (as callers would with
|
|
159
|
+
* `const a = await ensureConnectedAdapter()`) makes the Promise machinery
|
|
160
|
+
* follow its thenable and forces Comlink to structured-clone the
|
|
161
|
+
* (unserializable) adapter → "Unserializable return value". Callers must read
|
|
162
|
+
* the adapter SYNCHRONOUSLY via `getConnectedAdapter()` AFTER awaiting this,
|
|
163
|
+
* so the proxy's methods are called remotely but the proxy is never awaited.
|
|
164
|
+
*/
|
|
165
|
+
async ensureConnectedAdapter() {
|
|
166
|
+
if (this.connectedAdapter)
|
|
167
|
+
return true;
|
|
168
|
+
if (!this.connectedWalletUuid)
|
|
169
|
+
return false;
|
|
170
|
+
try {
|
|
171
|
+
await this.initializeDiscovery();
|
|
172
|
+
const wallet = this.findWalletByUuid(this.connectedWalletUuid);
|
|
173
|
+
if (!wallet?.adapter)
|
|
174
|
+
return false;
|
|
175
|
+
const address = await this.checkExistingConnection(wallet.adapter, this.connectedWalletUuid);
|
|
176
|
+
if (!address)
|
|
177
|
+
return false;
|
|
178
|
+
this.setConnectionState(wallet.adapter, address, this.connectedWalletUuid);
|
|
179
|
+
return this.connectedAdapter != null;
|
|
180
|
+
}
|
|
181
|
+
catch {
|
|
182
|
+
return false;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
127
185
|
/**
|
|
128
186
|
* Subscribe to the connected wallet-standard adapter's lifecycle. Only the
|
|
129
187
|
* adapter's typed `disconnect` event is forwarded (`WalletAdapterEvents` doesn't
|
|
@@ -153,12 +211,72 @@ export class SolanaWalletService {
|
|
|
153
211
|
adapter.off('disconnect', onDisconnect);
|
|
154
212
|
};
|
|
155
213
|
}
|
|
214
|
+
/**
|
|
215
|
+
* Subscribe to the connected Solana adapter's account changes (direct mode
|
|
216
|
+
* only). `StandardWalletAdapter` re-emits `'connect'` with the new
|
|
217
|
+
* `PublicKey` whenever the underlying Wallet-Standard wallet reports a
|
|
218
|
+
* `change` to its accounts (e.g. the user switches accounts in Phantom),
|
|
219
|
+
* and emits `'disconnect'` when the account goes away entirely. We forward
|
|
220
|
+
* `[address]` on connect and `[]` on disconnect — core reads `[]` as a
|
|
221
|
+
* namespace disconnect.
|
|
222
|
+
*
|
|
223
|
+
* Bridge guard: in the production iframe the adapter published to this
|
|
224
|
+
* service is a Comlink proxy (no real `.on`/`.off`), so a direct
|
|
225
|
+
* subscription is impossible here. Instead, relay through
|
|
226
|
+
* `window.__uwcSubscribeSolanaWalletEvent` (installed by
|
|
227
|
+
* `@meshconnect/uwc-bridge-child`, only present in bridge mode), which asks
|
|
228
|
+
* the PARENT frame — where the live adapter actually lives — to subscribe
|
|
229
|
+
* on our behalf. Falls back to `undefined` (polling remains the fallback)
|
|
230
|
+
* when the global or a connected wallet id isn't available, e.g. an older
|
|
231
|
+
* bridge-parent that predates this capability.
|
|
232
|
+
*/
|
|
233
|
+
onAccountsChanged(listener) {
|
|
234
|
+
if (typeof window !== 'undefined' &&
|
|
235
|
+
window
|
|
236
|
+
.UWCBridgeChildInitialized === true) {
|
|
237
|
+
return this.subscribeAccountsChangedViaBridge(listener);
|
|
238
|
+
}
|
|
239
|
+
const adapter = this.connectedAdapter;
|
|
240
|
+
if (!adapter || typeof adapter.on !== 'function')
|
|
241
|
+
return undefined;
|
|
242
|
+
const onConnect = (publicKey) => {
|
|
243
|
+
const address = publicKey?.toBase58?.();
|
|
244
|
+
listener(address ? [address] : []);
|
|
245
|
+
};
|
|
246
|
+
const onDisconnect = () => listener([]);
|
|
247
|
+
adapter.on('connect', onConnect);
|
|
248
|
+
adapter.on('disconnect', onDisconnect);
|
|
249
|
+
return () => {
|
|
250
|
+
adapter.off('connect', onConnect);
|
|
251
|
+
adapter.off('disconnect', onDisconnect);
|
|
252
|
+
};
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* Bridge half of `onAccountsChanged`. `walletId` is
|
|
256
|
+
* `connectedWalletUuid` — the SAME id BridgeParent's
|
|
257
|
+
* `walletStandardWallets[].uuid` publishes (name+chain based, not a real
|
|
258
|
+
* UUID; see `generateWalletId` in `wallet-standard-discovery.ts`), which
|
|
259
|
+
* this service captured at connect time. The bridge global forwards a
|
|
260
|
+
* plain `string | null` address (never a `PublicKey`); we map it to the
|
|
261
|
+
* `[address]` / `[]` shape `onAccountsChanged`'s direct-mode branch already
|
|
262
|
+
* uses (core reads `[]` as a namespace disconnect).
|
|
263
|
+
*/
|
|
264
|
+
subscribeAccountsChangedViaBridge(listener) {
|
|
265
|
+
const walletId = this.connectedWalletUuid;
|
|
266
|
+
const bridgeSubscribe = window.__uwcSubscribeSolanaWalletEvent;
|
|
267
|
+
if (!walletId || !bridgeSubscribe)
|
|
268
|
+
return undefined;
|
|
269
|
+
return bridgeSubscribe(walletId, address => {
|
|
270
|
+
listener(address ? [address] : []);
|
|
271
|
+
});
|
|
272
|
+
}
|
|
156
273
|
/**
|
|
157
274
|
* Disconnect (clear state only, don't actually disconnect from wallet)
|
|
158
275
|
*/
|
|
159
276
|
disconnect() {
|
|
160
277
|
this.connectedAdapter = null;
|
|
161
278
|
this.account = null;
|
|
279
|
+
this.connectedWalletUuid = null;
|
|
162
280
|
}
|
|
163
281
|
}
|
|
164
282
|
//# sourceMappingURL=solana-wallet-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-wallet-service.js","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,gBAAgB,EAIjB,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,MAAM,OAAO,mBAAmB;IACtB,eAAe,GAAyB,EAAE,CAAA;IAC1C,gBAAgB,GAAyB,IAAI,CAAA;IAC7C,OAAO,GAAkB,IAAI,CAAA;IAC7B,cAAc,CAAgB;IAEtC,YAAY,cAA8B;QACxC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACtC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,mBAAmB,CACvB,kBAAoC,EAAE,EACtC,sBAAsB,GAAG,KAAK,EAC9B,wBAA+D;QAE/D,IAAI,CAAC,eAAe,GAAG,MAAM,gBAAgB,CAC3C,eAAe,EACf,sBAAsB,EACtB,wBAAwB,CACzB,CAAA;IACH,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IACxD,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,uBAAuB,CAC3B,OAAsB,EACtB,UAAkB,EAClB,OAA4C;QAE5C,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,IAAI,IAAI,CAAA;QAClE,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;YAC3D,0DAA0D;YAC1D,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,eAAe,CAAA;YACxB,CAAC;YAED,4DAA4D;YAC5D,iEAAiE;YACjE,IACE,oBAAoB;gBACpB,IAAI,CAAC,cAAc,CAAC,kCAAkC,CAAC,UAAU,CAAC,EAClE,CAAC;gBACD,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAA;gBACnD,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,IAAI,CAAC;wBACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;wBAEvB,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;wBAC3D,IAAI,eAAe,EAAE,CAAC;4BACpB,OAAO,eAAe,CAAA;wBACxB,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,qFAAqF;oBACvF,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,OAAsB,EAAE,UAAkB;QACtD,+BAA+B;QAC/B,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QAEvB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;QAEnD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAA;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"solana-wallet-service.js","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,15 @@ export declare class TonWalletService {
|
|
|
25
25
|
sendTransaction(request: TonNativeTransferRequest): Promise<TransactionResult>;
|
|
26
26
|
checkExistingConnection(): Promise<string | null>;
|
|
27
27
|
buildAvailableAddresses(supportedNetworkIds: string[], address: string): AvailableAddress[];
|
|
28
|
+
/**
|
|
29
|
+
* The current signer address. Prefers the LIVE SDK account (which reflects an
|
|
30
|
+
* in-wallet account switch) over the connect-time cache, converting the raw
|
|
31
|
+
* SDK address to the user-friendly form the connect handshake returned. The
|
|
32
|
+
* tvm signMessage branch claims this to the backend, so it MUST equal the
|
|
33
|
+
* account that actually signs — a stale cache would surface as an invalid
|
|
34
|
+
* signature after a switch. Falls back to the cache when no live SDK account
|
|
35
|
+
* is available (e.g. state seeded via setConnectionState without an SDK).
|
|
36
|
+
*/
|
|
28
37
|
getAccount(): string | null;
|
|
29
38
|
getConnectedJsBridgeKey(): string | null;
|
|
30
39
|
isConnected(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/ton/ton-wallet-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,gBAAgB,EAChB,cAAc,EACd,wBAAwB,EACxB,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;AAO/B,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAW3E,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,oBAAoB,CAAsB;IAClD,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,qBAAqB,CAEd;IACf,OAAO,CAAC,gBAAgB,CAAiD;IACzE,OAAO,CAAC,kBAAkB,CAAuB;IAEjD,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,iBAAiB,CAAI;gBAG3B,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,EACrC,iBAAiB,CAAC,EAAE,MAAM,IAAI;IAO1B,mBAAmB,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,kBAAkB,IAAI,iBAAiB,EAAE;IAIzC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;YAI/C,UAAU;IAWlB,OAAO,CACX,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAqH7C,WAAW,CACf,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,aAAa,CAAC;IAanB,eAAe,CACnB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,iBAAiB,CAAC;IAYvB,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBvD,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAMrB,UAAU,IAAI,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"ton-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/ton/ton-wallet-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,gBAAgB,EAChB,cAAc,EACd,wBAAwB,EACxB,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;AAO/B,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAW3E,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,oBAAoB,CAAsB;IAClD,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,WAAW,CAAqC;IACxD,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,qBAAqB,CAEd;IACf,OAAO,CAAC,gBAAgB,CAAiD;IACzE,OAAO,CAAC,kBAAkB,CAAuB;IAEjD,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,iBAAiB,CAAI;gBAG3B,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,EACrC,iBAAiB,CAAC,EAAE,MAAM,IAAI;IAO1B,mBAAmB,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,kBAAkB,IAAI,iBAAiB,EAAE;IAIzC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;YAI/C,UAAU;IAWlB,OAAO,CACX,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAqH7C,WAAW,CACf,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,aAAa,CAAC;IAanB,eAAe,CACnB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,iBAAiB,CAAC;IAYvB,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBvD,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAMrB;;;;;;;;OAQG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAU3B,uBAAuB,IAAI,MAAM,GAAG,IAAI;IAIxC,WAAW,IAAI,OAAO;IAItB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAI1C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBjC,mCAAmC,CACjC,eAAe,GAAE,cAAc,EAAO,GACrC,MAAM,EAAE;CAOZ"}
|
|
@@ -172,7 +172,22 @@ export class TonWalletService {
|
|
|
172
172
|
.filter(id => id.startsWith('tvm:'))
|
|
173
173
|
.map(networkId => ({ address, networkId: networkId }));
|
|
174
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
* The current signer address. Prefers the LIVE SDK account (which reflects an
|
|
177
|
+
* in-wallet account switch) over the connect-time cache, converting the raw
|
|
178
|
+
* SDK address to the user-friendly form the connect handshake returned. The
|
|
179
|
+
* tvm signMessage branch claims this to the backend, so it MUST equal the
|
|
180
|
+
* account that actually signs — a stale cache would surface as an invalid
|
|
181
|
+
* signature after a switch. Falls back to the cache when no live SDK account
|
|
182
|
+
* is available (e.g. state seeded via setConnectionState without an SDK).
|
|
183
|
+
*/
|
|
175
184
|
getAccount() {
|
|
185
|
+
const liveRawAddress = this.sdkInstance?.account?.address;
|
|
186
|
+
if (liveRawAddress) {
|
|
187
|
+
return this.toUserFriendlyAddress
|
|
188
|
+
? toFriendlyAddress(liveRawAddress, this.toUserFriendlyAddress)
|
|
189
|
+
: liveRawAddress;
|
|
190
|
+
}
|
|
176
191
|
return this.connectedAddress;
|
|
177
192
|
}
|
|
178
193
|
getConnectedJsBridgeKey() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-wallet-service.js","sourceRoot":"","sources":["../../../src/services/ton/ton-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ton-wallet-service.js","sourceRoot":"","sources":["../../../src/services/ton/ton-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,17 @@ export declare class TronWalletService {
|
|
|
45
45
|
* Get current account
|
|
46
46
|
*/
|
|
47
47
|
getAccount(): string | null;
|
|
48
|
+
/**
|
|
49
|
+
* The LIVE default address of the connected Tron provider, resolved at call
|
|
50
|
+
* time from `tronWeb` (bridge providers via async `getDefaultAddress()`,
|
|
51
|
+
* native via `defaultAddress.base58`). Unlike `getAccount()`'s connect-time
|
|
52
|
+
* cache, this reflects an in-wallet account switch, letting the signMessage
|
|
53
|
+
* flow claim the account that ACTUALLY signs (`signMessageV2` signs with the
|
|
54
|
+
* wallet's current default address). Returns null when there is no connected
|
|
55
|
+
* provider or it exposes no address, or the lookup fails; the caller decides
|
|
56
|
+
* whether to throw.
|
|
57
|
+
*/
|
|
58
|
+
getLiveAccount(): Promise<string | null>;
|
|
48
59
|
/**
|
|
49
60
|
* Get connected provider
|
|
50
61
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tron-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/tron/tron-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAA;AAE7B;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,OAAO,CAAsB;IAErC;;OAEG;IACG,mBAAmB,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;;;OAIG;YACW,cAAc;IAU5B;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAWzB;;OAEG;IACG,OAAO,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBtD;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,QAAQ,EAAE,YAAY,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,IAAI;IAKP;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;OAEG;IACH,oBAAoB,IAAI,YAAY,GAAG,IAAI;IAI3C;;OAEG;IACH,UAAU,IAAI,IAAI;IAKlB,mCAAmC,CACjC,eAAe,GAAE,cAAc,EAAO,GACrC,MAAM,EAAE;CASZ"}
|
|
1
|
+
{"version":3,"file":"tron-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/tron/tron-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,gBAAgB,EAChB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAA;AAE7B;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,OAAO,CAAsB;IAErC;;OAEG;IACG,mBAAmB,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;;;OAIG;YACW,cAAc;IAU5B;;OAEG;IACG,uBAAuB,CAC3B,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAWzB;;OAEG;IACG,OAAO,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBtD;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,QAAQ,EAAE,YAAY,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,IAAI;IAKP;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;;;;;;;;OASG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAU9C;;OAEG;IACH,oBAAoB,IAAI,YAAY,GAAG,IAAI;IAI3C;;OAEG;IACH,UAAU,IAAI,IAAI;IAKlB,mCAAmC,CACjC,eAAe,GAAE,cAAc,EAAO,GACrC,MAAM,EAAE;CASZ"}
|
|
@@ -104,6 +104,27 @@ export class TronWalletService {
|
|
|
104
104
|
getAccount() {
|
|
105
105
|
return this.account;
|
|
106
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* The LIVE default address of the connected Tron provider, resolved at call
|
|
109
|
+
* time from `tronWeb` (bridge providers via async `getDefaultAddress()`,
|
|
110
|
+
* native via `defaultAddress.base58`). Unlike `getAccount()`'s connect-time
|
|
111
|
+
* cache, this reflects an in-wallet account switch, letting the signMessage
|
|
112
|
+
* flow claim the account that ACTUALLY signs (`signMessageV2` signs with the
|
|
113
|
+
* wallet's current default address). Returns null when there is no connected
|
|
114
|
+
* provider or it exposes no address, or the lookup fails; the caller decides
|
|
115
|
+
* whether to throw.
|
|
116
|
+
*/
|
|
117
|
+
async getLiveAccount() {
|
|
118
|
+
const provider = this.connectedProvider;
|
|
119
|
+
if (!provider)
|
|
120
|
+
return null;
|
|
121
|
+
try {
|
|
122
|
+
return await this.resolveAddress(provider.tronWeb);
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
107
128
|
/**
|
|
108
129
|
* Get connected provider
|
|
109
130
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tron-wallet-service.js","sourceRoot":"","sources":["../../../src/services/tron/tron-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tron-wallet-service.js","sourceRoot":"","sources":["../../../src/services/tron/tron-wallet-service.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.21.0",
|
|
4
4
|
"description": "Injected connector for Universal Wallet Connector",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -27,11 +27,11 @@
|
|
|
27
27
|
"buffer": "^6.0.3",
|
|
28
28
|
"uuid": "^13.0.0",
|
|
29
29
|
"viem": "^2.54.6",
|
|
30
|
-
"@meshconnect/uwc-bridge-child": "0.
|
|
31
|
-
"@meshconnect/uwc-constants": "0.7.
|
|
32
|
-
"@meshconnect/uwc-ton-connector": "0.
|
|
33
|
-
"@meshconnect/uwc-tron-connector": "0.
|
|
34
|
-
"@meshconnect/uwc-types": "0.
|
|
30
|
+
"@meshconnect/uwc-bridge-child": "0.4.0",
|
|
31
|
+
"@meshconnect/uwc-constants": "0.7.2",
|
|
32
|
+
"@meshconnect/uwc-ton-connector": "0.8.0",
|
|
33
|
+
"@meshconnect/uwc-tron-connector": "0.7.0",
|
|
34
|
+
"@meshconnect/uwc-types": "0.25.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"typescript": "^5.9.3"
|
|
@@ -21,6 +21,12 @@ Object.defineProperty(globalThis, 'window', {
|
|
|
21
21
|
describe('EIP-6963 Discovery', () => {
|
|
22
22
|
beforeEach(() => {
|
|
23
23
|
vi.clearAllMocks()
|
|
24
|
+
// Reset addEventListener/dispatchEvent implementations too — some tests
|
|
25
|
+
// install a mockImplementation on these to simulate a real announcement,
|
|
26
|
+
// and clearAllMocks only clears call history, not the implementation.
|
|
27
|
+
mockWindow.addEventListener.mockReset()
|
|
28
|
+
mockWindow.removeEventListener.mockReset()
|
|
29
|
+
mockWindow.dispatchEvent.mockReset()
|
|
24
30
|
// Reset window properties
|
|
25
31
|
mockWindow.ethereum = undefined
|
|
26
32
|
mockWindow.UWCBridgeChildInitialized = false
|
|
@@ -66,7 +72,9 @@ describe('EIP-6963 Discovery', () => {
|
|
|
66
72
|
|
|
67
73
|
const result = await discoverWallets()
|
|
68
74
|
|
|
69
|
-
expect(result).toEqual(
|
|
75
|
+
expect(result).toEqual(
|
|
76
|
+
mockBridgeWallets.map(wallet => ({ ...wallet, source: 'bridge' }))
|
|
77
|
+
)
|
|
70
78
|
})
|
|
71
79
|
|
|
72
80
|
it('should return empty array when bridge polling times out', async () => {
|
|
@@ -306,7 +314,108 @@ describe('EIP-6963 Discovery', () => {
|
|
|
306
314
|
|
|
307
315
|
const result = await discoverWallets()
|
|
308
316
|
|
|
309
|
-
expect(result).toEqual(
|
|
317
|
+
expect(result).toEqual(
|
|
318
|
+
mockBridgeWallets.map(wallet => ({ ...wallet, source: 'bridge' }))
|
|
319
|
+
)
|
|
320
|
+
})
|
|
321
|
+
})
|
|
322
|
+
|
|
323
|
+
describe('wallet provenance tagging', () => {
|
|
324
|
+
it('tags bridge-sourced wallets as "bridge"', async () => {
|
|
325
|
+
mockWindow.UWCBridgeChildInitialized = true
|
|
326
|
+
mockWindow.eip6963Wallets = [
|
|
327
|
+
{
|
|
328
|
+
uuid: 'bridge-wallet-1',
|
|
329
|
+
name: 'Bridge Wallet',
|
|
330
|
+
icon: 'bridge-icon',
|
|
331
|
+
rdns: 'com.bridge.wallet',
|
|
332
|
+
provider: { request: vi.fn() }
|
|
333
|
+
}
|
|
334
|
+
]
|
|
335
|
+
|
|
336
|
+
const result = await discoverWallets()
|
|
337
|
+
|
|
338
|
+
expect(result).toHaveLength(1)
|
|
339
|
+
expect(result[0].source).toBe('bridge')
|
|
340
|
+
})
|
|
341
|
+
|
|
342
|
+
it('tags locally-announced wallets as "local"', async () => {
|
|
343
|
+
mockWindow.UWCBridgeChildInitialized = false
|
|
344
|
+
|
|
345
|
+
let announceHandler: ((event: unknown) => void) | undefined
|
|
346
|
+
mockWindow.addEventListener.mockImplementation(
|
|
347
|
+
(type: string, handler: (event: unknown) => void) => {
|
|
348
|
+
if (type === 'eip6963:announceProvider') announceHandler = handler
|
|
349
|
+
}
|
|
350
|
+
)
|
|
351
|
+
mockWindow.dispatchEvent.mockImplementation((event: Event) => {
|
|
352
|
+
if (event.type === 'eip6963:requestProvider' && announceHandler) {
|
|
353
|
+
announceHandler({
|
|
354
|
+
type: 'eip6963:announceProvider',
|
|
355
|
+
detail: {
|
|
356
|
+
info: {
|
|
357
|
+
uuid: 'local-wallet-1',
|
|
358
|
+
name: 'Local Wallet',
|
|
359
|
+
icon: 'local-icon',
|
|
360
|
+
rdns: 'io.local.wallet'
|
|
361
|
+
},
|
|
362
|
+
provider: { request: vi.fn() }
|
|
363
|
+
}
|
|
364
|
+
})
|
|
365
|
+
}
|
|
366
|
+
})
|
|
367
|
+
|
|
368
|
+
const result = await discoverWallets()
|
|
369
|
+
|
|
370
|
+
expect(result).toHaveLength(1)
|
|
371
|
+
expect(result[0].source).toBe('local')
|
|
372
|
+
})
|
|
373
|
+
|
|
374
|
+
it('tags the legacy window.ethereum match as "local"', async () => {
|
|
375
|
+
const mockDetectedWallets: any[] = []
|
|
376
|
+
const mockLegacyProvider = {
|
|
377
|
+
request: vi.fn(),
|
|
378
|
+
on: vi.fn(),
|
|
379
|
+
removeListener: vi.fn(),
|
|
380
|
+
isMetaMask: true
|
|
381
|
+
}
|
|
382
|
+
mockWindow.ethereum = mockLegacyProvider
|
|
383
|
+
|
|
384
|
+
vi.doMock('./eip6963-discovery', async () => {
|
|
385
|
+
const actual = await vi.importActual('./eip6963-discovery')
|
|
386
|
+
return {
|
|
387
|
+
...actual,
|
|
388
|
+
discoverWallets: vi.fn().mockResolvedValue(mockDetectedWallets)
|
|
389
|
+
}
|
|
390
|
+
})
|
|
391
|
+
|
|
392
|
+
const { getAvailableWallets } = await import('./eip6963-discovery')
|
|
393
|
+
const result = await getAvailableWallets([
|
|
394
|
+
{
|
|
395
|
+
id: 'metamask',
|
|
396
|
+
name: 'MetaMask',
|
|
397
|
+
metadata: {
|
|
398
|
+
uuid: 'metamask-uuid',
|
|
399
|
+
icon: 'metamask-icon',
|
|
400
|
+
rdns: 'io.metamask'
|
|
401
|
+
},
|
|
402
|
+
extensionInjectedProvider: {
|
|
403
|
+
supportedNetworkIds: ['eip155:1'] as const,
|
|
404
|
+
namespaceMetaData: {
|
|
405
|
+
eip155: {
|
|
406
|
+
eip155Name: 'MetaMask',
|
|
407
|
+
injectedId: 'isMetaMask',
|
|
408
|
+
supportsAddingNetworks: true,
|
|
409
|
+
requiresUserApprovalOnNetworkSwitch: false
|
|
410
|
+
}
|
|
411
|
+
},
|
|
412
|
+
requiresUserApprovalOnNamespaceSwitch: false
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
])
|
|
416
|
+
|
|
417
|
+
expect(result).toHaveLength(1)
|
|
418
|
+
expect(result[0].source).toBe('local')
|
|
310
419
|
})
|
|
311
420
|
})
|
|
312
421
|
})
|
package/src/eip6963-discovery.ts
CHANGED
|
@@ -61,6 +61,19 @@ export interface DetectedWallet {
|
|
|
61
61
|
icon: string
|
|
62
62
|
rdns: string
|
|
63
63
|
provider: EthereumProvider
|
|
64
|
+
/**
|
|
65
|
+
* Which injection context this wallet's uuid/provider came from. `'bridge'`
|
|
66
|
+
* means the provider lives in the TOP frame (marshalled via
|
|
67
|
+
* `window.eip6963Wallets` by `@meshconnect/uwc-bridge-child`) — connecting
|
|
68
|
+
* through it grants the wallet permission to the embedder's origin.
|
|
69
|
+
* `'local'` means it was discovered by THIS frame's own EIP-6963 listener
|
|
70
|
+
* (either the bridge yielded nothing and we fell back, or we're not
|
|
71
|
+
* bridged at all) — connecting through it grants permission to the
|
|
72
|
+
* iframe's own origin. The two are never interchangeable: a listener
|
|
73
|
+
* attached to the wrong context's provider silently never fires, since
|
|
74
|
+
* wallet extensions scope `accountsChanged` per origin.
|
|
75
|
+
*/
|
|
76
|
+
source: 'bridge' | 'local'
|
|
64
77
|
}
|
|
65
78
|
|
|
66
79
|
/**
|
|
@@ -89,8 +102,13 @@ async function pollForBridgeWallets(): Promise<DetectedWallet[]> {
|
|
|
89
102
|
if (window.eip6963Wallets && Array.isArray(window.eip6963Wallets)) {
|
|
90
103
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
91
104
|
// @ts-ignore
|
|
92
|
-
const bridgeWallets = window.eip6963Wallets as
|
|
93
|
-
|
|
105
|
+
const bridgeWallets = window.eip6963Wallets as Array<
|
|
106
|
+
Omit<DetectedWallet, 'source'>
|
|
107
|
+
>
|
|
108
|
+
// The bridge child marshals entries without a `source` tag (it predates
|
|
109
|
+
// this field) — every entry it produces is, by construction, sourced
|
|
110
|
+
// from the TOP frame's BridgeParent discovery.
|
|
111
|
+
resolve(bridgeWallets.map(wallet => ({ ...wallet, source: 'bridge' })))
|
|
94
112
|
return
|
|
95
113
|
}
|
|
96
114
|
|
|
@@ -142,7 +160,10 @@ export async function discoverWallets(): Promise<DetectedWallet[]> {
|
|
|
142
160
|
name: info.name,
|
|
143
161
|
icon: info.icon,
|
|
144
162
|
rdns: info.rdns,
|
|
145
|
-
provider
|
|
163
|
+
provider,
|
|
164
|
+
// Announced directly to THIS frame's own listener, not relayed via
|
|
165
|
+
// the bridge — see the DetectedWallet.source doc above.
|
|
166
|
+
source: 'local'
|
|
146
167
|
})
|
|
147
168
|
}
|
|
148
169
|
}
|
|
@@ -207,7 +228,10 @@ export async function getAvailableWallets(
|
|
|
207
228
|
?.eip155Name || matchedWallet.name,
|
|
208
229
|
icon: matchedWallet.metadata['icon'] || '',
|
|
209
230
|
rdns: matchedWallet.metadata['rdns'] || '',
|
|
210
|
-
provider: legacyProvider
|
|
231
|
+
provider: legacyProvider,
|
|
232
|
+
// window.ethereum is always read from THIS frame's own global —
|
|
233
|
+
// see the DetectedWallet.source doc above.
|
|
234
|
+
source: 'local'
|
|
211
235
|
})
|
|
212
236
|
}
|
|
213
237
|
}
|