From d6a29f5223324660cd98c2a6aaf345c207b2cd97 Mon Sep 17 00:00:00 2001
From: jxom <jakemoxey@gmail.com>
Date: Tue, 21 Feb 2023 07:01:13 +1100
Subject: [PATCH] feat: decorate clients with actions (#77)

* feat: fall back to getLogs if filters are not supported

* Update src/actions/public/watchContractEvent.test.ts

Co-authored-by: awkweb <tom@meagher.co>

* pr review

* feat: decode event log topics & data

* wip: public

* wip: add ens

* docs: public actions

* wip: wallet actions

* docs: wallet actions

* wip: test actions

* wip: add utils to main entrypoint

* tests: add tests

* playgrounds: update

* chore: changeset

* test

* refactor: wire up decorator generics

* fix conflicts

* format

---------

Co-authored-by: awkweb <tom@meagher.co>
---
 .changeset/unlucky-poems-rush.md              |  21 ++
 .../src/components/actions/AddChain.tsx       |   3 +-
 .../src/components/actions/GetBalance.tsx     |   3 +-
 .../src/components/actions/GetBlock.tsx       |   5 +-
 .../src/components/actions/GetBlockNumber.tsx |   3 +-
 .../src/components/actions/GetPermissions.tsx |   3 +-
 .../src/components/actions/GetTransaction.tsx |  12 +-
 .../actions/RequestAccountAddresses.tsx       |   3 +-
 .../components/actions/RequestPermissions.tsx |   3 +-
 .../components/actions/SendTransaction.tsx    |   7 +-
 .../src/components/actions/SwitchChain.tsx    |   3 +-
 .../components/actions/WatchBlockNumber.tsx   |   3 +-
 .../src/components/actions/WatchBlocks.tsx    |   3 +-
 .../actions/WatchPendingTransactions.tsx      |  21 +-
 playgrounds/bun/index.ts                      |   9 +-
 site/docs/actions/public/call.md              |  33 +-
 site/docs/actions/public/createBlockFilter.md |   9 +-
 site/docs/actions/public/createEventFilter.md |  35 +-
 .../public/createPendingTransactionFilter.md  |   9 +-
 site/docs/actions/public/estimateGas.md       |  27 +-
 site/docs/actions/public/getBalance.md        |  17 +-
 site/docs/actions/public/getBlock.md          |  15 +-
 site/docs/actions/public/getBlockNumber.md    |  11 +-
 .../public/getBlockTransactionCount.md        |  15 +-
 site/docs/actions/public/getChainId.md        |   9 +-
 site/docs/actions/public/getFeeHistory.md     |  17 +-
 site/docs/actions/public/getFilterChanges.md  |  35 +-
 site/docs/actions/public/getFilterLogs.md     |  17 +-
 site/docs/actions/public/getGasPrice.md       |   9 +-
 site/docs/actions/public/getLogs.md           |  39 +--
 site/docs/actions/public/getTransaction.md    |  19 +-
 .../public/getTransactionConfirmations.md     |  19 +-
 .../actions/public/getTransactionCount.md     |  15 +-
 .../actions/public/getTransactionReceipt.md   |  11 +-
 site/docs/actions/public/uninstallFilter.md   |  15 +-
 .../public/waitForTransactionReceipt.md       |  22 +-
 site/docs/actions/public/watchBlockNumber.md  |  19 +-
 site/docs/actions/public/watchBlocks.md       |  28 +-
 site/docs/actions/public/watchEvent.md        |  55 ++-
 .../public/watchPendingTransactions.md        |  21 +-
 site/docs/actions/test/dropTransaction.md     |  11 +-
 site/docs/actions/test/getAutomine.md         |   9 +-
 site/docs/actions/test/getTxpoolContent.md    |   9 +-
 site/docs/actions/test/getTxpoolStatus.md     |   9 +-
 site/docs/actions/test/impersonateAccount.md  |  11 +-
 site/docs/actions/test/increaseTime.md        |  11 +-
 site/docs/actions/test/inspectTxpool.md       |   9 +-
 site/docs/actions/test/mine.md                |  13 +-
 .../test/removeBlockTimestampInterval.md      |   9 +-
 site/docs/actions/test/reset.md               |  13 +-
 site/docs/actions/test/revert.md              |  11 +-
 .../actions/test/sendUnsignedTransaction.md   |  27 +-
 site/docs/actions/test/setAutomine.md         |  11 +-
 site/docs/actions/test/setBalance.md          |  14 +-
 site/docs/actions/test/setBlockGasLimit.md    |  11 +-
 .../actions/test/setBlockTimestampInterval.md |  11 +-
 site/docs/actions/test/setCode.md             |  13 +-
 site/docs/actions/test/setCoinbase.md         |  11 +-
 site/docs/actions/test/setIntervalMining.md   |  11 +-
 site/docs/actions/test/setLoggingEnabled.md   |   9 +-
 site/docs/actions/test/setMinGasPrice.md      |  12 +-
 .../actions/test/setNextBlockBaseFeePerGas.md |  11 +-
 .../actions/test/setNextBlockTimestamp.md     |  11 +-
 site/docs/actions/test/setNonce.md            |  13 +-
 site/docs/actions/test/setRpcUrl.md           |   9 +-
 site/docs/actions/test/setStorageAt.md        |  15 +-
 site/docs/actions/test/snapshot.md            |   9 +-
 .../actions/test/stopImpersonatingAccount.md  |  11 +-
 site/docs/actions/wallet/addChain.md          |   9 +-
 site/docs/actions/wallet/getAccounts.md       |   9 +-
 site/docs/actions/wallet/getPermissions.md    |   9 +-
 site/docs/actions/wallet/requestAccounts.md   |   9 +-
 .../docs/actions/wallet/requestPermissions.md |   9 +-
 site/docs/actions/wallet/sendTransaction.md   |  27 +-
 site/docs/actions/wallet/signMessage.md       |  13 +-
 site/docs/actions/wallet/switchChain.md       |   9 +-
 site/docs/actions/wallet/watchAsset.md        |  19 +-
 .../contract/createContractEventFilter.md     |  31 +-
 site/docs/contract/deployContract.md          |  17 +-
 site/docs/contract/estimateContractGas.md     |  38 +--
 site/docs/contract/getBytecode.md             |  11 +-
 site/docs/contract/getStorageAt.md            |  15 +-
 site/docs/contract/multicall.md               |  21 +-
 site/docs/contract/readContract.md            |  25 +-
 site/docs/contract/simulateContract.md        |  43 +--
 site/docs/contract/watchContractEvent.md      |  31 +-
 site/docs/contract/writeContract.md           |  41 +--
 site/docs/ens/actions/getEnsAddress.md        |  33 +-
 site/docs/ens/actions/getEnsName.md           |  17 +-
 site/docs/ens/utilities/labelhash.md          |  15 +-
 site/docs/ens/utilities/namehash.md           |   9 +-
 site/docs/getting-started.md                  |   3 +-
 site/docs/utilities/concat.md                 |   4 +-
 site/docs/utilities/formatEther.md            |   4 +-
 site/docs/utilities/formatGwei.md             |   4 +-
 site/docs/utilities/formatUnit.md             |   4 +-
 site/docs/utilities/fromBytes.md              |  14 +-
 site/docs/utilities/fromHex.md                |  14 +-
 site/docs/utilities/fromRlp.md                |   4 +-
 site/docs/utilities/getAddress.md             |   4 +-
 site/docs/utilities/getContractAddress.md     |   4 +-
 site/docs/utilities/getEventSignature.md      |   4 +-
 site/docs/utilities/getFunctionSignature.md   |   4 +-
 site/docs/utilities/isAddress.md              |   4 +-
 site/docs/utilities/isAddressEqual.md         |   4 +-
 site/docs/utilities/isBytes.md                |   4 +-
 site/docs/utilities/isHex.md                  |   4 +-
 site/docs/utilities/keccak256.md              |   6 +-
 site/docs/utilities/pad.md                    |   4 +-
 site/docs/utilities/parseEther.md             |   4 +-
 site/docs/utilities/parseGwei.md              |   4 +-
 site/docs/utilities/parseUnit.md              |   4 +-
 site/docs/utilities/size.md                   |   4 +-
 site/docs/utilities/slice.md                  |   4 +-
 site/docs/utilities/toBytes.md                |  12 +-
 site/docs/utilities/toHex.md                  |  12 +-
 site/docs/utilities/toRlp.md                  |   4 +-
 site/docs/utilities/trim.md                   |   4 +-
 site/index.md                                 |   3 +-
 src/actions/ens/getEnsAddress.ts              |   4 +-
 src/actions/ens/getEnsName.test.ts            |   2 +-
 src/actions/ens/getEnsName.ts                 |   4 +-
 src/actions/ens/index.ts                      |  12 +-
 src/actions/index.ts                          |   3 +
 src/actions/public/estimateGas.ts             |   2 +-
 src/actions/public/getBlockNumber.ts          |   2 +-
 src/actions/public/getChainId.ts              |   6 +-
 src/actions/public/getStorageAt.test.ts       |   1 -
 .../public/getTransactionConfirmations.ts     |   2 +-
 src/actions/public/index.ts                   |   1 +
 src/actions/public/watchBlockNumber.ts        |   2 +-
 src/actions/test/getTxpoolContent.ts          |  11 +-
 src/actions/test/getTxpoolStatus.ts           |   9 +-
 src/actions/test/index.ts                     |   4 +
 src/actions/test/inspectTxpool.ts             |  10 +-
 src/actions/wallet/addChain.test.ts           |   6 +-
 src/actions/wallet/addChain.ts                |   6 +-
 src/actions/wallet/deployContract.ts          |   5 +-
 src/actions/wallet/getAccounts.ts             |   7 +-
 src/actions/wallet/index.ts                   |   8 +-
 src/actions/wallet/requestAccounts.ts         |   7 +-
 src/clients/createPublicClient.test.ts        | 136 ++++++++
 src/clients/createPublicClient.ts             |  20 +-
 src/clients/createTestClient.test.ts          |  84 +++++
 src/clients/createTestClient.ts               |  13 +-
 src/clients/createWalletClient.test.ts        |  44 +++
 src/clients/createWalletClient.ts             |  18 +-
 src/clients/decorators/index.ts               |   8 +
 src/clients/decorators/public.test.ts         | 321 ++++++++++++++++++
 src/clients/decorators/public.ts              | 263 ++++++++++++++
 src/clients/decorators/test.test.ts           | 223 ++++++++++++
 src/clients/decorators/test.ts                | 133 ++++++++
 src/clients/decorators/wallet.test.ts         | 105 ++++++
 src/clients/decorators/wallet.ts              |  79 +++++
 src/contract.test.ts                          |   1 +
 src/contract.ts                               |   8 +-
 src/ens.ts                                    |   3 +-
 src/index.test.ts                             |  88 +++++
 src/index.ts                                  | 109 ++++++
 src/public.test.ts                            |   1 +
 src/public.ts                                 |   3 +
 src/utils/encoding/index.ts                   |   2 +-
 src/utils/encoding/toRlp.ts                   |   4 +-
 src/utils/ens/index.test.ts                   |   1 -
 src/utils/ens/index.ts                        |   2 -
 src/utils/ens/labelhash.test.ts               |   3 +-
 src/utils/ens/labelhash.ts                    |   3 +-
 src/utils/ens/namehash.test.ts                |   3 +-
 src/utils/ens/namehash.ts                     |   3 +-
 src/utils/index.ts                            |   2 +-
 src/wallet.ts                                 |   3 +
 171 files changed, 2256 insertions(+), 1099 deletions(-)
 create mode 100644 .changeset/unlucky-poems-rush.md
 create mode 100644 src/clients/decorators/index.ts
 create mode 100644 src/clients/decorators/public.test.ts
 create mode 100644 src/clients/decorators/public.ts
 create mode 100644 src/clients/decorators/test.test.ts
 create mode 100644 src/clients/decorators/test.ts
 create mode 100644 src/clients/decorators/wallet.test.ts
 create mode 100644 src/clients/decorators/wallet.ts

diff --git a/.changeset/unlucky-poems-rush.md b/.changeset/unlucky-poems-rush.md
new file mode 100644
index 0000000000..1e359ef61b
--- /dev/null
+++ b/.changeset/unlucky-poems-rush.md
@@ -0,0 +1,21 @@
+---
+"viem": patch
+---
+
+Decorated Clients with their respective Actions.
+
+Example:
+
+```diff
+import { createPublicClient, http } from 'viem'
+import { mainnet } from 'viem/chains'
+-import { getBlockNumber } from 'viem/public'
+
+const client = createPublicClient({
+  chain: mainnet,
+  transport: http(),
+})
+
+- const blockNumber = await getBlockNumber(client)
++ const blockNumber = await client.getBlockNumber()
+```
\ No newline at end of file
diff --git a/playgrounds/browser/src/components/actions/AddChain.tsx b/playgrounds/browser/src/components/actions/AddChain.tsx
index a3a6aac511..f60f38bb27 100644
--- a/playgrounds/browser/src/components/actions/AddChain.tsx
+++ b/playgrounds/browser/src/components/actions/AddChain.tsx
@@ -1,13 +1,12 @@
 import type { WalletClient } from 'viem'
 import { celo } from 'viem/chains'
-import { addChain } from 'viem/wallet'
 
 export function AddChain({ client }: { client: WalletClient }) {
   return (
     <div>
       <button
         onClick={async () => {
-          await addChain(client, celo)
+          await client.addChain({ chain: celo })
         }}
       >
         add chain
diff --git a/playgrounds/browser/src/components/actions/GetBalance.tsx b/playgrounds/browser/src/components/actions/GetBalance.tsx
index 640c258df3..84399515f3 100644
--- a/playgrounds/browser/src/components/actions/GetBalance.tsx
+++ b/playgrounds/browser/src/components/actions/GetBalance.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react'
 import type { PublicClient } from 'viem'
-import { getBalance } from 'viem/public'
 
 export function GetBalance({
   address = '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
@@ -13,7 +12,7 @@ export function GetBalance({
   useEffect(() => {
     ;(async () => {
       setBalance(
-        await getBalance(client, {
+        await client.getBalance({
           address,
         }),
       )
diff --git a/playgrounds/browser/src/components/actions/GetBlock.tsx b/playgrounds/browser/src/components/actions/GetBlock.tsx
index 9db3f23e81..0a53dd1d32 100644
--- a/playgrounds/browser/src/components/actions/GetBlock.tsx
+++ b/playgrounds/browser/src/components/actions/GetBlock.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react'
 import type { PublicClient } from 'viem'
 import type { GetBlockResponse } from 'viem/public'
-import { getBlock } from 'viem/public'
 
 export function GetBlock({ client }: { client: PublicClient }) {
   const [latestBlock, setLatestBlock] = useState<GetBlockResponse>()
@@ -9,8 +8,8 @@ export function GetBlock({ client }: { client: PublicClient }) {
 
   useEffect(() => {
     ;(async () => {
-      setLatestBlock(await getBlock(client, { blockTag: 'latest' }))
-      setBlock(await getBlock(client, { blockNumber: 42069n }))
+      setLatestBlock(await client.getBlock({ blockTag: 'latest' }))
+      setBlock(await client.getBlock({ blockNumber: 42069n }))
     })()
   }, [client])
 
diff --git a/playgrounds/browser/src/components/actions/GetBlockNumber.tsx b/playgrounds/browser/src/components/actions/GetBlockNumber.tsx
index 9d4d8e16e1..29cb4e95a5 100644
--- a/playgrounds/browser/src/components/actions/GetBlockNumber.tsx
+++ b/playgrounds/browser/src/components/actions/GetBlockNumber.tsx
@@ -1,13 +1,12 @@
 import { useEffect, useState } from 'react'
 import type { PublicClient } from 'viem'
 import type { GetBlockNumberResponse } from 'viem/public'
-import { getBlockNumber } from 'viem/public'
 
 export function GetBlockNumber({ client }: { client: PublicClient }) {
   const [blockNumber, setBlockNumber] = useState<GetBlockNumberResponse>()
   useEffect(() => {
     ;(async () => {
-      setBlockNumber(await getBlockNumber(client))
+      setBlockNumber(await client.getBlockNumber())
     })()
   }, [client])
   return <div>{blockNumber?.toString()}</div>
diff --git a/playgrounds/browser/src/components/actions/GetPermissions.tsx b/playgrounds/browser/src/components/actions/GetPermissions.tsx
index 921515841c..24aaabdd70 100644
--- a/playgrounds/browser/src/components/actions/GetPermissions.tsx
+++ b/playgrounds/browser/src/components/actions/GetPermissions.tsx
@@ -1,12 +1,11 @@
 import type { WalletClient } from 'viem'
-import { getPermissions } from 'viem/wallet'
 
 export function GetPermissions({ client }: { client: WalletClient }) {
   return (
     <div>
       <button
         onClick={async () => {
-          console.log(await getPermissions(client))
+          console.log(await client.getPermissions())
         }}
       >
         get permissions
diff --git a/playgrounds/browser/src/components/actions/GetTransaction.tsx b/playgrounds/browser/src/components/actions/GetTransaction.tsx
index 0754748d80..441ea60b2b 100644
--- a/playgrounds/browser/src/components/actions/GetTransaction.tsx
+++ b/playgrounds/browser/src/components/actions/GetTransaction.tsx
@@ -1,8 +1,6 @@
 import { useState } from 'react'
-import type { PublicClient } from 'viem'
+import type { Address, PublicClient } from 'viem'
 import type { GetTransactionArgs, GetTransactionResponse } from 'viem/public'
-import { getTransaction } from 'viem/public'
-import type { Address } from 'viem'
 
 export function GetTransaction({ client }: { client: PublicClient }) {
   return (
@@ -24,7 +22,7 @@ function GetTransactionByHash({ client }: { client: PublicClient }) {
 
   const handleGetTransaction = async () => {
     if (hash) {
-      setTransaction(await getTransaction(client, { hash }))
+      setTransaction(await client.getTransaction({ hash }))
     }
   }
 
@@ -64,7 +62,7 @@ function GetTransactionByHashAndIndex({ client }: { client: PublicClient }) {
   const handleGetTransaction = async () => {
     if (blockHash && index) {
       setTransaction(
-        await getTransaction(client, { blockHash, index: parseInt(index) }),
+        await client.getTransaction({ blockHash, index: parseInt(index) }),
       )
     }
   }
@@ -108,7 +106,7 @@ function GetTransactionByNumberAndIndex({ client }: { client: PublicClient }) {
   const handleGetTransaction = async () => {
     if (blockNumber && index) {
       setTransaction(
-        await getTransaction(client, {
+        await client.getTransaction({
           blockNumber: BigInt(blockNumber),
           index: parseInt(index),
         }),
@@ -156,7 +154,7 @@ function GetTransactionByTagAndIndex({ client }: { client: PublicClient }) {
   const handleGetTransaction = async () => {
     if (blockTag && index) {
       setTransaction(
-        await getTransaction(client, {
+        await client.getTransaction({
           blockTag,
           index: parseInt(index),
         }),
diff --git a/playgrounds/browser/src/components/actions/RequestAccountAddresses.tsx b/playgrounds/browser/src/components/actions/RequestAccountAddresses.tsx
index da25e31d2a..a84781c857 100644
--- a/playgrounds/browser/src/components/actions/RequestAccountAddresses.tsx
+++ b/playgrounds/browser/src/components/actions/RequestAccountAddresses.tsx
@@ -1,6 +1,5 @@
 import { useState } from 'react'
 import type { WalletClient } from 'viem'
-import { requestAccounts } from 'viem/wallet'
 
 export function RequestAccountAddresses({ client }: { client: WalletClient }) {
   const [addresses, setAddresses] = useState<`0x${string}`[]>()
@@ -8,7 +7,7 @@ export function RequestAccountAddresses({ client }: { client: WalletClient }) {
     <div>
       <button
         onClick={async () => {
-          const addresses = await requestAccounts(client)
+          const addresses = await client.requestAccounts()
           setAddresses(addresses)
         }}
       >
diff --git a/playgrounds/browser/src/components/actions/RequestPermissions.tsx b/playgrounds/browser/src/components/actions/RequestPermissions.tsx
index ad4c236702..0c0672eb2e 100644
--- a/playgrounds/browser/src/components/actions/RequestPermissions.tsx
+++ b/playgrounds/browser/src/components/actions/RequestPermissions.tsx
@@ -1,12 +1,11 @@
 import type { WalletClient } from 'viem'
-import { requestPermissions } from 'viem/wallet'
 
 export function RequestPermissions({ client }: { client: WalletClient }) {
   return (
     <div>
       <button
         onClick={async () => {
-          console.log(await requestPermissions(client, { eth_accounts: {} }))
+          console.log(await client.requestPermissions({ eth_accounts: {} }))
         }}
       >
         request permissions
diff --git a/playgrounds/browser/src/components/actions/SendTransaction.tsx b/playgrounds/browser/src/components/actions/SendTransaction.tsx
index 608a36cbe7..ff15280b5e 100644
--- a/playgrounds/browser/src/components/actions/SendTransaction.tsx
+++ b/playgrounds/browser/src/components/actions/SendTransaction.tsx
@@ -1,14 +1,13 @@
 import type { WalletClient } from 'viem'
-import { parseEther } from 'viem/utils'
-import { sendTransaction } from 'viem/wallet'
+import { parseEther } from 'viem'
 
 export function SendTransaction({ client }: { client: WalletClient }) {
   return (
     <div>
       <button
         onClick={async () => {
-          const [account] = await client.request({ method: 'eth_accounts' })
-          await sendTransaction(client, {
+          const [account] = await client.getAccounts()
+          await client.sendTransaction({
             from: account,
             to: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
             value: parseEther('0.0001'),
diff --git a/playgrounds/browser/src/components/actions/SwitchChain.tsx b/playgrounds/browser/src/components/actions/SwitchChain.tsx
index 998943a1aa..d29e27fd62 100644
--- a/playgrounds/browser/src/components/actions/SwitchChain.tsx
+++ b/playgrounds/browser/src/components/actions/SwitchChain.tsx
@@ -1,13 +1,12 @@
 import type { WalletClient } from 'viem'
 import { mainnet } from 'viem/chains'
-import { switchChain } from 'viem/wallet'
 
 export function SwitchChain({ client }: { client: WalletClient }) {
   return (
     <div>
       <button
         onClick={async () => {
-          await switchChain(client, mainnet)
+          await client.switchChain(mainnet)
         }}
       >
         switch chain
diff --git a/playgrounds/browser/src/components/actions/WatchBlockNumber.tsx b/playgrounds/browser/src/components/actions/WatchBlockNumber.tsx
index 45091baed5..b82674731c 100644
--- a/playgrounds/browser/src/components/actions/WatchBlockNumber.tsx
+++ b/playgrounds/browser/src/components/actions/WatchBlockNumber.tsx
@@ -1,12 +1,11 @@
 import { useEffect, useState } from 'react'
 import type { PublicClient } from 'viem'
 import type { OnBlockNumberResponse } from 'viem/public'
-import { watchBlockNumber } from 'viem/public'
 
 export function WatchBlockNumber({ client }: { client: PublicClient }) {
   const [blockNumber, setBlockNumber] = useState<OnBlockNumberResponse>()
   useEffect(() => {
-    const unwatch = watchBlockNumber(client, {
+    const unwatch = client.watchBlockNumber({
       emitOnBegin: true,
       onBlockNumber: setBlockNumber,
     })
diff --git a/playgrounds/browser/src/components/actions/WatchBlocks.tsx b/playgrounds/browser/src/components/actions/WatchBlocks.tsx
index c68855c870..07f966c787 100644
--- a/playgrounds/browser/src/components/actions/WatchBlocks.tsx
+++ b/playgrounds/browser/src/components/actions/WatchBlocks.tsx
@@ -1,12 +1,11 @@
 import { useEffect, useState } from 'react'
 import type { PublicClient } from 'viem'
 import type { OnBlockResponse } from 'viem/public'
-import { watchBlocks } from 'viem/public'
 
 export function WatchBlocks({ client }: { client: PublicClient }) {
   const [block, setBlock] = useState<OnBlockResponse>()
   useEffect(() => {
-    const unwatch = watchBlocks(client, {
+    const unwatch = client.watchBlocks({
       emitOnBegin: true,
       onBlock: setBlock,
     })
diff --git a/playgrounds/browser/src/components/actions/WatchPendingTransactions.tsx b/playgrounds/browser/src/components/actions/WatchPendingTransactions.tsx
index a61626f7a9..e5f70230bc 100644
--- a/playgrounds/browser/src/components/actions/WatchPendingTransactions.tsx
+++ b/playgrounds/browser/src/components/actions/WatchPendingTransactions.tsx
@@ -1,26 +1,25 @@
-import { useEffect, useState } from 'react';
-import type { PublicClient } from 'viem';
-import type { OnTransactionsResponse } from 'viem/public';
-import { watchPendingTransactions } from 'viem/public';
+import { useEffect, useState } from 'react'
+import type { PublicClient } from 'viem'
+import type { OnTransactionsResponse } from 'viem/public'
 
 export function WatchPendingTransactions({ client }: { client: PublicClient }) {
-  const [transactions, setTransactions] = useState<OnTransactionsResponse>([]);
+  const [transactions, setTransactions] = useState<OnTransactionsResponse>([])
   useEffect(() => {
     try {
-      const unwatch = watchPendingTransactions(client, {
+      const unwatch = client.watchPendingTransactions({
         onError: (err) => console.log(client.transport.url),
         onTransactions: setTransactions,
-      });
-      return unwatch;
+      })
+      return unwatch
     } catch (err) {
-      console.log(err);
+      console.log(err)
     }
-  }, [client]);
+  }, [client])
   return (
     <div style={{ maxHeight: 300, overflow: 'scroll' }}>
       {transactions.map((hash, i) => (
         <div key={i}>{hash}</div>
       ))}
     </div>
-  );
+  )
 }
diff --git a/playgrounds/bun/index.ts b/playgrounds/bun/index.ts
index f945707512..ed63cb6c45 100644
--- a/playgrounds/bun/index.ts
+++ b/playgrounds/bun/index.ts
@@ -1,6 +1,5 @@
 import { createPublicClient, http } from 'viem'
 import { mainnet, polygon } from 'viem/chains'
-import { getBlockNumber, getLogs, watchEvent } from 'viem/public'
 
 ////////////////////////////////////////////////////////////////////
 // Clients
@@ -19,17 +18,17 @@ export const publicClients = {
 ////////////////////////////////////////////////////////////////////
 // Blocks
 
-// const blockNumber = await getBlockNumber(publicClients.mainnet)
-// const blockNumber = await getBlockNumber(publicClients.polygon)
+// const blockNumber = await publicClients.mainnet.getBlockNumber()
+// const blockNumber = await publicClients.polygon.getBlockNumber()
 // console.log('blockNumber', blockNumber)
 
 ////////////////////////////////////////////////////////////////////
 // Events, Logs & Filters
 
-// const logs = await getLogs(publicClients.mainnet)
+// const logs = await publicClients.mainnet.getLogs()
 // console.log(logs)
 
-watchEvent(publicClients.mainnet, {
+publicClients.mainnet.watchEvent({
   onError(error) {
     console.log(error)
   },
diff --git a/site/docs/actions/public/call.md b/site/docs/actions/public/call.md
index f2446b4af9..d101f9910e 100644
--- a/site/docs/actions/public/call.md
+++ b/site/docs/actions/public/call.md
@@ -2,19 +2,12 @@
 
 Executes a new message call immediately without submitting a transaction to the network.
 
-## Import
-
-```ts
-import { call } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { call } from 'viem/public'
 import { publicClient } from '.'
  
-const data = await call(publicClient, { // [!code focus:7]
+const data = await publicClient.call({ // [!code focus:7]
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -36,7 +29,7 @@ The call data.
 A contract hashed method call with encoded args.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // [!code focus]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -50,7 +43,7 @@ const data = await call(publicClient, {
 The sender.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -64,7 +57,7 @@ const data = await call(publicClient, {
 The contract address or recipient.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', // [!code focus]
@@ -78,7 +71,7 @@ const data = await call(publicClient, {
 The access list.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   accessList: [ // [!code focus:6]
     {
       address: '0x1',
@@ -98,7 +91,7 @@ const data = await call(publicClient, {
 The gas provided for transaction execution.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   gas: 1_000_000n, // [!code focus]
@@ -113,7 +106,7 @@ const data = await call(publicClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   gasPrice: parseGwei('20'), // [!code focus]
@@ -128,7 +121,7 @@ const data = await call(publicClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'), // [!code focus]
@@ -143,7 +136,7 @@ const data = await call(publicClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),
@@ -159,7 +152,7 @@ const data = await call(publicClient, {
 Unique number identifying this transaction.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   nonce: 420n, // [!code focus]
@@ -174,7 +167,7 @@ const data = await call(publicClient, {
 Value (in wei) sent with this transaction.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -189,7 +182,7 @@ const data = await call(publicClient, {
 The block number to perform the call against.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   blockNumber: 15121123n, // [!code focus]
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
@@ -205,7 +198,7 @@ const data = await call(publicClient, {
 The block tag to perform the call against.
 
 ```ts
-const data = await call(publicClient, {
+const data = await publicClient.call({
   blockTag: 'safe', // [!code focus]
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
diff --git a/site/docs/actions/public/createBlockFilter.md b/site/docs/actions/public/createBlockFilter.md
index 7405444a43..cc6ba8b940 100644
--- a/site/docs/actions/public/createBlockFilter.md
+++ b/site/docs/actions/public/createBlockFilter.md
@@ -2,19 +2,12 @@
 
 Creates a Filter to listen for new block hashes that can be used with [`getFilterChanges`](/TODO).
 
-## Import
-
-```ts
-import { createBlockFilter } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { createBlockFilter } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createBlockFilter(publicClient) // [!code focus:99]
+const filter = await publicClient.createBlockFilter() // [!code focus:99]
 // { id: "0x345a6572337856574a76364e457a4366", type: 'block' }
 ```
 
diff --git a/site/docs/actions/public/createEventFilter.md b/site/docs/actions/public/createEventFilter.md
index 289e89552d..11bc809cc7 100644
--- a/site/docs/actions/public/createEventFilter.md
+++ b/site/docs/actions/public/createEventFilter.md
@@ -2,21 +2,14 @@
 
 Creates a Filter to listen for new events that can be used with [`getFilterChanges`](/docs/actions/public/getFilterChanges).
 
-## Import
-
-```ts
-import { createEventFilter } from 'viem/public'
-```
-
 ## Usage
 
 By default, an Event Filter with no arguments will query for/listen to all events.
 
 ```ts
-import { createEventFilter } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createEventFilter(publicClient)
+const filter = await publicClient.createEventFilter()
 // { id: "0x345a6572337856574a76364e457a4366", type: 'event' }
 ```
 
@@ -29,10 +22,9 @@ You can also scope a Filter to a set of given attributes (listed below).
 A Filter can be scoped to an **address**:
 
 ```ts 
-import { createEventFilter } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2' // [!code focus]
 })
 ```
@@ -44,11 +36,10 @@ A Filter can be scoped to an **event**.
 The `event` argument takes in an event in ABI format – we have a [`parseAbiEvent` utility](/docs/contract/parseAbiEvent) that you can use to convert from a human-readable event signature → ABI.
 
 ```ts
-import { createEventFilter } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils' // [!code focus]
+import { parseAbiEvent } from 'viem' // [!code focus]
 import { publicClient } from '.'
 
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'), // [!code focus]
 })
@@ -79,7 +70,7 @@ const filter = await createEventFilter(publicClient, {
 A Filter can be scoped to given **_indexed_ arguments**:
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:4]
@@ -94,7 +85,7 @@ Only indexed arguments in `event` are candidates for `args`.
 A Filter Argument can also be an array to indicate that other values can exist in the position:
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:8]
@@ -113,7 +104,7 @@ const filter = await createEventFilter(publicClient, {
 A Filter can be scoped to a **block range**:
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   fromBlock: 16330000n, // [!code focus]
@@ -134,7 +125,7 @@ const filter = await createEventFilter(publicClient, {
 The contract address or a list of addresses from which Logs should originate.
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2' // [!code focus]
 })
 ```
@@ -148,9 +139,9 @@ The event in ABI format.
 A [`parseAbiEvent` utility](/docs/contract/parseAbiEvent) is exported from viem that converts from a human-readable event signature → ABI.
 
 ```ts
-import { parseAbiEvent } from 'viem/utils' // [!code focus]
+import { parseAbiEvent } from 'viem' // [!code focus]
 
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'), // [!code focus]
 })
@@ -163,7 +154,7 @@ const filter = await createEventFilter(publicClient, {
 A list of _indexed_ event arguments.
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:4]
@@ -180,7 +171,7 @@ const filter = await createEventFilter(publicClient, {
 Block to start querying/listening from.
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   fromBlock: 69420n // [!code focus]
 })
 ```
@@ -192,7 +183,7 @@ const filter = await createEventFilter(publicClient, {
 Block to query/listen until.
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   fromBlock: 70120n // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/public/createPendingTransactionFilter.md b/site/docs/actions/public/createPendingTransactionFilter.md
index fa3d3200e1..cedde61ead 100644
--- a/site/docs/actions/public/createPendingTransactionFilter.md
+++ b/site/docs/actions/public/createPendingTransactionFilter.md
@@ -2,19 +2,12 @@
 
 Creates a Filter to listen for new pending transaction hashes that can be used with [`getFilterChanges`](/docs/actions/public/getFilterChanges).
 
-## Import
-
-```ts
-import { createPendingTransactionFilter } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { createPendingTransactionFilter } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createPendingTransactionFilter(publicClient) // [!code focus:99]
+const filter = await publicClient.createPendingTransactionFilter() // [!code focus:99]
 // { id: "0x345a6572337856574a76364e457a4366", type: 'transaction' }
 ```
 
diff --git a/site/docs/actions/public/estimateGas.md b/site/docs/actions/public/estimateGas.md
index 3ef97653b6..f4758dd8a9 100644
--- a/site/docs/actions/public/estimateGas.md
+++ b/site/docs/actions/public/estimateGas.md
@@ -2,19 +2,12 @@
 
 Estimates the gas necessary to complete a transaction without submitting it to the network.
 
-## Import
-
-```ts
-import { estimateGas } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { estimateGas } from 'viem/public'
 import { publicClient } from '.'
  
-const gasEstimate = await estimateGas(publicClient, { // [!code focus:7]
+const gasEstimate = await publicClient.estimateGas({ // [!code focus:7]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: parseEther('1')
@@ -36,7 +29,7 @@ The gas estimate (in wei).
 Contract code or a hashed method call with encoded args.
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   data: '0x...', // [!code focus]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -51,7 +44,7 @@ const gasEstimate = await estimateGas(publicClient, {
 Transaction sender.
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: parseEther('1')
@@ -65,7 +58,7 @@ const gasEstimate = await estimateGas(publicClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   gasPrice: parseGwei('20'), // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -80,7 +73,7 @@ const gasEstimate = await estimateGas(publicClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),  // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -95,7 +88,7 @@ const gasEstimate = await estimateGas(publicClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),
   maxPriorityFeePerGas: parseGwei('2'), // [!code focus]
@@ -111,7 +104,7 @@ const gasEstimate = await estimateGas(publicClient, {
 Transaction recipient.
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', // [!code focus]
   value: parseEther('1')
@@ -125,7 +118,7 @@ const gasEstimate = await estimateGas(publicClient, {
 Value (in wei) sent with this transaction.
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: parseEther('1') // [!code focus]
@@ -139,7 +132,7 @@ const gasEstimate = await estimateGas(publicClient, {
 The block number to perform the gas estimate against.
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   blockNumber: 15121123n, // [!code focus]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -155,7 +148,7 @@ const gasEstimate = await estimateGas(publicClient, {
 The block tag to perform the gas estimate against.
 
 ```ts
-const gasEstimate = await estimateGas(publicClient, {
+const gasEstimate = await publicClient.estimateGas({
   blockTag: 'safe', // [!code focus]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
diff --git a/site/docs/actions/public/getBalance.md b/site/docs/actions/public/getBalance.md
index ea1a09a028..67c8d69423 100644
--- a/site/docs/actions/public/getBalance.md
+++ b/site/docs/actions/public/getBalance.md
@@ -2,19 +2,12 @@
 
 Returns the balance of an address in wei.
 
-## Import
-
-```ts
-import { getBalance } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getBalance } from 'viem/public'
 import { publicClient } from '.'
  
-const balance = await getBalance(publicClient, { // [!code focus:4]
+const balance = await publicClient.getBalance({ // [!code focus:4]
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
 })
 // 10000000000000000000000n (wei)
@@ -35,7 +28,7 @@ The balance of the address in wei.
 The address of the account.
 
 ```ts
-const balance = await getBalance(publicClient, {
+const balance = await publicClient.getBalance({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e', // [!code focus]
 })
 ```
@@ -47,7 +40,7 @@ const balance = await getBalance(publicClient, {
 The balance of the account at a block number.
 
 ```ts
-const balance = await getBalance(publicClient, {
+const balance = await publicClient.getBalance({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
   blockNumber: 69420n  // [!code focus]
 })
@@ -60,7 +53,7 @@ const balance = await getBalance(publicClient, {
 The balance of the account at a block tag.
 
 ```ts
-const balance = await getBalance(publicClient, {
+const balance = await publicClient.getBalance({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
   blockTag: 'safe'  // [!code focus]
 })
@@ -71,7 +64,7 @@ const balance = await getBalance(publicClient, {
 - You can convert the balance to ether units with [`formatEther`](/docs/utilities/formatEther).
 
 ```ts
-const balance = await getBalance(publicClient, {
+const balance = await publicClient.getBalance({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
   blockTag: 'safe'
 })
diff --git a/site/docs/actions/public/getBlock.md b/site/docs/actions/public/getBlock.md
index 0d1d4a2721..81c633d11a 100644
--- a/site/docs/actions/public/getBlock.md
+++ b/site/docs/actions/public/getBlock.md
@@ -2,19 +2,12 @@
 
 Returns information about a block at a block number, hash or tag.
 
-## Import
-
-```ts
-import { getBlock } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getBlock } from 'viem/public'
 import { publicClient } from '.'
  
-const block = await getBlock(publicClient) // [!code focus:99]
+const block = await publicClient.getBlock() // [!code focus:99]
 /**
  * {
  *  baseFeePerGas: 10789405161n,
@@ -40,7 +33,7 @@ Information about the block.
 Information at a given block hash.
 
 ```ts
-const block = await getBlock(publicClient, {
+const block = await publicClient.getBlock({
   blockHash: '0x89644bbd5c8d682a2e9611170e6c1f02573d866d286f006cbf517eec7254ec2d' // [!code focus]
 })
 ```
@@ -52,7 +45,7 @@ const block = await getBlock(publicClient, {
 Information at a given block number.
 
 ```ts
-const block = await getBlock(publicClient, {
+const block = await publicClient.getBlock({
   blockNumber: 42069n // [!code focus]
 })
 ```
@@ -65,7 +58,7 @@ const block = await getBlock(publicClient, {
 Information at a given block tag.
 
 ```ts
-const block = await getBlock(publicClient, {
+const block = await publicClient.getBlock({
   blockTag: 'safe' // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/public/getBlockNumber.md b/site/docs/actions/public/getBlockNumber.md
index 3ec006b44a..7c30e5f513 100644
--- a/site/docs/actions/public/getBlockNumber.md
+++ b/site/docs/actions/public/getBlockNumber.md
@@ -2,19 +2,12 @@
 
 Returns the number of the most recent block seen.
 
-## Import
-
-```ts
-import { getBlockNumber } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getBlockNumber } from 'viem/public'
 import { publicClient } from '.'
  
-const block = await getBlockNumber(publicClient) // [!code focus:99]
+const block = await publicClient.getBlockNumber() // [!code focus:99]
 // 69420n
 ```
 
@@ -34,7 +27,7 @@ The number of the block.
 The maximum age (in ms) of the cached value. 
 
 ```ts
-const block = await getBlockNumber(publicClient, {
+const block = await publicClient.getBlockNumber({
   maxAge: 4_000 // [!code focus]
 })
 ```
diff --git a/site/docs/actions/public/getBlockTransactionCount.md b/site/docs/actions/public/getBlockTransactionCount.md
index 52f9fdc244..ce1552de1e 100644
--- a/site/docs/actions/public/getBlockTransactionCount.md
+++ b/site/docs/actions/public/getBlockTransactionCount.md
@@ -2,19 +2,12 @@
 
 Returns information about a block at a block number, hash or tag.
 
-## Import
-
-```ts
-import { getBlockTransactionCount } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getBlockTransactionCount } from 'viem/public'
 import { publicClient } from '.'
  
-const count = await getBlockTransactionCount(publicClient) // [!code focus:99]
+const count = await publicClient.getBlockTransactionCount() // [!code focus:99]
 // 23
 ```
 
@@ -33,7 +26,7 @@ The block transaction count.
 Count at a given block hash.
 
 ```ts
-const count = await getBlockTransactionCount(publicClient, {
+const count = await publicClient.getBlockTransactionCount({
   blockHash: '0x89644bbd5c8d682a2e9611170e6c1f02573d866d286f006cbf517eec7254ec2d' // [!code focus]
 })
 ```
@@ -45,7 +38,7 @@ const count = await getBlockTransactionCount(publicClient, {
 Count at a given block number.
 
 ```ts
-const block = await getBlockTransactionCount(publicClient, {
+const block = await publicClient.getBlockTransactionCount({
   blockNumber: 42069n // [!code focus]
 })
 ```
@@ -58,7 +51,7 @@ const block = await getBlockTransactionCount(publicClient, {
 Count at a given block tag.
 
 ```ts
-const block = await getBlockTransactionCount(publicClient, {
+const block = await publicClient.getBlockTransactionCount({
   blockTag: 'safe' // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/public/getChainId.md b/site/docs/actions/public/getChainId.md
index cbe249e91e..ae97729611 100644
--- a/site/docs/actions/public/getChainId.md
+++ b/site/docs/actions/public/getChainId.md
@@ -2,19 +2,12 @@
 
 Returns the chain ID associated with the current network
 
-## Import
-
-```ts
-import { getChainId } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getChainId } from 'viem/public'
 import { publicClient } from '.'
  
-const block = await getChainId(publicClient) // [!code focus:99]
+const block = await publicClient.getChainId() // [!code focus:99]
 // 1
 ```
 
diff --git a/site/docs/actions/public/getFeeHistory.md b/site/docs/actions/public/getFeeHistory.md
index 95ff767b78..8824b7106c 100644
--- a/site/docs/actions/public/getFeeHistory.md
+++ b/site/docs/actions/public/getFeeHistory.md
@@ -2,19 +2,12 @@
 
 Returns a collection of historical gas information.
 
-## Import
-
-```ts
-import { getFeeHistory } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getFeeHistory } from 'viem/public'
 import { publicClient } from '.'
  
-const feeHistory = await getFeeHistory(publicClient, { // [!code focus:4]
+const feeHistory = await publicClient.getFeeHistory({ // [!code focus:4]
   blockCount: 4,
   rewardPercentiles: [25, 75]
 })
@@ -35,7 +28,7 @@ The fee history.
 Number of blocks in the requested range. Between 1 and 1024 blocks can be requested in a single query. Less than requested may be returned if not all blocks are available.
 
 ```ts
-const feeHistory = await getFeeHistory(publicClient, {
+const feeHistory = await publicClient.getFeeHistory({
   blockCount: 4, // [!code focus]
   rewardPercentiles: [25, 75]
 })
@@ -48,7 +41,7 @@ const feeHistory = await getFeeHistory(publicClient, {
 A monotonically increasing list of percentile values to sample from each block's effective priority fees per gas in ascending order, weighted by gas used.
 
 ```ts
-const feeHistory = await getFeeHistory(publicClient, {
+const feeHistory = await publicClient.getFeeHistory({
   blockCount: 4,
   rewardPercentiles: [25, 75] // [!code focus]
 })
@@ -61,7 +54,7 @@ const feeHistory = await getFeeHistory(publicClient, {
 Highest number block of the requested range.
 
 ```ts
-const feeHistory = await getFeeHistory(publicClient, {
+const feeHistory = await publicClient.getFeeHistory({
   blockCount: 4,
   blockNumber: 1551231n, // [!code focus]
   rewardPercentiles: [25, 75]
@@ -76,7 +69,7 @@ const feeHistory = await getFeeHistory(publicClient, {
 Highest number block of the requested range.
 
 ```ts
-const feeHistory = await getFeeHistory(publicClient, {
+const feeHistory = await publicClient.getFeeHistory({
   blockCount: 4,
   blockTag: 'safe', // [!code focus]
   rewardPercentiles: [25, 75]
diff --git a/site/docs/actions/public/getFilterChanges.md b/site/docs/actions/public/getFilterChanges.md
index 2b1377b154..5b6e6de7b9 100644
--- a/site/docs/actions/public/getFilterChanges.md
+++ b/site/docs/actions/public/getFilterChanges.md
@@ -9,68 +9,55 @@ A Filter can be created from the following actions:
 - [`createEventFilter`](/docs/actions/public/createEventFilter)
 - [`createPendingTransactionFilter`](/docs/actions/public/createPendingTransactionFilter)
 
-## Import
-
-```ts
-import { getFilterChanges } from 'viem/public'
-```
-
 ## Usage
 
 ### Blocks
 
 ```ts
-import { createBlockFilter, getFilterChanges } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createBlockFilter(publicClient) // [!code focus:99]
-// ...
-const hashes = await getFilterChanges(publicClient, { filter })
+const filter = await publicClient.createBlockFilter() // [!code focus:99]
+const hashes = await publicClient.getFilterChanges({ filter })
 // ["0x10d86dc08ac2f18f00ef0daf7998dcc8673cbcf1f1501eeb2fac1afd2f851128", ...]
 ```
 
 ### Contract Events
 
 ```ts
-import { createContractEventFilter } from 'viem/contract'
-import { getFilterChanges } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createContractEventFilter(publicClient, { // [!code focus:99]
+const filter = await publicClient.createContractEventFilter({ // [!code focus:99]
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   abi: wagmiAbi,
   eventName: 'Transfer'
 })
 // ...
-const logs = await getFilterChanges(publicClient, { filter })
+const logs = await publicClient.getFilterChanges({ filter })
 // [{ ... }, { ... }, { ... }]
 ```
 
 ### Raw Events
 
 ```ts
-import { createEventFilter, getFilterChanges } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils'
+import { parseAbiEvent } from 'viem'
 import { publicClient } from '.'
 
-const filter = await createEventFilter(publicClient, { // [!code focus:99]
+const filter = await publicClient.createEventFilter({ // [!code focus:99]
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed, address indexed, uint256)'),
 })
 // ...
-const logs = await getFilterChanges(publicClient, { filter })
+const logs = await publicClient.getFilterChanges({ filter })
 // [{ ... }, { ... }, { ... }]
 ```
 
 ### Transactions
 
 ```ts
-import { createPendingTransactionFilter, getFilterChanges } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createPendingTransactionFilter(publicClient) // [!code focus:99]
-// ...
-const hashes = await getFilterChanges(publicClient, { filter })
+const filter = await publicClient.createPendingTransactionFilter() // [!code focus:99]
+const hashes = await publicClient.getFilterChanges({ filter })
 // ["0x89b3aa1c01ca4da5d15eca9fab459d062db5c0c9b76609acb0741901f01f6d19", ...]
 ```
 
@@ -101,8 +88,8 @@ If the filter was created with `createBlockFilter`, it returns a list of block h
 A created filter.
 
 ```ts
-const filter = await createPendingTransactionFilter(publicClient)
-const logs = await getFilterChanges(publicClient, {
+const filter = await publicClient.createPendingTransactionFilter()
+const logs = await publicClient.getFilterChanges({
   filter, // [!code focus]
 })
 ```
diff --git a/site/docs/actions/public/getFilterLogs.md b/site/docs/actions/public/getFilterLogs.md
index 78509007a2..e12a506217 100644
--- a/site/docs/actions/public/getFilterLogs.md
+++ b/site/docs/actions/public/getFilterLogs.md
@@ -4,25 +4,18 @@ Returns a list of **event** logs since the filter was created.
 
 Note: `getFilterLogs` is only compatible with **event filters**.
 
-## Import
-
-```ts
-import { getFilterLogs } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { createEventFilter, getFilterLogs } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils'
+import { parseAbiEvent } from 'viem'
 import { publicClient } from '.'
 
-const filter = await createEventFilter(publicClient, { // [!code focus:99]
+const filter = await publicClient.createEventFilter({ // [!code focus:99]
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed, address indexed, uint256)'),
 })
 // ...
-const logs = await getFilterLogs(publicClient, { filter })
+const logs = await publicClient.getFilterLogs({ filter })
 // [{ ... }, { ... }, { ... }]
 ```
 
@@ -41,8 +34,8 @@ A list of event logs.
 An **event** filter.
 
 ```ts
-const filter = await createEventFilter(publicClient)
-const logs = await getFilterLogs(publicClient, {
+const filter = await publicClient.createEventFilter()
+const logs = await publicClient.getFilterChanges({
   filter, // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/public/getGasPrice.md b/site/docs/actions/public/getGasPrice.md
index d8ae20d982..0e5f53ca1a 100644
--- a/site/docs/actions/public/getGasPrice.md
+++ b/site/docs/actions/public/getGasPrice.md
@@ -2,19 +2,12 @@
 
 Returns the current price of gas (in wei).
 
-## Import
-
-```ts
-import { getGasPrice } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getGasPrice } from 'viem/public'
 import { publicClient } from '.'
  
-const gasPrice = await getGasPrice(publicClient) // [!code focus:4]
+const gasPrice = await publicClient.getGasPrice() // [!code focus:4]
 ```
 
 ## Returns
diff --git a/site/docs/actions/public/getLogs.md b/site/docs/actions/public/getLogs.md
index 4ab7e0d89e..d970c062c7 100644
--- a/site/docs/actions/public/getLogs.md
+++ b/site/docs/actions/public/getLogs.md
@@ -2,21 +2,14 @@
 
 Returns a list of **event** logs matching the provided parameters. 
 
-## Import
-
-```ts
-import { getLogs } from 'viem/public'
-```
-
 ## Usage
 
 By default, `getLogs` returns all events. In practice, you must use scoping to filter for specific events.
 
 ```ts
-import { getLogs } from 'viem/public'
 import { publicClient } from '.'
 
-const logs = await getLogs(publicClient)  // [!code focus:99]
+const logs = await publicClient.getLogs()  // [!code focus:99]
 // [{ ... }, { ... }, { ... }]
 ```
 
@@ -25,11 +18,10 @@ const logs = await getLogs(publicClient)  // [!code focus:99]
 You can also scope to a set of given attributes.
 
 ```ts
-import { getLogs } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils'
+import { parseAbiEvent } from 'viem'
 import { publicClient } from '.'
 
-const logs = await getLogs(publicClient, {  // [!code focus:99]
+const logs = await publicClient.getLogs({  // [!code focus:99]
   address: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   event: parseAbiEvent('Transfer(address indexed, address indexed, uint256)'),
   args: {
@@ -72,7 +64,7 @@ const filter = await getLogs(publicClient, {
 A Filter can be scoped to an **address**:
 
 ```ts
-const filter = await getLogs(publicClient, {
+const filter = await publicClient.getLogs({
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2' // [!code focus]
 })
 ```
@@ -84,11 +76,10 @@ A Filter can be scoped to an **event**.
 The `event` argument takes in an event in ABI format – we have a [`parseAbiEvent` utility](/docs/contract/parseAbiEvent) that you can use to convert from a human-readable event signature → ABI.
 
 ```ts
-import { getLogs } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils' // [!code focus]
+import { parseAbiEvent } from 'viem' // [!code focus]
 import { publicClient } from '.'
 
-const filter = await getLogs(publicClient, {
+const filter = await publicClient.getLogs({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'), // [!code focus]
 })
@@ -99,7 +90,7 @@ const filter = await getLogs(publicClient, {
 A Filter can be scoped to given **_indexed_ arguments**:
 
 ```ts
-const filter = await getLogs(publicClient, {
+const filter = await publicClient.getLogs({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:4]
@@ -114,7 +105,7 @@ Only indexed arguments in `event` are candidates for `args`.
 A Filter Argument can also be an array to indicate that other values can exist in the position:
 
 ```ts
-const filter = await getLogs(publicClient, {
+const filter = await publicClient.getLogs({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:8]
@@ -133,7 +124,7 @@ const filter = await getLogs(publicClient, {
 A Filter can be scoped to a **block range**:
 
 ```ts
-const filter = await getLogs(publicClient, {
+const filter = await publicClient.getLogs({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   fromBlock: 16330000n, // [!code focus]
@@ -156,7 +147,7 @@ A list of event logs.
 A contract address or a list of contract addresses. Only logs originating from the contract(s) will be included in the result.
 
 ```ts
-const logs = await getLogs(publicClient, {
+const logs = await publicClient.getLogs({
   address: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
 })
 ```
@@ -170,7 +161,7 @@ The event in ABI format.
 A [`parseAbiEvent` utility](/docs/contract/parseAbiEvent) is exported from viem that converts from a human-readable event signature → ABI.
 
 ```ts
-const logs = await getLogs(publicClient, {
+const logs = await publicClient.getLogs({
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'), // [!code focus]
 })
 ```
@@ -182,7 +173,7 @@ const logs = await getLogs(publicClient, {
 A list of _indexed_ event arguments.
 
 ```ts
-const logs = await getLogs(publicClient, {
+const logs = await publicClient.getLogs({
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:4]
     from: '0xd8da6bf26964af9d7eed9e03e53415d37aa96045',
@@ -198,7 +189,7 @@ const logs = await getLogs(publicClient, {
 Block to start including logs from. Mutually exclusive with `blockHash`.
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   fromBlock: 69420n // [!code focus]
 })
 ```
@@ -210,7 +201,7 @@ const filter = await createEventFilter(publicClient, {
 Block to stop including logs from. Mutually exclusive with `blockHash`.
 
 ```ts
-const filter = await createEventFilter(publicClient, {
+const filter = await publicClient.createEventFilter({
   toBlock: 70120n // [!code focus]
 })
 ```
@@ -222,7 +213,7 @@ const filter = await createEventFilter(publicClient, {
 Block hash to include logs from. Mutually exclusive with `fromBlock`/`toBlock`.
 
 ```ts
-const logs = await getLogs(publicClient, {
+const logs = await publicClient.getLogs({
   blockHash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d' // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/public/getTransaction.md b/site/docs/actions/public/getTransaction.md
index 92e5da5913..dda8192676 100644
--- a/site/docs/actions/public/getTransaction.md
+++ b/site/docs/actions/public/getTransaction.md
@@ -2,19 +2,12 @@
 
 Returns information about a transaction given a hash or block identifier.
 
-## Import
-
-```ts
-import { getTransaction } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getTransaction } from 'viem/public'
 import { publicClient } from '.'
  
-const transaction = await getTransaction(publicClient, { // [!code focus:99]
+const transaction = await publicClient.getTransaction({ // [!code focus:99]
   hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d'
 })
 /**
@@ -42,7 +35,7 @@ The transaction information.
 Get information about a transaction given a transaction hash.
 
 ```ts
-const transaction = await getTransaction(publicClient, {
+const transaction = await publicClient.getTransaction({
   hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d' // [!code focus]
 })
 ```
@@ -54,7 +47,7 @@ const transaction = await getTransaction(publicClient, {
 Get information about a transaction given a block hash (and index).
 
 ```ts
-const transaction = await getTransaction(publicClient, {
+const transaction = await publicClient.getTransaction({
   blockHash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d', // [!code focus:2]
   index: 0
 })
@@ -67,7 +60,7 @@ const transaction = await getTransaction(publicClient, {
 Get information about a transaction given a block number (and index).
 
 ```ts
-const transaction = await getTransaction(publicClient, {
+const transaction = await publicClient.getTransaction({
   blockNumber: 69420n, // [!code focus:2]
   index: 0
 })
@@ -80,7 +73,7 @@ const transaction = await getTransaction(publicClient, {
 Get information about a transaction given a block tag (and index).
 
 ```ts
-const transaction = await getTransaction(publicClient, {
+const transaction = await publicClient.getTransaction({
   blockTag: 'safe', // [!code focus:2]
   index: 0
 })
@@ -93,7 +86,7 @@ const transaction = await getTransaction(publicClient, {
 An index to be used with a block identifier (number, hash or tag).
 
 ```ts
-const transaction = await getTransaction(publicClient, {
+const transaction = await publicClient.getTransaction({
   blockTag: 'safe',
   index: 0 // [!code focus]
 })
diff --git a/site/docs/actions/public/getTransactionConfirmations.md b/site/docs/actions/public/getTransactionConfirmations.md
index 6cf27422c4..1aefd79155 100644
--- a/site/docs/actions/public/getTransactionConfirmations.md
+++ b/site/docs/actions/public/getTransactionConfirmations.md
@@ -2,21 +2,13 @@
 
 Returns the number of blocks passed (confirmations) since the transaction was processed on a block.
 
-## Import
-
-```ts
-import { getTransactionConfirmations } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getTransactionConfirmations } from 'viem/public'
 import { publicClient } from '.'
  
-const transactionReceipt = await getTransactionReceipt(publicClient, { hash: '...' })
-
-const confirmations = await getTransactionConfirmations(publicClient, {  // [!code focus:99]
+const transactionReceipt = await publicClient.getTransactionReceipt({ hash: '...' })
+const confirmations = await publicClient.getTransactionConfirmations({  // [!code focus:99]
   transactionReceipt
 })
 // 15n
@@ -25,10 +17,9 @@ const confirmations = await getTransactionConfirmations(publicClient, {  // [!co
 You can also fetch confirmations by Transaction hash:
 
 ```ts
-import { getTransactionConfirmations } from 'viem/public'
 import { publicClient } from '.'
 
-const confirmations = await getTransactionConfirmations(publicClient, {  // [!code focus:99]
+const confirmations = await publicClient.getTransactionConfirmations({  // [!code focus:99]
   hash: '0x...'
 })
 // 15n
@@ -49,7 +40,7 @@ The number of blocks passed since the transaction was processed. If confirmation
 The transaction receipt.
 
 ```ts
-const balance = await getTransactionConfirmations(publicClient, {
+const balance = await publicClient.getTransactionConfirmations({
   transactionReceipt: { ... }, // [!code focus]
 })
 ```
@@ -61,7 +52,7 @@ const balance = await getTransactionConfirmations(publicClient, {
 The hash of the transaction.
 
 ```ts
-const balance = await getTransactionConfirmations(publicClient, {
+const balance = await publicClient.getTransactionConfirmations({
   hash: '0x...'  // [!code focus]
 })
 ```
diff --git a/site/docs/actions/public/getTransactionCount.md b/site/docs/actions/public/getTransactionCount.md
index 7ef40aeedc..fe03db91c2 100644
--- a/site/docs/actions/public/getTransactionCount.md
+++ b/site/docs/actions/public/getTransactionCount.md
@@ -2,19 +2,12 @@
 
 Returns the number of [Transactions](/docs/glossary/terms#TODO) an Account has broadcast / sent.
 
-## Import
-
-```ts
-import { getTransactionCount } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getTransactionCount } from 'viem/public'
 import { publicClient } from '.'
  
-const block = await getTransactionCount(publicClient, {  // [!code focus:99]
+const block = await publicClient.getTransactionCount({  // [!code focus:99]
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
 })
 // 420
@@ -35,7 +28,7 @@ The number of transactions an account has sent.
 The address of the account.
 
 ```ts
-const balance = await getTransactionCount(publicClient, {
+const balance = await publicClient.getTransactionCount({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e', // [!code focus]
 })
 ```
@@ -47,7 +40,7 @@ const balance = await getTransactionCount(publicClient, {
 Get the count at a block number.
 
 ```ts
-const balance = await getTransactionCount(publicClient, {
+const balance = await publicClient.getTransactionCount({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
   blockNumber: 69420n  // [!code focus]
 })
@@ -60,7 +53,7 @@ const balance = await getTransactionCount(publicClient, {
 Get the count at a block tag.
 
 ```ts
-const balance = await getTransactionCount(publicClient, {
+const balance = await publicClient.getTransactionCount({
   address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
   blockTag: 'safe'  // [!code focus]
 })
diff --git a/site/docs/actions/public/getTransactionReceipt.md b/site/docs/actions/public/getTransactionReceipt.md
index 5a1d27c78c..5cdb8bf5aa 100644
--- a/site/docs/actions/public/getTransactionReceipt.md
+++ b/site/docs/actions/public/getTransactionReceipt.md
@@ -2,19 +2,12 @@
 
 Returns the transaction receipt given a transaction hash.
 
-## Import
-
-```ts
-import { getTransactionReceipt } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { getTransactionReceipt } from 'viem/public'
 import { publicClient } from '.'
  
-const transaction = await getTransactionReceipt(publicClient, { // [!code focus:99]
+const transaction = await publicClient.getTransactionReceipt({ // [!code focus:99]
   hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d'
 })
 /**
@@ -43,7 +36,7 @@ The transaction receipt.
 A transaction hash.
 
 ```ts
-const transaction = await getTransactionReceipt(publicClient, {
+const transaction = await publicClient.getTransactionReceipt({
   hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d' // [!code focus]
 })
 ```
diff --git a/site/docs/actions/public/uninstallFilter.md b/site/docs/actions/public/uninstallFilter.md
index d1fb867e9a..a6e626450b 100644
--- a/site/docs/actions/public/uninstallFilter.md
+++ b/site/docs/actions/public/uninstallFilter.md
@@ -6,20 +6,13 @@ Destroys a Filter that was created from one of the following actions:
 - [`createEventFilter`](/docs/actions/public/createEventFilter)
 - [`createPendingTransactionFilter`](/docs/actions/public/createPendingTransactionFilter)
 
-## Import
-
-```ts
-import { uninstallFilter } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { createPendingTransactionFilter, uninstallFilter } from 'viem/public'
 import { publicClient } from '.'
 
-const filter = await createPendingTransactionFilter(publicClient)
-const uninstalled = await uninstallFilter(publicClient, { filter }) // [!code focus:99]
+const filter = await publicClient.createPendingTransactionFilter()
+const uninstalled = await publicClient.uninstallFilter({ filter }) // [!code focus:99]
 // true
 ```
 
@@ -38,8 +31,8 @@ A boolean indicating if the Filter was successfully uninstalled.
 A created filter.
 
 ```ts
-const filter = await createPendingTransactionFilter(publicClient)
-const uninstalled = await uninstallFilter(publicClient, {
+const filter = await publicClient.createPendingTransactionFilter()
+const uninstalled = await publicClient.uninstallFilter({
   filter, // [!code focus]
 })
 ```
diff --git a/site/docs/actions/public/waitForTransactionReceipt.md b/site/docs/actions/public/waitForTransactionReceipt.md
index bdea56573a..dc4bab8f07 100644
--- a/site/docs/actions/public/waitForTransactionReceipt.md
+++ b/site/docs/actions/public/waitForTransactionReceipt.md
@@ -4,20 +4,12 @@ Waits for the [Transaction](/docs/glossary/terms#TODO) to be included on a [Bloc
 
 The `waitForTransactionReceipt` action additionally supports Replacement detection (ie. sped up Transactions).
 
-## Import
-
-```ts
-import { waitForTransactionReceipt } from 'viem/public'
-```
-
 ## Usage
 
 ```ts
-import { waitForTransactionReceipt } from 'viem/public'
 import { publicClient } from '.'
  
-const transaction = await waitForTransactionReceipt( // [!code focus:99]
-  publicClient,
+const transaction = await publicClient.waitForTransactionReceipt( // [!code focus:99]
   { hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d' }
 )
 /**
@@ -47,8 +39,7 @@ The transaction receipt.
 The number of confirmations (blocks that have passed) to wait before resolving.
 
 ```ts
-const transaction = await waitForTransactionReceipt(
-  publicClient,
+const transaction = await publicClient.waitForTransactionReceipt(
   { 
     confirmations: 5, // [!code focus:1]
     hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d' 
@@ -63,8 +54,7 @@ const transaction = await waitForTransactionReceipt(
 Optional callback to emit if the transaction has been replaced.
 
 ```ts
-const transaction = await waitForTransactionReceipt(
-  publicClient,
+const transaction = await publicClient.waitForTransactionReceipt(
   { 
     hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d',
     onReplaced: replacement => console.log(replacement) // [!code focus:1]
@@ -79,8 +69,7 @@ const transaction = await waitForTransactionReceipt(
 Polling frequency (in ms). Defaults to the Client's `pollingInterval` config.
 
 ```ts
-const transaction = await waitForTransactionReceipt(
-  publicClient,
+const transaction = await publicClient.waitForTransactionReceipt(
   { 
     hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d',
     pollingInterval: 12_000, // [!code focus:1]
@@ -95,8 +84,7 @@ const transaction = await waitForTransactionReceipt(
 Optional timeout (in milliseconds) to wait before stopping polling.
 
 ```ts
-const transaction = await waitForTransactionReceipt(
-  publicClient,
+const transaction = await publicClient.waitForTransactionReceipt(
   { 
     hash: '0x4ca7ee652d57678f26e887c149ab0735f41de37bcad58c9f6d3ed5824f15b74d',
     timeout: 60_000, // [!code focus:1]
diff --git a/site/docs/actions/public/watchBlockNumber.md b/site/docs/actions/public/watchBlockNumber.md
index 4a62c5e9fc..033d017596 100644
--- a/site/docs/actions/public/watchBlockNumber.md
+++ b/site/docs/actions/public/watchBlockNumber.md
@@ -2,22 +2,14 @@
 
 Watches and returns incoming block numbers.
 
-## Import
-
-```ts
-import { watchBlockNumber } from 'viem/public'
-```
-
 ## Usage
 
 Pass through your Public Client, along with a listener.
 
 ```ts
-import { watchBlockNumber } from 'viem/public'
 import { publicClient } from '.'
  
-const unwatch = watchBlockNumber( // [!code focus:99]
-  publicClient,
+const unwatch = publicClient.watchBlockNumber( // [!code focus:99]
   { onBlockNumber: blockNumber => console.log(blockNumber) }
 )
 /**
@@ -51,8 +43,7 @@ Whether or not to emit missed block numbers to the callback.
 Missed block numbers may occur in instances where internet connection is lost, or the block time is lesser than the [polling interval](/docs/clients/public.html#pollinginterval-optional) of the client.
 
 ```ts
-const unwatch = watchBlockNumber(
-  client,
+const unwatch = publicClient.watchBlockNumber(
   { 
     emitMissed: true, // [!code focus]
     onBlockNumber: blockNumber => console.log(blockNumber),
@@ -68,8 +59,7 @@ const unwatch = watchBlockNumber(
 Whether or not to emit the latest block number to the callback when the subscription opens.
 
 ```ts
-const unwatch = watchBlockNumber(
-  client,
+const unwatch = publicClient.watchBlockNumber(
   { 
     emitOnBegin: true, // [!code focus]
     onBlockNumber: blockNumber => console.log(blockNumber),
@@ -84,8 +74,7 @@ const unwatch = watchBlockNumber(
 Polling frequency (in ms). Defaults to Client's `pollingInterval` config.
 
 ```ts
-const unwatch = watchBlockNumber(
-  client,
+const unwatch = publicClient.watchBlockNumber(
   { 
     onBlockNumber: blockNumber => console.log(blockNumber),
     pollingInterval: 12_000, // [!code focus]
diff --git a/site/docs/actions/public/watchBlocks.md b/site/docs/actions/public/watchBlocks.md
index 7a114ad851..968350ab9f 100644
--- a/site/docs/actions/public/watchBlocks.md
+++ b/site/docs/actions/public/watchBlocks.md
@@ -2,22 +2,14 @@
 
 Watches and returns information for incoming blocks.
 
-## Import
-
-```ts
-import { watchBlocks } from 'viem/public'
-```
-
 ## Usage
 
 Pass through your Public Client, along with a listener.
 
 ```ts
-import { watchBlocks } from 'viem/public'
 import { publicClient } from '.'
  
-const unwatch = watchBlocks( // [!code focus:99]
-  publicClient,
+const unwatch = publicClient.watchBlocks( // [!code focus:99]
   { onBlock: block => console.log(block) }
 )
 /**
@@ -52,8 +44,7 @@ A function that can be invoked to stop watching for new blocks.
 The block information.
 
 ```ts
-const unwatch = watchBlocks(
-  publicClient,
+const unwatch = publicClient.watchBlocks(
   { onBlock: block => console.log(block) } // [!code focus:1]
 )
 ```
@@ -65,8 +56,7 @@ const unwatch = watchBlocks(
 Error thrown from getting a block.
 
 ```ts
-const unwatch = watchBlocks(
-  publicClient,
+const unwatch = publicClient.watchBlocks(
   { 
     onBlock: block => console.log(block),
     onError: error => console.log(error) // [!code focus:1]
@@ -82,8 +72,7 @@ const unwatch = watchBlocks(
 Watch for new blocks on a given tag.
 
 ```ts
-const unwatch = watchBlocks(
-  client,
+const unwatch = publicClient.watchBlocks(
   { 
     blockTag: 'safe',
     onBlock: block => console.log(block), // [!code focus]
@@ -101,8 +90,7 @@ Whether or not to emit missed blocks to the callback.
 Missed blocks may occur in instances where internet connection is lost, or the block time is lesser than the [polling interval](/docs/clients/public.html#pollinginterval-optional) of the client.
 
 ```ts
-const unwatch = watchBlocks(
-  client,
+const unwatch = publicClient.watchBlocks(
   { 
     emitMissed: true, // [!code focus]
     onBlock: block => console.log(block),
@@ -118,8 +106,7 @@ const unwatch = watchBlocks(
 Whether or not to emit the block to the callback when the subscription opens.
 
 ```ts
-const unwatch = watchBlocks(
-  client,
+const unwatch = publicClient.watchBlocks(
   { 
     emitOnBegin: true, // [!code focus]
     onBlock: block => console.log(block),
@@ -134,8 +121,7 @@ const unwatch = watchBlocks(
 Polling frequency (in ms). Defaults to the Client's `pollingInterval` config.
 
 ```ts
-const unwatch = watchBlocks(
-  client,
+const unwatch = publicClient.watchBlocks(
   { 
     onBlock: block => console.log(block),
     pollingInterval: true, // [!code focus]
diff --git a/site/docs/actions/public/watchEvent.md b/site/docs/actions/public/watchEvent.md
index 3e4c4561f1..454fbfcdfe 100644
--- a/site/docs/actions/public/watchEvent.md
+++ b/site/docs/actions/public/watchEvent.md
@@ -6,12 +6,6 @@ This Action will batch up all the Event Logs found within the [`pollingInterval`
 
 `watchEvent` will attempt to create an [Event Filter](/docs/actions/public/watchEvent) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (ie. `eth_newFilter`), then `watchEvent` will fall back to using [`getLogs`](/docs/actions/public/getLogs) instead.
 
-## Import
-
-```ts
-import { watchEvent } from 'viem/public'
-```
-
 ## Usage
 
 By default, you can watch all broadcasted events to the blockchain by just passing `onLogs`. 
@@ -21,11 +15,10 @@ These events will be batched up into [Event Logs](/docs/glossary/terms#TODO) and
 ::: code-group
 
 ```ts [example.ts]
-import { watchEvent } from 'viem/public'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchEvent(publicClient, {
+const unwatch = await publicClient.watchEvent({
   onLogs: logs => console.log(logs)
 })
 // > [{ ... }, { ... }, { ... }]
@@ -34,7 +27,7 @@ const unwatch = await watchEvent(publicClient, {
 ```
 
 ```ts [client.ts]
-import { createPublicClient, http } from 'viem/public'
+import { createPublicClient, http } from 'viem'
 import { mainnet } from 'viem/chains'
 
 export const publicClient = createPublicClient({
@@ -56,11 +49,10 @@ You can also scope `watchEvent` to a set of given attributes (listed below).
 ::: code-group
 
 ```ts [example.ts]
-import { watchEvent } from 'viem/public'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchEvent(publicClient, {
+const unwatch = await publicClient.watchEvent({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', // [!code focus]
   onLogs: logs => console.log(logs)
 })
@@ -70,7 +62,7 @@ const unwatch = await watchEvent(publicClient, {
 ```
 
 ```ts [client.ts]
-import { createPublicClient, http } from 'viem/public'
+import { createPublicClient, http } from 'viem'
 import { mainnet } from 'viem/chains'
 
 export const publicClient = createPublicClient({
@@ -90,12 +82,11 @@ The `event` argument takes in an event in ABI format – we have a [`parseAbiEve
 ::: code-group
 
 ```ts [example.ts]
-import { watchEvent } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils' // [!code focus]
+import { parseAbiEvent } from 'viem' // [!code focus]
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchEvent(publicClient, {
+const unwatch = await publicClient.watchEvent({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'), // [!code focus]
   onLogs: logs => console.log(logs)
@@ -106,7 +97,7 @@ const unwatch = await watchEvent(publicClient, {
 ```
 
 ```ts [client.ts]
-import { createPublicClient, http } from 'viem/public'
+import { createPublicClient, http } from 'viem'
 import { mainnet } from 'viem/chains'
 
 export const publicClient = createPublicClient({
@@ -145,12 +136,11 @@ const unwatch = await watchEvent(publicClient, {
 ::: code-group
 
 ```ts [example.ts]
-import { watchEvent } from 'viem/public'
-import { parseAbiEvent } from 'viem/utils'
+import { parseAbiEvent } from 'viem'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchEvent(publicClient, {
+const unwatch = await publicClient.watchEvent({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:4]
@@ -165,7 +155,7 @@ const unwatch = await watchEvent(publicClient, {
 ```
 
 ```ts [client.ts]
-import { createPublicClient, http } from 'viem/public'
+import { createPublicClient, http } from 'viem'
 import { mainnet } from 'viem/chains'
 
 export const publicClient = createPublicClient({
@@ -181,7 +171,7 @@ Only indexed arguments in `event` are candidates for `args`.
 These arguments can also be an array to indicate that other values can exist in the position:
 
 ```ts
-const unwatch = await watchEvent(publicClient, {
+const unwatch = await publicClient.watchEvent({
   address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
   event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
   args: { // [!code focus:8]
@@ -211,8 +201,7 @@ A function that can be invoked to stop watching for new Event Logs.
 The new Event Logs.
 
 ```ts
-const unwatch = watchEvent(
-  publicClient,
+const unwatch = publicClient.watchEvent(
   { onLogs: logs => console.log(logs) } // [!code focus:1]
 )
 ```
@@ -224,8 +213,7 @@ const unwatch = watchEvent(
 The contract address or a list of addresses from which Logs should originate.
 
 ```ts
-const unwatch = watchEvent(
-  publicClient,
+const unwatch = publicClient.watchEvent(
   { 
     address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2', // [!code focus]
     onLogs: logs => console.log(logs) 
@@ -242,10 +230,9 @@ The event in ABI format.
 A [`parseAbiEvent` utility](/docs/contract/parseAbiEvent) is exported from viem that converts from a human-readable event signature → ABI.
 
 ```ts
-import { parseAbiEvent } from 'viem/utils' // [!code focus]
+import { parseAbiEvent } from 'viem' // [!code focus]
 
-const unwatch = watchEvent(
-  publicClient,
+const unwatch = publicClient.watchEvent(
   { 
     address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2',
     event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'), // [!code focus]
@@ -261,8 +248,7 @@ const unwatch = watchEvent(
 A list of _indexed_ event arguments.
 
 ```ts
-const unwatch = watchEvent(
-  publicClient,
+const unwatch = publicClient.watchEvent(
   { 
     address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2',
     event: parseAbiEvent('Transfer(address indexed from, address indexed to, uint256 value)'),
@@ -282,8 +268,7 @@ const unwatch = watchEvent(
 Whether or not to batch the Event Logs between polling intervals.
 
 ```ts
-const unwatch = watchEvent(
-  publicClient,
+const unwatch = publicClient.watchEvent(
   { 
     batch: false, // [!code focus]
     onLogs: logs => console.log(logs),
@@ -298,8 +283,7 @@ const unwatch = watchEvent(
 Error thrown from listening for new Event Logs.
 
 ```ts
-const unwatch = watchEvent(
-  publicClient,
+const unwatch = publicClient.watchEvent(
   { 
     onError: error => console.log(error) // [!code focus:1]
     onLogs: logs => console.log(logs),
@@ -314,8 +298,7 @@ const unwatch = watchEvent(
 Polling frequency (in ms). Defaults to the Client's `pollingInterval` config.
 
 ```ts
-const unwatch = watchEvent(
-  client,
+const unwatch = publicClient.watchEvent(
   { 
     pollingInterval: 1_000, // [!code focus]
     onLogs: logs => console.log(logs),
diff --git a/site/docs/actions/public/watchPendingTransactions.md b/site/docs/actions/public/watchPendingTransactions.md
index 2f95bd3c1c..bf4a40c393 100644
--- a/site/docs/actions/public/watchPendingTransactions.md
+++ b/site/docs/actions/public/watchPendingTransactions.md
@@ -4,20 +4,13 @@ Watches and returns pending transaction hashes.
 
 This Action will batch up all the pending transactions found within the [`pollingInterval`](#pollinginterval-optional), and invoke them via [`onTransactions`](#ontransactions).
 
-## Import
-
-```ts
-import { watchPendingTransactions } from 'viem/public'
-```
 
 ## Usage
 
 ```ts
-import { watchPendingTransactions } from 'viem/public'
 import { publicClient } from '.'
  
-const unwatch = watchPendingTransactions( // [!code focus:99]
-  publicClient,
+const unwatch = publicClient.watchPendingTransactions( // [!code focus:99]
   { onTransactions: hashes => console.log(hashes) }
 )
 /**
@@ -42,8 +35,7 @@ A function that can be invoked to stop watching for new pending transaction hash
 The new pending transaction hashes.
 
 ```ts
-const unwatch = watchPendingTransactions(
-  publicClient,
+const unwatch = publicClient.watchPendingTransactions(
   { onTransactions: hashes => console.log(hashes) } // [!code focus:1]
 )
 ```
@@ -56,8 +48,7 @@ const unwatch = watchPendingTransactions(
 Whether or not to batch the transaction hashes between polling intervals.
 
 ```ts
-const unwatch = watchPendingTransactions(
-  publicClient,
+const unwatch = publicClient.watchPendingTransactions(
   { 
     batch: false, // [!code focus]
     onTransactions: hashes => console.log(hashes),
@@ -72,8 +63,7 @@ const unwatch = watchPendingTransactions(
 Error thrown from listening for new pending transactions.
 
 ```ts
-const unwatch = watchPendingTransactions(
-  publicClient,
+const unwatch = publicClient.watchPendingTransactions(
   { 
     onError: error => console.log(error) // [!code focus:1]
     onTransactions: hashes => console.log(hashes),
@@ -88,8 +78,7 @@ const unwatch = watchPendingTransactions(
 Polling frequency (in ms). Defaults to the Client's `pollingInterval` config.
 
 ```ts
-const unwatch = watchPendingTransactions(
-  client,
+const unwatch = publicClient..watchPendingTransactions(
   { 
     pollingInterval: 1_000, // [!code focus]
     onTransactions: hashes => console.log(hashes),
diff --git a/site/docs/actions/test/dropTransaction.md b/site/docs/actions/test/dropTransaction.md
index 74f0adc985..0464a6d71f 100644
--- a/site/docs/actions/test/dropTransaction.md
+++ b/site/docs/actions/test/dropTransaction.md
@@ -2,19 +2,12 @@
 
 Remove a transaction from the mempool.
 
-## Import 
-
-```ts
-import { dropTransaction } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { dropTransaction } from 'viem/test'
 import { testClient } from '.'
  
-await dropTransaction(testClient, { // [!code focus:4]
+await testClient.dropTransaction({ // [!code focus:4]
   hash: '0xe58dceb6b20b03965bb678e27d141e151d7d4efc2334c2d6a49b9fac523f7364'
 })
 ```
@@ -28,7 +21,7 @@ await dropTransaction(testClient, { // [!code focus:4]
 The hash of the transaction.
 
 ```ts
-await dropTransaction(testClient, {
+await testClient.dropTransaction({
   hash: '0xe58dceb6b20b03965bb678e27d141e151d7d4efc2334c2d6a49b9fac523f7364', // [!code focus]
 })
 ```
diff --git a/site/docs/actions/test/getAutomine.md b/site/docs/actions/test/getAutomine.md
index 91be4d4fb5..70659a4b31 100644
--- a/site/docs/actions/test/getAutomine.md
+++ b/site/docs/actions/test/getAutomine.md
@@ -2,19 +2,12 @@
 
 Returns the automatic mining status of the node.
 
-## Import 
-
-```ts
-import { getAutomine } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { getAutomine } from 'viem/test'
 import { testClient } from '.'
  
-const isAutomining = await getAutomine(testClient) // [!code focus]
+const isAutomining = await testClient.getAutomine() // [!code focus]
 ```
 
 ## Returns
diff --git a/site/docs/actions/test/getTxpoolContent.md b/site/docs/actions/test/getTxpoolContent.md
index c6cb5e3fb8..0c2784d10c 100644
--- a/site/docs/actions/test/getTxpoolContent.md
+++ b/site/docs/actions/test/getTxpoolContent.md
@@ -2,19 +2,12 @@
 
 Returns the details of all transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only. [Read more](https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-txpool).
 
-## Import 
-
-```ts
-import { getTxpoolContent } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { getTxpoolContent } from 'viem/test'
 import { testClient } from '.'
  
-const content = await getTxpoolContent(testClient) // [!code focus]
+const content = await testClient.getTxpoolContent() // [!code focus]
 ```
 
 ## Returns
diff --git a/site/docs/actions/test/getTxpoolStatus.md b/site/docs/actions/test/getTxpoolStatus.md
index 9278dd5cde..a688717536 100644
--- a/site/docs/actions/test/getTxpoolStatus.md
+++ b/site/docs/actions/test/getTxpoolStatus.md
@@ -2,19 +2,12 @@
 
 Returns a summary of all the transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only. [Read more](https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-txpool).
 
-## Import 
-
-```ts
-import { getTxpoolStatus } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { getTxpoolStatus } from 'viem/test'
 import { testClient } from '.'
  
-const status = await getTxpoolStatus(testClient) // [!code focus]
+const status = await testClient.getTxpoolStatus() // [!code focus]
 ```
 
 ## Returns
diff --git a/site/docs/actions/test/impersonateAccount.md b/site/docs/actions/test/impersonateAccount.md
index 72676536fb..8a7c3e7825 100644
--- a/site/docs/actions/test/impersonateAccount.md
+++ b/site/docs/actions/test/impersonateAccount.md
@@ -2,19 +2,12 @@
 
 Impersonate an account or contract address. This lets you send transactions from that account even if you don't have access to its private key.
 
-## Import 
-
-```ts
-import { impersonateAccount } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { impersonateAccount } from 'viem/test'
 import { testClient } from '.'
  
-await impersonateAccount(testClient, { // [!code focus:4]
+await testClient.impersonateAccount({ // [!code focus:4]
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC'
 })
 ```
@@ -28,7 +21,7 @@ await impersonateAccount(testClient, { // [!code focus:4]
 The address of the target account.
 
 ```ts
-await impersonateAccount(testClient, {
+await testClient.impersonateAccount({
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC', // [!code focus]
 })
 ```
diff --git a/site/docs/actions/test/increaseTime.md b/site/docs/actions/test/increaseTime.md
index 76526c68b3..5fbfbf6f7f 100644
--- a/site/docs/actions/test/increaseTime.md
+++ b/site/docs/actions/test/increaseTime.md
@@ -2,19 +2,12 @@
 
 Jump forward in time by the given amount of time, in seconds.
 
-## Import 
-
-```ts
-import { increaseTime } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { increaseTime } from 'viem/test'
 import { testClient } from '.'
  
-await increaseTime(testClient, { // [!code focus:4]
+await testClient.increaseTime({ // [!code focus:4]
   seconds: 420
 })
 ```
@@ -28,7 +21,7 @@ await increaseTime(testClient, { // [!code focus:4]
 The amount of seconds to jump forward in time.
 
 ```ts
-await increaseTime(testClient, {
+await testClient.increaseTime({
   seconds: 20 // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/inspectTxpool.md b/site/docs/actions/test/inspectTxpool.md
index 0ee969100e..f04f0be713 100644
--- a/site/docs/actions/test/inspectTxpool.md
+++ b/site/docs/actions/test/inspectTxpool.md
@@ -2,19 +2,12 @@
 
 Returns a summary of all the transactions currently pending for inclusion in the next block(s), as well as the ones that are being scheduled for future execution only. [Read more](https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-txpool).
 
-## Import 
-
-```ts
-import { inspectTxpool } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { inspectTxpool } from 'viem/test'
 import { testClient } from '.'
  
-const data = await inspectTxpool(testClient) // [!code focus]
+const data = await testClient.inspectTxpool() // [!code focus]
 ```
 
 ## Returns
diff --git a/site/docs/actions/test/mine.md b/site/docs/actions/test/mine.md
index 17095f604e..1d6e96a470 100644
--- a/site/docs/actions/test/mine.md
+++ b/site/docs/actions/test/mine.md
@@ -2,19 +2,12 @@
 
 Mine a specified number of blocks.
 
-## Import 
-
-```ts
-import { mine } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { mine } from 'viem/test'
 import { testClient } from '.'
  
-await mine(testClient, { // [!code focus:4]
+await testClient.mine({ // [!code focus:4]
   blocks: 1
 })
 ```
@@ -28,7 +21,7 @@ await mine(testClient, { // [!code focus:4]
 Number of blocks to mine.
 
 ```ts
-await mine(testClient, {
+await testClient.mine({
   blocks: 1 // [!code focus:4]
 })
 ```
@@ -41,7 +34,7 @@ await mine(testClient, {
 Interval between each block in seconds.
 
 ```ts
-await mine(testClient, {
+await testClient.mine({
   blocks: 10,
   interval: 4 // [!code focus]
 })
diff --git a/site/docs/actions/test/removeBlockTimestampInterval.md b/site/docs/actions/test/removeBlockTimestampInterval.md
index 5a36459b92..4939a00540 100644
--- a/site/docs/actions/test/removeBlockTimestampInterval.md
+++ b/site/docs/actions/test/removeBlockTimestampInterval.md
@@ -2,17 +2,10 @@
 
 Removes `setBlockTimestampInterval` if it exists.
 
-## Import 
-
-```ts
-import { removeBlockTimestampInterval } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { removeBlockTimestampInterval } from 'viem/test'
 import { testClient } from '.'
  
-await removeBlockTimestampInterval(testClient) // [!code focus]
+await testClient.removeBlockTimestampInterval() // [!code focus]
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/reset.md b/site/docs/actions/test/reset.md
index 5708ef1e15..75b59e2323 100644
--- a/site/docs/actions/test/reset.md
+++ b/site/docs/actions/test/reset.md
@@ -2,19 +2,12 @@
 
 Resets the fork back to its original state.
 
-## Import 
-
-```ts
-import { reset } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { reset } from 'viem/test'
 import { testClient } from '.'
  
-await reset(testClient) // [!code focus]
+await testClient.reset() // [!code focus]
 ```
 
 ## Parameters
@@ -26,7 +19,7 @@ await reset(testClient) // [!code focus]
 Resets the fork to a given block number.
 
 ```ts
-await reset(testClient, {
+await testClient.reset({
   blockNumber: 69420n,
   jsonRpcUrl: 'https://mainnet.g.alchemy.com/v2' // [!code focus]
 })
@@ -39,7 +32,7 @@ await reset(testClient, {
 Resets the fork with a given JSON RPC URL.
 
 ```ts
-await reset(testClient, {
+await testClient.reset({
   blockNumber: 69420n, // [!code focus]
   jsonRpcUrl: 'https://mainnet.g.alchemy.com/v2'
 })
diff --git a/site/docs/actions/test/revert.md b/site/docs/actions/test/revert.md
index 4de384cd4f..6349935f25 100644
--- a/site/docs/actions/test/revert.md
+++ b/site/docs/actions/test/revert.md
@@ -2,19 +2,12 @@
 
 Revert the state of the blockchain at the current block.
 
-## Import 
-
-```ts
-import { revert } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { revert } from 'viem/test'
 import { testClient } from '.'
  
-await revert(testClient, { // [!code focus:99]
+await testClient.revert({ // [!code focus:99]
   id: '0x...'
 })
 ```
@@ -28,7 +21,7 @@ await revert(testClient, { // [!code focus:99]
 The snapshot ID.
 
 ```ts
-await revert(testClient, {
+await testClient.revert({
   id: '0x...' // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/sendUnsignedTransaction.md b/site/docs/actions/test/sendUnsignedTransaction.md
index 8f0708ef59..1926c47dfa 100644
--- a/site/docs/actions/test/sendUnsignedTransaction.md
+++ b/site/docs/actions/test/sendUnsignedTransaction.md
@@ -2,19 +2,12 @@
 
 Executes a transaction regardless of the signature.
 
-## Import 
-
-```ts
-import { sendUnsignedTransaction } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { sendUnsignedTransaction } from 'viem/test'
 import { testClient } from '.'
  
-const { hash } = await sendUnsignedTransaction(testClient, { // [!code focus:99]
+const { hash } = await testClient.sendUnsignedTransaction({ // [!code focus:99]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n
@@ -37,7 +30,7 @@ The transaction hash.
 The Transaction sender.
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n
@@ -51,7 +44,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 The transaction recipient or contract address.
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n,
@@ -66,7 +59,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 The access list.
 
 ```ts
-const data = await sendUnsignedTransaction(testClient, {
+const data = await testClient.sendUnsignedTransaction({
   accessList: [ // [!code focus:6]
     {
       address: '0x1',
@@ -85,7 +78,7 @@ const data = await sendUnsignedTransaction(testClient, {
 A contract hashed method call with encoded args.
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // [!code focus]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -100,7 +93,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   gasPrice: parseGwei('20'), // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -115,7 +108,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),  // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -130,7 +123,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),
   maxPriorityFeePerGas: parseGwei('2'), // [!code focus]
@@ -146,7 +139,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 Unique number identifying this transaction.
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n,
@@ -161,7 +154,7 @@ const hash = await sendUnsignedTransaction(testClient, {
 Value in wei sent with this transaction.
 
 ```ts
-const hash = await sendUnsignedTransaction(testClient, {
+const hash = await testClient.sendUnsignedTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: parseEther('1'), // [!code focus]
diff --git a/site/docs/actions/test/setAutomine.md b/site/docs/actions/test/setAutomine.md
index d51a88e7bd..4a13b78274 100644
--- a/site/docs/actions/test/setAutomine.md
+++ b/site/docs/actions/test/setAutomine.md
@@ -2,19 +2,12 @@
 
 Enables or disables the automatic mining of new blocks with each new transaction submitted to the network.
 
-## Import 
-
-```ts
-import { setAutomine } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setAutomine } from 'viem/test'
 import { testClient } from '.'
  
-await setAutomine(testClient, true) // [!code focus]
+await testClient.setAutomine(true) // [!code focus]
 ```
 
 ## Parameters
@@ -24,5 +17,5 @@ await setAutomine(testClient, true) // [!code focus]
 - **Type:** `boolean`
 
 ```ts
-await setAutomine(testClient, false) // [!code focus]
+await testClient.setAutomine(false) // [!code focus]
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setBalance.md b/site/docs/actions/test/setBalance.md
index 003aa3dddb..f57a595761 100644
--- a/site/docs/actions/test/setBalance.md
+++ b/site/docs/actions/test/setBalance.md
@@ -2,19 +2,13 @@
 
 Modifies the balance of an account.
 
-## Import 
-
-```ts
-import { setBalance } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setBalance, parseEther } from 'viem/test'
+import { parseEther } from 'viem'
 import { testClient } from '.'
  
-await setBalance(testClient, { // [!code focus:4]
+await testClient.setBalance({ // [!code focus:4]
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
   value: parseEther('1')
 })
@@ -29,7 +23,7 @@ await setBalance(testClient, { // [!code focus:4]
 The address of the target account.
 
 ```ts
-await setBalance(testClient, {
+await testClient.setBalance({
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC', // [!code focus]
   value: parseEther('1')
 })
@@ -42,7 +36,7 @@ await setBalance(testClient, {
 The value (in wei) to set.
 
 ```ts
-await setBalance(testClient, {
+await testClient.setBalance({
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
   value: 1000000000000000000n // [!code focus]
 })
diff --git a/site/docs/actions/test/setBlockGasLimit.md b/site/docs/actions/test/setBlockGasLimit.md
index 706f6d0f59..5d0625e312 100644
--- a/site/docs/actions/test/setBlockGasLimit.md
+++ b/site/docs/actions/test/setBlockGasLimit.md
@@ -2,19 +2,12 @@
 
 Sets the block's gas limit.
 
-## Import 
-
-```ts
-import { setBlockGasLimit } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setBlockGasLimit } from 'viem/test'
 import { testClient } from '.'
  
-await setBlockGasLimit(testClient, { // [!code focus:4]
+await testClient.setBlockGasLimit({ // [!code focus:4]
   gasLimit: 420_000n
 })
 ```
@@ -28,7 +21,7 @@ await setBlockGasLimit(testClient, { // [!code focus:4]
 The gas limit.
 
 ```ts
-await setBlockGasLimit(testClient, {
+await testClient.setBlockGasLimit({
   gasLimit: 420_000n // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setBlockTimestampInterval.md b/site/docs/actions/test/setBlockTimestampInterval.md
index 6c2c4f45c1..5a60021ed5 100644
--- a/site/docs/actions/test/setBlockTimestampInterval.md
+++ b/site/docs/actions/test/setBlockTimestampInterval.md
@@ -2,19 +2,12 @@
 
 Similar to [`increaseTime`](/docs/actions/test/increaseTime), but sets a block timestamp `interval`. The timestamp of future blocks will be computed as `lastBlock_timestamp` + `interval`.
 
-## Import 
-
-```ts
-import { setBlockTimestampInterval } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setBlockTimestampInterval } from 'viem/test'
 import { testClient } from '.'
  
-await setBlockTimestampInterval(testClient, { // [!code focus:4]
+await testClient.setBlockTimestampInterval({ // [!code focus:4]
   interval: 5
 })
 ```
@@ -26,7 +19,7 @@ await setBlockTimestampInterval(testClient, { // [!code focus:4]
 - **Type:** `number`
 
 ```ts
-await setBlockTimestampInterval(testClient, {
+await testClient.setBlockTimestampInterval({
   interval: 1 // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setCode.md b/site/docs/actions/test/setCode.md
index 70414bf277..e5b35436d1 100644
--- a/site/docs/actions/test/setCode.md
+++ b/site/docs/actions/test/setCode.md
@@ -2,19 +2,12 @@
 
 Modifies the bytecode stored at an account's address.
 
-## Import 
-
-```ts
-import { setCode } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setCode } from 'viem/test'
 import { testClient } from '.'
  
-await setCode(testClient, { // [!code focus:4]
+await testClient.setCode({ // [!code focus:4]
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79',
   bytecode: '0x60806040526000600355600019600955600c80546001600160a01b031916737a250d5630b4cf539739df...'
 })
@@ -29,7 +22,7 @@ await setCode(testClient, { // [!code focus:4]
 The account address.
 
 ```ts
-await setCode(testClient, {
+await testClient.setCode({
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79', // [!code focus]
   bytecode: '0x60806040526000600355600019600955600c80546001600160a01b031916737a250d5630b4cf539739df...'
 })
@@ -42,7 +35,7 @@ await setCode(testClient, {
 The stored bytecode.
 
 ```ts
-await setCode(testClient, {
+await testClient.setCode({
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79',
   bytecode: '0x60806040526000600355600019600955600c80546001600160a01b031916737a250d5630b4cf539739df...' // [!code focus]
 })
diff --git a/site/docs/actions/test/setCoinbase.md b/site/docs/actions/test/setCoinbase.md
index edccb7416c..59f53e6f78 100644
--- a/site/docs/actions/test/setCoinbase.md
+++ b/site/docs/actions/test/setCoinbase.md
@@ -2,19 +2,12 @@
 
 Sets the coinbase address to be used in new blocks.
 
-## Import 
-
-```ts
-import { setCoinbase } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setCoinbase } from 'viem/test'
 import { testClient } from '.'
  
-await setCoinbase(testClient, { // [!code focus:99]
+await testClient.setCoinbase({ // [!code focus:99]
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79',
 })
 ```
@@ -28,7 +21,7 @@ await setCoinbase(testClient, { // [!code focus:99]
 The coinbase address.
 
 ```ts
-await setCoinbase(testClient, {
+await testClient.setCoinbase({
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79', // [!code focus]
 })
 ```
diff --git a/site/docs/actions/test/setIntervalMining.md b/site/docs/actions/test/setIntervalMining.md
index 66884f0c37..788810f7e4 100644
--- a/site/docs/actions/test/setIntervalMining.md
+++ b/site/docs/actions/test/setIntervalMining.md
@@ -2,19 +2,12 @@
 
 Sets the automatic mining interval (in seconds) of blocks. Setting the interval to `0` will disable automatic mining.
 
-## Import 
-
-```ts
-import { setIntervalMining } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setIntervalMining } from 'viem/test'
 import { testClient } from '.'
  
-await setIntervalMining(testClient, { // [!code focus:4]
+await testClient.setIntervalMining({ // [!code focus:4]
   interval: 5
 })
 ```
@@ -28,7 +21,7 @@ await setIntervalMining(testClient, { // [!code focus:4]
 The mining interval (in seconds). Setting the interval to `0` will disable automatic mining.
 
 ```ts
-await setIntervalMining(testClient, {
+await testClient.setIntervalMining({
   interval: 5 // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setLoggingEnabled.md b/site/docs/actions/test/setLoggingEnabled.md
index 854d88d064..5e7c1924c8 100644
--- a/site/docs/actions/test/setLoggingEnabled.md
+++ b/site/docs/actions/test/setLoggingEnabled.md
@@ -2,17 +2,10 @@
 
 Enable or disable logging on the test node network.
 
-## Import 
-
-```ts
-import { setLoggingEnabled } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setLoggingEnabled } from 'viem/test'
 import { testClient } from '.'
  
-await setLoggingEnabled(testClient, true) // [!code focus]
+await testClient.setLoggingEnabled(true) // [!code focus]
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setMinGasPrice.md b/site/docs/actions/test/setMinGasPrice.md
index 983882703d..1af7802181 100644
--- a/site/docs/actions/test/setMinGasPrice.md
+++ b/site/docs/actions/test/setMinGasPrice.md
@@ -4,19 +4,13 @@ Change the minimum gas price accepted by the network (in wei).
 
 > Note: `setMinGasPrice` can only be used on clients that do not have EIP-1559 enabled.
 
-## Import 
-
-```ts
-import { setMinGasPrice } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setMinGasPrice, parseGwei } from 'viem/test'
+import { parseGwei } from 'viem'
 import { testClient } from '.'
  
-await setMinGasPrice(testClient, { // [!code focus:99]
+await testClient.setMinGasPrice({ // [!code focus:99]
   gasPrice: parseGwei('20'),
 })
 ```
@@ -30,7 +24,7 @@ await setMinGasPrice(testClient, { // [!code focus:99]
 The gas price (in wei).
 
 ```ts
-await setMinGasPrice(testClient, {
+await testClient.setMinGasPrice({
   gasPrice: parseGwei('20'), // [!code focus]
 })
 ```
diff --git a/site/docs/actions/test/setNextBlockBaseFeePerGas.md b/site/docs/actions/test/setNextBlockBaseFeePerGas.md
index f5687ae1ac..5df876e570 100644
--- a/site/docs/actions/test/setNextBlockBaseFeePerGas.md
+++ b/site/docs/actions/test/setNextBlockBaseFeePerGas.md
@@ -2,19 +2,12 @@
 
 Sets the next block's base fee per gas.
 
-## Import 
-
-```ts
-import { setNextBlockBaseFeePerGas } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setNextBlockBaseFeePerGas } from 'viem/test'
 import { testClient } from '.'
  
-await setNextBlockBaseFeePerGas(testClient, { // [!code focus:4]
+await testClient.setNextBlockBaseFeePerGas({ // [!code focus:4]
   baseFeePerGas: parseGwei('20')
 })
 ```
@@ -28,7 +21,7 @@ await setNextBlockBaseFeePerGas(testClient, { // [!code focus:4]
 Base fee per gas.
 
 ```ts
-await setNextBlockBaseFeePerGas(testClient, {
+await testClient.setNextBlockBaseFeePerGas({
   baseFeePerGas: parseGwei('30') // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setNextBlockTimestamp.md b/site/docs/actions/test/setNextBlockTimestamp.md
index 345d367d76..4c60bc94f3 100644
--- a/site/docs/actions/test/setNextBlockTimestamp.md
+++ b/site/docs/actions/test/setNextBlockTimestamp.md
@@ -2,19 +2,12 @@
 
 Sets the next block's timestamp.
 
-## Import 
-
-```ts
-import { setNextBlockTimestamp } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setNextBlockTimestamp } from 'viem/test'
 import { testClient } from '.'
  
-await setNextBlockTimestamp(testClient, { // [!code focus:4]
+await testClient.setNextBlockTimestamp({ // [!code focus:4]
   timestamp: 1671744314
 })
 ```
@@ -26,7 +19,7 @@ await setNextBlockTimestamp(testClient, { // [!code focus:4]
 - **Type:** `number`
 
 ```ts
-await setNextBlockTimestamp(testClient, {
+await testClient.setNextBlockTimestamp({
   timestamp: 1671744314 // [!code focus]
 })
 ```
diff --git a/site/docs/actions/test/setNonce.md b/site/docs/actions/test/setNonce.md
index abbf2b6990..1121c7b7a2 100644
--- a/site/docs/actions/test/setNonce.md
+++ b/site/docs/actions/test/setNonce.md
@@ -2,19 +2,12 @@
 
 Modifies (overrides) the nonce of an account.
 
-## Import 
-
-```ts
-import { setNonce } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setNonce } from 'viem/test'
 import { testClient } from '.'
  
-await setNonce(testClient, { // [!code focus:4]
+await testClient.setNonce({ // [!code focus:4]
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
   nonce: 420
 })
@@ -29,7 +22,7 @@ await setNonce(testClient, { // [!code focus:4]
 The address of the target account.
 
 ```ts
-await setNonce(testClient, {
+await testClient.setNonce({
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC', // [!code focus]
   nonce: 420
 })
@@ -42,7 +35,7 @@ await setNonce(testClient, {
 The nonce.
 
 ```ts
-await setNonce(testClient, {
+await testClient.setNonce({
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
   nonce: 420 // [!code focus]
 })
diff --git a/site/docs/actions/test/setRpcUrl.md b/site/docs/actions/test/setRpcUrl.md
index b94a9da3ef..bec2e0d372 100644
--- a/site/docs/actions/test/setRpcUrl.md
+++ b/site/docs/actions/test/setRpcUrl.md
@@ -2,17 +2,10 @@
 
 Sets the backend RPC URL.
 
-## Import 
-
-```ts
-import { setRpcUrl } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setRpcUrl } from 'viem/test'
 import { testClient } from '.'
  
-await setRpcUrl(testClient, 'https://eth-mainnet.alchemyapi.io/v2') // [!code focus]
+await testClient.setRpcUrl('https://eth-mainnet.alchemyapi.io/v2') // [!code focus]
 ```
\ No newline at end of file
diff --git a/site/docs/actions/test/setStorageAt.md b/site/docs/actions/test/setStorageAt.md
index dc65e3b531..67d8cc5625 100644
--- a/site/docs/actions/test/setStorageAt.md
+++ b/site/docs/actions/test/setStorageAt.md
@@ -2,19 +2,12 @@
 
 Writes to a slot of an account's storage.
 
-## Import 
-
-```ts
-import { setStorageAt } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { setStorageAt } from 'viem/test'
 import { testClient } from '.'
  
-await setStorageAt(testClient, { // [!code focus:99]
+await testClient.setStorageAt({ // [!code focus:99]
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79',
   index: 2,
   value: '0x0000000000000000000000000000000000000000000000000000000000000069'
@@ -30,7 +23,7 @@ await setStorageAt(testClient, { // [!code focus:99]
 The account address.
 
 ```ts
-await setStorageAt(testClient, {
+await testClient.setStorageAt({
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79', // [!code focus]
   index: 2,
   value: '0x0000000000000000000000000000000000000000000000000000000000000069'
@@ -44,7 +37,7 @@ await setStorageAt(testClient, {
 The storage slot (index). Can either be a number or hash value.
 
 ```ts
-await setStorageAt(testClient, {
+await testClient.setStorageAt({
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79',
   index: '0xa6eef7e35abe7026729641147f7915573c7e97b47efa546f5f6e3230263bcb49', // [!code focus]
   value: '0x0000000000000000000000000000000000000000000000000000000000000069'
@@ -58,7 +51,7 @@ await setStorageAt(testClient, {
 The value to store as a 32 byte hex string.
 
 ```ts
-await setStorageAt(testClient, {
+await testClient.setStorageAt({
   address: '0xe846c6fcf817734ca4527b28ccb4aea2b6663c79',
   index: 2,
   value: '0x0000000000000000000000000000000000000000000000000000000000000069' // [!code focus]
diff --git a/site/docs/actions/test/snapshot.md b/site/docs/actions/test/snapshot.md
index a43855d48a..8b2d83c1ff 100644
--- a/site/docs/actions/test/snapshot.md
+++ b/site/docs/actions/test/snapshot.md
@@ -2,19 +2,12 @@
 
 Snapshot the state of the blockchain at the current block.
 
-## Import 
-
-```ts
-import { snapshot } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { snapshot } from 'viem/test'
 import { testClient } from '.'
  
-const id = await snapshot(testClient) // [!code focus]
+const id = await testClient.snapshot() // [!code focus]
 ```
 
 ## Returns
diff --git a/site/docs/actions/test/stopImpersonatingAccount.md b/site/docs/actions/test/stopImpersonatingAccount.md
index f181954eb7..a73392c2ac 100644
--- a/site/docs/actions/test/stopImpersonatingAccount.md
+++ b/site/docs/actions/test/stopImpersonatingAccount.md
@@ -2,19 +2,12 @@
 
 Stop impersonating an account after having previously used [`impersonateAccount`](/docs/actions/test/impersonateAccount).
 
-## Import 
-
-```ts
-import { stopImpersonatingAccount } from 'viem/test'
-```
-
 ## Usage
 
 ```ts
-import { stopImpersonatingAccount } from 'viem/test'
 import { testClient } from '.'
  
-await stopImpersonatingAccount(testClient, { // [!code focus:4]
+await testClient.stopImpersonatingAccount({ // [!code focus:4]
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC'
 })
 ```
@@ -28,7 +21,7 @@ await stopImpersonatingAccount(testClient, { // [!code focus:4]
 The address of the target account.
 
 ```ts
-await stopImpersonatingAccount(testClient, {
+await testClient.stopImpersonatingAccount({
   address: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC', // [!code focus]
 })
 ```
diff --git a/site/docs/actions/wallet/addChain.md b/site/docs/actions/wallet/addChain.md
index 4f48c679f2..553ab86827 100644
--- a/site/docs/actions/wallet/addChain.md
+++ b/site/docs/actions/wallet/addChain.md
@@ -5,17 +5,10 @@ Adds an EVM chain to the wallet.
 ## Usage
 
 ```ts
-import { addChain } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { addChain } from 'viem/wallet'
 import { avalanche } from 'viem/chains'
 import { walletClient } from '.'
  
-await addChain(walletClient, avalanche) // [!code focus]
+await walletClient.addChain(avalanche) // [!code focus]
 ```
 
 ## Parameters
diff --git a/site/docs/actions/wallet/getAccounts.md b/site/docs/actions/wallet/getAccounts.md
index b75bb891a0..984e2bf798 100644
--- a/site/docs/actions/wallet/getAccounts.md
+++ b/site/docs/actions/wallet/getAccounts.md
@@ -5,16 +5,9 @@ Returns a list of addresses owned by the wallet or client.
 ## Usage
 
 ```ts
-import { getAccounts } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { getAccounts } from 'viem/wallet'
 import { walletClient } from '.'
  
-const accounts = await getAccounts(walletClient) // [!code focus:99]
+const accounts = await walletClient.getAccounts() // [!code focus:99]
 // ['0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC']
 ```
 
diff --git a/site/docs/actions/wallet/getPermissions.md b/site/docs/actions/wallet/getPermissions.md
index c86933eae0..5c09dea5b7 100644
--- a/site/docs/actions/wallet/getPermissions.md
+++ b/site/docs/actions/wallet/getPermissions.md
@@ -5,16 +5,9 @@ Gets the wallets current permissions.
 ## Usage
 
 ```ts
-import { getPermissions } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { getPermissions } from 'viem/wallet'
 import { walletClient } from '.'
  
-const permissions = await getPermissions(walletClient) // [!code focus:99]
+const permissions = await walletClient.getPermissions() // [!code focus:99]
 ```
 
 ## Returns
diff --git a/site/docs/actions/wallet/requestAccounts.md b/site/docs/actions/wallet/requestAccounts.md
index 6e56e0f6be..3eeb55ab92 100644
--- a/site/docs/actions/wallet/requestAccounts.md
+++ b/site/docs/actions/wallet/requestAccounts.md
@@ -9,16 +9,9 @@ This API can be useful for dapps that need to access the user's accounts in orde
 ## Usage
 
 ```ts
-import { requestAccounts } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { requestAccounts } from 'viem/wallet'
 import { walletClient } from '.'
  
-const accounts = await requestAccounts(walletClient) // [!code focus:99]
+const accounts = await walletClient.requestAccounts() // [!code focus:99]
 // ['0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC']
 ```
 
diff --git a/site/docs/actions/wallet/requestPermissions.md b/site/docs/actions/wallet/requestPermissions.md
index 3eb91ba581..bf17bd6393 100644
--- a/site/docs/actions/wallet/requestPermissions.md
+++ b/site/docs/actions/wallet/requestPermissions.md
@@ -5,16 +5,9 @@ Requests permissions for a wallet.
 ## Usage
 
 ```ts
-import { requestPermissions } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { requestPermissions } from 'viem/wallet'
 import { walletClient } from '.'
  
-const permissions = await requestPermissions(walletClient, { eth_accounts: {} }) // [!code focus:99]
+const permissions = await walletClient.requestPermissions({ eth_accounts: {} }) // [!code focus:99]
 ```
 
 ## Returns
diff --git a/site/docs/actions/wallet/sendTransaction.md b/site/docs/actions/wallet/sendTransaction.md
index f7baa9f7d5..d30f66249d 100644
--- a/site/docs/actions/wallet/sendTransaction.md
+++ b/site/docs/actions/wallet/sendTransaction.md
@@ -5,16 +5,9 @@ Creates, signs, and sends a new transaction to the network.
 ## Usage
 
 ```ts
-import { sendTransaction } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { sendTransaction } from 'viem/wallet'
 import { walletClient } from '.'
  
-const hash = await sendTransaction(walletClient, { // [!code focus:99]
+const hash = await walletClient.sendTransaction({ // [!code focus:99]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n
@@ -37,7 +30,7 @@ The [Transaction Hash](/docs/glossary/terms#TODO).
 The Transaction sender.
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n
@@ -51,7 +44,7 @@ const hash = await sendTransaction(walletClient, {
 The transaction recipient or contract address.
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n,
@@ -66,7 +59,7 @@ const hash = await sendTransaction(walletClient, {
 The access list.
 
 ```ts
-const data = await sendTransaction(publicClient, {
+const data = await publicClient.sendTransaction({
   accessList: [ // [!code focus:6]
     {
       address: '0x1',
@@ -85,7 +78,7 @@ const data = await sendTransaction(publicClient, {
 A contract hashed method call with encoded args.
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   data: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // [!code focus]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -100,7 +93,7 @@ const hash = await sendTransaction(walletClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   gasPrice: parseGwei('20'), // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -115,7 +108,7 @@ const hash = await sendTransaction(walletClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),  // [!code focus]
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
@@ -130,7 +123,7 @@ const hash = await sendTransaction(walletClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   maxFeePerGas: parseGwei('20'),
   maxPriorityFeePerGas: parseGwei('2'), // [!code focus]
@@ -146,7 +139,7 @@ const hash = await sendTransaction(walletClient, {
 Unique number identifying this transaction.
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: 1000000000000000000n,
@@ -161,7 +154,7 @@ const hash = await sendTransaction(walletClient, {
 Value in wei sent with this transaction.
 
 ```ts
-const hash = await sendTransaction(walletClient, {
+const hash = await walletClient.sendTransaction({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
   value: parseEther('1'), // [!code focus]
diff --git a/site/docs/actions/wallet/signMessage.md b/site/docs/actions/wallet/signMessage.md
index 285c87aa51..d03f5d471f 100644
--- a/site/docs/actions/wallet/signMessage.md
+++ b/site/docs/actions/wallet/signMessage.md
@@ -7,16 +7,9 @@ Takes a byte array or hex value as the `data` argument.
 ## Usage
 
 ```ts
-import { signMessage } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { signMessage } from 'viem/wallet'
 import { walletClient } from '.'
  
-const message = await signMessage(walletClient, { // [!code focus:99]
+const message = await walletClient.signMessage({ // [!code focus:99]
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   data: '0xdeadbeaf',
 })
@@ -38,7 +31,7 @@ The signed message.
 Address to use for signing.
 
 ```ts
-const message = await signMessage(walletClient, {
+const message = await walletClient.signMessage({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', // [!code focus:1]
   data: '0xdeadbeaf',
 })
@@ -51,7 +44,7 @@ const message = await signMessage(walletClient, {
 Data to sign.
 
 ```ts
-const message = await signMessage(walletClient, {
+const message = await walletClient.signMessage({
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
   data: '0xdeadbeaf', // [!code focus:1]
 })
diff --git a/site/docs/actions/wallet/switchChain.md b/site/docs/actions/wallet/switchChain.md
index 8fabaa2dcb..cb036918a4 100644
--- a/site/docs/actions/wallet/switchChain.md
+++ b/site/docs/actions/wallet/switchChain.md
@@ -5,17 +5,10 @@ Switch the target chain in a wallet.
 ## Usage
 
 ```ts
-import { switchChain } from 'viem/wallet'
-```
-
-## Usage
-
-```ts
-import { switchChain } from 'viem/wallet'
 import { avalanche } from 'viem/chains'
 import { walletClient } from '.'
  
-await switchChain(walletClient, { id: avalanche.id }) // [!code focus]
+await walletClient.switchChain({ id: avalanche.id }) // [!code focus]
 ```
 
 ## Parameters
diff --git a/site/docs/actions/wallet/watchAsset.md b/site/docs/actions/wallet/watchAsset.md
index f2f5062f14..867bd0e748 100644
--- a/site/docs/actions/wallet/watchAsset.md
+++ b/site/docs/actions/wallet/watchAsset.md
@@ -5,16 +5,9 @@ Requests that the user tracks the token in their wallet. Returns a boolean indic
 ## Usage
 
 ```ts
-import { watchAsset } from 'viem/wallet';
-```
-
-## Usage
-
-```ts
-import { watchAsset } from 'viem/wallet';
 import { walletClient } from '.';
 
-await watchAsset(walletClient, {
+await walletClient.watchAsset({
   // [!code focus:99]
   type: 'ERC20',
   options: {
@@ -40,7 +33,7 @@ Boolean indicating if the token was successfully added.
 Token type.
 
 ```ts
-await watchAsset(walletClient, {
+await walletClient.watchAsset({
   type: 'ERC20', // [!code focus]
   options: {
     address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -57,7 +50,7 @@ await watchAsset(walletClient, {
 The address of the token contract.
 
 ```ts
-await watchAsset(walletClient, {
+await walletClient.watchAsset({
   type: 'ERC20',
   options: {
     address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', // [!code focus]
@@ -74,7 +67,7 @@ await watchAsset(walletClient, {
 The number of token decimals.
 
 ```ts
-await watchAsset(walletClient, {
+await walletClient.watchAsset({
   type: 'ERC20',
   options: {
     address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -91,7 +84,7 @@ await watchAsset(walletClient, {
 A ticker symbol or shorthand, up to 11 characters.
 
 ```ts
-await watchAsset(walletClient, {
+await walletClient.watchAsset({
   type: 'ERC20',
   options: {
     address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -108,7 +101,7 @@ await watchAsset(walletClient, {
 A string url of the token logo.
 
 ```ts
-await watchAsset(walletClient, {
+await walletClient.watchAsset({
   type: 'ERC20',
   options: {
     address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
diff --git a/site/docs/contract/createContractEventFilter.md b/site/docs/contract/createContractEventFilter.md
index 6b40206537..0e5182cfe7 100644
--- a/site/docs/contract/createContractEventFilter.md
+++ b/site/docs/contract/createContractEventFilter.md
@@ -2,12 +2,6 @@
 
 Creates a Filter to retrieve event logs that can be used with [`getFilterChanges`](/docs/actions/public/getFilterChanges) or [`getFilterLogs`](/docs/actions/public/getFilterChanges).
 
-## Import
-
-```ts
-import { createContractEventFilter } from 'viem/public'
-```
-
 ## Usage
 
 By default, an Event Filter with an ABI (`abi`) will retrieve events defined on the ABI.
@@ -15,11 +9,10 @@ By default, an Event Filter with an ABI (`abi`) will retrieve events defined on
 ::: code-group
 
 ```ts [example.ts]
-import { createContractEventFilter } from 'viem/public'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi
 })
 /**
@@ -76,7 +69,7 @@ You can also scope a Filter to a set of given attributes (listed below).
 A Filter can be scoped to an **address**:
 
 ```ts 
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2' // [!code focus]
 })
@@ -87,7 +80,7 @@ const filter = await createContractEventFilter(publicClient, {
 A Filter can be scoped to an **event**:
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2',
   eventName: 'Transfer' // [!code focus]
@@ -99,7 +92,7 @@ const filter = await createContractEventFilter(publicClient, {
 A Filter can be scoped to given **_indexed_ arguments**:
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2',
   eventName: 'Transfer',
@@ -115,7 +108,7 @@ Only indexed arguments in `event` are candidates for `args`.
 A Filter Argument can also be an array to indicate that other values can exist in the position:
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2',
   eventName: 'Transfer',
@@ -135,7 +128,7 @@ const filter = await createContractEventFilter(publicClient, {
 A Filter can be scoped to a **block range**:
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2',
   eventName: 'Transfer',
@@ -157,7 +150,7 @@ const filter = await createContractEventFilter(publicClient, {
 The contract's ABI.
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi, // [!code focus]
 })
 ```
@@ -169,7 +162,7 @@ const filter = await createContractEventFilter(publicClient, {
 The contract address or a list of addresses from which Logs should originate. If no addresses are provided, then it will query all events matching the event signatures on the ABI.
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   address: '0xfba3912ca04dd458c843e2ee08967fc04f3579c2' // [!code focus]
 })
@@ -182,7 +175,7 @@ const filter = await createContractEventFilter(publicClient, {
 The event name.
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   eventName: 'Transfer' // [!code focus]
 })
@@ -195,7 +188,7 @@ const filter = await createContractEventFilter(publicClient, {
 A list of _indexed_ event arguments.
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   eventName: 'Transfer',
   args: { // [!code focus:4]
@@ -212,7 +205,7 @@ const filter = await createContractEventFilter(publicClient, {
 Block to start querying/listening from.
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   fromBlock: 69420n // [!code focus]
 })
@@ -225,7 +218,7 @@ const filter = await createContractEventFilter(publicClient, {
 Block to query/listen until.
 
 ```ts
-const filter = await createContractEventFilter(publicClient, {
+const filter = await publicClient.createContractEventFilter({
   abi: wagmiAbi,
   fromBlock: 70120n // [!code focus]
 })
diff --git a/site/docs/contract/deployContract.md b/site/docs/contract/deployContract.md
index c8bf0dfa9b..1a20123d0c 100644
--- a/site/docs/contract/deployContract.md
+++ b/site/docs/contract/deployContract.md
@@ -2,22 +2,15 @@
 
 Deploys a contract to the network, given bytecode & constructor arguments.
 
-## Install
-
-```ts
-import { deployContract } from 'viem/contract'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { deployContract } from 'viem/contract'
 import { wagmiAbi } from './abi'
 import { walletClient } from './client'
 
-await deployContract(walletClient, {
+await walletClient.deployContract({
   abi,
   bytecode: '0x608060405260405161083e38038061083e833981016040819052610...',
 })
@@ -56,7 +49,7 @@ import { deployContract } from 'viem/contract'
 import { wagmiAbi } from './abi'
 import { walletClient } from './client'
 
-await deployContract(walletClient, {
+await walletClient.deployContract({
   abi,
   args: [69420],
   bytecode: '0x608060405260405161083e38038061083e833981016040819052610...',
@@ -96,7 +89,7 @@ export const walletClient = createWalletClient({
 The contract's ABI.
 
 ```ts
-await deployContract(walletClient, {
+await walletClient.deployContract({
   abi: wagmiAbi, // [!code focus]
   bytecode: '0x608060405260405161083e38038061083e833981016040819052610...',
 })
@@ -109,7 +102,7 @@ await deployContract(walletClient, {
 The contract's bytecode.
 
 ```ts
-await deployContract(walletClient, {
+await walletClient.deployContract({
   abi: wagmiAbi,
   bytecode: '0x608060405260405161083e38038061083e833981016040819052610...', // [!code focus]
 })
@@ -122,7 +115,7 @@ await deployContract(walletClient, {
 Constructor arguments to call upon deployment.
 
 ```ts
-await deployContract(walletClient, {
+await walletClient.deployContract({
   abi: wagmiAbi,
   bytecode: '0x608060405260405161083e38038061083e833981016040819052610...',
   args: [69] // [!code focus]
diff --git a/site/docs/contract/estimateContractGas.md b/site/docs/contract/estimateContractGas.md
index 2dd7a7880e..0170956ddb 100644
--- a/site/docs/contract/estimateContractGas.md
+++ b/site/docs/contract/estimateContractGas.md
@@ -2,12 +2,6 @@
 
 Estimates the gas required to successfully execute a contract write function call. 
 
-## Import
-
-```ts
-import { estimateContractGas } from 'viem/contract'
-```
-
 ## Usage
 
 Below is a very basic example of how to estimate gas (with no arguments).
@@ -17,11 +11,10 @@ The `mint` function accepts no arguments, and returns a token ID.
 ::: code-group
 
 ```ts [example.ts]
-import { estimateGas } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const gas = await estimateContractGas(publicClient, {
+const gas = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -67,11 +60,10 @@ For example, the `mint` function name below requires a **tokenId** argument, and
 ::: code-group
 
 ```ts {9} [example.ts]
-import { estimateGas } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const gas = await estimateGas(publicClient, {
+const gas = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -122,7 +114,7 @@ The gas estimate.
 The contract address.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
   abi: wagmiAbi,
   functionName: 'mint',
@@ -137,7 +129,7 @@ const { result } = await estimateGas(publicClient, {
 The contract's ABI.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi, // [!code focus]
   functionName: 'mint',
@@ -152,7 +144,7 @@ const { result } = await estimateGas(publicClient, {
 A function to extract from the ABI.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint', // [!code focus]
@@ -167,7 +159,7 @@ const { result } = await estimateGas(publicClient, {
 The sender of the call.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -182,7 +174,7 @@ const { result } = await estimateGas(publicClient, {
 The access list.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -203,7 +195,7 @@ const { result } = await estimateGas(publicClient, {
 Arguments to pass to function call.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0x1dfe7ca09e99d10835bf73044a23b73fc20623df',
   abi: wagmiAbi,
   functionName: 'balanceOf',
@@ -219,7 +211,7 @@ const { result } = await estimateGas(publicClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -236,7 +228,7 @@ const { result } = await estimateGas(publicClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -253,7 +245,7 @@ const { result } = await estimateGas(publicClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -271,7 +263,7 @@ const { result } = await estimateGas(publicClient, {
 Unique number identifying this transaction.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -288,7 +280,7 @@ const { result } = await estimateGas(publicClient, {
 Value in wei sent with this transaction.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -305,7 +297,7 @@ const { result } = await estimateGas(publicClient, {
 The block number to perform the read against.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -322,7 +314,7 @@ const { result } = await estimateGas(publicClient, {
 The block tag to perform the read against.
 
 ```ts
-const { result } = await estimateGas(publicClient, {
+const { result } = await publicClient.estimateContractGas({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
diff --git a/site/docs/contract/getBytecode.md b/site/docs/contract/getBytecode.md
index c84f70ab00..a3e0a172f7 100644
--- a/site/docs/contract/getBytecode.md
+++ b/site/docs/contract/getBytecode.md
@@ -2,21 +2,14 @@
 
 Retrieves the bytecode at an address.
 
-## Install
-
-```ts
-import { getBytecode } from 'viem/contract'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { getBytecode } from 'viem/contract'
 import { publicClient } from './client'
 
-const bytecode = await getBytecode(publicClient, {
+const bytecode = await publicClient.getBytecode({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
 })
 ```
@@ -48,7 +41,7 @@ The contract's bytecode.
 The contract address.
 
 ```ts
-const bytecode = await getBytecode(publicClient, {
+const bytecode = await publicClient.getBytecode({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/contract/getStorageAt.md b/site/docs/contract/getStorageAt.md
index 3295d3f2b8..fced9d59fc 100644
--- a/site/docs/contract/getStorageAt.md
+++ b/site/docs/contract/getStorageAt.md
@@ -2,23 +2,16 @@
 
 Returns the value from a storage slot at a given address.
 
-## Import
-
-```ts
-import { getStorageAt } from 'viem/contract'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { getStorageAt } from 'viem/contract'
-import { toHex } from 'viem/utils'
+import { toHex } from 'viem'
 import { wagmiAbi } from './abi'
 import { publicClient } from './client'
 
-const data = await getStorageAt(publicClient, {
+const data = await publicClient.getStorageAt({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   slot: toHex(0)
 })
@@ -51,7 +44,7 @@ The value of the storage slot.
 The contract address.
 
 ```ts
-const data = await getStorageAt(publicClient, {
+const data = await publicClient.getStorageAt({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
   slot: toHex(0)
 })
@@ -64,7 +57,7 @@ const data = await getStorageAt(publicClient, {
 The storage position (as a hex encoded value).
 
 ```ts
-const data = await getStorageAt(publicClient, {
+const data = await publicClient.getStorageAt({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   slot: toHex(0) // [!code focus]
 })
diff --git a/site/docs/contract/multicall.md b/site/docs/contract/multicall.md
index 90503e064f..7a80db6509 100644
--- a/site/docs/contract/multicall.md
+++ b/site/docs/contract/multicall.md
@@ -2,18 +2,11 @@
 
 Similar to [`readContract`](/docs/contract/readContract), but batches up & contracts multiple functions on a contract in a single RPC call via the [`multicall3` contract](https://github.com/mds1/multicall). 
 
-## Import
-
-```ts
-import { multicall } from 'viem/contract'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { multicall } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
@@ -22,7 +15,7 @@ const wagmiContract = {
   abi: wagmiAbi
 } as const
 
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       ...wagmiContract,
@@ -103,7 +96,7 @@ An array of results with accompanying status.
 The contract address.
 
 ```ts
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
@@ -122,7 +115,7 @@ const results = await multicall(publicClient, {
 The contract ABI.
 
 ```ts
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
@@ -141,7 +134,7 @@ const results = await multicall(publicClient, {
 The function name to call.
 
 ```ts
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
@@ -160,7 +153,7 @@ const results = await multicall(publicClient, {
 Arguments to pass to function call.
 
 ```ts
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
@@ -181,7 +174,7 @@ const results = await multicall(publicClient, {
 Whether or not the `multicall` function should throw if a call reverts. If set to `true` (default), and a call reverts, then `multicall` will fail silently and its error will be logged in the `results` array.
 
 ```ts
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
@@ -201,7 +194,7 @@ const results = await multicall(publicClient, {
 Optional sender override.
 
 ```ts
-const results = await multicall(publicClient, {
+const results = await publicClient.multicall({
   contracts: [
     {
       address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
diff --git a/site/docs/contract/readContract.md b/site/docs/contract/readContract.md
index 5644d2fe0a..5268fe3718 100644
--- a/site/docs/contract/readContract.md
+++ b/site/docs/contract/readContract.md
@@ -6,12 +6,6 @@ A "read-only" function (constant function) on a Solidity contract is denoted by
 
 Internally, `readContract` uses a [Public Client](/docs/clients/public) to call the [`call` action](/docs/actions/public/call) with [ABI-encoded `data`](/docs/contract/encodeFunctionData).
 
-## Import
-
-```ts
-import { readContract } from 'viem/contract'
-```
-
 ## Usage
 
 Below is a very basic example of how to call a read-only function on a contract (with no arguments).
@@ -19,11 +13,10 @@ Below is a very basic example of how to call a read-only function on a contract
 ::: code-group
 
 ```ts [example.ts]
-import { readContract } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'totalSupply',
@@ -72,7 +65,7 @@ import { readContract } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'balanceOf',
@@ -119,7 +112,7 @@ The response from the contract. Type is inferred.
 The contract address.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
   abi: wagmiAbi,
   functionName: 'totalSupply',
@@ -133,7 +126,7 @@ const data = await readContract(publicClient, {
 The contract's ABI.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi, // [!code focus]
   functionName: 'totalSupply',
@@ -147,7 +140,7 @@ const data = await readContract(publicClient, {
 A function to extract from the ABI.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'totalSupply', // [!code focus]
@@ -161,7 +154,7 @@ const data = await readContract(publicClient, {
 Arguments to pass to function call.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0x1dfe7ca09e99d10835bf73044a23b73fc20623df',
   abi: wagmiAbi,
   functionName: 'balanceOf',
@@ -176,7 +169,7 @@ const data = await readContract(publicClient, {
 Optional sender override.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'totalSupply',
@@ -191,7 +184,7 @@ const data = await readContract(publicClient, {
 The block number to perform the read against.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'totalSupply',
@@ -207,7 +200,7 @@ const data = await readContract(publicClient, {
 The block tag to perform the read against.
 
 ```ts
-const data = await readContract(publicClient, {
+const data = await publicClient.readContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'totalSupply',
diff --git a/site/docs/contract/simulateContract.md b/site/docs/contract/simulateContract.md
index 01926fad9f..a47806fa98 100644
--- a/site/docs/contract/simulateContract.md
+++ b/site/docs/contract/simulateContract.md
@@ -6,12 +6,6 @@ This function does not require gas to execute and _**does not**_ change the stat
 
 Internally, `simulateContract` uses a [Public Client](/docs/clients/public) to call the [`call` action](/docs/actions/public/call) with [ABI-encoded `data`](/docs/contract/encodeFunctionData).
 
-## Import
-
-```ts
-import { simulateContract } from 'viem/contract'
-```
-
 ## Usage
 
 Below is a very basic example of how to simulate a write function on a contract (with no arguments).
@@ -21,11 +15,10 @@ The `mint` function accepts no arguments, and returns a token ID.
 ::: code-group
 
 ```ts [example.ts]
-import { simulateContract } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -71,11 +64,10 @@ For example, the `mint` function name below requires a **tokenId** argument, and
 ::: code-group
 
 ```ts {9} [example.ts]
-import { simulateContract } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -120,17 +112,16 @@ In the example below, we are **validating** if the contract write will be succes
 ::: code-group
 
 ```ts [example.ts]
-import { simulateContract } from 'viem/contract'
 import { walletClient, publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const { request } = await simulateContract(publicClient, {
+const { request } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
   from: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266',
 })
-const hash = await writeContract(walletClient, request)
+const hash = await walletClient.writeContract(request)
 ```
 
 ```ts [abi.ts]
@@ -172,7 +163,7 @@ The response from the contract. Type is inferred.
 The contract address.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
   abi: wagmiAbi,
   functionName: 'mint',
@@ -187,7 +178,7 @@ const { result } = await simulateContract(publicClient, {
 The contract's ABI.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi, // [!code focus]
   functionName: 'mint',
@@ -202,7 +193,7 @@ const { result } = await simulateContract(publicClient, {
 A function to extract from the ABI.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint', // [!code focus]
@@ -217,7 +208,7 @@ const { result } = await simulateContract(publicClient, {
 The sender of the call.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -232,7 +223,7 @@ const { result } = await simulateContract(publicClient, {
 The access list.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -253,7 +244,7 @@ const { result } = await simulateContract(publicClient, {
 Arguments to pass to function call.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0x1dfe7ca09e99d10835bf73044a23b73fc20623df',
   abi: wagmiAbi,
   functionName: 'balanceOf',
@@ -269,7 +260,7 @@ const { result } = await simulateContract(publicClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -286,7 +277,7 @@ const { result } = await simulateContract(publicClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -303,7 +294,7 @@ const { result } = await simulateContract(publicClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -321,7 +312,7 @@ const { result } = await simulateContract(publicClient, {
 Unique number identifying this transaction.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -338,7 +329,7 @@ const { result } = await simulateContract(publicClient, {
 Value in wei sent with this transaction.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -357,7 +348,7 @@ const { result } = await simulateContract(publicClient, {
 The block number to perform the read against.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -374,7 +365,7 @@ const { result } = await simulateContract(publicClient, {
 The block tag to perform the read against.
 
 ```ts
-const { result } = await simulateContract(publicClient, {
+const { result } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
diff --git a/site/docs/contract/watchContractEvent.md b/site/docs/contract/watchContractEvent.md
index 018cbfc83a..8ed65a4469 100644
--- a/site/docs/contract/watchContractEvent.md
+++ b/site/docs/contract/watchContractEvent.md
@@ -6,22 +6,15 @@ This Action will batch up all the event logs found within the [`pollingInterval`
 
 `watchContractEvent` will attempt to create an [Event Filter](/docs/contract/createContractEventFilter) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (ie. `eth_newFilter`), then `watchContractEvent` will fall back to using [`getLogs`](/docs/actions/public/getLogs) instead.
 
-## Import
-
-```ts
-import { watchContractEvent } from 'viem/contract'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { watchContractEvent } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   onLogs: logs => console.log(logs)
@@ -50,11 +43,10 @@ You can scope to an event on the given ABI.
 ::: code-group
 
 ```ts {8} [example.ts]
-import { watchContractEvent } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   eventName: 'Transfer',
@@ -112,11 +104,10 @@ In the example below, we want to filter out `Transfer`s that were sent by the ad
 ::: code-group
 
 ```ts {8-9} [example.ts]
-import { watchContractEvent } from 'viem/contract'
 import { publicClient } from './client'
 import { wagmiAbi } from './abi'
 
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   eventName: 'Transfer',
@@ -183,7 +174,7 @@ A function that can be invoked to stop watching for new event logs.
 The contract's ABI.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi, // [!code focus]
   onLogs: logs => console.log(logs)
@@ -197,7 +188,7 @@ const unwatch = await watchContractEvent(publicClient, {
 The new event logs.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   onLogs: logs => console.log(logs) // [!code focus]
@@ -211,7 +202,7 @@ const unwatch = await watchContractEvent(publicClient, {
 The contract address. If no address is provided, then it will emit all events matching the event signatures on the ABI.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
   abi: wagmiAbi,
   onLogs: logs => console.log(logs)
@@ -225,7 +216,7 @@ const unwatch = await watchContractEvent(publicClient, {
 Event arguments to filter logs.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   eventName: 'Transfer', // [!code focus]
@@ -241,7 +232,7 @@ const unwatch = await watchContractEvent(publicClient, {
 An event name to filter logs.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   eventName: 'Transfer', // [!code focus]
@@ -257,7 +248,7 @@ const unwatch = await watchContractEvent(publicClient, {
 Whether or not to batch logs between polling intervals.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   batch: false, // [!code focus]
@@ -272,7 +263,7 @@ const unwatch = await watchContractEvent(publicClient, {
 Error thrown from listening for new event logs.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   onError: error => console.log(error), // [!code focus]
@@ -287,7 +278,7 @@ const unwatch = await watchContractEvent(publicClient, {
 Polling frequency (in ms). Defaults to the Client's `pollingInterval` config.
 
 ```ts
-const unwatch = await watchContractEvent(publicClient, {
+const unwatch = await publicClient.watchContractEvent({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   pollingInterval: 1_000, // [!code focus]
diff --git a/site/docs/contract/writeContract.md b/site/docs/contract/writeContract.md
index 2ce2799c68..1216899c54 100644
--- a/site/docs/contract/writeContract.md
+++ b/site/docs/contract/writeContract.md
@@ -12,12 +12,6 @@ The `writeContract` internally sends a transaction – it **does not** validate
 
 :::
 
-## Import
-
-```ts
-import { writeContract } from 'viem/contract'
-```
-
 ## Usage
 
 Below is a very basic example of how to execute a write function on a contract (with no arguments).
@@ -27,16 +21,15 @@ While you can use `writeContract` [by itself](#standalone), it is highly recomme
 ::: code-group
 
 ```ts [example.ts]
-import { writeContract } from 'viem/contract'
 import { publicClient, walletClient } from './client'
 import { wagmiAbi } from './abi'
 
-const { request } = await simulateContract(publicClient, {
+const { request } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
 })
-await writeContract(walletClient, request)
+await walletClient.writeContract(request)
 ```
 
 ```ts [abi.ts]
@@ -76,17 +69,16 @@ For example, the `mint` function name below requires a **tokenId** argument, and
 ::: code-group
 
 ```ts {9} [example.ts]
-import { writeContract } from 'viem/contract'
 import { walletClient } from './client'
 import { wagmiAbi } from './abi'
 
-const { request } = await simulateContract(publicClient, {
+const { request } = await publicClient.simulateContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
   args: [69420]
 })
-await writeContract(walletClient, request)
+await walletClient.writeContract(request)
 ```
 
 ```ts [abi.ts]
@@ -122,11 +114,10 @@ If you don't need to perform validation on the contract write, you can also use
 ::: code-group
 
 ```ts [example.ts]
-import { writeContract } from 'viem/contract'
 import { walletClient } from './client'
 import { wagmiAbi } from './abi'
 
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -177,7 +168,7 @@ Unlike [`readContract`](/docs/contract/readContract), `writeContract` only retur
 The contract address.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2', // [!code focus]
   abi: wagmiAbi,
   functionName: 'mint',
@@ -192,7 +183,7 @@ await writeContract(walletClient, {
 The contract's ABI.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi, // [!code focus]
   functionName: 'mint',
@@ -207,7 +198,7 @@ await writeContract(walletClient, {
 A function to extract from the ABI.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint', // [!code focus]
@@ -222,7 +213,7 @@ await writeContract(walletClient, {
 The access list.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -241,7 +232,7 @@ await writeContract(walletClient, {
 Arguments to pass to function call.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -256,7 +247,7 @@ await writeContract(walletClient, {
 Optional sender override.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -272,7 +263,7 @@ await writeContract(walletClient, {
 The price (in wei) to pay per gas. Only applies to [Legacy Transactions](/docs/glossary/terms#TODO).
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -288,7 +279,7 @@ await writeContract(walletClient, {
 Total fee per gas (in wei), inclusive of `maxPriorityFeePerGas`. Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -304,7 +295,7 @@ await writeContract(walletClient, {
 Max priority fee per gas (in wei). Only applies to [EIP-1559 Transactions](/docs/glossary/terms#TODO)
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -321,7 +312,7 @@ await writeContract(walletClient, {
 Unique number identifying this transaction.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
@@ -337,7 +328,7 @@ await writeContract(walletClient, {
 Value in wei sent with this transaction.
 
 ```ts
-await writeContract(walletClient, {
+await walletClient.writeContract({
   address: '0xFBA3912Ca04dd458c843e2EE08967fC04f3579c2',
   abi: wagmiAbi,
   functionName: 'mint',
diff --git a/site/docs/ens/actions/getEnsAddress.md b/site/docs/ens/actions/getEnsAddress.md
index 3a4e726012..da28625d12 100644
--- a/site/docs/ens/actions/getEnsAddress.md
+++ b/site/docs/ens/actions/getEnsAddress.md
@@ -4,22 +4,16 @@ Gets address for ENS name.
 
 Calls `resolve(bytes, bytes)` on ENS Universal Resolver Contract to resolve the ENS name to address.
 
-## Import
-
-```ts
-import { getEnsAddress } from 'viem/ens'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { getEnsAddress } from 'viem/ens'
+import { normalize } from 'viem/ens'
 import { publicClient } from './client'
  
-const ensAddress = await getEnsAddress(publicClient, {
-  name: 'wagmi-dev.eth',
+const ensAddress = await publicClient.getEnsAddress({
+  name: normalize('wagmi-dev.eth'),
 })
 // '0xd2135CfB216b74109775236E36d4b433F1DF507B'
 ```
@@ -36,6 +30,11 @@ export const publicClient = createPublicClient({
 
 :::
 
+::: warning
+A name must be [normalized via UTS-46 normalization](https://docs.ens.domains/contract-api-reference/name-processing) before being used with `getEnsAddress`. 
+This can be achieved by using the `normalize` utility.
+:::
+
 ## Returns
 
 `Address`
@@ -53,8 +52,8 @@ Returns `0x0000000000000000000000000000000000000000` if ENS name does not resolv
 Address to get primary ENS name for.
 
 ```ts
-const ensName = await getEnsAddress(publicClient, {
-  name: 'wagmi-dev.eth', // [!code focus]
+const ensName = await publicClient.getEnsAddress({
+  name: normalize('wagmi-dev.eth'), // [!code focus]
 })
 ```
 
@@ -65,8 +64,8 @@ const ensName = await getEnsAddress(publicClient, {
 The block number to perform the read against.
 
 ```ts
-const ensName = await getEnsAddress(publicClient, {
-  name: 'wagmi-dev.eth',
+const ensName = await publicClient.getEnsAddress({
+  name: normalize('wagmi-dev.eth'),
   blockNumber: 15121123n, // [!code focus]
 })
 ```
@@ -79,8 +78,8 @@ const ensName = await getEnsAddress(publicClient, {
 The block tag to perform the read against.
 
 ```ts
-const ensName = await getEnsAddress(publicClient, {
-  name: 'wagmi-dev.eth',
+const ensName = await publicClient.getEnsAddress({
+  name: normalize('wagmi-dev.eth'),
   blockTag: 'safe', // [!code focus]
 })
 ```
@@ -93,8 +92,8 @@ const ensName = await getEnsAddress(publicClient, {
 Address of ENS Universal Resolver Contract.
 
 ```ts
-const ensName = await getEnsAddress(publicClient, {
-  name: 'wagmi-dev.eth',
+const ensName = await publicClient.getEnsAddress({
+  name: normalize('wagmi-dev.eth'),
   universalResolverAddress: '0x74E20Bd2A1fE0cdbe45b9A1d89cb7e0a45b36376', // [!code focus]
 })
 ```
\ No newline at end of file
diff --git a/site/docs/ens/actions/getEnsName.md b/site/docs/ens/actions/getEnsName.md
index 4e2e1256a5..113ca0eac0 100644
--- a/site/docs/ens/actions/getEnsName.md
+++ b/site/docs/ens/actions/getEnsName.md
@@ -4,21 +4,14 @@ Gets primary name for specified address.
 
 Calls `reverse(bytes)` on ENS Universal Resolver Contract to "reverse resolve" the address to the primary ENS name.
 
-## Import
-
-```ts
-import { getEnsName } from 'viem/ens'
-```
-
 ## Usage
 
 ::: code-group
 
 ```ts [example.ts]
-import { getEnsName } from 'viem/ens'
 import { publicClient } from './client'
  
-const ensName = await getEnsName(publicClient, {
+const ensName = await publicClient.getEnsName({
   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B',
 })
 // 'wagmi-dev.eth'
@@ -53,7 +46,7 @@ Returns `null` if address does not have primary name assigned.
 Address to get primary ENS name for.
 
 ```ts
-const ensName = await getEnsName(publicClient, {
+const ensName = await publicClient.getEnsName({
   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B', // [!code focus]
 })
 ```
@@ -65,7 +58,7 @@ const ensName = await getEnsName(publicClient, {
 The block number to perform the read against.
 
 ```ts
-const ensName = await getEnsName(publicClient, {
+const ensName = await publicClient.getEnsName({
   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B',
   blockNumber: 15121123n, // [!code focus]
 })
@@ -79,7 +72,7 @@ const ensName = await getEnsName(publicClient, {
 The block tag to perform the read against.
 
 ```ts
-const ensName = await getEnsName(publicClient, {
+const ensName = await publicClient.getEnsName({
   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B',
   blockTag: 'safe', // [!code focus]
 })
@@ -93,7 +86,7 @@ const ensName = await getEnsName(publicClient, {
 Address of ENS Universal Resolver Contract.
 
 ```ts
-const ensName = await getEnsName(publicClient, {
+const ensName = await publicClient.getEnsName({
   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B',
   universalResolverAddress: '0x74E20Bd2A1fE0cdbe45b9A1d89cb7e0a45b36376', // [!code focus]
 })
diff --git a/site/docs/ens/utilities/labelhash.md b/site/docs/ens/utilities/labelhash.md
index 0756e797f9..b679081cc9 100644
--- a/site/docs/ens/utilities/labelhash.md
+++ b/site/docs/ens/utilities/labelhash.md
@@ -5,18 +5,25 @@ Hashes ENS label.
 ## Import
 
 ```ts
-import { labelhash } from 'viem/ens'
+import { labelhash, normalize } from 'viem/ens'
 ```
 
 ## Usage
 
 ```ts
-import { labelhash } from 'viem/ens'
+import { labelhash, normalize } from 'viem/ens'
 
-labelhash('eth') // [!code focus:2]
-// '0x4f5b812789fc606be1b3b16908db13fc7a9adf7ca72641f84d75b47069d3d7f0'
+labelhash(normalize('awkweb')) // [!code focus:2]
+// '0x7aaad03ddcacc63166440f59c14a1a2c97ee381014b59c58f55b49ab05f31a38'
 ```
 
+::: warning
+A label must be [normalized via UTS-46 normalization](https://docs.ens.domains/contract-api-reference/name-processing) before being hashed with labelhash. 
+This can be achieved by using the `normalize` utility.
+:::
+
+### 
+
 ## Returns
 
 `string`
diff --git a/site/docs/ens/utilities/namehash.md b/site/docs/ens/utilities/namehash.md
index 6d25ddfc19..c5089b602f 100644
--- a/site/docs/ens/utilities/namehash.md
+++ b/site/docs/ens/utilities/namehash.md
@@ -5,18 +5,23 @@ Hashes ENS name.
 ## Import
 
 ```ts
-import { namehash } from 'viem/ens'
+import { namehash, normalize } from 'viem/ens'
 ```
 
 ## Usage
 
 ```ts
-import { namehash } from 'viem/ens'
+import { namehash, normalize } from 'viem/ens'
 
 namehash('wagmi-dev.eth') // [!code focus:2]
 // '0xf246651c1b9a6b141d19c2604e9a58f567973833990f830d882534a747801359'
 ```
 
+::: warning
+A name must be [normalized via UTS-46 normalization](https://docs.ens.domains/contract-api-reference/name-processing) before being hashed with namehash. 
+This can be achieved by using the `normalize` utility.
+:::
+
 ## Returns
 
 `string`
diff --git a/site/docs/getting-started.md b/site/docs/getting-started.md
index 581d607115..809be0f34d 100644
--- a/site/docs/getting-started.md
+++ b/site/docs/getting-started.md
@@ -45,12 +45,11 @@ Now that you have a Client set up, you can now interact with Ethereum and consum
 ```tsx {3,10}
 import { createPublicClient, http } from 'viem'
 import { mainnet } from 'viem/chains'
-import { getBlockNumber } from 'viem/public'
 
 const client = createPublicClient({
   chain: mainnet,
   transport: http(),
 })
 
-const blockNumber = await getBlockNumber(client)
+const blockNumber = await client.getBlockNumber()
 ```
diff --git a/site/docs/utilities/concat.md b/site/docs/utilities/concat.md
index e496147844..b6a55aa81c 100644
--- a/site/docs/utilities/concat.md
+++ b/site/docs/utilities/concat.md
@@ -5,13 +5,13 @@ Concatenates a set of hex values or byte arrays.
 ## Install
 
 ```ts
-import { concat } from 'viem/utils'
+import { concat } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { concat } from 'viem/utils'
+import { concat } from 'viem'
 
 concat(['0x00000069', '0x00000420'])
 // 0x0000006900000420
diff --git a/site/docs/utilities/formatEther.md b/site/docs/utilities/formatEther.md
index 051adcbf61..ad7938b20f 100644
--- a/site/docs/utilities/formatEther.md
+++ b/site/docs/utilities/formatEther.md
@@ -5,13 +5,13 @@ Converts numerical wei to a string representation of ether.
 ## Import
 
 ```ts
-import { formatEther } from 'viem/utils'
+import { formatEther } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { formatEther } from 'viem/utils'
+import { formatEther } from 'viem'
 
 formatEther(1000000000000000000n) // [!code focus:2]
 // '1'
diff --git a/site/docs/utilities/formatGwei.md b/site/docs/utilities/formatGwei.md
index 1e20b6e677..11a3125b47 100644
--- a/site/docs/utilities/formatGwei.md
+++ b/site/docs/utilities/formatGwei.md
@@ -5,13 +5,13 @@ Converts numerical wei to a string representation of gwei.
 ## Import
 
 ```ts
-import { formatGwei } from 'viem/utils'
+import { formatGwei } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { formatGwei } from 'viem/utils'
+import { formatGwei } from 'viem'
 
 formatGwei(1000000000n) // [!code focus:2]
 // '1'
diff --git a/site/docs/utilities/formatUnit.md b/site/docs/utilities/formatUnit.md
index 67f638abcb..bfb5184086 100644
--- a/site/docs/utilities/formatUnit.md
+++ b/site/docs/utilities/formatUnit.md
@@ -5,13 +5,13 @@ Divides a number by a given exponent of base 10 (10<sup>exponent</sup>), and for
 ## Import
 
 ```ts
-import { formatUnit } from 'viem/utils'
+import { formatUnit } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { formatUnit } from 'viem/utils'
+import { formatUnit } from 'viem'
 
 formatUnit(420000000000n, 9) // [!code focus:2]
 // '420'
diff --git a/site/docs/utilities/fromBytes.md b/site/docs/utilities/fromBytes.md
index ecdac718f4..b487b63006 100644
--- a/site/docs/utilities/fromBytes.md
+++ b/site/docs/utilities/fromBytes.md
@@ -5,13 +5,13 @@ Decodes a byte array to a string, hex value, boolean or number.
 ## Import
 
 ```ts
-import { fromBytes } from 'viem/utils'
+import { fromBytes } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { fromBytes } from 'viem/utils'
+import { fromBytes } from 'viem'
 
 fromBytes(
   new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33]), 
@@ -61,7 +61,7 @@ The output type.
 Decodes a byte array to a hex value.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 bytesToHex(new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])) // [!code focus:2]
 // '0x48656c6c6f20576f726c6421'
@@ -74,7 +74,7 @@ bytesToHex(new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 3
 Decodes a byte array to a string.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 bytesToString(new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])) // [!code focus:2]
 // 'Hello world'
@@ -87,7 +87,7 @@ bytesToString(new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100
 Decodes a byte array to a number.
 
 ```ts
-import { bytesToNumber } from 'viem/utils'
+import { bytesToNumber } from 'viem'
 
 bytesToNumber(new Uint8Array([1, 164])) // [!code focus:2]
 // 420
@@ -100,7 +100,7 @@ bytesToNumber(new Uint8Array([1, 164])) // [!code focus:2]
 Decodes a byte array to a number.
 
 ```ts
-import { bytesToBigint } from 'viem/utils'
+import { bytesToBigint } from 'viem'
 
 bytesToBigint(new Uint8Array([12, 92, 243, 146, 17, 135, 111, 181, 229, 136, 67, 39, 250, 86, 252, 11, 117])) // [!code focus:2]
 // 4206942069420694206942069420694206942069n
@@ -113,7 +113,7 @@ bytesToBigint(new Uint8Array([12, 92, 243, 146, 17, 135, 111, 181, 229, 136, 67,
 Decodes a byte array to a boolean.
 
 ```ts
-import { bytesToBool } from 'viem/utils'
+import { bytesToBool } from 'viem'
 
 bytesToBool(new Uint8Array([1])) // [!code focus:2]
 // true
diff --git a/site/docs/utilities/fromHex.md b/site/docs/utilities/fromHex.md
index b637b4c390..5917e74d15 100644
--- a/site/docs/utilities/fromHex.md
+++ b/site/docs/utilities/fromHex.md
@@ -5,13 +5,13 @@ Decodes a hex value to a string, number or byte array.
 ## Import
 
 ```ts
-import { fromHex } from 'viem/utils'
+import { fromHex } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { fromHex } from 'viem/utils'
+import { fromHex } from 'viem'
 
 fromHex('0x1a4', 'number')
 // 420
@@ -58,7 +58,7 @@ The output type.
 Decodes a hex value to a number.
 
 ```ts
-import { hexToNumber } from 'viem/utils'
+import { hexToNumber } from 'viem'
 
 hexToNumber('0x1a4')
 // 420
@@ -71,7 +71,7 @@ hexToNumber('0x1a4')
 Decodes a hex value to a bigint.
 
 ```ts
-import { hexToBigInt } from 'viem/utils'
+import { hexToBigInt } from 'viem'
 
 hexToBigInt('0xc5cf39211876fb5e5884327fa56fc0b75')
 // 4206942069420694206942069420694206942069n
@@ -84,7 +84,7 @@ hexToBigInt('0xc5cf39211876fb5e5884327fa56fc0b75')
 Decodes a hex value to a string.
 
 ```ts
-import { hexToString } from 'viem/utils'
+import { hexToString } from 'viem'
 
 hexToString('0x48656c6c6f20576f726c6421')
 // "Hello World!"
@@ -97,7 +97,7 @@ hexToString('0x48656c6c6f20576f726c6421')
 Decodes a hex value to a byte array.
 
 ```ts
-import { hexToBytes } from 'viem/utils'
+import { hexToBytes } from 'viem'
 
 hexToBytes('0x48656c6c6f20576f726c6421')
 // Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])
@@ -110,7 +110,7 @@ hexToBytes('0x48656c6c6f20576f726c6421')
 Decodes a hex value to a boolean.
 
 ```ts
-import { hexToBytes } from 'viem/utils'
+import { hexToBytes } from 'viem'
 
 hexToBytes('0x1')
 // true
diff --git a/site/docs/utilities/fromRlp.md b/site/docs/utilities/fromRlp.md
index 09e331511b..e1a7567f4c 100644
--- a/site/docs/utilities/fromRlp.md
+++ b/site/docs/utilities/fromRlp.md
@@ -5,13 +5,13 @@ Decodes a [Recursive-Length Prefix (RLP)](https://ethereum.org/en/developers/doc
 ## Import
 
 ```ts
-import { fromRlp } from 'viem/utils'
+import { fromRlp } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { fromRlp } from 'viem/utils'
+import { fromRlp } from 'viem'
 
 fromRlp('0x850123456789', 'hex')
 // "0x123456789"
diff --git a/site/docs/utilities/getAddress.md b/site/docs/utilities/getAddress.md
index 6698651a02..fac0207f23 100644
--- a/site/docs/utilities/getAddress.md
+++ b/site/docs/utilities/getAddress.md
@@ -5,13 +5,13 @@ Converts an address to an address that is [checksum encoded](https://eips.ethere
 ## Import
 
 ```ts
-import { getAddress } from 'viem/utils'
+import { getAddress } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { getAddress } from 'viem/utils'
+import { getAddress } from 'viem'
 
 getAddress('0xa5cc3c03994db5b0d9a5eEdD10Cabab0813678ac') // [!code focus:2]
 // '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC'
diff --git a/site/docs/utilities/getContractAddress.md b/site/docs/utilities/getContractAddress.md
index 0d0ba8d56f..15f9200b7b 100644
--- a/site/docs/utilities/getContractAddress.md
+++ b/site/docs/utilities/getContractAddress.md
@@ -5,13 +5,13 @@ Retrieves the contract address generated by the [`CREATE`](https://ethereum.stac
 ## Import
 
 ```ts
-import { getContractAddress } from 'viem/utils'
+import { getContractAddress } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { getContractAddress } from 'viem/utils'
+import { getContractAddress } from 'viem'
 
 getContractAddress({ // [!code focus:99]
   from: '0xc961145a54C96E3aE9bAA048c4F4D6b04C13916b',
diff --git a/site/docs/utilities/getEventSignature.md b/site/docs/utilities/getEventSignature.md
index 7f60bc6090..3cc6b7ae9d 100644
--- a/site/docs/utilities/getEventSignature.md
+++ b/site/docs/utilities/getEventSignature.md
@@ -5,13 +5,13 @@ Returns the event signature for a given event definition.
 ## Install
 
 ```ts
-import { getEventSignature } from 'viem/utils'
+import { getEventSignature } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { getEventSignature } from 'viem/utils'
+import { getEventSignature } from 'viem'
 
 const signature = getEventSignature('Transfer(address,address,uint256)')
 // 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef
diff --git a/site/docs/utilities/getFunctionSignature.md b/site/docs/utilities/getFunctionSignature.md
index 2e0aed31f2..7c021e1f18 100644
--- a/site/docs/utilities/getFunctionSignature.md
+++ b/site/docs/utilities/getFunctionSignature.md
@@ -5,13 +5,13 @@ Returns the function signature (4 byte encoding) for a given function definition
 ## Install
 
 ```ts
-import { getFunctionSignature } from 'viem/utils'
+import { getFunctionSignature } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { getFunctionSignature } from 'viem/utils'
+import { getFunctionSignature } from 'viem'
 
 const signature = getFunctionSignature('function ownerOf(uint256 tokenId)')
 // 0x6352211e
diff --git a/site/docs/utilities/isAddress.md b/site/docs/utilities/isAddress.md
index e0ab182553..4a076965dc 100644
--- a/site/docs/utilities/isAddress.md
+++ b/site/docs/utilities/isAddress.md
@@ -5,13 +5,13 @@ Checks if the address is valid.
 ## Import
 
 ```ts
-import { isAddress } from 'viem/utils'
+import { isAddress } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { isAddress } from 'viem/utils'
+import { isAddress } from 'viem'
 
 isAddress('0xa5cc3c03994db5b0d9a5eEdD10Cabab0813678ac') // [!code focus:2]
 // true
diff --git a/site/docs/utilities/isAddressEqual.md b/site/docs/utilities/isAddressEqual.md
index 2fb3cf896e..4f9096225f 100644
--- a/site/docs/utilities/isAddressEqual.md
+++ b/site/docs/utilities/isAddressEqual.md
@@ -5,13 +5,13 @@ Checks if the given addresses (checksummed) are equal.
 ## Import
 
 ```ts
-import { isAddressEqual } from 'viem/utils'
+import { isAddressEqual } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { isAddressEqual } from 'viem/utils'
+import { isAddressEqual } from 'viem'
 
 isAddressEqual('0xa5cc3c03994db5b0d9a5eEdD10Cabab0813678ac', '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC') // [!code focus:2]
 // true
diff --git a/site/docs/utilities/isBytes.md b/site/docs/utilities/isBytes.md
index 35b6949ee2..b4d13f23ed 100644
--- a/site/docs/utilities/isBytes.md
+++ b/site/docs/utilities/isBytes.md
@@ -5,13 +5,13 @@ Checks whether the value is a byte array or not.
 ## Install
 
 ```ts
-import { isBytes } from 'viem/utils'
+import { isBytes } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { isBytes } from 'viem/utils'
+import { isBytes } from 'viem'
 
 isBytes(new Uint8Array([1, 69, 420]))
 // true
diff --git a/site/docs/utilities/isHex.md b/site/docs/utilities/isHex.md
index 45eb630d99..2c0042ff77 100644
--- a/site/docs/utilities/isHex.md
+++ b/site/docs/utilities/isHex.md
@@ -5,13 +5,13 @@ Checks whether the value is a hex value or not.
 ## Install
 
 ```ts
-import { isHex } from 'viem/utils'
+import { isHex } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { isHex } from 'viem/utils'
+import { isHex } from 'viem'
 
 isHex('0x1a4')
 // true
diff --git a/site/docs/utilities/keccak256.md b/site/docs/utilities/keccak256.md
index bacaf63e98..c42af2560b 100644
--- a/site/docs/utilities/keccak256.md
+++ b/site/docs/utilities/keccak256.md
@@ -7,13 +7,13 @@ This function is a re-export of `keccak_256` from [`@noble/hashes`](https://gith
 ## Install
 
 ```ts
-import { keccak256 } from 'viem/utils'
+import { keccak256 } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { keccak256 } from 'viem/utils'
+import { keccak256 } from 'viem'
 
 keccak256(new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])
 // 0x3ea2f1d0abf3fc66cf29eebb70cbd4e7fe762ef8a09bcc06c8edf641230afec0
@@ -45,7 +45,7 @@ The byte array to hash.
 The output type.
 
 ```ts
-import { keccak256 } from 'viem/utils'
+import { keccak256 } from 'viem'
 
 keccak256(
   new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33],
diff --git a/site/docs/utilities/pad.md b/site/docs/utilities/pad.md
index 1afaa781f9..019ecc12e4 100644
--- a/site/docs/utilities/pad.md
+++ b/site/docs/utilities/pad.md
@@ -5,7 +5,7 @@ Pads a hex value or byte array with leading or trailing zeros.
 ## Install
 
 ```ts
-import { pad } from 'viem/utils'
+import { pad } from 'viem'
 ```
 
 ## Usage
@@ -13,7 +13,7 @@ import { pad } from 'viem/utils'
 By default, `pad` will pad a value with leading zeros up to 32 bytes (64 hex chars).
 
 ```ts
-import { pad } from 'viem/utils'
+import { pad } from 'viem'
 
 pad('0xa4e12a45')
 // 0x00000000000000000000000000000000000000000000000000000000a4e12a45
diff --git a/site/docs/utilities/parseEther.md b/site/docs/utilities/parseEther.md
index d4a796b40b..f262051107 100644
--- a/site/docs/utilities/parseEther.md
+++ b/site/docs/utilities/parseEther.md
@@ -5,13 +5,13 @@ Converts a string representation of ether to numerical wei.
 ## Import
 
 ```ts
-import { parseEther } from 'viem/utils'
+import { parseEther } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { parseEther } from 'viem/utils'
+import { parseEther } from 'viem'
 
 parseEther('420') // [!code focus:2]
 // 420000000000000000000n
diff --git a/site/docs/utilities/parseGwei.md b/site/docs/utilities/parseGwei.md
index e6f66f5570..8f106c2efd 100644
--- a/site/docs/utilities/parseGwei.md
+++ b/site/docs/utilities/parseGwei.md
@@ -5,13 +5,13 @@ Converts a string representation of gwei to numerical wei.
 ## Import
 
 ```ts
-import { parseGwei } from 'viem/utils'
+import { parseGwei } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { parseGwei } from 'viem/utils'
+import { parseGwei } from 'viem'
 
 parseGwei('420') // [!code focus:2]
 // 420000000000n
diff --git a/site/docs/utilities/parseUnit.md b/site/docs/utilities/parseUnit.md
index 979ad32f68..f59d999569 100644
--- a/site/docs/utilities/parseUnit.md
+++ b/site/docs/utilities/parseUnit.md
@@ -5,13 +5,13 @@ Multiplies a string representation of a number by a given exponent of base 10 (1
 ## Import
 
 ```ts
-import { parseUnit } from 'viem/utils'
+import { parseUnit } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { parseUnit } from 'viem/utils'
+import { parseUnit } from 'viem'
 
 parseUnit('420', 9) // [!code focus:2]
 // 420000000000n
diff --git a/site/docs/utilities/size.md b/site/docs/utilities/size.md
index 93ae43bbeb..319570f085 100644
--- a/site/docs/utilities/size.md
+++ b/site/docs/utilities/size.md
@@ -5,13 +5,13 @@ Retrieves the size of the value (in bytes).
 ## Install
 
 ```ts
-import { size } from 'viem/utils'
+import { size } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { size } from 'viem/utils'
+import { size } from 'viem'
 
 size('0xa4') // 1
 size('0xa4e12a45') // 4
diff --git a/site/docs/utilities/slice.md b/site/docs/utilities/slice.md
index 9b223080fe..3c216b7b4d 100644
--- a/site/docs/utilities/slice.md
+++ b/site/docs/utilities/slice.md
@@ -5,13 +5,13 @@ Returns a section of the hex or byte array given a start/end bytes offset.
 ## Install
 
 ```ts
-import { slice } from 'viem/utils'
+import { slice } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { slice } from 'viem/utils'
+import { slice } from 'viem'
 
 sliceHex('0x0123456789', 1, 4)
 // 0x234567
diff --git a/site/docs/utilities/toBytes.md b/site/docs/utilities/toBytes.md
index 50ae73ae97..ec85b7b7c7 100644
--- a/site/docs/utilities/toBytes.md
+++ b/site/docs/utilities/toBytes.md
@@ -5,13 +5,13 @@ Encodes a string, hex value, number or boolean to a byte array.
 ## Import
 
 ```ts
-import { toBytes } from 'viem/utils'
+import { toBytes } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { toBytes } from 'viem/utils'
+import { toBytes } from 'viem'
 
 toBytes('Hello world')
 // Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])
@@ -49,7 +49,7 @@ The value to encode as bytes.
 Encodes a hex value to a byte array.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 hexToBytes('0x48656c6c6f20576f726c6421') // [!code focus:2]
 // Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])
@@ -62,7 +62,7 @@ hexToBytes('0x48656c6c6f20576f726c6421') // [!code focus:2]
 Encodes a string to a byte array.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 stringToBytes('Hello world') // [!code focus:2]
 // Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33])
@@ -75,7 +75,7 @@ stringToBytes('Hello world') // [!code focus:2]
 Encodes a number to a byte array.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 numberToBytes(420) // [!code focus:2]
 // Uint8Array([1, 164])
@@ -88,7 +88,7 @@ numberToBytes(420) // [!code focus:2]
 Encodes a boolean to a byte array.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 numberToBytes(true) // [!code focus:2]
 // Uint8Array([1])
diff --git a/site/docs/utilities/toHex.md b/site/docs/utilities/toHex.md
index e295c9116f..c54fadba37 100644
--- a/site/docs/utilities/toHex.md
+++ b/site/docs/utilities/toHex.md
@@ -5,13 +5,13 @@ Encodes a string, number, boolean or byte array to a hex value value.
 ## Import
 
 ```ts
-import { toHex } from 'viem/utils'
+import { toHex } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { toHex } from 'viem/utils'
+import { toHex } from 'viem'
 
 toHex(420)
 // "0x1a4"
@@ -51,7 +51,7 @@ The value to hex encode.
 Encodes a number value to a hex value.
 
 ```ts
-import { numberToHex } from 'viem/utils'
+import { numberToHex } from 'viem'
 
 numberToHex(420)
 // "0x1a4"
@@ -67,7 +67,7 @@ numberToHex(4206942069420694206942069420694206942069n)
 Encodes a UTF-8 string value to a hex value.
 
 ```ts
-import { stringToHex } from 'viem/utils'
+import { stringToHex } from 'viem'
 
 stringToHex('Hello World!')
 // "0x48656c6c6f20576f726c6421"
@@ -80,7 +80,7 @@ stringToHex('Hello World!')
 Encodes a byte array to a hex value.
 
 ```ts
-import { stringToHex } from 'viem/utils'
+import { stringToHex } from 'viem'
 
 bytesToHex(
   new Uint8Array([72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33]),
@@ -95,7 +95,7 @@ bytesToHex(
 Encodes a boolean to a hex value.
 
 ```ts
-import { stringToHex } from 'viem/utils'
+import { stringToHex } from 'viem'
 
 bytesToHex(true)
 // "0x1"
diff --git a/site/docs/utilities/toRlp.md b/site/docs/utilities/toRlp.md
index 425e70f0b4..98bc4bd728 100644
--- a/site/docs/utilities/toRlp.md
+++ b/site/docs/utilities/toRlp.md
@@ -5,13 +5,13 @@ Encodes a hex value or byte array into a [Recursive-Length Prefix (RLP)](https:/
 ## Import
 
 ```ts
-import { toRlp } from 'viem/utils'
+import { toRlp } from 'viem'
 ```
 
 ## Usage
 
 ```ts
-import { toRlp } from 'viem/utils'
+import { toRlp } from 'viem'
 
 toRlp('0x123456789')
 // "0x850123456789"
diff --git a/site/docs/utilities/trim.md b/site/docs/utilities/trim.md
index eabd6de92f..a77067e149 100644
--- a/site/docs/utilities/trim.md
+++ b/site/docs/utilities/trim.md
@@ -5,7 +5,7 @@ Trims the leading or trailing zeros from a hex value or byte array.
 ## Install
 
 ```ts
-import { trim } from 'viem/utils'
+import { trim } from 'viem'
 ```
 
 ## Usage
@@ -13,7 +13,7 @@ import { trim } from 'viem/utils'
 By default, `trim` will trim the leading zeros from a hex value or byte array.
 
 ```ts
-import { trim } from 'viem/utils'
+import { trim } from 'viem'
 
 trim('0x00000000000000000000000000000000000000000000000000000000a4e12a45')
 // 0xa4e12a45
diff --git a/site/index.md b/site/index.md
index 4663ff5570..5a852ec0cf 100644
--- a/site/index.md
+++ b/site/index.md
@@ -111,7 +111,6 @@ yarn add viem
 // 1. Import modules.
 import { createPublicClient, http } from 'viem'
 import { mainnet } from 'viem/chains'
-import { getBlockNumber } from 'viem/public'
 
 // 2. Set up your client with desired chain & transport.
 const client = createPublicClient({
@@ -120,7 +119,7 @@ const client = createPublicClient({
 })
 
 // 3. Consume an action!
-const blockNumber = await getBlockNumber(client)
+const blockNumber = await client.getBlockNumber()
 ```
 
 <style scoped>
diff --git a/src/actions/ens/getEnsAddress.ts b/src/actions/ens/getEnsAddress.ts
index 8755b6b479..83823840d9 100644
--- a/src/actions/ens/getEnsAddress.ts
+++ b/src/actions/ens/getEnsAddress.ts
@@ -14,6 +14,8 @@ export type GetEnsAddressArgs = Prettify<
   }
 >
 
+export type GetEnsAddressResponse = Address
+
 /**
  * @description Gets address for ENS name.
  *
@@ -33,7 +35,7 @@ export async function getEnsAddress(
     name,
     universalResolverAddress: universalResolverAddress_,
   }: GetEnsAddressArgs,
-) {
+): Promise<GetEnsAddressResponse> {
   let universalResolverAddress = universalResolverAddress_
   if (!universalResolverAddress) {
     if (!client.chain)
diff --git a/src/actions/ens/getEnsName.test.ts b/src/actions/ens/getEnsName.test.ts
index a1bf2aca44..d168ccdd2f 100644
--- a/src/actions/ens/getEnsName.test.ts
+++ b/src/actions/ens/getEnsName.test.ts
@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest'
-import { localhost, mainnet, optimism } from '../../chains'
+import { optimism } from '../../chains'
 import { createPublicClient, http } from '../../clients'
 
 import { address, localHttpUrl, publicClient } from '../../_test'
diff --git a/src/actions/ens/getEnsName.ts b/src/actions/ens/getEnsName.ts
index 763c549aef..f6dfca823c 100644
--- a/src/actions/ens/getEnsName.ts
+++ b/src/actions/ens/getEnsName.ts
@@ -19,6 +19,8 @@ export type GetEnsNameArgs = Prettify<
   }
 >
 
+export type GetEnsNameResponse = string | null
+
 /**
  * @description Gets primary name for specified address.
  *
@@ -38,7 +40,7 @@ export async function getEnsName(
     blockTag,
     universalResolverAddress: universalResolverAddress_,
   }: GetEnsNameArgs,
-) {
+): Promise<GetEnsNameResponse> {
   let universalResolverAddress = universalResolverAddress_
   if (!universalResolverAddress) {
     if (!client.chain)
diff --git a/src/actions/ens/index.ts b/src/actions/ens/index.ts
index 129617e061..eed7dc11eb 100644
--- a/src/actions/ens/index.ts
+++ b/src/actions/ens/index.ts
@@ -1,3 +1,11 @@
-export { getEnsAddress, type GetEnsAddressArgs } from './getEnsAddress'
+export {
+  getEnsAddress,
+  type GetEnsAddressArgs,
+  type GetEnsAddressResponse,
+} from './getEnsAddress'
 
-export { getEnsName, type GetEnsNameArgs } from './getEnsName'
+export {
+  getEnsName,
+  type GetEnsNameArgs,
+  type GetEnsNameResponse,
+} from './getEnsName'
diff --git a/src/actions/index.ts b/src/actions/index.ts
index 36f4c57b74..1f34dda864 100644
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -165,10 +165,13 @@ export {
   writeContract,
 } from './wallet'
 export type {
+  AddChainArgs,
   DeployContractArgs,
   DeployContractResponse,
   FormattedTransactionRequest,
+  GetAccountsResponse,
   GetPermissionsResponse,
+  RequestAccountsResponse,
   RequestPermissionsResponse,
   SendTransactionArgs,
   SendTransactionResponse,
diff --git a/src/actions/public/estimateGas.ts b/src/actions/public/estimateGas.ts
index 75be2ac8a4..92319d4d3d 100644
--- a/src/actions/public/estimateGas.ts
+++ b/src/actions/public/estimateGas.ts
@@ -58,7 +58,7 @@ export async function estimateGas<TChain extends Chain>(
     to,
     value,
     ...rest
-  }: EstimateGasArgs,
+  }: EstimateGasArgs<TChain>,
 ): Promise<EstimateGasResponse> {
   const blockNumberHex = blockNumber ? numberToHex(blockNumber) : undefined
 
diff --git a/src/actions/public/getBlockNumber.ts b/src/actions/public/getBlockNumber.ts
index 0440ebb0f0..03c8d75580 100644
--- a/src/actions/public/getBlockNumber.ts
+++ b/src/actions/public/getBlockNumber.ts
@@ -18,7 +18,7 @@ export function getBlockNumberCache(id: string) {
  * @description Returns the number of the most recent block seen.
  */
 export async function getBlockNumber(
-  client: PublicClient,
+  client: PublicClient<any, any, any>,
   { maxAge = client.pollingInterval }: GetBlockNumberArgs = {},
 ): Promise<GetBlockNumberResponse> {
   const blockNumberHex = await withCache(
diff --git a/src/actions/public/getChainId.ts b/src/actions/public/getChainId.ts
index 05f89f9313..34f3e2a627 100644
--- a/src/actions/public/getChainId.ts
+++ b/src/actions/public/getChainId.ts
@@ -1,7 +1,11 @@
 import type { PublicClient } from '../../clients'
 import { hexToNumber } from '../../utils'
 
-export async function getChainId(client: PublicClient) {
+export type GetChainIdResponse = number
+
+export async function getChainId(
+  client: PublicClient,
+): Promise<GetChainIdResponse> {
   const chainIdHex = await client.request({ method: 'eth_chainId' })
   return hexToNumber(chainIdHex)
 }
diff --git a/src/actions/public/getStorageAt.test.ts b/src/actions/public/getStorageAt.test.ts
index 8f36e3ce00..ca62a7a943 100644
--- a/src/actions/public/getStorageAt.test.ts
+++ b/src/actions/public/getStorageAt.test.ts
@@ -5,7 +5,6 @@ import {
   wagmiContractConfig,
 } from '../../_test'
 
-import { getBytecode } from './getBytecode'
 import { getStorageAt } from './getStorageAt'
 
 test('default', async () => {
diff --git a/src/actions/public/getTransactionConfirmations.ts b/src/actions/public/getTransactionConfirmations.ts
index 1538abfd9a..9591d0859d 100644
--- a/src/actions/public/getTransactionConfirmations.ts
+++ b/src/actions/public/getTransactionConfirmations.ts
@@ -7,7 +7,7 @@ import type {
 import { getBlockNumber } from './getBlockNumber'
 import { getTransaction } from './getTransaction'
 
-export type GetTransactionConfirmationsArgs<TChain extends Chain> =
+export type GetTransactionConfirmationsArgs<TChain extends Chain = Chain> =
   | {
       /** The transaction hash. */
       hash: Hash
diff --git a/src/actions/public/index.ts b/src/actions/public/index.ts
index 96ce093597..c580e97795 100644
--- a/src/actions/public/index.ts
+++ b/src/actions/public/index.ts
@@ -56,6 +56,7 @@ export { getBytecode } from './getBytecode'
 export type { GetBytecodeArgs, GetBytecodeResponse } from './getBytecode'
 
 export { getChainId } from './getChainId'
+export type { GetChainIdResponse } from './getChainId'
 
 export { getFeeHistory } from './getFeeHistory'
 export type { GetFeeHistoryArgs, GetFeeHistoryResponse } from './getFeeHistory'
diff --git a/src/actions/public/watchBlockNumber.ts b/src/actions/public/watchBlockNumber.ts
index d2a3629dd5..4121c52a87 100644
--- a/src/actions/public/watchBlockNumber.ts
+++ b/src/actions/public/watchBlockNumber.ts
@@ -25,7 +25,7 @@ export type WatchBlockNumberArgs = {
 
 /** @description Watches and returns incoming block numbers. */
 export function watchBlockNumber(
-  client: PublicClient,
+  client: PublicClient<any, any, any>,
   {
     emitOnBegin = false,
     emitMissed = false,
diff --git a/src/actions/test/getTxpoolContent.ts b/src/actions/test/getTxpoolContent.ts
index fab0a733c0..1849b4a5ff 100644
--- a/src/actions/test/getTxpoolContent.ts
+++ b/src/actions/test/getTxpoolContent.ts
@@ -1,6 +1,15 @@
+import { Address } from 'abitype'
 import type { TestClient } from '../../clients'
+import { RpcTransaction } from '../../types'
 
-export async function getTxpoolContent(client: TestClient) {
+export type GetTxPoolContentResponse = {
+  pending: Record<Address, Record<string, RpcTransaction>>
+  queued: Record<Address, Record<string, RpcTransaction>>
+}
+
+export async function getTxpoolContent(
+  client: TestClient,
+): Promise<GetTxPoolContentResponse> {
   return await client.request({
     method: 'txpool_content',
   })
diff --git a/src/actions/test/getTxpoolStatus.ts b/src/actions/test/getTxpoolStatus.ts
index 7856d8cce9..1e1ce158b9 100644
--- a/src/actions/test/getTxpoolStatus.ts
+++ b/src/actions/test/getTxpoolStatus.ts
@@ -1,7 +1,14 @@
 import type { TestClient } from '../../clients'
 import { hexToNumber } from '../../utils'
 
-export async function getTxpoolStatus(client: TestClient) {
+export type GetTxPoolStatusResponse = {
+  pending: number
+  queued: number
+}
+
+export async function getTxpoolStatus(
+  client: TestClient,
+): Promise<GetTxPoolStatusResponse> {
   const { pending, queued } = await client.request({
     method: 'txpool_status',
   })
diff --git a/src/actions/test/index.ts b/src/actions/test/index.ts
index 995086d401..9236feaee9 100644
--- a/src/actions/test/index.ts
+++ b/src/actions/test/index.ts
@@ -2,10 +2,13 @@ export { dropTransaction } from './dropTransaction'
 export type { DropTransactionArgs } from './dropTransaction'
 
 export { getAutomine } from './getAutomine'
+export type { GetAutomineResponse } from './getAutomine'
 
 export { getTxpoolContent } from './getTxpoolContent'
+export type { GetTxPoolContentResponse } from './getTxpoolContent'
 
 export { getTxpoolStatus } from './getTxpoolStatus'
+export type { GetTxPoolStatusResponse } from './getTxpoolStatus'
 
 export { impersonateAccount } from './impersonateAccount'
 export type { ImpersonateAccountArgs } from './impersonateAccount'
@@ -14,6 +17,7 @@ export { increaseTime } from './increaseTime'
 export type { IncreaseTimeArgs } from './increaseTime'
 
 export { inspectTxpool } from './inspectTxpool'
+export type { InspectTxpoolResponse } from './inspectTxpool'
 
 export { mine } from './mine'
 export type { MineArgs } from './mine'
diff --git a/src/actions/test/inspectTxpool.ts b/src/actions/test/inspectTxpool.ts
index e0463048f7..028bc7da83 100644
--- a/src/actions/test/inspectTxpool.ts
+++ b/src/actions/test/inspectTxpool.ts
@@ -1,6 +1,14 @@
 import type { TestClient } from '../../clients'
+import { Address } from '../../types'
 
-export async function inspectTxpool(client: TestClient) {
+export type InspectTxpoolResponse = {
+  pending: Record<Address, Record<string, string>>
+  queued: Record<Address, Record<string, string>>
+}
+
+export async function inspectTxpool(
+  client: TestClient,
+): Promise<InspectTxpoolResponse> {
   return await client.request({
     method: 'txpool_inspect',
   })
diff --git a/src/actions/wallet/addChain.test.ts b/src/actions/wallet/addChain.test.ts
index 418df92d3c..b944fa4edb 100644
--- a/src/actions/wallet/addChain.test.ts
+++ b/src/actions/wallet/addChain.test.ts
@@ -6,9 +6,11 @@ import { avalanche } from '../../chains'
 import { addChain } from './addChain'
 
 test('default', async () => {
-  await addChain(walletClient!, avalanche)
+  await addChain(walletClient!, { chain: avalanche })
 })
 
 test('no block explorer', async () => {
-  await addChain(walletClient!, { ...avalanche, blockExplorers: undefined })
+  await addChain(walletClient!, {
+    chain: { ...avalanche, blockExplorers: undefined },
+  })
 })
diff --git a/src/actions/wallet/addChain.ts b/src/actions/wallet/addChain.ts
index c2e76aedab..239aa05062 100644
--- a/src/actions/wallet/addChain.ts
+++ b/src/actions/wallet/addChain.ts
@@ -2,7 +2,11 @@ import type { WalletClient } from '../../clients'
 import type { Chain } from '../../types'
 import { numberToHex } from '../../utils'
 
-export async function addChain(client: WalletClient, chain: Chain) {
+export type AddChainArgs = {
+  chain: Chain
+}
+
+export async function addChain(client: WalletClient, { chain }: AddChainArgs) {
   const { id, name, nativeCurrency, rpcUrls, blockExplorers } = chain
   await client.request({
     method: 'wallet_addEthereumChain',
diff --git a/src/actions/wallet/deployContract.ts b/src/actions/wallet/deployContract.ts
index 69f724c7a5..2e5c30ebed 100644
--- a/src/actions/wallet/deployContract.ts
+++ b/src/actions/wallet/deployContract.ts
@@ -22,7 +22,10 @@ export type DeployContractArgs<
 
 export type DeployContractResponse = SendTransactionResponse
 
-export function deployContract<TChain extends Chain, TAbi extends Abi>(
+export function deployContract<
+  TChain extends Chain,
+  TAbi extends Abi | readonly unknown[],
+>(
   walletClient: WalletClient,
   { abi, args, bytecode, ...request }: DeployContractArgs<TChain, TAbi>,
 ): Promise<DeployContractResponse> {
diff --git a/src/actions/wallet/getAccounts.ts b/src/actions/wallet/getAccounts.ts
index df80593262..ba45430d1b 100644
--- a/src/actions/wallet/getAccounts.ts
+++ b/src/actions/wallet/getAccounts.ts
@@ -1,7 +1,12 @@
+import { Address } from 'abitype'
 import type { WalletClient } from '../../clients'
 import { checksumAddress } from '../../utils/address'
 
-export async function getAccounts(client: WalletClient) {
+export type GetAccountsResponse = Address[]
+
+export async function getAccounts(
+  client: WalletClient,
+): Promise<GetAccountsResponse> {
   const addresses = await client.request({ method: 'eth_accounts' })
   return addresses.map((address) => checksumAddress(address))
 }
diff --git a/src/actions/wallet/index.ts b/src/actions/wallet/index.ts
index cb49f3c367..5842565263 100644
--- a/src/actions/wallet/index.ts
+++ b/src/actions/wallet/index.ts
@@ -1,4 +1,5 @@
 export { addChain } from './addChain'
+export type { AddChainArgs } from './addChain'
 
 export { deployContract } from './deployContract'
 export type {
@@ -7,14 +8,19 @@ export type {
 } from './deployContract'
 
 export { getAccounts } from './getAccounts'
+export type { GetAccountsResponse } from './getAccounts'
 
 export { getPermissions } from './getPermissions'
 export type { GetPermissionsResponse } from './getPermissions'
 
 export { requestAccounts } from './requestAccounts'
+export type { RequestAccountsResponse } from './requestAccounts'
 
 export { requestPermissions } from './requestPermissions'
-export type { RequestPermissionsResponse } from './requestPermissions'
+export type {
+  RequestPermissionsArgs,
+  RequestPermissionsResponse,
+} from './requestPermissions'
 
 export { sendTransaction } from './sendTransaction'
 export type {
diff --git a/src/actions/wallet/requestAccounts.ts b/src/actions/wallet/requestAccounts.ts
index 333d5d0f8f..f6737af3c8 100644
--- a/src/actions/wallet/requestAccounts.ts
+++ b/src/actions/wallet/requestAccounts.ts
@@ -1,7 +1,12 @@
+import { Address } from 'abitype'
 import type { WalletClient } from '../../clients'
 import { getAddress } from '../../utils'
 
-export async function requestAccounts(client: WalletClient) {
+export type RequestAccountsResponse = Address[]
+
+export async function requestAccounts(
+  client: WalletClient,
+): Promise<RequestAccountsResponse> {
   const addresses = await client.request({ method: 'eth_requestAccounts' })
   return addresses.map((address) => getAddress(address))
 }
diff --git a/src/clients/createPublicClient.test.ts b/src/clients/createPublicClient.test.ts
index 228a7a661d..7705e72c54 100644
--- a/src/clients/createPublicClient.test.ts
+++ b/src/clients/createPublicClient.test.ts
@@ -27,11 +27,38 @@ test('creates', () => {
   expect(uid).toBeDefined()
   expect(client).toMatchInlineSnapshot(`
     {
+      "call": [Function],
       "chain": undefined,
+      "createBlockFilter": [Function],
+      "createContractEventFilter": [Function],
+      "createEventFilter": [Function],
+      "createPendingTransactionFilter": [Function],
+      "estimateContractGas": [Function],
+      "estimateGas": [Function],
+      "getBalance": [Function],
+      "getBlock": [Function],
+      "getBlockNumber": [Function],
+      "getBlockTransactionCount": [Function],
+      "getBytecode": [Function],
+      "getChainId": [Function],
+      "getEnsAddress": [Function],
+      "getEnsName": [Function],
+      "getFeeHistory": [Function],
+      "getFilterChanges": [Function],
+      "getFilterLogs": [Function],
+      "getGasPrice": [Function],
+      "getLogs": [Function],
+      "getStorageAt": [Function],
+      "getTransaction": [Function],
+      "getTransactionConfirmations": [Function],
+      "getTransactionReceipt": [Function],
       "key": "public",
+      "multicall": [Function],
       "name": "Public Client",
       "pollingInterval": 4000,
+      "readContract": [Function],
       "request": [Function],
+      "simulateContract": [Function],
       "transport": {
         "key": "mock",
         "name": "Mock Transport",
@@ -41,6 +68,13 @@ test('creates', () => {
         "type": "mock",
       },
       "type": "publicClient",
+      "uninstallFilter": [Function],
+      "waitForTransactionReceipt": [Function],
+      "watchBlockNumber": [Function],
+      "watchBlocks": [Function],
+      "watchContractEvent": [Function],
+      "watchEvent": [Function],
+      "watchPendingTransactions": [Function],
     }
   `)
 })
@@ -55,6 +89,7 @@ describe('transports', () => {
     expect(uid).toBeDefined()
     expect(client).toMatchInlineSnapshot(`
       {
+        "call": [Function],
         "chain": {
           "id": 1337,
           "name": "Localhost",
@@ -77,10 +112,36 @@ describe('transports', () => {
             },
           },
         },
+        "createBlockFilter": [Function],
+        "createContractEventFilter": [Function],
+        "createEventFilter": [Function],
+        "createPendingTransactionFilter": [Function],
+        "estimateContractGas": [Function],
+        "estimateGas": [Function],
+        "getBalance": [Function],
+        "getBlock": [Function],
+        "getBlockNumber": [Function],
+        "getBlockTransactionCount": [Function],
+        "getBytecode": [Function],
+        "getChainId": [Function],
+        "getEnsAddress": [Function],
+        "getEnsName": [Function],
+        "getFeeHistory": [Function],
+        "getFilterChanges": [Function],
+        "getFilterLogs": [Function],
+        "getGasPrice": [Function],
+        "getLogs": [Function],
+        "getStorageAt": [Function],
+        "getTransaction": [Function],
+        "getTransactionConfirmations": [Function],
+        "getTransactionReceipt": [Function],
         "key": "public",
+        "multicall": [Function],
         "name": "Public Client",
         "pollingInterval": 4000,
+        "readContract": [Function],
         "request": [Function],
+        "simulateContract": [Function],
         "transport": {
           "key": "http",
           "name": "HTTP JSON-RPC",
@@ -91,6 +152,13 @@ describe('transports', () => {
           "url": undefined,
         },
         "type": "publicClient",
+        "uninstallFilter": [Function],
+        "waitForTransactionReceipt": [Function],
+        "watchBlockNumber": [Function],
+        "watchBlocks": [Function],
+        "watchContractEvent": [Function],
+        "watchEvent": [Function],
+        "watchPendingTransactions": [Function],
       }
     `)
   })
@@ -104,6 +172,7 @@ describe('transports', () => {
     expect(uid).toBeDefined()
     expect(client).toMatchInlineSnapshot(`
       {
+        "call": [Function],
         "chain": {
           "id": 1337,
           "name": "Localhost",
@@ -126,10 +195,36 @@ describe('transports', () => {
             },
           },
         },
+        "createBlockFilter": [Function],
+        "createContractEventFilter": [Function],
+        "createEventFilter": [Function],
+        "createPendingTransactionFilter": [Function],
+        "estimateContractGas": [Function],
+        "estimateGas": [Function],
+        "getBalance": [Function],
+        "getBlock": [Function],
+        "getBlockNumber": [Function],
+        "getBlockTransactionCount": [Function],
+        "getBytecode": [Function],
+        "getChainId": [Function],
+        "getEnsAddress": [Function],
+        "getEnsName": [Function],
+        "getFeeHistory": [Function],
+        "getFilterChanges": [Function],
+        "getFilterLogs": [Function],
+        "getGasPrice": [Function],
+        "getLogs": [Function],
+        "getStorageAt": [Function],
+        "getTransaction": [Function],
+        "getTransactionConfirmations": [Function],
+        "getTransactionReceipt": [Function],
         "key": "public",
+        "multicall": [Function],
         "name": "Public Client",
         "pollingInterval": 4000,
+        "readContract": [Function],
         "request": [Function],
+        "simulateContract": [Function],
         "transport": {
           "getSocket": [Function],
           "key": "webSocket",
@@ -141,6 +236,13 @@ describe('transports', () => {
           "type": "webSocket",
         },
         "type": "publicClient",
+        "uninstallFilter": [Function],
+        "waitForTransactionReceipt": [Function],
+        "watchBlockNumber": [Function],
+        "watchBlocks": [Function],
+        "watchContractEvent": [Function],
+        "watchEvent": [Function],
+        "watchPendingTransactions": [Function],
       }
     `)
   })
@@ -153,11 +255,38 @@ describe('transports', () => {
     expect(uid).toBeDefined()
     expect(client).toMatchInlineSnapshot(`
       {
+        "call": [Function],
         "chain": undefined,
+        "createBlockFilter": [Function],
+        "createContractEventFilter": [Function],
+        "createEventFilter": [Function],
+        "createPendingTransactionFilter": [Function],
+        "estimateContractGas": [Function],
+        "estimateGas": [Function],
+        "getBalance": [Function],
+        "getBlock": [Function],
+        "getBlockNumber": [Function],
+        "getBlockTransactionCount": [Function],
+        "getBytecode": [Function],
+        "getChainId": [Function],
+        "getEnsAddress": [Function],
+        "getEnsName": [Function],
+        "getFeeHistory": [Function],
+        "getFilterChanges": [Function],
+        "getFilterLogs": [Function],
+        "getGasPrice": [Function],
+        "getLogs": [Function],
+        "getStorageAt": [Function],
+        "getTransaction": [Function],
+        "getTransactionConfirmations": [Function],
+        "getTransactionReceipt": [Function],
         "key": "public",
+        "multicall": [Function],
         "name": "Public Client",
         "pollingInterval": 4000,
+        "readContract": [Function],
         "request": [Function],
+        "simulateContract": [Function],
         "transport": {
           "key": "custom",
           "name": "Custom Provider",
@@ -167,6 +296,13 @@ describe('transports', () => {
           "type": "custom",
         },
         "type": "publicClient",
+        "uninstallFilter": [Function],
+        "waitForTransactionReceipt": [Function],
+        "watchBlockNumber": [Function],
+        "watchBlocks": [Function],
+        "watchContractEvent": [Function],
+        "watchEvent": [Function],
+        "watchPendingTransactions": [Function],
       }
     `)
   })
diff --git a/src/clients/createPublicClient.ts b/src/clients/createPublicClient.ts
index 6f1e2eb99a..77c581da8a 100644
--- a/src/clients/createPublicClient.ts
+++ b/src/clients/createPublicClient.ts
@@ -2,6 +2,7 @@ import type { PublicRequests } from '../types/eip1193'
 import type { Transport } from './transports/createTransport'
 import type { Client, ClientConfig } from './createClient'
 import { createClient } from './createClient'
+import { publicActions, PublicActions } from './decorators'
 import { Chain } from '../types'
 
 export type PublicClientConfig<
@@ -15,7 +16,9 @@ export type PublicClientConfig<
 export type PublicClient<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
-> = Client<TTransport, TChain, PublicRequests>
+  TIncludeActions extends boolean = true,
+> = Client<TTransport, TChain, PublicRequests> &
+  (TIncludeActions extends true ? PublicActions<TChain> : {})
 
 /**
  * @description Creates a public client with a given transport.
@@ -25,7 +28,7 @@ export type PublicClient<
  * @example
  * import { mainnet } from 'viem/chains'
  * import { createPublicClient, http } from 'viem/clients'
- * const client = createPublicClient(http({ chain: mainnet }))
+ * const client = createPublicClient({ transport: http('https://...') })
  */
 export function createPublicClient<
   TTransport extends Transport,
@@ -36,9 +39,12 @@ export function createPublicClient<
   name = 'Public Client',
   transport,
   pollingInterval,
-}: PublicClientConfig<TTransport, TChain>): PublicClient<TTransport, TChain> {
-  chain
-  return createClient({
+}: PublicClientConfig<TTransport, TChain>): PublicClient<
+  TTransport,
+  TChain,
+  true
+> {
+  const client = createClient({
     chain,
     key,
     name,
@@ -46,4 +52,8 @@ export function createPublicClient<
     transport,
     type: 'publicClient',
   })
+  return {
+    ...client,
+    ...publicActions(client as PublicClient<any, any>),
+  }
 }
diff --git a/src/clients/createTestClient.test.ts b/src/clients/createTestClient.test.ts
index 43bb888084..a6fe31b15c 100644
--- a/src/clients/createTestClient.test.ts
+++ b/src/clients/createTestClient.test.ts
@@ -27,11 +27,39 @@ test('creates', () => {
   expect(client).toMatchInlineSnapshot(`
     {
       "chain": undefined,
+      "dropTransaction": [Function],
+      "getAutomine": [Function],
+      "getTxPoolContent": [Function],
+      "getTxPoolStatus": [Function],
+      "impersonateAccount": [Function],
+      "increaseTime": [Function],
+      "inspectTxpool": [Function],
       "key": "test",
+      "mine": [Function],
       "mode": "anvil",
       "name": "Test Client",
       "pollingInterval": 4000,
+      "removeBlockTimestampInterval": [Function],
       "request": [Function],
+      "reset": [Function],
+      "revert": [Function],
+      "sendUnsignedTransaction": [Function],
+      "setAutomine": [Function],
+      "setBalance": [Function],
+      "setBlockGasLimit": [Function],
+      "setBlockTimestampInterval": [Function],
+      "setCode": [Function],
+      "setCoinbase": [Function],
+      "setIntervalMining": [Function],
+      "setLoggingEnabled": [Function],
+      "setMinGasPrice": [Function],
+      "setNextBlockBaseFeePerGas": [Function],
+      "setNextBlockTimestamp": [Function],
+      "setNonce": [Function],
+      "setRpcUrl": [Function],
+      "setStorageAt": [Function],
+      "snapshot": [Function],
+      "stopImpersonatingAccount": [Function],
       "transport": {
         "key": "mock",
         "name": "Mock Transport",
@@ -78,11 +106,39 @@ describe('transports', () => {
             },
           },
         },
+        "dropTransaction": [Function],
+        "getAutomine": [Function],
+        "getTxPoolContent": [Function],
+        "getTxPoolStatus": [Function],
+        "impersonateAccount": [Function],
+        "increaseTime": [Function],
+        "inspectTxpool": [Function],
         "key": "test",
+        "mine": [Function],
         "mode": "anvil",
         "name": "Test Client",
         "pollingInterval": 4000,
+        "removeBlockTimestampInterval": [Function],
         "request": [Function],
+        "reset": [Function],
+        "revert": [Function],
+        "sendUnsignedTransaction": [Function],
+        "setAutomine": [Function],
+        "setBalance": [Function],
+        "setBlockGasLimit": [Function],
+        "setBlockTimestampInterval": [Function],
+        "setCode": [Function],
+        "setCoinbase": [Function],
+        "setIntervalMining": [Function],
+        "setLoggingEnabled": [Function],
+        "setMinGasPrice": [Function],
+        "setNextBlockBaseFeePerGas": [Function],
+        "setNextBlockTimestamp": [Function],
+        "setNonce": [Function],
+        "setRpcUrl": [Function],
+        "setStorageAt": [Function],
+        "snapshot": [Function],
+        "stopImpersonatingAccount": [Function],
         "transport": {
           "key": "http",
           "name": "HTTP JSON-RPC",
@@ -129,11 +185,39 @@ describe('transports', () => {
             },
           },
         },
+        "dropTransaction": [Function],
+        "getAutomine": [Function],
+        "getTxPoolContent": [Function],
+        "getTxPoolStatus": [Function],
+        "impersonateAccount": [Function],
+        "increaseTime": [Function],
+        "inspectTxpool": [Function],
         "key": "test",
+        "mine": [Function],
         "mode": "anvil",
         "name": "Test Client",
         "pollingInterval": 4000,
+        "removeBlockTimestampInterval": [Function],
         "request": [Function],
+        "reset": [Function],
+        "revert": [Function],
+        "sendUnsignedTransaction": [Function],
+        "setAutomine": [Function],
+        "setBalance": [Function],
+        "setBlockGasLimit": [Function],
+        "setBlockTimestampInterval": [Function],
+        "setCode": [Function],
+        "setCoinbase": [Function],
+        "setIntervalMining": [Function],
+        "setLoggingEnabled": [Function],
+        "setMinGasPrice": [Function],
+        "setNextBlockBaseFeePerGas": [Function],
+        "setNextBlockTimestamp": [Function],
+        "setNonce": [Function],
+        "setRpcUrl": [Function],
+        "setStorageAt": [Function],
+        "snapshot": [Function],
+        "stopImpersonatingAccount": [Function],
         "transport": {
           "getSocket": [Function],
           "key": "webSocket",
diff --git a/src/clients/createTestClient.ts b/src/clients/createTestClient.ts
index 6e972b2666..3e12c1e2f2 100644
--- a/src/clients/createTestClient.ts
+++ b/src/clients/createTestClient.ts
@@ -3,6 +3,7 @@ import type { Transport } from './transports/createTransport'
 import type { Client, ClientConfig } from './createClient'
 import { createClient } from './createClient'
 import { Chain } from '../types'
+import { testActions, TestActions } from './decorators'
 
 type TestClientModes = 'anvil' | 'hardhat'
 
@@ -27,9 +28,10 @@ export type TestClient<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
   TMode extends TestClientModes = TestClientModes,
+  TIncludeActions extends boolean = true,
 > = Client<TTransport, TChain, TestRequests<TMode>> & {
   mode: TMode
-}
+} & (TIncludeActions extends true ? TestActions<TChain> : {})
 
 /**
  * @description Creates a test client with a given transport.
@@ -56,9 +58,10 @@ export function createTestClient<
 }: TestClientConfig<TTransport, TChain, TMode>): TestClient<
   TTransport,
   TChain,
-  TMode
+  TMode,
+  true
 > {
-  return {
+  const client = {
     ...createClient({
       chain,
       key,
@@ -69,4 +72,8 @@ export function createTestClient<
     }),
     mode,
   }
+  return {
+    ...client,
+    ...testActions(client as TestClient<any, any, any>),
+  }
 }
diff --git a/src/clients/createWalletClient.test.ts b/src/clients/createWalletClient.test.ts
index b8422d96b1..2e8b2c4813 100644
--- a/src/clients/createWalletClient.test.ts
+++ b/src/clients/createWalletClient.test.ts
@@ -26,11 +26,20 @@ test('creates', () => {
   expect(uid).toBeDefined()
   expect(client).toMatchInlineSnapshot(`
     {
+      "addChain": [Function],
       "chain": undefined,
+      "deployContract": [Function],
+      "getAccounts": [Function],
+      "getPermissions": [Function],
       "key": "wallet",
       "name": "Wallet Client",
       "pollingInterval": 4000,
       "request": [Function],
+      "requestAccounts": [Function],
+      "requestPermissions": [Function],
+      "sendTransaction": [Function],
+      "signMessage": [Function],
+      "switchChain": [Function],
       "transport": {
         "key": "mock",
         "name": "Mock Transport",
@@ -40,6 +49,8 @@ test('creates', () => {
         "type": "mock",
       },
       "type": "walletClient",
+      "watchAsset": [Function],
+      "writeContract": [Function],
     }
   `)
 })
@@ -53,11 +64,20 @@ describe('transports', () => {
     expect(uid).toBeDefined()
     expect(client).toMatchInlineSnapshot(`
       {
+        "addChain": [Function],
         "chain": undefined,
+        "deployContract": [Function],
+        "getAccounts": [Function],
+        "getPermissions": [Function],
         "key": "wallet",
         "name": "Wallet Client",
         "pollingInterval": 4000,
         "request": [Function],
+        "requestAccounts": [Function],
+        "requestPermissions": [Function],
+        "sendTransaction": [Function],
+        "signMessage": [Function],
+        "switchChain": [Function],
         "transport": {
           "key": "custom",
           "name": "Custom Provider",
@@ -67,6 +87,8 @@ describe('transports', () => {
           "type": "custom",
         },
         "type": "walletClient",
+        "watchAsset": [Function],
+        "writeContract": [Function],
       }
     `)
   })
@@ -79,11 +101,20 @@ describe('transports', () => {
     expect(uid).toBeDefined()
     expect(client).toMatchInlineSnapshot(`
       {
+        "addChain": [Function],
         "chain": undefined,
+        "deployContract": [Function],
+        "getAccounts": [Function],
+        "getPermissions": [Function],
         "key": "wallet",
         "name": "Wallet Client",
         "pollingInterval": 4000,
         "request": [Function],
+        "requestAccounts": [Function],
+        "requestPermissions": [Function],
+        "sendTransaction": [Function],
+        "signMessage": [Function],
+        "switchChain": [Function],
         "transport": {
           "key": "http",
           "name": "HTTP JSON-RPC",
@@ -94,6 +125,8 @@ describe('transports', () => {
           "url": "https://mockapi.com/rpc",
         },
         "type": "walletClient",
+        "watchAsset": [Function],
+        "writeContract": [Function],
       }
     `)
   })
@@ -107,11 +140,20 @@ describe('transports', () => {
     expect(uid).toBeDefined()
     expect(client).toMatchInlineSnapshot(`
       {
+        "addChain": [Function],
         "chain": undefined,
+        "deployContract": [Function],
+        "getAccounts": [Function],
+        "getPermissions": [Function],
         "key": "wallet",
         "name": "Wallet Client",
         "pollingInterval": 4000,
         "request": [Function],
+        "requestAccounts": [Function],
+        "requestPermissions": [Function],
+        "sendTransaction": [Function],
+        "signMessage": [Function],
+        "switchChain": [Function],
         "transport": {
           "getSocket": [Function],
           "key": "webSocket",
@@ -123,6 +165,8 @@ describe('transports', () => {
           "type": "webSocket",
         },
         "type": "walletClient",
+        "watchAsset": [Function],
+        "writeContract": [Function],
       }
     `)
   })
diff --git a/src/clients/createWalletClient.ts b/src/clients/createWalletClient.ts
index 05a6f23d16..c466162e31 100644
--- a/src/clients/createWalletClient.ts
+++ b/src/clients/createWalletClient.ts
@@ -3,6 +3,8 @@ import type { Transport } from './transports/createTransport'
 import type { Client, ClientConfig } from './createClient'
 import { createClient } from './createClient'
 import { Chain } from '../types'
+import { WalletActions, walletActions } from './decorators'
+import { wagmiContractConfig } from '../_test'
 
 export type WalletClientConfig<
   TTransport extends Transport = Transport,
@@ -21,7 +23,9 @@ export type WalletClientConfig<
 export type WalletClient<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
-> = Client<TTransport, TChain, SignableRequests & WalletRequests>
+  TIncludeActions extends boolean = true,
+> = Client<TTransport, TChain, SignableRequests & WalletRequests> &
+  (TIncludeActions extends true ? WalletActions<TChain> : {})
 
 /**
  * @description Creates a wallet client with a given transport.
@@ -43,12 +47,20 @@ export function createWalletClient<
   key = 'wallet',
   name = 'Wallet Client',
   pollingInterval,
-}: WalletClientConfig<TTransport, TChain>): WalletClient<TTransport, TChain> {
-  return createClient({
+}: WalletClientConfig<TTransport, TChain>): WalletClient<
+  TTransport,
+  TChain,
+  true
+> {
+  const client = createClient({
     key,
     name,
     pollingInterval,
     transport,
     type: 'walletClient',
   })
+  return {
+    ...client,
+    ...(walletActions(client as any) as any),
+  }
 }
diff --git a/src/clients/decorators/index.ts b/src/clients/decorators/index.ts
new file mode 100644
index 0000000000..b7744fdf0c
--- /dev/null
+++ b/src/clients/decorators/index.ts
@@ -0,0 +1,8 @@
+export type { PublicActions } from './public'
+export { publicActions } from './public'
+
+export type { TestActions } from './test'
+export { testActions } from './test'
+
+export type { WalletActions } from './wallet'
+export { walletActions } from './wallet'
diff --git a/src/clients/decorators/public.test.ts b/src/clients/decorators/public.test.ts
new file mode 100644
index 0000000000..4db2a86e62
--- /dev/null
+++ b/src/clients/decorators/public.test.ts
@@ -0,0 +1,321 @@
+import { describe, expect, test } from 'vitest'
+import { parseEther } from '../../utils'
+import {
+  accounts,
+  address,
+  initialBlockNumber,
+  publicClient,
+  testClient,
+  usdcContractConfig,
+  wagmiContractConfig,
+  walletClient,
+} from '../../_test'
+import { publicActions } from './public'
+
+test('default', async () => {
+  expect(publicActions(publicClient as any)).toMatchInlineSnapshot(`
+    {
+      "call": [Function],
+      "createBlockFilter": [Function],
+      "createContractEventFilter": [Function],
+      "createEventFilter": [Function],
+      "createPendingTransactionFilter": [Function],
+      "estimateContractGas": [Function],
+      "estimateGas": [Function],
+      "getBalance": [Function],
+      "getBlock": [Function],
+      "getBlockNumber": [Function],
+      "getBlockTransactionCount": [Function],
+      "getBytecode": [Function],
+      "getChainId": [Function],
+      "getEnsAddress": [Function],
+      "getEnsName": [Function],
+      "getFeeHistory": [Function],
+      "getFilterChanges": [Function],
+      "getFilterLogs": [Function],
+      "getGasPrice": [Function],
+      "getLogs": [Function],
+      "getStorageAt": [Function],
+      "getTransaction": [Function],
+      "getTransactionConfirmations": [Function],
+      "getTransactionReceipt": [Function],
+      "multicall": [Function],
+      "readContract": [Function],
+      "simulateContract": [Function],
+      "uninstallFilter": [Function],
+      "waitForTransactionReceipt": [Function],
+      "watchBlockNumber": [Function],
+      "watchBlocks": [Function],
+      "watchContractEvent": [Function],
+      "watchEvent": [Function],
+      "watchPendingTransactions": [Function],
+    }
+  `)
+})
+
+describe('smoke test', () => {
+  test('call', async () => {
+    const { data } = await publicClient.call({
+      data: '0x06fdde03',
+      from: accounts[0].address,
+      to: wagmiContractConfig.address,
+    })
+    expect(data).toMatchInlineSnapshot(
+      '"0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000057761676d69000000000000000000000000000000000000000000000000000000"',
+    )
+  })
+
+  test('createBlockFilter', async () => {
+    expect(await publicClient.createBlockFilter()).toBeDefined()
+  })
+
+  test('createContractEventFilter', async () => {
+    expect(
+      await publicClient.createContractEventFilter({
+        abi: usdcContractConfig.abi,
+      }),
+    ).toBeDefined()
+  })
+
+  test('createEventFilter', async () => {
+    expect(await publicClient.createEventFilter()).toBeDefined()
+  })
+
+  test('createPendingTransactionFilter', async () => {
+    expect(await publicClient.createPendingTransactionFilter()).toBeDefined()
+  })
+
+  test('estimateContractGas', async () => {
+    expect(
+      await publicClient.estimateContractGas({
+        ...wagmiContractConfig,
+        from: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
+        functionName: 'mint',
+        args: [69420n],
+      }),
+    ).toEqual(57025n)
+  })
+
+  test('estimateGas', async () => {
+    expect(
+      await publicClient.estimateGas({
+        from: accounts[0].address,
+        to: accounts[1].address,
+        value: parseEther('1'),
+      }),
+    ).toEqual(21000n)
+  })
+
+  test('getBalance', async () => {
+    expect(
+      await publicClient.getBalance({ address: accounts[5].address }),
+    ).toEqual(10000000000000000000000n)
+  })
+
+  test('getBlock', async () => {
+    expect(
+      await publicClient.getBlock({ blockNumber: initialBlockNumber }),
+    ).toBeDefined()
+  })
+
+  test('getBlockNumber', async () => {
+    expect(await publicClient.getBlockNumber()).toBeDefined()
+  })
+
+  test('getBlockTransactionCount', async () => {
+    expect(await publicClient.getBlockTransactionCount()).toBeDefined()
+  })
+
+  test('getBytecode', async () => {
+    expect(
+      await publicClient.getBytecode({ address: wagmiContractConfig.address }),
+    ).toBeDefined()
+  })
+
+  test('getChainId', async () => {
+    expect(await publicClient.getChainId()).toBeDefined()
+  })
+
+  test('getEnsAddress', async () => {
+    expect(await publicClient.getEnsAddress({ name: 'jxom.eth' })).toBeDefined()
+  })
+
+  test('getEnsName', async () => {
+    expect(
+      await publicClient.getEnsName({ address: address.vitalik }),
+    ).toBeDefined()
+  })
+
+  test('getFeeHistory', async () => {
+    expect(
+      await publicClient.getFeeHistory({
+        blockCount: 4,
+        blockNumber: initialBlockNumber,
+        rewardPercentiles: [0, 50, 100],
+      }),
+    ).toBeDefined()
+  })
+
+  test('getFilterChanges', async () => {
+    const filter = await publicClient.createPendingTransactionFilter()
+    expect(
+      await publicClient.getFilterChanges({
+        filter,
+      }),
+    ).toBeDefined()
+  })
+
+  test('getFilterLogs', async () => {
+    const filter = await publicClient.createEventFilter()
+    expect(
+      await publicClient.getFilterLogs({
+        filter,
+      }),
+    ).toBeDefined()
+  })
+
+  test('getGasPrice', async () => {
+    expect(await publicClient.getGasPrice()).toBeDefined()
+  })
+
+  test('getLogs', async () => {
+    expect(await publicClient.getLogs()).toBeDefined()
+  })
+
+  test('getStorageAt', async () => {
+    expect(
+      await publicClient.getStorageAt({
+        address: wagmiContractConfig.address,
+        slot: '0x0',
+      }),
+    ).toBeDefined()
+  })
+
+  test('getTransaction', async () => {
+    expect(
+      await publicClient.getTransaction({
+        blockNumber: 15131999n,
+        index: 69,
+      }),
+    ).toBeDefined()
+  })
+
+  test('getTransactionConfirmations', async () => {
+    const hash = await walletClient.sendTransaction({
+      from: accounts[0].address,
+      to: accounts[1].address,
+      value: parseEther('1'),
+    })
+    await testClient.mine({ blocks: 1 })
+    const transactionReceipt = await publicClient.getTransactionReceipt({
+      hash,
+    })
+    expect(
+      await publicClient.getTransactionConfirmations({
+        transactionReceipt,
+      }),
+    ).toBe(1n)
+  })
+
+  test('getTransactionReceipt', async () => {
+    expect(
+      await publicClient.getTransactionReceipt({
+        hash: '0xa4b1f606b66105fa45cb5db23d2f6597075701e7f0e2367f4e6a39d17a8cf98b',
+      }),
+    ).toBeDefined()
+  })
+
+  test('multicall', async () => {
+    expect(
+      await publicClient.multicall({
+        blockNumber: initialBlockNumber,
+        contracts: [
+          {
+            ...usdcContractConfig,
+            functionName: 'totalSupply',
+          },
+          {
+            ...usdcContractConfig,
+            functionName: 'balanceOf',
+            args: [address.vitalik],
+          },
+        ],
+        multicallAddress: '0xca11bde05977b3631167028862be2a173976ca11',
+      }),
+    ).toBeDefined()
+  })
+
+  test('readContract', async () => {
+    expect(
+      await publicClient.readContract({
+        ...wagmiContractConfig,
+        functionName: 'balanceOf',
+        args: ['0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC'],
+      }),
+    ).toBeDefined()
+  })
+
+  test('simulateContract', async () => {
+    expect(
+      await publicClient.simulateContract({
+        ...wagmiContractConfig,
+        from: '0xa5cc3c03994DB5b0d9A5eEdD10CabaB0813678AC',
+        functionName: 'mint',
+        args: [69420n],
+      }),
+    ).toBeDefined()
+  })
+
+  test('uninstallFilter', async () => {
+    const filter = await publicClient.createPendingTransactionFilter()
+    expect(await publicClient.uninstallFilter({ filter })).toBeDefined()
+  })
+
+  test('waitForTransactionReceipt', async () => {
+    const hash = await walletClient.sendTransaction({
+      from: accounts[6].address,
+      to: accounts[7].address,
+      value: parseEther('1'),
+    })
+    const { status } = await publicClient.waitForTransactionReceipt({
+      hash,
+    })
+    expect(status).toBe('success')
+  })
+
+  test('watchBlockNumber', async () => {
+    const unwatch = publicClient.watchBlockNumber({
+      onBlockNumber: () => {},
+    })
+    expect(unwatch).toBeDefined()
+  })
+
+  test('watchBlocks', async () => {
+    const unwatch = publicClient.watchBlocks({
+      onBlock: () => {},
+    })
+    expect(unwatch).toBeDefined()
+  })
+
+  test('watchContractEvent', async () => {
+    const unwatch = publicClient.watchContractEvent({
+      abi: wagmiContractConfig.abi,
+      onLogs: () => {},
+    })
+    expect(unwatch).toBeDefined()
+  })
+
+  test('watchEvent', async () => {
+    const unwatch = publicClient.watchEvent({
+      onLogs: () => {},
+    })
+    expect(unwatch).toBeDefined()
+  })
+
+  test('watchPendingTransactions', async () => {
+    const unwatch = publicClient.watchPendingTransactions({
+      onTransactions: () => {},
+    })
+    expect(unwatch).toBeDefined()
+  })
+})
diff --git a/src/clients/decorators/public.ts b/src/clients/decorators/public.ts
new file mode 100644
index 0000000000..bd1b507923
--- /dev/null
+++ b/src/clients/decorators/public.ts
@@ -0,0 +1,263 @@
+import { Abi, AbiEvent } from 'abitype'
+import type {
+  CallArgs,
+  CallResponse,
+  CreateBlockFilterResponse,
+  CreateContractEventFilterArgs,
+  CreateContractEventFilterResponse,
+  CreateEventFilterArgs,
+  CreateEventFilterResponse,
+  CreatePendingTransactionFilterResponse,
+  EstimateGasArgs,
+  EstimateGasResponse,
+  EstimateContractGasArgs,
+  EstimateContractGasResponse,
+  GetBalanceArgs,
+  GetBalanceResponse,
+  GetBlockArgs,
+  GetBlockNumberArgs,
+  GetBlockNumberResponse,
+  GetBlockResponse,
+  GetBlockTransactionCountArgs,
+  GetBlockTransactionCountResponse,
+  GetBytecodeArgs,
+  GetBytecodeResponse,
+  GetChainIdResponse,
+  GetFeeHistoryArgs,
+  GetFeeHistoryResponse,
+  GetFilterChangesArgs,
+  GetFilterChangesResponse,
+  GetFilterLogsArgs,
+  GetFilterLogsResponse,
+  GetGasPriceResponse,
+  GetTransactionArgs,
+  GetTransactionConfirmationsArgs,
+  GetTransactionConfirmationsResponse,
+  GetTransactionReceiptArgs,
+  GetTransactionReceiptResponse,
+  GetTransactionResponse,
+  UninstallFilterArgs,
+  UninstallFilterResponse,
+  WaitForTransactionReceiptArgs,
+  WaitForTransactionReceiptResponse,
+  WatchBlockNumberArgs,
+  WatchBlocksArgs,
+  WatchPendingTransactionsArgs,
+  GetLogsArgs,
+  GetLogsResponse,
+  GetStorageAtArgs,
+  GetStorageAtResponse,
+  MulticallArgs,
+  MulticallResponse,
+  ReadContractArgs,
+  ReadContractResponse,
+  SimulateContractArgs,
+  SimulateContractResponse,
+  WatchContractEventArgs,
+  WatchEventArgs,
+} from '../../actions/public'
+import {
+  call,
+  createBlockFilter,
+  createContractEventFilter,
+  createEventFilter,
+  createPendingTransactionFilter,
+  estimateContractGas,
+  estimateGas,
+  getBalance,
+  getBlock,
+  getBlockNumber,
+  getBlockTransactionCount,
+  getBytecode,
+  getChainId,
+  getFeeHistory,
+  getFilterChanges,
+  getFilterLogs,
+  getGasPrice,
+  getLogs,
+  getTransaction,
+  getTransactionConfirmations,
+  getTransactionReceipt,
+  uninstallFilter,
+  waitForTransactionReceipt,
+  watchBlockNumber,
+  watchBlocks,
+  watchEvent,
+  watchPendingTransactions,
+  getStorageAt,
+  multicall,
+  readContract,
+  simulateContract,
+  watchContractEvent,
+} from '../../actions/public'
+import type {
+  GetEnsAddressArgs,
+  GetEnsAddressResponse,
+  GetEnsNameArgs,
+  GetEnsNameResponse,
+} from '../../actions/ens'
+import { getEnsAddress, getEnsName } from '../../actions/ens'
+import type { PublicClient } from '../createPublicClient'
+import {
+  Chain,
+  ContractConfig,
+  FilterType,
+  MaybeExtractEventArgsFromAbi,
+} from '../../types'
+
+export type PublicActions<TChain extends Chain = Chain> = {
+  call: (args: CallArgs<TChain>) => Promise<CallResponse>
+  createBlockFilter: () => Promise<CreateBlockFilterResponse>
+  createContractEventFilter: <
+    TAbi extends Abi | readonly unknown[],
+    TEventName extends string | undefined,
+    TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
+  >(
+    args: CreateContractEventFilterArgs<TAbi, TEventName, TArgs>,
+  ) => Promise<CreateContractEventFilterResponse<TAbi, TEventName, TArgs>>
+  createEventFilter: <
+    TAbiEvent extends AbiEvent | undefined,
+    TAbi extends Abi | readonly unknown[],
+    TEventName extends string | undefined,
+    TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
+  >(
+    args?: CreateEventFilterArgs<TAbiEvent, TAbi, TEventName, TArgs>,
+  ) => Promise<CreateEventFilterResponse<TAbiEvent, TAbi, TEventName, TArgs>>
+  createPendingTransactionFilter: () => Promise<CreatePendingTransactionFilterResponse>
+  estimateContractGas: <
+    TChain extends Chain,
+    TAbi extends Abi | readonly unknown[],
+    TFunctionName extends string,
+  >(
+    args: EstimateContractGasArgs<TChain, TAbi, TFunctionName>,
+  ) => Promise<EstimateContractGasResponse>
+  estimateGas: (args: EstimateGasArgs<TChain>) => Promise<EstimateGasResponse>
+  getBalance: (args: GetBalanceArgs) => Promise<GetBalanceResponse>
+  getBlock: (args: GetBlockArgs) => Promise<GetBlockResponse<TChain>>
+  getBlockNumber: (args?: GetBlockNumberArgs) => Promise<GetBlockNumberResponse>
+  getBlockTransactionCount: (
+    args?: GetBlockTransactionCountArgs,
+  ) => Promise<GetBlockTransactionCountResponse>
+  getBytecode: (args: GetBytecodeArgs) => Promise<GetBytecodeResponse>
+  getChainId: () => Promise<GetChainIdResponse>
+  getEnsAddress: (args: GetEnsAddressArgs) => Promise<GetEnsAddressResponse>
+  getEnsName: (args: GetEnsNameArgs) => Promise<GetEnsNameResponse>
+  getFeeHistory: (args: GetFeeHistoryArgs) => Promise<GetFeeHistoryResponse>
+  getFilterChanges: <
+    TFilterType extends FilterType,
+    TAbiEvent extends AbiEvent | undefined,
+    TAbi extends Abi | readonly unknown[],
+    TEventName extends string | undefined,
+  >(
+    args: GetFilterChangesArgs<TFilterType, TAbiEvent, TAbi, TEventName>,
+  ) => Promise<
+    GetFilterChangesResponse<TFilterType, TAbiEvent, TAbi, TEventName>
+  >
+  getFilterLogs: <
+    TAbiEvent extends AbiEvent | undefined,
+    TAbi extends Abi | readonly unknown[],
+    TEventName extends string | undefined,
+  >(
+    args: GetFilterLogsArgs<TAbiEvent, TAbi, TEventName>,
+  ) => Promise<GetFilterLogsResponse<TAbiEvent, TAbi, TEventName>>
+  getGasPrice: () => Promise<GetGasPriceResponse>
+  getLogs: <TAbiEvent extends AbiEvent | undefined>(
+    args?: GetLogsArgs<TAbiEvent>,
+  ) => Promise<GetLogsResponse<TAbiEvent>>
+  getStorageAt: (args: GetStorageAtArgs) => Promise<GetStorageAtResponse>
+  getTransaction: (
+    args: GetTransactionArgs,
+  ) => Promise<GetTransactionResponse<TChain>>
+  getTransactionConfirmations: (
+    args: GetTransactionConfirmationsArgs<TChain>,
+  ) => Promise<GetTransactionConfirmationsResponse>
+  getTransactionReceipt: (
+    args: GetTransactionReceiptArgs,
+  ) => Promise<GetTransactionReceiptResponse<TChain>>
+  multicall: <
+    TContracts extends ContractConfig[],
+    TAllowFailure extends boolean = true,
+  >(
+    args: MulticallArgs<TContracts, TAllowFailure>,
+  ) => Promise<MulticallResponse<TContracts, TAllowFailure>>
+  readContract: <
+    TAbi extends Abi | readonly unknown[],
+    TFunctionName extends string,
+  >(
+    args: ReadContractArgs<TAbi, TFunctionName>,
+  ) => Promise<ReadContractResponse>
+  simulateContract: <
+    TAbi extends Abi | readonly unknown[] = Abi,
+    TFunctionName extends string = any,
+  >(
+    args: SimulateContractArgs<TChain, TAbi, TFunctionName>,
+  ) => Promise<SimulateContractResponse<TChain, TAbi, TFunctionName>>
+  uninstallFilter: (
+    args: UninstallFilterArgs,
+  ) => Promise<UninstallFilterResponse>
+  waitForTransactionReceipt: (
+    args: WaitForTransactionReceiptArgs<TChain>,
+  ) => Promise<WaitForTransactionReceiptResponse<TChain>>
+  watchBlockNumber: (
+    args: WatchBlockNumberArgs,
+  ) => ReturnType<typeof watchBlockNumber>
+  watchBlocks: (args: WatchBlocksArgs<TChain>) => ReturnType<typeof watchBlocks>
+  watchContractEvent: <
+    TAbi extends Abi | readonly unknown[],
+    TEventName extends string,
+  >(
+    args: WatchContractEventArgs<TAbi, TEventName>,
+  ) => ReturnType<typeof watchContractEvent>
+  watchEvent: <
+    TAbiEvent extends AbiEvent | undefined,
+    TEventName extends string | undefined,
+  >(
+    args: WatchEventArgs<TAbiEvent>,
+  ) => ReturnType<typeof watchEvent>
+  watchPendingTransactions: (
+    args: WatchPendingTransactionsArgs,
+  ) => ReturnType<typeof watchPendingTransactions>
+}
+
+export const publicActions = <
+  TChain extends Chain,
+  TClient extends PublicClient<any, any>,
+>(
+  client: TClient,
+): PublicActions<TChain> => ({
+  call: (args) => call(client, args),
+  createBlockFilter: () => createBlockFilter(client),
+  createContractEventFilter: (args) => createContractEventFilter(client, args),
+  createEventFilter: (args) => createEventFilter(client, args),
+  createPendingTransactionFilter: () => createPendingTransactionFilter(client),
+  estimateContractGas: (args) => estimateContractGas(client, args),
+  estimateGas: (args) => estimateGas(client, args),
+  getBalance: (args) => getBalance(client, args),
+  getBlock: (args) => getBlock(client, args),
+  getBlockNumber: (args) => getBlockNumber(client, args),
+  getBlockTransactionCount: (args) => getBlockTransactionCount(client, args),
+  getBytecode: (args) => getBytecode(client, args),
+  getChainId: () => getChainId(client),
+  getEnsAddress: (args) => getEnsAddress(client, args),
+  getEnsName: (args) => getEnsName(client, args),
+  getFeeHistory: (args) => getFeeHistory(client, args),
+  getFilterChanges: (args) => getFilterChanges(client, args),
+  getFilterLogs: (args) => getFilterLogs(client, args),
+  getGasPrice: () => getGasPrice(client),
+  getLogs: (args) => getLogs(client, args),
+  getStorageAt: (args) => getStorageAt(client, args),
+  getTransaction: (args) => getTransaction(client, args),
+  getTransactionConfirmations: (args) =>
+    getTransactionConfirmations(client, args),
+  getTransactionReceipt: (args) => getTransactionReceipt(client, args),
+  multicall: (args) => multicall(client, args),
+  readContract: (args) => readContract(client, args),
+  simulateContract: (args) => simulateContract(client, args),
+  uninstallFilter: (args) => uninstallFilter(client, args),
+  waitForTransactionReceipt: (args) => waitForTransactionReceipt(client, args),
+  watchBlocks: (args) => watchBlocks(client, args),
+  watchBlockNumber: (args) => watchBlockNumber(client, args),
+  watchContractEvent: (args) => watchContractEvent(client, args),
+  watchEvent: (args) => watchEvent(client, args),
+  watchPendingTransactions: (args) => watchPendingTransactions(client, args),
+})
diff --git a/src/clients/decorators/test.test.ts b/src/clients/decorators/test.test.ts
new file mode 100644
index 0000000000..39bc21889a
--- /dev/null
+++ b/src/clients/decorators/test.test.ts
@@ -0,0 +1,223 @@
+import { describe, expect, test } from 'vitest'
+import { setNonce } from '../../test'
+import { parseEther, parseGwei } from '../../utils'
+import {
+  accounts,
+  address,
+  initialBlockNumber,
+  publicClient,
+  testClient,
+  walletClient,
+} from '../../_test'
+import { testActions } from './test'
+
+const bytecode =
+  '0x60806040526000600355600019600955600c80546001600160a01b031916737a250d5630b4cf539739df2c5dacb4c659f2488d1790553480156200004257600080fd5b506040516200197138038062001971833981810160405260808110156200006857600080fd5b81019080805160405193929190846401000000008211156200008957600080fd5b9083019060208201858111156200009f57600080fd5b8251640100000000811182820188101715620000ba57600080fd5b82525081516020918201929091019080838360005b83811015620000e9578181015183820152602001620000cf565b50505050905090810190601f168015620001175780820380516001836020036101000a031916815260200191505b50604052602001805160405193929190846401000000008211156200013b57600080fd5b9083019060208201858111156200015157600080fd5b82516401000000008111828201881017156200016c57600080fd5b82525081516020918201929091019080838360005b838110156200019b57818101518382015260200162000181565b50505050905090810190601f168015620001c95780820380516001836020036101000a031916815260200191505b506040908152602082810151929091015186519294509250620001f291600691870190620003db565b50825162000208906007906020860190620003db565b506008805460ff19166012179055600a80546001600160a01b038084166001600160a01b0319928316811793849055600b805490931617909155620002629116670de0b6b3a764000084026001600160e01b036200026c16565b5050505062000480565b600a546001600160a01b03163314620002cc576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b620002e8816005546200037960201b620013691790919060201c565b600555600a546001600160a01b0316600090815260208181526040909120546200031d9183906200136962000379821b17901c565b600a546001600160a01b0390811660009081526020818152604080832094909455835185815293519286169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b600082820183811015620003d4576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200041e57805160ff19168380011785556200044e565b828001600101855582156200044e579182015b828111156200044e57825182559160200191906001019062000431565b506200045c92915062000460565b5090565b6200047d91905b808211156200045c576000815560010162000467565b90565b6114e180620004906000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c806352b0f19611610097578063a9059cbb11610066578063a9059cbb14610472578063b2bdfa7b1461049e578063dd62ed3e146104c2578063e1268115146104f0576100f5565b806352b0f196146102f457806370a082311461041e57806380b2122e1461044457806395d89b411461046a576100f5565b806318160ddd116100d357806318160ddd1461025a57806323b872dd14610274578063313ce567146102aa5780634e6ec247146102c8576100f5565b8063043fa39e146100fa57806306fdde031461019d578063095ea7b31461021a575b600080fd5b61019b6004803603602081101561011057600080fd5b810190602081018135600160201b81111561012a57600080fd5b82018360208201111561013c57600080fd5b803590602001918460208302840111600160201b8311171561015d57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610591945050505050565b005b6101a5610686565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101df5781810151838201526020016101c7565b50505050905090810190601f16801561020c5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102466004803603604081101561023057600080fd5b506001600160a01b03813516906020013561071c565b604080519115158252519081900360200190f35b610262610739565b60408051918252519081900360200190f35b6102466004803603606081101561028a57600080fd5b506001600160a01b0381358116916020810135909116906040013561073f565b6102b26107cc565b6040805160ff9092168252519081900360200190f35b61019b600480360360408110156102de57600080fd5b506001600160a01b0381351690602001356107d5565b61019b6004803603606081101561030a57600080fd5b81359190810190604081016020820135600160201b81111561032b57600080fd5b82018360208201111561033d57600080fd5b803590602001918460208302840111600160201b8311171561035e57600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b8111156103ad57600080fd5b8201836020820111156103bf57600080fd5b803590602001918460208302840111600160201b831117156103e057600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506108d1945050505050565b6102626004803603602081101561043457600080fd5b50356001600160a01b03166109ea565b61019b6004803603602081101561045a57600080fd5b50356001600160a01b0316610a05565b6101a5610a6f565b6102466004803603604081101561048857600080fd5b506001600160a01b038135169060200135610ad0565b6104a6610ae4565b604080516001600160a01b039092168252519081900360200190f35b610262600480360360408110156104d857600080fd5b506001600160a01b0381358116916020013516610af3565b61019b6004803603602081101561050657600080fd5b810190602081018135600160201b81111561052057600080fd5b82018360208201111561053257600080fd5b803590602001918460208302840111600160201b8311171561055357600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610b1e945050505050565b600a546001600160a01b031633146105d9576040805162461bcd60e51b815260206004820152600660248201526510b7bbb732b960d11b604482015290519081900360640190fd5b60005b8151811015610682576001600260008484815181106105f757fe5b60200260200101516001600160a01b03166001600160a01b0316815260200190815260200160002060006101000a81548160ff02191690831515021790555060006001600084848151811061064857fe5b6020908102919091018101516001600160a01b03168252810191909152604001600020805460ff19169115159190911790556001016105dc565b5050565b60068054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156107125780601f106106e757610100808354040283529160200191610712565b820191906000526020600020905b8154815290600101906020018083116106f557829003601f168201915b5050505050905090565b6000610730610729610c0e565b8484610c12565b50600192915050565b60055490565b600061074c848484610cfe565b6107c284610758610c0e565b6107bd8560405180606001604052806028815260200161143b602891396001600160a01b038a16600090815260046020526040812090610796610c0e565b6001600160a01b03168152602081019190915260400160002054919063ffffffff6112d216565b610c12565b5060019392505050565b60085460ff1690565b600a546001600160a01b03163314610834576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b600554610847908263ffffffff61136916565b600555600a546001600160a01b0316600090815260208190526040902054610875908263ffffffff61136916565b600a546001600160a01b0390811660009081526020818152604080832094909455835185815293519286169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b600a546001600160a01b03163314610919576040805162461bcd60e51b815260206004820152600660248201526510b7bbb732b960d11b604482015290519081900360640190fd5b60005b82518110156109e45761095583828151811061093457fe5b602002602001015183838151811061094857fe5b6020026020010151610ad0565b50838110156109dc57600180600085848151811061096f57fe5b60200260200101516001600160a01b03166001600160a01b0316815260200190815260200160002060006101000a81548160ff0219169083151502179055506109dc8382815181106109bd57fe5b6020908102919091010151600c546001600160a01b0316600019610c12565b60010161091c565b50505050565b6001600160a01b031660009081526020819052604090205490565b600a546001600160a01b03163314610a4d576040805162461bcd60e51b815260206004820152600660248201526510b7bbb732b960d11b604482015290519081900360640190fd5b600b80546001600160a01b0319166001600160a01b0392909216919091179055565b60078054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156107125780601f106106e757610100808354040283529160200191610712565b6000610730610add610c0e565b8484610cfe565b600a546001600160a01b031681565b6001600160a01b03918216600090815260046020908152604080832093909416825291909152205490565b600a546001600160a01b03163314610b66576040805162461bcd60e51b815260206004820152600660248201526510b7bbb732b960d11b604482015290519081900360640190fd5b60005b8151811015610682576001806000848481518110610b8357fe5b60200260200101516001600160a01b03166001600160a01b0316815260200190815260200160002060006101000a81548160ff021916908315150217905550600060026000848481518110610bd457fe5b6020908102919091018101516001600160a01b03168252810191909152604001600020805460ff1916911515919091179055600101610b69565b3390565b6001600160a01b038316610c575760405162461bcd60e51b81526004018080602001828103825260248152602001806114886024913960400191505060405180910390fd5b6001600160a01b038216610c9c5760405162461bcd60e51b81526004018080602001828103825260228152602001806113f36022913960400191505060405180910390fd5b6001600160a01b03808416600081815260046020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b600b54600a548491849184916001600160a01b039182169116148015610d315750600a546001600160a01b038481169116145b15610eb557600b80546001600160a01b0319166001600160a01b03848116919091179091558616610d935760405162461bcd60e51b81526004018080602001828103825260258152602001806114636025913960400191505060405180910390fd5b6001600160a01b038516610dd85760405162461bcd60e51b81526004018080602001828103825260238152602001806113d06023913960400191505060405180910390fd5b610de38686866113ca565b610e2684604051806060016040528060268152602001611415602691396001600160a01b038916600090815260208190526040902054919063ffffffff6112d216565b6001600160a01b038088166000908152602081905260408082209390935590871681522054610e5b908563ffffffff61136916565b6001600160a01b038087166000818152602081815260409182902094909455805188815290519193928a16927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a36112ca565b600a546001600160a01b0384811691161480610ede5750600b546001600160a01b038481169116145b80610ef65750600a546001600160a01b038381169116145b15610f7957600a546001600160a01b038481169116148015610f295750816001600160a01b0316836001600160a01b0316145b15610f345760038190555b6001600160a01b038616610d935760405162461bcd60e51b81526004018080602001828103825260258152602001806114636025913960400191505060405180910390fd5b6001600160a01b03831660009081526001602081905260409091205460ff1615151415610fe5576001600160a01b038616610d935760405162461bcd60e51b81526004018080602001828103825260258152602001806114636025913960400191505060405180910390fd5b6001600160a01b03831660009081526002602052604090205460ff1615156001141561106f57600b546001600160a01b03848116911614806110345750600c546001600160a01b038381169116145b610f345760405162461bcd60e51b81526004018080602001828103825260268152602001806114156026913960400191505060405180910390fd5b60035481101561110357600b546001600160a01b0383811691161415610f34576001600160a01b0383811660009081526002602090815260408083208054600160ff1991821681179092559252909120805490911690558616610d935760405162461bcd60e51b81526004018080602001828103825260258152602001806114636025913960400191505060405180910390fd5b600b546001600160a01b038481169116148061112c5750600c546001600160a01b038381169116145b6111675760405162461bcd60e51b81526004018080602001828103825260268152602001806114156026913960400191505060405180910390fd5b6001600160a01b0386166111ac5760405162461bcd60e51b81526004018080602001828103825260258152602001806114636025913960400191505060405180910390fd5b6001600160a01b0385166111f15760405162461bcd60e51b81526004018080602001828103825260238152602001806113d06023913960400191505060405180910390fd5b6111fc8686866113ca565b61123f84604051806060016040528060268152602001611415602691396001600160a01b038916600090815260208190526040902054919063ffffffff6112d216565b6001600160a01b038088166000908152602081905260408082209390935590871681522054611274908563ffffffff61136916565b6001600160a01b038087166000818152602081815260409182902094909455805188815290519193928a16927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a35b505050505050565b600081848411156113615760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561132657818101518382015260200161130e565b50505050905090810190601f1680156113535780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b6000828201838110156113c3576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f2061646472657373a2646970667358221220429310b0a61af322d78e657c431f1c87f50b2d5caf027f14004be851bad8755064736f6c63430006060033000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000a158e67a82bb1dd234d44f72c0ba33ddcf59b4a2000000000000000000000000000000000000000000000000000000000000000b5741474d49474f54434849000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b5741474d49474f54434849000000000000000000000000000000000000000000'
+
+test('default', async () => {
+  expect(testActions(testClient as any)).toMatchInlineSnapshot(`
+    {
+      "dropTransaction": [Function],
+      "getAutomine": [Function],
+      "getTxPoolContent": [Function],
+      "getTxPoolStatus": [Function],
+      "impersonateAccount": [Function],
+      "increaseTime": [Function],
+      "inspectTxpool": [Function],
+      "mine": [Function],
+      "removeBlockTimestampInterval": [Function],
+      "reset": [Function],
+      "revert": [Function],
+      "sendUnsignedTransaction": [Function],
+      "setAutomine": [Function],
+      "setBalance": [Function],
+      "setBlockGasLimit": [Function],
+      "setBlockTimestampInterval": [Function],
+      "setCode": [Function],
+      "setCoinbase": [Function],
+      "setIntervalMining": [Function],
+      "setLoggingEnabled": [Function],
+      "setMinGasPrice": [Function],
+      "setNextBlockBaseFeePerGas": [Function],
+      "setNextBlockTimestamp": [Function],
+      "setNonce": [Function],
+      "setRpcUrl": [Function],
+      "setStorageAt": [Function],
+      "snapshot": [Function],
+      "stopImpersonatingAccount": [Function],
+    }
+  `)
+})
+
+describe('smoke test', () => {
+  test('dropTransaction', async () => {
+    const hash = await walletClient.sendTransaction({
+      from: accounts[6].address,
+      to: accounts[7].address,
+      value: parseEther('2'),
+    })
+    expect(await testClient.dropTransaction({ hash })).toBeDefined()
+  })
+
+  // TODO: Anvil sometimes stops interval mining when automining is programatically set.
+  test.skip('getAutomine', async () => {
+    expect(await testClient.getAutomine()).toBeDefined()
+  })
+
+  test('getTxPoolContent', async () => {
+    expect(await testClient.getTxPoolContent()).toBeDefined()
+  })
+
+  test('getTxPoolStatus', async () => {
+    expect(await testClient.getTxPoolStatus()).toBeDefined()
+  })
+
+  test.skip('impersonateAccount', async () => {
+    await testClient.impersonateAccount({ address: accounts[0].address })
+    await testClient.stopImpersonatingAccount({
+      address: accounts[0].address,
+    })
+  })
+
+  test('increaseTime', async () => {
+    expect(await testClient.increaseTime({ seconds: 1 })).toBeDefined()
+  })
+
+  test('inspectTxpool', async () => {
+    expect(await testClient.inspectTxpool()).toBeDefined()
+  })
+
+  test('mine', async () => {
+    expect(await testClient.mine({ blocks: 1 })).toBeDefined()
+  })
+
+  test('removeBlockTimestampInterval', async () => {
+    expect(await testClient.removeBlockTimestampInterval()).toBeDefined()
+  })
+
+  test('reset', async () => {
+    expect(
+      await testClient.reset({ blockNumber: initialBlockNumber }),
+    ).toBeDefined()
+  })
+
+  test('revert', async () => {
+    const id = await testClient.snapshot()
+    expect(await testClient.revert({ id })).toBeDefined()
+  })
+
+  test('sendUnsignedTransaction', async () => {
+    expect(
+      await testClient.sendUnsignedTransaction({
+        from: accounts[6].address,
+        to: accounts[7].address,
+        value: parseEther('1'),
+      }),
+    ).toBeDefined()
+  })
+
+  // TODO: Anvil sometimes stops interval mining when automining is programatically set.
+  test.skip('setAutomine', async () => {
+    expect(await testClient.setAutomine(true)).toBeDefined()
+  })
+
+  test('setBalance', async () => {
+    expect(
+      await testClient.setBalance({
+        address: accounts[8].address,
+        value: parseEther('420'),
+      }),
+    ).toBeDefined()
+  })
+
+  test('setBlockGasLimit', async () => {
+    const block1 = await publicClient.getBlock({
+      blockTag: 'latest',
+    })
+    await testClient.setBlockGasLimit({
+      gasLimit: block1.gasLimit + parseGwei('10'),
+    })
+  })
+
+  test('setBlockTimestampInterval', async () => {
+    await testClient.setBlockTimestampInterval({
+      interval: 1,
+    })
+  })
+
+  test('setCode', async () => {
+    await testClient.setCode({
+      address: '0xff9c1b15b16263c61d017ee9f65c50e4ae0113d7',
+      bytecode,
+    })
+  })
+
+  test('setCoinbase', async () => {
+    await testClient.setCoinbase({
+      address: '0x50821B3b78Da0255Ba2b7B6d62ae1f389EB987A4',
+    })
+  })
+
+  test('setIntervalMining', async () => {
+    await testClient.setIntervalMining({
+      interval: 1,
+    })
+  })
+
+  test('setLoggingEnabled', async () => {
+    await testClient.setLoggingEnabled(true)
+  })
+
+  test('setMinGasPrice', async () => {
+    await expect(() =>
+      testClient.setMinGasPrice({ gasPrice: parseGwei('20') }),
+    ).rejects.toThrowError()
+  })
+
+  test('setNextBlockBaseFeePerGas', async () => {
+    const block1 = await publicClient.getBlock({
+      blockTag: 'latest',
+    })
+    await testClient.setNextBlockBaseFeePerGas({
+      baseFeePerGas: block1.baseFeePerGas!,
+    })
+  })
+
+  test('setNextBlockTimestamp', async () => {
+    const block1 = await publicClient.getBlock({
+      blockTag: 'latest',
+    })
+    await testClient.setNextBlockTimestamp({
+      timestamp: block1.timestamp! + 100n,
+    })
+  })
+
+  test('setNonce', async () => {
+    await testClient.setNonce({
+      address: accounts[8].address,
+      nonce: 69,
+    })
+  })
+
+  test('setRpcUrl', async () => {
+    await testClient.setRpcUrl(process.env.VITE_ANVIL_FORK_URL!)
+  })
+
+  test('setStorageAt', async () => {
+    await testClient.setStorageAt({
+      address: accounts[8].address,
+      index: 0,
+      value:
+        '0x0000000000000000000000000000000000000000000000000000000000003039',
+    })
+  })
+
+  test('snapshot', async () => {
+    await testClient.snapshot()
+  })
+
+  test.skip('stopImpersonatingAccount', async () => {
+    await testClient.impersonateAccount({ address: address.vitalik })
+    await testClient.stopImpersonatingAccount({ address: address.vitalik })
+  })
+})
diff --git a/src/clients/decorators/test.ts b/src/clients/decorators/test.ts
new file mode 100644
index 0000000000..182221a868
--- /dev/null
+++ b/src/clients/decorators/test.ts
@@ -0,0 +1,133 @@
+import type {
+  DropTransactionArgs,
+  GetAutomineResponse,
+  GetTxPoolContentResponse,
+  GetTxPoolStatusResponse,
+  ImpersonateAccountArgs,
+  IncreaseTimeArgs,
+  InspectTxpoolResponse,
+  MineArgs,
+  ResetArgs,
+  RevertArgs,
+  SendUnsignedTransactionArgs,
+  SendUnsignedTransactionResponse,
+  SetBalanceArgs,
+  SetBlockGasLimitArgs,
+  SetBlockTimestampIntervalArgs,
+  SetCodeArgs,
+  SetCoinbaseArgs,
+  SetIntervalMiningArgs,
+  SetMinGasPriceArgs,
+  SetNextBlockBaseFeePerGasArgs,
+  SetNextBlockTimestampArgs,
+  SetNonceArgs,
+  SetStorageAtArgs,
+  StopImpersonatingAccountArgs,
+} from '../../actions/test'
+import {
+  dropTransaction,
+  getAutomine,
+  getTxpoolContent,
+  getTxpoolStatus,
+  impersonateAccount,
+  increaseTime,
+  inspectTxpool,
+  mine,
+  removeBlockTimestampInterval,
+  reset,
+  revert,
+  sendUnsignedTransaction,
+  setAutomine,
+  setBalance,
+  setBlockGasLimit,
+  setBlockTimestampInterval,
+  setCode,
+  setCoinbase,
+  setIntervalMining,
+  setLoggingEnabled,
+  setMinGasPrice,
+  setNextBlockBaseFeePerGas,
+  setNextBlockTimestamp,
+  setNonce,
+  setRpcUrl,
+  setStorageAt,
+  snapshot,
+  stopImpersonatingAccount,
+} from '../../actions/test'
+import { Chain, Quantity } from '../../types'
+import type { TestClient } from '../createTestClient'
+
+export type TestActions<TChain extends Chain = Chain> = {
+  dropTransaction: (args: DropTransactionArgs) => Promise<void>
+  getAutomine: () => Promise<GetAutomineResponse>
+  getTxPoolContent: () => Promise<GetTxPoolContentResponse>
+  getTxPoolStatus: () => Promise<GetTxPoolStatusResponse>
+  impersonateAccount: (args: ImpersonateAccountArgs) => Promise<void>
+  increaseTime: (args: IncreaseTimeArgs) => Promise<Quantity>
+  inspectTxpool: () => Promise<InspectTxpoolResponse>
+  mine: (args: MineArgs) => Promise<void>
+  removeBlockTimestampInterval: () => Promise<void>
+  reset: (args: ResetArgs) => Promise<void>
+  revert: (args: RevertArgs) => Promise<void>
+  sendUnsignedTransaction: (
+    args: SendUnsignedTransactionArgs,
+  ) => Promise<SendUnsignedTransactionResponse>
+  setAutomine: (args: boolean) => Promise<void>
+  setBalance: (args: SetBalanceArgs) => Promise<void>
+  setBlockGasLimit: (args: SetBlockGasLimitArgs) => Promise<void>
+  setBlockTimestampInterval: (
+    args: SetBlockTimestampIntervalArgs,
+  ) => Promise<void>
+  setCode: (args: SetCodeArgs) => Promise<void>
+  setCoinbase: (args: SetCoinbaseArgs) => Promise<void>
+  setIntervalMining: (args: SetIntervalMiningArgs) => Promise<void>
+  setLoggingEnabled: (args: boolean) => Promise<void>
+  setMinGasPrice: (args: SetMinGasPriceArgs) => Promise<void>
+  setNextBlockBaseFeePerGas: (
+    args: SetNextBlockBaseFeePerGasArgs,
+  ) => Promise<void>
+  setNextBlockTimestamp: (args: SetNextBlockTimestampArgs) => Promise<void>
+  setNonce: (args: SetNonceArgs) => Promise<void>
+  setRpcUrl: (args: string) => Promise<void>
+  setStorageAt: (args: SetStorageAtArgs) => Promise<void>
+  snapshot: () => Promise<Quantity>
+  stopImpersonatingAccount: (
+    args: StopImpersonatingAccountArgs,
+  ) => Promise<void>
+}
+
+export const testActions = <
+  TChain extends Chain,
+  TClient extends TestClient<any, any>,
+>(
+  client: TClient,
+): TestActions<TChain> => ({
+  dropTransaction: (args) => dropTransaction(client, args),
+  getAutomine: () => getAutomine(client),
+  getTxPoolContent: () => getTxpoolContent(client),
+  getTxPoolStatus: () => getTxpoolStatus(client),
+  impersonateAccount: (args) => impersonateAccount(client, args),
+  increaseTime: (args) => increaseTime(client, args),
+  inspectTxpool: () => inspectTxpool(client),
+  mine: (args) => mine(client, args),
+  removeBlockTimestampInterval: () => removeBlockTimestampInterval(client),
+  reset: (args) => reset(client, args),
+  revert: (args) => revert(client, args),
+  sendUnsignedTransaction: (args) => sendUnsignedTransaction(client, args),
+  setAutomine: (args) => setAutomine(client, args),
+  setBalance: (args) => setBalance(client, args),
+  setBlockGasLimit: (args) => setBlockGasLimit(client, args),
+  setBlockTimestampInterval: (args) => setBlockTimestampInterval(client, args),
+  setCode: (args) => setCode(client, args),
+  setCoinbase: (args) => setCoinbase(client, args),
+  setIntervalMining: (args) => setIntervalMining(client, args),
+  setLoggingEnabled: (args) => setLoggingEnabled(client, args),
+  setMinGasPrice: (args) => setMinGasPrice(client, args),
+  setNextBlockBaseFeePerGas: (args) => setNextBlockBaseFeePerGas(client, args),
+  setNextBlockTimestamp: (args) => setNextBlockTimestamp(client, args),
+  setNonce: (args) => setNonce(client, args),
+  setRpcUrl: (args) => setRpcUrl(client, args),
+  setStorageAt: (args) => setStorageAt(client, args),
+  snapshot: () => snapshot(client),
+  stopImpersonatingAccount: (args) => stopImpersonatingAccount(client, args),
+})
diff --git a/src/clients/decorators/wallet.test.ts b/src/clients/decorators/wallet.test.ts
new file mode 100644
index 0000000000..e6082d0770
--- /dev/null
+++ b/src/clients/decorators/wallet.test.ts
@@ -0,0 +1,105 @@
+import { describe, expect, test } from 'vitest'
+import { avalanche } from '../../chains'
+import { parseEther } from '../../utils'
+import { accounts, walletClient } from '../../_test'
+import { baycContractConfig, wagmiContractConfig } from '../../_test/abis'
+import { walletActions } from './wallet'
+
+test('default', async () => {
+  expect(walletActions(walletClient as any)).toMatchInlineSnapshot(`
+    {
+      "addChain": [Function],
+      "deployContract": [Function],
+      "getAccounts": [Function],
+      "getPermissions": [Function],
+      "requestAccounts": [Function],
+      "requestPermissions": [Function],
+      "sendTransaction": [Function],
+      "signMessage": [Function],
+      "switchChain": [Function],
+      "watchAsset": [Function],
+      "writeContract": [Function],
+    }
+  `)
+})
+
+describe('smoke test', () => {
+  test('addChain', async () => {
+    await walletClient.addChain({ chain: avalanche })
+  })
+
+  test('deployContract', async () => {
+    expect(
+      await walletClient.deployContract({
+        ...baycContractConfig,
+        args: ['Bored Ape Wagmi Club', 'BAYC', 69420n, 0n],
+        from: accounts[0].address,
+      }),
+    ).toBeDefined()
+  })
+
+  test('getAccounts', async () => {
+    expect(await walletClient.getAccounts()).toBeDefined()
+  })
+
+  test('getPermissions', async () => {
+    expect(await walletClient.getPermissions()).toBeDefined()
+  })
+
+  test('requestAccounts', async () => {
+    expect(await walletClient.requestAccounts()).toBeDefined()
+  })
+
+  test('requestPermissions', async () => {
+    expect(
+      await walletClient.requestPermissions({ eth_accounts: {} }),
+    ).toBeDefined()
+  })
+
+  test('sendTransaction', async () => {
+    expect(
+      await walletClient.sendTransaction({
+        from: accounts[6].address,
+        to: accounts[7].address,
+        value: parseEther('1'),
+      }),
+    ).toBeDefined()
+  })
+
+  test('signMessage', async () => {
+    expect(
+      await walletClient.signMessage({
+        from: accounts[0].address,
+        data: '0xdeadbeaf',
+      }),
+    ).toBeDefined()
+  })
+
+  test('switchChain', async () => {
+    await walletClient.switchChain({ id: avalanche.id })
+  })
+
+  test('watchAsset', async () => {
+    expect(
+      await walletClient.watchAsset({
+        type: 'ERC20',
+        options: {
+          address: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
+          symbol: 'FOO',
+          decimals: 18,
+          image: 'https://foo.io/token-image.svg',
+        },
+      }),
+    ).toBeTruthy()
+  })
+
+  test('writeContract', async () => {
+    expect(
+      await walletClient.writeContract({
+        ...wagmiContractConfig,
+        from: accounts[0].address,
+        functionName: 'mint',
+      }),
+    ).toBeTruthy()
+  })
+})
diff --git a/src/clients/decorators/wallet.ts b/src/clients/decorators/wallet.ts
new file mode 100644
index 0000000000..124040e7ef
--- /dev/null
+++ b/src/clients/decorators/wallet.ts
@@ -0,0 +1,79 @@
+import { Abi } from 'abitype'
+import {
+  AddChainArgs,
+  DeployContractArgs,
+  DeployContractResponse,
+  GetAccountsResponse,
+  GetPermissionsResponse,
+  RequestAccountsResponse,
+  RequestPermissionsArgs,
+  RequestPermissionsResponse,
+  SendTransactionArgs,
+  SendTransactionResponse,
+  SignMessageArgs,
+  SignMessageResponse,
+  SwitchChainArgs,
+  watchAsset,
+  WatchAssetArgs,
+  WatchAssetResponse,
+  writeContract,
+  WriteContractArgs,
+  WriteContractResponse,
+} from '../../actions/wallet'
+import {
+  addChain,
+  deployContract,
+  getAccounts,
+  getPermissions,
+  requestAccounts,
+  requestPermissions,
+  sendTransaction,
+  signMessage,
+  switchChain,
+} from '../../actions/wallet'
+import type { Chain } from '../../types'
+import type { WalletClient } from '../createWalletClient'
+
+export type WalletActions<TChain extends Chain = Chain> = {
+  addChain: (args: AddChainArgs) => Promise<void>
+  deployContract: <TAbi extends Abi | readonly unknown[]>(
+    args: DeployContractArgs<TChain, TAbi>,
+  ) => Promise<DeployContractResponse>
+  getAccounts: () => Promise<GetAccountsResponse>
+  getPermissions: () => Promise<GetPermissionsResponse>
+  requestAccounts: () => Promise<RequestAccountsResponse>
+  requestPermissions: (
+    args: RequestPermissionsArgs,
+  ) => Promise<RequestPermissionsResponse>
+  sendTransaction: (
+    args: SendTransactionArgs<TChain>,
+  ) => Promise<SendTransactionResponse>
+  signMessage: (args: SignMessageArgs) => Promise<SignMessageResponse>
+  switchChain: (args: SwitchChainArgs) => Promise<void>
+  watchAsset: (args: WatchAssetArgs) => Promise<WatchAssetResponse>
+  writeContract: <
+    TAbi extends Abi | readonly unknown[],
+    TFunctionName extends string,
+  >(
+    args: WriteContractArgs<TChain, TAbi, TFunctionName>,
+  ) => Promise<WriteContractResponse>
+}
+
+export const walletActions = <
+  TChain extends Chain,
+  TClient extends WalletClient<any, any>,
+>(
+  client: TClient,
+): WalletActions<TChain> => ({
+  addChain: (args) => addChain(client, args),
+  deployContract: (args) => deployContract(client, args),
+  getAccounts: () => getAccounts(client),
+  getPermissions: () => getPermissions(client),
+  requestAccounts: () => requestAccounts(client),
+  requestPermissions: (args) => requestPermissions(client, args),
+  sendTransaction: (args) => sendTransaction(client, args),
+  signMessage: (args) => signMessage(client, args),
+  switchChain: (args) => switchChain(client, args),
+  watchAsset: (args) => watchAsset(client, args),
+  writeContract: (args) => writeContract(client, args),
+})
diff --git a/src/contract.test.ts b/src/contract.test.ts
index 4eb18f7b15..12482140eb 100644
--- a/src/contract.test.ts
+++ b/src/contract.test.ts
@@ -5,6 +5,7 @@ import * as contract from './contract'
 test('exports contract actions', () => {
   expect(Object.keys(contract)).toMatchInlineSnapshot(`
     [
+      "createContractEventFilter",
       "estimateContractGas",
       "getBytecode",
       "getStorageAt",
diff --git a/src/contract.ts b/src/contract.ts
index 8df84164fa..e123deb7ed 100644
--- a/src/contract.ts
+++ b/src/contract.ts
@@ -1,4 +1,6 @@
 export type {
+  CreateContractEventFilterArgs,
+  CreateContractEventFilterResponse,
   EstimateContractGasArgs,
   EstimateContractGasResponse,
   GetBytecodeArgs,
@@ -16,6 +18,7 @@ export type {
   WatchContractEventArgs,
 } from './actions/public'
 export {
+  createContractEventFilter,
   estimateContractGas,
   getBytecode,
   getStorageAt,
@@ -31,10 +34,7 @@ export type {
   WriteContractArgs,
   WriteContractResponse,
 } from './actions/wallet'
-export {
-  deployContract,
-  writeContract,
-} from './actions/wallet'
+export { deployContract, writeContract } from './actions/wallet'
 
 export type {
   DecodeAbiArgs,
diff --git a/src/ens.ts b/src/ens.ts
index 486b0982a5..90501a42f0 100644
--- a/src/ens.ts
+++ b/src/ens.ts
@@ -4,5 +4,6 @@ export { getEnsAddress, getEnsName } from './actions/ens'
 export {
   labelhash,
   namehash,
-  normalize,
 } from './utils/ens'
+
+export { normalize } from './utils/ens/normalize'
diff --git a/src/index.test.ts b/src/index.test.ts
index 82ba41c7b3..f2acb936a1 100644
--- a/src/index.test.ts
+++ b/src/index.test.ts
@@ -59,14 +59,76 @@ test('exports actions', () => {
       "UrlRequiredError": [Function],
       "WaitForTransactionReceiptTimeoutError": [Function],
       "WebSocketRequestError": [Function],
+      "boolToBytes": [Function],
+      "boolToHex": [Function],
+      "bytesToBigint": [Function],
+      "bytesToBool": [Function],
+      "bytesToHex": [Function],
+      "bytesToNumber": [Function],
+      "bytesToString": [Function],
       "createClient": [Function],
       "createPublicClient": [Function],
       "createTestClient": [Function],
       "createTransport": [Function],
       "createWalletClient": [Function],
       "custom": [Function],
+      "decodeAbi": [Function],
+      "decodeBytes": [Function],
+      "decodeErrorResult": [Function],
+      "decodeEventLog": [Function],
+      "decodeFunctionData": [Function],
+      "decodeFunctionResult": [Function],
+      "decodeHex": [Function],
+      "decodeRlp": [Function],
+      "defineBlock": [Function],
+      "defineChain": [Function],
+      "defineTransaction": [Function],
+      "defineTransactionReceipt": [Function],
+      "defineTransactionRequest": [Function],
+      "encodeAbi": [Function],
+      "encodeBytes": [Function],
+      "encodeDeployData": [Function],
+      "encodeErrorResult": [Function],
+      "encodeEventTopics": [Function],
+      "encodeFunctionData": [Function],
+      "encodeFunctionResult": [Function],
+      "encodeHex": [Function],
+      "encodeRlp": [Function],
+      "etherUnits": {
+        "gwei": 9,
+        "wei": 18,
+      },
       "fallback": [Function],
+      "formatBlock": [Function],
+      "formatEther": [Function],
+      "formatGwei": [Function],
+      "formatTransaction": [Function],
+      "formatTransactionRequest": [Function],
+      "formatUnit": [Function],
+      "getAbiItem": [Function],
+      "getAddress": [Function],
+      "getContractAddress": [Function],
+      "getContractError": [Function],
+      "getCreate2Address": [Function],
+      "getCreateAddress": [Function],
+      "getEventSignature": [Function],
+      "getFunctionSignature": [Function],
+      "gweiUnits": {
+        "ether": -9,
+        "wei": 9,
+      },
+      "hexToBigInt": [Function],
+      "hexToBool": [Function],
+      "hexToBytes": [Function],
+      "hexToNumber": [Function],
+      "hexToString": [Function],
       "http": [Function],
+      "isAddress": [Function],
+      "isAddressEqual": [Function],
+      "isBytes": [Function],
+      "isHex": [Function],
+      "keccak256": [Function],
+      "labelhash": [Function],
       "multicall3Abi": [
         {
           "inputs": [
@@ -110,7 +172,33 @@ test('exports actions', () => {
           "type": "function",
         },
       ],
+      "namehash": [Function],
+      "numberToBytes": [Function],
+      "numberToHex": [Function],
+      "pad": [Function],
+      "padBytes": [Function],
+      "padHex": [Function],
+      "parseEther": [Function],
+      "parseGwei": [Function],
+      "parseUnit": [Function],
+      "size": [Function],
+      "slice": [Function],
+      "sliceBytes": [Function],
+      "sliceHex": [Function],
+      "stringToBytes": [Function],
+      "stringToHex": [Function],
+      "stringify": [Function],
+      "transactionType": {
+        "0x0": "legacy",
+        "0x1": "eip2930",
+        "0x2": "eip1559",
+      },
+      "trim": [Function],
       "webSocket": [Function],
+      "weiUnits": {
+        "ether": -18,
+        "gwei": -9,
+      },
     }
   `)
 })
diff --git a/src/index.ts b/src/index.ts
index 52321379fe..811fb825af 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -130,3 +130,112 @@ export type {
   TransactionLegacy,
   Uncle,
 } from './types'
+
+export { labelhash, namehash } from './utils/ens'
+
+export type {
+  BlockFormatter,
+  DecodeAbiArgs,
+  DecodeErrorResultArgs,
+  DecodeErrorResultResponse,
+  DecodeEventLogArgs,
+  DecodeEventLogResponse,
+  DecodeFunctionDataArgs,
+  DecodeFunctionResultArgs,
+  DecodeFunctionResultResponse,
+  EncodeAbiArgs,
+  EncodeDeployDataArgs,
+  EncodeErrorResultArgs,
+  EncodeEventTopicsArgs,
+  EncodeFunctionDataArgs,
+  EncodeFunctionResultArgs,
+  ExtractFormatter,
+  Formatted,
+  FormattedBlock,
+  FormattedTransaction,
+  FormattedTransactionReceipt,
+  FormattedTransactionRequest,
+  GetAbiItemArgs,
+  GetContractAddressOptions,
+  GetCreate2AddressOptions,
+  GetCreateAddressOptions,
+  ToRlpResponse,
+  TransactionFormatter,
+  TransactionReceiptFormatter,
+  TransactionRequestFormatter,
+} from './utils'
+export {
+  boolToBytes,
+  boolToHex,
+  bytesToBigint,
+  bytesToBool,
+  bytesToHex,
+  bytesToNumber,
+  bytesToString,
+  decodeAbi,
+  decodeErrorResult,
+  decodeEventLog,
+  decodeFunctionData,
+  decodeFunctionResult,
+  defineBlock,
+  defineChain,
+  defineTransaction,
+  defineTransactionReceipt,
+  defineTransactionRequest,
+  encodeAbi,
+  encodeDeployData,
+  encodeErrorResult,
+  encodeEventTopics,
+  encodeFunctionData,
+  encodeFunctionResult,
+  etherUnits,
+  formatBlock,
+  formatEther,
+  formatGwei,
+  formatTransaction,
+  formatTransactionRequest,
+  formatUnit,
+  fromBytes,
+  fromHex,
+  fromRlp,
+  getAbiItem,
+  getAddress,
+  getContractAddress,
+  getContractError,
+  getCreate2Address,
+  getCreateAddress,
+  getEventSignature,
+  getFunctionSignature,
+  gweiUnits,
+  hexToBigInt,
+  hexToBool,
+  hexToBytes,
+  hexToNumber,
+  hexToString,
+  isAddress,
+  isAddressEqual,
+  isBytes,
+  isHex,
+  keccak256,
+  numberToBytes,
+  numberToHex,
+  pad,
+  padBytes,
+  padHex,
+  parseEther,
+  parseGwei,
+  parseUnit,
+  size,
+  slice,
+  sliceBytes,
+  sliceHex,
+  stringToBytes,
+  stringToHex,
+  stringify,
+  toBytes,
+  toHex,
+  toRlp,
+  transactionType,
+  trim,
+  weiUnits,
+} from './utils'
diff --git a/src/public.test.ts b/src/public.test.ts
index 327d938387..4ec57be5a3 100644
--- a/src/public.test.ts
+++ b/src/public.test.ts
@@ -7,6 +7,7 @@ test('exports public actions', () => {
     [
       "call",
       "createBlockFilter",
+      "createEventFilter",
       "createPendingTransactionFilter",
       "estimateGas",
       "getBalance",
diff --git a/src/public.ts b/src/public.ts
index 8fcb68a4ab..a54ff2bd8a 100644
--- a/src/public.ts
+++ b/src/public.ts
@@ -1,6 +1,7 @@
 export {
   call,
   createBlockFilter,
+  createEventFilter,
   createPendingTransactionFilter,
   estimateGas,
   getBalance,
@@ -30,6 +31,8 @@ export type {
   CallArgs,
   CallResponse,
   CreateBlockFilterResponse,
+  CreateEventFilterArgs,
+  CreateEventFilterResponse,
   CreatePendingTransactionFilterResponse,
   EstimateGasArgs,
   EstimateGasResponse,
diff --git a/src/utils/encoding/index.ts b/src/utils/encoding/index.ts
index 8365ec90b7..d959a38f85 100644
--- a/src/utils/encoding/index.ts
+++ b/src/utils/encoding/index.ts
@@ -14,7 +14,7 @@ export {
   stringToHex,
 } from './toHex'
 
-export type { toRlpResponse } from './toRlp'
+export type { ToRlpResponse } from './toRlp'
 export { toRlp } from './toRlp'
 
 export {
diff --git a/src/utils/encoding/toRlp.ts b/src/utils/encoding/toRlp.ts
index e7d4f1896e..4b6c432325 100644
--- a/src/utils/encoding/toRlp.ts
+++ b/src/utils/encoding/toRlp.ts
@@ -7,7 +7,7 @@ export type RecursiveArray<T> = T | Array<RecursiveArray<T>>
 
 type To = 'hex' | 'bytes'
 
-export type toRlpResponse<TTo extends To> = TTo extends 'bytes'
+export type ToRlpResponse<TTo extends To> = TTo extends 'bytes'
   ? ByteArray
   : TTo extends 'hex'
   ? Hex
@@ -18,7 +18,7 @@ export function toRlp<TTo extends To = 'hex'>(
   to_?: TTo,
 ) {
   const to = to_ || ('hex' as const)
-  return format(bytesToRlp(parse(hexOrBytes)), to) as toRlpResponse<TTo>
+  return format(bytesToRlp(parse(hexOrBytes)), to) as ToRlpResponse<TTo>
 }
 
 function parse(
diff --git a/src/utils/ens/index.test.ts b/src/utils/ens/index.test.ts
index 506d0795e8..dc303acf97 100644
--- a/src/utils/ens/index.test.ts
+++ b/src/utils/ens/index.test.ts
@@ -7,7 +7,6 @@ test('exports utils', () => {
     {
       "labelhash": [Function],
       "namehash": [Function],
-      "normalize": [Function],
       "packetToBytes": [Function],
     }
   `)
diff --git a/src/utils/ens/index.ts b/src/utils/ens/index.ts
index 15be0b7570..a943b36f5d 100644
--- a/src/utils/ens/index.ts
+++ b/src/utils/ens/index.ts
@@ -2,6 +2,4 @@ export { labelhash } from './labelhash'
 
 export { namehash } from './namehash'
 
-export { normalize } from './normalize'
-
 export { packetToBytes } from './packetToBytes'
diff --git a/src/utils/ens/labelhash.test.ts b/src/utils/ens/labelhash.test.ts
index a34694d8b4..83e2120580 100644
--- a/src/utils/ens/labelhash.test.ts
+++ b/src/utils/ens/labelhash.test.ts
@@ -1,6 +1,7 @@
 import { test, expect } from 'vitest'
 
 import { labelhash } from './labelhash'
+import { normalize } from './normalize'
 
 test.each([
   {
@@ -19,7 +20,7 @@ test.each([
       '0x7aaad03ddcacc63166440f59c14a1a2c97ee381014b59c58f55b49ab05f31a38',
   },
   {
-    label: 'awkw𝝣b',
+    label: normalize('awkw𝝣b'),
     expected:
       '0x064cfb20fc5f10bd727bd17232b9b0c8021cec89e596b1c966ff1c611420c72f',
   },
diff --git a/src/utils/ens/labelhash.ts b/src/utils/ens/labelhash.ts
index c1d7c9b5c3..792a05b9fe 100644
--- a/src/utils/ens/labelhash.ts
+++ b/src/utils/ens/labelhash.ts
@@ -1,6 +1,5 @@
 import { bytesToHex, stringToBytes } from '../encoding'
 import { keccak256 } from '../hash'
-import { normalize } from './normalize'
 
 /**
  * @description Hashes ENS label
@@ -12,5 +11,5 @@ import { normalize } from './normalize'
 export function labelhash(label: string) {
   let result = new Uint8Array(32).fill(0)
   if (!label) return bytesToHex(result)
-  return keccak256(stringToBytes(normalize(label)))
+  return keccak256(stringToBytes(label))
 }
diff --git a/src/utils/ens/namehash.test.ts b/src/utils/ens/namehash.test.ts
index 9a071240b1..22db9751e2 100644
--- a/src/utils/ens/namehash.test.ts
+++ b/src/utils/ens/namehash.test.ts
@@ -1,6 +1,7 @@
 import { test, expect } from 'vitest'
 
 import { namehash } from './namehash'
+import { normalize } from './normalize'
 
 test.each([
   {
@@ -29,7 +30,7 @@ test.each([
       '0x52d0f5fbf348925621be297a61b88ec492ebbbdfa9477d82892e2786020ad61c',
   },
   {
-    name: 'awkw𝝣b.eth',
+    name: normalize('awkw𝝣b.eth'),
     expected:
       '0x4e372358e2e47fdbba39e5ca56d412e6dc4216a260a733b1b5d8df0001d28202',
   },
diff --git a/src/utils/ens/namehash.ts b/src/utils/ens/namehash.ts
index 3feefcffe6..f68708e48c 100644
--- a/src/utils/ens/namehash.ts
+++ b/src/utils/ens/namehash.ts
@@ -1,7 +1,6 @@
 import { concat } from '../data'
 import { bytesToHex, stringToBytes } from '../encoding'
 import { keccak256 } from '../hash'
-import { normalize } from './normalize'
 
 /**
  * @description Hashes ENS name
@@ -17,7 +16,7 @@ export function namehash(name: string) {
   let result = new Uint8Array(32).fill(0)
   if (!name) return bytesToHex(result)
 
-  const labels = normalize(name).split('.')
+  const labels = name.split('.')
   // Iterate in reverse order building up hash
   for (let i = labels.length - 1; i >= 0; i -= 1) {
     const hashed = keccak256(stringToBytes(labels[i]), 'bytes')
diff --git a/src/utils/index.ts b/src/utils/index.ts
index bab578bbcd..07d0ebf4d2 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -97,7 +97,7 @@ export {
   transactionType,
 } from './formatters'
 
-export type { toRlpResponse } from './encoding'
+export type { ToRlpResponse } from './encoding'
 export {
   boolToBytes,
   boolToHex,
diff --git a/src/wallet.ts b/src/wallet.ts
index ece8bccc08..419878e7e9 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -10,8 +10,11 @@ export {
   watchAsset,
 } from './actions/wallet'
 export type {
+  AddChainArgs,
   FormattedTransactionRequest,
   GetPermissionsResponse,
+  GetAccountsResponse,
+  RequestAccountsResponse,
   RequestPermissionsResponse,
   SendTransactionArgs,
   SendTransactionResponse,