viem 0.4.0-main.20230430T212953 → 1.0.0

package/src/utils/ens/encodedLabelToLabelhash.ts

@@ -0,0 +1,11 @@
+import type { Hex } from '../../index.js'
+import { isHex } from '../index.js'
+
+export function encodedLabelToLabelhash(label: string): Hex | null {
+  if (label.length !== 66) return null
+  if (label.indexOf('[') !== 0) return null
+  if (label.indexOf(']') !== 65) return null
+  const hash = `0x${label.slice(1, 65)}`
+  if (!isHex(hash)) return null
+  return hash
+}

package/src/utils/ens/labelhash.ts

@@ -1,5 +1,7 @@
-import { bytesToHex, stringToBytes } from '../encoding/index.js'
-import { keccak256 } from '../hash/index.js'
+import { stringToBytes } from '../encoding/toBytes.js'
+import { bytesToHex } from '../encoding/toHex.js'
+import { keccak256 } from '../hash/keccak256.js'
+import { encodedLabelToLabelhash } from './encodedLabelToLabelhash.js'
 
 /**
  * @description Hashes ENS label
@@ -13,5 +15,5 @@ import { keccak256 } from '../hash/index.js'
 export function labelhash(label: string) {
   const result = new Uint8Array(32).fill(0)
   if (!label) return bytesToHex(result)
-  return keccak256(stringToBytes(label))
+  return encodedLabelToLabelhash(label) || keccak256(stringToBytes(label))
 }

package/src/utils/ens/namehash.ts

@@ -1,6 +1,8 @@
-import { concat } from '../data/index.js'
-import { bytesToHex, stringToBytes } from '../encoding/index.js'
-import { keccak256 } from '../hash/index.js'
+import { concat } from '../data/concat.js'
+import { stringToBytes, toBytes } from '../encoding/toBytes.js'
+import { bytesToHex } from '../encoding/toHex.js'
+import { keccak256 } from '../hash/keccak256.js'
+import { encodedLabelToLabelhash } from './encodedLabelToLabelhash.js'
 
 /**
  * @description Hashes ENS name
@@ -20,7 +22,10 @@ export function namehash(name: string) {
   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')
+    const hashFromEncodedLabel = encodedLabelToLabelhash(labels[i])
+    const hashed = hashFromEncodedLabel
+      ? toBytes(hashFromEncodedLabel)
+      : keccak256(stringToBytes(labels[i]), 'bytes')
     result = keccak256(concat([result, hashed]), 'bytes')
   }
 

package/src/utils/ens/packetToBytes.ts

@@ -1,29 +1,33 @@
 // Adapted from https://github.com/mafintosh/dns-packet
-import type { ByteArray } from '../../types/index.js'
-import { stringToBytes } from '../encoding/index.js'
+import type { ByteArray } from '../../types/misc.js'
+import { stringToBytes } from '../encoding/toBytes.js'
+import { encodeLabelhash } from './encodeLabelhash.js'
+import { labelhash } from './labelhash.js'
 
 /*
  * @description Encodes a DNS packet into a ByteArray containing a UDP payload.
  */
 export function packetToBytes(packet: string): ByteArray {
-  function length(value: string) {
-    if (value === '.' || value === '..') return 1
-    return stringToBytes(value.replace(/^\.|\.$/gm, '')).length + 2
-  }
-
-  const bytes = new Uint8Array(length(packet))
   // strip leading and trailing `.`
   const value = packet.replace(/^\.|\.$/gm, '')
-  if (!value.length) return bytes
+  if (value.length === 0) return new Uint8Array(1)
+
+  const bytes = new Uint8Array(stringToBytes(value).byteLength + 2)
 
   let offset = 0
   const list = value.split('.')
   for (let i = 0; i < list.length; i++) {
-    const encoded = stringToBytes(list[i])
+    let encoded = stringToBytes(list[i])
+    // if the length is > 255, make the encoded label value a labelhash
+    // this is compatible with the universal resolver
+    if (encoded.byteLength > 255)
+      encoded = stringToBytes(encodeLabelhash(labelhash(list[i])))
     bytes[offset] = encoded.length
     bytes.set(encoded, offset + 1)
     offset += encoded.length + 1
   }
 
+  if (bytes.byteLength !== offset + 1) return bytes.slice(0, offset + 1)
+
   return bytes
 }

