viem 0.0.0-w-20230821171049 → 0.0.0-w-20230828183856

package/dist/types/utils/transaction/parseTransaction.d.ts

@@ -1,5 +1,9 @@
-import type { TransactionSerializableEIP1559, TransactionSerializableEIP2930, TransactionSerializableLegacy, TransactionSerialized, TransactionType } from '../../types/transaction.js';
+import type { Hex } from '../../types/misc.js';
+import type { AccessList, TransactionSerializableEIP1559, TransactionSerializableEIP2930, TransactionSerializableLegacy, TransactionSerialized, TransactionType } from '../../types/transaction.js';
+import type { RecursiveArray } from '../encoding/toRlp.js';
 import { type GetSerializedTransactionType } from './getSerializedTransactionType.js';
 export type ParseTransactionReturnType<TSerialized extends TransactionSerialized = TransactionSerialized, TType extends TransactionType = GetSerializedTransactionType<TSerialized>> = (TType extends 'eip1559' ? TransactionSerializableEIP1559 : never) | (TType extends 'eip2930' ? TransactionSerializableEIP2930 : never) | (TType extends 'legacy' ? TransactionSerializableLegacy : never);
 export declare function parseTransaction<TSerialized extends TransactionSerialized>(serializedTransaction: TSerialized): ParseTransactionReturnType<TSerialized>;
+export declare function toTransactionArray(serializedTransaction: string): RecursiveArray<`0x${string}`>;
+export declare function parseAccessList(accessList_: RecursiveArray<Hex>): AccessList;
 //# sourceMappingURL=parseTransaction.d.ts.map

package/dist/types/utils/transaction/parseTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseTransaction.d.ts","sourceRoot":"","sources":["../../../../src/utils/transaction/parseTransaction.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAIV,8BAA8B,EAC9B,8BAA8B,EAC9B,6BAA6B,EAC7B,qBAAqB,EAGrB,eAAe,EAChB,MAAM,4BAA4B,CAAA;AAenC,OAAO,EACL,KAAK,4BAA4B,EAElC,MAAM,mCAAmC,CAAA;AAE1C,MAAM,MAAM,0BAA0B,CACpC,WAAW,SAAS,qBAAqB,GAAG,qBAAqB,EACjE,KAAK,SAAS,eAAe,GAAG,4BAA4B,CAAC,WAAW,CAAC,IAEvE,CAAC,KAAK,SAAS,SAAS,GAAG,8BAA8B,GAAG,KAAK,CAAC,GAClE,CAAC,KAAK,SAAS,SAAS,GAAG,8BAA8B,GAAG,KAAK,CAAC,GAClE,CAAC,KAAK,SAAS,QAAQ,GAAG,6BAA6B,GAAG,KAAK,CAAC,CAAA;AAEpE,wBAAgB,gBAAgB,CAAC,WAAW,SAAS,qBAAqB,EACxE,qBAAqB,EAAE,WAAW,GACjC,0BAA0B,CAAC,WAAW,CAAC,CAgBzC"}
+{"version":3,"file":"parseTransaction.d.ts","sourceRoot":"","sources":["../../../../src/utils/transaction/parseTransaction.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAa,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EACV,UAAU,EAGV,8BAA8B,EAC9B,8BAA8B,EAC9B,6BAA6B,EAC7B,qBAAqB,EAGrB,eAAe,EAChB,MAAM,4BAA4B,CAAA;AAOnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAQ1D,OAAO,EACL,KAAK,4BAA4B,EAElC,MAAM,mCAAmC,CAAA;AAE1C,MAAM,MAAM,0BAA0B,CACpC,WAAW,SAAS,qBAAqB,GAAG,qBAAqB,EACjE,KAAK,SAAS,eAAe,GAAG,4BAA4B,CAAC,WAAW,CAAC,IAEvE,CAAC,KAAK,SAAS,SAAS,GAAG,8BAA8B,GAAG,KAAK,CAAC,GAClE,CAAC,KAAK,SAAS,SAAS,GAAG,8BAA8B,GAAG,KAAK,CAAC,GAClE,CAAC,KAAK,SAAS,QAAQ,GAAG,6BAA6B,GAAG,KAAK,CAAC,CAAA;AAEpE,wBAAgB,gBAAgB,CAAC,WAAW,SAAS,qBAAqB,EACxE,qBAAqB,EAAE,WAAW,GACjC,0BAA0B,CAAC,WAAW,CAAC,CAgBzC;AAoMD,wBAAgB,kBAAkB,CAAC,qBAAqB,EAAE,MAAM,iCAE/D;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,UAAU,CAa5E"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.6.2";
+export declare const version = "1.8.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -21,7 +21,7 @@
       "optional": true
     }
   },
