ox 1.0.0-beta.21 → 1.0.0-beta.22

package/src/erc4337/_test/UserOperation.test.ts

@@ -215,6 +215,52 @@ describe('getSignPayload', () => {
 })
 
 describe('hash', () => {
+  describe('v0.9', () => {
+    const userOperation = {
+      callData: '0x',
+      callGasLimit: 6942069n,
+      maxFeePerGas: 69420n,
+      maxPriorityFeePerGas: 69n,
+      nonce: 0n,
+      paymaster: '0x1234567890123456789012345678901234567890',
+      paymasterData: '0xdeadbeef',
+      paymasterPostOpGasLimit: 6942069n,
+      paymasterVerificationGasLimit: 6942069n,
+      preVerificationGas: 6942069n,
+      sender: '0x1234567890123456789012345678901234567890',
+      signature: '0x',
+      verificationGasLimit: 6942069n,
+    } as const satisfies UserOperation.UserOperation<'0.9', true>
+
+    test('args: paymasterSignature', () => {
+      const options = {
+        chainId: 1,
+        entryPointAddress: '0x433709009B8330FDa32311DF1C2AFA402eD8D009',
+        entryPointVersion: '0.9',
+      } as const
+
+      expect(
+        UserOperation.hash(
+          { ...userOperation, paymasterSignature: '0xcafebabe' },
+          options,
+        ),
+      ).toMatchInlineSnapshot(
+        `"0x802c25af5d98cd349b2118227faa93172fb791c4130a482272095cec45c4fc6e"`,
+      )
+      expect(
+        UserOperation.hash(
+          { ...userOperation, paymasterSignature: '0xdeadbeef' },
+          options,
+        ),
+      ).toMatchInlineSnapshot(
+        `"0x802c25af5d98cd349b2118227faa93172fb791c4130a482272095cec45c4fc6e"`,
+      )
+      expect(UserOperation.hash(userOperation, options)).toMatchInlineSnapshot(
+        `"0xde381ae0368b77df677808c3a2da72abd68a07eab11ef31c35923f56a75bbe6d"`,
+      )
+    })
+  })
+
   describe('v0.8', () => {
     test('default', () => {
       expect(
@@ -818,6 +864,54 @@ describe('toPacked', () => {
       }
     `)
   })
+
+  describe('v0.9 paymasterSignature', () => {
+    const userOperation = {
+      callData: '0x',
+      callGasLimit: 6942069n,
+      maxFeePerGas: 69420n,
+      maxPriorityFeePerGas: 69n,
+      nonce: 0n,
+      paymaster: '0x1234567890123456789012345678901234567890',
+      paymasterData: '0xdeadbeef',
+      paymasterPostOpGasLimit: 6942069n,
+      paymasterSignature: '0xcafebabe',
+      paymasterVerificationGasLimit: 6942069n,
+      preVerificationGas: 6942069n,
+      sender: '0x1234567890123456789012345678901234567890',
+      signature: '0x',
+      verificationGasLimit: 6942069n,
+    } as const satisfies UserOperation.UserOperation<'0.9', true>
+
+    test('default', () => {
+      expect(
+        UserOperation.toPacked(userOperation).paymasterAndData,
+      ).toMatchInlineSnapshot(
+        `"0x12345678901234567890123456789012345678900000000000000000000000000069ed750000000000000000000000000069ed75deadbeefcafebabe000422e325a297439656"`,
+      )
+    })
+
+    test('options: forHash', () => {
+      expect(
+        UserOperation.toPacked(userOperation, { forHash: true })
+          .paymasterAndData,
+      ).toMatchInlineSnapshot(
+        `"0x12345678901234567890123456789012345678900000000000000000000000000069ed750000000000000000000000000069ed75deadbeef22e325a297439656"`,
+      )
+    })
+
+    test('encodes a uint16 signature length', () => {
+      const paymasterSignature = Hex.fromBytes(new Uint8Array(65).fill(0x11))
+      const paymasterAndData = UserOperation.toPacked({
+        ...userOperation,
+        paymasterSignature,
+      }).paymasterAndData
+
+      expect(
+        Hex.slice(paymasterAndData, Hex.size(paymasterAndData) - 10),
+      ).toMatchInlineSnapshot(`"0x004122e325a297439656"`)
+    })
+  })
 })
 
 describe('toInitCode', () => {
@@ -1170,6 +1264,96 @@ describe('toRpc', () => {
       }
     `)
   })
+
+  test('v0.6 preserves paymasterAndData', () => {
+    expect(
+      UserOperation.toRpc({
+        callData: '0x',
+        callGasLimit: 0n,
+        maxFeePerGas: 0n,
+        maxPriorityFeePerGas: 0n,
+        nonce: 0n,
+        paymasterAndData: '0x1234567890123456789012345678901234567890deadbeef',
+        preVerificationGas: 0n,
+        sender: '0x1234567890123456789012345678901234567890',
+        signature: '0x',
+        verificationGasLimit: 0n,
+      } satisfies UserOperation.UserOperation<'0.6', true>),
+    ).toMatchInlineSnapshot(`
+      {
+        "callData": "0x",
+        "callGasLimit": "0x0",
+        "maxFeePerGas": "0x0",
+        "maxPriorityFeePerGas": "0x0",
+        "nonce": "0x0",
+        "paymasterAndData": "0x1234567890123456789012345678901234567890deadbeef",
+        "preVerificationGas": "0x0",
+        "sender": "0x1234567890123456789012345678901234567890",
+        "signature": "0x",
+        "verificationGasLimit": "0x0",
+      }
+    `)
+  })
+
+  test('v0.6 preserves empty paymasterAndData', () => {
+    expect(
+      UserOperation.toRpc({
+        callData: '0x',
+        callGasLimit: 0n,
+        maxFeePerGas: 0n,
+        maxPriorityFeePerGas: 0n,
+        nonce: 0n,
+        paymasterAndData: '0x',
+        preVerificationGas: 0n,
+        sender: '0x1234567890123456789012345678901234567890',
+        signature: '0x',
+        verificationGasLimit: 0n,
+      } satisfies UserOperation.UserOperation<'0.6', true>),
+    ).toMatchInlineSnapshot(`
+      {
+        "callData": "0x",
+        "callGasLimit": "0x0",
+        "maxFeePerGas": "0x0",
+        "maxPriorityFeePerGas": "0x0",
+        "nonce": "0x0",
+        "paymasterAndData": "0x",
+        "preVerificationGas": "0x0",
+        "sender": "0x1234567890123456789012345678901234567890",
+        "signature": "0x",
+        "verificationGasLimit": "0x0",
+      }
+    `)
+  })
+
+  test('v0.9 preserves paymasterSignature', () => {
+    expect(
+      UserOperation.toRpc({
+        callData: '0x',
+        callGasLimit: 0n,
+        maxFeePerGas: 0n,
+        maxPriorityFeePerGas: 0n,
+        nonce: 0n,
+        paymasterSignature: '0xcafebabe',
+        preVerificationGas: 0n,
+        sender: '0x1234567890123456789012345678901234567890',
+        signature: '0x',
+        verificationGasLimit: 0n,
+      } satisfies UserOperation.UserOperation<'0.9', true>),
+    ).toMatchInlineSnapshot(`
+      {
+        "callData": "0x",
+        "callGasLimit": "0x0",
+        "maxFeePerGas": "0x0",
+        "maxPriorityFeePerGas": "0x0",
+        "nonce": "0x0",
+        "paymasterSignature": "0xcafebabe",
+        "preVerificationGas": "0x0",
+        "sender": "0x1234567890123456789012345678901234567890",
+        "signature": "0x",
+        "verificationGasLimit": "0x0",
+      }
+    `)
+  })
 })
 
 describe('toTypedData', () => {
@@ -1465,9 +1649,9 @@ describe('v0.8 authorization round-trip', () => {
     verificationGasLimit: 100_000n,
   } as const satisfies UserOperation.UserOperation<'0.8', true>
 
-  test('toRpc serializes authorization', () => {
+  test('toRpc serializes eip7702Auth', () => {
     const rpc = UserOperation.toRpc(userOperation) as UserOperation.Rpc<'0.8'>
-    expect(rpc.authorization).toMatchInlineSnapshot(`
+    expect(rpc.eip7702Auth).toMatchInlineSnapshot(`
       {
         "address": "0x1234567890123456789012345678901234567890",
         "chainId": "0x1",
@@ -1479,7 +1663,7 @@ describe('v0.8 authorization round-trip', () => {
     `)
   })
 
-  test('fromRpc parses authorization', () => {
+  test('fromRpc parses eip7702Auth', () => {
     const rpc = UserOperation.toRpc(userOperation) as UserOperation.Rpc<'0.8'>
     const parsed = UserOperation.fromRpc(rpc) as UserOperation.UserOperation<
       '0.8',
@@ -1494,9 +1678,41 @@ describe('v0.8 authorization round-trip', () => {
     expect(parsed).toEqual(userOperation)
   })
 
-  test('toRpc omits authorization when absent', () => {
+  test('toRpc omits eip7702Auth when absent', () => {
     const { authorization: _omit, ...rest } = userOperation
     const rpc = UserOperation.toRpc(rest)
-    expect('authorization' in rpc).toBe(false)
+    expect('eip7702Auth' in rpc).toBe(false)
+  })
+})
+
+describe('v0.9 RPC round-trip', () => {
+  test('preserves paymasterSignature and parses eip7702Auth', () => {
+    const userOperation = {
+      authorization: {
+        address: '0x1234567890123456789012345678901234567890',
+        chainId: 1,
+        nonce: 0n,
+        r: '0x0000000000000000000000000000000000000000000000000000000000000001',
+        s: '0x0000000000000000000000000000000000000000000000000000000000000002',
+        yParity: 0,
+      },
+      callData: '0x',
+      callGasLimit: 0n,
+      maxFeePerGas: 0n,
+      maxPriorityFeePerGas: 0n,
+      nonce: 0n,
+      paymasterSignature: '0xcafebabe',
+      preVerificationGas: 0n,
+      sender: '0x1234567890123456789012345678901234567890',
+      signature: '0x',
+      verificationGasLimit: 0n,
+    } as const satisfies UserOperation.UserOperation<'0.9', true>
+
+    const rpc = UserOperation.toRpc(userOperation)
+    const parsed = UserOperation.fromRpc(rpc)
+
+    expect(rpc).toHaveProperty('eip7702Auth')
+    expect(rpc).not.toHaveProperty('authorization')
+    expect(parsed).toEqual(userOperation)
   })
 })

package/src/erc4337/_test/UserOperationGas.test.ts

@@ -1,5 +1,5 @@
 import { UserOperationGas } from 'ox/erc4337'
-import { describe, expect, test } from 'vp/test'
+import { describe, expect, expectTypeOf, test } from 'vp/test'
 
 describe('fromRpc', () => {
   test('default', () => {
@@ -91,3 +91,32 @@ describe('v0.8', () => {
     expect(parsed).toEqual(v08)
   })
 })
+
+describe('v0.9', () => {
+  test('round-trips matching v0.8 shape', () => {
+    const v09 = {
+      callGasLimit: 300_000n,
+      paymasterPostOpGasLimit: 100_000n,
+      paymasterVerificationGasLimit: 100_000n,
+      preVerificationGas: 100_000n,
+      verificationGasLimit: 100_000n,
+    } as const satisfies UserOperationGas.UserOperationGas<'0.9'>
+
+    const rpc = UserOperationGas.toRpc<'0.9'>(v09)
+    const parsed = UserOperationGas.fromRpc<'0.9'>(rpc)
+
+    expectTypeOf(rpc).toEqualTypeOf<UserOperationGas.Rpc<'0.9'>>()
+    expectTypeOf(parsed).toEqualTypeOf<
+      UserOperationGas.UserOperationGas<'0.9'>
+    >()
+    expect(parsed).toMatchInlineSnapshot(`
+      {
+        "callGasLimit": 300000n,
+        "paymasterPostOpGasLimit": 100000n,
+        "paymasterVerificationGasLimit": 100000n,
+        "preVerificationGas": 100000n,
+        "verificationGasLimit": 100000n,
+      }
+    `)
+  })
+})

package/src/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '1.0.0-beta.21'
+export const version = '1.0.0-beta.22'