ox 1.8.10 → 1.8.12

package/src/core/Authorization.ts

@@ -179,7 +179,11 @@ export declare namespace from {
  */
 export function fromRpc(authorization: Rpc): Signed {
   const { address, chainId, nonce } = authorization
-  const signature = Signature.extract(authorization)!
+  // EIP-7702 permits any `y_parity` below 2**8 in an authorization tuple, so
+  // check `yParity` against one byte rather than against 0 or 1.
+  const signature = Signature.fromRpc(authorization)
+  Signature.assert({ r: signature.r, s: signature.s })
+  assertYParity(signature.yParity)
 
   return {
     address,
@@ -278,8 +282,18 @@ export function fromTuple<const tuple extends Tuple>(
     chainId: chainId === '0x' ? 0 : Number(chainId),
     nonce: nonce === '0x' ? 0n : BigInt(nonce),
   }
-  if (yParity && r && s)
-    args = { ...args, ...Signature.fromTuple([yParity, r, s]) }
+  if (yParity && r && s) {
+    // EIP-7702 permits any `y_parity` below 2**8 in an authorization tuple, so
+    // check `yParity` against one byte rather than against 0 or 1.
+    const signature = {
+      r: Hex.padLeft(r, 32),
+      s: Hex.padLeft(s, 32),
+      yParity: yParity === '0x' ? 0 : Number(yParity),
+    }
+    Signature.assert({ r: signature.r, s: signature.s })
+    assertYParity(signature.yParity)
+    args = { ...args, ...signature }
+  }
   return from(args) as never
 }
 
@@ -500,6 +514,7 @@ export declare namespace hash {
  */
 export function toRpc(authorization: toRpc.Input): Rpc {
   const { address, chainId, nonce, ...signature } = authorization
+  assertYParity(Number(signature.yParity))
 
   return {
     address,
@@ -576,13 +591,23 @@ export declare namespace toRpcList {
 export function toTuple<const authorization extends Authorization>(
   authorization: authorization,
 ): toTuple.ReturnType<authorization> {
-  const { address, chainId, nonce } = authorization
-  const signature = Signature.extract(authorization)
+  const { address, chainId, nonce, r, s, yParity } = authorization
+  const signature = Signature.extract({ r, s })
+  if (signature && typeof yParity !== 'undefined') assertYParity(yParity)
   return [
     chainId ? Hex.fromNumber(chainId) : '0x',
     address,
     nonce ? Hex.fromNumber(nonce) : '0x',
-    ...(signature ? Signature.toTuple(signature) : []),
+    // EIP-7702 permits any `y_parity` below 2**8 in an authorization tuple, and a
+    // tuple that fails recovery does not invalidate the transaction. Encode
+    // `yParity` as is, so that serialization preserves the transaction hash.
+    ...(signature
+      ? [
+          yParity ? Hex.fromNumber(yParity, { size: 1 }) : '0x',
+          Hex.trimLeft(signature.r),
+          Hex.trimLeft(signature.s),
+        ]
+      : []),
   ] as never
 }
 
@@ -656,3 +681,15 @@ export declare namespace toTupleList {
 
   type ErrorType = Errors.GlobalErrorType
 }
+
+// Asserts that an EIP-7702 authorization `yParity` fits in one byte.
+function assertYParity(yParity: number) {
+  if (Number.isInteger(yParity) && yParity >= 0 && yParity < 256) return
+  throw new Hex.IntegerOutOfRangeError({
+    max: '255',
+    min: '0',
+    signed: false,
+    size: 1,
+    value: `${yParity}`,
+  })
+}

package/src/core/Siwe.ts

@@ -4,7 +4,7 @@ import * as Hex from './Hex.js'
 import type { ExactPartial } from './internal/types.js'
 
 export const domainRegex =
-  /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:[0-9]{1,5})?$/
+  /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+(?:[a-zA-Z]{2,63}|[xX][nN]--[a-zA-Z0-9-]{0,58}[a-zA-Z0-9])(:[0-9]{1,5})?$/
 
 export const ipRegex =
   /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:[0-9]{1,5})?$/

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

@@ -151,6 +151,43 @@ describe('fromRpc', () => {
       }
     `)
   })
+
+  test('behavior: yParity above 1', () => {
+    expect(
+      Authorization.fromRpc({
+        address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+        chainId: '0x0',
+        nonce: '0x6',
+        r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+        s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+        yParity: '0x1c',
+      }),
+    ).toMatchInlineSnapshot(`
+      {
+        "address": "0xc498cea4bfedbb8de856491bdd9967e677775f4f",
+        "chainId": 0,
+        "nonce": 6n,
+        "r": "0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512",
+        "s": "0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191",
+        "yParity": 28,
+      }
+    `)
+  })
+
+  test('error: yParity above 2**8 - 1', () => {
+    expect(() =>
+      Authorization.fromRpc({
+        address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+        chainId: '0x0',
+        nonce: '0x6',
+        r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+        s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+        yParity: '0x100',
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[Hex.IntegerOutOfRangeError: Number \`256\` is not in safe 8-bit unsigned integer range (\`0\` to \`255\`)]`,
+    )
+  })
 })
 
 describe('fromRpcList', () => {
@@ -251,6 +288,44 @@ describe('fromTuple', () => {
       }
     `)
   })
+
+  test('behavior: yParity above 1', () => {
+    const tuple = [
+      '0x',
+      '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+      '0x06',
+      '0x1c',
+      '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+      '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+    ] as const satisfies Authorization.Tuple
+    const authorization = Authorization.fromTuple(tuple)
+    expect(authorization).toMatchInlineSnapshot(`
+      {
+        "address": "0xc498cea4bfedbb8de856491bdd9967e677775f4f",
+        "chainId": 0,
+        "nonce": 6n,
+        "r": "0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512",
+        "s": "0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191",
+        "yParity": 28,
+      }
+    `)
+  })
+
+  test('error: yParity above 2**8 - 1', () => {
+    const tuple = [
+      '0x',
+      '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+      '0x06',
+      '0x0100',
+      '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+      '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+    ] as const satisfies Authorization.Tuple
+    expect(() =>
+      Authorization.fromTuple(tuple),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[Hex.IntegerOutOfRangeError: Number \`256\` is not in safe 8-bit unsigned integer range (\`0\` to \`255\`)]`,
+    )
+  })
 })
 
 describe('fromTupleList', () => {
@@ -454,6 +529,43 @@ describe('toRpc', () => {
     expect(fromBigint).toEqual(fromNumber)
     expect(fromBigint).toEqual(fromHex)
   })
+
+  test('behavior: yParity above 1', () => {
+    expect(
+      Authorization.toRpc({
+        address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+        chainId: 0,
+        nonce: 6n,
+        r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+        s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+        yParity: 28,
+      }),
+    ).toMatchInlineSnapshot(`
+      {
+        "address": "0xc498cea4bfedbb8de856491bdd9967e677775f4f",
+        "chainId": "0x0",
+        "nonce": "0x6",
+        "r": "0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512",
+        "s": "0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191",
+        "yParity": "0x1c",
+      }
+    `)
+  })
+
+  test('error: yParity above 2**8 - 1', () => {
+    expect(() =>
+      Authorization.toRpc({
+        address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+        chainId: 0,
+        nonce: 6n,
+        r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+        s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+        yParity: 256,
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[Hex.IntegerOutOfRangeError: Number \`256\` is not in safe 8-bit unsigned integer range (\`0\` to \`255\`)]`,
+    )
+  })
 })
 
 describe('toRpcList', () => {
@@ -540,6 +652,60 @@ describe('toTuple', () => {
     `)
     }
   })
+
+  test('behavior: yParity above 1', () => {
+    const authorization = Authorization.from({
+      address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+      chainId: 0,
+      nonce: 6n,
+      r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+      s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+      yParity: 28,
+    })
+    const tuple = Authorization.toTuple(authorization)
+    expect(tuple).toMatchInlineSnapshot(`
+      [
+        "0x",
+        "0xc498cea4bfedbb8de856491bdd9967e677775f4f",
+        "0x6",
+        "0x1c",
+        "0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512",
+        "0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191",
+      ]
+    `)
+  })
+
+  test('error: yParity above 2**8 - 1', () => {
+    const authorization = Authorization.from({
+      address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+      chainId: 0,
+      nonce: 6n,
+      r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+      s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+      yParity: 256,
+    })
+    expect(() =>
+      Authorization.toTuple(authorization),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[Hex.IntegerOutOfRangeError: Number \`256\` is not in safe 8-bit unsigned integer range (\`0\` to \`255\`)]`,
+    )
+  })
+
+  test('error: yParity not an integer', () => {
+    const authorization = Authorization.from({
+      address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+      chainId: 0,
+      nonce: 6n,
+      r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+      s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+      yParity: Number.NaN,
+    })
+    expect(() =>
+      Authorization.toTuple(authorization),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[Hex.IntegerOutOfRangeError: Number \`NaN\` is not in safe 8-bit unsigned integer range (\`0\` to \`255\`)]`,
+    )
+  })
 })
 
 describe('toTupleList', () => {

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

@@ -61,6 +61,40 @@ describe('createMessage', () => {
     0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
 
 
+    URI: https://example.com/path
+    Version: 1
+    Chain ID: 1
+    Nonce: foobarbaz
+    Issued At: 2023-02-01T00:00:00.000Z"
+  `)
+
+    expect(
+      Siwe.createMessage({
+        ...message,
+        domain: 'example.xn--p1ai',
+      }),
+    ).toMatchInlineSnapshot(`
+    "example.xn--p1ai 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"
+  `)
+
+    expect(
+      Siwe.createMessage({
+        ...message,
+        domain: 'example.XN--P1AI',
+      }),
+    ).toMatchInlineSnapshot(`
+    "example.XN--P1AI wants you to sign in with your Ethereum account:
+    0xA0Cf798816D4b9b9866b5330EEa46a18382f251e
+
+
     URI: https://example.com/path
     Version: 1
     Chain ID: 1
@@ -431,6 +465,12 @@ describe('createMessage', () => {
     'example.com:3000',
     'localhost:3000',
     '127.0.0.1:3000',
+    'example.xN--p1ai',
+    'example.xn--p1ai:443',
+    'example.xn--vermgensberater-ctb',
+    // 63 octets: "xn--" plus 59 LDH characters.
+    `example.xn--${'a'.repeat(59)}`,
+    `example.${'a'.repeat(63)}`,
   ])('valid domain `%s`', (domain) => {
     expect(
       Siwe.createMessage({
@@ -449,6 +489,13 @@ describe('createMessage', () => {
     'http://127.0.0.1:3000',
     'foobarbaz',
     '-example.com',
+    'example.xn--',
+    'example.xn--p1ai-',
+    'example.xx--p1ai',
+    'xn--p1ai',
+    // 64 octets: one past the maximum label length.
+    `example.xn--${'a'.repeat(60)}`,
+    `example.${'a'.repeat(64)}`,
   ])('invalid domain `%s`', (domain) => {
     expect(() =>
       Siwe.createMessage({
@@ -459,6 +506,12 @@ describe('createMessage', () => {
   })
 })
 
+describe('domainRegex', () => {
+  test('behavior: captures the port in group 3', () => {
+    expect(Siwe.domainRegex.exec('example.xn--p1ai:443')?.[3]).toBe(':443')
+  })
+})
+
 describe('generateNonce', () => {
   test('default', () => {
     const nonce = Siwe.generateNonce()

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

@@ -181,6 +181,40 @@ describe('deserialize', () => {
     })
   })
 
+  test('behavior: authorization yParity above 1', () => {
+    // Mainnet transaction 0xaec8420968abd74e70ef5b3099d6ba7baa3f069c4f718d7c4d729d591cffcb09,
+    // whose authorization holds a `y_parity` of 28.
+    const serialized =
+      '0x04f8c90102843b9aca0084408206be830186a094db35624115a810cf541988294a57766cd02acc828080c0f85cf85a8094c498cea4bfedbb8de856491bdd9967e677775f4f061ca044754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512a027a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b19180a0287d894b2ebb8a178a55810b242af186c73de663382358363d58b42628bbded3a0678f589cd41571248f24df7e60912d05f14c76471b859f4abd956c612bf175ee'
+
+    const envelope = TxEnvelopeEip7702.deserialize(serialized)
+    expect(envelope).toMatchInlineSnapshot(`
+      {
+        "authorizationList": [
+          {
+            "address": "0xc498cea4bfedbb8de856491bdd9967e677775f4f",
+            "chainId": 0,
+            "nonce": 6n,
+            "r": "0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512",
+            "s": "0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191",
+            "yParity": 28,
+          },
+        ],
+        "chainId": 1,
+        "gas": 100000n,
+        "maxFeePerGas": 1082263230n,
+        "maxPriorityFeePerGas": 1000000000n,
+        "nonce": 2n,
+        "r": "0x287d894b2ebb8a178a55810b242af186c73de663382358363d58b42628bbded3",
+        "s": "0x678f589cd41571248f24df7e60912d05f14c76471b859f4abd956c612bf175ee",
+        "to": "0xdb35624115a810cf541988294a57766cd02acc82",
+        "type": "eip7702",
+        "yParity": 0,
+      }
+    `)
+    expect(TxEnvelopeEip7702.serialize(envelope)).toBe(serialized)
+  })
+
   describe('raw', () => {
     test('default', () => {
       const serialized = `0x04${Rlp.fromHex([
@@ -529,6 +563,38 @@ describe('hash', () => {
       `"0xa5ccd813e459b9154917af19270091cf3312bd759af08e0e18cd2560ef586cf4"`,
     )
   })
+
+  test('behavior: authorization yParity above 1', () => {
+    // Mainnet transaction 0xaec8420968abd74e70ef5b3099d6ba7baa3f069c4f718d7c4d729d591cffcb09,
+    // whose authorization holds a `y_parity` of 28.
+    const envelope = TxEnvelopeEip7702.from({
+      authorizationList: [
+        {
+          address: '0xc498cea4bfedbb8de856491bdd9967e677775f4f',
+          chainId: 0,
+          nonce: 6n,
+          r: '0x44754b7f217808e21f1935cfa450380e17a3ab8f2c6996c0190d678f0c14a512',
+          s: '0x27a6b869798cbbbd8d538dbc95b9bb28783bf08f8ef88ad6bb82552d0b47b191',
+          yParity: 28,
+        },
+      ],
+      chainId: 1,
+      gas: 100000n,
+      maxFeePerGas: 1082263230n,
+      maxPriorityFeePerGas: 1000000000n,
+      nonce: 2n,
+      r: '0x287d894b2ebb8a178a55810b242af186c73de663382358363d58b42628bbded3',
+      s: '0x678f589cd41571248f24df7e60912d05f14c76471b859f4abd956c612bf175ee',
+      to: '0xdb35624115a810cf541988294a57766cd02acc82',
+      value: 0n,
+      yParity: 0,
+    })
+
+    const hash = TxEnvelopeEip7702.hash(envelope)
+    expect(hash).toMatchInlineSnapshot(
+      `"0xaec8420968abd74e70ef5b3099d6ba7baa3f069c4f718d7c4d729d591cffcb09"`,
+    )
+  })
 })
 
 describe('serialize', () => {

package/src/tempo/AccountConfig.test.ts

@@ -1,4 +1,3 @@
-import { factory } from '../../test/tempo/configurableAccounts.js'
 import { Hash, Hex, Rlp } from 'ox'
 import { AccountConfig } from 'ox/tempo'
 import { describe, expect, test } from 'vp/test'
@@ -10,13 +9,12 @@ const config = AccountConfig.from({
   owners: [{ owner: owner_1, weight: 1 }],
   threshold: 1,
 })
-const account = AccountConfig.getAddress(config, { factory })
+const account = AccountConfig.getAddress(config)
 
 // Vectors from Tempo `crates/primitives/tests/configurable_account.rs`
 // (`configurable_account_hashes_follow_vectors_and_documented_layout`).
 const tempo = {
   account: '0x91847576f406d0842ad7c1a0c97c22a122e64278',
-  factory: '0x9999999999999999999999999999999999999999',
 } as const
 
 describe('from', () => {
@@ -180,78 +178,67 @@ describe('fromUpgrade', () => {
 describe('getAddress', () => {
   test('example: matches the Tempo vectors', () => {
     expect({
-      maxOwners: AccountConfig.getAddress(
-        {
-          owners: Array.from({ length: AccountConfig.maxOwners }, (_, i) => ({
-            owner: Hex.padLeft(Hex.fromNumber(i + 1), 20),
-            weight: 1,
-          })),
-          threshold: 8,
-        },
-        { factory: tempo.factory },
-      ),
-      single: AccountConfig.getAddress(config, { factory: tempo.factory }),
+      maxOwners: AccountConfig.getAddress({
+        owners: Array.from({ length: AccountConfig.maxOwners }, (_, i) => ({
+          owner: Hex.padLeft(Hex.fromNumber(i + 1), 20),
+          weight: 1,
+        })),
+        threshold: 8,
+      }),
+      single: AccountConfig.getAddress(config),
     }).toMatchInlineSnapshot(`
       {
-        "maxOwners": "0x7a4279bb3f1b8b54d703484317f64eae6814e827",
-        "single": "0x87c346a9029d675f296db533b12e146439cf20d5",
+        "maxOwners": "0x9859f0316567499ebcd81d3417c0622999d7179f",
+        "single": "0xcbb727e2489c904a905420e794e8275b6150bfe1",
       }
     `)
   })
 
-  test('example: matches the frozen CREATE2 vector', () => {
+  test('example: matches the frozen keccak vector', () => {
     expect(account).toMatchInlineSnapshot(
-      `"0x2318ebe50d1d476ec10854bfd949f96ea7737b68"`,
+      `"0xcbb727e2489c904a905420e794e8275b6150bfe1"`,
     )
     expect(account).not.toBe('0x8820d1497eeaf4f68e00b2cfc00a2f3b1dbb00da')
   })
 
   test('behavior: includes salt, threshold, and owners', () => {
     expect(
-      AccountConfig.getAddress(
-        {
-          owners: [
-            { owner: owner_1, weight: 1 },
-            { owner: owner_2, weight: 2 },
-          ],
-          salt: `0x${'42'.repeat(32)}`,
-          threshold: 2,
-        },
-        { factory },
-      ),
-    ).toMatchInlineSnapshot(`"0x1baa996a4f142d99999aa22f1cb1eb97eed2a24a"`)
+      AccountConfig.getAddress({
+        owners: [
+          { owner: owner_1, weight: 1 },
+          { owner: owner_2, weight: 2 },
+        ],
+        salt: `0x${'42'.repeat(32)}`,
+        threshold: 2,
+      }),
+    ).toMatchInlineSnapshot(`"0x870b14ffcb3d1bd52be7cc6e8358a35712fec535"`)
   })
 
   test('behavior: is stable and binds the salt', () => {
     expect({
-      repeated: AccountConfig.getAddress(config, { factory }),
-      salted: AccountConfig.getAddress(
-        {
-          ...config,
-          salt: `0x${'42'.repeat(32)}`,
-        },
-        { factory },
-      ),
+      repeated: AccountConfig.getAddress(config),
+      salted: AccountConfig.getAddress({
+        ...config,
+        salt: `0x${'42'.repeat(32)}`,
+      }),
     }).toMatchInlineSnapshot(`
       {
-        "repeated": "0x2318ebe50d1d476ec10854bfd949f96ea7737b68",
-        "salted": "0x70d2e44032514493b68641ce5182cc878baa51f0",
+        "repeated": "0xcbb727e2489c904a905420e794e8275b6150bfe1",
+        "salted": "0xfc6a724c4715d331ec47dc8c1636798956fd3e4d",
       }
     `)
   })
 
   test('error: rejects a current configuration', () => {
     expect(() =>
-      AccountConfig.getAddress({ ...config, version: 1n }, { factory }),
+      AccountConfig.getAddress({ ...config, version: 1n }),
     ).toThrowErrorMatchingInlineSnapshot(
       `[AccountConfig.InvalidConfigError: Invalid account config: account address requires version zero.]`,
     )
   })
 
   test('behavior: accepts numeric zero for an initial configuration', () => {
-    expect(
-      AccountConfig.getAddress({ ...config, version: 0 }, { factory }),
-    ).toBe(account)
+    expect(AccountConfig.getAddress({ ...config, version: 0 })).toBe(account)
   })
 })
 
@@ -308,7 +295,7 @@ describe('getSignPayload', () => {
     expect(
       AccountConfig.getSignPayload({ account, config, payload }),
     ).toMatchInlineSnapshot(
-      `"0x32144254ec42f7a37b97e3a843667b527479f933320be553265e6594dc44ea87"`,
+      `"0x53a60618dd8fd4d01c2c94a4d9dc482dbb7b97115eb448a4590d153b933e549a"`,
     )
   })
 
@@ -449,14 +436,14 @@ describe('assert/validate', () => {
     })
     const rlp = Rlp.fromHex(AccountConfig.toTuple(boundary))
     expect({
-      account: AccountConfig.getAddress(boundary, { factory }),
+      account: AccountConfig.getAddress(boundary),
       commitment: AccountConfig.getCommitment(boundary),
       rlpHash: Hash.keccak256(rlp),
       rlpLength: Hex.size(rlp),
       valid: AccountConfig.validate(boundary),
     }).toMatchInlineSnapshot(`
       {
-        "account": "0x8400988285be93cba9391d445e473601633e5d62",
+        "account": "0x9859f0316567499ebcd81d3417c0622999d7179f",
         "commitment": "0xa9282ca5b73ac63b7e27f49cafa6ab13bd2aa79fc45267cf27342db73150cd46",
         "rlpHash": "0xbaf0d030add91caaa10815d2e99c942f1e39b0d199216973781adb4fc1af6955",
         "rlpLength": 1145,