ox 1.8.1 → 1.8.3

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

@@ -214,3 +214,48 @@ test('eth_call accepts a 4-tuple with state + block overrides', () => {
     ]
   >().toExtend<Params>()
 })
+
+test('frame fill responses do not require raw bytes or lookup metadata', () => {
+  type Filled = Extract<
+    RpcSchema.Eth,
+    { Request: { method: 'eth_fillTransaction' } }
+  >['ReturnType']
+  const filled = {
+    tx: {
+      type: '0x6',
+      chainId: '0x1',
+      nonce: '0x0',
+      from: '0x1111111111111111111111111111111111111111',
+      frames: [
+        {
+          mode: '0x2',
+          flags: '0x0',
+          executionGas: '0x10000',
+          stateGas: '0x0',
+          value: '0x0',
+          data: '0x',
+        },
+      ],
+      signatures: [{ scheme: '0x1' }],
+      maxFeePerGas: '0x2',
+      maxPriorityFeePerGas: '0x1',
+      maxFeePerBlobGas: '0x0',
+      blobVersionedHashes: [],
+    },
+  } as const satisfies Filled
+  expectTypeOf(filled).toExtend<Filled>()
+})
+
+test('frame simulation results expose payer and frame results', () => {
+  type Result = Extract<
+    RpcSchema.Eth,
+    { Request: { method: 'eth_simulateV1' } }
+  >['ReturnType'][number]
+  type Call = NonNullable<Result['calls']>[number]
+  expectTypeOf<Call['payer']>().toEqualTypeOf<`0x${string}` | undefined>()
+  type Frame = NonNullable<Call['frameResults']>[number]
+  expectTypeOf<Frame['status']>().toEqualTypeOf<'0x0' | '0x1' | '0x2'>()
+  expectTypeOf<Frame['executionGasUsed']>().toEqualTypeOf<`0x${string}`>()
+  expectTypeOf<Frame['stateGasUsed']>().toEqualTypeOf<`0x${string}`>()
+  expectTypeOf<Frame['returnData']>().toEqualTypeOf<`0x${string}`>()
+})

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

@@ -773,6 +773,153 @@ Resources:
   `)
   })
 
+  test('behavior: "Resources:" in statement', () => {
+    const message = `example.com wants you to sign in with your Ethereum account:
+0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+See the Resources: list below.
+
+URI: https://example.com/path
+Version: 1
+Chain ID: 1
+Nonce: foobarbaz
+Issued At: 2023-02-01T00:00:00.000Z
+Resources:
+- https://example.com/foo
+- https://example.com/bar`
+    const parsed = Siwe.parseMessage(message)
+    expect(parsed).toMatchInlineSnapshot(`
+      {
+        "address": "0xA0Cf798816D4b9b9866b5330EEa46a18382f251e",
+        "chainId": 1,
+        "domain": "example.com",
+        "issuedAt": 2023-02-01T00:00:00.000Z,
+        "nonce": "foobarbaz",
+        "resources": [
+          "https://example.com/foo",
+          "https://example.com/bar",
+        ],
+        "statement": "See the Resources: list below.",
+        "uri": "https://example.com/path",
+        "version": "1",
+      }
+    `)
+  })
+
+  test('behavior: "Resources:" in statement without resources', () => {
+    const message = `example.com wants you to sign in with your Ethereum account:
+0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+See the Resources: page.
+
+URI: https://example.com/path
+Version: 1
+Chain ID: 1
+Nonce: foobarbaz
+Issued At: 2023-02-01T00:00:00.000Z`
+    const parsed = Siwe.parseMessage(message)
+    expect(parsed.resources).toBeUndefined()
+  })
+
+  test('behavior: "Resources:" in uri', () => {
+    const message = `example.com wants you to sign in with your Ethereum account:
+0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+
+URI: https://example.com/Resources:path
+Version: 1
+Chain ID: 1
+Nonce: foobarbaz
+Issued At: 2023-02-01T00:00:00.000Z
+Resources:
+- https://example.com/foo`
+    const parsed = Siwe.parseMessage(message)
+    expect(parsed.resources).toMatchInlineSnapshot(`
+      [
+        "https://example.com/foo",
+      ]
+    `)
+  })
+
+  test('behavior: "Resources:" in requestId', () => {
+    const message = `example.com wants you to sign in with your Ethereum account:
+0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+
+URI: https://example.com/path
+Version: 1
+Chain ID: 1
+Nonce: foobarbaz
+Issued At: 2023-02-01T00:00:00.000Z
+Request ID: Resources:123
+Resources:
+- https://example.com/foo`
+    const parsed = Siwe.parseMessage(message)
+    expect(parsed.resources).toMatchInlineSnapshot(`
+      [
+        "https://example.com/foo",
+      ]
+    `)
+  })
+
+  test('behavior: "Resources:" in a resource', () => {
+    const message = `example.com wants you to sign in with your Ethereum account:
+0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+
+URI: https://example.com/path
+Version: 1
+Chain ID: 1
+Nonce: foobarbaz
+Issued At: 2023-02-01T00:00:00.000Z
+Resources:
+- https://example.com/Resources:foo
+- https://example.com/bar`
+    const parsed = Siwe.parseMessage(message)
+    expect(parsed.resources).toMatchInlineSnapshot(`
+      [
+        "https://example.com/Resources:foo",
+        "https://example.com/bar",
+      ]
+    `)
+  })
+
+  test('behavior: empty requestId with resources', () => {
+    // EIP-4361 allows an empty Request ID (`request-id = *pchar`).
+    const message = `example.com wants you to sign in with your Ethereum account:
+0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+
+URI: https://example.com/path
+Version: 1
+Chain ID: 1
+Nonce: foobarbaz
+Issued At: 2023-02-01T00:00:00.000Z
+Request ID: \nResources:
+- https://example.com/foo`
+    const parsed = Siwe.parseMessage(message)
+    expect(parsed.resources).toMatchInlineSnapshot(`
+      [
+        "https://example.com/foo",
+      ]
+    `)
+  })
+
+  test('behavior: empty resources', () => {
+    const message = Siwe.createMessage({
+      address: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
+      chainId: 1,
+      domain: 'example.com',
+      issuedAt: new Date('2023-02-01T00:00:00.000Z'),
+      nonce: 'foobarbaz',
+      resources: [],
+      statement: 'Resources:',
+      uri: 'https://example.com/path',
+      version: '1',
+    })
+    expect(Siwe.parseMessage(message).resources).toMatchInlineSnapshot('[]')
+  })
+
   test('behavior: no suffix', () => {
     const message = `https://example.com wants you to sign in with your Ethereum account:
 0xA0Cf798816D4b9b9866b5330EEa46a18382f251e

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

@@ -434,7 +434,7 @@ describe('toTransactionRequest', () => {
   test('maps frame sender to request from', () => {
     expect(TransactionEnvelope.toTransactionRequest(eip8141)).toEqual({
       chainId: 1,
-      frames: [{}],
+      frames: [{ executionGas: 0n, stateGas: 0n }],
       from: '0x1111111111111111111111111111111111111111',
       type: 'eip8141',
     })

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

@@ -466,7 +466,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 +474,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'
   }>()