viem 0.0.0-main.20230904T005829 → 0.0.0-main.20230904T010242
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/cjs/errors/node.js +1 -1
- package/dist/cjs/errors/node.js.map +1 -1
- package/dist/cjs/errors/version.js +1 -1
- package/dist/cjs/utils/errors/getCallError.js +4 -3
- package/dist/cjs/utils/errors/getCallError.js.map +1 -1
- package/dist/cjs/utils/errors/getContractError.js +2 -1
- package/dist/cjs/utils/errors/getContractError.js.map +1 -1
- package/dist/cjs/utils/errors/getEstimateGasError.js +4 -3
- package/dist/cjs/utils/errors/getEstimateGasError.js.map +1 -1
- package/dist/cjs/utils/errors/getNodeError.js +16 -10
- package/dist/cjs/utils/errors/getNodeError.js.map +1 -1
- package/dist/cjs/utils/errors/getTransactionError.js +4 -3
- package/dist/cjs/utils/errors/getTransactionError.js.map +1 -1
- package/dist/esm/errors/node.js +1 -1
- package/dist/esm/errors/node.js.map +1 -1
- package/dist/esm/errors/version.js +1 -1
- package/dist/esm/utils/errors/getCallError.js +5 -4
- package/dist/esm/utils/errors/getCallError.js.map +1 -1
- package/dist/esm/utils/errors/getContractError.js +2 -1
- package/dist/esm/utils/errors/getContractError.js.map +1 -1
- package/dist/esm/utils/errors/getEstimateGasError.js +5 -4
- package/dist/esm/utils/errors/getEstimateGasError.js.map +1 -1
- package/dist/esm/utils/errors/getNodeError.js +16 -10
- package/dist/esm/utils/errors/getNodeError.js.map +1 -1
- package/dist/esm/utils/errors/getTransactionError.js +5 -4
- package/dist/esm/utils/errors/getTransactionError.js.map +1 -1
- package/dist/types/errors/version.d.ts +1 -1
- package/dist/types/utils/errors/getCallError.d.ts.map +1 -1
- package/dist/types/utils/errors/getContractError.d.ts.map +1 -1
- package/dist/types/utils/errors/getEstimateGasError.d.ts.map +1 -1
- package/dist/types/utils/errors/getNodeError.d.ts +1 -1
- package/dist/types/utils/errors/getNodeError.d.ts.map +1 -1
- package/dist/types/utils/errors/getTransactionError.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/errors/node.ts +1 -1
- package/src/errors/version.ts +1 -1
- package/src/utils/errors/getCallError.ts +4 -8
- package/src/utils/errors/getContractError.ts +4 -1
- package/src/utils/errors/getEstimateGasError.ts +4 -8
- package/src/utils/errors/getNodeError.ts +18 -13
- package/src/utils/errors/getTransactionError.ts +4 -8
package/dist/cjs/errors/node.js
CHANGED
@@ -247,7 +247,7 @@ Object.defineProperty(TipAboveFeeCapError, "nodeMessage", {
|
|
247
247
|
exports.TipAboveFeeCapError = TipAboveFeeCapError;
|
248
248
|
class UnknownNodeError extends base_js_1.BaseError {
|
249
249
|
constructor({ cause }) {
|
250
|
-
super(`An error occurred while executing: ${cause?.
|
250
|
+
super(`An error occurred while executing: ${cause?.shortMessage}`, {
|
251
251
|
cause,
|
252
252
|
});
|
253
253
|
Object.defineProperty(this, "name", {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/errors/node.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/errors/node.ts"],"names":[],"mappings":"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"}
|
@@ -2,11 +2,12 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getCallError = void 0;
|
4
4
|
const contract_js_1 = require("../../errors/contract.js");
|
5
|
+
const node_js_1 = require("../../errors/node.js");
|
5
6
|
const getNodeError_js_1 = require("./getNodeError.js");
|
6
7
|
function getCallError(err, { docsPath, ...args }) {
|
7
|
-
let cause = err;
|
8
|
-
if (
|
9
|
-
cause =
|
8
|
+
let cause = (0, getNodeError_js_1.getNodeError)(err, args);
|
9
|
+
if (cause instanceof node_js_1.UnknownNodeError)
|
10
|
+
cause = err;
|
10
11
|
return new contract_js_1.CallExecutionError(cause, {
|
11
12
|
docsPath,
|
12
13
|
...args,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getCallError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getCallError.ts"],"names":[],"mappings":";;;AAEA,0DAA6D;
|
1
|
+
{"version":3,"file":"getCallError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getCallError.ts"],"names":[],"mappings":";;;AAEA,0DAA6D;AAC7D,kDAAuD;AAGvD,uDAA6E;AAE7E,SAAgB,YAAY,CAC1B,GAAc,EACd,EACE,QAAQ,EACR,GAAG,IAAI,EAIR;IAED,IAAI,KAAK,GAAG,IAAA,8BAAY,EAAC,GAAG,EAAE,IAA8B,CAAC,CAAA;IAC7D,IAAI,KAAK,YAAY,0BAAgB;QAAE,KAAK,GAAG,GAAG,CAAA;IAClD,OAAO,IAAI,gCAAkB,CAAC,KAAK,EAAE;QACnC,QAAQ;QACR,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC;AAhBD,oCAgBC"}
|
@@ -5,6 +5,7 @@ const abi_js_1 = require("../../errors/abi.js");
|
|
5
5
|
const base_js_1 = require("../../errors/base.js");
|
6
6
|
const contract_js_1 = require("../../errors/contract.js");
|
7
7
|
const EXECUTION_REVERTED_ERROR_CODE = 3;
|
8
|
+
const EXECUTION_REVERTED_ERROR_CODE_NEW = -32603;
|
8
9
|
function getContractError(err, { abi, address, args, docsPath, functionName, sender, }) {
|
9
10
|
const { code, data, message, shortMessage } = (err instanceof contract_js_1.RawContractError
|
10
11
|
? err
|
@@ -15,7 +16,7 @@ function getContractError(err, { abi, address, args, docsPath, functionName, sen
|
|
15
16
|
if (err instanceof abi_js_1.AbiDecodingZeroDataError) {
|
16
17
|
cause = new contract_js_1.ContractFunctionZeroDataError({ functionName });
|
17
18
|
}
|
18
|
-
else if (code
|
19
|
+
else if ([EXECUTION_REVERTED_ERROR_CODE, EXECUTION_REVERTED_ERROR_CODE_NEW].includes(code) &&
|
19
20
|
(data || message || shortMessage)) {
|
20
21
|
cause = new contract_js_1.ContractFunctionRevertedError({
|
21
22
|
abi,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getContractError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getContractError.ts"],"names":[],"mappings":";;;AAEA,gDAA8D;AAC9D,kDAAgD;AAChD,0DAKiC;AAEjC,MAAM,6BAA6B,GAAG,CAAC,CAAA;
|
1
|
+
{"version":3,"file":"getContractError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getContractError.ts"],"names":[],"mappings":";;;AAEA,gDAA8D;AAC9D,kDAAgD;AAChD,0DAKiC;AAEjC,MAAM,6BAA6B,GAAG,CAAC,CAAA;AACvC,MAAM,iCAAiC,GAAG,CAAC,KAAK,CAAA;AAEhD,SAAgB,gBAAgB,CAC9B,GAAc,EACd,EACE,GAAG,EACH,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,MAAM,GAQP;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,CAC5C,GAAG,YAAY,8BAAgB;QAC7B,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,GAAG,YAAY,mBAAS;YAC1B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,IAAK,GAAa,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE;YAC3D,CAAC,CAAC,EAAE,CACa,CAAA;IAErB,IAAI,KAAK,GAAG,GAAG,CAAA;IACf,IAAI,GAAG,YAAY,iCAAwB,EAAE;QAC3C,KAAK,GAAG,IAAI,2CAA6B,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;KAC5D;SAAM,IACL,CAAC,6BAA6B,EAAE,iCAAiC,CAAC,CAAC,QAAQ,CACzE,IAAI,CACL;QACD,CAAC,IAAI,IAAI,OAAO,IAAI,YAAY,CAAC,EACjC;QACA,KAAK,GAAG,IAAI,2CAA6B,CAAC;YACxC,GAAG;YACH,IAAI,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;YACjD,YAAY;YACZ,OAAO,EAAE,YAAY,IAAI,OAAO;SACjC,CAAC,CAAA;KACH;IAED,OAAO,IAAI,4CAA8B,CAAC,KAAK,EAAE;QAC/C,GAAG;QACH,IAAI;QACJ,eAAe,EAAE,OAAO;QACxB,QAAQ;QACR,YAAY;QACZ,MAAM;KACP,CAAC,CAAA;AACJ,CAAC;AAnDD,4CAmDC"}
|
@@ -2,11 +2,12 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getEstimateGasError = void 0;
|
4
4
|
const estimateGas_js_1 = require("../../errors/estimateGas.js");
|
5
|
+
const node_js_1 = require("../../errors/node.js");
|
5
6
|
const getNodeError_js_1 = require("./getNodeError.js");
|
6
7
|
function getEstimateGasError(err, { docsPath, ...args }) {
|
7
|
-
let cause = err;
|
8
|
-
if (
|
9
|
-
cause =
|
8
|
+
let cause = (0, getNodeError_js_1.getNodeError)(err, args);
|
9
|
+
if (cause instanceof node_js_1.UnknownNodeError)
|
10
|
+
cause = err;
|
10
11
|
return new estimateGas_js_1.EstimateGasExecutionError(cause, {
|
11
12
|
docsPath,
|
12
13
|
...args,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEstimateGasError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getEstimateGasError.ts"],"names":[],"mappings":";;;AAGA,gEAAuE;
|
1
|
+
{"version":3,"file":"getEstimateGasError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getEstimateGasError.ts"],"names":[],"mappings":";;;AAGA,gEAAuE;AACvE,kDAAuD;AAGvD,uDAA6E;AAE7E,SAAgB,mBAAmB,CACjC,GAAc,EACd,EACE,QAAQ,EACR,GAAG,IAAI,EAKR;IAED,IAAI,KAAK,GAAG,IAAA,8BAAY,EAAC,GAAG,EAAE,IAA8B,CAAC,CAAA;IAC7D,IAAI,KAAK,YAAY,0BAAgB;QAAE,KAAK,GAAG,GAAG,CAAA;IAClD,OAAO,IAAI,0CAAyB,CAAC,KAAK,EAAE;QAC1C,QAAQ;QACR,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC;AAjBD,kDAiBC"}
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getNodeError = exports.containsNodeError = void 0;
|
4
|
+
const base_js_1 = require("../../errors/base.js");
|
4
5
|
const node_js_1 = require("../../errors/node.js");
|
5
6
|
const request_js_1 = require("../../errors/request.js");
|
6
7
|
const rpc_js_1 = require("../../errors/rpc.js");
|
@@ -11,8 +12,20 @@ function containsNodeError(err) {
|
|
11
12
|
}
|
12
13
|
exports.containsNodeError = containsNodeError;
|
13
14
|
function getNodeError(err, args) {
|
14
|
-
const message = err.details.toLowerCase();
|
15
|
-
|
15
|
+
const message = (err.details || '').toLowerCase();
|
16
|
+
const executionRevertedError = err.walk((e) => e.code === node_js_1.ExecutionRevertedError.code);
|
17
|
+
if (executionRevertedError instanceof base_js_1.BaseError) {
|
18
|
+
return new node_js_1.ExecutionRevertedError({
|
19
|
+
cause: err,
|
20
|
+
message: executionRevertedError.details,
|
21
|
+
});
|
22
|
+
}
|
23
|
+
else if (node_js_1.ExecutionRevertedError.nodeMessage.test(message))
|
24
|
+
return new node_js_1.ExecutionRevertedError({
|
25
|
+
cause: err,
|
26
|
+
message: err.details,
|
27
|
+
});
|
28
|
+
else if (node_js_1.FeeCapTooHighError.nodeMessage.test(message))
|
16
29
|
return new node_js_1.FeeCapTooHighError({
|
17
30
|
cause: err,
|
18
31
|
maxFeePerGas: args?.maxFeePerGas,
|
@@ -42,15 +55,8 @@ function getNodeError(err, args) {
|
|
42
55
|
maxFeePerGas: args?.maxFeePerGas,
|
43
56
|
maxPriorityFeePerGas: args?.maxPriorityFeePerGas,
|
44
57
|
});
|
45
|
-
else if (message.match(node_js_1.ExecutionRevertedError.nodeMessage) ||
|
46
|
-
('code' in err.cause &&
|
47
|
-
err.cause?.code === node_js_1.ExecutionRevertedError.code))
|
48
|
-
return new node_js_1.ExecutionRevertedError({
|
49
|
-
cause: err,
|
50
|
-
message: err.cause.details || err.details,
|
51
|
-
});
|
52
58
|
return new node_js_1.UnknownNodeError({
|
53
|
-
cause: err
|
59
|
+
cause: err,
|
54
60
|
});
|
55
61
|
}
|
56
62
|
exports.getNodeError = getNodeError;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getNodeError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"getNodeError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"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"}
|
@@ -1,12 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getTransactionError = void 0;
|
4
|
+
const node_js_1 = require("../../errors/node.js");
|
4
5
|
const transaction_js_1 = require("../../errors/transaction.js");
|
5
6
|
const getNodeError_js_1 = require("./getNodeError.js");
|
6
7
|
function getTransactionError(err, { docsPath, ...args }) {
|
7
|
-
let cause = err;
|
8
|
-
if (
|
9
|
-
cause =
|
8
|
+
let cause = (0, getNodeError_js_1.getNodeError)(err, args);
|
9
|
+
if (cause instanceof node_js_1.UnknownNodeError)
|
10
|
+
cause = err;
|
10
11
|
return new transaction_js_1.TransactionExecutionError(cause, {
|
11
12
|
docsPath,
|
12
13
|
...args,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getTransactionError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getTransactionError.ts"],"names":[],"mappings":";;;AAGA,gEAAuE;AAGvE,
|
1
|
+
{"version":3,"file":"getTransactionError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getTransactionError.ts"],"names":[],"mappings":";;;AAGA,kDAAuD;AACvD,gEAAuE;AAGvE,uDAA6E;AAW7E,SAAgB,mBAAmB,CACjC,GAAc,EACd,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAiC;IAEpD,IAAI,KAAK,GAAG,IAAA,8BAAY,EAAC,GAAG,EAAE,IAA8B,CAAC,CAAA;IAC7D,IAAI,KAAK,YAAY,0BAAgB;QAAE,KAAK,GAAG,GAAG,CAAA;IAClD,OAAO,IAAI,0CAAyB,CAAC,KAAK,EAAE;QAC1C,QAAQ;QACR,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC;AAVD,kDAUC"}
|
package/dist/esm/errors/node.js
CHANGED
@@ -253,7 +253,7 @@ Object.defineProperty(TipAboveFeeCapError, "nodeMessage", {
|
|
253
253
|
export { TipAboveFeeCapError };
|
254
254
|
export class UnknownNodeError extends BaseError {
|
255
255
|
constructor({ cause }) {
|
256
|
-
super(`An error occurred while executing: ${cause?.
|
256
|
+
super(`An error occurred while executing: ${cause?.shortMessage}`, {
|
257
257
|
cause,
|
258
258
|
});
|
259
259
|
Object.defineProperty(this, "name", {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/errors/node.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/errors/node.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = '0.0.0-main.
|
1
|
+
export const version = '0.0.0-main.20230904T010242';
|
2
2
|
//# sourceMappingURL=version.js.map
|
@@ -1,9 +1,10 @@
|
|
1
1
|
import { CallExecutionError } from '../../errors/contract.js';
|
2
|
-
import {
|
2
|
+
import { UnknownNodeError } from '../../errors/node.js';
|
3
|
+
import { getNodeError } from './getNodeError.js';
|
3
4
|
export function getCallError(err, { docsPath, ...args }) {
|
4
|
-
let cause = err;
|
5
|
-
if (
|
6
|
-
cause =
|
5
|
+
let cause = getNodeError(err, args);
|
6
|
+
if (cause instanceof UnknownNodeError)
|
7
|
+
cause = err;
|
7
8
|
return new CallExecutionError(cause, {
|
8
9
|
docsPath,
|
9
10
|
...args,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getCallError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getCallError.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;
|
1
|
+
{"version":3,"file":"getCallError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getCallError.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvD,OAAO,EAA+B,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAE7E,MAAM,UAAU,YAAY,CAC1B,GAAc,EACd,EACE,QAAQ,EACR,GAAG,IAAI,EAIR;IAED,IAAI,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,IAA8B,CAAC,CAAA;IAC7D,IAAI,KAAK,YAAY,gBAAgB;QAAE,KAAK,GAAG,GAAG,CAAA;IAClD,OAAO,IAAI,kBAAkB,CAAC,KAAK,EAAE;QACnC,QAAQ;QACR,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC"}
|
@@ -2,6 +2,7 @@ import { AbiDecodingZeroDataError } from '../../errors/abi.js';
|
|
2
2
|
import { BaseError } from '../../errors/base.js';
|
3
3
|
import { ContractFunctionExecutionError, ContractFunctionRevertedError, ContractFunctionZeroDataError, RawContractError, } from '../../errors/contract.js';
|
4
4
|
const EXECUTION_REVERTED_ERROR_CODE = 3;
|
5
|
+
const EXECUTION_REVERTED_ERROR_CODE_NEW = -32603;
|
5
6
|
export function getContractError(err, { abi, address, args, docsPath, functionName, sender, }) {
|
6
7
|
const { code, data, message, shortMessage } = (err instanceof RawContractError
|
7
8
|
? err
|
@@ -12,7 +13,7 @@ export function getContractError(err, { abi, address, args, docsPath, functionNa
|
|
12
13
|
if (err instanceof AbiDecodingZeroDataError) {
|
13
14
|
cause = new ContractFunctionZeroDataError({ functionName });
|
14
15
|
}
|
15
|
-
else if (code
|
16
|
+
else if ([EXECUTION_REVERTED_ERROR_CODE, EXECUTION_REVERTED_ERROR_CODE_NEW].includes(code) &&
|
16
17
|
(data || message || shortMessage)) {
|
17
18
|
cause = new ContractFunctionRevertedError({
|
18
19
|
abi,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getContractError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getContractError.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC7B,6BAA6B,EAC7B,gBAAgB,GACjB,MAAM,0BAA0B,CAAA;AAEjC,MAAM,6BAA6B,GAAG,CAAC,CAAA;
|
1
|
+
{"version":3,"file":"getContractError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getContractError.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC7B,6BAA6B,EAC7B,gBAAgB,GACjB,MAAM,0BAA0B,CAAA;AAEjC,MAAM,6BAA6B,GAAG,CAAC,CAAA;AACvC,MAAM,iCAAiC,GAAG,CAAC,KAAK,CAAA;AAEhD,MAAM,UAAU,gBAAgB,CAC9B,GAAc,EACd,EACE,GAAG,EACH,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,MAAM,GAQP;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,CAC5C,GAAG,YAAY,gBAAgB;QAC7B,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,GAAG,YAAY,SAAS;YAC1B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,IAAK,GAAa,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE;YAC3D,CAAC,CAAC,EAAE,CACa,CAAA;IAErB,IAAI,KAAK,GAAG,GAAG,CAAA;IACf,IAAI,GAAG,YAAY,wBAAwB,EAAE;QAC3C,KAAK,GAAG,IAAI,6BAA6B,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;KAC5D;SAAM,IACL,CAAC,6BAA6B,EAAE,iCAAiC,CAAC,CAAC,QAAQ,CACzE,IAAI,CACL;QACD,CAAC,IAAI,IAAI,OAAO,IAAI,YAAY,CAAC,EACjC;QACA,KAAK,GAAG,IAAI,6BAA6B,CAAC;YACxC,GAAG;YACH,IAAI,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;YACjD,YAAY;YACZ,OAAO,EAAE,YAAY,IAAI,OAAO;SACjC,CAAC,CAAA;KACH;IAED,OAAO,IAAI,8BAA8B,CAAC,KAAK,EAAE;QAC/C,GAAG;QACH,IAAI;QACJ,eAAe,EAAE,OAAO;QACxB,QAAQ;QACR,YAAY;QACZ,MAAM;KACP,CAAC,CAAA;AACJ,CAAC"}
|
@@ -1,9 +1,10 @@
|
|
1
1
|
import { EstimateGasExecutionError } from '../../errors/estimateGas.js';
|
2
|
-
import {
|
2
|
+
import { UnknownNodeError } from '../../errors/node.js';
|
3
|
+
import { getNodeError } from './getNodeError.js';
|
3
4
|
export function getEstimateGasError(err, { docsPath, ...args }) {
|
4
|
-
let cause = err;
|
5
|
-
if (
|
6
|
-
cause =
|
5
|
+
let cause = getNodeError(err, args);
|
6
|
+
if (cause instanceof UnknownNodeError)
|
7
|
+
cause = err;
|
7
8
|
return new EstimateGasExecutionError(cause, {
|
8
9
|
docsPath,
|
9
10
|
...args,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEstimateGasError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getEstimateGasError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;
|
1
|
+
{"version":3,"file":"getEstimateGasError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getEstimateGasError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvD,OAAO,EAA+B,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAE7E,MAAM,UAAU,mBAAmB,CACjC,GAAc,EACd,EACE,QAAQ,EACR,GAAG,IAAI,EAKR;IAED,IAAI,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,IAA8B,CAAC,CAAA;IAC7D,IAAI,KAAK,YAAY,gBAAgB;QAAE,KAAK,GAAG,GAAG,CAAA;IAClD,OAAO,IAAI,yBAAyB,CAAC,KAAK,EAAE;QAC1C,QAAQ;QACR,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC"}
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import { BaseError } from '../../errors/base.js';
|
1
2
|
import { ExecutionRevertedError, FeeCapTooHighError, FeeCapTooLowError, InsufficientFundsError, IntrinsicGasTooHighError, IntrinsicGasTooLowError, NonceMaxValueError, NonceTooHighError, NonceTooLowError, TipAboveFeeCapError, TransactionTypeNotSupportedError, UnknownNodeError, } from '../../errors/node.js';
|
2
3
|
import { RpcRequestError } from '../../errors/request.js';
|
3
4
|
import { InvalidInputRpcError, TransactionRejectedRpcError, } from '../../errors/rpc.js';
|
@@ -7,8 +8,20 @@ export function containsNodeError(err) {
|
|
7
8
|
(err instanceof RpcRequestError && err.code === ExecutionRevertedError.code));
|
8
9
|
}
|
9
10
|
export function getNodeError(err, args) {
|
10
|
-
const message = err.details.toLowerCase();
|
11
|
-
|
11
|
+
const message = (err.details || '').toLowerCase();
|
12
|
+
const executionRevertedError = err.walk((e) => e.code === ExecutionRevertedError.code);
|
13
|
+
if (executionRevertedError instanceof BaseError) {
|
14
|
+
return new ExecutionRevertedError({
|
15
|
+
cause: err,
|
16
|
+
message: executionRevertedError.details,
|
17
|
+
});
|
18
|
+
}
|
19
|
+
else if (ExecutionRevertedError.nodeMessage.test(message))
|
20
|
+
return new ExecutionRevertedError({
|
21
|
+
cause: err,
|
22
|
+
message: err.details,
|
23
|
+
});
|
24
|
+
else if (FeeCapTooHighError.nodeMessage.test(message))
|
12
25
|
return new FeeCapTooHighError({
|
13
26
|
cause: err,
|
14
27
|
maxFeePerGas: args?.maxFeePerGas,
|
@@ -38,15 +51,8 @@ export function getNodeError(err, args) {
|
|
38
51
|
maxFeePerGas: args?.maxFeePerGas,
|
39
52
|
maxPriorityFeePerGas: args?.maxPriorityFeePerGas,
|
40
53
|
});
|
41
|
-
else if (message.match(ExecutionRevertedError.nodeMessage) ||
|
42
|
-
('code' in err.cause &&
|
43
|
-
err.cause?.code === ExecutionRevertedError.code))
|
44
|
-
return new ExecutionRevertedError({
|
45
|
-
cause: err,
|
46
|
-
message: err.cause.details || err.details,
|
47
|
-
});
|
48
54
|
return new UnknownNodeError({
|
49
|
-
cause: err
|
55
|
+
cause: err,
|
50
56
|
});
|
51
57
|
}
|
52
58
|
//# sourceMappingURL=getNodeError.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getNodeError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"getNodeError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"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"}
|
@@ -1,9 +1,10 @@
|
|
1
|
+
import { UnknownNodeError } from '../../errors/node.js';
|
1
2
|
import { TransactionExecutionError } from '../../errors/transaction.js';
|
2
|
-
import {
|
3
|
+
import { getNodeError } from './getNodeError.js';
|
3
4
|
export function getTransactionError(err, { docsPath, ...args }) {
|
4
|
-
let cause = err;
|
5
|
-
if (
|
6
|
-
cause =
|
5
|
+
let cause = getNodeError(err, args);
|
6
|
+
if (cause instanceof UnknownNodeError)
|
7
|
+
cause = err;
|
7
8
|
return new TransactionExecutionError(cause, {
|
8
9
|
docsPath,
|
9
10
|
...args,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getTransactionError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getTransactionError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAGvE,OAAO,
|
1
|
+
{"version":3,"file":"getTransactionError.js","sourceRoot":"","sources":["../../../../src/utils/errors/getTransactionError.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAGvE,OAAO,EAA+B,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAW7E,MAAM,UAAU,mBAAmB,CACjC,GAAc,EACd,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAiC;IAEpD,IAAI,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,IAA8B,CAAC,CAAA;IAC7D,IAAI,KAAK,YAAY,gBAAgB;QAAE,KAAK,GAAG,GAAG,CAAA;IAClD,OAAO,IAAI,yBAAyB,CAAC,KAAK,EAAE;QAC1C,QAAQ;QACR,GAAG,IAAI;KACR,CAAC,CAAA;AACJ,CAAC"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "0.0.0-main.
|
1
|
+
export declare const version = "0.0.0-main.20230904T010242";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getCallError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getCallError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;
|
1
|
+
{"version":3,"file":"getCallError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getCallError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAE7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAIjD,wBAAgB,YAAY,CAC1B,GAAG,EAAE,SAAS,EACd,EACE,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,cAAc,GAAG;IAClB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,sBAQF"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getContractError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getContractError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EACL,8BAA8B,EAI/B,MAAM,0BAA0B,CAAA;
|
1
|
+
{"version":3,"file":"getContractError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getContractError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EACL,8BAA8B,EAI/B,MAAM,0BAA0B,CAAA;AAKjC,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,SAAS,EACd,EACE,GAAG,EACH,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,MAAM,GACP,EAAE;IACD,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,GAAG,CAAA;IACT,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,kCAmCF"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEstimateGasError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getEstimateGasError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;
|
1
|
+
{"version":3,"file":"getEstimateGasError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getEstimateGasError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAEvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAIjD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,SAAS,EACd,EACE,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,GAAG;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,6BAQF"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js';
|
2
|
-
import
|
2
|
+
import { BaseError } from '../../errors/base.js';
|
3
3
|
import { ExecutionRevertedError, FeeCapTooHighError, FeeCapTooLowError, InsufficientFundsError, IntrinsicGasTooHighError, IntrinsicGasTooLowError, NonceMaxValueError, NonceTooHighError, NonceTooLowError, TipAboveFeeCapError, TransactionTypeNotSupportedError, UnknownNodeError } from '../../errors/node.js';
|
4
4
|
export declare function containsNodeError(err: BaseError): boolean;
|
5
5
|
export type GetNodeErrorParameters = Partial<SendTransactionParameters<any>>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getNodeError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAA;AACxF,OAAO,
|
1
|
+
{"version":3,"file":"getNodeError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAA;AACxF,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,gCAAgC,EAChC,gBAAgB,EACjB,MAAM,sBAAsB,CAAA;AAO7B,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,WAM/C;AAED,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAA;AAE5E,wBAAgB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,yRAiDxE"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getTransactionError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getTransactionError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAA;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;
|
1
|
+
{"version":3,"file":"getTransactionError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getTransactionError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAA;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAIjD,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,yBAAyB,EACzB,SAAS,GAAG,OAAO,CACpB,GAAG;IACF,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,SAAS,EACd,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,6BAA6B,6BAQrD"}
|
package/package.json
CHANGED
package/src/errors/node.ts
CHANGED
@@ -216,7 +216,7 @@ export class UnknownNodeError extends BaseError {
|
|
216
216
|
override name = 'UnknownNodeError'
|
217
217
|
|
218
218
|
constructor({ cause }: { cause?: BaseError }) {
|
219
|
-
super(`An error occurred while executing: ${cause?.
|
219
|
+
super(`An error occurred while executing: ${cause?.shortMessage}`, {
|
220
220
|
cause,
|
221
221
|
})
|
222
222
|
}
|
package/src/errors/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = '0.0.0-main.
|
1
|
+
export const version = '0.0.0-main.20230904T010242'
|
@@ -1,13 +1,10 @@
|
|
1
1
|
import type { CallParameters } from '../../actions/public/call.js'
|
2
2
|
import type { BaseError } from '../../errors/base.js'
|
3
3
|
import { CallExecutionError } from '../../errors/contract.js'
|
4
|
+
import { UnknownNodeError } from '../../errors/node.js'
|
4
5
|
import type { Chain } from '../../types/chain.js'
|
5
6
|
|
6
|
-
import {
|
7
|
-
type GetNodeErrorParameters,
|
8
|
-
containsNodeError,
|
9
|
-
getNodeError,
|
10
|
-
} from './getNodeError.js'
|
7
|
+
import { type GetNodeErrorParameters, getNodeError } from './getNodeError.js'
|
11
8
|
|
12
9
|
export function getCallError(
|
13
10
|
err: BaseError,
|
@@ -19,9 +16,8 @@ export function getCallError(
|
|
19
16
|
docsPath?: string
|
20
17
|
},
|
21
18
|
) {
|
22
|
-
let cause = err
|
23
|
-
if (
|
24
|
-
cause = getNodeError(err, args as GetNodeErrorParameters)
|
19
|
+
let cause = getNodeError(err, args as GetNodeErrorParameters)
|
20
|
+
if (cause instanceof UnknownNodeError) cause = err
|
25
21
|
return new CallExecutionError(cause, {
|
26
22
|
docsPath,
|
27
23
|
...args,
|
@@ -10,6 +10,7 @@ import {
|
|
10
10
|
} from '../../errors/contract.js'
|
11
11
|
|
12
12
|
const EXECUTION_REVERTED_ERROR_CODE = 3
|
13
|
+
const EXECUTION_REVERTED_ERROR_CODE_NEW = -32603
|
13
14
|
|
14
15
|
export function getContractError(
|
15
16
|
err: BaseError,
|
@@ -41,7 +42,9 @@ export function getContractError(
|
|
41
42
|
if (err instanceof AbiDecodingZeroDataError) {
|
42
43
|
cause = new ContractFunctionZeroDataError({ functionName })
|
43
44
|
} else if (
|
44
|
-
|
45
|
+
[EXECUTION_REVERTED_ERROR_CODE, EXECUTION_REVERTED_ERROR_CODE_NEW].includes(
|
46
|
+
code,
|
47
|
+
) &&
|
45
48
|
(data || message || shortMessage)
|
46
49
|
) {
|
47
50
|
cause = new ContractFunctionRevertedError({
|
@@ -2,13 +2,10 @@ import type { Account } from '../../accounts/types.js'
|
|
2
2
|
import type { EstimateGasParameters } from '../../actions/public/estimateGas.js'
|
3
3
|
import type { BaseError } from '../../errors/base.js'
|
4
4
|
import { EstimateGasExecutionError } from '../../errors/estimateGas.js'
|
5
|
+
import { UnknownNodeError } from '../../errors/node.js'
|
5
6
|
import type { Chain } from '../../types/chain.js'
|
6
7
|
|
7
|
-
import {
|
8
|
-
type GetNodeErrorParameters,
|
9
|
-
containsNodeError,
|
10
|
-
getNodeError,
|
11
|
-
} from './getNodeError.js'
|
8
|
+
import { type GetNodeErrorParameters, getNodeError } from './getNodeError.js'
|
12
9
|
|
13
10
|
export function getEstimateGasError(
|
14
11
|
err: BaseError,
|
@@ -21,9 +18,8 @@ export function getEstimateGasError(
|
|
21
18
|
docsPath?: string
|
22
19
|
},
|
23
20
|
) {
|
24
|
-
let cause = err
|
25
|
-
if (
|
26
|
-
cause = getNodeError(err, args as GetNodeErrorParameters)
|
21
|
+
let cause = getNodeError(err, args as GetNodeErrorParameters)
|
22
|
+
if (cause instanceof UnknownNodeError) cause = err
|
27
23
|
return new EstimateGasExecutionError(cause, {
|
28
24
|
docsPath,
|
29
25
|
...args,
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
|
2
|
-
import
|
2
|
+
import { BaseError } from '../../errors/base.js'
|
3
3
|
import {
|
4
4
|
ExecutionRevertedError,
|
5
5
|
FeeCapTooHighError,
|
@@ -31,8 +31,22 @@ export function containsNodeError(err: BaseError) {
|
|
31
31
|
export type GetNodeErrorParameters = Partial<SendTransactionParameters<any>>
|
32
32
|
|
33
33
|
export function getNodeError(err: BaseError, args: GetNodeErrorParameters) {
|
34
|
-
const message = err.details.toLowerCase()
|
35
|
-
|
34
|
+
const message = (err.details || '').toLowerCase()
|
35
|
+
|
36
|
+
const executionRevertedError = err.walk(
|
37
|
+
(e) => (e as { code: number }).code === ExecutionRevertedError.code,
|
38
|
+
)
|
39
|
+
if (executionRevertedError instanceof BaseError) {
|
40
|
+
return new ExecutionRevertedError({
|
41
|
+
cause: err,
|
42
|
+
message: executionRevertedError.details,
|
43
|
+
})
|
44
|
+
} else if (ExecutionRevertedError.nodeMessage.test(message))
|
45
|
+
return new ExecutionRevertedError({
|
46
|
+
cause: err,
|
47
|
+
message: err.details,
|
48
|
+
})
|
49
|
+
else if (FeeCapTooHighError.nodeMessage.test(message))
|
36
50
|
return new FeeCapTooHighError({
|
37
51
|
cause: err,
|
38
52
|
maxFeePerGas: args?.maxFeePerGas,
|
@@ -62,16 +76,7 @@ export function getNodeError(err: BaseError, args: GetNodeErrorParameters) {
|
|
62
76
|
maxFeePerGas: args?.maxFeePerGas,
|
63
77
|
maxPriorityFeePerGas: args?.maxPriorityFeePerGas,
|
64
78
|
})
|
65
|
-
else if (
|
66
|
-
message.match(ExecutionRevertedError.nodeMessage) ||
|
67
|
-
('code' in (err.cause as BaseError) &&
|
68
|
-
(err.cause as { code: number })?.code === ExecutionRevertedError.code)
|
69
|
-
)
|
70
|
-
return new ExecutionRevertedError({
|
71
|
-
cause: err,
|
72
|
-
message: (err.cause as BaseError).details || err.details,
|
73
|
-
})
|
74
79
|
return new UnknownNodeError({
|
75
|
-
cause:
|
80
|
+
cause: err,
|
76
81
|
})
|
77
82
|
}
|
@@ -1,14 +1,11 @@
|
|
1
1
|
import type { Account } from '../../accounts/types.js'
|
2
2
|
import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
|
3
3
|
import type { BaseError } from '../../errors/base.js'
|
4
|
+
import { UnknownNodeError } from '../../errors/node.js'
|
4
5
|
import { TransactionExecutionError } from '../../errors/transaction.js'
|
5
6
|
import type { Chain } from '../../types/chain.js'
|
6
7
|
|
7
|
-
import {
|
8
|
-
type GetNodeErrorParameters,
|
9
|
-
containsNodeError,
|
10
|
-
getNodeError,
|
11
|
-
} from './getNodeError.js'
|
8
|
+
import { type GetNodeErrorParameters, getNodeError } from './getNodeError.js'
|
12
9
|
|
13
10
|
export type GetTransactionErrorParameters = Omit<
|
14
11
|
SendTransactionParameters,
|
@@ -23,9 +20,8 @@ export function getTransactionError(
|
|
23
20
|
err: BaseError,
|
24
21
|
{ docsPath, ...args }: GetTransactionErrorParameters,
|
25
22
|
) {
|
26
|
-
let cause = err
|
27
|
-
if (
|
28
|
-
cause = getNodeError(err, args as GetNodeErrorParameters)
|
23
|
+
let cause = getNodeError(err, args as GetNodeErrorParameters)
|
24
|
+
if (cause instanceof UnknownNodeError) cause = err
|
29
25
|
return new TransactionExecutionError(cause, {
|
30
26
|
docsPath,
|
31
27
|
...args,
|