ox 1.7.5 → 1.8.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "ox",
   "description": "Ethereum Standard Library",
   "type": "module",
-  "version": "1.7.5",
+  "version": "1.8.1",
   "main": "./dist/index.js",
   "sideEffects": false,
   "license": "MIT",
@@ -249,6 +249,21 @@
       "types": "./dist/core/Filter.d.ts",
       "default": "./dist/core/Filter.js"
     },
+    "./Frame": {
+      "src": "./src/core/Frame.ts",
+      "types": "./dist/core/Frame.d.ts",
+      "default": "./dist/core/Frame.js"
+    },
+    "./FrameReceipt": {
+      "src": "./src/core/FrameReceipt.ts",
+      "types": "./dist/core/FrameReceipt.d.ts",
+      "default": "./dist/core/FrameReceipt.js"
+    },
+    "./FrameSignature": {
+      "src": "./src/core/FrameSignature.ts",
+      "types": "./dist/core/FrameSignature.d.ts",
+      "default": "./dist/core/FrameSignature.js"
+    },
     "./Hash": {
       "src": "./src/core/Hash.ts",
       "types": "./dist/core/Hash.d.ts",
@@ -409,6 +424,11 @@
       "types": "./dist/core/TxEnvelopeEip7702.d.ts",
       "default": "./dist/core/TxEnvelopeEip7702.js"
     },
+    "./TxEnvelopeEip8141": {
+      "src": "./src/core/TxEnvelopeEip8141.ts",
+      "types": "./dist/core/TxEnvelopeEip8141.d.ts",
+      "default": "./dist/core/TxEnvelopeEip8141.js"
+    },
     "./TxEnvelopeLegacy": {
       "src": "./src/core/TxEnvelopeLegacy.ts",
       "types": "./dist/core/TxEnvelopeLegacy.d.ts",
@@ -894,6 +914,21 @@
       "types": "./dist/zod/Filter.d.ts",
       "default": "./dist/zod/Filter.js"
     },
+    "./zod/Frame": {
+      "src": "./src/zod/Frame.ts",
+      "types": "./dist/zod/Frame.d.ts",
+      "default": "./dist/zod/Frame.js"
+    },
+    "./zod/FrameReceipt": {
+      "src": "./src/zod/FrameReceipt.ts",
+      "types": "./dist/zod/FrameReceipt.d.ts",
+      "default": "./dist/zod/FrameReceipt.js"
+    },
+    "./zod/FrameSignature": {
+      "src": "./src/zod/FrameSignature.ts",
+      "types": "./dist/zod/FrameSignature.d.ts",
+      "default": "./dist/zod/FrameSignature.js"
+    },
     "./zod/Hash": {
       "src": "./src/zod/Hash.ts",
       "types": "./dist/zod/Hash.d.ts",
@@ -984,6 +1019,11 @@
       "types": "./dist/zod/TxEnvelopeEip7702.d.ts",
       "default": "./dist/zod/TxEnvelopeEip7702.js"
     },
