ox 1.8.1 → 1.8.4

package/src/core/FrameRequest.ts

@@ -0,0 +1,78 @@
+import * as Frame from './Frame.js'
+import type { Compute, PartialBy } from './internal/types.js'
+
+/** A frame request whose omitted gas limits are estimated by the node. */
+export type FrameRequest<bigintType = bigint> = Frame.Frame<bigintType>
+
+/** JSON-RPC frame request. Only the execution mode is required. */
+export type Rpc = Compute<
+  PartialBy<Frame.Rpc, Exclude<keyof Frame.Rpc, 'mode'>>
+>
+
+/**
+ * Converts an RPC frame request, preserving omitted gas limits for node estimation.
+ *
+ * @example
+ * ```ts twoslash
+ * import { FrameRequest } from 'ox'
+ *
+ * const frame = FrameRequest.fromRpc({
+ *   mode: '0x2',
+ *   stateGas: '0x0'
+ * })
+ * ```
+ *
+ * @param frame - The RPC frame request.
+ * @returns The decoded request with omitted gas limits preserved.
+ */
+export function fromRpc(frame: Rpc): FrameRequest {
+  const { executionGas, stateGas, ...rest } = Frame.fromRpc({
+    ...frame,
+    data: frame.data ?? '0x',
+    executionGas: frame.executionGas ?? '0x0',
+    flags: frame.flags ?? '0x0',
+    stateGas: frame.stateGas ?? '0x0',
+    value: frame.value ?? '0x0',
+  })
+  return {
+    ...rest,
+    ...(frame.executionGas === undefined ? {} : { executionGas }),
+    ...(frame.stateGas === undefined ? {} : { stateGas }),
+  }
+}
+
+export declare namespace fromRpc {
+  type ErrorType = Frame.fromRpc.ErrorType
+}
+
+/**
+ * Converts a frame request to RPC fields without filling omitted gas limits.
+ *
+ * Explicit zero limits remain zero. Omitted mode, flags, value, and data use frame defaults.
+ *
+ * @example
+ * ```ts twoslash
+ * import { FrameRequest } from 'ox'
+ *
+ * const frame = FrameRequest.toRpc({
+ *   mode: 'sender',
+ *   stateGas: 0n
+ * })
+ * ```
+ *
+ * @param frame - The frame request. Gas and value accept hex, bigint, or number values.
+ * @returns The RPC request with omitted gas limits preserved.
+ */
+export function toRpc(frame: toRpc.Input): Rpc {
+  const { executionGas, stateGas, ...rest } = Frame.toRpc(frame)
+  return {
+    ...rest,
+    ...(frame.executionGas === undefined ? {} : { executionGas }),
+    ...(frame.stateGas === undefined ? {} : { stateGas }),
+  }
+}
+
+export declare namespace toRpc {
+  type Input = Frame.toRpc.Input
+  type ErrorType = Frame.toRpc.ErrorType
+}

package/src/core/FrameSignature.ts

@@ -26,19 +26,19 @@ export type Arbitrary = {
   signer?: undefined
 }
 
-/** A structured secp256k1 signature entry. */
+/** A secp256k1 signature entry. */
 export type Secp256k1 = {
   /** Explicit nonzero digest. Omit or use empty bytes for the transaction signing hash. */
   payload?: Hex.Hex | undefined
   /** secp256k1 verification scheme. */
   scheme: 1 | 'secp256k1'
-  /** Recovered signature. Omit for an unsigned entry. */
-  signature?: Signature.Signature | undefined
+  /** Recovered signature or `Signature.toHex` bytes. Omit or use `0x` for an unsigned entry. */
+  signature?: Hex.Hex | Signature.Signature | undefined
   /** Signer address. Omit to use the transaction sender. */
   signer?: Address.Address | undefined
 }
 
