viem 2.13.6 → 2.13.7

package/types/eip1193.ts

@@ -366,7 +366,7 @@ export type PublicRpcSchema = [
       | [
           transaction: TransactionRequest,
           block: BlockNumber | BlockTag,
-          RpcStateOverride,
+          stateOverride: RpcStateOverride,
         ]
     ReturnType: Quantity
   },
@@ -1237,7 +1237,7 @@ export type WalletRpcSchema = [
       | [
           transaction: TransactionRequest,
           block: BlockNumber | BlockTag,
-          RpcStateOverride,
+          stateOverride: RpcStateOverride,
         ]
     ReturnType: Quantity
   },

package/types/fee.ts

@@ -1,48 +1,50 @@
-import type { Assign, OneOf } from './utils.js'
+import type { OneOf } from './utils.js'
 
-export type FeeHistory<TQuantity = bigint> = {
+export type FeeHistory<quantity = bigint> = {
   /**
    * An array of block base fees per gas (in wei). This includes the next block after
    * the newest of the returned range, because this value can be derived from the newest block.
    * Zeroes are returned for pre-EIP-1559 blocks. */
-  baseFeePerGas: TQuantity[]
+  baseFeePerGas: quantity[]
   /** An array of block gas used ratios. These are calculated as the ratio of gasUsed and gasLimit. */
   gasUsedRatio: number[]
   /** Lowest number block of the returned range. */
-  oldestBlock: TQuantity
+  oldestBlock: quantity
   /** An array of effective priority fees (in wei) per gas data points from a single block. All zeroes are returned if the block is empty. */
-  reward?: TQuantity[][] | undefined
+  reward?: quantity[][] | undefined
 }
 
-export type FeeValuesLegacy<TQuantity = bigint> = {
+export type FeeValuesLegacy<quantity = bigint> = {
   /** Base fee per gas. */
-  gasPrice: TQuantity
+  gasPrice: quantity
   maxFeePerBlobGas?: undefined
   maxFeePerGas?: undefined
   maxPriorityFeePerGas?: undefined
 }
 
-export type FeeValuesEIP1559<TQuantity = bigint> = {
+export type FeeValuesEIP1559<quantity = bigint> = {
   gasPrice?: undefined
   maxFeePerBlobGas?: undefined
   /** Total fee per gas in wei (gasPrice/baseFeePerGas + maxPriorityFeePerGas). */
-  maxFeePerGas: TQuantity
+  maxFeePerGas: quantity
   /** Max priority fee per gas (in wei). */
-  maxPriorityFeePerGas: TQuantity
+  maxPriorityFeePerGas: quantity
 }
 
-export type FeeValuesEIP4844<TQuantity = bigint> = Assign<
-  FeeValuesEIP1559<TQuantity>,
-  {
-    /** The maximum total fee per gas the sender is willing to pay for blob gas (in wei). */
-    maxFeePerBlobGas: TQuantity
-  }
->
+export type FeeValuesEIP4844<quantity = bigint> = {
+  gasPrice?: undefined
+  /** Maximum total fee per gas sender is willing to pay for blob gas (in wei). */
+  maxFeePerBlobGas: quantity
+  /** Total fee per gas in wei (gasPrice/baseFeePerGas + maxPriorityFeePerGas). */
+  maxFeePerGas: quantity
+  /** Max priority fee per gas (in wei). */
+  maxPriorityFeePerGas: quantity
+}
 
-export type FeeValues<TQuantity = bigint> = OneOf<
-  | FeeValuesLegacy<TQuantity>
-  | FeeValuesEIP1559<TQuantity>
-  | FeeValuesEIP4844<TQuantity>
+export type FeeValues<quantity = bigint> = OneOf<
+  | FeeValuesLegacy<quantity>
+  | FeeValuesEIP1559<quantity>
+  | FeeValuesEIP4844<quantity>
 >
 
 export type FeeValuesType = 'legacy' | 'eip1559' | 'eip4844'

package/types/rpc.ts

@@ -1,4 +1,5 @@
 import type { Address } from 'abitype'
+
 import type {
   Block,
   BlockIdentifier,
@@ -21,7 +22,7 @@ import type {
   TransactionRequestEIP4844,
   TransactionRequestLegacy,
 } from './transaction.js'
-import type { OneOf, UnionOmit, UnionPartialBy } from './utils.js'
+import type { Omit, OneOf, PartialBy } from './utils.js'
 
 export type Index = `0x${string}`
 export type Quantity = `0x${string}`
@@ -52,47 +53,49 @@ export type RpcTransactionRequest = OneOf<
   | TransactionRequestEIP1559<Quantity, Index, '0x2'>
   | TransactionRequestEIP4844<Quantity, Index, '0x3'>
 >
-export type RpcTransaction<TPending extends boolean = boolean> = UnionOmit<
-  UnionPartialBy<
-    OneOf<
-      | TransactionLegacy<Quantity, Index, TPending, '0x0'>
-      | TransactionEIP2930<Quantity, Index, TPending, '0x1'>
-      | TransactionEIP1559<Quantity, Index, TPending, '0x2'>
-      | TransactionEIP4844<Quantity, Index, TPending, '0x3'>
-    >,
-    // `yParity` is optional on the RPC type as some nodes do not return it
-    // for 1559 & 2930 transactions (they should!).
-    'yParity'
-  >,
-  'typeHex'
+// `yParity` is optional on the RPC type as some nodes do not return it
+// for 1559 & 2930 transactions (they should!).
+export type RpcTransaction<TPending extends boolean = boolean> = OneOf<
+  | Omit<TransactionLegacy<Quantity, Index, TPending, '0x0'>, 'typeHex'>
+  | PartialBy<
+      Omit<TransactionEIP2930<Quantity, Index, TPending, '0x1'>, 'typeHex'>,
+      'yParity'
+    >
+  | PartialBy<
+      Omit<TransactionEIP1559<Quantity, Index, TPending, '0x2'>, 'typeHex'>,
+      'yParity'
+    >
+  | PartialBy<
+      Omit<TransactionEIP4844<Quantity, Index, TPending, '0x3'>, 'typeHex'>,
+      'yParity'
+    >
 >
 
-type SuccessResult<T> = {
+type SuccessResult<result> = {
   method?: undefined
-  result: T
+  result: result
   error?: undefined
 }
-type ErrorResult<T> = {
+type ErrorResult<error> = {
   method?: undefined
   result?: undefined
-  error: T
+  error: error
 }
-type Subscription<TResult, TError> = {
+type Subscription<result, error> = {
   method: 'eth_subscription'
   error?: undefined
   result?: undefined
-  params: {
-    subscription: string
-  } & (
+  params:
     | {
-        result: TResult
+        subscription: string
+        result: result
         error?: undefined
       }
     | {
+        subscription: string
         result?: undefined
-        error: TError
+        error: error
       }
-  )
 }
 
 export type RpcRequest = {
@@ -102,14 +105,10 @@ export type RpcRequest = {
   id?: number | undefined
 }
 
-export type RpcResponse<TResult = any, TError = any> = {
+export type RpcResponse<result = any, error = any> = {
   jsonrpc: `${number}`
   id: number
-} & (
-  | SuccessResult<TResult>
-  | ErrorResult<TError>
-  | Subscription<TResult, TError>
-)
+} & (SuccessResult<result> | ErrorResult<error> | Subscription<result, error>)
 
 /** A key-value mapping of slot and storage values (supposedly 32 bytes each) */
 export type RpcStateMapping = {