ox 1.8.1 → 1.8.4

package/CHANGELOG.md

@@ -1,5 +1,58 @@
 # ox
 
+## 1.8.4
+
+### Patch Changes
+
+- [#489](https://github.com/wevm/ox/pull/489) [`277594a`](https://github.com/wevm/ox/commit/277594a1f489dd612bc25cfb73006c9050a61f7c) Thanks [@jxom](https://github.com/jxom)! - Added EIP-8250 keyed frame nonces with shared `nonce` sequences while preserving the original EIP-8141 encoding when `nonceKeys` is omitted.
+
+  ```ts
+  import { TxEnvelopeEip8141 } from "ox";
+
+  const envelope = TxEnvelopeEip8141.from({
+    chainId: 1,
+    sender: "0x1111111111111111111111111111111111111111",
+    frames: [{ mode: "sender", executionGas: 50_000n }],
+    nonceKeys: [1n, 2n],
+    nonce: 0n,
+  });
+  ```
+
+## 1.8.3
+
+### Patch Changes
+
+- [#482](https://github.com/wevm/ox/pull/482) [`9d2ab90`](https://github.com/wevm/ox/commit/9d2ab900d397066d036ddedef655d1a9da26a014) Thanks [@jxom](https://github.com/jxom)! - Fixed empty protocol signature placeholders in frame signature validation, encoding, and transaction signing payloads.
+
+## 1.8.2
+
+### Patch Changes
+
+- [`03eb47a`](https://github.com/wevm/ox/commit/03eb47a4c5d87b52215cbf345a95da854add9f26) Thanks [@jxom](https://github.com/jxom)! - Renamed `Frame.gas` to `Frame.executionGas`.
+
+  ```ts
+  import { Frame } from "ox";
+
+  Frame.from({ executionGas: 50_000n, stateGas: 1_000n });
+  ```
+
+- [#480](https://github.com/wevm/ox/pull/480) [`1ae6d07`](https://github.com/wevm/ox/commit/1ae6d078ee65b56983b6a5b9c4e7210aa38d3e37) Thanks [@jxom](https://github.com/jxom)! - Aligned to the frame transaction spec.
+
+- [#471](https://github.com/wevm/ox/pull/471) [`1270b42`](https://github.com/wevm/ox/commit/1270b4279a48acea5f2e397c19fa252342f30f90) Thanks [@jxom](https://github.com/jxom)! - Added hex signature support for secp256k1 and P256 frame signature entries.
+
+  ```ts
+  import { FrameSignature, Signature } from "ox";
+
+  declare const signature: Signature.Signature;
+
+  FrameSignature.from({
+    scheme: "secp256k1",
+    signature: Signature.toHex(signature),
+  });
+  ```
+
+- [#477](https://github.com/wevm/ox/pull/477) [`10075a8`](https://github.com/wevm/ox/commit/10075a8971ffd73d2345f3a1bda97bb1df5b6cac) Thanks [@jxom](https://github.com/jxom)! - Fixed `Siwe.parseMessage` losing or truncating resources when `Resources:` appeared in another message field or resource.
+
 ## 1.8.1
 
 ### Patch Changes

package/dist/core/Frame.d.ts

@@ -9,16 +9,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
@@ -42,13 +42,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. */
@@ -96,8 +96,8 @@ export type Tuple = readonly [
  * import { Frame } from 'ox'
  *
  * Frame.assert({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
@@ -124,8 +124,8 @@ export declare namespace assert {
  * import { Frame } from 'ox'
  *
  * const frame = Frame.from({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
@@ -148,10 +148,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'
  * })
  * ```
@@ -161,7 +161,7 @@ export declare namespace from {
  */
 export declare function fromRpc(frame: Rpc): Frame;
 export declare namespace fromRpc {
-    type ErrorType = from.ErrorType | Hex.toBigInt.ErrorType;
+    type ErrorType = from.ErrorType | Hex.toBigInt.ErrorType | Hex.toNumber.ErrorType;
 }
 /**
  * Converts a frame to its JSON-RPC representation.
@@ -172,7 +172,10 @@ 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)
  * ```
  *
@@ -208,8 +211,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
@@ -239,8 +242,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']
@@ -268,8 +271,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/dist/core/Frame.d.ts.map

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

package/dist/core/Frame.js

@@ -28,8 +28,8 @@ export const flags = {
  * import { Frame } from 'ox'
  *
  * Frame.assert({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
@@ -37,7 +37,7 @@ export const flags = {
  * @param frame - The frame to assert.
  */
 export function assert(frame) {
-    const { data = '0x', flags: flagsValue = 0, gas = 0n, mode: modeValue = 0, stateGas = 0n, value = 0n, } = frame;
+    const { data = '0x', executionGas = 0n, flags: flagsValue = 0, 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.');
@@ -53,12 +53,12 @@ export function assert(frame) {
     if (frame.to !== undefined)
         Address.assert(frame.to, { strict: false });
     for (const [field, limit] of [
-        ['gas', gas],
+        ['executionGas', executionGas],
         ['stateGas', stateGas],
     ])
         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.');
@@ -84,8 +84,8 @@ export function assert(frame) {
  * import { Frame } from 'ox'
  *
  * const frame = Frame.from({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * ```
@@ -108,10 +108,10 @@ export function from(frame) {
  *
  * const frame = Frame.fromRpc({
  *   data: '0x',
- *   executionGasLimit: '0xc350',
- *   flags: 3,
- *   mode: 1,
- *   stateGasLimit: '0x0',
+ *   executionGas: '0xc350',
+ *   flags: '0x3',
+ *   mode: '0x1',
+ *   stateGas: '0x0',
  *   value: '0x0'
  * })
  * ```
@@ -122,10 +122,10 @@ export function from(frame) {
 export function fromRpc(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),
     });
@@ -139,7 +139,10 @@ export function fromRpc(frame) {
  * ```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)
  * ```
  *
@@ -150,10 +153,10 @@ export function toRpc(frame) {
     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),
     };
@@ -182,8 +185,8 @@ export function toRpc(frame) {
  * ])
  * // @log: {
  * // @log:   data: '0x',
+ * // @log:   executionGas: 50000n,
  * // @log:   flags: 3,
- * // @log:   gas: 50000n,
  * // @log:   mode: 1,
  * // @log:   stateGas: 0n,
  * // @log:   value: 0n
@@ -211,8 +214,8 @@ export function fromTuple(tuple) {
     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),
@@ -236,8 +239,8 @@ export function fromTuple(tuple) {
  * 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']
@@ -255,7 +258,9 @@ export function toTuple(frame) {
         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',
@@ -277,8 +282,8 @@ export function toTuple(frame) {
  * import { Frame } from 'ox'
  *
  * const valid = Frame.validate({
+ *   executionGas: 50_000n,
  *   flags: 'approveExecutionAndPayment',
- *   gas: 50_000n,
  *   mode: 'verify'
  * })
  * // @log: true

package/dist/core/Frame.js.map

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

package/dist/core/FrameReceipt.d.ts

@@ -1,12 +1,16 @@
 import type * as Errors from './Errors.js';
 import * as Hex from './Hex.js';
 import type * as Log from './Log.js';
-/** Receipt for one frame. Frame logs contain only address, data, and topics. */
+import type { Compute, ExactPartial } from './internal/types.js';
+type FrameLog = Compute<Pick<Log.Rpc, 'address' | 'data' | 'topics'> & ExactPartial<Omit<Log.Rpc, 'address' | 'data' | 'topics'>>>;
+/** Receipt for one frame. */
 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'>[];
+    logs: readonly FrameLog[];
     /** Final state gas after refills and rollbacks. */
     stateGasUsed: bigintType;
     /** Frame execution result. */
@@ -16,8 +20,10 @@ export type FrameReceipt<bigintType = bigint> = {
 export type Rpc = {
     /** Execution gas used. */
     executionGasUsed: Hex.Hex;
+    /** Total execution and state gas used. */
+    gasUsed: Hex.Hex;
     /** Logs emitted by this frame. */
-    logs: readonly Pick<Log.Log, 'address' | 'data' | 'topics'>[];
+    logs: readonly FrameLog[];
     /** Final state gas used. */
     stateGasUsed: Hex.Hex;
     /** Zero for failure, one for success, or two for a skipped frame. */
@@ -25,19 +31,19 @@ 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 declare const fromRpcStatus: {
-    readonly 0: "reverted";
-    readonly 1: "success";
-    readonly 2: "skipped";
+    readonly '0x0': "reverted";
+    readonly '0x1': "success";
+    readonly '0x2': "skipped";
 };
 /** Status to RPC status mapping. */
 export declare const toRpcStatus: {
-    readonly reverted: 0;
-    readonly skipped: 2;
-    readonly success: 1;
+    readonly reverted: "0x0";
+    readonly skipped: "0x2";
+    readonly success: "0x1";
 };
 /**
  * Converts an RPC frame receipt to a {@link ox#FrameReceipt.FrameReceipt}.
@@ -50,9 +56,10 @@ export declare const toRpcStatus: {
  *
  * const receipt = FrameReceipt.fromRpc({
  *   executionGasUsed: '0x5208',
+ *   gasUsed: '0x5208',
  *   logs: [],
  *   stateGasUsed: '0x0',
- *   status: 1
+ *   status: '0x1'
  * })
  * ```
  *
@@ -74,19 +81,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 declare function toRpc(receipt: toRpc.Input): Rpc;
 export declare namespace toRpc {
     type Input = FrameReceipt<Hex.Hex | bigint | number>;
     type ErrorType = Hex.fromNumber.ErrorType | Errors.GlobalErrorType;
 }
+export {};
 //# sourceMappingURL=FrameReceipt.d.ts.map

package/dist/core/FrameReceipt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FrameReceipt.d.ts","sourceRoot":"","sources":["../../src/core/FrameReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AAEpC,gFAAgF;AAChF,MAAM,MAAM,YAAY,CAAC,UAAU,GAAG,MAAM,IAAI;IAC9C,2DAA2D;IAC3D,OAAO,EAAE,UAAU,CAAA;IACnB,kCAAkC;IAClC,IAAI,EAAE,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC7D,mDAAmD;IACnD,YAAY,EAAE,UAAU,CAAA;IACxB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,0BAA0B;IAC1B,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAA;IACzB,kCAAkC;IAClC,IAAI,EAAE,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC7D,4BAA4B;IAC5B,YAAY,EAAE,GAAG,CAAC,GAAG,CAAA;IACrB,qEAAqE;IACrE,MAAM,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,8BAA8B;AAC9B,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAA;AAEvD,+CAA+C;AAC/C,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAEjC,oCAAoC;AACpC,eAAO,MAAM,aAAa;;;;CAIhB,CAAA;AAEV,oCAAoC;AACpC,eAAO,MAAM,WAAW;;;;CAId,CAAA;AAEV;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,YAAY,CAOlD;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACjE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAO/C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAK,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IAEpD,KAAK,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACnE"}
+{"version":3,"file":"FrameReceipt.d.ts","sourceRoot":"","sources":["../../src/core/FrameReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEhE,KAAK,QAAQ,GAAG,OAAO,CACrB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,GAC1C,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC,CAAC,CAC7D,CAAA;AAED,6BAA6B;AAC7B,MAAM,MAAM,YAAY,CAAC,UAAU,GAAG,MAAM,IAAI;IAC9C,2DAA2D;IAC3D,gBAAgB,EAAE,UAAU,CAAA;IAC5B,0CAA0C;IAC1C,OAAO,EAAE,UAAU,CAAA;IACnB,kCAAkC;IAClC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAA;IACzB,mDAAmD;IACnD,YAAY,EAAE,UAAU,CAAA;IACxB,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,0BAA0B;IAC1B,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAA;IACzB,0CAA0C;IAC1C,OAAO,EAAE,GAAG,CAAC,GAAG,CAAA;IAChB,kCAAkC;IAClC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAA;IACzB,4BAA4B;IAC5B,YAAY,EAAE,GAAG,CAAC,GAAG,CAAA;IACrB,qEAAqE;IACrE,MAAM,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,8BAA8B;AAC9B,MAAM,MAAM,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAA;AAEvD,2CAA2C;AAC3C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAA;AAE7C,oCAAoC;AACpC,eAAO,MAAM,aAAa;;;;CAIhB,CAAA;AAEV,oCAAoC;AACpC,eAAO,MAAM,WAAW;;;;CAId,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,YAAY,CAQlD;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACjE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAQ/C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAK,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IAEpD,KAAK,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,eAAe,CAAA;CACnE"}

package/dist/core/FrameReceipt.js

@@ -2,15 +2,15 @@ import * as Hex from './Hex.js';
 import * as Quantity from './internal/quantity.js';
 /** RPC status to status mapping. */
 export const fromRpcStatus = {
-    0: 'reverted',
-    1: 'success',
-    2: 'skipped',
+    '0x0': 'reverted',
+    '0x1': 'success',
+    '0x2': 'skipped',
 };
 /** Status to RPC status mapping. */
 export const toRpcStatus = {
-    reverted: 0,
-    skipped: 2,
-    success: 1,
+    reverted: '0x0',
+    skipped: '0x2',
+    success: '0x1',
 };
 /**
  * Converts an RPC frame receipt to a {@link ox#FrameReceipt.FrameReceipt}.
@@ -23,9 +23,10 @@ export const toRpcStatus = {
  *
  * const receipt = FrameReceipt.fromRpc({
  *   executionGasUsed: '0x5208',
+ *   gasUsed: '0x5208',
  *   logs: [],
  *   stateGasUsed: '0x0',
- *   status: 1
+ *   status: '0x1'
  * })
  * ```
  *
@@ -34,7 +35,8 @@ export const toRpcStatus = {
  */
 export function fromRpc(receipt) {
     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],
@@ -51,19 +53,21 @@ export function fromRpc(receipt) {
  *
  * 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) {
     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/dist/core/FrameReceipt.js.map

@@ -1 +1 @@
-{"version":3,"file":"FrameReceipt.js","sourceRoot":"","sources":["../../src/core/FrameReceipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAiClD,oCAAoC;AACpC,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,CAAC,EAAE,UAAU;IACb,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,SAAS;CACJ,CAAA;AAEV,oCAAoC;AACpC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,QAAQ,EAAE,CAAC;IACX,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACF,CAAA;AAEV;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,OAAO,CAAC,OAAY;IAClC,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC/C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;QAChD,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;KACtC,CAAA;AACH,CAAC;AAMD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,KAAK,CAAC,OAAoB;IACxC,OAAO;QACL,gBAAgB,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC;QACzD,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;QAC1D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAA;AACH,CAAC"}
+{"version":3,"file":"FrameReceipt.js","sourceRoot":"","sources":["../../src/core/FrameReceipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AA2ClD,oCAAoC;AACpC,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;CACR,CAAA;AAEV,oCAAoC;AACpC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;CACN,CAAA;AAEV;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,OAAO,CAAC,OAAY;IAClC,OAAO;QACL,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC;QACxD,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QACtC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;QAChD,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;KACtC,CAAA;AACH,CAAC;AAMD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,KAAK,CAAC,OAAoB;IACxC,OAAO;QACL,gBAAgB,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAClE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC;QAChD,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;QAC1D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAA;AACH,CAAC"}

package/dist/core/FrameRequest.d.ts

@@ -0,0 +1,50 @@
+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 declare function fromRpc(frame: Rpc): FrameRequest;
+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 declare function toRpc(frame: toRpc.Input): Rpc;
+export declare namespace toRpc {
+    type Input = Frame.toRpc.Input;
+    type ErrorType = Frame.toRpc.ErrorType;
+}
+//# sourceMappingURL=FrameRequest.d.ts.map

package/dist/core/FrameRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FrameRequest.d.ts","sourceRoot":"","sources":["../../src/core/FrameRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE7D,0EAA0E;AAC1E,MAAM,MAAM,YAAY,CAAC,UAAU,GAAG,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;AAEvE,mEAAmE;AACnE,MAAM,MAAM,GAAG,GAAG,OAAO,CACvB,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CACvD,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,YAAY,CAchD;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAA;CACzC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,GAAG,CAO7C;AAED,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC;IAC7B,KAAK,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAA;IAC9B,KAAK,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAA;CACvC"}