@prb/effect-evm 1.0.0-beta.0 → 1.0.0-beta.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/contract/cross-chain-reader.d.ts +14 -10
- package/dist/contract/cross-chain-reader.d.ts.map +1 -1
- package/dist/contract/cross-chain-reader.js +2 -8
- package/dist/contract/cross-chain-reader.js.map +1 -1
- package/dist/core/errors/transaction.d.ts +3 -1
- package/dist/core/errors/transaction.d.ts.map +1 -1
- package/dist/core/errors/transaction.js +124 -2
- package/dist/core/errors/transaction.js.map +1 -1
- package/dist/core/errors/viem-mapper.d.ts.map +1 -1
- package/dist/core/errors/viem-mapper.js +2 -13
- package/dist/core/errors/viem-mapper.js.map +1 -1
- package/dist/testing-kit/mock-cross-chain-reader.d.ts +3 -10
- package/dist/testing-kit/mock-cross-chain-reader.d.ts.map +1 -1
- package/dist/testing-kit/mock-cross-chain-reader.js.map +1 -1
- package/dist/wallet/operations.d.ts.map +1 -1
- package/dist/wallet/operations.js +6 -13
- package/dist/wallet/operations.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,26 +3,30 @@ import type { Abi, Address, ContractFunctionArgs } from "viem";
|
|
|
3
3
|
import type { ClientNotFoundError, ContractReadError, MulticallError } from "../core/index.js";
|
|
4
4
|
import type { ContractFunctionName, ContractFunctionReturnType, MulticallCall, MulticallResult } from "../types/index.js";
|
|
5
5
|
import { ContractReader } from "./reader.js";
|
|
6
|
+
type ArgsField<TArgs> = {
|
|
7
|
+
readonly args?: TArgs | undefined;
|
|
8
|
+
} & (readonly [] extends TArgs ? unknown : {
|
|
9
|
+
readonly args: TArgs;
|
|
10
|
+
});
|
|
6
11
|
export type CrossChainCall<TAbi extends Abi = Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view"> = ContractFunctionName<TAbi, "pure" | "view">> = {
|
|
7
|
-
readonly
|
|
12
|
+
readonly abi: TAbi;
|
|
8
13
|
readonly address: Address;
|
|
14
|
+
readonly chainId: number;
|
|
15
|
+
readonly functionName: TFunctionName;
|
|
16
|
+
} & ArgsField<ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>>;
|
|
17
|
+
export type ReadSameParams<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">> = {
|
|
9
18
|
readonly abi: TAbi;
|
|
19
|
+
readonly address: Address;
|
|
20
|
+
readonly chainIds: readonly number[];
|
|
10
21
|
readonly functionName: TFunctionName;
|
|
11
|
-
|
|
12
|
-
};
|
|
22
|
+
} & ArgsField<ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>>;
|
|
13
23
|
export type ChainMulticallBatch = {
|
|
14
24
|
readonly chainId: number;
|
|
15
25
|
readonly calls: readonly MulticallCall[];
|
|
16
26
|
};
|
|
17
27
|
export type CrossChainReaderShape = {
|
|
18
28
|
readonly readAll: <const TCalls extends readonly CrossChainCall[]>(calls: TCalls) => Effect.Effect<Map<number, unknown[]>, ContractReadError | ClientNotFoundError>;
|
|
19
|
-
readonly readSame: <TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">>(params:
|
|
20
|
-
chainIds: readonly number[];
|
|
21
|
-
address: Address;
|
|
22
|
-
abi: TAbi;
|
|
23
|
-
functionName: TFunctionName;
|
|
24
|
-
args?: ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>;
|
|
25
|
-
}) => Effect.Effect<Map<number, ContractFunctionReturnType<TAbi, "pure" | "view", TFunctionName>>, ContractReadError | ClientNotFoundError>;
|
|
29
|
+
readonly readSame: <TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">>(params: ReadSameParams<TAbi, TFunctionName>) => Effect.Effect<Map<number, ContractFunctionReturnType<TAbi, "pure" | "view", TFunctionName>>, ContractReadError | ClientNotFoundError>;
|
|
26
30
|
readonly multicallAll: <const TBatches extends readonly ChainMulticallBatch[]>(batches: TBatches) => Effect.Effect<Map<number, readonly MulticallResult<unknown>[]>, MulticallError | ClientNotFoundError>;
|
|
27
31
|
};
|
|
28
32
|
declare const CrossChainReader_base: Context.TagClass<CrossChainReader, "ew3/CrossChainReader", CrossChainReaderShape>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross-chain-reader.d.ts","sourceRoot":"","sources":["../../src/contract/cross-chain-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,MAAM,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAElG,OAAO,KAAK,EACV,oBAAoB,EACpB,0BAA0B,EAC1B,aAAa,EACb,eAAe,
|
|
1
|
+
{"version":3,"file":"cross-chain-reader.d.ts","sourceRoot":"","sources":["../../src/contract/cross-chain-reader.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,13 +34,7 @@ export const CrossChainReaderLive = Layer.effect(CrossChainReader, Effect.gen(fu
|
|
|
34
34
|
})),
|
|
35
35
|
readAll: (calls) => Effect.gen(function* () {
|
|
36
36
|
const groupedCalls = groupBy(calls, (call) => call.chainId);
|
|
37
|
-
const results = yield* Effect.all(Array.from(groupedCalls.entries()).map(([chainId, chainCalls]) => Effect.all(chainCalls.map((call) => reader.read({
|
|
38
|
-
abi: call.abi,
|
|
39
|
-
address: call.address,
|
|
40
|
-
chainId: call.chainId,
|
|
41
|
-
functionName: call.functionName,
|
|
42
|
-
...(call.args !== undefined ? { args: call.args } : {}),
|
|
43
|
-
})), { concurrency: "unbounded" }).pipe(Effect.map((chainResults) => ({
|
|
37
|
+
const results = yield* Effect.all(Array.from(groupedCalls.entries()).map(([chainId, chainCalls]) => Effect.all(chainCalls.map((call) => reader.read(call)), { concurrency: "unbounded" }).pipe(Effect.map((chainResults) => ({
|
|
44
38
|
chainId,
|
|
45
39
|
results: chainResults,
|
|
46
40
|
})))), { concurrency: "unbounded" });
|
|
@@ -60,9 +54,9 @@ export const CrossChainReaderLive = Layer.effect(CrossChainReader, Effect.gen(fu
|
|
|
60
54
|
.read({
|
|
61
55
|
abi: params.abi,
|
|
62
56
|
address: params.address,
|
|
57
|
+
args: params.args,
|
|
63
58
|
chainId,
|
|
64
59
|
functionName: params.functionName,
|
|
65
|
-
...(params.args !== undefined ? { args: params.args } : {}),
|
|
66
60
|
})
|
|
67
61
|
.pipe(Effect.map((result) => ({
|
|
68
62
|
chainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross-chain-reader.js","sourceRoot":"","sources":["../../src/contract/cross-chain-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"cross-chain-reader.js","sourceRoot":"","sources":["../../src/contract/cross-chain-reader.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,9 @@ declare const InsufficientFundsError_base: Schema.TaggedErrorClass<InsufficientF
|
|
|
44
44
|
}>;
|
|
45
45
|
export declare class InsufficientFundsError extends InsufficientFundsError_base {
|
|
46
46
|
}
|
|
47
|
-
export declare const
|
|
47
|
+
export declare const isTaggedUserRejectedError: (error: unknown) => error is UserRejectedError;
|
|
48
|
+
export declare function isUserRejectedError(error: unknown): boolean;
|
|
49
|
+
export declare function isLikelyUserRejectedError(error: unknown): boolean;
|
|
48
50
|
export declare const catchUserRejection: {
|
|
49
51
|
<A2>(fallback: A2): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A | A2, Exclude<E, UserRejectedError>, R>;
|
|
50
52
|
<A, E, R, A2>(effect: Effect.Effect<A, E, R>, fallback: A2): Effect.Effect<A | A2, Exclude<E, UserRejectedError>, R>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK/C,MAAM,MAAM,4BAA4B,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,CAAC;;;;;;AAEjF,qBAAa,iBAAkB,SAAQ,sBAKtC;CAAG;;;;;;;;AAEJ,qBAAa,sBAAuB,SAAQ,2BAO3C;CAAG;;;;;;;;;AAEJ,qBAAa,wBAAyB,SAAQ,6BAQ7C;CAAG;;;;;;;;AAEJ,qBAAa,mBAAoB,SAAQ,wBAOxC;CAAG;;;;;;;;AAEJ,qBAAa,sBAAuB,SAAQ,2BAO3C;CAAG;AAKJ,eAAO,MAAM,yBAAyB,gDAAwD,CAAC;AA+G/F,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE3D;AAMD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEjE;AAkED,eAAO,MAAM,kBAAkB,EAAE;IAC/B,CAAC,EAAE,EACD,QAAQ,EAAE,EAAE,GACX,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,QAAQ,EAAE,EAAE,GACX,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;CAY5D,CAAC;AAcF,eAAO,MAAM,sBAAsB,EAAE;IACnC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EACT,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAClC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAClC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;CAYtE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Effect, Schema } from "effect";
|
|
1
|
+
import { Cause, Effect, Schema } from "effect";
|
|
2
2
|
import { dual } from "effect/Function";
|
|
3
3
|
import { isTaggedError } from "./predicates.js";
|
|
4
4
|
export class UserRejectedError extends Schema.TaggedError()("UserRejectedError", {
|
|
@@ -30,7 +30,129 @@ export class InsufficientFundsError extends Schema.TaggedError()("InsufficientFu
|
|
|
30
30
|
required: Schema.String,
|
|
31
31
|
}) {
|
|
32
32
|
}
|
|
33
|
-
export const
|
|
33
|
+
export const isTaggedUserRejectedError = isTaggedError("UserRejectedError");
|
|
34
|
+
const USER_REJECTION_CODE = 4001;
|
|
35
|
+
const USER_REJECTION_MESSAGE_FRAGMENTS = [
|
|
36
|
+
"user rejected",
|
|
37
|
+
"user denied",
|
|
38
|
+
"user cancelled",
|
|
39
|
+
"rejected by user",
|
|
40
|
+
"denied by user",
|
|
41
|
+
"rejected the request",
|
|
42
|
+
];
|
|
43
|
+
function matchesUserRejectionMessage(message) {
|
|
44
|
+
const normalized = message.trim().toLowerCase();
|
|
45
|
+
return USER_REJECTION_MESSAGE_FRAGMENTS.some((fragment) => normalized.includes(fragment));
|
|
46
|
+
}
|
|
47
|
+
function matchesUserRejectionTag(tag) {
|
|
48
|
+
return tag.trim().toLowerCase().includes("userrejected");
|
|
49
|
+
}
|
|
50
|
+
function matchesUserRejectionName(name) {
|
|
51
|
+
return name.trim().toLowerCase().includes("userrejected");
|
|
52
|
+
}
|
|
53
|
+
function isUserRejectionCode(value) {
|
|
54
|
+
return value === USER_REJECTION_CODE || value === `${USER_REJECTION_CODE}`;
|
|
55
|
+
}
|
|
56
|
+
function checkUserRejectionRecord(record, depth) {
|
|
57
|
+
if (typeof record._tag === "string" && matchesUserRejectionTag(record._tag)) {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
if (typeof record.name === "string" && matchesUserRejectionName(record.name)) {
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
if (isUserRejectionCode(record.code)) {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
if (Cause.isCause(record.cause)) {
|
|
67
|
+
return checkUserRejection(Cause.squash(record.cause), depth + 1);
|
|
68
|
+
}
|
|
69
|
+
if (record.cause && checkUserRejection(record.cause, depth + 1)) {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
if (record.error && checkUserRejection(record.error, depth + 1)) {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
if (Array.isArray(record.errors)) {
|
|
76
|
+
return record.errors.some((error) => checkUserRejection(error, depth + 1));
|
|
77
|
+
}
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
function checkUserRejection(error, depth) {
|
|
81
|
+
if (!error || depth > 4) {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
if (isTaggedUserRejectedError(error)) {
|
|
85
|
+
return true;
|
|
86
|
+
}
|
|
87
|
+
if (Cause.isCause(error)) {
|
|
88
|
+
return checkUserRejection(Cause.squash(error), depth + 1);
|
|
89
|
+
}
|
|
90
|
+
if (error instanceof Error) {
|
|
91
|
+
if (matchesUserRejectionName(error.name)) {
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
if (isUserRejectionCode(error.code)) {
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
const tag = error._tag;
|
|
98
|
+
if (typeof tag === "string" && matchesUserRejectionTag(tag)) {
|
|
99
|
+
return true;
|
|
100
|
+
}
|
|
101
|
+
return checkUserRejectionRecord(error, depth);
|
|
102
|
+
}
|
|
103
|
+
if (typeof error === "object") {
|
|
104
|
+
return checkUserRejectionRecord(error, depth);
|
|
105
|
+
}
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
export function isUserRejectedError(error) {
|
|
109
|
+
return checkUserRejection(error, 0);
|
|
110
|
+
}
|
|
111
|
+
export function isLikelyUserRejectedError(error) {
|
|
112
|
+
return checkLikelyUserRejection(error, 0);
|
|
113
|
+
}
|
|
114
|
+
function checkLikelyUserRejectionRecord(record, depth) {
|
|
115
|
+
if (typeof record.message === "string" && matchesUserRejectionMessage(record.message)) {
|
|
116
|
+
return true;
|
|
117
|
+
}
|
|
118
|
+
if (Cause.isCause(record.cause)) {
|
|
119
|
+
return checkLikelyUserRejection(Cause.squash(record.cause), depth + 1);
|
|
120
|
+
}
|
|
121
|
+
if (record.cause && checkLikelyUserRejection(record.cause, depth + 1)) {
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
if (record.error && checkLikelyUserRejection(record.error, depth + 1)) {
|
|
125
|
+
return true;
|
|
126
|
+
}
|
|
127
|
+
if (Array.isArray(record.errors)) {
|
|
128
|
+
return record.errors.some((err) => checkLikelyUserRejection(err, depth + 1));
|
|
129
|
+
}
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
function checkLikelyUserRejection(error, depth) {
|
|
133
|
+
if (!error || depth > 4) {
|
|
134
|
+
return false;
|
|
135
|
+
}
|
|
136
|
+
if (isUserRejectedError(error)) {
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
if (typeof error === "string") {
|
|
140
|
+
return matchesUserRejectionMessage(error);
|
|
141
|
+
}
|
|
142
|
+
if (Cause.isCause(error)) {
|
|
143
|
+
return checkLikelyUserRejection(Cause.squash(error), depth + 1);
|
|
144
|
+
}
|
|
145
|
+
if (error instanceof Error) {
|
|
146
|
+
if (matchesUserRejectionMessage(error.message)) {
|
|
147
|
+
return true;
|
|
148
|
+
}
|
|
149
|
+
return checkLikelyUserRejectionRecord(error, depth);
|
|
150
|
+
}
|
|
151
|
+
if (typeof error === "object") {
|
|
152
|
+
return checkLikelyUserRejectionRecord(error, depth);
|
|
153
|
+
}
|
|
154
|
+
return false;
|
|
155
|
+
}
|
|
34
156
|
export const catchUserRejection = dual(2, (effect, fallback) => Effect.catchIf(effect, isUserRejectedError, () => Effect.succeed(fallback)));
|
|
35
157
|
export const catchUserRejectionWith = dual(2, (effect, fallback) => Effect.catchIf(effect, isUserRejectedError, () => fallback));
|
|
36
158
|
//# sourceMappingURL=transaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/core/errors/transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viem-mapper.d.ts","sourceRoot":"","sources":["../../../src/core/errors/viem-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAU1C,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"viem-mapper.d.ts","sourceRoot":"","sources":["../../../src/core/errors/viem-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,13 @@
|
|
|
1
1
|
import { ContractFunctionExecutionError, ContractFunctionRevertedError, BaseError as CoreError, EstimateGasExecutionError, TransactionExecutionError, UserRejectedRequestError, InsufficientFundsError as ViemInsufficientFundsError, } from "viem";
|
|
2
2
|
import { ContractReadError, ContractWriteError, GasEstimationError, SimulationFailedError, } from "../../core/errors/contract.js";
|
|
3
|
-
import { InsufficientFundsError, UserRejectedError } from "../../core/errors/transaction.js";
|
|
3
|
+
import { InsufficientFundsError, isUserRejectedError, UserRejectedError, } from "../../core/errors/transaction.js";
|
|
4
4
|
import { AddChainError, ChainSwitchError, SignMessageError, SignTransactionError, SignTypedDataError, WalletConnectionError, WatchAssetError, } from "../../wallet/index.js";
|
|
5
5
|
const REVERT_REASON_RE = /reverted with reason: (.+?)(?:\n|$)/;
|
|
6
6
|
const REVERT_CUSTOM_ERROR_RE = /reverted with custom error '(.+?)'/;
|
|
7
7
|
const EXECUTION_REVERTED_RE = /execution reverted(?::?\s*)(.+?)(?:\n|$)/i;
|
|
8
8
|
const TX_HASH_RE = /0x[a-fA-F0-9]{64}/;
|
|
9
9
|
export function isUserRejection(error) {
|
|
10
|
-
|
|
11
|
-
return true;
|
|
12
|
-
}
|
|
13
|
-
if (error instanceof Error) {
|
|
14
|
-
const message = error.message.toLowerCase();
|
|
15
|
-
return (message.includes("user rejected") ||
|
|
16
|
-
message.includes("user denied") ||
|
|
17
|
-
message.includes("user cancelled") ||
|
|
18
|
-
message.includes("rejected by user") ||
|
|
19
|
-
message.includes("denied by user"));
|
|
20
|
-
}
|
|
21
|
-
return false;
|
|
10
|
+
return isUserRejectedError(error) || error instanceof UserRejectedRequestError;
|
|
22
11
|
}
|
|
23
12
|
export function isInsufficientFunds(error) {
|
|
24
13
|
if (error instanceof ViemInsufficientFundsError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viem-mapper.js","sourceRoot":"","sources":["../../../src/core/errors/viem-mapper.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC7B,SAAS,IAAI,SAAS,EACtB,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,IAAI,0BAA0B,GACrD,MAAM,MAAM,CAAC;AACd,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,+BAA+B,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"viem-mapper.js","sourceRoot":"","sources":["../../../src/core/errors/viem-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,10 @@
|
|
|
1
1
|
import { Effect, Layer } from "effect";
|
|
2
|
-
import type {
|
|
3
|
-
import type { ChainMulticallBatch, CrossChainCall, CrossChainReader } from "../contract/index.js";
|
|
2
|
+
import type { ChainMulticallBatch, CrossChainCall, CrossChainReader, ReadSameParams } from "../contract/index.js";
|
|
4
3
|
import type { ClientNotFoundError, ContractReadError, MulticallError } from "../core/index.js";
|
|
5
|
-
import type { Abi,
|
|
4
|
+
import type { Abi, ContractFunctionName, ContractFunctionReturnType, MulticallResult } from "../types/index.js";
|
|
6
5
|
export type MockCrossChainReaderConfig = {
|
|
7
6
|
readAll?: <const TCalls extends readonly CrossChainCall[]>(calls: TCalls) => Effect.Effect<Map<number, unknown[]>, ContractReadError | ClientNotFoundError>;
|
|
8
|
-
readSame?: <TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">>(params:
|
|
9
|
-
chainIds: readonly number[];
|
|
10
|
-
address: Address;
|
|
11
|
-
abi: TAbi;
|
|
12
|
-
functionName: TFunctionName;
|
|
13
|
-
args?: ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>;
|
|
14
|
-
}) => Effect.Effect<Map<number, ContractFunctionReturnType<TAbi, "pure" | "view", TFunctionName>>, ContractReadError | ClientNotFoundError>;
|
|
7
|
+
readSame?: <TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">>(params: ReadSameParams<TAbi, TFunctionName>) => Effect.Effect<Map<number, ContractFunctionReturnType<TAbi, "pure" | "view", TFunctionName>>, ContractReadError | ClientNotFoundError>;
|
|
15
8
|
multicallAll?: <const TBatches extends readonly ChainMulticallBatch[]>(batches: TBatches) => Effect.Effect<Map<number, readonly MulticallResult<unknown>[]>, MulticallError | ClientNotFoundError>;
|
|
16
9
|
};
|
|
17
10
|
export declare const makeMockCrossChainReaderLayer: (config?: MockCrossChainReaderConfig, supportedChainIds?: readonly number[]) => Layer.Layer<CrossChainReader>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-cross-chain-reader.d.ts","sourceRoot":"","sources":["../../src/testing-kit/mock-cross-chain-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"mock-cross-chain-reader.d.ts","sourceRoot":"","sources":["../../src/testing-kit/mock-cross-chain-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAEhB,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAElG,OAAO,KAAK,EACV,GAAG,EACH,oBAAoB,EACpB,0BAA0B,EAC1B,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAQ9B,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,cAAc,EAAE,EACvD,KAAK,EAAE,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,iBAAiB,GAAG,mBAAmB,CAAC,CAAC;IAEpF,QAAQ,CAAC,EAAE,CAAC,IAAI,SAAS,GAAG,EAAE,aAAa,SAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,EAC7F,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,KACxC,MAAM,CAAC,MAAM,CAChB,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,aAAa,CAAC,CAAC,EAC7E,iBAAiB,GAAG,mBAAmB,CACxC,CAAC;IAEF,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,SAAS,SAAS,mBAAmB,EAAE,EACnE,OAAO,EAAE,QAAQ,KACd,MAAM,CAAC,MAAM,CAChB,GAAG,CAAC,MAAM,EAAE,SAAS,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAChD,cAAc,GAAG,mBAAmB,CACrC,CAAC;CACH,CAAC;AAuCF,eAAO,MAAM,6BAA6B,GACxC,SAAQ,0BAA+B,EACvC,oBAAmB,SAAS,MAAM,EAAQ,KACzC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAgG9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-cross-chain-reader.js","sourceRoot":"","sources":["../../src/testing-kit/mock-cross-chain-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAQvC,OAAO,EAAE,gBAAgB,IAAI,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAElF,OAAO,EAAE,mBAAmB,IAAI,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"mock-cross-chain-reader.js","sourceRoot":"","sources":["../../src/testing-kit/mock-cross-chain-reader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/wallet/operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAW,GAAG,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/wallet/operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAW,GAAG,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGpD,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACnB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AA+F/B,wBAAgB,WAAW,CACzB,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,iBAAiB,GACxB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,GAAG,wBAAwB,CAAC,CAkEjE;AAKD,wBAAgB,aAAa,CAC3B,KAAK,CAAC,SAAS,SAAS,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,EAEpD,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC,GAClD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,GAAG,wBAAwB,CAAC,CAiDnE;AAKD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,qBAAqB,GAC5B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,oBAAoB,GAAG,wBAAwB,CAAC,CAwCrE"}
|
|
@@ -1,16 +1,9 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
+
import { isLikelyUserRejectedError, isUserRejectedError } from "../core/errors/index.js";
|
|
2
3
|
import { SpanNames } from "../telemetry/index.js";
|
|
3
4
|
import { AccountNotConnectedError, SignMessageError, SignTransactionError, SignTypedDataError, } from "../wallet/index.js";
|
|
4
|
-
const isUserRejection = (error) =>
|
|
5
|
-
|
|
6
|
-
const msg = error.message.toLowerCase();
|
|
7
|
-
return (msg.includes("user rejected") ||
|
|
8
|
-
msg.includes("user denied") ||
|
|
9
|
-
msg.includes("rejected by user") ||
|
|
10
|
-
msg.includes("user rejected request"));
|
|
11
|
-
}
|
|
12
|
-
return false;
|
|
13
|
-
};
|
|
5
|
+
const isUserRejection = (error) => isUserRejectedError(error);
|
|
6
|
+
const isLikelyUserRejection = (error) => isLikelyUserRejectedError(error);
|
|
14
7
|
const errorCode = (error) => {
|
|
15
8
|
if (!error || typeof error !== "object") {
|
|
16
9
|
return;
|
|
@@ -96,7 +89,7 @@ export function signMessage(provider, params) {
|
|
|
96
89
|
return yield* Effect.tryPromise({
|
|
97
90
|
catch: (cause) => {
|
|
98
91
|
const errorMessage = messageOf(cause) || "Failed to sign message";
|
|
99
|
-
const isRejection =
|
|
92
|
+
const isRejection = isLikelyUserRejection(cause);
|
|
100
93
|
return new SignMessageError({
|
|
101
94
|
cause,
|
|
102
95
|
message: isRejection ? "User rejected the request" : errorMessage,
|
|
@@ -157,7 +150,7 @@ export function signTypedData(provider, params) {
|
|
|
157
150
|
return yield* Effect.tryPromise({
|
|
158
151
|
catch: (cause) => {
|
|
159
152
|
const errorMessage = messageOf(cause) || "Failed to sign typed data";
|
|
160
|
-
const isRejection =
|
|
153
|
+
const isRejection = isLikelyUserRejection(cause);
|
|
161
154
|
return new SignTypedDataError({
|
|
162
155
|
cause,
|
|
163
156
|
message: isRejection ? "User rejected the request" : errorMessage,
|
|
@@ -192,7 +185,7 @@ export function signTransaction(provider, params) {
|
|
|
192
185
|
return yield* Effect.tryPromise({
|
|
193
186
|
catch: (cause) => {
|
|
194
187
|
const errorMessage = cause instanceof Error ? cause.message : "Failed to sign transaction";
|
|
195
|
-
const isRejection =
|
|
188
|
+
const isRejection = isLikelyUserRejection(cause);
|
|
196
189
|
return new SignTransactionError({
|
|
197
190
|
cause,
|
|
198
191
|
message: isRejection ? "User rejected the request" : errorMessage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/wallet/operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAOrD,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAK/B,MAAM,eAAe,GAAG,CAAC,KAAc,EAAW,EAAE
|
|
1
|
+
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/wallet/operations.ts"],"names":[],"mappings":"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"}
|