ox 1.8.1 → 1.8.4

package/src/core/_test/TransactionReceipt.test.ts

@@ -469,6 +469,7 @@ describe('frame receipts', () => {
       frameReceipts: [
         {
           executionGasUsed: '0x20000000000001',
+          gasUsed: '0x20000000000003',
           logs: [
             {
               address: '0x1111111111111111111111111111111111111111',
@@ -477,10 +478,22 @@ describe('frame receipts', () => {
             },
           ],
           stateGasUsed: '0x2',
-          status: 1,
+          status: '0x1',
+        },
+        {
+          executionGasUsed: '0x3',
+          gasUsed: '0x3',
+          logs: [],
+          stateGasUsed: '0x0',
+          status: '0x0',
+        },
+        {
+          executionGasUsed: '0x0',
+          gasUsed: '0x0',
+          logs: [],
+          stateGasUsed: '0x0',
+          status: '0x2',
         },
-        { executionGasUsed: '0x3', logs: [], stateGasUsed: '0x0', status: 0 },
-        { executionGasUsed: '0x0', logs: [], stateGasUsed: '0x0', status: 2 },
       ],
       from: '0x1111111111111111111111111111111111111111',
       gasUsed: '0x20000000000001',
@@ -498,13 +511,26 @@ describe('frame receipts', () => {
     expect(receipt.payer).toBe(rpc.payer)
     expect(receipt.frameReceipts).toEqual([
       {
-        gasUsed: 9007199254740993n,
+        executionGasUsed: 9007199254740993n,
+        gasUsed: 9007199254740995n,
         logs: rpc.frameReceipts[0]!.logs,
         stateGasUsed: 2n,
         status: 'success',
       },
-      { gasUsed: 3n, logs: [], stateGasUsed: 0n, status: 'reverted' },
-      { gasUsed: 0n, logs: [], stateGasUsed: 0n, status: 'skipped' },
+      {
+        executionGasUsed: 3n,
+        gasUsed: 3n,
+        logs: [],
+        stateGasUsed: 0n,
+        status: 'reverted',
+      },
+      {
+        executionGasUsed: 0n,
+        gasUsed: 0n,
+        logs: [],
+        stateGasUsed: 0n,
+        status: 'skipped',
+      },
     ])
     expect(TransactionReceipt.toRpc(receipt)).toMatchObject(rpc)
     expect(

package/src/core/_test/TransactionRequest.test-d.ts

@@ -139,7 +139,16 @@ describe('frame generics', () => {
 
   test('RPC types', () => {
     expectTypeOf<TransactionRequest.Rpc['frames']>().toEqualTypeOf<
-      readonly Frame.Rpc[] | undefined
+      | readonly {
+          mode: `0x${string}`
+          flags?: `0x${string}` | undefined
+          data?: `0x${string}` | undefined
+          executionGas?: `0x${string}` | undefined
+          stateGas?: `0x${string}` | undefined
+          target?: `0x${string}` | null | undefined
+          value?: `0x${string}` | undefined
+        }[]
+      | undefined
     >()
     expectTypeOf<TransactionRequest.Rpc['signatures']>().toEqualTypeOf<
       readonly FrameSignature.Rpc[] | undefined

package/src/core/_test/TransactionRequest.test.ts

@@ -13,6 +13,21 @@ import { kzg } from '../../../test/kzg.js'
 import { anvilMainnet } from '../../../test/prool.js'
 
 describe('toRpc', () => {
+  test('preserves nonce keys without type or frames', () => {
+    const request = { nonceKeys: [1n, 2n], nonce: 0n }
+    const rpc = TransactionRequest.toRpc(request)
+    expect(rpc).toMatchInlineSnapshot(`
+      {
+        "nonce": "0x0",
+        "nonceKeys": [
+          "0x1",
+          "0x2",
+        ],
+      }
+    `)
+    expect(TransactionRequest.fromRpc(rpc)).toEqual(request)
+  })
+
   test('default', () => {
     const request = TransactionRequest.toRpc({
       to: '0x0000000000000000000000000000000000000000',
@@ -439,6 +454,19 @@ test('exports', () => {
 })
 
 describe('frame transactions', () => {
+  test('requires frames when nonce keys select a frame envelope', () => {
+    expect(() =>
+      TransactionRequest.toEnvelope({
+        chainId: 1,
+        from: '0x1111111111111111111111111111111111111111',
+        nonceKeys: [1n],
+        nonce: 0n,
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      '[Quantity.MissingFieldError: Missing required field `frames` on `TransactionRequest`.]',
+    )
+  })
+
   test('derives frame blob sidecars and replaces stale hashes', () => {
     const blobs = Blobs.from('0xdeadbeef')
     const request = {
@@ -466,7 +494,7 @@ describe('frame transactions', () => {
   test('round-trips frame requests and envelopes', () => {
     const envelope = TxEnvelopeEip8141.from({
       chainId: 8141,
-      frames: [Frame.from({ gas: 50_000n, mode: 'verify' })],
+      frames: [Frame.from({ executionGas: 50_000n, mode: 'verify' })],
       sender: '0x1111111111111111111111111111111111111111',
       signatures: [FrameSignature.from('0xaabb')],
     })
@@ -474,8 +502,9 @@ describe('frame transactions', () => {
     const rpc = TransactionRequest.toRpc(request)
     expect(rpc.chainId).toBe('0x1fcd')
     expect(rpc.type).toBe('0x6')
+    expect(rpc.frames?.[0]?.executionGas).toBe('0xc350')
     expect(rpc.signatures).toEqual([
-      { msg: '0x', scheme: 0, signature: '0xaabb' },
+      { msg: '0x', scheme: '0x0', signature: '0xaabb' },
     ])
     const decoded = TransactionRequest.fromRpc(rpc)
     expect(decoded.chainId).toBe(8141)

package/src/core/_test/TxEnvelopeEip8141.test-d.ts

@@ -4,12 +4,12 @@ import { expectTypeOf, test } from 'vp/test'
 test('default', () => {
   const envelope = TxEnvelopeEip8141.from({
     chainId: 1,
-    frames: [{ gas: 50000n }],
+    frames: [{ executionGas: 50000n }],
     sender: '0x1111111111111111111111111111111111111111',
   })
   expectTypeOf(envelope).toEqualTypeOf<{
     readonly chainId: 1
-    readonly frames: readonly [{ readonly gas: 50000n }]
+    readonly frames: readonly [{ readonly executionGas: 50000n }]
     readonly sender: '0x1111111111111111111111111111111111111111'
     readonly type: 'eip8141'
   }>()
@@ -42,3 +42,30 @@ test('unsigned signature', () => {
   }>()
   expectTypeOf(envelope).toMatchTypeOf<TxEnvelopeEip8141.TxEnvelopeEip8141>()
 })
+
+test('keyed nonce literals and numberish RPC input', () => {
+  const envelope = TxEnvelopeEip8141.from({
+    chainId: 1,
+    frames: [{}],
+    sender: '0x1111111111111111111111111111111111111111',
+    nonceKeys: [1n, 2n],
+    nonce: 3n,
+  })
+  expectTypeOf(envelope.nonceKeys).toEqualTypeOf<readonly [1n, 2n]>()
+  expectTypeOf(envelope.nonce).toEqualTypeOf<3n>()
+  expectTypeOf(TxEnvelopeEip8141.toRpc(envelope).nonceKeys).toEqualTypeOf<
+    readonly `0x${string}`[] | undefined
+  >()
+  expectTypeOf(
+    TxEnvelopeEip8141.toRpc({
+      ...envelope,
+      nonceKeys: ['0x1', 2],
+      nonce: '0x3',
+    }),
+  ).toEqualTypeOf<TxEnvelopeEip8141.Rpc>()
+  // @ts-expect-error decoded nonce keys are bigint
+  TxEnvelopeEip8141.from({ ...envelope, nonceKeys: [1] })
+  expectTypeOf<keyof TxEnvelopeEip8141.Rpc>()
+    .exclude<'nonceSeq'>()
+    .toEqualTypeOf<keyof TxEnvelopeEip8141.Rpc>()
+})