viem 1.6.5 → 1.6.7

package/src/chains/index.ts

@@ -1,111 +1,158 @@
-export {
-  type Chain,
-  type ChainConfig,
-  type ChainContract,
-  type ChainEstimateFeesPerGasFnParameters,
-  type ChainFees,
-  type ChainFeesFnParameters,
-  type ChainFormatter,
-  type ChainFormatters,
-  type ChainSerializers,
-  type ExtractChainFormatterExclude,
-  type ExtractChainFormatterParameters,
-  type ExtractChainFormatterReturnType,
-  arbitrum,
-  arbitrumGoerli,
-  aurora,
-  auroraTestnet,
-  avalanche,
-  avalancheFuji,
-  base,
-  baseGoerli,
-  boba,
-  bronos,
-  bronosTestnet,
-  bsc,
-  bscTestnet,
-  canto,
-  celo,
-  celoAlfajores,
-  celoCannoli,
-  cronos,
-  crossbell,
-  dfk,
-  dogechain,
-  evmos,
-  evmosTestnet,
-  fantom,
-  fantomTestnet,
-  filecoin,
-  filecoinCalibration,
-  filecoinHyperspace,
-  flare,
-  flareTestnet,
-  foundry,
-  gnosis,
-  gnosisChiado,
-  goerli,
-  haqqMainnet,
-  haqqTestedge2,
-  hardhat,
-  harmonyOne,
-  iotex,
-  iotexTestnet,
-  klaytn,
-  lineaTestnet,
-  localhost,
-  mainnet,
-  metis,
-  metisGoerli,
-  mev,
-  mevTestnet,
-  moonbaseAlpha,
-  moonbeam,
-  moonriver,
-  nexi,
-  okc,
-  optimism,
-  optimismGoerli,
-  polygon,
-  polygonMumbai,
-  polygonZkEvm,
-  polygonZkEvmTestnet,
-  pulsechain,
-  pulsechainV4,
-  scrollSepolia,
-  scrollTestnet,
-  sepolia,
-  shardeumSphinx,
-  skaleBlockBrawlers,
-  skaleCalypso,
-  skaleCalypsoTestnet,
-  skaleChaosTestnet,
-  skaleCryptoBlades,
-  skaleCryptoColosseum,
-  skaleEuropa,
-  skaleEuropaTestnet,
-  skaleExorde,
-  skaleHumanProtocol,
-  skaleNebula,
-  skaleNebulaTestnet,
-  skaleRazor,
-  skaleTitan,
-  skaleTitanTestnet,
-  songbird,
-  songbirdTestnet,
-  syscoin,
-  taraxa,
-  taraxaTestnet,
-  telos,
-  telosTestnet,
-  thunderTestnet,
-  wanchain,
-  wanchainTestnet,
-  xdc,
-  xdcTestnet,
-  zhejiang,
-  zkSync,
-  zkSyncTestnet,
-  zora,
-  zoraTestnet,
-} from '@viem/chains'
+import * as chains from '@wagmi/chains'
+
+import { defineChain } from '../utils/chain.js'
+import { formattersCelo } from './celo/formatters.js'
+import { serializersCelo } from './celo/serializers.js'
+import { feesOptimism } from './optimism/fees.js'
+import { formattersOptimism } from './optimism/formatters.js'
+
+export const arbitrum = /*#__PURE__*/ defineChain(chains.arbitrum)
+export const arbitrumGoerli = /*#__PURE__*/ defineChain(chains.arbitrumGoerli)
+export const aurora = /*#__PURE__*/ defineChain(chains.aurora)
+export const auroraTestnet = /*#__PURE__*/ defineChain(chains.auroraTestnet)
+export const avalanche = /*#__PURE__*/ defineChain(chains.avalanche)
+export const avalancheFuji = /*#__PURE__*/ defineChain(chains.avalancheFuji)
+export const base = /*#__PURE__*/ defineChain(chains.base, {
+  fees: feesOptimism,
+  formatters: formattersOptimism,
+})
+export const baseGoerli = /*#__PURE__*/ defineChain(chains.baseGoerli, {
+  fees: feesOptimism,
+  formatters: formattersOptimism,
+})
+export const boba = /*#__PURE__*/ defineChain(chains.boba)
+export const bronos = /*#__PURE__*/ defineChain(chains.bronos)
+export const bronosTestnet = /*#__PURE__*/ defineChain(chains.bronosTestnet)
+export const bsc = /*#__PURE__*/ defineChain(chains.bsc)
+export const bscTestnet = /*#__PURE__*/ defineChain(chains.bscTestnet)
+export const canto = /*#__PURE__*/ defineChain(chains.canto)
+export const celo = /*#__PURE__*/ defineChain(chains.celo, {
+  formatters: formattersCelo,
+  serializers: serializersCelo,
+})
+export const celoAlfajores = /*#__PURE__*/ defineChain(chains.celoAlfajores, {
+  formatters: formattersCelo,
+  serializers: serializersCelo,
+})
+export const celoCannoli = /*#__PURE__*/ defineChain(chains.celoCannoli, {
+  formatters: formattersCelo,
+  serializers: serializersCelo,
+})
+export const cronos = /*#__PURE__*/ defineChain(chains.cronos)
+export const crossbell = /*#__PURE__*/ defineChain(chains.crossbell)
+export const dfk = /*#__PURE__*/ defineChain(chains.dfk)
+export const dogechain = /*#__PURE__*/ defineChain(chains.dogechain)
+export const evmos = /*#__PURE__*/ defineChain(chains.evmos)
+export const evmosTestnet = /*#__PURE__*/ defineChain(chains.evmosTestnet)
+export const fantom = /*#__PURE__*/ defineChain(chains.fantom)
+export const fantomTestnet = /*#__PURE__*/ defineChain(chains.fantomTestnet)
+export const filecoin = /*#__PURE__*/ defineChain(chains.filecoin)
+export const filecoinCalibration = /*#__PURE__*/ defineChain(
+  chains.filecoinCalibration,
+)
+export const filecoinHyperspace = /*#__PURE__*/ defineChain(
+  chains.filecoinHyperspace,
+)
+export const flare = /*#__PURE__*/ defineChain(chains.flare)
+export const flareTestnet = /*#__PURE__*/ defineChain(chains.flareTestnet)
+export const foundry = /*#__PURE__*/ defineChain(chains.foundry)
+export const iotex = /*#__PURE__*/ defineChain(chains.iotex)
+export const iotexTestnet = /*#__PURE__*/ defineChain(chains.iotexTestnet)
+export const goerli = /*#__PURE__*/ defineChain(chains.goerli)
+export const gnosis = /*#__PURE__*/ defineChain(chains.gnosis)
+export const gnosisChiado = /*#__PURE__*/ defineChain(chains.gnosisChiado)
+export const haqqMainnet = /*#__PURE__*/ defineChain(chains.haqqMainnet)
+export const haqqTestedge2 = /*#__PURE__*/ defineChain(chains.haqqTestedge2)
+export const hardhat = /*#__PURE__*/ defineChain(chains.hardhat)
+export const harmonyOne = /*#__PURE__*/ defineChain(chains.harmonyOne)
+export const klaytn = /*#__PURE__*/ defineChain(chains.klaytn)
+export const lineaTestnet = /*#__PURE__*/ defineChain(chains.lineaTestnet)
+export const localhost = /*#__PURE__*/ defineChain(chains.localhost)
+export const mainnet = /*#__PURE__*/ defineChain(chains.mainnet)
+export const metis = /*#__PURE__*/ defineChain(chains.metis)
+export const metisGoerli = /*#__PURE__*/ defineChain(chains.metisGoerli)
+export const mev = /*#__PURE__*/ defineChain(chains.mev)
+export const mevTestnet = /*#__PURE__*/ defineChain(chains.mevTestnet)
+export const moonbaseAlpha = /*#__PURE__*/ defineChain(chains.moonbaseAlpha)
+export const moonbeam = /*#__PURE__*/ defineChain(chains.moonbeam)
+export const moonriver = /*#__PURE__*/ defineChain(chains.moonriver)
+export const nexi = /*#__PURE__*/ defineChain(chains.nexi)
+export const okc = /*#__PURE__*/ defineChain(chains.okc)
+export const optimism = /*#__PURE__*/ defineChain(chains.optimism, {
+  fees: feesOptimism,
+  formatters: formattersOptimism,
+})
+export const optimismGoerli = /*#__PURE__*/ defineChain(chains.optimismGoerli, {
+  fees: feesOptimism,
+  formatters: formattersOptimism,
+})
+export const polygon = /*#__PURE__*/ defineChain(chains.polygon)
+export const polygonMumbai = /*#__PURE__*/ defineChain(chains.polygonMumbai)
+export const polygonZkEvm = /*#__PURE__*/ defineChain(chains.polygonZkEvm)
+export const polygonZkEvmTestnet = /*#__PURE__*/ defineChain(
+  chains.polygonZkEvmTestnet,
+)
+export const pulsechain = /*#__PURE__*/ defineChain(chains.pulsechain)
+export const pulsechainV4 = /*#__PURE__*/ defineChain(chains.pulsechainV4)
+export const scrollSepolia = /*#__PURE__*/ defineChain(chains.scrollSepolia)
+export const scrollTestnet = /*#__PURE__*/ defineChain(chains.scrollTestnet)
+export const sepolia = /*#__PURE__*/ defineChain(chains.sepolia)
+export const skaleBlockBrawlers = /*#__PURE__*/ defineChain(
+  chains.skaleBlockBrawlers,
+)
+export const skaleCalypso = /*#__PURE__*/ defineChain(chains.skaleCalypso)
+export const skaleCalypsoTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleCalypsoTestnet,
+)
+export const skaleChaosTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleChaosTestnet,
+)
+export const skaleCryptoBlades = /*#__PURE__*/ defineChain(
+  chains.skaleCryptoBlades,
+)
+export const skaleCryptoColosseum = /*#__PURE__*/ defineChain(
+  chains.skaleCryptoColosseum,
+)
+export const skaleEuropa = /*#__PURE__*/ defineChain(chains.skaleEuropa)
+export const skaleEuropaTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleEuropaTestnet,
+)
+export const skaleExorde = /*#__PURE__*/ defineChain(chains.skaleExorde)
+export const skaleHumanProtocol = /*#__PURE__*/ defineChain(
+  chains.skaleHumanProtocol,
+)
+export const skaleNebula = /*#__PURE__*/ defineChain(chains.skaleNebula)
+export const skaleNebulaTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleNebulaTestnet,
+)
+export const skaleRazor = /*#__PURE__*/ defineChain(chains.skaleRazor)
+export const skaleTitan = /*#__PURE__*/ defineChain(chains.skaleTitan)
+export const skaleTitanTestnet = /*#__PURE__*/ defineChain(
+  chains.skaleTitanTestnet,
+)
+export const songbird = /*#__PURE__*/ defineChain(chains.songbird)
+export const songbirdTestnet = /*#__PURE__*/ defineChain(chains.songbirdTestnet)
+export const shardeumSphinx = /*#__PURE__*/ defineChain(chains.shardeumSphinx)
+export const syscoin = /*#__PURE__*/ defineChain(chains.syscoin)
+export const taraxa = /*#__PURE__*/ defineChain(chains.taraxa)
+export const taraxaTestnet = /*#__PURE__*/ defineChain(chains.taraxaTestnet)
+export const telos = /*#__PURE__*/ defineChain(chains.telos)
+export const telosTestnet = /*#__PURE__*/ defineChain(chains.telosTestnet)
+export const thunderTestnet = /*#__PURE__*/ defineChain(chains.thunderTestnet)
+export const wanchain = /*#__PURE__*/ defineChain(chains.wanchain)
+export const wanchainTestnet = /*#__PURE__*/ defineChain(chains.wanchainTestnet)
+export const xdc = /*#__PURE__*/ defineChain(chains.xdc)
+export const xdcTestnet = /*#__PURE__*/ defineChain(chains.xdcTestnet)
+export const zhejiang = /*#__PURE__*/ defineChain(chains.zhejiang)
+export const zkSync = /*#__PURE__*/ defineChain(chains.zkSync)
+export const zkSyncTestnet = /*#__PURE__*/ defineChain(chains.zkSyncTestnet)
+export const zora = /*#__PURE__*/ defineChain(chains.zora, {
+  fees: feesOptimism,
+  formatters: formattersOptimism,
+})
+export const zoraTestnet = /*#__PURE__*/ defineChain(chains.zoraTestnet, {
+  fees: feesOptimism,
+  formatters: formattersOptimism,
+})
+
+export type { Chain } from '../types/chain.js'

