ox 0.14.45 → 0.14.46

package/core/Transaction.ts

@@ -2,6 +2,8 @@ import type * as AccessList from './AccessList.js'
 import type * as Address from './Address.js'
 import * as Authorization from './Authorization.js'
 import type * as Errors from './Errors.js'
+import * as Frame from './Frame.js'
+import * as FrameSignature from './FrameSignature.js'
 import * as Hex from './Hex.js'
 import type { Compute, OneOf, UnionCompute } from './internal/types.js'
 import * as Signature from './Signature.js'
@@ -20,6 +22,7 @@ export type Transaction<
     | Eip2930<pending, bigintType, numberType>
     | Eip4844<pending, bigintType, numberType>
     | Eip7702<pending, bigintType, numberType>
+    | Eip8141<pending, bigintType, numberType>
     | (Base & { type: Hex.Hex })
   >
 >
@@ -34,6 +37,7 @@ export type Rpc<pending extends boolean = false> = UnionCompute<
     | Eip2930Rpc<pending>
     | Eip4844Rpc<pending>
     | Eip7702Rpc<pending>
+    | Eip8141Rpc<pending>
     | (BaseRpc & { type: Hex.Hex })
   >
 >
@@ -183,6 +187,48 @@ export type Eip7702Rpc<pending extends boolean = false> = Compute<
   Eip7702<pending, Hex.Hex, Hex.Hex, ToRpcType['eip7702']>
 >
 
+/** An EIP-8141 frame transaction. */
+export type Eip8141<
+  pending extends boolean = false,
+  bigintType = bigint,
+  numberType = number,
+  type extends string = 'eip8141',
+> = Compute<
+  Omit<
+    Base<type, pending, bigintType, numberType>,
+    'chainId' | 'r' | 's' | 'v' | 'yParity'
+  > & {
+    /** Versioned blob hashes. */
+    blobVersionedHashes: readonly Hex.Hex[]
+    /** Chain ID, retaining bigint precision when needed. */
+    chainId: numberType | bigintType
+    /** Frames in execution order. */
+    frames: readonly ([bigintType] extends [Hex.Hex]
+      ? Frame.Rpc
+      : Frame.Frame<bigintType>)[]
+    /** Effective gas price. */
+    gasPrice?: bigintType | undefined
+    /** Maximum fee per blob gas. */
+    maxFeePerBlobGas: bigintType
+    /** Maximum fee per gas. */
+    maxFeePerGas: bigintType
+    /** Maximum priority fee per gas. */
+    maxPriorityFeePerGas: bigintType
+    /** Frame signature entries. */
+    signatures: readonly ([bigintType] extends [Hex.Hex]
+      ? FrameSignature.Rpc
+      : FrameSignature.FrameSignature)[]
+  }
+>
+
+/** An EIP-8141 RPC transaction. */
+export type Eip8141Rpc<pending extends boolean = false> = Eip8141<
+  pending,
+  Hex.Hex,
+  Hex.Hex,
+  '0x6'
+>
+
 /** An legacy Transaction as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml). */
 export type Legacy<
   pending extends boolean = false,
@@ -216,6 +262,7 @@ export const toRpcType = {
   eip1559: '0x2',
   eip4844: '0x3',
   eip7702: '0x4',
+  eip8141: '0x6',
 } as const
 
 /** Type to RPC Type mapping. */
@@ -230,6 +277,7 @@ export const fromRpcType = {
   '0x2': 'eip1559',
   '0x3': 'eip4844',
   '0x4': 'eip7702',
+  '0x6': 'eip8141',
 } as const
 
 /** RPC Type to Type mapping. */
