ox 0.14.47 → 0.14.49

package/_types/core/FrameSignature.d.ts

@@ -23,18 +23,18 @@ export type Arbitrary = {
     /** Arbitrary signatures have no signer metadata. */
     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 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;
@@ -45,8 +45,8 @@ 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;
@@ -58,11 +58,11 @@ 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;
 };
@@ -126,12 +126,13 @@ export declare namespace assert {
          */
         signed?: boolean | undefined;
     };
-    type ErrorType = InvalidError | Address.assert.ErrorType | Hex.assert.ErrorType | Hex.toBigInt.ErrorType | PublicKey.assert.ErrorType | Signature.assert.ErrorType | Errors.GlobalErrorType;
+    type ErrorType = InvalidError | Address.assert.ErrorType | Hex.assert.ErrorType | 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.
@@ -230,7 +231,7 @@ export declare namespace from {
  *
  * const entry = FrameSignature.fromRpc({
  *   msg: '0x',
- *   scheme: 0,
+ *   scheme: '0x0',
  *   signature: '0xdeadbeef'
  * })
  * ```
@@ -240,7 +241,7 @@ export declare namespace from {
  */
 export declare function fromRpc(entry: Rpc): FrameSignature;
 export declare namespace fromRpc {
-    type ErrorType = fromTuple.ErrorType | Hex.fromNumber.ErrorType;
+    type ErrorType = fromTuple.ErrorType | Hex.fromNumber.ErrorType | Hex.toNumber.ErrorType;
 }
 /**
  * Converts a structured frame signature to its RPC representation.

package/_types/core/FrameSignature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FrameSignature.d.ts","sourceRoot":"","sources":["../../core/FrameSignature.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FrameSignature.d.ts","sourceRoot":"","sources":["../../core/FrameSignature.ts"],"names":[],"mappings":"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"}

package/_types/core/TxEnvelopeEip8141.d.ts

@@ -82,7 +82,7 @@ export type Type = typeof type;
  *
  * TxEnvelopeEip8141.assert({
  *   chainId: 1,
- *   frames: [{ gas: 50_000n, mode: 'verify' }],
+ *   frames: [{ executionGas: 50_000n, mode: 'verify' }],
  *   sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
  * })
  * ```
@@ -132,8 +132,8 @@ export declare namespace deserialize {
  *   chainId: 1,
  *   frames: [
  *     {
+ *       executionGas: 50_000n,
  *       flags: 'approveExecutionAndPayment',
- *       gas: 50_000n,
  *       mode: 'verify'
  *     }
  *   ],
@@ -235,8 +235,8 @@ export declare namespace toRpc {
  *   chainId: 1,
  *   frames: [
  *     {
+ *       executionGas: 50_000n,
  *       flags: 'approveExecutionAndPayment',
- *       gas: 50_000n,
  *       mode: 'verify'
  *     }
  *   ],
@@ -300,7 +300,7 @@ export declare namespace hash {
  *
  * const envelope = TxEnvelopeEip8141.from({
  *   chainId: 1,
- *   frames: [{ gas: 50_000n, mode: 'sender' }],
+ *   frames: [{ executionGas: 50_000n, mode: 'sender' }],
  *   sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
  * })
  * const serialized = TxEnvelopeEip8141.serialize(envelope)

package/_types/index.d.ts

@@ -1533,13 +1533,13 @@ export * as Filter from './core/Filter.js';
  * import { Frame } from 'ox'
  *
  * const frame = Frame.from({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
  *
- * @category Transaction Envelopes
+ * @category Frames (EIP-8141)
  */
 export * as Frame from './core/Frame.js';
 /**
@@ -1547,7 +1547,7 @@ export * as Frame from './core/Frame.js';
  *
  * Frame receipts include execution gas, state gas, logs, and execution status.
  *
- * @category Execution Spec
+ * @category Frames (EIP-8141)
  */
 export * as FrameReceipt from './core/FrameReceipt.js';
 /**
@@ -1569,7 +1569,7 @@ export * as FrameReceipt from './core/FrameReceipt.js';
  * // @log: { payload: '0x', scheme: 'arbitrary', signature: '0xaabb' }
  * ```
  *
- * @category Transaction Envelopes
+ * @category Frames (EIP-8141)
  */
 export * as FrameSignature from './core/FrameSignature.js';
 /**
@@ -3299,7 +3299,7 @@ export * as TxEnvelopeEip7702 from './core/TxEnvelopeEip7702.js';
  *
  * const envelope = TxEnvelopeEip8141.from({
  *   chainId: 1,
- *   frames: [{ gas: 50_000n, mode: 'sender' }],
+ *   frames: [{ executionGas: 50_000n, mode: 'sender' }],
  *   sender: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
  * })
  * ```

package/_types/version.d.ts

@@ -1,3 +1,3 @@
 /** @internal */
-export declare const version = "0.14.47";
+export declare const version = "0.14.49";
 //# sourceMappingURL=version.d.ts.map

package/core/Frame.ts

@@ -11,16 +11,16 @@ export type Frame<bigintType = bigint> = {
    * @default '0x'
    */
   data?: Hex.Hex | undefined
+  /**
+   * Execution gas budget.
+   * @default 0n
+   */
+  executionGas?: bigintType | 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
@@ -45,13 +45,13 @@ export type Rpc = {
   /** Frame calldata. */
   data: Hex.Hex
   /** Execution gas budget. */
-  executionGasLimit: Hex.Hex
+  executionGas: Hex.Hex
   /** Approval scope and batching bits. */
-  flags: number
+  flags: Hex.Hex
   /** Execution mode. */
-  mode: number
+  mode: Hex.Hex
   /** State gas budget. */
-  stateGasLimit: Hex.Hex
+  stateGas: Hex.Hex
   /** Target address; absent for the transaction sender. */
   target?: Address.Address | null | undefined
   /** Value transferred in wei. */
@@ -101,8 +101,8 @@ export type Tuple = readonly [
  * import { Frame } from 'ox'
  *
  * Frame.assert({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
@@ -112,8 +112,8 @@ export type Tuple = readonly [
 export function assert(frame: Frame): void {
   const {
     data = '0x',
+    executionGas = 0n,
     flags: flagsValue = 0,
-    gas = 0n,
     mode: modeValue = 0,
     stateGas = 0n,
     value = 0n,
@@ -136,12 +136,12 @@ export function assert(frame: Frame): void {
   }
   if (frame.to !== undefined) Address.assert(frame.to, { strict: false })
   for (const [field, limit] of [
-    ['gas', gas],
+    ['executionGas', executionGas],
     ['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)
+  if (executionGas + 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.')
@@ -176,8 +176,8 @@ export declare namespace assert {
  * import { Frame } from 'ox'
  *
  * const frame = Frame.from({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
@@ -205,10 +205,10 @@ export declare namespace from {
  *
  * const frame = Frame.fromRpc({
  *   data: '0x',
- *   executionGasLimit: '0xc350',
- *   flags: 3,
- *   mode: 1,
- *   stateGasLimit: '0x0',
+ *   executionGas: '0xc350',
+ *   flags: '0x3',
+ *   mode: '0x1',
+ *   stateGas: '0x0',
  *   value: '0x0'
  * })
  * ```
@@ -219,17 +219,20 @@ export declare namespace from {
 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),
+    executionGas: Hex.toBigInt(frame.executionGas),
+    flags: Hex.toNumber(frame.flags),
+    mode: Hex.toNumber(frame.mode),
+    stateGas: Hex.toBigInt(frame.stateGas),
     ...(frame.target == null ? {} : { to: frame.target }),
     value: Hex.toBigInt(frame.value),
   })
 }
 
 export declare namespace fromRpc {
-  type ErrorType = from.ErrorType | Hex.toBigInt.ErrorType
+  type ErrorType =
+    | from.ErrorType
+    | Hex.toBigInt.ErrorType
+    | Hex.toNumber.ErrorType
 }
 
 /**
@@ -241,7 +244,7 @@ export declare namespace fromRpc {
  * ```ts twoslash
  * import { Frame } from 'ox'
  *
- * const frame = Frame.from({ gas: 50_000n, mode: 'verify' })
+ * const frame = Frame.from({ executionGas: 50_000n, mode: 'verify' })
  * const rpc = Frame.toRpc(frame)
  * ```
  *
@@ -252,10 +255,10 @@ 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),
+    executionGas: Quantity.fromNumberish(frame.executionGas ?? 0n),
+    flags: Hex.fromNumber(typeof flags_ === 'string' ? flags[flags_] : flags_),
+    mode: Hex.fromNumber(typeof mode === 'string' ? modes[mode] : mode),
+    stateGas: Quantity.fromNumberish(frame.stateGas ?? 0n),
     ...(frame.to === undefined ? {} : { target: frame.to }),
     value: Quantity.fromNumberish(frame.value ?? 0n),
   }
@@ -290,8 +293,8 @@ export declare namespace toRpc {
  * ])
  * // @log: {
  * // @log:   data: '0x',
+ * // @log:   executionGas: 50000n,
  * // @log:   flags: 3,
- * // @log:   gas: 50000n,
  * // @log:   mode: 1,
  * // @log:   stateGas: 0n,
  * // @log:   value: 0n
@@ -325,8 +328,8 @@ export function fromTuple(tuple: Tuple): Frame {
   const frame = {
     ...(target === '0x' ? {} : { to: target }),
     data,
+    executionGas: execution === '0x' ? 0n : Hex.toBigInt(execution),
     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),
@@ -358,8 +361,8 @@ export declare namespace fromTuple {
  * import { Frame } from 'ox'
  *
  * const tuple = Frame.toTuple({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * // @log: ['0x01', '0x03', '0x', ['0xc350', '0x'], '0x', '0x']
@@ -379,7 +382,9 @@ export function toTuple(frame: Frame): Tuple {
     flags_ ? Hex.fromBytes(Bytes.fromNumber(flags_)) : '0x',
     frame.to ?? '0x',
     [
-      frame.gas ? Hex.fromBytes(Bytes.fromNumber(frame.gas)) : '0x',
+      frame.executionGas
+        ? Hex.fromBytes(Bytes.fromNumber(frame.executionGas))
+        : '0x',
       frame.stateGas ? Hex.fromBytes(Bytes.fromNumber(frame.stateGas)) : '0x',
     ],
     frame.value ? Hex.fromBytes(Bytes.fromNumber(frame.value)) : '0x',
@@ -409,8 +414,8 @@ export declare namespace toTuple {
  * import { Frame } from 'ox'
  *
  * const valid = Frame.validate({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * // @log: true

package/core/FrameReceipt.ts

@@ -6,6 +6,8 @@ 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. */
+  executionGasUsed: bigintType
+  /** Total execution and state gas used. */
   gasUsed: bigintType
   /** Logs emitted by this frame. */
   logs: readonly Pick<Log.Log, 'address' | 'data' | 'topics'>[]
@@ -17,6 +19,8 @@ export type FrameReceipt<bigintType = bigint> = {
 
 /** JSON-RPC receipt for one frame. */
 export type Rpc = {
+  /** Total execution and state gas used. */
+  gasUsed: Hex.Hex
   /** Execution gas used. */
   executionGasUsed: Hex.Hex
   /** Logs emitted by this frame. */
@@ -30,21 +34,21 @@ export type Rpc = {
 /** Frame execution status. */
 export type Status = 'reverted' | 'skipped' | 'success'
 
-/** Numeric JSON-RPC frame execution status. */
-export type RpcStatus = 0 | 1 | 2
+/** Hex JSON-RPC frame execution status. */
+export type RpcStatus = '0x0' | '0x1' | '0x2'
 
 /** RPC status to status mapping. */
 export const fromRpcStatus = {
-  0: 'reverted',
-  1: 'success',
-  2: 'skipped',
+  '0x0': 'reverted',
+  '0x1': 'success',
+  '0x2': 'skipped',
 } as const
 
 /** Status to RPC status mapping. */
 export const toRpcStatus = {
-  reverted: 0,
-  skipped: 2,
-  success: 1,
+  reverted: '0x0',
+  skipped: '0x2',
+  success: '0x1',
 } as const
 
 /**
@@ -58,9 +62,10 @@ export const toRpcStatus = {
  *
  * const receipt = FrameReceipt.fromRpc({
  *   executionGasUsed: '0x5208',
+ *   gasUsed: '0x5208',
  *   logs: [],
  *   stateGasUsed: '0x0',
- *   status: 1
+ *   status: '0x1'
  * })
  * ```
  *
@@ -69,7 +74,8 @@ export const toRpcStatus = {
  */
 export function fromRpc(receipt: Rpc): FrameReceipt {
   return {
-    gasUsed: Hex.toBigInt(receipt.executionGasUsed),
+    executionGasUsed: Hex.toBigInt(receipt.executionGasUsed),
+    gasUsed: Hex.toBigInt(receipt.gasUsed),
     logs: receipt.logs,
     stateGasUsed: Hex.toBigInt(receipt.stateGasUsed),
     status: fromRpcStatus[receipt.status],
@@ -91,19 +97,21 @@ export declare namespace fromRpc {
  *
  * const receipt = FrameReceipt.fromRpc({
  *   executionGasUsed: '0x5208',
+ *   gasUsed: '0x5208',
  *   logs: [],
  *   stateGasUsed: '0x0',
- *   status: 1
+ *   status: '0x1'
  * })
  * 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.
+ * @returns The RPC frame receipt with hex gas and a hex status.
  */
 export function toRpc(receipt: toRpc.Input): Rpc {
   return {
-    executionGasUsed: Quantity.fromNumberish(receipt.gasUsed),
+    executionGasUsed: Quantity.fromNumberish(receipt.executionGasUsed),
+    gasUsed: Quantity.fromNumberish(receipt.gasUsed),
     logs: receipt.logs,
     stateGasUsed: Quantity.fromNumberish(receipt.stateGasUsed),
     status: toRpcStatus[receipt.status],

package/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 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,8 +50,8 @@ 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. */
@@ -67,11 +67,11 @@ 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
 }
@@ -174,20 +174,23 @@ export function assert(
     if (options.signed) throw new InvalidError('Signature is required.')
     return
   }
-  if (
-    typeof entry.signature.r !== 'bigint' ||
-    typeof entry.signature.s !== 'bigint'
-  )
+  if (typeof entry.signature === 'string')
+    Hex.assert(entry.signature, { strict: true })
+  const signature =
+    typeof entry.signature === 'string'
+      ? Signature.fromHex(entry.signature)
+      : entry.signature
+  if (typeof signature.r !== 'bigint' || typeof signature.s !== 'bigint')
     throw new InvalidError('Signature scalars must be bigint.')
   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 = entry.signature.r
-  const s = entry.signature.s
+  Signature.assert(signature, { recovered: scheme === 1 })
+  const r = signature.r
+  const s = signature.s
   const order = scheme === 1 ? secp256k1N : p256N
   if (
     r === 0n ||
@@ -216,13 +219,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.
@@ -346,7 +351,7 @@ export declare namespace from {
  *
  * const entry = FrameSignature.fromRpc({
  *   msg: '0x',
- *   scheme: 0,
+ *   scheme: '0x0',
  *   signature: '0xdeadbeef'
  * })
  * ```
@@ -356,15 +361,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
 }
 
 /**
@@ -387,8 +397,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 }),
   }
 }
@@ -518,18 +530,26 @@ export function toTuple(entry: FrameSignature): Tuple {
       case 'arbitrary':
         return entry.signature
       case 1:
-      case 'secp256k1':
-        return entry.signature === undefined
-          ? '0x'
-          : Hex.concat(
-              Hex.fromNumber(entry.signature.yParity, { size: 1 }),
-              Hex.fromNumber(entry.signature.r, { size: 32 }),
-              Hex.fromNumber(entry.signature.s, { size: 32 }),
-            )
+      case 'secp256k1': {
+        if (entry.signature === undefined) return '0x'
+        const signature =
+          typeof entry.signature === 'string'
+            ? Signature.fromHex(entry.signature)
+            : entry.signature
+        return Hex.concat(
+          Hex.fromNumber(signature.yParity, { size: 1 }),
+          Hex.fromNumber(signature.r, { size: 32 }),
+          Hex.fromNumber(signature.s, { size: 32 }),
+        )
+      }
       case 2:
       case 'p256': {
         if (entry.signature === undefined) return '0x'
-        const { publicKey, signature } = entry
+        const { publicKey } = entry
+        const signature =
+          typeof entry.signature === 'string'
+            ? Signature.fromHex(entry.signature)
+            : entry.signature
         const s = signature.s
         return Hex.concat(
           Hex.fromNumber(signature.r, { size: 32 }),