@prb/effect-evm 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/balance/service.test.integration.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service.test.integration.d.ts.map

package/dist/balance/service.test.integration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.test.integration.d.ts","sourceRoot":"","sources":["../../src/balance/service.test.integration.ts"],"names":[],"mappings":""}

package/dist/balance/service.test.integration.js

@@ -0,0 +1,289 @@
+import { describe, expect, it } from "@effect/vitest";
+import { Cause, Effect, Exit } from "effect";
+import { mainnet } from "viem/chains";
+import { BalanceService, decodeBytes32String } from "../balance/index.js";
+import { ClientNotFoundError, TransportError } from "../core/index.js";
+import { makeEffectEvmTestLayer } from "../testing-kit/index.js";
+describe("BalanceService (Live)", () => {
+    const testAddress = "0x1234567890123456789012345678901234567890";
+    const tokenAddress = "0xabcdefabcdefabcdefabcdefabcdefabcdefabcd";
+    const testLayer = makeEffectEvmTestLayer({
+        publicClient: {
+            getBalance: () => Promise.resolve(1000000000000000000n),
+            multicall: (params) => {
+                const contracts = params.contracts ?? [];
+                return Promise.resolve(contracts.map((c) => {
+                    switch (c.functionName) {
+                        case "balanceOf":
+                            return { result: 1000000000n, status: "success" };
+                        case "decimals":
+                            return { result: 18, status: "success" };
+                        case "symbol":
+                            return { result: "MOCK", status: "success" };
+                        case "name":
+                            return { result: "Mock Token", status: "success" };
+                        default:
+                            return { result: 0n, status: "success" };
+                    }
+                }));
+            },
+            readContract: (params) => {
+                const functionName = params.functionName;
+                if (functionName === "balanceOf") {
+                    return Promise.resolve(1000000000n);
+                }
+                return Promise.resolve(0n);
+            },
+        },
+    });
+    describe("getBalance", () => {
+        it.effect("returns native balance", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const result = yield* service.getBalance({
+                address: testAddress,
+                chainId: mainnet.id,
+            });
+            expect(result).toBe(1000000000000000000n);
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("supports blockTag parameter", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const result = yield* service.getBalance({
+                address: testAddress,
+                blockTag: "latest",
+                chainId: mainnet.id,
+            });
+            expect(result).toBe(1000000000000000000n);
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("fails with TransportError (not defect) when RPC rejects", () => {
+            const failingLayer = makeEffectEvmTestLayer({
+                publicClient: {
+                    getBalance: () => Promise.reject(new Error("boom")),
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BalanceService;
+                const exit = yield* Effect.exit(service.getBalance({
+                    address: testAddress,
+                    chainId: mainnet.id,
+                }));
+                expect(Exit.isFailure(exit)).toBe(true);
+                if (Exit.isFailure(exit)) {
+                    const error = Cause.failureOption(exit.cause);
+                    expect(error._tag).toBe("Some");
+                    if (error._tag === "Some") {
+                        expect(error.value).toBeInstanceOf(TransportError);
+                    }
+                }
+            }).pipe(Effect.provide(failingLayer));
+        });
+        it.effect("fails with ClientNotFoundError for unsupported chainId", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const exit = yield* Effect.exit(service.getBalance({
+                address: testAddress,
+                chainId: 123_456_789,
+            }));
+            expect(Exit.isFailure(exit)).toBe(true);
+            if (Exit.isFailure(exit)) {
+                const error = Cause.failureOption(exit.cause);
+                if (error._tag === "Some") {
+                    expect(error.value).toBeInstanceOf(ClientNotFoundError);
+                }
+            }
+        }).pipe(Effect.provide(testLayer)));
+    });
+    describe("getTokenBalance", () => {
+        it.effect("returns token balance", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const result = yield* service.getTokenBalance({
+                address: testAddress,
+                chainId: mainnet.id,
+                tokenAddress,
+            });
+            expect(result).toBe(1000000000n);
+        }).pipe(Effect.provide(testLayer)));
+    });
+    describe("getTokenBalances", () => {
+        it.effect("returns multiple token balances with metadata", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const tokenAddresses = [
+                "0xabcdefabcdefabcdefabcdefabcdefabcdefabcd",
+                "0x1111111111111111111111111111111111111111",
+            ];
+            const result = yield* service.getTokenBalances({
+                address: testAddress,
+                chainId: mainnet.id,
+                tokenAddresses,
+            });
+            expect(result).toHaveLength(2);
+            expect(result[0]?.balance).toBe(1000000000n);
+            expect(result[0]?.decimals).toBe(18);
+            expect(result[0]?.symbol).toBe("MOCK");
+            expect(result[0]?.name).toBe("Mock Token");
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("falls back to bytes32 when string calls fail", () => {
+            const bytes32Layer = makeEffectEvmTestLayer({
+                publicClient: {
+                    multicall: (params) => {
+                        const contracts = params.contracts ?? [];
+                        return Promise.resolve(contracts.map((c) => {
+                            const isBytes32Abi = Array.isArray(c.abi) &&
+                                c.abi.some((item) => item.name === c.functionName && item.outputs?.[0]?.type === "bytes32");
+                            switch (c.functionName) {
+                                case "balanceOf":
+                                    return { result: 1000000000n, status: "success" };
+                                case "decimals":
+                                    return { result: 18, status: "success" };
+                                case "symbol":
+                                    if (isBytes32Abi) {
+                                        return {
+                                            result: "0x5553445400000000000000000000000000000000000000000000000000000000",
+                                            status: "success",
+                                        };
+                                    }
+                                    return {
+                                        error: new Error("not supported"),
+                                        status: "failure",
+                                    };
+                                case "name":
+                                    if (isBytes32Abi) {
+                                        return {
+                                            result: "0x5465746865722055534400000000000000000000000000000000000000000000",
+                                            status: "success",
+                                        };
+                                    }
+                                    return {
+                                        error: new Error("not supported"),
+                                        status: "failure",
+                                    };
+                                default:
+                                    return { result: 0n, status: "success" };
+                            }
+                        }));
+                    },
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BalanceService;
+                const result = yield* service.getTokenBalances({
+                    address: testAddress,
+                    chainId: mainnet.id,
+                    tokenAddresses: [tokenAddress],
+                });
+                expect(result).toHaveLength(1);
+                expect(result[0]?.symbol).toBe("USDT");
+                expect(result[0]?.name).toBe("Tether USD");
+            }).pipe(Effect.provide(bytes32Layer));
+        });
+        it.effect("prefers string results over bytes32 when both succeed", () => {
+            const hybridLayer = makeEffectEvmTestLayer({
+                publicClient: {
+                    multicall: (params) => {
+                        const contracts = params.contracts ?? [];
+                        return Promise.resolve(contracts.map((c) => {
+                            const isBytes32Abi = Array.isArray(c.abi) &&
+                                c.abi.some((item) => item.name === c.functionName && item.outputs?.[0]?.type === "bytes32");
+                            switch (c.functionName) {
+                                case "balanceOf":
+                                    return { result: 1000000000n, status: "success" };
+                                case "decimals":
+                                    return { result: 18, status: "success" };
+                                case "symbol":
+                                    if (isBytes32Abi) {
+                                        return {
+                                            result: "0x4d4f434b00000000000000000000000000000000000000000000000000000000",
+                                            status: "success",
+                                        };
+                                    }
+                                    return {
+                                        result: "MOCK_STRING",
+                                        status: "success",
+                                    };
+                                case "name":
+                                    if (isBytes32Abi) {
+                                        return {
+                                            result: "0x4d6f636b20546f6b656e0000000000000000000000000000000000000000000000",
+                                            status: "success",
+                                        };
+                                    }
+                                    return {
+                                        result: "Mock Token String",
+                                        status: "success",
+                                    };
+                                default:
+                                    return { result: 0n, status: "success" };
+                            }
+                        }));
+                    },
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BalanceService;
+                const result = yield* service.getTokenBalances({
+                    address: testAddress,
+                    chainId: mainnet.id,
+                    tokenAddresses: [tokenAddress],
+                });
+                expect(result).toHaveLength(1);
+                expect(result[0]?.symbol).toBe("MOCK_STRING");
+                expect(result[0]?.name).toBe("Mock Token String");
+            }).pipe(Effect.provide(hybridLayer));
+        });
+    });
+    describe("hasSufficientBalance", () => {
+        it.effect("returns true/false based on native balance", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const ok = yield* service.hasSufficientBalance({
+                address: testAddress,
+                chainId: mainnet.id,
+                required: 500000000000000000n,
+            });
+            const notOk = yield* service.hasSufficientBalance({
+                address: testAddress,
+                chainId: mainnet.id,
+                required: 2000000000000000000n,
+            });
+            expect(ok).toBe(true);
+            expect(notOk).toBe(false);
+        }).pipe(Effect.provide(testLayer)));
+    });
+    describe("hasSufficientTokenBalance", () => {
+        it.effect("returns true/false based on token balance", () => Effect.gen(function* () {
+            const service = yield* BalanceService;
+            const ok = yield* service.hasSufficientTokenBalance({
+                address: testAddress,
+                chainId: mainnet.id,
+                required: 500000000n,
+                tokenAddress,
+            });
+            const notOk = yield* service.hasSufficientTokenBalance({
+                address: testAddress,
+                chainId: mainnet.id,
+                required: 2000000000n,
+                tokenAddress,
+            });
+            expect(ok).toBe(true);
+            expect(notOk).toBe(false);
+        }).pipe(Effect.provide(testLayer)));
+    });
+});
+describe("decodeBytes32String", () => {
+    it("decodes bytes32 string correctly", () => {
+        const usdt = "0x5553445400000000000000000000000000000000000000000000000000000000";
+        expect(decodeBytes32String(usdt)).toBe("USDT");
+        const tetherUsd = "0x5465746865722055534400000000000000000000000000000000000000000000";
+        expect(decodeBytes32String(tetherUsd)).toBe("Tether USD");
+    });
+    it("returns undefined for empty or invalid input", () => {
+        expect(decodeBytes32String("0x")).toBeUndefined();
+        expect(decodeBytes32String("0x0000000000000000000000000000000000000000000000000000000000000000")).toBeUndefined();
+    });
+    it("handles trailing null bytes", () => {
+        const dai = "0x4441490000000000000000000000000000000000000000000000000000000000";
+        expect(decodeBytes32String(dai)).toBe("DAI");
+    });
+    it("strips whitespace", () => {
+        const testWithSpace = "0x5445535420000000000000000000000000000000000000000000000000000000";
+        expect(decodeBytes32String(testWithSpace)).toBe("TEST");
+    });
+});
+//# sourceMappingURL=service.test.integration.js.map

