@meshconnect/uwc-injected-connector 0.27.0 → 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/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/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/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/utils/error-utils.test.ts +115 -0
- package/src/utils/error-utils.ts +50 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-transaction-builder.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,wBAAwB,CAAA;AAI/B;;GAEG;AACH,qBAAa,0BAA0B;IAC/B,sBAAsB,CAC1B,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,oBAAoB,CAAC,CAkB/B;IAEK,oBAAoB,CACxB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"ethereum-transaction-builder.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,wBAAwB,CAAA;AAI/B;;GAEG;AACH,qBAAa,0BAA0B;IAC/B,sBAAsB,CAC1B,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,oBAAoB,CAAC,CAkB/B;IAEK,oBAAoB,CACxB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,oBAAoB,CAAC,CAe/B;IAEK,kBAAkB,CACtB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,oBAAoB,CAAC,CAa/B;IAED;;OAEG;IACH,OAAO,CAAC,eAAe;CAiBxB"}
|
|
@@ -27,9 +27,14 @@ export class EthereumTransactionBuilder {
|
|
|
27
27
|
}
|
|
28
28
|
async getNativeTransaction(request) {
|
|
29
29
|
try {
|
|
30
|
+
// Explicit empty calldata: Trust Wallet's Android in-app browser rejects an
|
|
31
|
+
// eth_sendTransaction with no `data` field ("Transaction error", rejected
|
|
32
|
+
// with the bare string "cancelled"), and accepts the same request with
|
|
33
|
+
// `data: '0x'`. Empty calldata is what every node assumes when it is absent.
|
|
30
34
|
return {
|
|
31
35
|
to: request.to,
|
|
32
36
|
value: request.amount,
|
|
37
|
+
data: '0x',
|
|
33
38
|
...this.formatGasConfig(request.gasConfig)
|
|
34
39
|
};
|
|
35
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-transaction-builder.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAQzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD;;GAEG;AACH,MAAM,OAAO,0BAA0B;IACrC,KAAK,CAAC,sBAAsB,CAC1B,OAA+B;QAE/B,IAAI,CAAC;YACH,kCAAkC;YAClC,MAAM,IAAI,GAAG,kBAAkB,CAAC;gBAC9B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;aACzB,CAAC,CAAA;YACF,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,eAAe;gBAC3B,IAAI;gBACJ,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAiC;QAEjC,IAAI,CAAC;YACH,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,OAAO,CAAC,MAAM;gBACrB,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,OAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;YAED,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,SAAwB;QAExB,MAAM,SAAS,GAAkC,EAAE,CAAA;QACnD,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC;YACxB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC7D,CAAC;QACD,IAAI,SAAS,EAAE,YAAY,EAAE,CAAC;YAC5B,SAAS,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QACrE,CAAC;QACD,IAAI,SAAS,EAAE,oBAAoB,EAAE,CAAC;YACpC,SAAS,CAAC,oBAAoB,GAAG,MAAM,CACrC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAC3C,CAAA;QACH,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"ethereum-transaction-builder.js","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAQzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD;;GAEG;AACH,MAAM,OAAO,0BAA0B;IACrC,KAAK,CAAC,sBAAsB,CAC1B,OAA+B;QAE/B,IAAI,CAAC;YACH,kCAAkC;YAClC,MAAM,IAAI,GAAG,kBAAkB,CAAC;gBAC9B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE;aACzB,CAAC,CAAA;YACF,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,eAAe;gBAC3B,IAAI;gBACJ,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAiC;QAEjC,IAAI,CAAC;YACH,4EAA4E;YAC5E,0EAA0E;YAC1E,uEAAuE;YACvE,6EAA6E;YAC7E,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,OAAO,CAAC,MAAM;gBACrB,IAAI,EAAE,IAAI;gBACV,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,OAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,SAAS,GAAyB;gBACtC,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC;aAC3C,CAAA;YAED,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,SAAwB;QAExB,MAAM,SAAS,GAAkC,EAAE,CAAA;QACnD,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC;YACxB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC7D,CAAC;QACD,IAAI,SAAS,EAAE,YAAY,EAAE,CAAC;YAC5B,SAAS,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QACrE,CAAC;QACD,IAAI,SAAS,EAAE,oBAAoB,EAAE,CAAC;YACpC,SAAS,CAAC,oBAAoB,GAAG,MAAM,CACrC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAC3C,CAAA;QACH,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAKV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAA;AAK/B;;GAEG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,OAAO,CAA4B;IAE3C,cAEC;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC,CAiCjB;IAED;;OAEG;YACW,qBAAqB;
|
|
1
|
+
{"version":3,"file":"ethereum-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/ethereum/ethereum-transaction-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAKV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAA;AAK/B;;GAEG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,OAAO,CAA4B;IAE3C,cAEC;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC,CAiCjB;IAED;;OAEG;YACW,qBAAqB;IAkCnC;;OAEG;YACW,gBAAgB;IAkC9B;;OAEG;YACW,gBAAgB;IAkC9B;;OAEG;YACW,SAAS;CA+HxB"}
|
|
@@ -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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"}
|
|
@@ -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.27.
|
|
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"
|
|
@@ -31,6 +31,7 @@ describe('EthereumTransactionBuilder', () => {
|
|
|
31
31
|
expect(result).toEqual({
|
|
32
32
|
to: request.to,
|
|
33
33
|
value: request.amount,
|
|
34
|
+
data: '0x',
|
|
34
35
|
gasLimit: BigInt(21000),
|
|
35
36
|
maxFeePerGas: BigInt(50000000000),
|
|
36
37
|
maxPriorityFeePerGas: BigInt(2000000000)
|
|
@@ -48,7 +49,8 @@ describe('EthereumTransactionBuilder', () => {
|
|
|
48
49
|
|
|
49
50
|
expect(result).toEqual({
|
|
50
51
|
to: request.to,
|
|
51
|
-
value: request.amount
|
|
52
|
+
value: request.amount,
|
|
53
|
+
data: '0x'
|
|
52
54
|
})
|
|
53
55
|
})
|
|
54
56
|
})
|
|
@@ -39,9 +39,14 @@ export class EthereumTransactionBuilder {
|
|
|
39
39
|
request: EVMNativeTransferRequest
|
|
40
40
|
): Promise<EVMTransactionParams> {
|
|
41
41
|
try {
|
|
42
|
+
// Explicit empty calldata: Trust Wallet's Android in-app browser rejects an
|
|
43
|
+
// eth_sendTransaction with no `data` field ("Transaction error", rejected
|
|
44
|
+
// with the bare string "cancelled"), and accepts the same request with
|
|
45
|
+
// `data: '0x'`. Empty calldata is what every node assumes when it is absent.
|
|
42
46
|
return {
|
|
43
47
|
to: request.to,
|
|
44
48
|
value: request.amount,
|
|
49
|
+
data: '0x',
|
|
45
50
|
...this.formatGasConfig(request.gasConfig)
|
|
46
51
|
}
|
|
47
52
|
} catch (error) {
|
|
@@ -114,6 +114,179 @@ describe('EthereumTransactionService', () => {
|
|
|
114
114
|
|
|
115
115
|
expect(result).toBe('0xtxhash')
|
|
116
116
|
})
|
|
117
|
+
|
|
118
|
+
// Trust Wallet's Android in-app browser fails a send without `data`.
|
|
119
|
+
it('always sends explicit empty calldata to the wallet', async () => {
|
|
120
|
+
const request: EVMNativeTransferRequest = {
|
|
121
|
+
from: '0x1234567890123456789012345678901234567890',
|
|
122
|
+
to: '0x0987654321098765432109876543210987654321',
|
|
123
|
+
amount: 1_000_000_000_000n,
|
|
124
|
+
gasConfig: {
|
|
125
|
+
gasLimit: 21220,
|
|
126
|
+
maxFeePerGas: 25_000_000,
|
|
127
|
+
maxPriorityFeePerGas: 20_000_000
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
await service.sendTransaction(request, mockProvider)
|
|
132
|
+
|
|
133
|
+
expect(vi.mocked(mockProvider.request).mock.calls[0]?.[0]).toEqual({
|
|
134
|
+
method: 'eth_sendTransaction',
|
|
135
|
+
params: [
|
|
136
|
+
{
|
|
137
|
+
from: request.from,
|
|
138
|
+
to: request.to,
|
|
139
|
+
value: '0xe8d4a51000',
|
|
140
|
+
data: '0x',
|
|
141
|
+
gas: '0x52e4',
|
|
142
|
+
maxFeePerGas: '0x17d7840',
|
|
143
|
+
maxPriorityFeePerGas: '0x1312d00'
|
|
144
|
+
}
|
|
145
|
+
]
|
|
146
|
+
})
|
|
147
|
+
})
|
|
148
|
+
|
|
149
|
+
it('sends explicit empty calldata without a gas config', async () => {
|
|
150
|
+
const request: EVMNativeTransferRequest = {
|
|
151
|
+
from: '0x1234567890123456789012345678901234567890',
|
|
152
|
+
to: '0x0987654321098765432109876543210987654321',
|
|
153
|
+
amount: 1n
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
await service.sendTransaction(request, mockProvider)
|
|
157
|
+
|
|
158
|
+
expect(vi.mocked(mockProvider.request).mock.calls[0]?.[0]).toEqual({
|
|
159
|
+
method: 'eth_sendTransaction',
|
|
160
|
+
params: [
|
|
161
|
+
{
|
|
162
|
+
from: request.from,
|
|
163
|
+
to: request.to,
|
|
164
|
+
value: '0x1',
|
|
165
|
+
data: '0x'
|
|
166
|
+
}
|
|
167
|
+
]
|
|
168
|
+
})
|
|
169
|
+
})
|
|
170
|
+
})
|
|
171
|
+
|
|
172
|
+
// Mirrors Trust Wallet's Android in-app browser, device-probed: a send without
|
|
173
|
+
// `data` fails after the user approves and rejects with the bare string
|
|
174
|
+
// "cancelled"; the same send with `data` goes through.
|
|
175
|
+
describe('wallet that requires a data field (Trust Wallet Android)', () => {
|
|
176
|
+
const FROM = '0x1234567890123456789012345678901234567890'
|
|
177
|
+
const TO = '0x0987654321098765432109876543210987654321'
|
|
178
|
+
|
|
179
|
+
const requiresData = () =>
|
|
180
|
+
({
|
|
181
|
+
request: vi.fn(
|
|
182
|
+
async ({ params }: { method: string; params: unknown[] }) => {
|
|
183
|
+
const tx = params[0] as { data?: string }
|
|
184
|
+
if (tx.data === undefined) throw 'cancelled'
|
|
185
|
+
return '0xtxhash'
|
|
186
|
+
}
|
|
187
|
+
)
|
|
188
|
+
}) as unknown as EthereumProvider
|
|
189
|
+
|
|
190
|
+
it('completes a native transfer', async () => {
|
|
191
|
+
const result = await service.sendTransaction(
|
|
192
|
+
{ from: FROM, to: TO, amount: 1_000_000_000_000n },
|
|
193
|
+
requiresData()
|
|
194
|
+
)
|
|
195
|
+
|
|
196
|
+
expect(result).toBe('0xtxhash')
|
|
197
|
+
})
|
|
198
|
+
|
|
199
|
+
it('completes a zero-value native transfer', async () => {
|
|
200
|
+
const provider = requiresData()
|
|
201
|
+
|
|
202
|
+
await service.sendTransaction(
|
|
203
|
+
{ from: FROM, to: TO, amount: 0n },
|
|
204
|
+
provider
|
|
205
|
+
)
|
|
206
|
+
|
|
207
|
+
expect(vi.mocked(provider.request).mock.calls[0]?.[0]).toEqual({
|
|
208
|
+
method: 'eth_sendTransaction',
|
|
209
|
+
params: [{ from: FROM, to: TO, value: '0x0', data: '0x' }]
|
|
210
|
+
})
|
|
211
|
+
})
|
|
212
|
+
|
|
213
|
+
it("reports the wallet's own reason when it still fails", async () => {
|
|
214
|
+
const provider = {
|
|
215
|
+
request: vi.fn().mockRejectedValue('cancelled')
|
|
216
|
+
} as unknown as EthereumProvider
|
|
217
|
+
|
|
218
|
+
const error = await service
|
|
219
|
+
.sendTransaction({ from: FROM, to: TO, amount: 1n }, provider)
|
|
220
|
+
.catch((e: unknown) => e)
|
|
221
|
+
|
|
222
|
+
expect(error).toBeInstanceOf(WalletConnectorError)
|
|
223
|
+
expect(error).toMatchObject({
|
|
224
|
+
type: 'unknown',
|
|
225
|
+
providerReason: 'cancelled'
|
|
226
|
+
})
|
|
227
|
+
})
|
|
228
|
+
})
|
|
229
|
+
|
|
230
|
+
// The empty calldata is only for native sends: every other path keeps the
|
|
231
|
+
// exact request it sent before.
|
|
232
|
+
describe('other EVM paths keep their request', () => {
|
|
233
|
+
const FROM = '0x1234567890123456789012345678901234567890'
|
|
234
|
+
const TOKEN = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'
|
|
235
|
+
const TO = '0x0987654321098765432109876543210987654321'
|
|
236
|
+
|
|
237
|
+
it('an ERC-20 transfer sends the encoded call, not empty calldata', async () => {
|
|
238
|
+
const request: EVMContractCallRequest = {
|
|
239
|
+
from: FROM,
|
|
240
|
+
contractAddress: TOKEN,
|
|
241
|
+
abi: [
|
|
242
|
+
{
|
|
243
|
+
name: 'transfer',
|
|
244
|
+
type: 'function',
|
|
245
|
+
inputs: [
|
|
246
|
+
{ name: 'to', type: 'address' },
|
|
247
|
+
{ name: 'amount', type: 'uint256' }
|
|
248
|
+
],
|
|
249
|
+
outputs: [{ name: '', type: 'bool' }],
|
|
250
|
+
stateMutability: 'nonpayable'
|
|
251
|
+
}
|
|
252
|
+
],
|
|
253
|
+
functionName: 'transfer',
|
|
254
|
+
args: [TO, 1_000_000n]
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
await service.sendTransaction(request, mockProvider)
|
|
258
|
+
|
|
259
|
+
expect(vi.mocked(mockProvider.request).mock.calls[0]?.[0]).toEqual({
|
|
260
|
+
method: 'eth_sendTransaction',
|
|
261
|
+
params: [
|
|
262
|
+
{
|
|
263
|
+
from: FROM,
|
|
264
|
+
to: TOKEN,
|
|
265
|
+
value: '0x0',
|
|
266
|
+
data:
|
|
267
|
+
'0xa9059cbb' +
|
|
268
|
+
TO.slice(2).toLowerCase().padStart(64, '0') +
|
|
269
|
+
(1_000_000).toString(16).padStart(64, '0')
|
|
270
|
+
}
|
|
271
|
+
]
|
|
272
|
+
})
|
|
273
|
+
})
|
|
274
|
+
|
|
275
|
+
it('a raw data transfer sends its data unchanged', async () => {
|
|
276
|
+
const request: EVMDataTransferRequest = {
|
|
277
|
+
from: FROM,
|
|
278
|
+
to: TO,
|
|
279
|
+
data: '0xdeadbeef',
|
|
280
|
+
chainId: '8453'
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
await service.sendTransaction(request, mockProvider)
|
|
284
|
+
|
|
285
|
+
expect(vi.mocked(mockProvider.request).mock.calls[0]?.[0]).toEqual({
|
|
286
|
+
method: 'eth_sendTransaction',
|
|
287
|
+
params: [{ from: FROM, to: TO, value: '0x0', data: '0xdeadbeef' }]
|
|
288
|
+
})
|
|
289
|
+
})
|
|
117
290
|
})
|
|
118
291
|
|
|
119
292
|
describe('sendContractCall', () => {
|
|
@@ -361,6 +534,39 @@ describe('EthereumTransactionService', () => {
|
|
|
361
534
|
vi.useRealTimers()
|
|
362
535
|
})
|
|
363
536
|
|
|
537
|
+
it('sends a native call in a batch without data, as before', async () => {
|
|
538
|
+
const provider = batchProvider([confirmedWithReceipts])
|
|
539
|
+
const from = '0x1234567890123456789012345678901234567890'
|
|
540
|
+
const to = '0x0987654321098765432109876543210987654321'
|
|
541
|
+
const mixed: EVMBatchTransactionRequest = {
|
|
542
|
+
...batchRequest,
|
|
543
|
+
calls: [
|
|
544
|
+
{ from, to, amount: 5n },
|
|
545
|
+
{ from, to, data: '0xa9059cbb', chainId: '42161' }
|
|
546
|
+
]
|
|
547
|
+
}
|
|
548
|
+
|
|
549
|
+
const outcome = service.sendTransaction(mixed, provider)
|
|
550
|
+
await vi.runAllTimersAsync()
|
|
551
|
+
await outcome
|
|
552
|
+
|
|
553
|
+
expect(provider.request.mock.calls[0]?.[0]).toEqual({
|
|
554
|
+
method: 'wallet_sendCalls',
|
|
555
|
+
params: [
|
|
556
|
+
{
|
|
557
|
+
version: '2.0.0',
|
|
558
|
+
from,
|
|
559
|
+
chainId: '0xa4b1',
|
|
560
|
+
atomicRequired: true,
|
|
561
|
+
calls: [
|
|
562
|
+
{ to, value: '0x5' },
|
|
563
|
+
{ to, data: '0xa9059cbb', value: '0x0' }
|
|
564
|
+
]
|
|
565
|
+
}
|
|
566
|
+
]
|
|
567
|
+
})
|
|
568
|
+
})
|
|
569
|
+
|
|
364
570
|
it('returns the first receipt hash when the confirmation carries receipts', async () => {
|
|
365
571
|
const provider = batchProvider([confirmedWithReceipts])
|
|
366
572
|
|
|
@@ -86,6 +86,7 @@ export class EthereumTransactionService {
|
|
|
86
86
|
chain: null,
|
|
87
87
|
to: tx.to as `0x${string}`,
|
|
88
88
|
value: tx.value,
|
|
89
|
+
data: tx.data as `0x${string}`,
|
|
89
90
|
...(tx.gasLimit && { gas: tx.gasLimit }),
|
|
90
91
|
...(tx.maxFeePerGas && { maxFeePerGas: tx.maxFeePerGas }),
|
|
91
92
|
...(tx.maxPriorityFeePerGas && {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { describe, it, expect } from 'vitest'
|
|
2
|
+
import { createWalletClient, custom } from 'viem'
|
|
2
3
|
import { WalletConnectorError } from '@meshconnect/uwc-types'
|
|
3
4
|
import { parseError, extractTonSdkErrorMessage } from './error-utils'
|
|
4
5
|
|
|
@@ -75,6 +76,120 @@ describe('parseError (injected)', () => {
|
|
|
75
76
|
expect(thrownBy({ code: Infinity, message: 'x' }).code).toBeUndefined()
|
|
76
77
|
})
|
|
77
78
|
})
|
|
79
|
+
|
|
80
|
+
describe('providerReason', () => {
|
|
81
|
+
// Reproduces the real path: viem's sendTransaction over an injected provider
|
|
82
|
+
// that rejects the way Trust Wallet Android does, with a bare string.
|
|
83
|
+
const viemErrorFor = async (rejection: unknown): Promise<unknown> => {
|
|
84
|
+
const from = '0x1234567890123456789012345678901234567890'
|
|
85
|
+
const client = createWalletClient({
|
|
86
|
+
account: from,
|
|
87
|
+
transport: custom({
|
|
88
|
+
request: async () => {
|
|
89
|
+
throw rejection
|
|
90
|
+
}
|
|
91
|
+
})
|
|
92
|
+
})
|
|
93
|
+
try {
|
|
94
|
+
await client.sendTransaction({
|
|
95
|
+
account: from,
|
|
96
|
+
chain: null,
|
|
97
|
+
to: '0x0987654321098765432109876543210987654321',
|
|
98
|
+
value: 1n
|
|
99
|
+
})
|
|
100
|
+
} catch (error) {
|
|
101
|
+
return error
|
|
102
|
+
}
|
|
103
|
+
throw new Error('sendTransaction did not reject')
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
it('recovers a bare-string wallet rejection that viem reduces to "unknown RPC error"', async () => {
|
|
107
|
+
const err = thrownBy(await viemErrorFor('cancelled'))
|
|
108
|
+
expect(err.message).toContain('An unknown RPC error occurred.')
|
|
109
|
+
expect(err.message).not.toContain('cancelled')
|
|
110
|
+
expect(err.providerReason).toBe('cancelled')
|
|
111
|
+
expect(err.type).toBe('unknown')
|
|
112
|
+
})
|
|
113
|
+
|
|
114
|
+
it('classifies a bare-string user rejection as rejected', async () => {
|
|
115
|
+
const err = thrownBy(await viemErrorFor('User rejected the request'))
|
|
116
|
+
expect(err.message).toContain('An unknown RPC error occurred.')
|
|
117
|
+
expect(err.providerReason).toBe('User rejected the request')
|
|
118
|
+
expect(err.type).toBe('rejected')
|
|
119
|
+
})
|
|
120
|
+
|
|
121
|
+
it('leaves a standard EIP-1193 rejection (4001, MetaMask) as it was', async () => {
|
|
122
|
+
const err = thrownBy(
|
|
123
|
+
await viemErrorFor({
|
|
124
|
+
code: 4001,
|
|
125
|
+
message: 'MetaMask Tx Signature: User denied transaction signature.'
|
|
126
|
+
})
|
|
127
|
+
)
|
|
128
|
+
expect(err.type).toBe('rejected')
|
|
129
|
+
expect(err.message).toContain('User denied transaction signature.')
|
|
130
|
+
expect(err.providerReason).toBeUndefined()
|
|
131
|
+
})
|
|
132
|
+
|
|
133
|
+
it('leaves an Error rejection with its own message as it was', async () => {
|
|
134
|
+
const err = thrownBy(await viemErrorFor(new Error('Request timed out')))
|
|
135
|
+
expect(err.message).toContain('Request timed out')
|
|
136
|
+
expect(err.providerReason).toBeUndefined()
|
|
137
|
+
})
|
|
138
|
+
|
|
139
|
+
it('omits the reason when viem already put it in the message', async () => {
|
|
140
|
+
const err = thrownBy(
|
|
141
|
+
await viemErrorFor({ code: -32000, message: 'insufficient funds' })
|
|
142
|
+
)
|
|
143
|
+
expect(err.message).toContain('insufficient funds')
|
|
144
|
+
expect(err.providerReason).toBeUndefined()
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
it('omits the reason when the error has no cause', () => {
|
|
148
|
+
expect(
|
|
149
|
+
thrownBy(new Error('Something odd happened')).providerReason
|
|
150
|
+
).toBeUndefined()
|
|
151
|
+
})
|
|
152
|
+
|
|
153
|
+
it('takes the deepest message in a chain of Error causes', () => {
|
|
154
|
+
const inner = new Error('nonce too low')
|
|
155
|
+
const middle = new Error('wrapped', { cause: inner })
|
|
156
|
+
const outer = new Error('Transaction failed', { cause: middle })
|
|
157
|
+
expect(thrownBy(outer).providerReason).toBe('nonce too low')
|
|
158
|
+
})
|
|
159
|
+
|
|
160
|
+
it('ignores a blank string cause', () => {
|
|
161
|
+
expect(
|
|
162
|
+
thrownBy(new Error('Transaction failed', { cause: ' ' }))
|
|
163
|
+
.providerReason
|
|
164
|
+
).toBeUndefined()
|
|
165
|
+
})
|
|
166
|
+
|
|
167
|
+
it('keeps a long reason whole, so an address in it is never cut short before core redacts it', () => {
|
|
168
|
+
const address = '0x1234567890123456789012345678901234567890'
|
|
169
|
+
const reason = `${'x'.repeat(180)} ${address}`
|
|
170
|
+
const err = thrownBy(new Error('Transaction failed', { cause: reason }))
|
|
171
|
+
expect(err.providerReason).toBe(reason)
|
|
172
|
+
})
|
|
173
|
+
|
|
174
|
+
it('stops at a cyclic cause chain instead of looping', () => {
|
|
175
|
+
const a: { message: string; cause?: unknown } = { message: 'a' }
|
|
176
|
+
const b = { message: 'b', cause: a }
|
|
177
|
+
a.cause = b
|
|
178
|
+
expect(() => thrownBy(a)).not.toThrow()
|
|
179
|
+
})
|
|
180
|
+
|
|
181
|
+
it('survives a cause getter that throws', () => {
|
|
182
|
+
const hostile = { message: 'boom' }
|
|
183
|
+
Object.defineProperty(hostile, 'cause', {
|
|
184
|
+
get() {
|
|
185
|
+
throw new Error('poisoned')
|
|
186
|
+
}
|
|
187
|
+
})
|
|
188
|
+
const err = thrownBy(hostile)
|
|
189
|
+
expect(err.message).toBe('boom')
|
|
190
|
+
expect(err.providerReason).toBeUndefined()
|
|
191
|
+
})
|
|
192
|
+
})
|
|
78
193
|
})
|
|
79
194
|
|
|
80
195
|
describe('extractTonSdkErrorMessage', () => {
|
package/src/utils/error-utils.ts
CHANGED
|
@@ -26,6 +26,48 @@ export function extractTonSdkErrorMessage(error: unknown): string {
|
|
|
26
26
|
return msg
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
+
// No length cap here: core telemetry redacts addresses before it caps, and a cap
|
|
30
|
+
// applied first could cut an address short enough to slip past the redaction.
|
|
31
|
+
const MAX_CAUSE_DEPTH = 5
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* The wallet's own rejection text from the deepest `cause` in the chain.
|
|
35
|
+
*
|
|
36
|
+
* viem wraps a provider rejection twice (TransactionExecutionError →
|
|
37
|
+
* UnknownRpcError → original) and only surfaces the original in its message when
|
|
38
|
+
* it was an Error. A wallet that rejects with a bare string (Trust Wallet Android:
|
|
39
|
+
* `"cancelled"`) is reduced to "An unknown RPC error occurred.", so the reason
|
|
40
|
+
* survives only as the innermost `cause`.
|
|
41
|
+
*/
|
|
42
|
+
function extractProviderReason(
|
|
43
|
+
error: unknown,
|
|
44
|
+
message: string
|
|
45
|
+
): string | undefined {
|
|
46
|
+
try {
|
|
47
|
+
let current: unknown = error
|
|
48
|
+
let reason: string | undefined
|
|
49
|
+
for (let depth = 0; depth < MAX_CAUSE_DEPTH; depth++) {
|
|
50
|
+
if (!current || typeof current !== 'object' || !('cause' in current))
|
|
51
|
+
break
|
|
52
|
+
const cause: unknown = (current as { cause: unknown }).cause
|
|
53
|
+
if (typeof cause === 'string') {
|
|
54
|
+
reason = cause
|
|
55
|
+
break
|
|
56
|
+
}
|
|
57
|
+
if (cause && typeof cause === 'object') {
|
|
58
|
+
const causeMessage: unknown = (cause as { message?: unknown }).message
|
|
59
|
+
if (typeof causeMessage === 'string') reason = causeMessage
|
|
60
|
+
}
|
|
61
|
+
current = cause
|
|
62
|
+
}
|
|
63
|
+
const trimmed = reason?.trim()
|
|
64
|
+
if (!trimmed || message.includes(trimmed)) return undefined
|
|
65
|
+
return trimmed
|
|
66
|
+
} catch {
|
|
67
|
+
return undefined
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
29
71
|
/**
|
|
30
72
|
* Parse an error and throw a WalletConnectorError
|
|
31
73
|
* Detects if the error is a user rejection or an unknown error
|
|
@@ -72,7 +114,11 @@ export function parseError(error: unknown): never {
|
|
|
72
114
|
message = String(error)
|
|
73
115
|
}
|
|
74
116
|
|
|
75
|
-
|
|
117
|
+
const providerReason = extractProviderReason(error, message)
|
|
118
|
+
|
|
119
|
+
// If not already marked as rejected, check message patterns. The provider
|
|
120
|
+
// reason counts too: a wallet that rejects with a bare string loses it from
|
|
121
|
+
// viem's message.
|
|
76
122
|
if (!isRejected) {
|
|
77
123
|
const rejectionPatterns = [
|
|
78
124
|
'user rejected',
|
|
@@ -90,7 +136,7 @@ export function parseError(error: unknown): never {
|
|
|
90
136
|
'user rejects'
|
|
91
137
|
]
|
|
92
138
|
|
|
93
|
-
const lowerMessage = message
|
|
139
|
+
const lowerMessage = `${message} ${providerReason ?? ''}`.toLowerCase()
|
|
94
140
|
isRejected = rejectionPatterns.some(pattern =>
|
|
95
141
|
lowerMessage.includes(pattern.toLowerCase())
|
|
96
142
|
)
|
|
@@ -99,7 +145,8 @@ export function parseError(error: unknown): never {
|
|
|
99
145
|
const walletError: WalletError = {
|
|
100
146
|
type: isRejected ? 'rejected' : 'unknown',
|
|
101
147
|
message,
|
|
102
|
-
...(numericCode !== undefined ? { code: numericCode } : {})
|
|
148
|
+
...(numericCode !== undefined ? { code: numericCode } : {}),
|
|
149
|
+
...(providerReason ? { providerReason } : {})
|
|
103
150
|
}
|
|
104
151
|
|
|
105
152
|
throw new WalletConnectorError(walletError)
|