-/** A structured P-256 signature entry. */
+/** A P-256 signature entry. */
 export type P256 = {
   /** Explicit nonzero digest. Omit or use empty bytes for the transaction signing hash. */
   payload?: Hex.Hex | undefined
@@ -50,14 +50,14 @@ export type P256 = {
   | {
       /** Uncompressed P-256 public key. */
       publicKey: PublicKey.PublicKey
-      /** P-256 signature. */
-      signature: Signature.Signature<false>
+      /** P-256 signature or `Signature.toHex` bytes. */
+      signature: Hex.Hex | Signature.Signature<false>
     }
   | {
       /** Public key, if already known. Empty wire signatures do not retain it. */
       publicKey?: PublicKey.PublicKey | undefined
-      /** Omit for an unsigned entry. */
-      signature?: undefined
+      /** Omit or use `0x` for an unsigned entry. */
+      signature?: '0x' | undefined
     }
 )
 
@@ -67,13 +67,13 @@ export type FrameSignature = Arbitrary | Secp256k1 | P256
 /** JSON-RPC representation of a frame signature. */
 export type Rpc = {
   /** Explicit digest, or empty bytes for the transaction signing hash. */
-  msg: Hex.Hex
+  msg?: Hex.Hex | undefined
   /** Signature verification scheme. */
-  scheme: 0 | 1 | 2
+  scheme: '0x0' | '0x1' | '0x2'
   /** Encoded signature bytes. */
-  signature: Hex.Hex
+  signature?: Hex.Hex | undefined
   /** Signer address; absent for the transaction sender. */
-  signer?: Address.Address | null | undefined
+  signer?: Address.Address | '0x' | undefined
 }
 
 /** RLP-ready signature entry. The payload occupies the specification's `msg` field. */
@@ -164,24 +164,34 @@ export function assert(
           throw new InvalidError('Public key coordinates must fit in 32 bytes.')
       }
     }
-    if (entry.signature !== undefined && entry.publicKey === undefined)
+    if (
+      entry.signature !== undefined &&
+      entry.signature !== '0x' &&
+      entry.publicKey === undefined
+    )
       throw new InvalidError('P-256 signatures require a public key.')
   }
