@prb/effect-evm 1.0.0-beta.0 → 1.0.0-beta.2
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/balance/service.test.integration.d.ts +2 -0
- package/dist/balance/service.test.integration.d.ts.map +1 -0
- package/dist/balance/service.test.integration.js +289 -0
- package/dist/balance/service.test.integration.js.map +1 -0
- package/dist/block/service.test.integration.d.ts +2 -0
- package/dist/block/service.test.integration.d.ts.map +1 -0
- package/dist/block/service.test.integration.js +190 -0
- package/dist/block/service.test.integration.js.map +1 -0
- 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 +11 -13
- package/dist/core/errors/viem-mapper.js.map +1 -1
- package/dist/erc20/index.d.ts +1 -0
- package/dist/erc20/index.d.ts.map +1 -1
- package/dist/erc20/index.js +1 -0
- package/dist/erc20/index.js.map +1 -1
- package/dist/erc20/metadata.d.ts +16 -0
- package/dist/erc20/metadata.d.ts.map +1 -0
- package/dist/erc20/metadata.js +67 -0
- package/dist/erc20/metadata.js.map +1 -0
- package/dist/events/backfill.test.integration.d.ts +2 -0
- package/dist/events/backfill.test.integration.d.ts.map +1 -0
- package/dist/events/backfill.test.integration.js +112 -0
- package/dist/events/backfill.test.integration.js.map +1 -0
- package/dist/events/reliable-stream-simple.test.integration.d.ts +2 -0
- package/dist/events/reliable-stream-simple.test.integration.d.ts.map +1 -0
- package/dist/events/reliable-stream-simple.test.integration.js +22 -0
- package/dist/events/reliable-stream-simple.test.integration.js.map +1 -0
- package/dist/events/reliable-stream.test.integration.d.ts +2 -0
- package/dist/events/reliable-stream.test.integration.d.ts.map +1 -0
- package/dist/events/reliable-stream.test.integration.js +327 -0
- package/dist/events/reliable-stream.test.integration.js.map +1 -0
- package/dist/events/stream.test.integration.d.ts +2 -0
- package/dist/events/stream.test.integration.d.ts.map +1 -0
- package/dist/events/stream.test.integration.js +120 -0
- package/dist/events/stream.test.integration.js.map +1 -0
- package/dist/gas/service.test.integration.d.ts +2 -0
- package/dist/gas/service.test.integration.d.ts.map +1 -0
- package/dist/gas/service.test.integration.js +128 -0
- package/dist/gas/service.test.integration.js.map +1 -0
- package/dist/nonce/service.test.integration.d.ts +2 -0
- package/dist/nonce/service.test.integration.d.ts.map +1 -0
- package/dist/nonce/service.test.integration.js +141 -0
- package/dist/nonce/service.test.integration.js.map +1 -0
- package/dist/query/client.test.integration.d.ts +2 -0
- package/dist/query/client.test.integration.d.ts.map +1 -0
- package/dist/query/client.test.integration.js +94 -0
- package/dist/query/client.test.integration.js.map +1 -0
- package/dist/query/contract-query.test.integration.d.ts +2 -0
- package/dist/query/contract-query.test.integration.d.ts.map +1 -0
- package/dist/query/contract-query.test.integration.js +133 -0
- package/dist/query/contract-query.test.integration.js.map +1 -0
- package/dist/safe/detection.test.integration.d.ts +2 -0
- package/dist/safe/detection.test.integration.d.ts.map +1 -0
- package/dist/safe/detection.test.integration.js +92 -0
- package/dist/safe/detection.test.integration.js.map +1 -0
- package/dist/safe/service.test.integration.d.ts +2 -0
- package/dist/safe/service.test.integration.d.ts.map +1 -0
- package/dist/safe/service.test.integration.js +173 -0
- package/dist/safe/service.test.integration.js.map +1 -0
- package/dist/safe/simulation/errors.d.ts +3 -3
- package/dist/safe/simulation/errors.js +1 -1
- package/dist/safe/simulation/index.d.ts +1 -1
- package/dist/safe/simulation/index.js +1 -1
- package/dist/safe/simulation/service.d.ts +2 -2
- package/dist/safe/simulation/service.js +2 -2
- package/dist/signature/service.test.integration.d.ts +2 -0
- package/dist/signature/service.test.integration.d.ts.map +1 -0
- package/dist/signature/service.test.integration.js +179 -0
- package/dist/signature/service.test.integration.js.map +1 -0
- package/dist/simulation/tenderly.test.integration.d.ts +2 -0
- package/dist/simulation/tenderly.test.integration.d.ts.map +1 -0
- package/dist/simulation/tenderly.test.integration.js +104 -0
- package/dist/simulation/tenderly.test.integration.js.map +1 -0
- 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/tx/manager.test.integration.d.ts +2 -0
- package/dist/tx/manager.test.integration.d.ts.map +1 -0
- package/dist/tx/manager.test.integration.js +157 -0
- package/dist/tx/manager.test.integration.js.map +1 -0
- 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 +5 -1
|
@@ -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,15 @@
|
|
|
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, isLikelyUserRejectedError, 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
|
+
const REVERT_REASON_STRING_RE = /reverted with reason string '(.+?)'/;
|
|
6
7
|
const REVERT_CUSTOM_ERROR_RE = /reverted with custom error '(.+?)'/;
|
|
7
8
|
const EXECUTION_REVERTED_RE = /execution reverted(?::?\s*)(.+?)(?:\n|$)/i;
|
|
9
|
+
const EXECUTION_REVERTED_GENERIC_RE = /execution reverted/i;
|
|
8
10
|
const TX_HASH_RE = /0x[a-fA-F0-9]{64}/;
|
|
9
11
|
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;
|
|
12
|
+
return isLikelyUserRejectedError(error) || error instanceof UserRejectedRequestError;
|
|
22
13
|
}
|
|
23
14
|
export function isInsufficientFunds(error) {
|
|
24
15
|
if (error instanceof ViemInsufficientFundsError) {
|
|
@@ -59,6 +50,10 @@ export function extractRevertReason(error) {
|
|
|
59
50
|
}
|
|
60
51
|
}
|
|
61
52
|
if (error instanceof Error) {
|
|
53
|
+
const reasonStringMatch = error.message.match(REVERT_REASON_STRING_RE);
|
|
54
|
+
if (reasonStringMatch?.[1]) {
|
|
55
|
+
return reasonStringMatch[1];
|
|
56
|
+
}
|
|
62
57
|
const execMatch = error.message.match(EXECUTION_REVERTED_RE);
|
|
63
58
|
if (execMatch?.[1]) {
|
|
64
59
|
return execMatch[1].trim();
|
|
@@ -71,6 +66,9 @@ export function extractRevertReason(error) {
|
|
|
71
66
|
if (customMatch?.[1]) {
|
|
72
67
|
return customMatch[1];
|
|
73
68
|
}
|
|
69
|
+
if (EXECUTION_REVERTED_GENERIC_RE.test(error.message)) {
|
|
70
|
+
return "execution reverted";
|
|
71
|
+
}
|
|
74
72
|
}
|
|
75
73
|
return undefined;
|
|
76
74
|
}
|
|
@@ -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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"}
|
package/dist/erc20/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/erc20/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/erc20/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
|
package/dist/erc20/index.js
CHANGED
package/dist/erc20/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/erc20/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/erc20/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import type { Address } from "viem";
|
|
3
|
+
import { ContractReader } from "../contract/index.js";
|
|
4
|
+
import type { ClientNotFoundError, MulticallError } from "../core/index.js";
|
|
5
|
+
export type Erc20Metadata = {
|
|
6
|
+
address: Address;
|
|
7
|
+
chainId: number;
|
|
8
|
+
decimals: number;
|
|
9
|
+
name?: string;
|
|
10
|
+
symbol?: string;
|
|
11
|
+
};
|
|
12
|
+
export declare function readErc20Metadata(params: {
|
|
13
|
+
chainId: number;
|
|
14
|
+
tokenAddress: Address;
|
|
15
|
+
}): Effect.Effect<Erc20Metadata, MulticallError | ClientNotFoundError, ContractReader>;
|
|
16
|
+
//# sourceMappingURL=metadata.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/erc20/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAO,MAAM,MAAM,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG/E,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAKF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,cAAc,GAAG,mBAAmB,EAAE,cAAc,CAAC,CAgErF"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { erc20Abi, erc20Abi_bytes32 } from "../abi/index.js";
|
|
3
|
+
import { decodeBytes32String } from "../balance/index.js";
|
|
4
|
+
import { ContractReader } from "../contract/index.js";
|
|
5
|
+
export function readErc20Metadata(params) {
|
|
6
|
+
return Effect.gen(function* () {
|
|
7
|
+
const reader = yield* ContractReader;
|
|
8
|
+
const results = yield* reader.multicall(params.chainId, [
|
|
9
|
+
{
|
|
10
|
+
abi: erc20Abi,
|
|
11
|
+
address: params.tokenAddress,
|
|
12
|
+
functionName: "decimals",
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
abi: erc20Abi,
|
|
16
|
+
address: params.tokenAddress,
|
|
17
|
+
functionName: "name",
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
abi: erc20Abi,
|
|
21
|
+
address: params.tokenAddress,
|
|
22
|
+
functionName: "symbol",
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
abi: erc20Abi_bytes32,
|
|
26
|
+
address: params.tokenAddress,
|
|
27
|
+
functionName: "name",
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
abi: erc20Abi_bytes32,
|
|
31
|
+
address: params.tokenAddress,
|
|
32
|
+
functionName: "symbol",
|
|
33
|
+
},
|
|
34
|
+
]);
|
|
35
|
+
const [decimalsResult, nameResult, symbolResult, nameBytes32Result, symbolBytes32Result] = results;
|
|
36
|
+
const decimals = (() => {
|
|
37
|
+
if (decimalsResult.status !== "success") {
|
|
38
|
+
return 18;
|
|
39
|
+
}
|
|
40
|
+
const value = typeof decimalsResult.result === "bigint"
|
|
41
|
+
? Number(decimalsResult.result)
|
|
42
|
+
: decimalsResult.result;
|
|
43
|
+
return Number.isSafeInteger(value) && value >= 0 && value <= 255 ? value : 18;
|
|
44
|
+
})();
|
|
45
|
+
const name = extractStringOrBytes32(nameResult, nameBytes32Result);
|
|
46
|
+
const symbol = extractStringOrBytes32(symbolResult, symbolBytes32Result);
|
|
47
|
+
return {
|
|
48
|
+
address: params.tokenAddress,
|
|
49
|
+
chainId: params.chainId,
|
|
50
|
+
decimals,
|
|
51
|
+
name,
|
|
52
|
+
symbol,
|
|
53
|
+
};
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
function extractStringOrBytes32(stringResult, bytes32Result) {
|
|
57
|
+
const normalized = stringResult.status === "success" ? normalizeString(stringResult.result) : undefined;
|
|
58
|
+
if (normalized) {
|
|
59
|
+
return normalized;
|
|
60
|
+
}
|
|
61
|
+
return bytes32Result.status === "success" ? decodeBytes32String(bytes32Result.result) : undefined;
|
|
62
|
+
}
|
|
63
|
+
function normalizeString(value) {
|
|
64
|
+
const trimmed = value.trim();
|
|
65
|
+
return trimmed.length > 0 ? trimmed : undefined;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=metadata.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/erc20/metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backfill.test.integration.d.ts","sourceRoot":"","sources":["../../src/events/backfill.test.integration.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { describe, expect, it } from "@effect/vitest";
|
|
2
|
+
import { Chunk, Effect, Layer, Stream } from "effect";
|
|
3
|
+
import { erc20Abi } from "viem";
|
|
4
|
+
import { EventBackfill, EventBackfillLive } from "../events/index.js";
|
|
5
|
+
import { makeMockPublicClientLayer, TEST_ADDRESS, TEST_CHAIN_ID } from "../testing-kit/index.js";
|
|
6
|
+
describe("EventBackfill", () => {
|
|
7
|
+
describe("fetch", () => {
|
|
8
|
+
it.effect("returns Stream that fetches historical events in batches", () => Effect.gen(function* () {
|
|
9
|
+
const backfill = yield* EventBackfill;
|
|
10
|
+
const eventStream = yield* backfill.fetch({
|
|
11
|
+
abi: erc20Abi,
|
|
12
|
+
address: TEST_ADDRESS,
|
|
13
|
+
batchSize: 5n,
|
|
14
|
+
chainId: TEST_CHAIN_ID,
|
|
15
|
+
eventName: "Transfer",
|
|
16
|
+
fromBlock: 1n,
|
|
17
|
+
toBlock: 10n,
|
|
18
|
+
});
|
|
19
|
+
const events = yield* Stream.runCollect(eventStream);
|
|
20
|
+
const eventArray = Chunk.toReadonlyArray(events);
|
|
21
|
+
expect(eventArray).toHaveLength(2);
|
|
22
|
+
expect(eventArray[0].eventName).toBe("Transfer");
|
|
23
|
+
expect(eventArray[1].eventName).toBe("Transfer");
|
|
24
|
+
}).pipe(Effect.provide(Layer.provide(EventBackfillLive, makeMockPublicClientLayer({
|
|
25
|
+
getLogs: (params) => {
|
|
26
|
+
return Promise.resolve([
|
|
27
|
+
{
|
|
28
|
+
address: TEST_ADDRESS,
|
|
29
|
+
blockHash: "0xblockhash",
|
|
30
|
+
blockNumber: params.fromBlock ?? 1n,
|
|
31
|
+
data: "0x0000000000000000000000000000000000000000000000000000000000000064",
|
|
32
|
+
logIndex: 0,
|
|
33
|
+
removed: false,
|
|
34
|
+
topics: [
|
|
35
|
+
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
|
|
36
|
+
"0x0000000000000000000000001234567890123456789012345678901234567890",
|
|
37
|
+
"0x0000000000000000000000000987654321098765432109876543210987654321",
|
|
38
|
+
],
|
|
39
|
+
transactionHash: "0xtxhash",
|
|
40
|
+
transactionIndex: 0,
|
|
41
|
+
},
|
|
42
|
+
]);
|
|
43
|
+
},
|
|
44
|
+
})))));
|
|
45
|
+
it.effect("uses current block as toBlock when not specified", () => Effect.gen(function* () {
|
|
46
|
+
const backfill = yield* EventBackfill;
|
|
47
|
+
const eventStream = yield* backfill.fetch({
|
|
48
|
+
abi: erc20Abi,
|
|
49
|
+
address: TEST_ADDRESS,
|
|
50
|
+
chainId: TEST_CHAIN_ID,
|
|
51
|
+
eventName: "Transfer",
|
|
52
|
+
fromBlock: 1n,
|
|
53
|
+
});
|
|
54
|
+
const events = yield* Stream.runCollect(eventStream);
|
|
55
|
+
const eventArray = Chunk.toReadonlyArray(events);
|
|
56
|
+
expect(eventArray).toHaveLength(1);
|
|
57
|
+
}).pipe(Effect.provide(Layer.provide(EventBackfillLive, makeMockPublicClientLayer({
|
|
58
|
+
getBlockNumber: async () => 100n,
|
|
59
|
+
getLogs: () => Promise.resolve([
|
|
60
|
+
{
|
|
61
|
+
address: TEST_ADDRESS,
|
|
62
|
+
blockHash: "0xblockhash",
|
|
63
|
+
blockNumber: 50n,
|
|
64
|
+
data: "0x0000000000000000000000000000000000000000000000000000000000000064",
|
|
65
|
+
logIndex: 0,
|
|
66
|
+
removed: false,
|
|
67
|
+
topics: [
|
|
68
|
+
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
|
|
69
|
+
"0x0000000000000000000000001234567890123456789012345678901234567890",
|
|
70
|
+
"0x0000000000000000000000000987654321098765432109876543210987654321",
|
|
71
|
+
],
|
|
72
|
+
transactionHash: "0xtxhash",
|
|
73
|
+
transactionIndex: 0,
|
|
74
|
+
},
|
|
75
|
+
]),
|
|
76
|
+
})))));
|
|
77
|
+
});
|
|
78
|
+
describe("fetchAll", () => {
|
|
79
|
+
it.effect("returns all historical events as array", () => Effect.gen(function* () {
|
|
80
|
+
const backfill = yield* EventBackfill;
|
|
81
|
+
const events = yield* backfill.fetchAll({
|
|
82
|
+
abi: erc20Abi,
|
|
83
|
+
address: TEST_ADDRESS,
|
|
84
|
+
chainId: TEST_CHAIN_ID,
|
|
85
|
+
eventName: "Transfer",
|
|
86
|
+
fromBlock: 1n,
|
|
87
|
+
toBlock: 10n,
|
|
88
|
+
});
|
|
89
|
+
expect(events).toHaveLength(1);
|
|
90
|
+
expect(events[0].eventName).toBe("Transfer");
|
|
91
|
+
}).pipe(Effect.provide(Layer.provide(EventBackfillLive, makeMockPublicClientLayer({
|
|
92
|
+
getLogs: () => Promise.resolve([
|
|
93
|
+
{
|
|
94
|
+
address: TEST_ADDRESS,
|
|
95
|
+
blockHash: "0xblockhash",
|
|
96
|
+
blockNumber: 5n,
|
|
97
|
+
data: "0x0000000000000000000000000000000000000000000000000000000000000064",
|
|
98
|
+
logIndex: 0,
|
|
99
|
+
removed: false,
|
|
100
|
+
topics: [
|
|
101
|
+
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
|
|
102
|
+
"0x0000000000000000000000001234567890123456789012345678901234567890",
|
|
103
|
+
"0x0000000000000000000000000987654321098765432109876543210987654321",
|
|
104
|
+
],
|
|
105
|
+
transactionHash: "0xtxhash",
|
|
106
|
+
transactionIndex: 0,
|
|
107
|
+
},
|
|
108
|
+
]),
|
|
109
|
+
})))));
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
//# sourceMappingURL=backfill.test.integration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backfill.test.integration.js","sourceRoot":"","sources":["../../src/events/backfill.test.integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reliable-stream-simple.test.integration.d.ts","sourceRoot":"","sources":["../../src/events/reliable-stream-simple.test.integration.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { describe, expect, it } from "@effect/vitest";
|
|
2
|
+
import { Effect, Exit, Layer, Stream } from "effect";
|
|
3
|
+
import { erc20Abi } from "viem";
|
|
4
|
+
import { EventStream, ReliableEventStream, ReliableEventStreamLive } from "../events/index.js";
|
|
5
|
+
import { makeMockPublicClientLayer, TEST_ADDRESS, UNKNOWN_CHAIN_ID, } from "../testing-kit/index.js";
|
|
6
|
+
describe("ReliableEventStream - Simple", () => {
|
|
7
|
+
it.effect("ClientNotFoundError when chainId invalid", () => Effect.gen(function* () {
|
|
8
|
+
const layers = Layer.provide(ReliableEventStreamLive, Layer.merge(Layer.succeed(EventStream, {
|
|
9
|
+
decodeReceipt: () => Effect.succeed([]),
|
|
10
|
+
watch: () => Effect.succeed(Stream.async(() => Effect.void)),
|
|
11
|
+
}), makeMockPublicClientLayer()));
|
|
12
|
+
const reliableStream = yield* Effect.provide(ReliableEventStream, layers);
|
|
13
|
+
const exit = yield* Effect.exit(reliableStream.watch({
|
|
14
|
+
abi: erc20Abi,
|
|
15
|
+
address: TEST_ADDRESS,
|
|
16
|
+
chainId: UNKNOWN_CHAIN_ID,
|
|
17
|
+
eventName: "Transfer",
|
|
18
|
+
}));
|
|
19
|
+
expect(Exit.isFailure(exit)).toBe(true);
|
|
20
|
+
}));
|
|
21
|
+
});
|
|
22
|
+
//# sourceMappingURL=reliable-stream-simple.test.integration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reliable-stream-simple.test.integration.js","sourceRoot":"","sources":["../../src/events/reliable-stream-simple.test.integration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EACL,yBAAyB,EACzB,YAAY,EACZ,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AAEpC,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,MAAM,CAAC,0CAA0C,EAAE,GAAG,EAAE,CACzD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAC1B,uBAAuB,EACvB,KAAK,CAAC,KAAK,CACT,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE;YACzB,aAAa,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,KAAK,EAAE,GAAG,EAAE,CACV,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAClB,CACF;SACmB,CAAC,EACzB,yBAAyB,EAAE,CAC5B,CACF,CAAC;QAEF,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAC7B,cAAc,CAAC,KAAK,CAAC;YACnB,GAAG,EAAE,QAAQ;YACb,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE,gBAAgB;YACzB,SAAS,EAAE,UAAU;SACtB,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reliable-stream.test.integration.d.ts","sourceRoot":"","sources":["../../src/events/reliable-stream.test.integration.ts"],"names":[],"mappings":""}
|