package/src/chains/optimism/fees.ts

@@ -0,0 +1,5 @@
+import type { ChainFees } from '../../types/chain.js'
+
+export const feesOptimism = {
+  defaultPriorityFee: 1_000_000n, // 0.001 gwei
+} as const satisfies ChainFees

package/src/chains/optimism/formatters.ts

@@ -0,0 +1,74 @@
+import { type ChainFormatters } from '../../types/chain.js'
+import type { Hash } from '../../types/misc.js'
+import { type RpcTransaction } from '../../types/rpc.js'
+import { hexToBigInt } from '../../utils/encoding/fromHex.js'
+import { defineBlock } from '../../utils/formatters/block.js'
+import {
+  defineTransaction,
+  formatTransaction,
+} from '../../utils/formatters/transaction.js'
+import { defineTransactionReceipt } from '../../utils/formatters/transactionReceipt.js'
+import type {
+  OptimismBlockOverrides,
+  OptimismRpcBlockOverrides,
+  OptimismRpcTransaction,
+  OptimismRpcTransactionReceiptOverrides,
+  OptimismTransaction,
+  OptimismTransactionReceiptOverrides,
+} from './types.js'
+
+export const formattersOptimism = {
+  block: /*#__PURE__*/ defineBlock({
+    format(
+      args: OptimismRpcBlockOverrides & {
+        transactions: Hash[] | OptimismRpcTransaction[]
+      },
+    ): OptimismBlockOverrides & {
+      transactions: Hash[] | OptimismTransaction[]
+    } {
+      const transactions = args.transactions?.map((transaction) => {
+        if (typeof transaction === 'string') return transaction
+        const formatted = formatTransaction(
+          transaction as RpcTransaction,
+        ) as OptimismTransaction
+        if (formatted.typeHex === '0x7e') {
+          formatted.isSystemTx = transaction.isSystemTx
+          formatted.mint = transaction.mint
+            ? hexToBigInt(transaction.mint)
+            : undefined
+          formatted.sourceHash = transaction.sourceHash
+          formatted.type = 'deposit'
+        }
+        return formatted
+      }) as Hash[] | OptimismTransaction[]
+      return {
+        transactions,
+        stateRoot: args.stateRoot,
+      }
+    },
+  }),
+  transaction: /*#__PURE__*/ defineTransaction({
+    format(args: OptimismRpcTransaction): OptimismTransaction {
+      const transaction = {} as OptimismTransaction
+      if (args.type === '0x7e') {
+        transaction.isSystemTx = args.isSystemTx
+        transaction.mint = args.mint ? hexToBigInt(args.mint) : undefined
+        transaction.sourceHash = args.sourceHash
+        transaction.type = 'deposit'
+      }
+      return transaction
+    },
+  }),
+  transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
+    format(
+      args: OptimismRpcTransactionReceiptOverrides,
+    ): OptimismTransactionReceiptOverrides {
+      return {
+        l1GasPrice: args.l1GasPrice ? hexToBigInt(args.l1GasPrice) : null,
+        l1GasUsed: args.l1GasUsed ? hexToBigInt(args.l1GasUsed) : null,
+        l1Fee: args.l1Fee ? hexToBigInt(args.l1Fee) : null,
+        l1FeeScalar: args.l1FeeScalar ? Number(args.l1FeeScalar) : null,
+      }
+    },
+  }),
+} as const satisfies ChainFormatters