-  "version": "0.0.0-w-20230821171049",
+  "version": "0.0.0-w-20230828183856",
   "files": [
     "dist",
     "!dist/**/*.tsbuildinfo",

package/src/actions/ens/getEnsAddress.ts

@@ -106,14 +106,12 @@ export async function getEnsAddress<TChain extends Chain | undefined,>(
 
     if (res[0] === '0x') return null
 
-    const address = trim(
-      decodeFunctionResult({
-        abi: addressResolverAbi,
-        args: coinType != null ? [namehash(name), BigInt(coinType)] : undefined,
-        functionName: 'addr',
-        data: res[0],
-      }),
-    )
+    const address = decodeFunctionResult({
+      abi: addressResolverAbi,
+      args: coinType != null ? [namehash(name), BigInt(coinType)] : undefined,
+      functionName: 'addr',
+      data: res[0],
+    })
 
     if (address === '0x') return null
     if (trim(address) === '0x00') return null

package/src/actions/index.ts

@@ -224,11 +224,26 @@ export {
 } from './test/inspectTxpool.js'
 export { type ResetParameters, reset } from './test/reset.js'
 export { type RevertParameters, revert } from './test/revert.js'
+export {
+  type PrepareTransactionRequestParameters,
+  type PrepareTransactionRequestReturnType,
+  prepareTransactionRequest,
+} from './wallet/prepareTransactionRequest.js'
 export {
   type SendTransactionParameters,
   type SendTransactionReturnType,
   sendTransaction,
 } from './wallet/sendTransaction.js'
+export {
+  type SignTransactionParameters,
+  type SignTransactionReturnType,
+  signTransaction,
+} from './wallet/signTransaction.js'
+export {
+  type SendRawTransactionParameters,
+  type SendRawTransactionReturnType,
+  sendRawTransaction,
+} from './wallet/sendRawTransaction.js'
 export {
   type SendUnsignedTransactionParameters,
   type SendUnsignedTransactionReturnType,

package/src/actions/public/estimateFeesPerGas.ts

@@ -0,0 +1,154 @@
+import type { Client } from '../../clients/createClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import {
+  BaseFeeScalarError,
+  Eip1559FeesNotSupportedError,
+} from '../../errors/fee.js'
+import type { Block } from '../../types/block.js'
+import type {
+  Chain,
+  ChainEstimateFeesPerGasFnParameters,
+  ChainFeesFnParameters,
+} from '../../types/chain.js'
+import type { GetChain } from '../../types/chain.js'
+import type {
+  FeeValuesEIP1559,
+  FeeValuesLegacy,
+  FeeValuesType,
+} from '../../types/fee.js'
+import type { PrepareTransactionRequestParameters } from '../wallet/prepareTransactionRequest.js'
+import { internal_estimateMaxPriorityFeePerGas } from './estimateMaxPriorityFeePerGas.js'
+import { getBlock } from './getBlock.js'
+import { getGasPrice } from './getGasPrice.js'
+
+export type EstimateFeesPerGasParameters<
+  chain extends Chain | undefined = Chain | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
+  type extends FeeValuesType = FeeValuesType,
+> = {
+  /**
+   * The type of fee values to return.
+   *
+   * - `legacy`: Returns the legacy gas price.
+   * - `eip1559`: Returns the max fee per gas and max priority fee per gas.
+   *
+   * @default 'eip1559'
+   */
+  type?: type | FeeValuesType
+} & GetChain<chain, chainOverride>
+
+export type EstimateFeesPerGasReturnType<
+  type extends FeeValuesType = FeeValuesType,
+> =
+  | (type extends 'legacy' ? FeeValuesLegacy : never)
+  | (type extends 'eip1559' ? FeeValuesEIP1559 : never)
+
+/**
+ * Returns an estimate for the fees per gas (in wei) for a
+ * transaction to be likely included in the next block.
+ * Defaults to [`chain.fees.estimateFeesPerGas`](/docs/clients/chains.html#fees-estimatefeespergas) if set.
+ *
+ * - Docs: https://viem.sh/docs/actions/public/estimateFeesPerGas.html
+ *
+ * @param client - Client to use
+ * @param parameters - {@link EstimateFeesPerGasParameters}
+ * @returns An estimate (in wei) for the fees per gas. {@link EstimateFeesPerGasReturnType}
+ *
+ * @example
+ * import { createPublicClient, http } from 'viem'
+ * import { mainnet } from 'viem/chains'
+ * import { estimateFeesPerGas } from 'viem/actions'
+ *
+ * const client = createPublicClient({
+ *   chain: mainnet,
+ *   transport: http(),
+ * })
+ * const maxPriorityFeePerGas = await estimateFeesPerGas(client)
+ * // { maxFeePerGas: ..., maxPriorityFeePerGas: ... }
+ */
+export async function estimateFeesPerGas<
+  chain extends Chain | undefined,
+  chainOverride extends Chain | undefined,
+  type extends FeeValuesType = 'eip1559',
+>(
+  client: Client<Transport, chain>,
+  args?: EstimateFeesPerGasParameters<chain, chainOverride, type>,
+): Promise<EstimateFeesPerGasReturnType<type>> {
+  return internal_estimateFeesPerGas(client, args as any)
+}
+
+export async function internal_estimateFeesPerGas<
+  chain extends Chain | undefined,
+  chainOverride extends Chain | undefined,
+  type extends FeeValuesType = 'eip1559',
+>(
+  client: Client<Transport, chain>,
+  args: EstimateFeesPerGasParameters<chain, chainOverride, type> & {
+    block?: Block
+    request?: PrepareTransactionRequestParameters
+  },
+): Promise<EstimateFeesPerGasReturnType<type>> {
+  const {
+    block: block_,
+    chain = client.chain,
+    request,
+    type = 'eip1559',
+  } = args || {}
+
+  const baseFeeMultiplier = await (async () => {
+    if (typeof chain?.fees?.baseFeeMultiplier === 'function')
+      return chain.fees.baseFeeMultiplier({
+        block: block_ as Block,
+        client,
+        request,
+      } as ChainFeesFnParameters)
+    return chain?.fees?.baseFeeMultiplier ?? 1.2
+  })()
+  if (baseFeeMultiplier < 1) throw new BaseFeeScalarError()
+
+  const decimals = baseFeeMultiplier.toString().split('.')[1].length
+  const denominator = 10 ** decimals
+  const multiply = (base: bigint) =>
+    (base * BigInt(baseFeeMultiplier * denominator)) / BigInt(denominator)
+
+  const block = block_ ? block_ : await getBlock(client)
+
+  if (typeof chain?.fees?.estimateFeesPerGas === 'function')
+    return chain.fees.estimateFeesPerGas({
+      block: block_ as Block,
+      client,
+      multiply,
+      request,
+      type,
+    } as ChainEstimateFeesPerGasFnParameters) as unknown as EstimateFeesPerGasReturnType<type>
+
+  if (type === 'eip1559') {
+    if (typeof block.baseFeePerGas !== 'bigint')
+      throw new Eip1559FeesNotSupportedError()
+
+    const maxPriorityFeePerGas = request?.maxPriorityFeePerGas
+      ? request.maxPriorityFeePerGas
+      : await internal_estimateMaxPriorityFeePerGas(
+          client as Client<Transport, Chain>,
+          {
+            block,
+            chain,
+            request,
+          },
+        )
+
+    const baseFeePerGas = multiply(block.baseFeePerGas)
+    const maxFeePerGas =
+      request?.maxFeePerGas ?? baseFeePerGas + maxPriorityFeePerGas
+
+    return {
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+    } as EstimateFeesPerGasReturnType<type>
+  }
+
+  const gasPrice = request?.gasPrice ?? multiply(await getGasPrice(client))
+  return {
+    gasPrice,
+  } as EstimateFeesPerGasReturnType<type>
+}

package/src/actions/public/estimateGas.ts

@@ -21,9 +21,9 @@ import {
   assertRequest,
 } from '../../utils/transaction/assertRequest.js'
 import {
-  type PrepareRequestParameters,
-  prepareRequest,
-} from '../../utils/transaction/prepareRequest.js'
+  type PrepareTransactionRequestParameters,
+  prepareTransactionRequest,
+} from '../wallet/prepareTransactionRequest.js'
 
 export type FormattedEstimateGas<
   TChain extends Chain | undefined = Chain | undefined,
@@ -107,9 +107,9 @@ export async function estimateGas<
       ...rest
     } =
       account.type === 'local'
