ox 1.0.0-beta.2 → 1.0.0-beta.21

package/src/core/Transaction.ts

@@ -3,6 +3,7 @@ import type * as Address from './Address.js'
 import * as Authorization from './Authorization.js'
 import type * as Errors from './Errors.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import type { Compute, OneOf, UnionCompute } from './internal/types.js'
 import * as Signature from './Signature.js'
 
@@ -373,31 +374,31 @@ export declare namespace fromRpc {
  * @returns An RPC-formatted transaction.
  */
 export function toRpc<pending extends boolean = false>(
-  transaction: Transaction<pending>,
+  transaction: toRpc.Input<pending>,
   _options?: toRpc.Options<pending>,
 ): Rpc<pending> {
   const rpc = {} as Rpc<boolean>
 
   rpc.blockHash = transaction.blockHash
   rpc.blockNumber =
-    typeof transaction.blockNumber === 'bigint'
-      ? Hex.fromNumber(transaction.blockNumber)
-      : null
-  if (typeof transaction.blockTimestamp === 'bigint')
-    rpc.blockTimestamp = Hex.fromNumber(transaction.blockTimestamp)
-  else if (transaction.blockTimestamp === null) rpc.blockTimestamp = null
+    transaction.blockNumber == null
+      ? null
+      : Quantity.fromNumberish(transaction.blockNumber)
+  if (transaction.blockTimestamp === null) rpc.blockTimestamp = null
+  else if (transaction.blockTimestamp !== undefined)
+    rpc.blockTimestamp = Quantity.fromNumberish(transaction.blockTimestamp)
   rpc.from = transaction.from
-  rpc.gas = Hex.fromNumber(transaction.gas ?? 0n)
+  rpc.gas = Quantity.fromNumberish(transaction.gas ?? 0n)
   rpc.hash = transaction.hash
   rpc.input = transaction.input
-  rpc.nonce = Hex.fromNumber(transaction.nonce ?? 0n)
+  rpc.nonce = Quantity.fromNumberish(transaction.nonce ?? 0n)
   rpc.to = transaction.to
   rpc.transactionIndex =
-    typeof transaction.transactionIndex === 'number'
-      ? Hex.fromNumber(transaction.transactionIndex)
-      : null
+    transaction.transactionIndex == null
+      ? null
+      : Quantity.fromNumberish(transaction.transactionIndex)
   rpc.type = (toRpcType as any)[transaction.type] ?? transaction.type
-  rpc.value = Hex.fromNumber(transaction.value ?? 0n)
+  rpc.value = Quantity.fromNumberish(transaction.value ?? 0n)
 
   if (transaction.accessList) rpc.accessList = transaction.accessList
   if (transaction.authorizationList)
@@ -406,26 +407,36 @@ export function toRpc<pending extends boolean = false>(
     )
   if (transaction.blobVersionedHashes)
     rpc.blobVersionedHashes = transaction.blobVersionedHashes
-  if (transaction.chainId) rpc.chainId = Hex.fromNumber(transaction.chainId)
-  if (typeof transaction.gasPrice === 'bigint')
-    rpc.gasPrice = Hex.fromNumber(transaction.gasPrice)
-  if (typeof transaction.maxFeePerBlobGas === 'bigint')
-    rpc.maxFeePerBlobGas = Hex.fromNumber(transaction.maxFeePerBlobGas)
-  if (typeof transaction.maxFeePerGas === 'bigint')
-    rpc.maxFeePerGas = Hex.fromNumber(transaction.maxFeePerGas)
-  if (typeof transaction.maxPriorityFeePerGas === 'bigint')
-    rpc.maxPriorityFeePerGas = Hex.fromNumber(transaction.maxPriorityFeePerGas)
+  if (transaction.chainId)
+    rpc.chainId = Quantity.fromNumberish(transaction.chainId)
+  if (transaction.gasPrice !== undefined)
+    rpc.gasPrice = Quantity.fromNumberish(transaction.gasPrice)
+  if (transaction.maxFeePerBlobGas !== undefined)
+    rpc.maxFeePerBlobGas = Quantity.fromNumberish(transaction.maxFeePerBlobGas)
+  if (transaction.maxFeePerGas !== undefined)
+    rpc.maxFeePerGas = Quantity.fromNumberish(transaction.maxFeePerGas)
+  if (transaction.maxPriorityFeePerGas !== undefined)
+    rpc.maxPriorityFeePerGas = Quantity.fromNumberish(
+      transaction.maxPriorityFeePerGas,
+    )
   if (typeof transaction.r === 'string') rpc.r = transaction.r
   if (typeof transaction.s === 'string') rpc.s = transaction.s
-  if (typeof transaction.v === 'number')
-    rpc.v = Hex.fromNumber(transaction.v, { size: 1 })
-  if (typeof transaction.yParity === 'number')
-    rpc.yParity = transaction.yParity === 0 ? '0x0' : '0x1'
+  if (transaction.v !== undefined)
+    rpc.v = Quantity.fromNumberish(transaction.v, { size: 1 })
+  if (transaction.yParity !== undefined)
+    rpc.yParity = Quantity.fromNumberish(transaction.yParity)
 
   return rpc as Rpc<pending>
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#Transaction.(toRpc:function)}. */
+  type Input<pending extends boolean = false> = Transaction<
+    pending,
+    Hex.Hex | bigint | number,
+    Hex.Hex | number
+  >
+
   type Options<pending extends boolean = false> = {
     pending?: pending | boolean | undefined
   }

package/src/core/TransactionReceipt.ts

@@ -1,6 +1,7 @@
 import type * as Address from './Address.js'
 import type * as Errors from './Errors.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import type { Compute } from './internal/types.js'
 import * as Log from './Log.js'
 
@@ -302,32 +303,40 @@ export declare namespace fromRpc {
  * @param receipt - The receipt to convert.
  * @returns An RPC receipt.
  */
-export function toRpc(receipt: TransactionReceipt): Rpc {
+export function toRpc(receipt: toRpc.Input): Rpc {
   return {
     blobGasPrice: receipt.blobGasPrice
-      ? Hex.fromNumber(receipt.blobGasPrice)
+      ? Quantity.fromNumberish(receipt.blobGasPrice)
       : undefined,
     blobGasUsed: receipt.blobGasUsed
-      ? Hex.fromNumber(receipt.blobGasUsed)
+      ? Quantity.fromNumberish(receipt.blobGasUsed)
       : undefined,
     blockHash: receipt.blockHash,
-    blockNumber: Hex.fromNumber(receipt.blockNumber),
+    blockNumber: Quantity.fromNumberish(receipt.blockNumber),
     contractAddress: receipt.contractAddress,
-    cumulativeGasUsed: Hex.fromNumber(receipt.cumulativeGasUsed),
-    effectiveGasPrice: Hex.fromNumber(receipt.effectiveGasPrice),
+    cumulativeGasUsed: Quantity.fromNumberish(receipt.cumulativeGasUsed),
+    effectiveGasPrice: Quantity.fromNumberish(receipt.effectiveGasPrice),
     from: receipt.from,
-    gasUsed: Hex.fromNumber(receipt.gasUsed),
+    gasUsed: Quantity.fromNumberish(receipt.gasUsed),
     logs: receipt.logs.map(Log.toRpc as never),
     logsBloom: receipt.logsBloom,
     root: receipt.root,
     status: toRpcStatus[receipt.status],
     to: receipt.to,
     transactionHash: receipt.transactionHash,
-    transactionIndex: Hex.fromNumber(receipt.transactionIndex),
+    transactionIndex: Quantity.fromNumberish(receipt.transactionIndex),
     type: (toRpcType as any)[receipt.type] ?? receipt.type,
   }
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#TransactionReceipt.(toRpc:function)}. */
+  export type Input = TransactionReceipt<
+    Status,
+    Type,
+    Hex.Hex | bigint | number,
+    Hex.Hex | number
+  >
+
   export type ErrorType = Hex.fromNumber.ErrorType | Errors.GlobalErrorType
 }

package/src/core/TransactionRequest.ts

@@ -4,6 +4,7 @@ import * as Authorization from './Authorization.js'
 import * as Blobs from './Blobs.js'
 import * as Errors from './Errors.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import type { Compute } from './internal/types.js'
 import type * as Kzg from './Kzg.js'
 import * as Transaction from './Transaction.js'
@@ -164,7 +165,7 @@ export declare namespace fromRpc {
  * @param request - The request to convert.
  * @returns An RPC request.
  */
-export function toRpc(request: TransactionRequest): Rpc {
+export function toRpc(request: toRpc.Input): Rpc {
   const request_rpc: Rpc = {}
 
   if (typeof request.accessList !== 'undefined')
@@ -177,7 +178,7 @@ export function toRpc(request: TransactionRequest): Rpc {
     request_rpc.blobVersionedHashes = request.blobVersionedHashes
   if (typeof request.blobs !== 'undefined') request_rpc.blobs = request.blobs
   if (typeof request.chainId !== 'undefined')
-    request_rpc.chainId = Hex.fromNumber(request.chainId)
+    request_rpc.chainId = Quantity.fromNumberish(request.chainId)
   if (typeof request.data !== 'undefined') {
     request_rpc.data = request.data
     request_rpc.input = request.data
@@ -187,19 +188,21 @@ export function toRpc(request: TransactionRequest): Rpc {
   }
   if (typeof request.from !== 'undefined') request_rpc.from = request.from
   if (typeof request.gas !== 'undefined')
-    request_rpc.gas = Hex.fromNumber(request.gas)
+    request_rpc.gas = Quantity.fromNumberish(request.gas)
   if (typeof request.gasPrice !== 'undefined')
-    request_rpc.gasPrice = Hex.fromNumber(request.gasPrice)
+    request_rpc.gasPrice = Quantity.fromNumberish(request.gasPrice)
   if (typeof request.maxFeePerBlobGas !== 'undefined')
-    request_rpc.maxFeePerBlobGas = Hex.fromNumber(request.maxFeePerBlobGas)
+    request_rpc.maxFeePerBlobGas = Quantity.fromNumberish(
+      request.maxFeePerBlobGas,
+    )
   if (typeof request.maxFeePerGas !== 'undefined')
-    request_rpc.maxFeePerGas = Hex.fromNumber(request.maxFeePerGas)
+    request_rpc.maxFeePerGas = Quantity.fromNumberish(request.maxFeePerGas)
   if (typeof request.maxPriorityFeePerGas !== 'undefined')
-    request_rpc.maxPriorityFeePerGas = Hex.fromNumber(
+    request_rpc.maxPriorityFeePerGas = Quantity.fromNumberish(
       request.maxPriorityFeePerGas,
     )
   if (typeof request.nonce !== 'undefined')
-    request_rpc.nonce = Hex.fromNumber(request.nonce)
+    request_rpc.nonce = Quantity.fromNumberish(request.nonce)
   if (typeof request.to !== 'undefined') request_rpc.to = request.to
   if (typeof request.type !== 'undefined')
     request_rpc.type =
@@ -207,18 +210,25 @@ export function toRpc(request: TransactionRequest): Rpc {
         request.type as keyof typeof Transaction.toRpcType
       ] || request.type
   if (typeof request.value !== 'undefined')
-    request_rpc.value = Hex.fromNumber(request.value)
+    request_rpc.value = Quantity.fromNumberish(request.value)
   if (typeof request.r !== 'undefined') request_rpc.r = request.r
   if (typeof request.s !== 'undefined') request_rpc.s = request.s
   if (typeof request.yParity !== 'undefined')
-    request_rpc.yParity = Hex.fromNumber(request.yParity)
+    request_rpc.yParity = Quantity.fromNumberish(request.yParity)
   if (typeof request.v !== 'undefined')
-    request_rpc.v = Hex.fromNumber(request.v)
+    request_rpc.v = Quantity.fromNumberish(request.v)
 
   return request_rpc
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#TransactionRequest.(toRpc:function)}. */
+  export type Input = TransactionRequest<
+    Hex.Hex | bigint | number,
+    Hex.Hex | number,
+    string
+  >
+
   export type ErrorType =
     | Authorization.toRpcList.ErrorType
     | Hex.fromNumber.ErrorType

package/src/core/TxEnvelope.ts

@@ -630,8 +630,8 @@ export declare namespace serialize {
  * @param envelope - The transaction envelope.
  * @returns RPC representation.
  */
-export function toRpc<const envelope extends TxEnvelope>(
-  envelope: envelope | TxEnvelope,
+export function toRpc<const envelope extends toRpc.Input>(
+  envelope: envelope | toRpc.Input,
 ): toRpc.ReturnType<envelope> {
   const type = getType(envelope) as Type | string
   if (type === 'legacy')
@@ -648,6 +648,13 @@ export function toRpc<const envelope extends TxEnvelope>(
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#(TransactionEnvelope:namespace).(toRpc:function)}. */
+  export type Input = TxEnvelope<
+    boolean,
+    Hex.Hex | bigint | number,
+    Hex.Hex | number
+  >
+
   export type ReturnType<envelope extends Typeable = TxEnvelope> =
     getType.ReturnType<envelope> extends 'legacy'
       ? TxEnvelopeLegacy.Rpc

package/src/core/TxEnvelopeEip1559.ts

@@ -4,6 +4,7 @@ import type * as Bytes from './Bytes.js'
 import type * as Errors from './Errors.js'
 import * as Hash from './Hash.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import * as Tx from './internal/tx.js'
 import type {
   Assign,
@@ -579,29 +580,31 @@ export declare namespace serialize {
  * @param envelope - The EIP-1559 transaction envelope to convert.
  * @returns An RPC-formatted EIP-1559 transaction envelope.
  */
-export function toRpc(envelope: Omit<TxEnvelopeEip1559, 'type'>): Rpc {
+export function toRpc(envelope: toRpc.Input): Rpc {
   const signature = Signature.extract(envelope)
 
   return {
     ...envelope,
-    chainId: Hex.fromNumber(envelope.chainId),
+    chainId: Quantity.fromNumberish(envelope.chainId),
     data: envelope.data ?? envelope.input,
     type: '0x2',
-    ...(typeof envelope.gas === 'bigint'
-      ? { gas: Hex.fromNumber(envelope.gas) }
+    ...(envelope.gas !== undefined
+      ? { gas: Quantity.fromNumberish(envelope.gas) }
       : {}),
-    ...(typeof envelope.nonce === 'bigint'
-      ? { nonce: Hex.fromNumber(envelope.nonce) }
+    ...(envelope.nonce !== undefined
+      ? { nonce: Quantity.fromNumberish(envelope.nonce) }
       : {}),
-    ...(typeof envelope.value === 'bigint'
-      ? { value: Hex.fromNumber(envelope.value) }
+    ...(envelope.value !== undefined
+      ? { value: Quantity.fromNumberish(envelope.value) }
       : {}),
-    ...(typeof envelope.maxFeePerGas === 'bigint'
-      ? { maxFeePerGas: Hex.fromNumber(envelope.maxFeePerGas) }
+    ...(envelope.maxFeePerGas !== undefined
+      ? { maxFeePerGas: Quantity.fromNumberish(envelope.maxFeePerGas) }
       : {}),
-    ...(typeof envelope.maxPriorityFeePerGas === 'bigint'
+    ...(envelope.maxPriorityFeePerGas !== undefined
       ? {
-          maxPriorityFeePerGas: Hex.fromNumber(envelope.maxPriorityFeePerGas),
+          maxPriorityFeePerGas: Quantity.fromNumberish(
+            envelope.maxPriorityFeePerGas,
+          ),
         }
       : {}),
     ...(signature ? Signature.toRpc(signature) : {}),
@@ -609,6 +612,12 @@ export function toRpc(envelope: Omit<TxEnvelopeEip1559, 'type'>): Rpc {
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#TxEnvelopeEip1559.(toRpc:function)}. */
+  export type Input = Omit<
+    TxEnvelopeEip1559<boolean, Hex.Hex | bigint | number, Hex.Hex | number>,
+    'type'
+  >
+
   export type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
 }
 

package/src/core/TxEnvelopeEip2930.ts

@@ -4,6 +4,7 @@ import type * as Bytes from './Bytes.js'
 import type * as Errors from './Errors.js'
 import * as Hash from './Hash.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import * as Tx from './internal/tx.js'
 import type {
   Assign,
@@ -545,24 +546,24 @@ export declare namespace serialize {
  * @param envelope - The EIP-2930 transaction envelope to convert.
  * @returns An RPC-formatted EIP-2930 transaction envelope.
  */
-export function toRpc(envelope: Omit<TxEnvelopeEip2930, 'type'>): Rpc {
+export function toRpc(envelope: toRpc.Input): Rpc {
   const signature = Signature.extract(envelope)!
 
   return {
     ...envelope,
-    chainId: Hex.fromNumber(envelope.chainId),
+    chainId: Quantity.fromNumberish(envelope.chainId),
     data: envelope.data ?? envelope.input,
-    ...(typeof envelope.gas === 'bigint'
-      ? { gas: Hex.fromNumber(envelope.gas) }
+    ...(envelope.gas !== undefined
+      ? { gas: Quantity.fromNumberish(envelope.gas) }
       : {}),
-    ...(typeof envelope.nonce === 'bigint'
-      ? { nonce: Hex.fromNumber(envelope.nonce) }
+    ...(envelope.nonce !== undefined
+      ? { nonce: Quantity.fromNumberish(envelope.nonce) }
       : {}),
-    ...(typeof envelope.value === 'bigint'
-      ? { value: Hex.fromNumber(envelope.value) }
+    ...(envelope.value !== undefined
+      ? { value: Quantity.fromNumberish(envelope.value) }
       : {}),
-    ...(typeof envelope.gasPrice === 'bigint'
-      ? { gasPrice: Hex.fromNumber(envelope.gasPrice) }
+    ...(envelope.gasPrice !== undefined
+      ? { gasPrice: Quantity.fromNumberish(envelope.gasPrice) }
       : {}),
     type: '0x1',
     ...(signature ? Signature.toRpc(signature) : {}),
@@ -570,6 +571,12 @@ export function toRpc(envelope: Omit<TxEnvelopeEip2930, 'type'>): Rpc {
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#TxEnvelopeEip2930.(toRpc:function)}. */
+  export type Input = Omit<
+    TxEnvelopeEip2930<boolean, Hex.Hex | bigint | number, Hex.Hex | number>,
+    'type'
+  >
+
   export type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
 }
 

package/src/core/TxEnvelopeEip4844.ts

@@ -4,6 +4,7 @@ import type * as Bytes from './Bytes.js'
 import * as Errors from './Errors.js'
 import * as Hash from './Hash.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import * as Tx from './internal/tx.js'
 import type {
   Assign,
@@ -791,30 +792,34 @@ export declare namespace serialize {
  * @param envelope - The EIP-4844 transaction envelope to convert.
  * @returns An RPC-formatted EIP-4844 transaction envelope.
  */
-export function toRpc(envelope: Omit<TxEnvelopeEip4844, 'type'>): Rpc {
+export function toRpc(envelope: toRpc.Input): Rpc {
   const signature = Signature.extract(envelope)
 
   return {
     ...envelope,
-    chainId: Hex.fromNumber(envelope.chainId),
+    chainId: Quantity.fromNumberish(envelope.chainId),
     data: envelope.data ?? envelope.input,
-    ...(typeof envelope.gas === 'bigint'
-      ? { gas: Hex.fromNumber(envelope.gas) }
+    ...(envelope.gas !== undefined
+      ? { gas: Quantity.fromNumberish(envelope.gas) }
       : {}),
-    ...(typeof envelope.nonce === 'bigint'
-      ? { nonce: Hex.fromNumber(envelope.nonce) }
+    ...(envelope.nonce !== undefined
+      ? { nonce: Quantity.fromNumberish(envelope.nonce) }
       : {}),
-    ...(typeof envelope.value === 'bigint'
-      ? { value: Hex.fromNumber(envelope.value) }
+    ...(envelope.value !== undefined
+      ? { value: Quantity.fromNumberish(envelope.value) }
       : {}),
-    ...(typeof envelope.maxFeePerBlobGas === 'bigint'
-      ? { maxFeePerBlobGas: Hex.fromNumber(envelope.maxFeePerBlobGas) }
+    ...(envelope.maxFeePerBlobGas !== undefined
+      ? { maxFeePerBlobGas: Quantity.fromNumberish(envelope.maxFeePerBlobGas) }
       : {}),
-    ...(typeof envelope.maxFeePerGas === 'bigint'
-      ? { maxFeePerGas: Hex.fromNumber(envelope.maxFeePerGas) }
+    ...(envelope.maxFeePerGas !== undefined
+      ? { maxFeePerGas: Quantity.fromNumberish(envelope.maxFeePerGas) }
       : {}),
-    ...(typeof envelope.maxPriorityFeePerGas === 'bigint'
-      ? { maxPriorityFeePerGas: Hex.fromNumber(envelope.maxPriorityFeePerGas) }
+    ...(envelope.maxPriorityFeePerGas !== undefined
+      ? {
+          maxPriorityFeePerGas: Quantity.fromNumberish(
+            envelope.maxPriorityFeePerGas,
+          ),
+        }
       : {}),
     type: '0x3',
     ...(signature ? Signature.toRpc(signature) : {}),
@@ -822,6 +827,12 @@ export function toRpc(envelope: Omit<TxEnvelopeEip4844, 'type'>): Rpc {
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#TxEnvelopeEip4844.(toRpc:function)}. */
+  export type Input = Omit<
+    TxEnvelopeEip4844<boolean, Hex.Hex | bigint | number, Hex.Hex | number>,
+    'type'
+  >
+
   export type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
 }
 

package/src/core/TxEnvelopeEip7702.ts

@@ -5,6 +5,7 @@ import type * as Bytes from './Bytes.js'
 import type * as Errors from './Errors.js'
 import * as Hash from './Hash.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import * as Tx from './internal/tx.js'
 import type {
   Assign,
@@ -637,30 +638,32 @@ export declare namespace serialize {
  * @param envelope - The EIP-7702 transaction envelope to convert.
  * @returns An RPC-formatted EIP-7702 transaction envelope.
  */
-export function toRpc(envelope: Omit<TxEnvelopeEip7702, 'type'>): Rpc {
+export function toRpc(envelope: toRpc.Input): Rpc {
   const signature = Signature.extract(envelope)
 
   return {
     ...envelope,
     authorizationList: Authorization.toRpcList(envelope.authorizationList),
-    chainId: Hex.fromNumber(envelope.chainId),
+    chainId: Quantity.fromNumberish(envelope.chainId),
     data: envelope.data ?? envelope.input,
     type: '0x4',
-    ...(typeof envelope.gas === 'bigint'
-      ? { gas: Hex.fromNumber(envelope.gas) }
+    ...(envelope.gas !== undefined
+      ? { gas: Quantity.fromNumberish(envelope.gas) }
       : {}),
-    ...(typeof envelope.nonce === 'bigint'
-      ? { nonce: Hex.fromNumber(envelope.nonce) }
+    ...(envelope.nonce !== undefined
+      ? { nonce: Quantity.fromNumberish(envelope.nonce) }
       : {}),
-    ...(typeof envelope.value === 'bigint'
-      ? { value: Hex.fromNumber(envelope.value) }
+    ...(envelope.value !== undefined
+      ? { value: Quantity.fromNumberish(envelope.value) }
       : {}),
-    ...(typeof envelope.maxFeePerGas === 'bigint'
-      ? { maxFeePerGas: Hex.fromNumber(envelope.maxFeePerGas) }
+    ...(envelope.maxFeePerGas !== undefined
+      ? { maxFeePerGas: Quantity.fromNumberish(envelope.maxFeePerGas) }
       : {}),
-    ...(typeof envelope.maxPriorityFeePerGas === 'bigint'
+    ...(envelope.maxPriorityFeePerGas !== undefined
       ? {
-          maxPriorityFeePerGas: Hex.fromNumber(envelope.maxPriorityFeePerGas),
+          maxPriorityFeePerGas: Quantity.fromNumberish(
+            envelope.maxPriorityFeePerGas,
+          ),
         }
       : {}),
     ...(signature ? Signature.toRpc(signature) : {}),
@@ -668,6 +671,12 @@ export function toRpc(envelope: Omit<TxEnvelopeEip7702, 'type'>): Rpc {
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#TxEnvelopeEip7702.(toRpc:function)}. */
+  export type Input = Omit<
+    TxEnvelopeEip7702<boolean, Hex.Hex | bigint | number, Hex.Hex | number>,
+    'type'
+  >
+
   export type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
 }
 

package/src/core/TxEnvelopeLegacy.ts

@@ -3,6 +3,7 @@ import type * as Bytes from './Bytes.js'
 import type * as Errors from './Errors.js'
 import * as Hash from './Hash.js'
 import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 import * as Tx from './internal/tx.js'
 import type {
   Assign,
@@ -579,7 +580,7 @@ export declare namespace serialize {
  * @param envelope - The legacy transaction envelope to convert.
  * @returns An RPC-formatted legacy transaction envelope.
  */
-export function toRpc(envelope: Omit<TxEnvelopeLegacy, 'type'>): Rpc {
+export function toRpc(envelope: toRpc.Input): Rpc {
   const signature = Signature.extract(envelope)!
 
   return {
@@ -590,17 +591,17 @@ export function toRpc(envelope: Omit<TxEnvelopeLegacy, 'type'>): Rpc {
         : undefined,
     data: envelope.data ?? envelope.input,
     type: '0x0',
-    ...(typeof envelope.gas === 'bigint'
-      ? { gas: Hex.fromNumber(envelope.gas) }
+    ...(envelope.gas !== undefined
+      ? { gas: Quantity.fromNumberish(envelope.gas) }
       : {}),
-    ...(typeof envelope.nonce === 'bigint'
-      ? { nonce: Hex.fromNumber(envelope.nonce) }
+    ...(envelope.nonce !== undefined
+      ? { nonce: Quantity.fromNumberish(envelope.nonce) }
       : {}),
-    ...(typeof envelope.value === 'bigint'
-      ? { value: Hex.fromNumber(envelope.value) }
+    ...(envelope.value !== undefined
+      ? { value: Quantity.fromNumberish(envelope.value) }
       : {}),
-    ...(typeof envelope.gasPrice === 'bigint'
-      ? { gasPrice: Hex.fromNumber(envelope.gasPrice) }
+    ...(envelope.gasPrice !== undefined
+      ? { gasPrice: Quantity.fromNumberish(envelope.gasPrice) }
       : {}),
     ...(signature
       ? {
@@ -624,6 +625,16 @@ export function toRpc(envelope: Omit<TxEnvelopeLegacy, 'type'>): Rpc {
 }
 
 export declare namespace toRpc {
+  /**
+   * Numberish input accepted by {@link ox#TxEnvelopeLegacy.(toRpc:function)}.
+   * `bigint` fields also accept `Hex.Hex | number`; `chainId`/`v` stay `number`
+   * to preserve EIP-155 `v` derivation.
+   */
+  export type Input = Omit<
+    TxEnvelopeLegacy<boolean, Hex.Hex | bigint | number, number>,
+    'type'
+  >
+
   export type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
 }
 

package/src/core/Withdrawal.ts

@@ -1,5 +1,6 @@
 import type * as Errors from './Errors.js'
-import * as Hex from './Hex.js'
+import type * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
 
 /** A Withdrawal as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/withdrawal.yaml). */
 export type Withdrawal<bigintType = bigint, numberType = number> = {
@@ -73,15 +74,18 @@ export declare namespace fromRpc {
  * @param withdrawal - The Withdrawal to convert.
  * @returns An RPC Withdrawal.
  */
-export function toRpc(withdrawal: Withdrawal): Rpc {
+export function toRpc(withdrawal: toRpc.Input): Rpc {
   return {
     address: withdrawal.address,
-    amount: Hex.fromNumber(withdrawal.amount),
-    index: Hex.fromNumber(withdrawal.index),
-    validatorIndex: Hex.fromNumber(withdrawal.validatorIndex),
+    amount: Quantity.fromNumberish(withdrawal.amount),
+    index: Quantity.fromNumberish(withdrawal.index),
+    validatorIndex: Quantity.fromNumberish(withdrawal.validatorIndex),
   }
 }
 
 export declare namespace toRpc {
+  /** Numberish input accepted by {@link ox#Withdrawal.(toRpc:function)}. */
+  export type Input = Withdrawal<Hex.Hex | bigint | number, Hex.Hex | number>
+
   export type ErrorType = Errors.GlobalErrorType
 }

package/src/core/_test/Abi.test.ts

@@ -117,6 +117,10 @@ describe('from', () => {
 test('exports', () => {
   expect(Object.keys(Abi)).toMatchInlineSnapshot(`
     [
+      "InvalidSignatureError",
+      "InvalidStructSignatureError",
+      "UnknownSignatureError",
+      "CircularReferenceError",
       "format",
       "from",
     ]

package/src/core/_test/AbiItem.test.ts

@@ -2107,6 +2107,9 @@ describe('getSignatureHash', () => {
 test('exports', () => {
   expect(Object.keys(AbiItem)).toMatchInlineSnapshot(`
     [
+      "InvalidAbiItemError",
+      "UnknownSolidityTypeError",
+      "UnknownTypeError",
       "format",
       "from",
       "fromAbi",