package/src/utils/errors/getCallError.ts

@@ -1,7 +1,8 @@
-import type { CallParameters } from '../../actions/index.js'
-import type { BaseError } from '../../errors/index.js'
-import { CallExecutionError } from '../../errors/index.js'
-import type { Chain } from '../../types/index.js'
+import type { CallParameters } from '../../actions/public/call.js'
+import type { BaseError } from '../../errors/base.js'
+import { CallExecutionError } from '../../errors/contract.js'
+import type { Chain } from '../../types/chain.js'
+
 import { containsNodeError, getNodeError } from './getNodeError.js'
 
 export function getCallError(

package/src/utils/errors/getContractError.ts

@@ -1,15 +1,13 @@
-import type { Abi } from 'abitype'
-import type { BaseError } from '../../errors/index.js'
+import type { Abi, Address } from 'abitype'
+
+import { AbiDecodingZeroDataError } from '../../errors/abi.js'
+import { BaseError } from '../../errors/base.js'
 import {
-  AbiDecodingZeroDataError,
   ContractFunctionExecutionError,
-  RawContractError,
-} from '../../errors/index.js'
-import {
   ContractFunctionRevertedError,
   ContractFunctionZeroDataError,
+  RawContractError,
 } from '../../errors/contract.js'
-import type { Address } from '../../types/index.js'
 
 const EXECUTION_REVERTED_ERROR_CODE = 3
 
@@ -34,7 +32,9 @@ export function getContractError(
   const { code, data, message, shortMessage } = (
     err instanceof RawContractError
       ? err
-      : err.walk((err) => 'data' in (err as Error))
+      : err instanceof BaseError
+      ? err.walk((err) => 'data' in (err as Error))
+      : {}
   ) as RawContractError
 
   let cause = err
@@ -46,7 +46,7 @@ export function getContractError(
   ) {
     cause = new ContractFunctionRevertedError({
       abi,
-      data,
+      data: typeof data === 'object' ? data.data : data,
       functionName,
       message: shortMessage ?? message,
     })

package/src/utils/errors/getEstimateGasError.ts

@@ -1,7 +1,9 @@
-import type { EstimateGasParameters } from '../../actions/index.js'
-import type { BaseError } from '../../errors/index.js'
-import { EstimateGasExecutionError } from '../../errors/index.js'
-import type { Account, Chain } from '../../types/index.js'
+import type { Account } from '../../accounts/types.js'
+import type { EstimateGasParameters } from '../../actions/public/estimateGas.js'
+import type { BaseError } from '../../errors/base.js'
+import { EstimateGasExecutionError } from '../../errors/estimateGas.js'
+import type { Chain } from '../../types/chain.js'
+
 import { containsNodeError, getNodeError } from './getNodeError.js'
 
 export function getEstimateGasError(

package/src/utils/errors/getNodeError.ts

@@ -1,5 +1,5 @@
-import type { SendTransactionParameters } from '../../actions/index.js'
-import { RpcRequestError, type BaseError } from '../../errors/index.js'
+import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
+import type { BaseError } from '../../errors/base.js'
 import {
   ExecutionRevertedError,
   FeeCapTooHighError,
@@ -7,15 +7,18 @@ import {
   InsufficientFundsError,
   IntrinsicGasTooHighError,
   IntrinsicGasTooLowError,
-  InvalidInputRpcError,
   NonceMaxValueError,
   NonceTooHighError,
   NonceTooLowError,
   TipAboveFeeCapError,
-  TransactionRejectedRpcError,
   TransactionTypeNotSupportedError,
   UnknownNodeError,
-} from '../../errors/index.js'
+} from '../../errors/node.js'
+import { RpcRequestError } from '../../errors/request.js'
+import {
+  InvalidInputRpcError,
+  TransactionRejectedRpcError,
+} from '../../errors/rpc.js'
 
 export function containsNodeError(err: BaseError) {
   return (

package/src/utils/errors/getTransactionError.ts

@@ -1,7 +1,9 @@
-import type { BaseError } from '../../errors/index.js'
-import { TransactionExecutionError } from '../../errors/index.js'
-import type { Account, Chain } from '../../types/index.js'
-import type { SendTransactionParameters } from '../../wallet.js'
+import type { Account } from '../../accounts/types.js'
+import type { SendTransactionParameters } from '../../actions/wallet/sendTransaction.js'
+import type { BaseError } from '../../errors/base.js'
+import { TransactionExecutionError } from '../../errors/transaction.js'
+import type { Chain } from '../../types/chain.js'
+
 import { containsNodeError, getNodeError } from './getNodeError.js'
 
 export function getTransactionError(

package/src/utils/filters/createFilterRequestScope.ts

@@ -1,8 +1,10 @@
-import type { Chain } from '../../chains.js'
-import type { PublicClient, Transport } from '../../clients/index.js'
+import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Transport } from '../../clients/transports/createTransport.js'
 import type { OnResponseFn } from '../../clients/transports/fallback.js'
-import type { Requests } from '../../types/eip1193.js'
-import type { Hex } from '../../types/index.js'
+import type { Chain } from '../../types/chain.js'
+import type { EIP1193RequestFn, PublicRpcSchema } from '../../types/eip1193.js'
+import type { Hex } from '../../types/misc.js'
+import type { Filter } from '../../types/utils.js'
 
 type CreateFilterRequestScopeParameters = {
   method:
@@ -10,8 +12,15 @@ type CreateFilterRequestScopeParameters = {
     | 'eth_newPendingTransactionFilter'
     | 'eth_newBlockFilter'
 }
-// TODO: Narrow `request` to filter-based methods (ie. `eth_getFilterLogs`, etc).
-type CreateFilterRequestScopeReturnType = (id: Hex) => Requests['request']
+
+type FilterRpcSchema = Filter<
+  PublicRpcSchema,
+  { Method: 'eth_getFilterLogs' | 'eth_getFilterChanges' }
+>
+
+type CreateFilterRequestScopeReturnType = (
+  id: Hex,
+) => EIP1193RequestFn<FilterRpcSchema>
 
 /**
  * Scopes `request` to the filter ID. If the client is a fallback, it will
@@ -22,7 +31,7 @@ export function createFilterRequestScope<TChain extends Chain | undefined>(
   client: PublicClient<Transport, TChain>,
   { method }: CreateFilterRequestScopeParameters,
 ): CreateFilterRequestScopeReturnType {
-  const requestMap: Record<Hex, PublicClient<Transport, TChain>['request']> = {}
+  const requestMap: Record<Hex, EIP1193RequestFn> = {}
 
   if (client.transport.type === 'fallback')
     client.transport.onResponse?.(

package/src/utils/formatters/block.ts

@@ -1,12 +1,13 @@
-import type {
-  Chain,
-  Block,
-  Formatter,
-  Formatters,
-  RpcBlock,
-} from '../../types/index.js'
-import { defineFormatter } from './format.js'
-import type { ExtractFormatter, Formatted } from './format.js'
+import type { Block } from '../../types/block.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter, Formatters } from '../../types/formatter.js'
+import type { RpcBlock } from '../../types/rpc.js'
+
+import {
+  type ExtractFormatter,
+  type Formatted,
+  defineFormatter,
+} from './format.js'
 import { formatTransaction } from './transaction.js'
 
 export type BlockFormatter<TChain extends Chain | undefined = Chain> =

package/src/utils/formatters/extract.ts

@@ -1,4 +1,4 @@
-import type { Formatter } from '../../types/index.js'
+import type { Formatter } from '../../types/formatter.js'
 
 /**
  * @description Picks out the keys from `value` that exist in the formatter.

package/src/utils/formatters/feeHistory.ts

@@ -1,4 +1,5 @@
-import type { FeeHistory, RpcFeeHistory } from '../../types/index.js'
+import type { FeeHistory } from '../../types/fee.js'
+import type { RpcFeeHistory } from '../../types/rpc.js'
 
 export function formatFeeHistory(feeHistory: RpcFeeHistory): FeeHistory {
   return {

package/src/utils/formatters/format.ts

@@ -1,4 +1,6 @@
-import type { Chain, Formatter, OptionalNullable } from '../../types/index.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter } from '../../types/formatter.js'
+import type { OptionalNullable } from '../../types/utils.js'
 
 export type ExtractFormatter<
   TChain extends Chain,

package/src/utils/formatters/log.ts

@@ -1,4 +1,5 @@
-import type { Log, RpcLog } from '../../types/index.js'
+import type { Log } from '../../types/log.js'
+import type { RpcLog } from '../../types/rpc.js'
 
 export function formatLog(
   log: Partial<RpcLog>,
@@ -8,10 +9,10 @@ export function formatLog(
     ...log,
     blockHash: log.blockHash ? log.blockHash : null,
     blockNumber: log.blockNumber ? BigInt(log.blockNumber) : null,
-    logIndex: log.logIndex ? BigInt(log.logIndex) : null,
+    logIndex: log.logIndex ? Number(log.logIndex) : null,
     transactionHash: log.transactionHash ? log.transactionHash : null,
     transactionIndex: log.transactionIndex
-      ? BigInt(log.transactionIndex)
+      ? Number(log.transactionIndex)
       : null,
     ...(eventName ? { args, eventName } : {}),
   } as Log

package/src/utils/formatters/transaction.ts

@@ -1,13 +1,14 @@
-import type {
-  Chain,
-  Formatter,
-  Formatters,
-  RpcTransaction,
-  Transaction,
-} from '../../types/index.js'
-import { hexToNumber } from '../encoding/index.js'
-import { defineFormatter } from './format.js'
-import type { ExtractFormatter, Formatted } from './format.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter, Formatters } from '../../types/formatter.js'
+import type { RpcTransaction } from '../../types/rpc.js'
+import type { Transaction } from '../../types/transaction.js'
+import { hexToNumber } from '../encoding/fromHex.js'
+
+import {
+  type ExtractFormatter,
+  type Formatted,
+  defineFormatter,
+} from './format.js'
 
 export type TransactionFormatter<TChain extends Chain | undefined = Chain> =
   TChain extends Chain

package/src/utils/formatters/transactionReceipt.ts

@@ -1,13 +1,14 @@
-import type {
-  Chain,
-  Formatter,
-  Formatters,
-  RpcTransactionReceipt,
-  TransactionReceipt,
-} from '../../types/index.js'
-import { hexToNumber } from '../encoding/index.js'
-import { defineFormatter } from './format.js'
-import type { ExtractFormatter, Formatted } from './format.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter, Formatters } from '../../types/formatter.js'
+import type { RpcTransactionReceipt } from '../../types/rpc.js'
+import type { TransactionReceipt } from '../../types/transaction.js'
+import { hexToNumber } from '../encoding/fromHex.js'
+
+import {
+  type ExtractFormatter,
+  type Formatted,
+  defineFormatter,
+} from './format.js'
 import { formatLog } from './log.js'
 import { transactionType } from './transaction.js'
 

package/src/utils/formatters/transactionRequest.ts

@@ -1,13 +1,14 @@
-import type {
-  Chain,
-  Formatter,
-  Formatters,
-  RpcTransactionRequest,
-  TransactionRequest,
-} from '../../types/index.js'
-import { defineFormatter } from './format.js'
-import type { ExtractFormatter, Formatted } from './format.js'
-import { numberToHex } from '../encoding/index.js'
+import type { Chain } from '../../types/chain.js'
+import type { Formatter, Formatters } from '../../types/formatter.js'
+import type { RpcTransactionRequest } from '../../types/rpc.js'
+import type { TransactionRequest } from '../../types/transaction.js'
+import { numberToHex } from '../encoding/toHex.js'
+
+import {
+  type ExtractFormatter,
+  type Formatted,
+  defineFormatter,
+} from './format.js'
 
 export type TransactionRequestFormatter<
   TChain extends Chain | undefined = Chain,

package/src/utils/hash/getEventSelector.ts

@@ -1,4 +1,5 @@
-import type { EventDefinition } from '../../types/index.js'
+import type { EventDefinition } from '../../types/contract.js'
+
 import { hashFunction } from './hashFunction.js'
 
 export const getEventSelector = (event: EventDefinition) => hashFunction(event)

package/src/utils/hash/getFunctionSelector.ts

@@ -1,4 +1,5 @@
-import { slice } from '../data/index.js'
+import { slice } from '../data/slice.js'
+
 import { hashFunction } from './hashFunction.js'
 
 export const getFunctionSelector = (fn: string) => slice(hashFunction(fn), 0, 4)

package/src/utils/hash/hashFunction.ts

@@ -1,15 +1,15 @@
-import { toBytes } from '../encoding/index.js'
 import {
   extractFunctionName,
   extractFunctionParams,
-} from '../contract/index.js'
+} from '../contract/extractFunctionParts.js'
+import { toBytes } from '../encoding/toBytes.js'
+
 import { keccak256 } from './keccak256.js'
 
 const hash = (value: string) => keccak256(toBytes(value))
 
 export function hashFunction(def: string) {
   const name = extractFunctionName(def)
-  const params = extractFunctionParams(def)
-  if (!params || params.length === 0) return hash(def.replace(/ /g, ''))
+  const params = extractFunctionParams(def) || []
   return hash(`${name}(${params.map(({ type }) => type).join(',')})`)
 }

package/src/utils/hash/isHash.ts

@@ -1,5 +1,6 @@
-import type { Hex } from '../../types/index.js'
-import { isHex, size } from '../data/index.js'
+import type { Hex } from '../../types/misc.js'
+import { isHex } from '../data/isHex.js'
+import { size } from '../data/size.js'
 
 export function isHash(hash: string): hash is Hex {
   return isHex(hash) && size(hash) === 32

package/src/utils/hash/keccak256.ts

@@ -1,8 +1,9 @@
 import { keccak_256 } from '@noble/hashes/sha3'
 
-import type { ByteArray, Hex } from '../../types/index.js'
-import { isHex } from '../data/index.js'
-import { toBytes, toHex } from '../encoding/index.js'
+import type { ByteArray, Hex } from '../../types/misc.js'
+import { isHex } from '../data/isHex.js'
+import { toBytes } from '../encoding/toBytes.js'
+import { toHex } from '../encoding/toHex.js'
 
 type To = 'hex' | 'bytes'
 
@@ -15,7 +16,9 @@ export function keccak256<TTo extends To = 'hex'>(
   to_?: TTo,
 ): Keccak256Hash<TTo> {
   const to = to_ || 'hex'
-  const bytes = keccak_256(isHex(value) ? toBytes(value) : value)
+  const bytes = keccak_256(
+    isHex(value, { strict: false }) ? toBytes(value) : value,
+  )
   if (to === 'bytes') return bytes as Keccak256Hash<TTo>
   return toHex(bytes) as Keccak256Hash<TTo>
 }