package/src/chains/optimism/types.ts

@@ -0,0 +1,102 @@
+import type { Block, BlockTag } from '../../types/block.js'
+import type { FeeValuesEIP1559 } from '../../types/fee.js'
+import type { Hash, Hex } from '../../types/misc.js'
+import type {
+  Index,
+  Quantity,
+  RpcBlock,
+  RpcTransaction as RpcTransaction_,
+  RpcTransactionReceipt,
+} from '../../types/rpc.js'
+import type {
+  Transaction as Transaction_,
+  TransactionBase,
+  TransactionReceipt,
+} from '../../types/transaction.js'
+
+export type OptimismBlockOverrides = {
+  stateRoot: Hash
+}
+export type OptimismBlock<
+  TIncludeTransactions extends boolean = boolean,
+  TBlockTag extends BlockTag = BlockTag,
+> = Block<
+  bigint,
+  TIncludeTransactions,
+  TBlockTag,
+  OptimismTransaction<TBlockTag extends 'pending' ? true : false>
+> &
+  OptimismBlockOverrides
+
+export type OptimismRpcBlockOverrides = {
+  stateRoot: Hash
+}
+export type OptimismRpcBlock<
+  TBlockTag extends BlockTag = BlockTag,
+  TIncludeTransactions extends boolean = boolean,
+> = RpcBlock<
+  TBlockTag,
+  TIncludeTransactions,
+  OptimismRpcTransaction<TBlockTag extends 'pending' ? true : false>
+> &
+  OptimismRpcBlockOverrides
+
+type RpcTransaction<TPending extends boolean = boolean> =
+  RpcTransaction_<TPending> & {
+    isSystemTx?: undefined
+    mint?: undefined
+    sourceHash?: undefined
+  }
+
+export type OptimismRpcDepositTransaction<TPending extends boolean = boolean> =
+  Omit<TransactionBase<Quantity, Index, TPending>, 'typeHex'> &
+    FeeValuesEIP1559<Quantity> & {
+      isSystemTx?: boolean
+      mint?: Hex
+      sourceHash: Hex
+      type: '0x7e'
+    }
+export type OptimismRpcTransaction<TPending extends boolean = boolean> =
+  | RpcTransaction<TPending>
+  | OptimismRpcDepositTransaction<TPending>
+
+export type OptimismRpcTransactionReceiptOverrides = {
+  l1GasPrice: Hex | null
+  l1GasUsed: Hex | null
+  l1Fee: Hex | null
+  l1FeeScalar: `${number}` | null
+}
+export type OptimismRpcTransactionReceipt = RpcTransactionReceipt &
+  OptimismRpcTransactionReceiptOverrides
+
+type Transaction<TPending extends boolean = boolean> = Transaction_<
+  bigint,
+  number,
+  TPending
+> & {
+  isSystemTx?: undefined
+  mint?: undefined
+  sourceHash?: undefined
+}
+
+export type OptimismDepositTransaction<TPending extends boolean = boolean> =
+  TransactionBase<bigint, number, TPending> &
+    FeeValuesEIP1559 & {
+      isSystemTx?: boolean
+      mint?: bigint
+      sourceHash: Hex
+      type: 'deposit'
+    }
+
+export type OptimismTransaction<TPending extends boolean = boolean> =
+  | Transaction<TPending>
+  | OptimismDepositTransaction<TPending>
+
+export type OptimismTransactionReceiptOverrides = {
+  l1GasPrice: bigint | null
+  l1GasUsed: bigint | null
+  l1Fee: bigint | null
+  l1FeeScalar: number | null
+}
+export type OptimismTransactionReceipt = TransactionReceipt &
+  OptimismTransactionReceiptOverrides

