voltaire-effect 0.2.23 → 0.2.25

package/src/services/FeeEstimator/FeeEstimator.test.ts

@@ -19,68 +19,74 @@ import {
 } from "./FeeEstimatorService.js";
 
 const createMockProvider = (
-	overrides: Partial<ProviderShape> = {},
-): ProviderShape => ({
-	getBlockNumber: () => Effect.succeed(18000000n),
-	getBlock: () =>
-		Effect.succeed({
-			number: "0x112a880",
-			hash: "0x1234",
-			parentHash: "0x5678",
-			nonce: "0x0",
-			sha3Uncles: "0x",
-			logsBloom: "0x",
-			transactionsRoot: "0x",
-			stateRoot: "0x",
-			receiptsRoot: "0x",
-			miner: "0x",
-			difficulty: "0x0",
-			totalDifficulty: "0x0",
-			extraData: "0x",
-			size: "0x0",
-			gasLimit: "0x1c9c380",
-			gasUsed: "0x0",
-			timestamp: "0x0",
-			transactions: [],
-			uncles: [],
-			baseFeePerGas: "0x3b9aca00",
-		}),
-	getBlockTransactionCount: () => Effect.succeed(0n),
-	getBalance: () => Effect.succeed(0n),
-	getTransactionCount: () => Effect.succeed(0n),
-	getCode: () => Effect.succeed("0x"),
-	getStorageAt: () => Effect.succeed("0x"),
-	getTransaction: () => Effect.succeed({} as any),
-	getTransactionReceipt: () => Effect.succeed({} as any),
-	waitForTransactionReceipt: () => Effect.succeed({} as any),
-	call: () => Effect.succeed("0x"),
-	estimateGas: () => Effect.succeed(21000n),
-	createAccessList: () => Effect.succeed({} as any),
-	getLogs: () => Effect.succeed([]),
-	createEventFilter: () => Effect.succeed("0x1" as any),
-	createBlockFilter: () => Effect.succeed("0x1" as any),
-	createPendingTransactionFilter: () => Effect.succeed("0x1" as any),
-	getFilterChanges: () => Effect.succeed([]),
-	getFilterLogs: () => Effect.succeed([]),
-	uninstallFilter: () => Effect.succeed(true),
-	getChainId: () => Effect.succeed(1),
-	getGasPrice: () => Effect.succeed(20000000000n),
-	getMaxPriorityFeePerGas: () => Effect.succeed(1500000000n),
-	getFeeHistory: () =>
-		Effect.succeed({
-			oldestBlock: "0x112a880",
-			baseFeePerGas: ["0x3b9aca00"],
-			gasUsedRatio: [0.5],
-		}),
-	watchBlocks: () => ({}) as any,
-	backfillBlocks: () => ({}) as any,
-	sendRawTransaction: () => Effect.succeed("0x" as `0x${string}`),
-	getUncle: () => Effect.succeed({} as any),
-	getProof: () => Effect.succeed({} as any),
-	getBlobBaseFee: () => Effect.succeed(0n),
-	getTransactionConfirmations: () => Effect.succeed(0n),
-	...overrides,
-});
+	overrides: {
+		getBlock?: () => Effect.Effect<unknown, TransportError>;
+		getGasPrice?: () => Effect.Effect<bigint, TransportError>;
+		getMaxPriorityFeePerGas?: () => Effect.Effect<bigint, TransportError>;
+	} = {},
+): ProviderShape => {
+	const defaultBlock = {
+		number: "0x112a880",
+		hash: "0x1234",
+		parentHash: "0x5678",
+		nonce: "0x0",
+		sha3Uncles: "0x",
+		logsBloom: "0x",
+		transactionsRoot: "0x",
+		stateRoot: "0x",
+		receiptsRoot: "0x",
+		miner: "0x",
+		difficulty: "0x0",
+		totalDifficulty: "0x0",
+		extraData: "0x",
+		size: "0x0",
+		gasLimit: "0x1c9c380",
+		gasUsed: "0x0",
+		timestamp: "0x0",
+		transactions: [],
+		uncles: [],
+		baseFeePerGas: "0x3b9aca00",
+	};
+
+	return {
+		request: <T>(method: string, _params?: unknown[]) => {
+			switch (method) {
+				case "eth_blockNumber":
+					return Effect.succeed("0x112a880" as T);
+				case "eth_getBlockByNumber":
+				case "eth_getBlockByHash":
+					if (overrides.getBlock) {
+						return overrides.getBlock() as Effect.Effect<T, TransportError>;
+					}
+					return Effect.succeed(defaultBlock as T);
+				case "eth_gasPrice":
+					if (overrides.getGasPrice) {
+						return overrides.getGasPrice().pipe(
+							Effect.map((v) => `0x${v.toString(16)}` as T),
+						);
+					}
+					return Effect.succeed("0x4a817c800" as T); // 20 gwei
+				case "eth_maxPriorityFeePerGas":
+					if (overrides.getMaxPriorityFeePerGas) {
+						return overrides.getMaxPriorityFeePerGas().pipe(
+							Effect.map((v) => `0x${v.toString(16)}` as T),
+						);
+					}
+					return Effect.succeed("0x59682f00" as T); // 1.5 gwei
+				case "eth_getTransactionCount":
+					return Effect.succeed("0x0" as T);
+				case "eth_getBalance":
+					return Effect.succeed("0x0" as T);
+				case "eth_chainId":
+					return Effect.succeed("0x1" as T);
+				default:
+					return Effect.fail(
+						new TransportError({ code: -32601, message: `Unknown method: ${method}` }),
+					);
+			}
+		},
+	};
+};
 
 const MULTIPLIER_PRECISION = 100n;
 const MULTIPLIER_PRECISION_NUMBER = 100;