-  if (entry.signature === undefined) {
+  if (entry.signature === undefined || entry.signature === '0x') {
     if (options.signed) throw new InvalidError('Signature is required.')
     return
   }
-  Hex.assert(entry.signature.r, { strict: true })
-  Hex.assert(entry.signature.s, { strict: true })
+  if (typeof entry.signature === 'string')
+    Hex.assert(entry.signature, { strict: true })
+  const signature =
+    typeof entry.signature === 'string'
+      ? Signature.fromHex(entry.signature)
+      : entry.signature
+  Hex.assert(signature.r, { strict: true })
+  Hex.assert(signature.s, { strict: true })
   if (
-    (scheme === 1 || entry.signature.yParity !== undefined) &&
-    entry.signature.yParity !== 0 &&
-    entry.signature.yParity !== 1
+    (scheme === 1 || signature.yParity !== undefined) &&
+    signature.yParity !== 0 &&
+    signature.yParity !== 1
   )
     throw new InvalidError('Signature parity must be 0 or 1.')
-  Signature.assert(entry.signature, { recovered: scheme === 1 })
-  const r = Hex.toBigInt(entry.signature.r)
-  const s = Hex.toBigInt(entry.signature.s)
+  Signature.assert(signature, { recovered: scheme === 1 })
+  const r = Hex.toBigInt(signature.r)
+  const s = Hex.toBigInt(signature.s)
   const order = scheme === 1 ? secp256k1N : p256N
   if (
     r === 0n ||
@@ -210,13 +220,15 @@ export declare namespace assert {
     | Hex.toBigInt.ErrorType
     | PublicKey.assert.ErrorType
     | Signature.assert.ErrorType
+    | Signature.fromHex.ErrorType
     | Errors.GlobalErrorType
 }
 
 /**
  * Coerces a value into a {@link ox#FrameSignature.FrameSignature}.
  *
- * Accepts arbitrary signature bytes or a structured signature entry. Omitted
+ * Accepts arbitrary signature bytes or a signature entry. Protocol signatures accept
+ * structured objects or `Signature.toHex` bytes. P-256 entries still require a public key. Omitted
  * `scheme` and `payload` default to `'arbitrary'` and `'0x'`, respectively.
  * An empty payload selects the canonical transaction signing hash; an explicit
  * payload must be a nonzero 32-byte digest.
@@ -340,7 +352,7 @@ export declare namespace from {
  *
  * const entry = FrameSignature.fromRpc({
  *   msg: '0x',
- *   scheme: 0,
+ *   scheme: '0x0',
  *   signature: '0xdeadbeef'
  * })
  * ```
@@ -350,15 +362,20 @@ export declare namespace from {
  */
 export function fromRpc(entry: Rpc): FrameSignature {
   return fromTuple([
-    entry.scheme === 0 ? '0x' : Hex.fromNumber(entry.scheme, { size: 1 }),
+    entry.scheme === '0x0'
+      ? '0x'
+      : Hex.fromNumber(Hex.toNumber(entry.scheme), { size: 1 }),
     entry.signer ?? '0x',
-    entry.msg,
-    entry.signature,
+    entry.msg ?? '0x',
+    entry.signature ?? '0x',
   ])
 }
 
 export declare namespace fromRpc {
-  type ErrorType = fromTuple.ErrorType | Hex.fromNumber.ErrorType
+  type ErrorType =
+    | fromTuple.ErrorType
+    | Hex.fromNumber.ErrorType
+    | Hex.toNumber.ErrorType
 }
 
 /**
@@ -381,8 +398,10 @@ export function toRpc(entry: FrameSignature): Rpc {
   const [scheme, signer, msg, signature] = toTuple(entry)
   return {
     msg,
-    scheme: (scheme === '0x' ? 0 : Hex.toNumber(scheme)) as Rpc['scheme'],
-    signature,
+    scheme: (scheme === '0x'
+      ? '0x0'
+      : Hex.fromNumber(Hex.toNumber(scheme))) as Rpc['scheme'],
+    ...(signature === '0x' && scheme !== '0x' ? {} : { signature }),
     ...(signer === '0x' ? {} : { signer }),
   }
 }
@@ -509,13 +528,24 @@ export function toTuple(entry: FrameSignature): Tuple {
         return entry.signature
       case 1:
       case 'secp256k1':
-        return entry.signature === undefined
+        return entry.signature === undefined || entry.signature === '0x'
           ? '0x'
-          : Hex.fromBytes(Signature.toRecoveredBytes(entry.signature))
+          : Hex.fromBytes(
+              Signature.toRecoveredBytes(
+                typeof entry.signature === 'string'
+                  ? Signature.fromHex(entry.signature)
+                  : entry.signature,
+              ),
+            )
       case 2:
       case 'p256': {
-        if (entry.signature === undefined) return '0x'
-        const { publicKey, signature } = entry
+        if (entry.signature === undefined || entry.signature === '0x')
+          return '0x'
+        const publicKey = entry.publicKey!
+        const signature =
+          typeof entry.signature === 'string'
+            ? Signature.fromHex(entry.signature)
+            : entry.signature
         const s = Hex.toBigInt(signature.s)
         return Hex.concat(
           Hex.fromNumber(Hex.toBigInt(signature.r), { size: 32 }),

package/src/core/Siwe.ts

@@ -21,7 +21,7 @@ export const prefixRegex =
 
 // https://regexr.com/80gf9
 export const suffixRegex =
-  /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId>.+))?/
+  /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId>.*))?(?:\nResources:(?<resources>(?:\n- .+)*))?/
 
 const siweDateTimeRegex =
   /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])[Tt]([01]\d|2[0-3]):[0-5]\d:[0-5]\d(?:\.\d+)?(?:[Zz]|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/
@@ -421,18 +421,26 @@ export function parseMessage(message: string): ExactPartial<Message> {
     scheme?: string
     statement?: string
   }
-  const { chainId, expirationTime, issuedAt, notBefore, requestId, ...suffix } =
-    (message.match(suffixRegex)?.groups ?? {}) as {
-      chainId: string
-      expirationTime?: string
-      issuedAt?: string
-      nonce: string
-      notBefore?: string
-      requestId?: string
-      uri: string
-      version: '1'
-    }
-  const resources = message.split('Resources:')[1]?.split('\n- ').slice(1)
+  const {
+    chainId,
+    expirationTime,
+    issuedAt,
+    notBefore,
+    requestId,
+    resources: resources_,
+    ...suffix
+  } = (message.match(suffixRegex)?.groups ?? {}) as {
+    chainId: string
+    expirationTime?: string
+    issuedAt?: string
+    nonce: string
+    notBefore?: string
+    requestId?: string
+    resources?: string
+    uri: string
+    version: '1'
+  }
+  const resources = resources_?.split('\n- ').slice(1)
   return {
     ...prefix,
     ...suffix,

package/src/core/Transaction.ts

@@ -5,8 +5,14 @@ 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 * as FrameNonce from './internal/frameNonce.js'
 import * as Quantity from './internal/quantity.js'
-import type { Compute, OneOf, UnionCompute } from './internal/types.js'
+import type {
+  Compute,
+  ExactPartial,
+  OneOf,
+  UnionCompute,
+} from './internal/types.js'
 import * as Signature from './Signature.js'
 
 /**
@@ -197,29 +203,37 @@ export type 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)[]
-  }
+    'chainId' | 'gas' | 'input' | 'to' | 'value' | 'r' | 's' | 'v' | 'yParity'
+  > &
+    ExactPartial<
+      Pick<
+        Base<type, pending, bigintType, numberType>,
+        'gas' | 'input' | 'to' | 'value'
+      >
+    > & {
+      /** 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
+      /** EIP-8250 domains sharing the transaction's `nonce` sequence. */
+      nonceKeys?: readonly bigintType[] | undefined
+      /** Frame signature entries. */
+      signatures: readonly ([bigintType] extends [Hex.Hex]
+        ? FrameSignature.Rpc
+        : FrameSignature.FrameSignature)[]
+    }
 >
 
 /** An EIP-8141 RPC transaction. */
@@ -366,6 +380,16 @@ export function fromRpc<
         ? chainId
         : Number(chainId)
   }
