@meshconnect/uwc-injected-connector 0.16.6 → 0.17.1

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.
@@ -33,12 +33,21 @@ export function parseError(error) {
33
33
  }
34
34
  let message;
35
35
  let isRejected = false;
36
+ // Preserve the numeric provider code so the classifier can place it (e.g.
37
+ // -32002 "already pending" → provider_error); it is lost at wrap time otherwise.
38
+ let numericCode;
36
39
  // Handle different error formats
37
40
  if (error && typeof error === 'object') {
38
41
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
39
42
  const errorObj = error;
43
+ // Read once — a wallet-controlled getter/proxy could yield inconsistent
44
+ // values or throw on repeated access.
45
+ const code = errorObj.code;
46
+ if (typeof code === 'number' && Number.isInteger(code)) {
47
+ numericCode = code;
48
+ }
40
49
  // Check for EIP-1193 error code
41
- if (errorObj.code === 4001 || errorObj.code === 'ACTION_REJECTED') {
50
+ if (code === 4001 || code === 'ACTION_REJECTED') {
42
51
  isRejected = true;
43
52
  }
44
53
  // Extract message
@@ -77,7 +86,8 @@ export function parseError(error) {
77
86
  }
78
87
  const walletError = {
79
88
  type: isRejected ? 'rejected' : 'unknown',
80
- message
89
+ message,
90
+ ...(numericCode !== undefined ? { code: numericCode } : {})
81
91
  };
82
92
  throw new WalletConnectorError(walletError);
83
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/utils/error-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,MAAM,GAAG,GACP,KAAK,YAAY,KAAK;QACpB,CAAC,CAAC,KAAK,CAAC,OAAO;QACf,CAAC,CAAC,KAAK;YACH,OAAO,KAAK,KAAK,QAAQ;YACzB,SAAS,IAAI,KAAK;YAClB,OAAQ,KAA8B,CAAC,OAAO,KAAK,QAAQ;YAC7D,CAAC,CAAE,KAA6B,CAAC,OAAO;YACxC,CAAC,CAAC,EAAE,CAAA;IAEV,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAA;IAEnB,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;IACtC,IAAI,QAAQ,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,wEAAwE;IACxE,yEAAyE;IACzE,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;QAC1C,MAAM,KAAK,CAAA;IACb,CAAC;IAED,IAAI,OAAe,CAAA;IACnB,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,iCAAiC;IACjC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,KAAY,CAAA;QAE7B,gCAAgC;QAChC,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAClE,UAAU,GAAG,IAAI,CAAA;QACnB,CAAC;QAED,kBAAkB;QAClB,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;QAC5B,CAAC;aAAM,IAAI,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;YACnC,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAA;QAClC,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;IAED,4DAA4D;IAC5D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,iBAAiB,GAAG;YACxB,eAAe;YACf,aAAa;YACb,gBAAgB;YAChB,eAAe;YACf,kBAAkB;YAClB,gBAAgB;YAChB,mBAAmB;YACnB,kBAAkB;YAClB,kBAAkB;YAClB,eAAe;YACf,iBAAiB;YACjB,gBAAgB;YAChB,cAAc;SACf,CAAA;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;QAC1C,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAC5C,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAC7C,CAAA;IACH,CAAC;IAED,MAAM,WAAW,GAAgB;QAC/B,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QACzC,OAAO;KACR,CAAA;IAED,MAAM,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAA;AAC7C,CAAC"}
1
+ {"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/utils/error-utils.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,19 @@
5
5
  */
6
6
  import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base';
7
7
  import type { Transaction } from '@solana/web3.js';
8
+ import type { WalletMetadata } from '@meshconnect/uwc-types';
9
+ import { LegacyInjectedSolanaWalletAdapter } from './legacy-injected-solana-adapter';
10
+ /**
11
+ * Telemetry sink for the legacy injected-Solana fallback. Fires only when a
12
+ * wallet declares `solana.injectedId` and a global exists at that path but is
13
+ * NOT a valid Solana provider (wrong method surface) — the actionable
14
+ * "the wallet changed its injected provider" signal. An absent global is a
15
+ * normal not-installed case and is intentionally not reported.
16
+ */
17
+ export type LegacyInjectedSolanaDiscoveryFailure = (info: {
18
+ injectedId: string;
19
+ walletName: string;
20
+ }) => void;
8
21
  export interface ExtendedStandardWalletAdapter extends StandardWalletAdapter {
9
22
  customFunctions: ('sendSerializedTransaction' | 'signSerializedTransaction' | 'signAllSerializedTransactions' | 'signSolanaTransactionBytes')[];
10
23
  sendSerializedTransaction: (transaction: unknown, rpcUrl: string) => Promise<string>;
@@ -12,16 +25,22 @@ export interface ExtendedStandardWalletAdapter extends StandardWalletAdapter {
12
25
  signAllSerializedTransactions: (transactions: unknown[]) => Promise<Error | Transaction[]>;
13
26
  signSolanaTransactionBytes: (transaction: unknown, connectedAddress?: string) => Promise<Uint8Array>;
14
27
  }
15
- export type SolanaAdapter = ExtendedStandardWalletAdapter | StandardWalletAdapter;
28
+ export type SolanaAdapter = ExtendedStandardWalletAdapter | StandardWalletAdapter | LegacyInjectedSolanaWalletAdapter;
16
29
  export interface WalletStandardInfo {
17
30
  uuid: string;
18
31
  name: string;
19
32
  chains: string[];
20
33
  features: string[];
21
34
  adapter: SolanaAdapter | undefined;
35
+ /**
36
+ * True only for entries produced by the legacy injected-Solana fallback (a
37
+ * `window[injectedId]` global), false/absent for Wallet Standard registry
38
+ * wallets. Lets detection report which discovery path matched (MFS-805).
39
+ */
40
+ legacyInjected?: boolean;
22
41
  }
23
42
  /**
24
43
  * Gets all available Solana wallets using Wallet Standard
25
44
  */
26
- export declare function getSolanaWallets(): Promise<WalletStandardInfo[]>;
45
+ export declare function getSolanaWallets(expectedWallets?: WalletMetadata[], usingIntegratedBrowser?: boolean, onLegacyDiscoveryFailure?: LegacyInjectedSolanaDiscoveryFailure): Promise<WalletStandardInfo[]>;
27
46
  //# sourceMappingURL=wallet-standard-discovery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"wallet-standard-discovery.d.ts","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAGlD,MAAM,WAAW,6BAA8B,SAAQ,qBAAqB;IAC1E,eAAe,EAAE,CACb,2BAA2B,GAC3B,2BAA2B,GAC3B,+BAA+B,GAC/B,4BAA4B,CAC/B,EAAE,CAAA;IACH,yBAAyB,EAAE,CACzB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,CAAA;IACpB,yBAAyB,EAAE,CACzB,WAAW,EAAE,OAAO,KACjB,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC,CAAA;IACjC,6BAA6B,EAAE,CAC7B,YAAY,EAAE,OAAO,EAAE,KACpB,OAAO,CAAC,KAAK,GAAG,WAAW,EAAE,CAAC,CAAA;IAGnC,0BAA0B,EAAE,CAC1B,WAAW,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,MAAM,KACtB,OAAO,CAAC,UAAU,CAAC,CAAA;CACzB;AAED,MAAM,MAAM,aAAa,GACrB,6BAA6B,GAC7B,qBAAqB,CAAA;AAEzB,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,aAAa,GAAG,SAAS,CAAA;CACnC;AAiDD;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwCtE"}
1
+ {"version":3,"file":"wallet-standard-discovery.d.ts","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAG5D,OAAO,EACL,iCAAiC,EAGlC,MAAM,kCAAkC,CAAA;AAEzC;;;;;;GAMG;AACH,MAAM,MAAM,oCAAoC,GAAG,CAAC,IAAI,EAAE;IACxD,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB,KAAK,IAAI,CAAA;AAEV,MAAM,WAAW,6BAA8B,SAAQ,qBAAqB;IAC1E,eAAe,EAAE,CACb,2BAA2B,GAC3B,2BAA2B,GAC3B,+BAA+B,GAC/B,4BAA4B,CAC/B,EAAE,CAAA;IACH,yBAAyB,EAAE,CACzB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,CAAA;IACpB,yBAAyB,EAAE,CACzB,WAAW,EAAE,OAAO,KACjB,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC,CAAA;IACjC,6BAA6B,EAAE,CAC7B,YAAY,EAAE,OAAO,EAAE,KACpB,OAAO,CAAC,KAAK,GAAG,WAAW,EAAE,CAAC,CAAA;IAGnC,0BAA0B,EAAE,CAC1B,WAAW,EAAE,OAAO,EACpB,gBAAgB,CAAC,EAAE,MAAM,KACtB,OAAO,CAAC,UAAU,CAAC,CAAA;CACzB;AAED,MAAM,MAAM,aAAa,GACrB,6BAA6B,GAC7B,qBAAqB,GAKrB,iCAAiC,CAAA;AAErC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,aAAa,GAAG,SAAS,CAAA;IAClC;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAiDD;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,eAAe,GAAE,cAAc,EAAO,EACtC,sBAAsB,UAAQ,EAC9B,wBAAwB,CAAC,EAAE,oCAAoC,GAC9D,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAkG/B"}
@@ -6,7 +6,9 @@
6
6
  import { getWallets } from '@wallet-standard/app';
7
7
  import { isWalletAdapterCompatibleStandardWallet } from '@solana/wallet-adapter-base';
8
8
  import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base';
9
+ import { solanaNetwork } from '@meshconnect/uwc-constants';
9
10
  import { BRIDGE_WALLET_POLL_MS } from './bridge-poll';
11
+ import { LegacyInjectedSolanaWalletAdapter, getInjectedSolanaProvider, resolveInjectedProperty } from './legacy-injected-solana-adapter';
10
12
  /**
11
13
  * Polls for bridge wallets when UWCBridgeInitialized is true
12
14
  * @returns Promise that resolves to an array of detected wallets from the bridge
@@ -51,7 +53,11 @@ async function pollForBridgeWallets() {
51
53
  /**
52
54
  * Gets all available Solana wallets using Wallet Standard
53
55
  */
54
- export async function getSolanaWallets() {
56
+ export async function getSolanaWallets(expectedWallets = [], usingIntegratedBrowser = false, onLegacyDiscoveryFailure) {
57
+ // No wallets to discover outside a browser (SSR / non-DOM) — every path below
58
+ // touches `window`.
59
+ if (typeof window === 'undefined')
60
+ return [];
55
61
  // UWCBridgeChildInitialized is only initialized if app runs in an iframe. We can skip checking for bridge proxy providers when it's not necessary.
56
62
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
57
63
  // @ts-ignore - window.UWCBridgeInitialized is set by the bridge
@@ -64,6 +70,9 @@ export async function getSolanaWallets() {
64
70
  const { get } = getWallets();
65
71
  const wallets = get();
66
72
  const solanaWallets = [];
73
+ // Lowercased names — dedupe must match core's case-insensitive Solana name
74
+ // matching, so a legacy entry can't slip past a registry wallet that differs
75
+ // only by casing.
67
76
  const walletNames = new Set();
68
77
  // First, get wallets from Wallet Standard
69
78
  for (const wallet of wallets) {
@@ -73,16 +82,64 @@ export async function getSolanaWallets() {
73
82
  if (isWalletAdapterCompatibleStandardWallet(wallet)) {
74
83
  adapter = new StandardWalletAdapter({ wallet });
75
84
  }
85
+ // Key the uuid on the wallet's first `solana:` chain (not `chains[0]`):
86
+ // multi-chain wallets may list a non-Solana chain first, which would make
87
+ // the id depend on chain ordering.
88
+ const solanaChain = wallet.chains?.find(chain => chain.startsWith('solana:')) ||
89
+ wallet.chains?.[0] ||
90
+ 'unknown';
76
91
  solanaWallets.push({
77
- uuid: generateWalletId(wallet),
92
+ uuid: generateWalletId(wallet.name, solanaChain),
78
93
  name: wallet.name,
79
94
  chains: (wallet.chains || []),
80
95
  features: Object.keys(wallet.features),
81
96
  adapter: adapter
82
97
  });
83
- walletNames.add(wallet.name);
98
+ walletNames.add(wallet.name.toLowerCase());
84
99
  }
85
100
  }
101
+ // Legacy injected-Solana fallback (MFS-805): wallets whose in-app browser
102
+ // exposes Solana only via a `window[injectedId]` global and never register with
103
+ // the Wallet Standard registry (first: Coinbase/Base Legacy mode). Metadata-
104
+ // driven, mirroring the EVM/TRON `injectedId` pattern — no wallet hardcoded.
105
+ for (const expected of expectedWallets) {
106
+ // Name + injectedId come ONLY from the provider core will match against —
107
+ // the session-matched one (mirrors applyDetectedWallet's `pickProvider`).
108
+ // No fallback to the other provider: core reads only `pickProvider(w)`, so a
109
+ // cross-provider entry (e.g. named from the extension while the session is
110
+ // the in-wallet browser) would be discovered but never marked `installed` —
111
+ // a dead entry. Skipping it is fail-closed and honest.
112
+ const sessionProvider = usingIntegratedBrowser
113
+ ? expected.integratedBrowserInjectedProvider
114
+ : expected.extensionInjectedProvider;
115
+ const solanaMeta = sessionProvider?.namespaceMetaData?.solana;
116
+ const injectedId = solanaMeta?.injectedId;
117
+ const name = solanaMeta?.walletStandardName;
118
+ if (!injectedId || !name || walletNames.has(name.toLowerCase()))
119
+ continue;
120
+ if (!getInjectedSolanaProvider(injectedId)) {
121
+ // A global exists but isn't a valid Solana provider → actionable (the
122
+ // wallet changed its shape); an absent global is just not-installed.
123
+ if (resolveInjectedProperty(injectedId)) {
124
+ onLegacyDiscoveryFailure?.({ injectedId, walletName: name });
125
+ }
126
+ continue;
127
+ }
128
+ solanaWallets.push({
129
+ uuid: generateWalletId(name, solanaNetwork.id),
130
+ name,
131
+ chains: [solanaNetwork.id],
132
+ features: [
133
+ 'solana:signTransaction',
134
+ 'solana:signAllTransactions',
135
+ 'solana:signMessage',
136
+ 'solana:signAndSendTransaction'
137
+ ],
138
+ adapter: new LegacyInjectedSolanaWalletAdapter(injectedId, name),
139
+ legacyInjected: true
140
+ });
141
+ walletNames.add(name.toLowerCase());
142
+ }
86
143
  return solanaWallets;
87
144
  }
88
145
  /**
@@ -94,10 +151,9 @@ function isSolanaWallet(wallet) {
94
151
  return hasSolanaChain;
95
152
  }
96
153
  /**
97
- * Generate a unique ID for a wallet
154
+ * Generate a unique, stable ID for a wallet from its name + primary chain.
98
155
  */
99
- function generateWalletId(wallet) {
100
- const chain = wallet.chains?.[0] || 'unknown';
101
- return `${wallet.name}-${chain}`.toLowerCase().replace(/\s+/g, '-');
156
+ function generateWalletId(name, chain) {
157
+ return `${name}-${chain}`.toLowerCase().replace(/\s+/g, '-');
102
158
  }
103
159
  //# sourceMappingURL=wallet-standard-discovery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wallet-standard-discovery.js","sourceRoot":"","sources":["../src/wallet-standard-discovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wallet-standard-discovery.js","sourceRoot":"","sources":["../src/wallet-standard-discovery.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.16.6",
3
+ "version": "0.17.1",
4
4
  "description": "Injected connector for Universal Wallet Connector",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -28,10 +28,10 @@
28
28
  "uuid": "^13.0.0",
29
29
  "viem": "^2.54.6",
30
30
  "@meshconnect/uwc-bridge-child": "0.3.0",
31
- "@meshconnect/uwc-constants": "0.6.11",
32
- "@meshconnect/uwc-ton-connector": "0.7.3",
33
- "@meshconnect/uwc-tron-connector": "0.5.1",
34
- "@meshconnect/uwc-types": "0.20.0"
31
+ "@meshconnect/uwc-constants": "0.6.13",
32
+ "@meshconnect/uwc-ton-connector": "0.7.5",
33
+ "@meshconnect/uwc-tron-connector": "0.5.3",
34
+ "@meshconnect/uwc-types": "0.22.0"
35
35
  },
36
36
  "devDependencies": {
37
37
  "typescript": "^5.9.3"
@@ -18,6 +18,10 @@ vi.mock('./services/transaction-service')
18
18
  vi.mock('@meshconnect/uwc-tron-connector', () => ({
19
19
  TronConnector: vi.fn()
20
20
  }))
21
+ vi.mock('@meshconnect/uwc-bridge-child', async importOriginal => ({
22
+ ...(await importOriginal<Record<string, unknown>>()),
23
+ BridgeChild: vi.fn()
24
+ }))
21
25
 
22
26
  describe('InjectedConnector', () => {
23
27
  let connector: InjectedConnector
@@ -30,7 +34,7 @@ describe('InjectedConnector', () => {
30
34
 
31
35
  // Create connector
32
36
  connector = new InjectedConnector({
33
- 'eip155:1': 'https://eth-rpc.example.com'
37
+ networkRpcMap: { 'eip155:1': 'https://eth-rpc.example.com' }
34
38
  })
35
39
 
36
40
  // Setup mock provider
@@ -71,7 +75,7 @@ describe('InjectedConnector', () => {
71
75
  'eip155:1': 'https://mainnet.infura.io/v3/test',
72
76
  'eip155:137': 'https://polygon-rpc.com'
73
77
  }
74
- const newConnector = new InjectedConnector(networkRpcMap)
78
+ const newConnector = new InjectedConnector({ networkRpcMap })
75
79
  expect(newConnector).toBeDefined()
76
80
  })
77
81
 
@@ -98,6 +102,110 @@ describe('InjectedConnector', () => {
98
102
  })
99
103
  })
100
104
 
105
+ describe('constructor options wiring', () => {
106
+ it('defaults every option when constructed with no arguments', async () => {
107
+ const { TransactionService } =
108
+ await import('./services/transaction-service')
109
+ const { TronConnector } = await import('@meshconnect/uwc-tron-connector')
110
+ const { BridgeChild } = await import('@meshconnect/uwc-bridge-child')
111
+
112
+ new InjectedConnector()
113
+
114
+ // Empty rpc map, no Mesh Tron connector, and a bridge with no error sink.
115
+ expect(TransactionService).toHaveBeenCalledWith({})
116
+ expect(TronConnector).not.toHaveBeenCalled()
117
+ const bridgeOpts = vi.mocked(BridgeChild).mock.calls.at(-1)![0] as {
118
+ onError?: unknown
119
+ }
120
+ expect(bridgeOpts.onError).toBeUndefined()
121
+ })
122
+
123
+ it('routes networkRpcMap to the TransactionService', async () => {
124
+ const { TransactionService } =
125
+ await import('./services/transaction-service')
126
+ const networkRpcMap = { 'eip155:1': 'https://rpc.example.com' }
127
+
128
+ new InjectedConnector({ networkRpcMap })
129
+
130
+ expect(TransactionService).toHaveBeenCalledWith(networkRpcMap)
131
+ })
132
+
133
+ it('constructs the Mesh Tron connector only when tronConnectorConfig is set', async () => {
134
+ const { TronConnector } = await import('@meshconnect/uwc-tron-connector')
135
+ const tronConnectorConfig = { enabledWallets: ['trust'] } as never
136
+
137
+ new InjectedConnector({ tronConnectorConfig })
138
+
139
+ expect(TronConnector).toHaveBeenCalledWith(tronConnectorConfig)
140
+ })
141
+
142
+ it('wires onBridgeError into BridgeChild.onError', async () => {
143
+ const { BridgeChild } = await import('@meshconnect/uwc-bridge-child')
144
+ const onBridgeError = vi.fn()
145
+
146
+ new InjectedConnector({ onBridgeError })
147
+
148
+ const bridgeOpts = vi.mocked(BridgeChild).mock.calls.at(-1)![0] as {
149
+ onError?: unknown
150
+ }
151
+ expect(bridgeOpts.onError).toBe(onBridgeError)
152
+ })
153
+
154
+ it('threads usingIntegratedBrowser + a deduping failure sink into Solana discovery', async () => {
155
+ const { SolanaWalletService } =
156
+ await import('./services/solana/solana-wallet-service')
157
+ const onLegacyDiscoveryFailure = vi.fn()
158
+ const expectedWallets = [{ id: 'coinbase' }] as never
159
+
160
+ const c = new InjectedConnector({
161
+ usingIntegratedBrowser: true,
162
+ onLegacyDiscoveryFailure
163
+ })
164
+ const solService = vi
165
+ .mocked(SolanaWalletService)
166
+ .mock.results.at(-1)!.value
167
+ solService.getDetectedWallets.mockReturnValue([])
168
+
169
+ await c.getAvailableWallets('solana', expectedWallets)
170
+
171
+ const call = solService.initializeDiscovery.mock.calls.at(-1)!
172
+ expect(call[0]).toBe(expectedWallets)
173
+ expect(call[1]).toBe(true)
174
+ const sink = call[2] as (info: {
175
+ injectedId: string
176
+ walletName: string
177
+ }) => void
178
+ expect(typeof sink).toBe('function')
179
+
180
+ // Deduped: the same injectedId reported across repeated detection cycles
181
+ // forwards once; a new injectedId forwards again.
182
+ sink({ injectedId: 'coinbaseSolana', walletName: 'Base Wallet' })
183
+ sink({ injectedId: 'coinbaseSolana', walletName: 'Base Wallet' })
184
+ expect(onLegacyDiscoveryFailure).toHaveBeenCalledTimes(1)
185
+ sink({ injectedId: 'phantomSolana', walletName: 'Phantom' })
186
+ expect(onLegacyDiscoveryFailure).toHaveBeenCalledTimes(2)
187
+ })
188
+
189
+ it('defaults Solana discovery to the extension flow (usingIntegratedBrowser false, no failure sink)', async () => {
190
+ const { SolanaWalletService } =
191
+ await import('./services/solana/solana-wallet-service')
192
+
193
+ const c = new InjectedConnector()
194
+ const solService = vi
195
+ .mocked(SolanaWalletService)
196
+ .mock.results.at(-1)!.value
197
+ solService.getDetectedWallets.mockReturnValue([])
198
+
199
+ await c.getAvailableWallets('solana', [])
200
+
201
+ expect(solService.initializeDiscovery).toHaveBeenCalledWith(
202
+ [],
203
+ false,
204
+ undefined
205
+ )
206
+ })
207
+ })
208
+
101
209
  describe('getAvailableWallets', () => {
102
210
  it('should return Ethereum wallets for eip155 namespace', async () => {
103
211
  const { EthereumWalletService } =
@@ -268,13 +376,10 @@ describe('InjectedConnector', () => {
268
376
  vi.mocked(TronConnector).mockImplementation(function () {
269
377
  return { connect: tronConnect } as never
270
378
  } as never)
271
- const c = new InjectedConnector(
272
- {},
273
- [],
274
- undefined,
275
- { enabledWallets: ['trust'] } as never,
276
- [mockNetwork, tronNetwork]
277
- )
379
+ const c = new InjectedConnector({
380
+ tronConnectorConfig: { enabledWallets: ['trust'] } as never,
381
+ networks: [mockNetwork, tronNetwork]
382
+ })
278
383
  const { ConnectionManager } =
279
384
  await import('./services/connection-manager')
280
385
  const connManager = vi
@@ -41,10 +41,43 @@ import { StorageService } from './services/storage-service'
41
41
  import { ConnectionManager } from './services/connection-manager'
42
42
  import { SignatureService } from './services/signature-service'
43
43
  import { TransactionService } from './services/transaction-service'
44
- import type { ExtendedStandardWalletAdapter } from './wallet-standard-discovery'
44
+ import type {
45
+ ExtendedStandardWalletAdapter,
46
+ LegacyInjectedSolanaDiscoveryFailure
47
+ } from './wallet-standard-discovery'
45
48
  import { parseError } from './utils/error-utils'
46
49
  import { resolveSigningAccount } from './utils/solana-account-utils'
47
50
 
51
+ /**
52
+ * Constructor options for {@link InjectedConnector}. A single typed bag instead
53
+ * of positional args: the two optional trailing callbacks (`onBridgeError`,
54
+ * `onLegacyDiscoveryFailure`) occupy the same positional slot shape, so
55
+ * positional passing risked wiring one where the other was expected — named
56
+ * fields remove the ambiguity (the same reason the WalletConnect connector
57
+ * moved to an options object).
58
+ */
59
+ export interface InjectedConnectorOptions {
60
+ networkRpcMap?: NetworkRpcMap | undefined
61
+ expectedWallets?: WalletMetadata[] | undefined
62
+ tonConnectConfig?: TonConnectConfig | undefined
63
+ tronConnectorConfig?: TronConnectorConfig | undefined
64
+ networks?: Network[] | undefined
65
+ /** Optional sink for BridgeChild discovery failures (wired to UWC's observer). */
66
+ onBridgeError?:
67
+ | ((info: { namespace: string; message: string }) => void)
68
+ | undefined
69
+ /**
70
+ * Whether this session runs inside a wallet's in-app browser. Selects which
71
+ * injected provider's Solana name the legacy fallback surfaces.
72
+ */
73
+ usingIntegratedBrowser?: boolean | undefined
74
+ /**
75
+ * Telemetry sink invoked when a configured legacy injected-Solana global is
76
+ * present but the wrong shape (see wallet-standard-discovery).
77
+ */
78
+ onLegacyDiscoveryFailure?: LegacyInjectedSolanaDiscoveryFailure | undefined
79
+ }
80
+
48
81
  export class InjectedConnector implements Connector {
49
82
  private readonly storageService: StorageService
50
83
  private ethereumService: EthereumWalletService
@@ -67,18 +100,42 @@ export class InjectedConnector implements Connector {
67
100
  * Tron auto-connect (see `enrichWithTron`).
68
101
  */
69
102
  private networks: Network[]
103
+ /**
104
+ * Selects which injected provider's Solana name the legacy fallback surfaces,
105
+ * so it matches what core's `connectSolana` compares against.
106
+ */
107
+ private usingIntegratedBrowser: boolean
108
+ private onLegacyDiscoveryFailure?:
109
+ | LegacyInjectedSolanaDiscoveryFailure
110
+ | undefined
111
+ /** injectedIds already reported this session — dedupes the emit across the
112
+ * repeated Solana detection cycles (mirrors the bridgeError source dedup). */
113
+ private readonly reportedLegacyFailures = new Set<string>()
114
+
115
+ /** Forward a legacy Solana discovery failure to the sink, once per injectedId. */
116
+ private reportLegacyDiscoveryFailure: LegacyInjectedSolanaDiscoveryFailure =
117
+ info => {
118
+ if (this.reportedLegacyFailures.has(info.injectedId)) return
119
+ this.reportedLegacyFailures.add(info.injectedId)
120
+ this.onLegacyDiscoveryFailure?.(info)
121
+ }
122
+
123
+ constructor(options: InjectedConnectorOptions = {}) {
124
+ const {
125
+ networkRpcMap = {},
126
+ expectedWallets = [],
127
+ tonConnectConfig,
128
+ tronConnectorConfig,
129
+ networks = [],
130
+ onBridgeError,
131
+ usingIntegratedBrowser = false,
132
+ onLegacyDiscoveryFailure
133
+ } = options
70
134
 
71
- constructor(
72
- networkRpcMap: NetworkRpcMap = {},
73
- expectedWallets: WalletMetadata[] = [],
74
- tonConnectConfig?: TonConnectConfig,
75
- tronConnectorConfig?: TronConnectorConfig,
76
- networks: Network[] = [],
77
- // Optional sink for BridgeChild discovery failures (wired to UWC's observer).
78
- onBridgeError?: (info: { namespace: string; message: string }) => void
79
- ) {
80
135
  this.networkRpcMap = networkRpcMap
81
136
  this.networks = networks
137
+ this.usingIntegratedBrowser = usingIntegratedBrowser
138
+ this.onLegacyDiscoveryFailure = onLegacyDiscoveryFailure
82
139
  this.tonConnectManifestUrl = tonConnectConfig?.manifestUrl
83
140
  this.tronConnector = tronConnectorConfig
84
141
  ? new TronConnector(tronConnectorConfig)
@@ -142,13 +199,25 @@ export class InjectedConnector implements Connector {
142
199
 
143
200
  case 'solana': {
144
201
  // Re-fetch Solana wallets
145
- await this.solanaService.initializeDiscovery()
202
+ await this.solanaService.initializeDiscovery(
203
+ expectedWallets,
204
+ this.usingIntegratedBrowser,
205
+ this.onLegacyDiscoveryFailure
206
+ ? this.reportLegacyDiscoveryFailure
207
+ : undefined
208
+ )
146
209
 
147
210
  // Convert to DetectedWalletInfo format
148
211
  return this.solanaService.getDetectedWallets().map(wallet => ({
149
212
  uuid: wallet.uuid,
150
213
  name: wallet.name,
151
- features: wallet.features
214
+ features: wallet.features,
215
+ // Include the flag only for legacy-fallback entries — registry wallets
216
+ // leave it absent (never `legacyInjected: undefined`), matching the
217
+ // "absent = registry" contract and exactOptionalPropertyTypes.
218
+ ...(wallet.legacyInjected !== undefined && {
219
+ legacyInjected: wallet.legacyInjected
220
+ })
152
221
  }))
153
222
  }
154
223