package/dist/balance/service.test.integration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.test.integration.js","sourceRoot":"","sources":["../../src/balance/service.test.integration.ts"],"names":[],"mappings":"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"}

package/dist/block/service.test.integration.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=service.test.integration.d.ts.map

package/dist/block/service.test.integration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.test.integration.d.ts","sourceRoot":"","sources":["../../src/block/service.test.integration.ts"],"names":[],"mappings":""}

package/dist/block/service.test.integration.js

@@ -0,0 +1,190 @@
+import { describe, expect, it } from "@effect/vitest";
+import { Cause, Effect, Exit, Fiber, TestClock } from "effect";
+import { mainnet } from "viem/chains";
+import { BlockNotFoundError, BlockService, BlockTimeoutError } from "../block/index.js";
+import { ClientNotFoundError, TransportError } from "../core/index.js";
+import { makeEffectEvmTestLayer } from "../testing-kit/index.js";
+const DEFAULT_HASH = "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
+const DEFAULT_BLOCK = {
+    baseFeePerGas: 30000000000n,
+    blobGasUsed: 0n,
+    difficulty: 0n,
+    excessBlobGas: 0n,
+    extraData: "0x",
+    gasLimit: 30000000n,
+    gasUsed: 12000000n,
+    hash: DEFAULT_HASH,
+    logsBloom: "0x00",
+    miner: "0x0000000000000000000000000000000000000000",
+    mixHash: DEFAULT_HASH,
+    nonce: "0x0000000000000000",
+    number: 1000n,
+    parentHash: DEFAULT_HASH,
+    receiptsRoot: DEFAULT_HASH,
+    sealFields: [],
+    sha3Uncles: DEFAULT_HASH,
+    size: 1024n,
+    stateRoot: DEFAULT_HASH,
+    timestamp: 1700000000n,
+    totalDifficulty: 0n,
+    transactions: [],
+    transactionsRoot: DEFAULT_HASH,
+    uncles: [],
+};
+describe("BlockService (Live)", () => {
+    const testLayer = makeEffectEvmTestLayer({
+        publicClient: {
+            getBlock: (params) => {
+                const p = params;
+                return Promise.resolve({
+                    ...DEFAULT_BLOCK,
+                    hash: p.blockHash ?? DEFAULT_BLOCK.hash,
+                    number: p.blockNumber ?? DEFAULT_BLOCK.number,
+                });
+            },
+            getBlockNumber: () => Promise.resolve(1000n),
+        },
+    });
+    describe("getBlockNumber", () => {
+        it.effect("returns current block number", () => Effect.gen(function* () {
+            const service = yield* BlockService;
+            const result = yield* service.getBlockNumber({ chainId: mainnet.id });
+            expect(result).toBe(1000n);
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("fails with ClientNotFoundError for unsupported chainId", () => Effect.gen(function* () {
+            const service = yield* BlockService;
+            const exit = yield* Effect.exit(service.getBlockNumber({ chainId: 999 }));
+            expect(Exit.isFailure(exit)).toBe(true);
+            if (Exit.isFailure(exit)) {
+                const error = Cause.failureOption(exit.cause);
+                if (error._tag === "Some") {
+                    expect(error.value).toBeInstanceOf(ClientNotFoundError);
+                }
+            }
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("fails with TransportError (not timeout) on RPC error", () => {
+            const failingLayer = makeEffectEvmTestLayer({
+                publicClient: {
+                    getBlockNumber: () => Promise.reject(new Error("boom")),
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BlockService;
+                const exit = yield* service.getBlockNumber({ chainId: mainnet.id }).pipe(Effect.exit);
+                expect(Exit.isFailure(exit)).toBe(true);
+                if (Exit.isFailure(exit)) {
+                    const error = Cause.failureOption(exit.cause);
+                    expect(error._tag).toBe("Some");
+                    if (error._tag === "Some") {
+                        expect(error.value).toBeInstanceOf(TransportError);
+                    }
+                }
+            }).pipe(Effect.provide(failingLayer));
+        });
+    });
+    describe("getBlock / getBlockByHash / getBlocks", () => {
+        it.effect("returns block by number", () => Effect.gen(function* () {
+            const service = yield* BlockService;
+            const result = yield* service.getBlock({
+                blockNumber: 123n,
+                chainId: mainnet.id,
+            });
+            expect(result.number).toBe(123n);
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("returns block by tag", () => Effect.gen(function* () {
+            const service = yield* BlockService;
+            const result = yield* service.getBlock({
+                blockTag: "latest",
+                chainId: mainnet.id,
+            });
+            expect(result.hash).toBeDefined();
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("returns block by hash", () => Effect.gen(function* () {
+            const service = yield* BlockService;
+            const result = yield* service.getBlockByHash({
+                chainId: mainnet.id,
+                hash: DEFAULT_HASH,
+            });
+            expect(result.hash).toBe(DEFAULT_HASH);
+        }).pipe(Effect.provide(testLayer)));
+        it.effect("returns range of blocks", () => Effect.gen(function* () {
+            const service = yield* BlockService;
+            const result = yield* service.getBlocks({
+                chainId: mainnet.id,
+                fromBlock: 10n,
+                toBlock: 12n,
+            });
+            expect(result.map((b) => b.number)).toEqual([10n, 11n, 12n]);
+        }).pipe(Effect.provide(testLayer)));
+    });
+    describe("waitForBlock", () => {
+        it.effect("times out with BlockTimeoutError (not misclassified)", () => {
+            const current = 0n;
+            const layer = makeEffectEvmTestLayer({
+                publicClient: {
+                    getBlockNumber: () => Promise.resolve(current),
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BlockService;
+                const fiber = yield* Effect.fork(service.waitForBlock({
+                    blockNumber: 10n,
+                    chainId: mainnet.id,
+                    timeout: 2500,
+                }));
+                yield* TestClock.adjust("3 seconds");
+                const exit = yield* Fiber.await(fiber);
+                expect(Exit.isFailure(exit)).toBe(true);
+                if (Exit.isFailure(exit)) {
+                    const error = Cause.failureOption(exit.cause);
+                    expect(error._tag).toBe("Some");
+                    if (error._tag === "Some") {
+                        expect(error.value).toBeInstanceOf(BlockTimeoutError);
+                    }
+                }
+            }).pipe(Effect.provide(layer));
+        });
+        it.effect("is interruptible", () => {
+            const current = 0n;
+            const layer = makeEffectEvmTestLayer({
+                publicClient: {
+                    getBlockNumber: () => Promise.resolve(current),
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BlockService;
+                const fiber = yield* Effect.fork(service.waitForBlock({
+                    blockNumber: 10n,
+                    chainId: mainnet.id,
+                    timeout: 60_000,
+                }));
+                yield* Fiber.interrupt(fiber);
+                const exit = yield* Fiber.await(fiber);
+                expect(Exit.isInterrupted(exit)).toBe(true);
+            }).pipe(Effect.provide(layer));
+        });
+        it.effect("returns BlockNotFoundError when block fetch fails", () => {
+            const layer = makeEffectEvmTestLayer({
+                publicClient: {
+                    getBlock: () => Promise.reject(new Error("missing")),
+                    getBlockNumber: () => Promise.resolve(10n),
+                },
+            });
+            return Effect.gen(function* () {
+                const service = yield* BlockService;
+                const exit = yield* service
+                    .waitForBlock({ blockNumber: 10n, chainId: mainnet.id })
+                    .pipe(Effect.exit);
+                expect(Exit.isFailure(exit)).toBe(true);
+                if (Exit.isFailure(exit)) {
+                    const error = Cause.failureOption(exit.cause);
+                    expect(error._tag).toBe("Some");
+                    if (error._tag === "Some") {
+                        expect(error.value).toBeInstanceOf(BlockNotFoundError);
+                    }
+                }
+            }).pipe(Effect.provide(layer));
+        });
+    });
+});
+//# sourceMappingURL=service.test.integration.js.map

package/dist/block/service.test.integration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.test.integration.js","sourceRoot":"","sources":["../../src/block/service.test.integration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,YAAY,GAAG,oEAA4E,CAAC;AAElG,MAAM,aAAa,GAAU;IAC3B,aAAa,EAAE,YAAY;IAC3B,WAAW,EAAE,EAAE;IACf,UAAU,EAAE,EAAE;IACd,aAAa,EAAE,EAAE;IACjB,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,MAAM;IACjB,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,YAAY;IACrB,KAAK,EAAE,oBAAoB;IAC3B,MAAM,EAAE,KAAK;IACb,UAAU,EAAE,YAAY;IACxB,YAAY,EAAE,YAAY;IAC1B,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,YAAY;IACxB,IAAI,EAAE,KAAK;IACX,SAAS,EAAE,YAAY;IACvB,SAAS,EAAE,WAAW;IACtB,eAAe,EAAE,EAAE;IACnB,YAAY,EAAE,EAAE;IAChB,gBAAgB,EAAE,YAAY;IAC9B,MAAM,EAAE,EAAE;CACX,CAAC;AAEF,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,MAAM,SAAS,GAAG,sBAAsB,CAAC;QACvC,YAAY,EAAE;YACZ,QAAQ,EAAE,CAAC,MAAe,EAAE,EAAE;gBAC5B,MAAM,CAAC,GAAG,MAAoD,CAAC;gBAC/D,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,GAAG,aAAa;oBAChB,IAAI,EAAE,CAAC,CAAC,SAAS,IAAI,aAAa,CAAC,IAAI;oBACvC,MAAM,EAAE,CAAC,CAAC,WAAW,IAAI,aAAa,CAAC,MAAM;iBAC9C,CAAC,CAAC;YACL,CAAC;YACD,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;SAC7C;KACF,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,MAAM,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAC7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAEtE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACnC,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,wDAAwD,EAAE,GAAG,EAAE,CACvE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YAE1E,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACnC,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,sDAAsD,EAAE,GAAG,EAAE;YACrE,MAAM,YAAY,GAAG,sBAAsB,CAAC;gBAC1C,YAAY,EAAE;oBACZ,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;iBACxD;aACF,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;gBACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEtF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC9C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAChC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;oBACrD,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;QACrD,EAAE,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,EAAE,CACxC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACrC,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,OAAO,CAAC,EAAE;aACpB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACnC,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,sBAAsB,EAAE,GAAG,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACrC,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,OAAO,CAAC,EAAE;aACpB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACnC,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,uBAAuB,EAAE,GAAG,EAAE,CACtC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC3C,OAAO,EAAE,OAAO,CAAC,EAAE;gBACnB,IAAI,EAAE,YAAY;aACnB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACnC,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,EAAE,CACxC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;YACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;gBACtC,OAAO,EAAE,OAAO,CAAC,EAAE;gBACnB,SAAS,EAAE,GAAG;gBACd,OAAO,EAAE,GAAG;aACb,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CACnC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,MAAM,CAAC,sDAAsD,EAAE,GAAG,EAAE;YACrE,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,MAAM,KAAK,GAAG,sBAAsB,CAAC;gBACnC,YAAY,EAAE;oBACZ,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;iBAC/C;aACF,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;gBACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAC9B,OAAO,CAAC,YAAY,CAAC;oBACnB,WAAW,EAAE,GAAG;oBAChB,OAAO,EAAE,OAAO,CAAC,EAAE;oBACnB,OAAO,EAAE,IAAI;iBACd,CAAC,CACH,CAAC;gBAEF,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAErC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC9C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAChC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;oBACxD,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE,GAAG,EAAE;YACjC,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,MAAM,KAAK,GAAG,sBAAsB,CAAC;gBACnC,YAAY,EAAE;oBACZ,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;iBAC/C;aACF,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;gBACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAC9B,OAAO,CAAC,YAAY,CAAC;oBACnB,WAAW,EAAE,GAAG;oBAChB,OAAO,EAAE,OAAO,CAAC,EAAE;oBACnB,OAAO,EAAE,MAAM;iBAChB,CAAC,CACH,CAAC;gBAEF,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,MAAM,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAClE,MAAM,KAAK,GAAG,sBAAsB,CAAC;gBACnC,YAAY,EAAE;oBACZ,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;oBACpD,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;iBAC3C;aACF,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC;gBACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO;qBACxB,YAAY,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;qBACvD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAErB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC9C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAChC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;oBACzD,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contract/cross-chain-reader.d.ts

@@ -3,26 +3,30 @@ import type { Abi, Address, ContractFunctionArgs } from "viem";
 import type { ClientNotFoundError, ContractReadError, MulticallError } from "../core/index.js";
 import type { ContractFunctionName, ContractFunctionReturnType, MulticallCall, MulticallResult } from "../types/index.js";
 import { ContractReader } from "./reader.js";
+type ArgsField<TArgs> = {
+    readonly args?: TArgs | undefined;
+} & (readonly [] extends TArgs ? unknown : {
+    readonly args: TArgs;
+});
 export type CrossChainCall<TAbi extends Abi = Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view"> = ContractFunctionName<TAbi, "pure" | "view">> = {
-    readonly chainId: number;
+    readonly abi: TAbi;
     readonly address: Address;
+    readonly chainId: number;
+    readonly functionName: TFunctionName;
+} & ArgsField<ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>>;
+export type ReadSameParams<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">> = {
     readonly abi: TAbi;
+    readonly address: Address;
+    readonly chainIds: readonly number[];
     readonly functionName: TFunctionName;
-    readonly args?: ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>;
-};
+} & ArgsField<ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>>;
 export type ChainMulticallBatch = {
     readonly chainId: number;
     readonly calls: readonly MulticallCall[];
 };
 export type CrossChainReaderShape = {
     readonly readAll: <const TCalls extends readonly CrossChainCall[]>(calls: TCalls) => Effect.Effect<Map<number, unknown[]>, ContractReadError | ClientNotFoundError>;
-    readonly readSame: <TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, "pure" | "view">>(params: {
-        chainIds: readonly number[];
-        address: Address;
-        abi: TAbi;
-        functionName: TFunctionName;
-        args?: ContractFunctionArgs<TAbi, "pure" | "view", TFunctionName>;
-    }) => Effect.Effect<Map<number, ContractFunctionReturnType<TAbi, "pure" | "view", TFunctionName>>, ContractReadError | ClientNotFoundError>;
+    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>;
     readonly multicallAll: <const TBatches extends readonly ChainMulticallBatch[]>(batches: TBatches) => Effect.Effect<Map<number, readonly MulticallResult<unknown>[]>, MulticallError | ClientNotFoundError>;
 };
 declare const CrossChainReader_base: Context.TagClass<CrossChainReader, "ew3/CrossChainReader", CrossChainReaderShape>;

package/dist/contract/cross-chain-reader.d.ts.map

@@ -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,EAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,cAAc,CACxB,IAAI,SAAS,GAAG,GAAG,GAAG,EACtB,aAAa,SAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,oBAAoB,CACtF,IAAI,EACJ,MAAM,GAAG,MAAM,CAChB,IACC;IACF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IACnB,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,aAAa,CAAC,CAAC;CAC5E,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAKlC,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,cAAc,EAAE,EAC/D,KAAK,EAAE,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,iBAAiB,GAAG,mBAAmB,CAAC,CAAC;IAKpF,QAAQ,CAAC,QAAQ,EAAE,CACjB,IAAI,SAAS,GAAG,EAChB,aAAa,SAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,EACjE,MAAM,EAAE;QACR,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;QAC5B,OAAO,EAAE,OAAO,CAAC;QACjB,GAAG,EAAE,IAAI,CAAC;QACV,YAAY,EAAE,aAAa,CAAC;QAC5B,IAAI,CAAC,EAAE,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,aAAa,CAAC,CAAC;KACnE,KAAK,MAAM,CAAC,MAAM,CACjB,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,aAAa,CAAC,CAAC,EAC7E,iBAAiB,GAAG,mBAAmB,CACxC,CAAC;IAKF,QAAQ,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,QAAQ,SAAS,SAAS,mBAAmB,EAAE,EAC3E,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;;AAEF,qBAAa,gBAAiB,SAAQ,qBAGnC;CAAG;AAsBN,eAAO,MAAM,oBAAoB,sDA8IhC,CAAC"}
+{"version":3,"file":"cross-chain-reader.d.ts","sourceRoot":"","sources":["../../src/contract/cross-chain-reader.ts"],"names":[],"mappings":"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"}

package/dist/contract/cross-chain-reader.js

@@ -34,13 +34,7 @@ export const CrossChainReaderLive = Layer.effect(CrossChainReader, Effect.gen(fu
         })),
         readAll: (calls) => Effect.gen(function* () {
             const groupedCalls = groupBy(calls, (call) => call.chainId);
-            const results = yield* Effect.all(Array.from(groupedCalls.entries()).map(([chainId, chainCalls]) => Effect.all(chainCalls.map((call) => reader.read({
-                abi: call.abi,
-                address: call.address,
-                chainId: call.chainId,
-                functionName: call.functionName,
-                ...(call.args !== undefined ? { args: call.args } : {}),
-            })), { concurrency: "unbounded" }).pipe(Effect.map((chainResults) => ({
+            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) => ({
                 chainId,
                 results: chainResults,
             })))), { concurrency: "unbounded" });
@@ -60,9 +54,9 @@ export const CrossChainReaderLive = Layer.effect(CrossChainReader, Effect.gen(fu
                 .read({
                 abi: params.abi,
                 address: params.address,
+                args: params.args,
                 chainId,
                 functionName: params.functionName,
-                ...(params.args !== undefined ? { args: params.args } : {}),
             })
                 .pipe(Effect.map((result) => ({
                 chainId,

package/dist/contract/cross-chain-reader.js.map

@@ -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;AAOrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA0D7C,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAGtE;CAAG;AAKN,MAAM,OAAO,GAAG,CACd,GAAiB,EACjB,KAAqB,EACR,EAAE;IACf,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,MAAM,CAC9C,gBAAgB,EAChB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC;IAErC,OAAO,gBAAgB,CAAC,EAAE,CAAC;QACzB,YAAY,EAAE,CAAwD,OAAiB,EAAE,EAAE,CACzF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAElB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAC/C,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACtB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM;aACP,CAAC,CAAC,CACJ,CACF,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;YAGF,MAAM,SAAS,GAAG,IAAI,GAAG,EAA+C,CAAC;YACzE,KAAK,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;gBAC1C,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,yBAAyB,EAAE;YACnD,UAAU,EAAE;gBACV,UAAU,EAAE,OAAO,CAAC,MAAM;gBAC1B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aACxC;SACF,CAAC,CACH;QAEH,OAAO,EAAE,CAAiD,KAAa,EAAE,EAAE,CACzE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAElB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAG5D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAC/B,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,CAC/D,MAAM,CAAC,GAAG,CACR,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,MAAM,CAAC,IAAI,CAAC;gBACV,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAEjD,CAAC,CACV,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC,IAAI,CACJ,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAC5B,OAAO;gBACP,OAAO,EAAE,YAAY;aACtB,CAAC,CAAC,CACJ,CACF,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;YAGF,MAAM,SAAS,GAAG,IAAI,GAAG,EAAqB,CAAC;YAC/C,KAAK,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,OAAO,EAAE,CAAC;gBACzD,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,oBAAoB,EAAE;YAC9C,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK,CAAC,MAAM;gBACvB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;aAC3D;SACF,CAAC,CACH;QAEH,QAAQ,EAAE,CAGR,MAMD,EAAE,EAAE,CACH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAElB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAC/B,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9B,MAAM;iBACH,IAAI,CAAC;gBACJ,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO;gBACP,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAErD,CAAC;iBACR,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACtB,OAAO;gBACP,MAAM,EAAE,MAIP;aACF,CAAC,CAAC,CACJ,CACJ,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;YAGF,MAAM,SAAS,GAAG,IAAI,GAAG,EAGtB,CAAC;YACJ,KAAK,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;gBAC1C,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,qBAAqB,EAAE;YAC/C,UAAU,EAAE;gBACV,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;gBAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,YAAY,EAAE,MAAM,CAAC,YAAY;aAClC;SACF,CAAC,CACH;KACJ,CAAC,CAAC;AACL,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"cross-chain-reader.js","sourceRoot":"","sources":["../../src/contract/cross-chain-reader.ts"],"names":[],"mappings":"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"}