@meshconnect/uwc-injected-connector 0.26.3 → 0.27.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.
- package/dist/injected-connector.d.ts.map +1 -1
- package/dist/injected-connector.js +13 -3
- package/dist/injected-connector.js.map +1 -1
- package/dist/services/connection-manager.d.ts +3 -1
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js +49 -21
- 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-builder.js +5 -0
- package/dist/services/ethereum/ethereum-transaction-builder.js.map +1 -1
- package/dist/services/ethereum/ethereum-transaction-service.d.ts.map +1 -1
- package/dist/services/ethereum/ethereum-transaction-service.js +1 -0
- package/dist/services/ethereum/ethereum-transaction-service.js.map +1 -1
- package/dist/services/solana/solana-wallet-service.d.ts +19 -0
- package/dist/services/solana/solana-wallet-service.d.ts.map +1 -1
- package/dist/services/solana/solana-wallet-service.js +43 -0
- package/dist/services/solana/solana-wallet-service.js.map +1 -1
- package/dist/utils/error-utils.d.ts.map +1 -1
- package/dist/utils/error-utils.js +47 -3
- package/dist/utils/error-utils.js.map +1 -1
- package/package.json +6 -6
- package/src/injected-connector.test.ts +67 -0
- package/src/injected-connector.ts +18 -3
- package/src/services/connection-manager.test.ts +446 -0
- package/src/services/connection-manager.ts +84 -48
- package/src/services/ethereum/ethereum-transaction-builder.test.ts +3 -1
- package/src/services/ethereum/ethereum-transaction-builder.ts +5 -0
- package/src/services/ethereum/ethereum-transaction-service.test.ts +206 -0
- package/src/services/ethereum/ethereum-transaction-service.ts +1 -0
- package/src/services/solana/solana-wallet-service.silent-only.test.ts +162 -0
- package/src/services/solana/solana-wallet-service.ts +48 -0
- package/src/utils/error-utils.test.ts +115 -0
- package/src/utils/error-utils.ts +50 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-transaction-service.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ethereum-transaction-service.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,25 @@ export declare class SolanaWalletService {
|
|
|
35
35
|
checkExistingConnection(adapter: SolanaAdapter, walletUuid: string, options?: {
|
|
36
36
|
allowSilentReconnect?: boolean;
|
|
37
37
|
}): Promise<string | null>;
|
|
38
|
+
/**
|
|
39
|
+
* The silent-only probe (see `ConnectorConnectOptions.silentOnly`): returns
|
|
40
|
+
* the already-authorized address, or null — and NEVER prompts.
|
|
41
|
+
*
|
|
42
|
+
* Passive check first (no storage-flag reconnect: that path calls the
|
|
43
|
+
* interactive `adapter.connect()`). Then, only for a Wallet Standard wallet
|
|
44
|
+
* that ALREADY exposes an account to this origin (`wallet.accounts`),
|
|
45
|
+
* `adapter.autoConnect()` to adopt it. With an account present the Standard
|
|
46
|
+
* adapter connects to it directly and never calls the wallet's
|
|
47
|
+
* `standard:connect`, so no wallet request is made at all. That gate matters:
|
|
48
|
+
* `silent: true` is only a hint the spec lets wallets ignore (Trust and
|
|
49
|
+
* MetaMask show a normal Connect popup for it), and a `standard:connect` that
|
|
50
|
+
* never settles would leave the adapter `connecting` until reload, turning the
|
|
51
|
+
* user's later tap into a no-op. The price is a miss for a wallet that trusts
|
|
52
|
+
* the origin but has not re-exposed its accounts on this page; the caller
|
|
53
|
+
* falls back to its normal connect. Never called for the legacy injected
|
|
54
|
+
* fallback, whose inherited `autoConnect()` is a plain prompting `connect()`.
|
|
55
|
+
*/
|
|
56
|
+
checkExistingConnectionSilently(adapter: SolanaAdapter, walletUuid: string, supportsStandardConnect: boolean): Promise<string | null>;
|
|
38
57
|
/**
|
|
39
58
|
* Connect to wallet
|
|
40
59
|
*/
|
|
@@ -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;
|
|
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;AAExC,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;IAEtC,YAAY,cAAc,EAAE,cAAc,EAEzC;IAED;;OAEG;IACG,mBAAmB,CACvB,eAAe,GAAE,cAAc,EAAO,EACtC,sBAAsB,UAAQ,EAC9B,wBAAwB,CAAC,EAAE,oCAAoC,GAC9D,OAAO,CAAC,IAAI,CAAC,CAMf;IAED;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE,CAEzC;IAED;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAE7D;IAED;;;;;;;;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,CAiCxB;IAED;;;;;;;;;;;;;;;;;OAiBG;IACG,+BAA+B,CACnC,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,uBAAuB,EAAE,OAAO,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuBxB;IAED;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBzE;IAED;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE,CAWpB;IAED;;OAEG;IACH,kBAAkB,CAChB,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,IAAI,CASN;IAED;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED;;;;;;;;OAQG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS7C;IAED;;OAEG;IACH,mBAAmB,IAAI,aAAa,GAAG,IAAI,CAE1C;IAED;;;;;;;;;;;;;OAaG;IACG,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC,CAiB/C;IAED;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAC9C,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAmB1B;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,iBAAiB,CACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GACrC,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAuB1B;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,iCAAiC;IAmBzC;;OAEG;IACH,UAAU,IAAI,IAAI,CAIjB;CACF"}
|
|
@@ -71,6 +71,49 @@ export class SolanaWalletService {
|
|
|
71
71
|
return null;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
+
/**
|
|
75
|
+
* The silent-only probe (see `ConnectorConnectOptions.silentOnly`): returns
|
|
76
|
+
* the already-authorized address, or null — and NEVER prompts.
|
|
77
|
+
*
|
|
78
|
+
* Passive check first (no storage-flag reconnect: that path calls the
|
|
79
|
+
* interactive `adapter.connect()`). Then, only for a Wallet Standard wallet
|
|
80
|
+
* that ALREADY exposes an account to this origin (`wallet.accounts`),
|
|
81
|
+
* `adapter.autoConnect()` to adopt it. With an account present the Standard
|
|
82
|
+
* adapter connects to it directly and never calls the wallet's
|
|
83
|
+
* `standard:connect`, so no wallet request is made at all. That gate matters:
|
|
84
|
+
* `silent: true` is only a hint the spec lets wallets ignore (Trust and
|
|
85
|
+
* MetaMask show a normal Connect popup for it), and a `standard:connect` that
|
|
86
|
+
* never settles would leave the adapter `connecting` until reload, turning the
|
|
87
|
+
* user's later tap into a no-op. The price is a miss for a wallet that trusts
|
|
88
|
+
* the origin but has not re-exposed its accounts on this page; the caller
|
|
89
|
+
* falls back to its normal connect. Never called for the legacy injected
|
|
90
|
+
* fallback, whose inherited `autoConnect()` is a plain prompting `connect()`.
|
|
91
|
+
*/
|
|
92
|
+
async checkExistingConnectionSilently(adapter, walletUuid, supportsStandardConnect) {
|
|
93
|
+
const passive = await this.checkExistingConnection(adapter, walletUuid, {
|
|
94
|
+
allowSilentReconnect: false
|
|
95
|
+
});
|
|
96
|
+
if (passive || !supportsStandardConnect) {
|
|
97
|
+
return passive;
|
|
98
|
+
}
|
|
99
|
+
// A bridged (framed) adapter is a Comlink proxy: `wallet`, `accounts` and
|
|
100
|
+
// `length` are all truthy proxies whatever the parent holds. Only a
|
|
101
|
+
// materialized, nonempty array proves an account, so a bridged adapter
|
|
102
|
+
// never gets the `autoConnect()` probe.
|
|
103
|
+
const exposedAccounts = adapter.wallet
|
|
104
|
+
?.accounts;
|
|
105
|
+
if (!Array.isArray(exposedAccounts) || exposedAccounts.length === 0) {
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
try {
|
|
109
|
+
await adapter.autoConnect();
|
|
110
|
+
return (await adapter.publicKey?.toBase58()) ?? null;
|
|
111
|
+
}
|
|
112
|
+
catch {
|
|
113
|
+
// The account vanished between the gate and the adopt: no address.
|
|
114
|
+
return null;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
74
117
|
/**
|
|
75
118
|
* Connect to wallet
|
|
76
119
|
*/
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"solana-wallet-service.js","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-utils.d.ts","sourceRoot":"","sources":["../../src/utils/error-utils.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAkBhE;
|
|
1
|
+
{"version":3,"file":"error-utils.d.ts","sourceRoot":"","sources":["../../src/utils/error-utils.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAkBhE;AA4CD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CA8EhD"}
|
|
@@ -21,6 +21,46 @@ export function extractTonSdkErrorMessage(error) {
|
|
|
21
21
|
}
|
|
22
22
|
return msg;
|
|
23
23
|
}
|
|
24
|
+
// No length cap here: core telemetry redacts addresses before it caps, and a cap
|
|
25
|
+
// applied first could cut an address short enough to slip past the redaction.
|
|
26
|
+
const MAX_CAUSE_DEPTH = 5;
|
|
27
|
+
/**
|
|
28
|
+
* The wallet's own rejection text from the deepest `cause` in the chain.
|
|
29
|
+
*
|
|
30
|
+
* viem wraps a provider rejection twice (TransactionExecutionError →
|
|
31
|
+
* UnknownRpcError → original) and only surfaces the original in its message when
|
|
32
|
+
* it was an Error. A wallet that rejects with a bare string (Trust Wallet Android:
|
|
33
|
+
* `"cancelled"`) is reduced to "An unknown RPC error occurred.", so the reason
|
|
34
|
+
* survives only as the innermost `cause`.
|
|
35
|
+
*/
|
|
36
|
+
function extractProviderReason(error, message) {
|
|
37
|
+
try {
|
|
38
|
+
let current = error;
|
|
39
|
+
let reason;
|
|
40
|
+
for (let depth = 0; depth < MAX_CAUSE_DEPTH; depth++) {
|
|
41
|
+
if (!current || typeof current !== 'object' || !('cause' in current))
|
|
42
|
+
break;
|
|
43
|
+
const cause = current.cause;
|
|
44
|
+
if (typeof cause === 'string') {
|
|
45
|
+
reason = cause;
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
if (cause && typeof cause === 'object') {
|
|
49
|
+
const causeMessage = cause.message;
|
|
50
|
+
if (typeof causeMessage === 'string')
|
|
51
|
+
reason = causeMessage;
|
|
52
|
+
}
|
|
53
|
+
current = cause;
|
|
54
|
+
}
|
|
55
|
+
const trimmed = reason?.trim();
|
|
56
|
+
if (!trimmed || message.includes(trimmed))
|
|
57
|
+
return undefined;
|
|
58
|
+
return trimmed;
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
24
64
|
/**
|
|
25
65
|
* Parse an error and throw a WalletConnectorError
|
|
26
66
|
* Detects if the error is a user rejection or an unknown error
|
|
@@ -64,7 +104,10 @@ export function parseError(error) {
|
|
|
64
104
|
else {
|
|
65
105
|
message = String(error);
|
|
66
106
|
}
|
|
67
|
-
|
|
107
|
+
const providerReason = extractProviderReason(error, message);
|
|
108
|
+
// If not already marked as rejected, check message patterns. The provider
|
|
109
|
+
// reason counts too: a wallet that rejects with a bare string loses it from
|
|
110
|
+
// viem's message.
|
|
68
111
|
if (!isRejected) {
|
|
69
112
|
const rejectionPatterns = [
|
|
70
113
|
'user rejected',
|
|
@@ -81,13 +124,14 @@ export function parseError(error) {
|
|
|
81
124
|
'reject request',
|
|
82
125
|
'user rejects'
|
|
83
126
|
];
|
|
84
|
-
const lowerMessage = message
|
|
127
|
+
const lowerMessage = `${message} ${providerReason ?? ''}`.toLowerCase();
|
|
85
128
|
isRejected = rejectionPatterns.some(pattern => lowerMessage.includes(pattern.toLowerCase()));
|
|
86
129
|
}
|
|
87
130
|
const walletError = {
|
|
88
131
|
type: isRejected ? 'rejected' : 'unknown',
|
|
89
132
|
message,
|
|
90
|
-
...(numericCode !== undefined ? { code: numericCode } : {})
|
|
133
|
+
...(numericCode !== undefined ? { code: numericCode } : {}),
|
|
134
|
+
...(providerReason ? { providerReason } : {})
|
|
91
135
|
};
|
|
92
136
|
throw new WalletConnectorError(walletError);
|
|
93
137
|
}
|
|
@@ -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;IACtB,0EAA0E;IAC1E,iFAAiF;IACjF,IAAI,WAA+B,CAAA;IAEnC,iCAAiC;IACjC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,KAAY,CAAA;QAE7B,wEAAwE;QACxE,sCAAsC;QACtC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;QAC1B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,WAAW,GAAG,IAAI,CAAA;QACpB,CAAC;QAED,gCAAgC;QAChC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAChD,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,
|
|
1
|
+
{"version":3,"file":"error-utils.js","sourceRoot":"","sources":["../../src/utils/error-utils.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.27.1",
|
|
4
4
|
"description": "Injected connector for Universal Wallet Connector",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"uuid": "^14.0.2",
|
|
29
29
|
"viem": "^2.56.5",
|
|
30
30
|
"@meshconnect/uwc-bridge-child": "0.6.1",
|
|
31
|
-
"@meshconnect/uwc-constants": "0.8.
|
|
32
|
-
"@meshconnect/uwc-ton-connector": "0.9.
|
|
33
|
-
"@meshconnect/uwc-bitcoin": "0.5.
|
|
34
|
-
"@meshconnect/uwc-tron-connector": "0.7.
|
|
35
|
-
"@meshconnect/uwc-types": "0.
|
|
31
|
+
"@meshconnect/uwc-constants": "0.8.3",
|
|
32
|
+
"@meshconnect/uwc-ton-connector": "0.9.11",
|
|
33
|
+
"@meshconnect/uwc-bitcoin": "0.5.5",
|
|
34
|
+
"@meshconnect/uwc-tron-connector": "0.7.15",
|
|
35
|
+
"@meshconnect/uwc-types": "0.32.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"typescript": "^7.0.2"
|
|
@@ -6,6 +6,7 @@ import type {
|
|
|
6
6
|
TransactionRequest,
|
|
7
7
|
EIP712TypedData
|
|
8
8
|
} from '@meshconnect/uwc-types'
|
|
9
|
+
import { WalletNotAuthorizedError } from '@meshconnect/uwc-types'
|
|
9
10
|
|
|
10
11
|
// Mock all service dependencies
|
|
11
12
|
vi.mock('./services/storage-service')
|
|
@@ -386,6 +387,50 @@ describe('InjectedConnector', () => {
|
|
|
386
387
|
expect(result.address).toBe('0xnewaddress')
|
|
387
388
|
})
|
|
388
389
|
|
|
390
|
+
// ONC-1975: silentOnly — the non-prompting probe is the whole attempt.
|
|
391
|
+
it('silentOnly: rejects with WalletNotAuthorizedError and never runs the prompting connect', async () => {
|
|
392
|
+
const { ConnectionManager } = await import(
|
|
393
|
+
'./services/connection-manager'
|
|
394
|
+
)
|
|
395
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
396
|
+
mockConnManager.checkExistingConnections.mockResolvedValue({
|
|
397
|
+
address: null,
|
|
398
|
+
availableAddresses: []
|
|
399
|
+
})
|
|
400
|
+
|
|
401
|
+
await expect(
|
|
402
|
+
connector.connect(mockNetwork, mockEthProvider, { silentOnly: true })
|
|
403
|
+
).rejects.toBeInstanceOf(WalletNotAuthorizedError)
|
|
404
|
+
|
|
405
|
+
expect(mockConnManager.checkExistingConnections).toHaveBeenCalledWith(
|
|
406
|
+
'eip155',
|
|
407
|
+
mockEthProvider,
|
|
408
|
+
undefined,
|
|
409
|
+
{ silentOnly: true }
|
|
410
|
+
)
|
|
411
|
+
expect(mockConnManager.connectEthereum).not.toHaveBeenCalled()
|
|
412
|
+
})
|
|
413
|
+
|
|
414
|
+
it('silentOnly: returns an already-authorized connection', async () => {
|
|
415
|
+
const { ConnectionManager } = await import(
|
|
416
|
+
'./services/connection-manager'
|
|
417
|
+
)
|
|
418
|
+
const mockConnManager = vi.mocked(ConnectionManager).mock.results[0].value
|
|
419
|
+
mockConnManager.checkExistingConnections.mockResolvedValue({
|
|
420
|
+
address: '0xexisting',
|
|
421
|
+
availableAddresses: [
|
|
422
|
+
{ address: '0xexisting', networkId: 'eip155:1' as any }
|
|
423
|
+
]
|
|
424
|
+
})
|
|
425
|
+
|
|
426
|
+
const result = await connector.connect(mockNetwork, mockEthProvider, {
|
|
427
|
+
silentOnly: true
|
|
428
|
+
})
|
|
429
|
+
|
|
430
|
+
expect(result.address).toBe('0xexisting')
|
|
431
|
+
expect(mockConnManager.connectEthereum).not.toHaveBeenCalled()
|
|
432
|
+
})
|
|
433
|
+
|
|
389
434
|
describe('cross-namespace Tron gather (tronConnectorConfig set)', () => {
|
|
390
435
|
const tronNetwork = {
|
|
391
436
|
id: 'tron:0x2b6653dc',
|
|
@@ -588,6 +633,28 @@ describe('InjectedConnector', () => {
|
|
|
588
633
|
})
|
|
589
634
|
})
|
|
590
635
|
|
|
636
|
+
it('silentOnly: skips the Tron gather, whose connect can prompt (ONC-1975)', async () => {
|
|
637
|
+
const tronConnect = vi.fn()
|
|
638
|
+
const c = await buildWithTron(tronConnect)
|
|
639
|
+
const { ConnectionManager } = await import(
|
|
640
|
+
'./services/connection-manager'
|
|
641
|
+
)
|
|
642
|
+
const connManager = vi
|
|
643
|
+
.mocked(ConnectionManager)
|
|
644
|
+
.mock.results.at(-1)!.value
|
|
645
|
+
connManager.checkExistingConnections.mockResolvedValue({
|
|
646
|
+
address: '0xeth',
|
|
647
|
+
availableAddresses: [{ address: '0xeth', networkId: 'eip155:1' }]
|
|
648
|
+
})
|
|
649
|
+
|
|
650
|
+
const result = await c.connect(mockNetwork, multiNsProvider, {
|
|
651
|
+
silentOnly: true
|
|
652
|
+
})
|
|
653
|
+
|
|
654
|
+
expect(tronConnect).not.toHaveBeenCalled()
|
|
655
|
+
expect(result.address).toBe('0xeth')
|
|
656
|
+
})
|
|
657
|
+
|
|
591
658
|
it('swallows a declined/failed Tron connect and keeps the EVM connection', async () => {
|
|
592
659
|
const tronConnect = vi
|
|
593
660
|
.fn()
|
|
@@ -29,7 +29,10 @@ import type {
|
|
|
29
29
|
BitcoinTransactionRequest,
|
|
30
30
|
WalletStepInfo
|
|
31
31
|
} from '@meshconnect/uwc-types'
|
|
32
|
-
import {
|
|
32
|
+
import {
|
|
33
|
+
assertSameMessage,
|
|
34
|
+
WalletNotAuthorizedError
|
|
35
|
+
} from '@meshconnect/uwc-types'
|
|
33
36
|
import {
|
|
34
37
|
TronConnector,
|
|
35
38
|
type TronConnectorConfig
|
|
@@ -394,6 +397,7 @@ export class InjectedConnector implements Connector {
|
|
|
394
397
|
}
|
|
395
398
|
const targetNamespace = network.namespace
|
|
396
399
|
const requiredAddresses = options?.requiredAddresses
|
|
400
|
+
const silentOnly = options?.silentOnly === true
|
|
397
401
|
|
|
398
402
|
// Check if we're already connected — bip122 now flows through the same
|
|
399
403
|
// shared plumbing as every other namespace (non-prompting probe against
|
|
@@ -407,9 +411,17 @@ export class InjectedConnector implements Connector {
|
|
|
407
411
|
await this.connectionManager.checkExistingConnections(
|
|
408
412
|
targetNamespace,
|
|
409
413
|
provider,
|
|
410
|
-
requiredAddresses
|
|
414
|
+
requiredAddresses,
|
|
415
|
+
{ silentOnly }
|
|
411
416
|
)
|
|
412
417
|
|
|
418
|
+
// Silent-only: the non-prompting probe above is the whole attempt. Without
|
|
419
|
+
// an already-authorized account, stop here — every path below
|
|
420
|
+
// (`connectToNamespace`, the Tron enrichment) can open the wallet's UI.
|
|
421
|
+
if (silentOnly && !existingAddress) {
|
|
422
|
+
throw new WalletNotAuthorizedError()
|
|
423
|
+
}
|
|
424
|
+
|
|
413
425
|
let result: ConnectorResult
|
|
414
426
|
if (existingAddress) {
|
|
415
427
|
// Already connected — return the existing connection.
|
|
@@ -435,7 +447,10 @@ export class InjectedConnector implements Connector {
|
|
|
435
447
|
// otherwise never expose its Tron address. Mirror the ETH/Solana/TON
|
|
436
448
|
// gathers and connect Tron too (skipped when Tron is the connect target —
|
|
437
449
|
// that path connects Tron directly above).
|
|
438
|
-
|
|
450
|
+
// Skipped for a silent-only connect: the Tron connector's connect can
|
|
451
|
+
// prompt, and a missing secondary Tron address is the documented price of
|
|
452
|
+
// never prompting.
|
|
453
|
+
if (targetNamespace !== 'tron' && !silentOnly) {
|
|
439
454
|
await this.enrichWithTron(provider, result.availableAddresses)
|
|
440
455
|
}
|
|
441
456
|
|