package/src/chains/utils.ts

@@ -1,41 +1,45 @@
+export { formattersCelo } from './celo/formatters.js'
 export {
-  type CeloBlock,
-  type CeloBlockOverrides,
-  type CeloRpcBlock,
-  type CeloRpcBlockOverrides,
-  type CeloRpcTransaction,
-  type CeloRpcTransactionOverrides,
-  type CeloRpcTransactionReceipt,
-  type CeloRpcTransactionReceiptOverrides,
-  type CeloRpcTransactionRequest,
-  type CeloRpcTransactionRequestOverrides,
-  type CeloTransaction,
-  type CeloTransactionOverrides,
-  type CeloTransactionReceipt,
-  type CeloTransactionReceiptOverrides,
-  type CeloTransactionRequest,
-  type CeloTransactionRequestOverrides,
-  type CeloTransactionSerializable,
-  type CeloTransactionSerialized,
-  type CeloTransactionType,
-  type OptimismBlock,
-  type OptimismBlockOverrides,
-  type OptimismDepositTransaction,
-  type OptimismRpcBlock,
-  type OptimismRpcBlockOverrides,
-  type OptimismRpcDepositTransaction,
-  type OptimismRpcTransaction,
-  type OptimismRpcTransactionReceipt,
-  type OptimismRpcTransactionReceiptOverrides,
-  type OptimismTransaction,
-  type OptimismTransactionReceipt,
-  type OptimismTransactionReceiptOverrides,
-  type TransactionSerializableCIP42,
-  type TransactionSerializedCIP42,
-  formattersCelo,
-  formattersOptimism,
-  parseTransactionCelo,
   serializeTransactionCelo,
   serializersCelo,
-  defineChain,
-} from '@viem/chains/utils'
+} from './celo/serializers.js'
+export { parseTransactionCelo } from './celo/parsers.js'
+export type {
+  CeloBlock,
+  CeloBlockOverrides,
+  CeloRpcBlock,
+  CeloRpcBlockOverrides,
+  CeloRpcTransaction,
+  CeloRpcTransactionOverrides,
+  CeloRpcTransactionReceipt,
+  CeloRpcTransactionReceiptOverrides,
+  CeloRpcTransactionRequest,
+  CeloRpcTransactionRequestOverrides,
+  CeloTransaction,
+  CeloTransactionOverrides,
+  CeloTransactionReceipt,
+  CeloTransactionReceiptOverrides,
+  CeloTransactionRequest,
+  CeloTransactionRequestOverrides,
+  CeloTransactionSerializable,
+  CeloTransactionSerialized,
+  CeloTransactionType,
+  TransactionSerializableCIP42,
+  TransactionSerializedCIP42,
+} from './celo/types.js'
+
+export { formattersOptimism } from './optimism/formatters.js'
+export type {
+  OptimismBlock,
+  OptimismBlockOverrides,
+  OptimismDepositTransaction,
+  OptimismRpcBlock,
+  OptimismRpcBlockOverrides,
+  OptimismRpcDepositTransaction,
+  OptimismRpcTransaction,
+  OptimismRpcTransactionReceipt,
+  OptimismRpcTransactionReceiptOverrides,
+  OptimismTransaction,
+  OptimismTransactionReceipt,
+  OptimismTransactionReceiptOverrides,
+} from './optimism/types.js'

