voltaire-effect 0.3.0 → 1.0.1

package/src/services/Provider/actions/multicall.ts

@@ -10,7 +10,6 @@ import {
 	BrandedAbi,
 	type Abi as BrandedAbiType,
 	type BrandedAddress,
-	type BrandedHex,
 	Hex,
 } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
@@ -26,7 +25,6 @@ import { call } from "../functions/call.js";
 import type { Abi } from "./readContract.js";
 
 type AddressType = BrandedAddress.AddressType;
-type HexType = BrandedHex.HexType;
 
 /**
  * Extracts function names from an ABI.
@@ -58,20 +56,41 @@ type GetFunctionInputs<
  * Maps ABI input types to TypeScript types.
  */
 type AbiInputsToArgs<TInputs extends readonly { type: string }[]> = {
-	[K in keyof TInputs]: AbiTypeToTS<TInputs[K]["type"]>;
+	[K in keyof TInputs]: AbiTypeToInput<TInputs[K]["type"]>;
 };
 
 /**
- * Maps a single ABI type to TypeScript type.
+ * Maps a single ABI type to TypeScript input type.
  */
-type AbiTypeToTS<T extends string> = T extends `uint${string}` | `int${string}`
+type BytesInput = Uint8Array | `0x${string}`;
+
+type AbiTypeToInput<T extends string> = T extends `uint${string}` | `int${string}`
+	? bigint
+	: T extends "address"
+		? AddressType | `0x${string}`
+		: T extends "bool"
+			? boolean
+			: T extends `bytes${string}` | "bytes"
+				? BytesInput
+				: T extends "string"
+					? string
+					: T extends `${string}[]`
+						? readonly unknown[]
+						: T extends `(${string})`
+							? readonly unknown[]
+							: unknown;
+
+/**
+ * Maps a single ABI type to TypeScript output type.
+ */
+type AbiTypeToOutput<T extends string> = T extends `uint${string}` | `int${string}`
 	? bigint
 	: T extends "address"
 		? AddressType | `0x${string}`
 		: T extends "bool"
 			? boolean
-			: T extends `bytes${string}`
-				? HexType | `0x${string}`
+			: T extends `bytes${string}` | "bytes"
+				? Uint8Array
 				: T extends "string"
 					? string
 					: T extends `${string}[]`
@@ -96,9 +115,9 @@ type GetFunctionOutput<
 			? Outputs["length"] extends 0
 				? undefined
 				: Outputs["length"] extends 1
-					? AbiTypeToTS<Outputs[0]["type"]>
+					? AbiTypeToOutput<Outputs[0]["type"]>
 					: {
-							[K in keyof Outputs]: AbiTypeToTS<
+							[K in keyof Outputs]: AbiTypeToOutput<
 								Outputs[K] extends { type: string } ? Outputs[K]["type"] : never
 							>;
 						}

package/src/services/Provider/actions/readContract.test.ts

@@ -1,17 +1,14 @@
-// @ts-nocheck - TODO: Fix ABI type inference issues
 import { beforeEach, describe, expect, it, vi } from "@effect/vitest";
 import { Address } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as S from "effect/Schema";
-import { fromArray } from "../../../primitives/Abi/AbiSchema.js";
 import { TransportError } from "../../Transport/TransportService.js";
 import { ProviderService } from "../ProviderService.js";
 import { readContract } from "./readContract.js";
 
 type HexType = `0x${string}`;
 