-        ? ((await prepareRequest(
+        ? ((await prepareTransactionRequest(
             client,
-            args as PrepareRequestParameters,
+            args as PrepareTransactionRequestParameters,
           )) as EstimateGasParameters)
         : args
 

package/src/actions/public/estimateMaxPriorityFeePerGas.ts

@@ -0,0 +1,98 @@
+import type { Client } from '../../clients/createClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
+import { Eip1559FeesNotSupportedError } from '../../errors/fee.js'
+import type { Account } from '../../types/account.js'
+import type { Block } from '../../types/block.js'
+import type { Chain, ChainFeesFnParameters } from '../../types/chain.js'
+import type { GetChain } from '../../types/chain.js'
+import { hexToBigInt } from '../../utils/encoding/fromHex.js'
+import type { PrepareTransactionRequestParameters } from '../wallet/prepareTransactionRequest.js'
+import { getBlock } from './getBlock.js'
+import { getGasPrice } from './getGasPrice.js'
+
+export type EstimateMaxPriorityFeePerGasParameters<
+  chain extends Chain | undefined = Chain | undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
+> = GetChain<chain, chainOverride>
+export type EstimateMaxPriorityFeePerGasReturnType = bigint
+
+/**
+ * Returns an estimate for the max priority fee per gas (in wei) for a
+ * transaction to be likely included in the next block.
+ * Defaults to [`chain.fees.defaultPriorityFee`](/docs/clients/chains.html#fees-defaultpriorityfee) if set.
+ *
+ * - Docs: https://viem.sh/docs/actions/public/estimateMaxPriorityFeePerGas.html
+ *
+ * @param client - Client to use
+ * @returns An estimate (in wei) for the max priority fee per gas. {@link EstimateMaxPriorityFeePerGasReturnType}
+ *
+ * @example
+ * import { createPublicClient, http } from 'viem'
+ * import { mainnet } from 'viem/chains'
+ * import { estimateMaxPriorityFeePerGas } from 'viem/actions'
+ *
+ * const client = createPublicClient({
+ *   chain: mainnet,
+ *   transport: http(),
+ * })
+ * const maxPriorityFeePerGas = await estimateMaxPriorityFeePerGas(client)
+ * // 10000000n
+ */
+export async function estimateMaxPriorityFeePerGas<
+  chain extends Chain | undefined,
+  chainOverride extends Chain | undefined,
+>(
+  client: Client<Transport, chain>,
+  args?: EstimateMaxPriorityFeePerGasParameters<chain, chainOverride>,
+): Promise<EstimateMaxPriorityFeePerGasReturnType> {
+  return internal_estimateMaxPriorityFeePerGas(client, args as any)
+}
+
+export async function internal_estimateMaxPriorityFeePerGas<
+  chain extends Chain | undefined,
+  chainOverride extends Chain | undefined,
+>(
+  client: Client<Transport, chain>,
+  args: EstimateMaxPriorityFeePerGasParameters<chain, chainOverride> & {
+    block?: Block
+    request?: PrepareTransactionRequestParameters<
+      chain,
+      Account | undefined,
+      chainOverride
+    >
+  },
+): Promise<EstimateMaxPriorityFeePerGasReturnType> {
+  const { block: block_, chain = client.chain, request } = args || {}
+  if (typeof chain?.fees?.defaultPriorityFee === 'function') {
+    const block = block_ || (await getBlock(client))
+    return chain.fees.defaultPriorityFee({
+      block,
+      client,
+      request,
+    } as ChainFeesFnParameters)
+  } else if (chain?.fees?.defaultPriorityFee)
+    return chain?.fees?.defaultPriorityFee
+
+  try {
+    const maxPriorityFeePerGasHex = await client.request({
+      method: 'eth_maxPriorityFeePerGas',
+    })
+    return hexToBigInt(maxPriorityFeePerGasHex)
+  } catch {
+    // If the RPC Provider does not support `eth_maxPriorityFeePerGas`
+    // fall back to calculating it manually via `gasPrice - baseFeePerGas`.
+    // See: https://github.com/ethereum/pm/issues/328#:~:text=eth_maxPriorityFeePerGas%20after%20London%20will%20effectively%20return%20eth_gasPrice%20%2D%20baseFee
+    const [block, gasPrice] = await Promise.all([
+      block_ ? Promise.resolve(block_) : getBlock(client),
+      getGasPrice(client),
+    ])
+
+    if (typeof block.baseFeePerGas !== 'bigint')
+      throw new Eip1559FeesNotSupportedError()
+
+    const maxPriorityFeePerGas = gasPrice - block.baseFeePerGas
+
+    if (maxPriorityFeePerGas < 0n) return 0n
+    return maxPriorityFeePerGas
+  }
+}

package/src/actions/public/verifyHash.ts

@@ -1,11 +1,11 @@
 import type { Address } from 'abitype'
 
-import type { Chain } from '../../chains/index.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import { universalSignatureValidatorAbi } from '../../constants/abis.js'
 import { universalSignatureValidatorByteCode } from '../../constants/contracts.js'
 import { CallExecutionError } from '../../errors/contract.js'
+import type { Chain } from '../../types/chain.js'
 import type { ByteArray, Hex } from '../../types/misc.js'
 import { isBytesEqual } from '../../utils/data/isBytesEqual.js'
 import { encodeDeployData, isHex, toHex } from '../../utils/index.js'

package/src/actions/public/verifyMessage.ts

@@ -1,10 +1,11 @@
-import type { Chain } from '../../chains/index.js'
+import type { Address } from 'abitype'
+
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
 import type { ByteArray, Hex, SignableMessage } from '../../types/misc.js'
 import { hashMessage } from '../../utils/index.js'
 import { type VerifyHashParameters, verifyHash } from './verifyHash.js'
-import type { Address } from 'abitype'
 
 export type VerifyMessageParameters = Omit<VerifyHashParameters, 'hash'> & {
   /** The address that signed the original message. */

package/src/actions/public/verifyTypedData.ts

@@ -1,11 +1,12 @@
-import type { Chain } from '../../chains/index.js'
+import type { Address, TypedData } from 'abitype'
+
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
+import type { Chain } from '../../types/chain.js'
 import type { ByteArray, Hex } from '../../types/misc.js'
 import type { TypedDataDefinition } from '../../types/typedData.js'
 import { hashTypedData } from '../../utils/signature/hashTypedData.js'
 import { type VerifyHashParameters, verifyHash } from './verifyHash.js'
-import type { Address, TypedData } from 'abitype'
 
 export type VerifyTypedDataParameters<
   TTypedData extends TypedData | { [key: string]: unknown } = TypedData,

package/src/actions/public/waitForTransactionReceipt.ts

@@ -192,56 +192,60 @@ export async function waitForTransactionReceipt<
                 (err instanceof TransactionNotFoundError ||
                   err instanceof TransactionReceiptNotFoundError)
               ) {
-                replacedTransaction = transaction
-
-                // Let's retrieve the transactions from the current block.
-                const block = await getBlock(client, {
-                  blockNumber,
-                  includeTransactions: true,
-                })
-
-                const replacementTransaction = (
-                  block.transactions as Transaction[]
-                ).find(
-                  ({ from, nonce }) =>
-                    from === replacedTransaction!.from &&
-                    nonce === replacedTransaction!.nonce,
-                )
+                try {
+                  replacedTransaction = transaction
 
-                // If we couldn't find a replacement transaction, continue polling.
-                if (!replacementTransaction) return
+                  // Let's retrieve the transactions from the current block.
+                  const block = await getBlock(client, {
+                    blockNumber,
+                    includeTransactions: true,
+                  })
 
-                // If we found a replacement transaction, return it's receipt.
-                receipt = await getTransactionReceipt(client, {
-                  hash: replacementTransaction.hash,
-                })
+                  const replacementTransaction = (
+                    block.transactions as Transaction[]
+                  ).find(
+                    ({ from, nonce }) =>
+                      from === replacedTransaction!.from &&
+                      nonce === replacedTransaction!.nonce,
+                  )
 
-                // Check if we have enough confirmations. If not, continue polling.
-                if (blockNumber - receipt.blockNumber + 1n < confirmations)
-                  return
+                  // If we couldn't find a replacement transaction, continue polling.
+                  if (!replacementTransaction) return
 
-                let reason: ReplacementReason = 'replaced'
-                if (
-                  replacementTransaction.to === replacedTransaction.to &&
-                  replacementTransaction.value === replacedTransaction.value
-                ) {
-                  reason = 'repriced'
-                } else if (
-                  replacementTransaction.from === replacementTransaction.to &&
-                  replacementTransaction.value === 0n
-                ) {
-                  reason = 'cancelled'
-                }
+                  // If we found a replacement transaction, return it's receipt.
+                  receipt = await getTransactionReceipt(client, {
+                    hash: replacementTransaction.hash,
+                  })
+
+                  // Check if we have enough confirmations. If not, continue polling.
+                  if (blockNumber - receipt.blockNumber + 1n < confirmations)
+                    return
 
-                done(() => {
-                  emit.onReplaced?.({
-                    reason,
-                    replacedTransaction: replacedTransaction!,
-                    transaction: replacementTransaction,
-                    transactionReceipt: receipt,
+                  let reason: ReplacementReason = 'replaced'
+                  if (
+                    replacementTransaction.to === replacedTransaction.to &&
+                    replacementTransaction.value === replacedTransaction.value
+                  ) {
+                    reason = 'repriced'
+                  } else if (
+                    replacementTransaction.from === replacementTransaction.to &&
+                    replacementTransaction.value === 0n
+                  ) {
+                    reason = 'cancelled'
+                  }
+
+                  done(() => {
+                    emit.onReplaced?.({
+                      reason,
+                      replacedTransaction: replacedTransaction!,
+                      transaction: replacementTransaction,
+                      transactionReceipt: receipt,
+                    })
+                    emit.resolve(receipt)
                   })
-                  emit.resolve(receipt)
-                })
+                } catch (err_) {
+                  done(() => emit.reject(err_))
+                }
               } else {
                 done(() => emit.reject(err))
               }

package/src/actions/public/watchContractEvent.ts

@@ -2,7 +2,6 @@ import type { Abi, AbiEvent, Address, ExtractAbiEvent } from 'abitype'
 
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import type { EncodeEventTopicsParameters, LogTopic } from '../../index.js'
 import type { Chain } from '../../types/chain.js'
 import type { GetEventArgs, InferEventName } from '../../types/contract.js'
 import type { Filter } from '../../types/filter.js'
@@ -17,14 +16,18 @@ import { observe } from '../../utils/observe.js'
 import { poll } from '../../utils/poll.js'
 import { stringify } from '../../utils/stringify.js'
 
-import { DecodeLogDataMismatch } from '../../errors/abi.js'
 import {
+  DecodeLogDataMismatch,
   DecodeLogTopicsMismatch,
-  InvalidInputRpcError,
-  decodeEventLog,
+} from '../../errors/abi.js'
+import { InvalidInputRpcError } from '../../errors/rpc.js'
+import type { LogTopic } from '../../types/misc.js'
+import { decodeEventLog } from '../../utils/abi/decodeEventLog.js'
+import {
+  type EncodeEventTopicsParameters,
   encodeEventTopics,
-  formatLog,
-} from '../../index.js'
+} from '../../utils/abi/encodeEventTopics.js'
+import { formatLog } from '../../utils/formatters/log.js'
 import {
   type CreateContractEventFilterParameters,
   createContractEventFilter,

package/src/actions/wallet/deployContract.ts

@@ -3,7 +3,8 @@ import type { Abi } from 'abitype'
 import type { Account } from '../../accounts/types.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import type { Chain, GetChain } from '../../types/chain.js'
+import type { Chain } from '../../types/chain.js'
+import type { GetChain } from '../../types/chain.js'
 import type { GetConstructorArgs } from '../../types/contract.js'
 import type { Hex } from '../../types/misc.js'
 import type { UnionOmit } from '../../types/utils.js'