package/src/clients/createClient.ts

@@ -1,7 +1,7 @@
-import type { Chain } from '@viem/chains'
 import type { Address } from 'abitype'
 
 import type { Account, JsonRpcAccount } from '../accounts/types.js'
+import type { Chain } from '../types/chain.js'
 import type {
   EIP1193RequestFn,
   EIP1474Methods,

package/src/clients/createPublicClient.ts

@@ -1,5 +1,4 @@
-import type { Chain } from '@viem/chains'
-
+import type { Chain } from '../types/chain.js'
 import type { PublicRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
 import { type Client, type ClientConfig, createClient } from './createClient.js'

package/src/clients/createTestClient.ts

@@ -1,11 +1,11 @@
 import type { Account } from '../accounts/types.js'
 import type { ParseAccount } from '../types/account.js'
+import type { Chain } from '../types/chain.js'
 import type { TestRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
 import { type Client, type ClientConfig, createClient } from './createClient.js'
 import { type TestActions, testActions } from './decorators/test.js'
 import type { Transport } from './transports/createTransport.js'
-import type { Chain } from '@viem/chains'
 import type { Address } from 'abitype'
 
 export type TestClientMode = 'anvil' | 'hardhat' | 'ganache'

package/src/clients/createWalletClient.ts

@@ -2,12 +2,12 @@ import type { Address } from 'abitype'
 
 import type { Account } from '../accounts/types.js'
 import type { ParseAccount } from '../types/account.js'
+import type { Chain } from '../types/chain.js'
 import type { WalletRpcSchema } from '../types/eip1193.js'
 import type { Prettify } from '../types/utils.js'
 import { type Client, type ClientConfig, createClient } from './createClient.js'
 import { type WalletActions, walletActions } from './decorators/wallet.js'
 import type { Transport } from './transports/createTransport.js'
-import type { Chain } from '@viem/chains'
 
 export type WalletClientConfig<
   transport extends Transport = Transport,