-const erc20Abi = S.decodeUnknownSync(fromArray)([
+const erc20Abi = [
 	{
 		type: "function",
 		name: "balanceOf",
@@ -50,9 +47,9 @@ const erc20Abi = S.decodeUnknownSync(fromArray)([
 		],
 		outputs: [{ name: "", type: "uint256" }],
 	},
-]);
+] as const;
 
-const pairAbi = S.decodeUnknownSync(fromArray)([
+const pairAbi = [
 	{
 		type: "function",
 		name: "getReserves",
@@ -71,9 +68,9 @@ const pairAbi = S.decodeUnknownSync(fromArray)([
 		inputs: [],
 		outputs: [{ name: "", type: "address" }],
 	},
-]);
+] as const;
 
-const extendedAbi = S.decodeUnknownSync(fromArray)([
+const extendedAbi = [
 	{
 		type: "function",
 		name: "owner",
@@ -127,9 +124,9 @@ const extendedAbi = S.decodeUnknownSync(fromArray)([
 		inputs: [{ name: "data", type: "bytes" }],
 		outputs: [],
 	},
-]);
+] as const;
 
-const complexAbi = S.decodeUnknownSync(fromArray)([
+const complexAbi = [
 	{
 		type: "function",
 		name: "getPositions",
@@ -153,7 +150,7 @@ const complexAbi = S.decodeUnknownSync(fromArray)([
 			{ name: "nonce", type: "uint256" },
 		],
 	},
-]);
+] as const;
 
 const mockCallFn = vi.fn();
 

package/src/services/Provider/actions/readContract.ts

@@ -18,7 +18,6 @@ import {
 	BrandedAbi,
 	type Abi as BrandedAbiType,
 	type BrandedAddress,
-	type BrandedHex,
 	Hex,
 } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
@@ -32,7 +31,6 @@ import {
 } from "../ProviderService.js";
 
 type AddressType = BrandedAddress.AddressType;
-type HexType = BrandedHex.HexType;
 
 /**
  * Represents a single ABI item.
@@ -88,20 +86,41 @@ type GetFunctionInputs<
  * Maps ABI input types to TypeScript types.
  */
 type AbiInputsToArgs<TInputs extends readonly { type: string }[]> = {
-	[K in keyof TInputs]: AbiTypeToTS<TInputs[K]["type"]>;
+	[K in keyof TInputs]: AbiTypeToInput<TInputs[K]["type"]>;
 };
 
 /**
- * Maps a single ABI type to TypeScript type.
+ * Maps a single ABI type to TypeScript input type.
  */
-type AbiTypeToTS<T extends string> = T extends `uint${string}` | `int${string}`
+type BytesInput = Uint8Array | `0x${string}`;
+
+type AbiTypeToInput<T extends string> = T extends `uint${string}` | `int${string}`
+	? bigint
+	: T extends "address"
+		? AddressType | `0x${string}`
+		: T extends "bool"
+			? boolean
+			: T extends `bytes${string}` | "bytes"
+				? BytesInput
+				: T extends "string"
+					? string
+					: T extends `${string}[]`
+						? readonly unknown[]
+						: T extends `(${string})`
+							? readonly unknown[]
+							: unknown;
+
+/**
+ * Maps a single ABI type to TypeScript output type.
+ */
+type AbiTypeToOutput<T extends string> = T extends `uint${string}` | `int${string}`
 	? bigint
 	: T extends "address"
 		? AddressType | `0x${string}`
 		: T extends "bool"
 			? boolean
-			: T extends `bytes${string}`
-				? HexType | `0x${string}`
+			: T extends `bytes${string}` | "bytes"
+				? Uint8Array
 				: T extends "string"
 					? string
 					: T extends `${string}[]`
@@ -126,9 +145,9 @@ type GetFunctionOutput<
 			? Outputs["length"] extends 0
 				? undefined
 				: Outputs["length"] extends 1
-					? AbiTypeToTS<Outputs[0]["type"]>
+					? AbiTypeToOutput<Outputs[0]["type"]>
 					: {
-							[K in keyof Outputs]: AbiTypeToTS<
+							[K in keyof Outputs]: AbiTypeToOutput<
 								Outputs[K] extends { type: string } ? Outputs[K]["type"] : never
 							>;
 						}

package/src/services/Provider/functions/getBlock.ts

@@ -5,6 +5,7 @@
  * @since 0.4.0
  */
 
+import { Hex } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
 import { ProviderService } from "../ProviderService.js";
 import {
@@ -56,7 +57,7 @@ export const getBlock = (
 			const hash =
 				typeof args.blockHash === "string"
 					? args.blockHash
-					: `0x${Buffer.from(args.blockHash).toString("hex")}`;
+					: Hex(args.blockHash);
 			return svc
 				.request<BlockType | null>("eth_getBlockByHash", [hash, includeTransactions])
 				.pipe(

package/src/services/Provider/functions/getBlockReceipts.ts

@@ -5,6 +5,7 @@
  * @since 0.4.0
  */
 
+import { Hex } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
 import { ProviderService } from "../ProviderService.js";
 import {
@@ -57,7 +58,7 @@ export const getBlockReceipts = (
 			blockId =
 				typeof args.blockHash === "string"
 					? args.blockHash
-					: `0x${Buffer.from(args.blockHash).toString("hex")}`;
+					: Hex(args.blockHash);
 		} else if ("blockNumber" in args && args.blockNumber !== undefined) {
 			blockId = `0x${args.blockNumber.toString(16)}`;
 		} else {

package/src/services/Provider/functions/getBlockTransactionCount.ts

@@ -5,6 +5,7 @@
  * @since 0.4.0
  */
 
+import { Hex } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
 import { ProviderService } from "../ProviderService.js";
 import {
@@ -49,7 +50,7 @@ export const getBlockTransactionCount = (
 			const hash =
 				typeof args.blockHash === "string"
 					? args.blockHash
-					: `0x${Buffer.from(args.blockHash).toString("hex")}`;
+					: Hex(args.blockHash);
 			return svc
 				.request<string>("eth_getBlockTransactionCountByHash", [hash])
 				.pipe(

package/src/services/Provider/functions/getUncle.ts

@@ -5,6 +5,7 @@
  * @since 0.4.0
  */
 
+import { Hex } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
 import { ProviderService } from "../ProviderService.js";
 import {
@@ -54,7 +55,7 @@ export const getUncle = (
 			const hash =
 				typeof args.blockHash === "string"
 					? args.blockHash
-					: `0x${Buffer.from(args.blockHash).toString("hex")}`;
+					: Hex(args.blockHash);
 			return svc
 				.request<UncleBlockType | null>("eth_getUncleByBlockHashAndIndex", [
 					hash,

package/src/services/Provider/functions/getUncleCount.ts

@@ -5,6 +5,7 @@
  * @since 0.4.0
  */
 
+import { Hex } from "@tevm/voltaire";
 import * as Effect from "effect/Effect";
 import { ProviderService } from "../ProviderService.js";
 import {
@@ -49,7 +50,7 @@ export const getUncleCount = (
 			const hash =
 				typeof args.blockHash === "string"
 					? args.blockHash
-					: `0x${Buffer.from(args.blockHash).toString("hex")}`;
+					: Hex(args.blockHash);
 			return svc
 				.request<string>("eth_getUncleCountByBlockHash", [hash])
 				.pipe(

package/src/services/Signer/actions/deployContract.ts

@@ -152,7 +152,7 @@ export const deployContract = <TAbi extends Abi>(
 			WaitForTransactionReceiptError,
 			ProviderService
 		> = Effect.gen(function* () {
-			const hashHex = `0x${Buffer.from(hash).toString("hex")}` as `0x${string}`;
+			const hashHex = Hex(hash) as `0x${string}`;
 			const receipt = yield* waitForTransactionReceipt(hashHex);
 			if (!receipt.contractAddress) {
 				return yield* Effect.fail(

package/src/services/index.ts

@@ -95,6 +95,31 @@ export {
 	type AbiEncoderShape,
 	DefaultAbiEncoder,
 } from "./AbiEncoder/index.js";
+// BlockExplorerApi exports
+export {
+	BlockExplorerApi,
+	BlockExplorerApiService,
+	type BlockExplorerApiShape,
+	type BlockExplorerApiConfig,
+	type BlockExplorerApiError,
+	BlockExplorerConfigError,
+	BlockExplorerDecodeError,
+	BlockExplorerNotFoundError,
+	BlockExplorerProxyResolutionError,
+	BlockExplorerRateLimitError,
+	BlockExplorerResponseError,
+	BlockExplorerUnexpectedError,
+	type ExplorerContractInstance,
+	type ExplorerSourceId,
+	type ResolvedExplorerContract,
+	type AbiItem as ExplorerAbiItem,
+	type AbiResolution,
+	type ContractSourceFile,
+	type GetAbiOptions,
+	type GetContractOptions,
+	type GetSourcesOptions,
+	type ProxyInfo,
+} from "./BlockExplorerApi/index.js";
 // Account exports
 export {
 	AccountError,