@@ -281,7 +329,8 @@ export function fromRpc<
 ): transaction extends Rpc<pending> ? Transaction<pending> : null {
   if (!transaction) return null as never
 
-  const signature = Signature.extract(transaction)
+  const signature =
+    transaction.type === '0x6' ? undefined : Signature.extract(transaction)
 
   const transaction_ = {
     ...transaction,
@@ -305,11 +354,20 @@ export function fromRpc<
     : null
   transaction_.value = BigInt(transaction.value ?? 0n)
 
+  if (transaction.frames)
+    transaction_.frames = transaction.frames.map(Frame.fromRpc)
+  if (transaction.signatures)
+    transaction_.signatures = transaction.signatures.map(FrameSignature.fromRpc)
   if (transaction.authorizationList)
     transaction_.authorizationList = Authorization.fromRpcList(
       transaction.authorizationList,
     )
-  if (transaction.chainId) transaction_.chainId = Number(transaction.chainId)
+  if (transaction.chainId)
+    transaction_.chainId =
+      transaction.type === '0x6' &&
+      BigInt(transaction.chainId) > BigInt(Number.MAX_SAFE_INTEGER)
+        ? BigInt(transaction.chainId)
+        : Number(transaction.chainId)
   if (transaction.gasPrice) transaction_.gasPrice = BigInt(transaction.gasPrice)
   if (transaction.maxFeePerBlobGas)
     transaction_.maxFeePerBlobGas = BigInt(transaction.maxFeePerBlobGas)
@@ -330,7 +388,11 @@ export declare namespace fromRpc {
     pending?: pending | boolean | undefined
   }
 
-  type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
+  type ErrorType =
+    | Frame.fromRpc.ErrorType
+    | FrameSignature.fromRpc.ErrorType
+    | Signature.extract.ErrorType
+    | Errors.GlobalErrorType
 }
 
 /**
@@ -394,6 +456,9 @@ export function toRpc<pending extends boolean = false>(
   rpc.type = (toRpcType as any)[transaction.type] ?? transaction.type
   rpc.value = Hex.fromNumber(transaction.value ?? 0n)
 
+  if (transaction.frames) rpc.frames = transaction.frames.map(Frame.toRpc)
+  if (transaction.signatures)
+    rpc.signatures = transaction.signatures.map(FrameSignature.toRpc)
   if (transaction.accessList) rpc.accessList = transaction.accessList
   if (transaction.authorizationList)
     rpc.authorizationList = Authorization.toRpcList(
@@ -427,5 +492,9 @@ export declare namespace toRpc {
     pending?: pending | boolean | undefined
   }
 
-  type ErrorType = Signature.extract.ErrorType | Errors.GlobalErrorType
+  type ErrorType =
+    | Frame.toRpc.ErrorType
+    | FrameSignature.toRpc.ErrorType
+    | Signature.extract.ErrorType
+    | Errors.GlobalErrorType
 }

package/core/TransactionReceipt.ts

@@ -1,5 +1,6 @@
 import type * as Address from './Address.js'
 import type * as Errors from './Errors.js'
+import * as FrameReceipt from './FrameReceipt.js'
 import * as Hex from './Hex.js'
 import type { Compute } from './internal/types.js'
 import * as Log from './Log.js'
@@ -10,6 +11,7 @@ export type TransactionReceipt<
   type = Type,
   bigintType = bigint,
   numberType = number,
+  frameReceipt = FrameReceipt.FrameReceipt<bigintType>,
 > = Compute<{
   /** The actual value per gas deducted from the sender's account for blob gas. Only specified for blob transactions as defined by EIP-4844. */
   blobGasPrice?: bigintType | undefined
@@ -25,6 +27,8 @@ export type TransactionReceipt<
   cumulativeGasUsed: bigintType
   /** Pre-London, it is equal to the transaction's gasPrice. Post-London, it is equal to the actual gas price paid for inclusion. */
   effectiveGasPrice: bigintType
+  /** Results for individual EIP-8141 frames. */
+  frameReceipts?: readonly frameReceipt[] | undefined
   /** Transaction sender */
   from: Address.Address
   /** Gas used by this transaction */
@@ -33,6 +37,8 @@ export type TransactionReceipt<
   logs: Log.Log<false, bigintType, numberType>[]
   /** Logs bloom filter */
   logsBloom: Hex.Hex
+  /** Account paying for an EIP-8141 transaction. */
+  payer?: Address.Address | undefined
   /** The post-transaction state root. Only specified for transactions included before the Byzantium upgrade. */
   root?: Hex.Hex | undefined
   /** `success` if this transaction was successful or `reverted` if it failed */
@@ -48,7 +54,13 @@ export type TransactionReceipt<
 }>
 
 /** An RPC Transaction Receipt as defined in the [Execution API specification](https://github.com/ethereum/execution-apis/blob/main/src/schemas/receipt.yaml). */