package/src/services/Multicall/BalanceResolver.ts

@@ -14,7 +14,7 @@ import {
 import * as Effect from "effect/Effect";
 import * as Request from "effect/Request";
 import * as RequestResolver from "effect/RequestResolver";
-import type { AddressInput, BlockTag } from "../Provider/ProviderService.js";
+import type { AddressInput, BlockTag } from "../Provider/types.js";
 import type { TransportService } from "../Transport/TransportService.js";
 import type { GetBalance } from "./GetBalance.js";
 import {

package/src/services/Multicall/GetBalance.ts

@@ -7,7 +7,7 @@
 
 import * as Data from "effect/Data";
 import type * as Request from "effect/Request";
-import type { AddressInput, BlockTag } from "../Provider/ProviderService.js";
+import type { AddressInput, BlockTag } from "../Provider/types.js";
 import type { MulticallError } from "./Multicall.js";
 
 /**

package/src/services/Multicall/Multicall.ts

@@ -16,7 +16,7 @@ import { decodeParameters, encodeParameters } from "@tevm/voltaire/Abi";
 import * as Hex from "@tevm/voltaire/Hex";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
-import type { BlockTag } from "../Provider/ProviderService.js";
+import type { BlockTag } from "../Provider/types.js";
 import { TransportService } from "../Transport/TransportService.js";
 
 /**

package/src/services/NonceManager/DefaultNonceManager.ts

@@ -16,6 +16,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as SynchronizedRef from "effect/SynchronizedRef";
+import { getTransactionCount } from "../Provider/functions/index.js";
 import { ProviderService } from "../Provider/index.js";
 import { NonceError, NonceManagerService } from "./NonceManagerService.js";
 
@@ -74,7 +75,7 @@ import { NonceError, NonceManagerService } from "./NonceManagerService.js";
  * @see {@link NonceManagerService} - The service interface
  * @see {@link ProviderService} - Required for fetching on-chain nonces
  */
-export const DefaultNonceManager: Layer.Layer<NonceManagerService> =
+export const DefaultNonceManager: Layer.Layer<NonceManagerService, never, ProviderService> =
 	Layer.effect(
 		NonceManagerService,
 		Effect.gen(function* () {
@@ -83,11 +84,9 @@ export const DefaultNonceManager: Layer.Layer<NonceManagerService> =
 			return {
 				get: (address: string, chainId: number) =>
 					Effect.gen(function* () {
-						const provider = yield* ProviderService;
 						const key = `${chainId}:${address.toLowerCase()}`;
 
-						const baseNonce = yield* provider
-							.getTransactionCount(address as `0x${string}`, "pending")
+						const baseNonce = yield* getTransactionCount(address as `0x${string}`, "pending")
 							.pipe(
 								Effect.mapError(
 									(e) =>
@@ -107,11 +106,9 @@ export const DefaultNonceManager: Layer.Layer<NonceManagerService> =
 				consume: (address: string, chainId: number) =>
 					SynchronizedRef.modifyEffect(deltaRef, (deltaMap) =>
 						Effect.gen(function* () {
-							const provider = yield* ProviderService;
 							const key = `${chainId}:${address.toLowerCase()}`;
 
-							const baseNonce = yield* provider
-								.getTransactionCount(address as `0x${string}`, "pending")
+							const baseNonce = yield* getTransactionCount(address as `0x${string}`, "pending")
 								.pipe(
 									Effect.mapError(
 										(e) =>

package/src/services/NonceManager/NonceManager.test.ts

@@ -11,40 +11,27 @@ import { DefaultNonceManager } from "./DefaultNonceManager.js";
 import { NonceError, NonceManagerService } from "./NonceManagerService.js";
 
 const createMockProvider = (
-	overrides: Partial<ProviderShape> = {},
+	overrides: {
+		getTransactionCount?: (address: unknown, blockTag?: unknown) => Effect.Effect<bigint, TransportError>;
+	} = {},
 ): ProviderShape => ({
-	getBlockNumber: () => Effect.succeed(18000000n),
-	getBlock: () => Effect.succeed({} as any),
-	getBlockTransactionCount: () => Effect.succeed(0n),
-	getBalance: () => Effect.succeed(0n),
-	getTransactionCount: () => Effect.succeed(5n),
-	getCode: () => Effect.succeed("0x"),
-	getStorageAt: () => Effect.succeed("0x"),
-	getTransaction: () => Effect.succeed({} as any),
-	getTransactionReceipt: () => Effect.succeed({} as any),
-	waitForTransactionReceipt: () => Effect.succeed({} as any),
-	call: () => Effect.succeed("0x"),
-	estimateGas: () => Effect.succeed(21000n),
-	createAccessList: () => Effect.succeed({} as any),
-	getLogs: () => Effect.succeed([]),
-	createEventFilter: () => Effect.succeed("0x1" as any),
-	createBlockFilter: () => Effect.succeed("0x1" as any),
-	createPendingTransactionFilter: () => Effect.succeed("0x1" as any),
-	getFilterChanges: () => Effect.succeed([]),
-	getFilterLogs: () => Effect.succeed([]),
-	uninstallFilter: () => Effect.succeed(true),
-	getChainId: () => Effect.succeed(1),
-	getGasPrice: () => Effect.succeed(20000000000n),
-	getMaxPriorityFeePerGas: () => Effect.succeed(1500000000n),
-	getFeeHistory: () => Effect.succeed({} as any),
-	watchBlocks: () => ({}) as any,
-	backfillBlocks: () => ({}) as any,
-	sendRawTransaction: () => Effect.succeed("0x" as `0x${string}`),
-	getUncle: () => Effect.succeed({} as any),
-	getProof: () => Effect.succeed({} as any),
-	getBlobBaseFee: () => Effect.succeed(0n),
-	getTransactionConfirmations: () => Effect.succeed(0n),
-	...overrides,
+	request: <T>(method: string, params?: unknown[]) => {
+		switch (method) {
+			case "eth_getTransactionCount":
+				if (overrides.getTransactionCount) {
+					return overrides.getTransactionCount(params?.[0], params?.[1]).pipe(
+						Effect.map((v) => `0x${v.toString(16)}` as T),
+					);
+				}
+				return Effect.succeed("0x5" as T); // default nonce = 5
+			case "eth_chainId":
+				return Effect.succeed("0x1" as T);
+			default:
+				return Effect.fail(
+					new TransportError({ code: -32601, message: `Unknown method: ${method}` }),
+				);
+		}
+	},
 });
 
 describe("NonceManagerService", () => {