+    "./zod/TxEnvelopeEip8141": {
+      "src": "./src/zod/TxEnvelopeEip8141.ts",
+      "types": "./dist/zod/TxEnvelopeEip8141.d.ts",
+      "default": "./dist/zod/TxEnvelopeEip8141.js"
+    },
     "./zod/TxEnvelopeLegacy": {
       "src": "./src/zod/TxEnvelopeLegacy.ts",
       "types": "./dist/zod/TxEnvelopeLegacy.d.ts",

package/src/core/Frame.ts

@@ -0,0 +1,442 @@
+import * as Address from './Address.js'
+import * as Bytes from './Bytes.js'
+import * as Errors from './Errors.js'
+import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
+
+/** An EIP-8141 call frame. */
+export type Frame<bigintType = bigint> = {
+  /**
+   * Frame calldata.
+   * @default '0x'
+   */
+  data?: Hex.Hex | undefined
+  /**
+   * Approval scope and atomic batching bits.
+   * @default 0
+   */
+  flags?: Flags | undefined
+  /**
+   * Execution gas budget.
+   * @default 0n
+   */
+  gas?: bigintType | undefined
+  /**
+   * Execution context: default, verify, or sender.
+   * @default 0
+   */
+  mode?: Mode | undefined
+  /**
+   * State gas budget.
+   * @default 0n
+   */
+  stateGas?: bigintType | undefined
+  /** Target address. Omit to target the transaction sender. */
+  to?: Address.Address | undefined
+  /**
+   * Value transferred by a sender frame, in wei.
+   * @default 0n
+   */
+  value?: bigintType | undefined
+}
+
+/** JSON-RPC representation of a frame. */
+export type Rpc = {
+  /** Frame calldata. */
+  data: Hex.Hex
+  /** Execution gas budget. */
+  executionGasLimit: Hex.Hex
+  /** Approval scope and batching bits. */
+  flags: number
+  /** Execution mode. */
+  mode: number
+  /** State gas budget. */
+  stateGasLimit: Hex.Hex
+  /** Target address; absent for the transaction sender. */
+  target?: Address.Address | null | undefined
+  /** Value transferred in wei. */
+  value: Hex.Hex
+}
+
+/** Frame execution modes. */
+export const modes = { default: 0, sender: 2, verify: 1 } as const
+
+/** A numeric or named frame execution mode. */
+export type Mode = number | keyof typeof modes
+
+/** Approval and atomic batching flags. */
+export const flags = {
+  approveExecution: 2,
+  approveExecutionAndPayment: 3,
+  approvePayment: 1,
+  atomicBatch: 4,
+  none: 0,
+} as const
+
+/** Numeric approval and batching bits, or a named flag value. */
+export type Flags = number | keyof typeof flags
+
+/** RLP-ready frame tuple. Empty target bytes refer to the transaction sender. */
+export type Tuple = readonly [
+  mode: Hex.Hex,
+  flags: Hex.Hex,
+  target: Hex.Hex,
+  limits: readonly [execution: Hex.Hex, state: Hex.Hex],
+  value: Hex.Hex,
+  data: Hex.Hex,
+]
+
+/**
+ * Asserts that a {@link ox#Frame.Frame} satisfies frame-local constraints.
+ *
+ * Sender-dependent approval, batch adjacency, expiry, and transaction-wide gas
+ * constraints require the enclosing transaction.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * Check a verification frame before including it in a transaction.
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * Frame.assert({
+ *   flags: 'approveExecutionAndPayment',
+ *   gas: 50_000n,
+ *   mode: 'verify'
+ * })
+ * ```
+ *
+ * @param frame - The frame to assert.
+ */
+export function assert(frame: Frame): void {
+  const {
+    data = '0x',
+    flags: flagsValue = 0,
+    gas = 0n,
+    mode: modeValue = 0,
+    stateGas = 0n,
+    value = 0n,
+  } = frame
+  const mode = typeof modeValue === 'string' ? modes[modeValue] : modeValue
+  if (!Number.isInteger(mode) || mode < 0 || mode > 2)
+    throw new InvalidError('mode must be a supported name or 0, 1, or 2.')
+  const flags_ = typeof flagsValue === 'string' ? flags[flagsValue] : flagsValue
+  if (!Number.isInteger(flags_) || flags_ < 0 || flags_ > 7)
+    throw new InvalidError(
+      'flags must be a supported name or an integer from 0 to 7.',
+    )
+  if (flags_ & flags.atomicBatch) {
+    if (mode === modes.verify)
+      throw new InvalidError('VERIFY frames cannot belong to an atomic batch.')
+    if (flags_ & flags.approveExecutionAndPayment)
+      throw new InvalidError(
+        'Atomic batch frames cannot approve execution or payment.',
+      )
+  }
+  if (frame.to !== undefined) Address.assert(frame.to, { strict: false })
+  for (const [field, limit] of [
+    ['gas', gas],
+    ['stateGas', stateGas],
+  ] as const)
+    if (typeof limit !== 'bigint' || limit < 0n || limit >= 2n ** 64n)
+      throw new InvalidError(`${field} must be an unsigned 64-bit integer.`)
+  if (gas + stateGas >= 2n ** 64n)
+    throw new InvalidError('Combined frame gas must be less than 2^64.')
+  if (typeof value !== 'bigint' || value < 0n || value >= 2n ** 256n)
+    throw new InvalidError('value must be an unsigned 256-bit integer.')
+  if (mode !== modes.sender && value !== 0n)
+    throw new InvalidError('Only SENDER frames can transfer value.')
+  Hex.assert(data, { strict: true })
+  if (data.length % 2 !== 0)
+    throw new InvalidError('data must contain whole bytes.')
+}
+
+export declare namespace assert {
+  type ErrorType =
+    | InvalidError
+    | Address.assert.ErrorType
+    | Hex.assert.ErrorType
+    | Errors.GlobalErrorType
+}
+
+/**
+ * Coerces a frame object into a {@link ox#Frame.Frame}.
+ *
+ * Validates the frame and returns a copy, preserving literal types and the supplied
+ * numeric or named mode and flags. Omitted fields stay omitted;
+ * {@link ox#Frame.(toTuple:function)} supplies their defaults when encoding.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * Construct a verification frame that approves execution and payment.
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * const frame = Frame.from({
+ *   flags: 'approveExecutionAndPayment',
+ *   gas: 50_000n,
+ *   mode: 'verify'
+ * })
+ * ```
+ *
+ * @param frame - The frame object to convert.
+ * @returns The validated frame.
+ */
+export function from<const frame extends Frame>(frame: frame | Frame): frame {
+  assert(frame)
+  return { ...frame } as frame
+}
+
+export declare namespace from {
+  type ErrorType = assert.ErrorType
+}
+
+/**
+ * Converts an RPC frame to a frame.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * const frame = Frame.fromRpc({
+ *   data: '0x',
+ *   executionGasLimit: '0xc350',
+ *   flags: 3,
+ *   mode: 1,
+ *   stateGasLimit: '0x0',
+ *   value: '0x0'
+ * })
+ * ```
+ *
+ * @param frame - The value to convert.
+ * @returns The converted value.
+ */
+export function fromRpc(frame: Rpc): Frame {
+  return from({
+    data: frame.data,
+    flags: frame.flags,
+    gas: Hex.toBigInt(frame.executionGasLimit),
+    mode: frame.mode,
+    stateGas: Hex.toBigInt(frame.stateGasLimit),
+    ...(frame.target == null ? {} : { to: frame.target }),
+    value: Hex.toBigInt(frame.value),
+  })
+}
+
+export declare namespace fromRpc {
+  type ErrorType = from.ErrorType | Hex.toBigInt.ErrorType
+}
+
+/**
+ * Converts a frame to its JSON-RPC representation.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * const frame = Frame.from({ gas: 50_000n, mode: 'verify' })
+ * const rpc = Frame.toRpc(frame)
+ * ```
+ *
+ * @param frame - The value to convert.
+ * @returns The converted value.
+ */
+export function toRpc(frame: toRpc.Input): Rpc {
+  const { flags: flags_ = 0, mode = 0 } = frame
+  return {
+    data: frame.data ?? '0x',
+    executionGasLimit: Quantity.fromNumberish(frame.gas ?? 0n),
+    flags: typeof flags_ === 'string' ? flags[flags_] : flags_,
+    mode: typeof mode === 'string' ? modes[mode] : mode,
+    stateGasLimit: Quantity.fromNumberish(frame.stateGas ?? 0n),
+    ...(frame.to === undefined ? {} : { target: frame.to }),
+    value: Quantity.fromNumberish(frame.value ?? 0n),
+  }
+}
+
+export declare namespace toRpc {
+  type Input = Frame<Hex.Hex | bigint | number>
+  type ErrorType = Hex.fromNumber.ErrorType | Errors.GlobalErrorType
+}
+
+/**
+ * Converts a {@link ox#Frame.Tuple} to a {@link ox#Frame.Frame}.
+ *
+ * Returns numeric mode and flags. An empty target becomes an omitted `to`.
+ * Integer fields must use minimal whole-byte encodings, with empty bytes for zero.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * Decode a frame tuple with separate execution and state gas limits.
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * const frame = Frame.fromTuple([
+ *   '0x01',
+ *   '0x03',
+ *   '0x',
+ *   ['0xc350', '0x'],
+ *   '0x',
+ *   '0x'
+ * ])
+ * // @log: {
+ * // @log:   data: '0x',
+ * // @log:   flags: 3,
+ * // @log:   gas: 50000n,
+ * // @log:   mode: 1,
+ * // @log:   stateGas: 0n,
+ * // @log:   value: 0n
+ * // @log: }
+ * ```
+ *
+ * @param tuple - The frame tuple to convert.
+ * @returns The decoded frame.
+ */
+export function fromTuple(tuple: Tuple): Frame {
+  if (
+    !Array.isArray(tuple) ||
+    tuple.length !== 6 ||
+    !Array.isArray(tuple[3]) ||
+    tuple[3].length !== 2
+  )
+    throw new InvalidError(
+      'Expected [mode, flags, target, [execution, state], value, data].',
+    )
+  const [mode, flags, target, [execution, state], value, data] = tuple
+  Hex.assert(target, { strict: true })
+  Hex.assert(data, { strict: true })
+  const quantities = [mode, flags, execution, state, value]
+  for (const quantity of quantities) {
+    Hex.assert(quantity, { strict: true })
+    if (quantity.length % 2 !== 0 || quantity.startsWith('0x00'))
+      throw new InvalidError(
+        'Integers must use minimal whole-byte encodings, with empty bytes for zero.',
+      )
+  }
+  const frame = {
+    ...(target === '0x' ? {} : { to: target }),
+    data,
+    flags: flags === '0x' ? 0 : Hex.toNumber(flags),
+    gas: execution === '0x' ? 0n : Hex.toBigInt(execution),
+    mode: mode === '0x' ? 0 : Hex.toNumber(mode),
+    stateGas: state === '0x' ? 0n : Hex.toBigInt(state),
+    value: value === '0x' ? 0n : Hex.toBigInt(value),
+  }
+  assert(frame)
+  return frame
+}
+
+export declare namespace fromTuple {
+  type ErrorType =
+    | assert.ErrorType
+    | Hex.toNumber.ErrorType
+    | Hex.toBigInt.ErrorType
+}
+
+/**
+ * Converts a {@link ox#Frame.Frame} to its RLP-ready {@link ox#Frame.Tuple}.
+ *
+ * Named mode and flags are encoded as integers. An omitted target and zero integer
+ * fields are encoded as empty bytes. Omitted mode and flags default to zero;
+ * omitted gas limits and value default to `0n`, and data defaults to `'0x'`.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * Encode a verification frame in the field order required by EIP-8141.
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * const tuple = Frame.toTuple({
+ *   flags: 'approveExecutionAndPayment',
+ *   gas: 50_000n,
+ *   mode: 'verify'
+ * })
+ * // @log: ['0x01', '0x03', '0x', ['0xc350', '0x'], '0x', '0x']
+ * ```
+ *
+ * @param frame - The frame to convert.
+ * @returns The encoded frame tuple.
+ */
+export function toTuple(frame: Frame): Tuple {
+  assert(frame)
+  const mode =
+    typeof frame.mode === 'string' ? modes[frame.mode] : (frame.mode ?? 0)
+  const flags_ =
+    typeof frame.flags === 'string' ? flags[frame.flags] : (frame.flags ?? 0)
+  return [
+    mode ? Hex.fromBytes(Bytes.fromNumber(mode)) : '0x',
+    flags_ ? Hex.fromBytes(Bytes.fromNumber(flags_)) : '0x',
+    frame.to ?? '0x',
+    [
+      frame.gas ? Hex.fromBytes(Bytes.fromNumber(frame.gas)) : '0x',
+      frame.stateGas ? Hex.fromBytes(Bytes.fromNumber(frame.stateGas)) : '0x',
+    ],
+    frame.value ? Hex.fromBytes(Bytes.fromNumber(frame.value)) : '0x',
+    frame.data ?? '0x',
+  ]
+}
+
+export declare namespace toTuple {
+  type ErrorType =
+    | assert.ErrorType
+    | Bytes.fromNumber.ErrorType
+    | Hex.fromBytes.ErrorType
+}
+
+/**
+ * Returns whether a {@link ox#Frame.Frame} satisfies frame-local constraints.
+ *
+ * Performs the same checks as {@link ox#Frame.(assert:function)}, returning `false`
+ * instead of throwing when the frame is invalid.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * Check whether a frame is structurally valid.
+ *
+ * ```ts twoslash
+ * import { Frame } from 'ox'
+ *
+ * const valid = Frame.validate({
+ *   flags: 'approveExecutionAndPayment',
+ *   gas: 50_000n,
+ *   mode: 'verify'
+ * })
+ * // @log: true
+ * ```
+ *
+ * @param frame - The frame to validate.
+ * @returns Whether the frame satisfies frame-local constraints.
+ */
+export function validate(frame: Frame): boolean {
+  try {
+    assert(frame)
+    return true
+  } catch {
+    return false
+  }
+}
+
+export declare namespace validate {
+  type ErrorType = Errors.GlobalErrorType
+}
+
+/** Thrown when an EIP-8141 frame is structurally invalid. */
+export class InvalidError extends Errors.BaseError {
+  override readonly name = 'Frame.InvalidError'
+
+  constructor(details: string) {
+    super('Invalid frame.', { details })
+  }
+}

package/src/core/FrameReceipt.ts

@@ -0,0 +1,117 @@
+import type * as Errors from './Errors.js'
+import * as Hex from './Hex.js'
+import * as Quantity from './internal/quantity.js'
+import type * as Log from './Log.js'
+
+/** Receipt for one frame. Frame logs contain only address, data, and topics. */
+export type FrameReceipt<bigintType = bigint> = {
+  /** Execution gas used before transaction-level refunds. */
+  gasUsed: bigintType
+  /** Logs emitted by this frame. */
+  logs: readonly Pick<Log.Log, 'address' | 'data' | 'topics'>[]
+  /** Final state gas after refills and rollbacks. */
+  stateGasUsed: bigintType
+  /** Frame execution result. */
+  status: Status
+}
+
+/** JSON-RPC receipt for one frame. */
+export type Rpc = {
+  /** Execution gas used. */
+  executionGasUsed: Hex.Hex
+  /** Logs emitted by this frame. */
+  logs: readonly Pick<Log.Log, 'address' | 'data' | 'topics'>[]
+  /** Final state gas used. */
+  stateGasUsed: Hex.Hex
+  /** Zero for failure, one for success, or two for a skipped frame. */
+  status: RpcStatus
+}
+
+/** Frame execution status. */
+export type Status = 'reverted' | 'skipped' | 'success'
+
+/** Numeric JSON-RPC frame execution status. */
+export type RpcStatus = 0 | 1 | 2
+
+/** RPC status to status mapping. */
+export const fromRpcStatus = {
+  0: 'reverted',
+  1: 'success',
+  2: 'skipped',
+} as const
+
+/** Status to RPC status mapping. */
+export const toRpcStatus = {
+  reverted: 0,
+  skipped: 2,
+  success: 1,
+} as const
+
+/**
+ * Converts an RPC frame receipt to a {@link ox#FrameReceipt.FrameReceipt}.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * ```ts twoslash
+ * import { FrameReceipt } from 'ox'
+ *
+ * const receipt = FrameReceipt.fromRpc({
+ *   executionGasUsed: '0x5208',
+ *   logs: [],
+ *   stateGasUsed: '0x0',
+ *   status: 1
+ * })
+ * ```
+ *
+ * @param receipt - The RPC frame receipt.
+ * @returns The frame receipt with bigint gas and a named status.
+ */
+export function fromRpc(receipt: Rpc): FrameReceipt {
+  return {
+    gasUsed: Hex.toBigInt(receipt.executionGasUsed),
+    logs: receipt.logs,
+    stateGasUsed: Hex.toBigInt(receipt.stateGasUsed),
+    status: fromRpcStatus[receipt.status],
+  }
+}
+
+export declare namespace fromRpc {
+  type ErrorType = Hex.toBigInt.ErrorType | Errors.GlobalErrorType
+}
+
+/**
+ * Converts a {@link ox#FrameReceipt.FrameReceipt} to an RPC frame receipt.
+ *
+ * @example
+ * ### Basic Usage
+ *
+ * ```ts twoslash
+ * import { FrameReceipt } from 'ox'
+ *
+ * const receipt = FrameReceipt.fromRpc({
+ *   executionGasUsed: '0x5208',
+ *   logs: [],
+ *   stateGasUsed: '0x0',
+ *   status: 1
+ * })
+ * const rpc = FrameReceipt.toRpc(receipt)
+ * ```
+ *
+ * @param receipt - The frame receipt. Gas accepts hex, bigint, or number values.
+ * @returns The RPC frame receipt with hex gas and a numeric status.
+ */
+export function toRpc(receipt: toRpc.Input): Rpc {
+  return {
+    executionGasUsed: Quantity.fromNumberish(receipt.gasUsed),
+    logs: receipt.logs,
+    stateGasUsed: Quantity.fromNumberish(receipt.stateGasUsed),
+    status: toRpcStatus[receipt.status],
+  }
+}
+
+export declare namespace toRpc {
+  type Input = FrameReceipt<Hex.Hex | bigint | number>
+
+  type ErrorType = Hex.fromNumber.ErrorType | Errors.GlobalErrorType
+}