fix(tempo): derive multisig accounts with create2

Author: jxom

.changeset/slow-cats-create.md

@@ -0,0 +1,5 @@
+---
+"ox": patch
+---
+
+Updated Tempo multisig account derivation to use the canonical CREATE2 recovery address.

src/tempo/KeyAuthorization.test.ts

@@ -1112,17 +1112,17 @@ describe('getSignPayload', () => {
 describe('deserialize', () => {
   test('example: matches the frozen multisig witness vector', () => {
     const serialized =
-      '0xf8f1f85382107980941eff47bc3a10a45d4b230b5d10e37751fe6aa718808080a0535353535353535353535353535353535353535353535353535353535353535380949dba7f426b711d4893c11611eacf7cc334e7146bb89a05f897949dba7f426b711d4893c11611eacf7cc334e7146bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b8412cfed9350faf80e4115e3c4c967356b80a8e6ee42e4a49ab953c8c8a3537d8d8359bf035a9bea18f32b0da7129cdce3ce701abc09ad8919b93da21a0d57e21451b' as const
+      '0xf8f1f85382107980941eff47bc3a10a45d4b230b5d10e37751fe6aa718808080a053535353535353535353535353535353535353535353535353535353535353538094c4a590afa7337e5cd5eb3aa60cacf91c5400044bb89a05f89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b8412cfed9350faf80e4115e3c4c967356b80a8e6ee42e4a49ab953c8c8a3537d8d8359bf035a9bea18f32b0da7129cdce3ce701abc09ad8919b93da21a0d57e21451b' as const
     const authorization = KeyAuthorization.deserialize(serialized)
 
     expect(authorization).toMatchInlineSnapshot(`
       {
-        "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
+        "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
         "address": "0x1eff47bc3a10a45d4b230b5d10e37751fe6aa718",
         "chainId": 4217n,
         "isAdmin": false,
         "signature": {
-          "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
+          "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
           "config": {
             "owners": [
               {

src/tempo/MultisigConfig.test.ts

@@ -98,10 +98,11 @@ describe('fromRpc/toRpc', () => {
 })
 
 describe('getAddress', () => {
-  test('example: matches the frozen version-0 vector', () => {
+  test('example: matches the frozen CREATE2 vector', () => {
     expect(account).toMatchInlineSnapshot(
-      `"0x8820d1497eeaf4f68e00b2cfc00a2f3b1dbb00da"`,
+      `"0xf4b916c5aea0fb199bd942389be00db0690c961f"`,
     )
+    expect(account).not.toBe('0x8820d1497eeaf4f68e00b2cfc00a2f3b1dbb00da')
   })
 
   test('behavior: includes salt, threshold, and owners', () => {
@@ -114,7 +115,22 @@ describe('getAddress', () => {
         salt: `0x${'42'.repeat(32)}`,
         threshold: 2,
       }),
-    ).toMatchInlineSnapshot(`"0x0773e28146400643e42cb28f6659b74e7c0b451d"`)
+    ).toMatchInlineSnapshot(`"0x94040edd3d7b542e0a96e01141bc250d709b4469"`)
+  })
+
+  test('behavior: is stable and binds the salt', () => {
+    expect({
+      repeated: MultisigConfig.getAddress(config),
+      salted: MultisigConfig.getAddress({
+        ...config,
+        salt: `0x${'42'.repeat(32)}`,
+      }),
+    }).toMatchInlineSnapshot(`
+      {
+        "repeated": "0xf4b916c5aea0fb199bd942389be00db0690c961f",
+        "salted": "0x95e771f514fd6ac5b8bbd62a9b37db86eeed7e38",
+      }
+    `)
   })
 
   test('error: rejects a current configuration', () => {
@@ -151,7 +167,7 @@ describe('getSignPayload', () => {
     expect(
       MultisigConfig.getSignPayload({ account, config, payload }),
     ).toMatchInlineSnapshot(
-      `"0xbf944a7a752b2cfab0418d5fb4591c5a7ff62976488edce11794d7f35fb34f41"`,
+      `"0xdba6b49849aaef399fbc1de73fe26d520f21846c80c3e5d2486ad56e8df3cee3"`,
     )
   })
 
@@ -213,7 +229,7 @@ describe('assert/validate', () => {
       valid: MultisigConfig.validate(boundary),
     }).toMatchInlineSnapshot(`
       {
-        "account": "0x6c67c57e0eed05341137dbf88e4e7a90dc46ef50",
+        "account": "0xa832c9a61d254a157c05edcd856b2cbe4dea8c77",
         "commitment": "0x0dc47a7ab45ffa21a01bfd115427e26617b5a57d7ccbea57db2fd4537ba96f56",
         "rlpHash": "0xbaf0d030add91caaa10815d2e99c942f1e39b0d199216973781adb4fc1af6955",
         "rlpLength": 1145,

src/tempo/MultisigConfig.ts

@@ -1,5 +1,6 @@
 import * as Address from '../core/Address.js'
 import type * as Bytes from '../core/Bytes.js'
+import * as ContractAddress from '../core/ContractAddress.js'
 import * as Errors from '../core/Errors.js'
 import * as Hash from '../core/Hash.js'
 import * as Hex from '../core/Hex.js'
@@ -38,6 +39,13 @@ const accountDomain = 'tempo:multisig:account'
 /** Domain prefix for native multisig configuration commitments. */
 const configDomain = 'tempo:multisig:config'
 
+/** Canonical CREATE2 factory for multisig recovery wallets. */
+const recoveryFactory = '0x8a196A227C48Ae8A3E36EebD4E106675CC0f6E64'
+
+/** Keccak-256 of the canonical recovery wallet creation code. */
+const recoveryWalletInitCodeHash =
+  '0x4b5ff53c5328a10a6ec5224adf16de5e204a47057c98af037ee30b7de660a8a6'
+
 /** Domain prefix for native multisig owner approvals. */
 const signatureDomain = 'tempo:multisig:signature'
 
@@ -321,8 +329,9 @@ export function fromTuple(tuple: Tuple): Config {
 /**
  * Derives the stable native multisig account address.
  *
- * Preimage (fixed-width big-endian, **not** RLP):
- * `keccak256("tempo:multisig:account" || salt || u8(threshold) || u8(owners.length) || (owner || u8(weight)) for each owner)[12:32]`.
+ * The initial config is hashed into a CREATE2 salt using fixed-width
+ * big-endian fields, not RLP. The account uses the canonical recovery factory
+ * and wallet init-code hash.
  *
  * The address is derived once from the initial version-0 config. Config
  * updates do not change it.
@@ -353,7 +362,7 @@ export function getAddress(config: Input): Address.Address {
     throw new InvalidConfigError({
       reason: 'account address requires version zero',
     })
-  const hash = Hash.keccak256(
+  const accountSalt = Hash.keccak256(
     Hex.concat(
       Hex.fromString(accountDomain),
       Hex.padLeft(config.salt ?? zeroSalt, 32),
@@ -365,7 +374,11 @@ export function getAddress(config: Input): Address.Address {
       ]),
     ),
   )
-  const account = Address.from(Hex.slice(hash, 12, 32))
+  const account = ContractAddress.fromCreate2({
+    bytecodeHash: recoveryWalletInitCodeHash,
+    from: recoveryFactory,
+    salt: accountSalt,
+  })
   if (Hex.toBigInt(account) === 0n)
     throw new InvalidConfigError({ reason: 'derived account cannot be zero' })
   if (config.owners.some((owner) => Address.isEqual(owner.owner, account)))
@@ -378,12 +391,11 @@ export function getAddress(config: Input): Address.Address {
 export declare namespace getAddress {
   type ErrorType =
     | assert.ErrorType
-    | Address.from.ErrorType
+    | ContractAddress.fromCreate2.ErrorType
     | Hash.keccak256.ErrorType
     | Hex.concat.ErrorType
     | Hex.fromNumber.ErrorType
     | Hex.fromString.ErrorType
-    | Hex.slice.ErrorType
     | Errors.GlobalErrorType
 }