-export type Rpc = TransactionReceipt<RpcStatus, RpcType, Hex.Hex, Hex.Hex>
+export type Rpc = TransactionReceipt<
+  RpcStatus,
+  RpcType,
+  Hex.Hex,
+  Hex.Hex,
+  FrameReceipt.Rpc
+>
 
 /**
  * Union of Transaction Receipt statuses.
@@ -74,6 +86,7 @@ export type RpcStatus = '0x0' | '0x1'
  * - `eip2930`
  * - `eip4844`
  * - `eip7702`
+ * - `eip8141`
  * - any other string
  */
 export type Type =
@@ -82,6 +95,7 @@ export type Type =
   | 'eip2930'
   | 'eip4844'
   | 'eip7702'
+  | 'eip8141'
   | (string & {})
 
 /**
@@ -92,9 +106,17 @@ export type Type =
  * - `0x2`: EIP-2930 transactions
  * - `0x3`: EIP-4844 transactions
  * - `0x4`: EIP-7702 transactions
+ * - `0x6`: EIP-8141 transactions
  * - any other string
  */
-export type RpcType = '0x0' | '0x1' | '0x2' | '0x3' | '0x4' | (string & {})
+export type RpcType =
+  | '0x0'
+  | '0x1'
+  | '0x2'
+  | '0x3'
+  | '0x4'
+  | '0x6'
+  | (string & {})
 
 /** RPC status to status mapping. */
 export const fromRpcStatus = {
@@ -115,6 +137,7 @@ export const fromRpcType = {
   '0x2': 'eip1559',
   '0x3': 'eip4844',
   '0x4': 'eip7702',
+  '0x6': 'eip8141',
 } as const
 
 /** Type to RPC type mapping. */
@@ -124,6 +147,7 @@ export const toRpcType = {
   eip1559: '0x2',
   eip4844: '0x3',
   eip7702: '0x4',
+  eip8141: '0x6',
 } as const
 
 /**
@@ -230,6 +254,9 @@ export function fromRpc<const receipt extends Rpc | null>(
 
   return {
     ...receipt,
+    ...(receipt.frameReceipts
+      ? { frameReceipts: receipt.frameReceipts.map(FrameReceipt.fromRpc) }
+      : {}),
     blobGasPrice: receipt.blobGasPrice
       ? BigInt(receipt.blobGasPrice)
       : undefined,
@@ -246,7 +273,10 @@ export function fromRpc<const receipt extends Rpc | null>(
 }
 
 export declare namespace fromRpc {
-  export type ErrorType = Log.fromRpc.ErrorType | Errors.GlobalErrorType
+  export type ErrorType =
+    | FrameReceipt.fromRpc.ErrorType
+    | Log.fromRpc.ErrorType
+    | Errors.GlobalErrorType
 }
 
 /**
@@ -304,6 +334,10 @@ export declare namespace fromRpc {
  */
 export function toRpc(receipt: TransactionReceipt): Rpc {
   return {
+    ...(receipt.frameReceipts
+      ? { frameReceipts: receipt.frameReceipts.map(FrameReceipt.toRpc) }
+      : {}),
+    ...(receipt.payer ? { payer: receipt.payer } : {}),
     blobGasPrice: receipt.blobGasPrice
       ? Hex.fromNumber(receipt.blobGasPrice)
       : undefined,
@@ -329,5 +363,8 @@ export function toRpc(receipt: TransactionReceipt): Rpc {
 }
 
 export declare namespace toRpc {
-  export type ErrorType = Hex.fromNumber.ErrorType | Errors.GlobalErrorType
+  export type ErrorType =
+    | FrameReceipt.toRpc.ErrorType
+    | Hex.fromNumber.ErrorType
+    | Errors.GlobalErrorType
 }

package/core/TransactionRequest.ts

@@ -2,6 +2,8 @@ import type * as AccessList from './AccessList.js'
 import type * as Address from './Address.js'
 import * as Authorization from './Authorization.js'
 import type * as Errors from './Errors.js'
+import * as Frame from './Frame.js'
+import * as FrameSignature from './FrameSignature.js'
 import * as Hex from './Hex.js'
 import type { Compute } from './internal/types.js'
 import * as Transaction from './Transaction.js'
@@ -11,6 +13,8 @@ export type TransactionRequest<
   bigintType = bigint,
   numberType = number,
   type extends string = string,
+  frame = Frame.Frame<bigintType>,
+  signature = FrameSignature.FrameSignature,
 > = Compute<{
   /** EIP-2930 Access List. */
   accessList?: AccessList.AccessList | undefined
@@ -28,6 +32,8 @@ export type TransactionRequest<
   data?: Hex.Hex | undefined
   /** @alias `data` – added for TransactionEnvelope - Transaction compatibility. */
   input?: Hex.Hex | undefined
+  /** Frames in execution order for EIP-8141 transactions. */
+  frames?: readonly frame[] | undefined
   /** Sender of the transaction. */
   from?: Address.Address | undefined
   /** Gas provided for transaction execution */
@@ -42,6 +48,8 @@ export type TransactionRequest<
   maxPriorityFeePerGas?: bigintType | undefined
   /** Unique number identifying this transaction */
   nonce?: bigintType | undefined
+  /** Frame signature entries for EIP-8141 transactions. */
+  signatures?: readonly signature[] | undefined
   /** Transaction recipient */
   to?: Address.Address | null | undefined
   /** Transaction type */
@@ -51,7 +59,13 @@ export type TransactionRequest<
 }>
 
 /** RPC representation of a {@link ox#TransactionRequest.TransactionRequest}. */
-export type Rpc = TransactionRequest<Hex.Hex, Hex.Hex, string>
+export type Rpc = TransactionRequest<
+  Hex.Hex,
+  Hex.Hex,
+  string,
+  Frame.Rpc,
+  FrameSignature.Rpc
+>
 
 /**
  * Converts a {@link ox#TransactionRequest.Rpc} to a {@link ox#TransactionRequest.TransactionRequest}.
@@ -70,7 +84,7 @@ export type Rpc = TransactionRequest<Hex.Hex, Hex.Hex, string>
  * @returns A transaction request.
  */
 export function fromRpc(request: Rpc): TransactionRequest {
-  const request_ = request as TransactionRequest
+  const request_ = { ...request } as unknown as TransactionRequest
 
   if (typeof request.authorizationList !== 'undefined')
     request_.authorizationList = Authorization.fromRpcList(
@@ -78,6 +92,9 @@ export function fromRpc(request: Rpc): TransactionRequest {
     )
   if (typeof request.chainId !== 'undefined')
     request_.chainId = Hex.toNumber(request.chainId)
+  if (request.frames) request_.frames = request.frames.map(Frame.fromRpc)
+  if (request.signatures)
+    request_.signatures = request.signatures.map(FrameSignature.fromRpc)
   if (typeof request.gas !== 'undefined')
     request_.gas = Hex.toBigInt(request.gas)
   if (typeof request.gasPrice !== 'undefined')
@@ -103,6 +120,8 @@ export function fromRpc(request: Rpc): TransactionRequest {
 
 export declare namespace fromRpc {
   export type ErrorType =
+    | Frame.fromRpc.ErrorType
+    | FrameSignature.fromRpc.ErrorType
     | Authorization.fromRpcList.ErrorType
     | Hex.toNumber.ErrorType
     | Hex.toBigInt.ErrorType
@@ -170,6 +189,9 @@ export function toRpc(request: TransactionRequest): Rpc {
     request_rpc.input = request.input
   }
   if (typeof request.from !== 'undefined') request_rpc.from = request.from
+  if (request.frames) request_rpc.frames = request.frames.map(Frame.toRpc)
+  if (request.signatures)
+    request_rpc.signatures = request.signatures.map(FrameSignature.toRpc)
   if (typeof request.gas !== 'undefined')
     request_rpc.gas = Hex.fromNumber(request.gas)
   if (typeof request.gasPrice !== 'undefined')
@@ -202,6 +224,8 @@ export function toRpc(request: TransactionRequest): Rpc {
 
 export declare namespace toRpc {
   export type ErrorType =
+    | Frame.toRpc.ErrorType
+    | FrameSignature.toRpc.ErrorType
     | Authorization.toRpcList.ErrorType
     | Hex.fromNumber.ErrorType
     | Errors.GlobalErrorType