+  if (transaction.type === '0x6' && transaction.nonceKeys !== undefined) {
+    if (transaction.nonce === undefined)
+      throw new FrameNonce.InvalidError(
+        'A keyed transaction result requires nonce.',
+      )
+    transaction_.nonceKeys = FrameNonce.fromRpc(
+      transaction.nonceKeys,
+      transaction.nonce,
+    )
+  }
   if (transaction.type === '0x6' && transaction.frames) {
     transaction_.frames = transaction.frames.map(Frame.fromRpc)
     transaction_.signatures = (transaction.signatures ?? []).map(
@@ -402,6 +426,7 @@ export declare namespace fromRpc {
 
   type ErrorType =
     | Signature.extract.ErrorType
+    | FrameNonce.InvalidError
     | Frame.fromRpc.ErrorType
     | FrameSignature.fromRpc.ErrorType
     | Errors.GlobalErrorType
@@ -469,6 +494,8 @@ export function toRpc<pending extends boolean = false>(
   rpc.type = (toRpcType as any)[transaction.type] ?? transaction.type
   rpc.value = Quantity.fromNumberish(transaction.value ?? 0n)
 
+  if (transaction.type === 'eip8141' && transaction.nonceKeys !== undefined)
+    rpc.nonceKeys = FrameNonce.toRpc(transaction.nonceKeys, transaction.nonce)
   if (transaction.type === 'eip8141' && transaction.frames) {
     rpc.frames = transaction.frames.map(Frame.toRpc)
     rpc.signatures = transaction.signatures.map(FrameSignature.toRpc)
@@ -516,6 +543,7 @@ export declare namespace toRpc {
 
   type ErrorType =
     | Signature.extract.ErrorType
+    | FrameNonce.InvalidError
     | Frame.toRpc.ErrorType
     | FrameSignature.toRpc.ErrorType
     | Errors.GlobalErrorType

package/src/core/TransactionRequest.ts

@@ -3,9 +3,10 @@ import type * as Address from './Address.js'
 import * as Authorization from './Authorization.js'
 import * as Blobs from './Blobs.js'
 import * as Errors from './Errors.js'
-import * as Frame from './Frame.js'
+import * as FrameRequest from './FrameRequest.js'
 import * as FrameSignature from './FrameSignature.js'
 import * as Hex from './Hex.js'
+import * as FrameNonce from './internal/frameNonce.js'
 import * as Quantity from './internal/quantity.js'
 import type { Compute } from './internal/types.js'
 import type * as Kzg from './Kzg.js'
@@ -19,7 +20,9 @@ export type TransactionRequest<
   bigintType = bigint,
   numberType = number,
   type extends string = string,
-  frame = [bigintType] extends [Hex.Hex] ? Frame.Rpc : Frame.Frame<bigintType>,
+  frame = [bigintType] extends [Hex.Hex]
+    ? FrameRequest.Rpc
+    : FrameRequest.FrameRequest<bigintType>,
   signature = [bigintType] extends [Hex.Hex]
     ? FrameSignature.Rpc
     : FrameSignature.FrameSignature,
@@ -56,6 +59,8 @@ export type TransactionRequest<
   maxPriorityFeePerGas?: bigintType | undefined
   /** Unique number identifying this transaction */
   nonce?: bigintType | undefined
+  /** EIP-8250 nonce domains. `nonce` is their shared sequence; omitted keys preserve EIP-8141 encoding. */
+  nonceKeys?: readonly bigintType[] | undefined
   /** Frame signature entries for EIP-8141 transactions. */
   signatures?: readonly signature[] | undefined
   /** Transaction recipient */
@@ -79,7 +84,7 @@ export type Rpc = TransactionRequest<
   Hex.Hex,
   Hex.Hex,
   string,
-  Frame.Rpc,
+  FrameRequest.Rpc,
   FrameSignature.Rpc
 >
 
@@ -109,7 +114,7 @@ export function fromRpc(request: Rpc): TransactionRequest {
   if (typeof request.chainId !== 'undefined')
     request_.chainId = Hex.toNumber(request.chainId)
   if (request.frames !== undefined)
-    request_.frames = request.frames.map(Frame.fromRpc)
+    request_.frames = request.frames.map(FrameRequest.fromRpc)
   if (request.signatures !== undefined)
     request_.signatures = request.signatures.map(FrameSignature.fromRpc)
   if (typeof request.gas !== 'undefined')
@@ -124,6 +129,8 @@ export function fromRpc(request: Rpc): TransactionRequest {
     request_.maxPriorityFeePerGas = Hex.toBigInt(request.maxPriorityFeePerGas)
   if (typeof request.nonce !== 'undefined')
     request_.nonce = Hex.toBigInt(request.nonce)
+  if (request.nonceKeys !== undefined)
+    request_.nonceKeys = FrameNonce.fromRpc(request.nonceKeys, request.nonce)
   if (typeof request.type !== 'undefined')
     request_.type =
       Transaction.fromRpcType[
@@ -141,7 +148,8 @@ export function fromRpc(request: Rpc): TransactionRequest {
 export declare namespace fromRpc {
   export type ErrorType =
     | Authorization.fromRpcList.ErrorType
-    | Frame.fromRpc.ErrorType
+    | FrameNonce.InvalidError
+    | FrameRequest.fromRpc.ErrorType
     | FrameSignature.fromRpc.ErrorType
     | Hex.toNumber.ErrorType
     | Hex.toBigInt.ErrorType
@@ -210,7 +218,7 @@ export function toRpc(request: toRpc.Input): Rpc {
     request_rpc.input = request.input
   }
   if (request.frames !== undefined)
-    request_rpc.frames = request.frames.map(Frame.toRpc)
+    request_rpc.frames = request.frames.map(FrameRequest.toRpc)
   if (request.signatures !== undefined)
     request_rpc.signatures = request.signatures.map(FrameSignature.toRpc)
   if (typeof request.from !== 'undefined') request_rpc.from = request.from
@@ -230,6 +238,8 @@ export function toRpc(request: toRpc.Input): Rpc {
     )
   if (typeof request.nonce !== 'undefined')
     request_rpc.nonce = Quantity.fromNumberish(request.nonce)
+  if (request.nonceKeys !== undefined)
+    request_rpc.nonceKeys = FrameNonce.toRpc(request.nonceKeys, request.nonce)
   if (typeof request.to !== 'undefined') request_rpc.to = request.to
   if (typeof request.type !== 'undefined')
     request_rpc.type =
@@ -258,7 +268,8 @@ export declare namespace toRpc {
 
   export type ErrorType =
     | Authorization.toRpcList.ErrorType
-    | Frame.toRpc.ErrorType
+    | FrameNonce.InvalidError
+    | FrameRequest.toRpc.ErrorType
     | FrameSignature.toRpc.ErrorType
     | Hex.fromNumber.ErrorType
     | Errors.GlobalErrorType
@@ -400,6 +411,9 @@ export function toEnvelope(
         maxFeePerGas: request.maxFeePerGas,
         maxPriorityFeePerGas: request.maxPriorityFeePerGas,
         nonce: request.nonce,
+        ...(request.nonceKeys !== undefined
+          ? { nonceKeys: request.nonceKeys }
+          : {}),
         sender: request.from,
         sidecars,
         signatures: request.signatures,

package/src/core/TxEnvelope.ts

@@ -242,7 +242,9 @@ export declare namespace deserialize {
  *
  * const envelope = TransactionEnvelope.from({
  *   chainId: 1,
- *   frames: [Frame.from({ gas: 50_000n, mode: 'sender' })],
+ *   frames: [
+ *     Frame.from({ executionGas: 50_000n, mode: 'sender' })
+ *   ],
  *   sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
  * })
  * ```
@@ -410,7 +412,10 @@ export function getType<const envelope extends Typeable>(
     return type as never
   }
 
-  if ('frames' in envelope && envelope.frames !== undefined)
+  if (
+    ('frames' in envelope && envelope.frames !== undefined) ||
+    ('nonceKeys' in envelope && envelope.nonceKeys !== undefined)
+  )
     return 'eip8141' as never
   if (
     'authorizationList' in envelope &&
@@ -444,7 +449,9 @@ export declare namespace getType {
     type: infer type extends string
   }
     ? type
-    : HasDefined<envelope, 'frames'> extends true
+    : true extends
+          | HasDefined<envelope, 'frames'>
+          | HasDefined<envelope, 'nonceKeys'>
       ? TxEnvelopeEip8141.Type
       : HasDefined<envelope, 'authorizationList'> extends true
         ? TxEnvelopeEip7702.Type
@@ -779,6 +786,12 @@ export function toTransactionRequest(
       ...rest,
       ...(sidecars ? { blobs: sidecars.blobs } : {}),
       chainId: Hex.toNumber(Hex.fromNumber(rest.chainId)),
+      // Envelopes commit to zero defaults; request omission would trigger estimation.
+      frames: rest.frames.map((frame) => ({
+        ...frame,
+        executionGas: frame.executionGas ?? 0n,
+        stateGas: frame.stateGas ?? 0n,
+      })),
       from: sender,
     }
   }