ox 0.14.56 → 0.14.57

package/tempo/AccountConfig.test.ts

@@ -12,6 +12,13 @@ const config = AccountConfig.from({
 })
 const account = AccountConfig.getAddress(config, { factory })
 
+// 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', () => {
   test('behavior: normalizes an initial configuration', () => {
     expect(
@@ -99,10 +106,103 @@ describe('fromRpc/toRpc', () => {
   })
 })
 
+describe('fromUpgrade', () => {
+  const root = '0x3333333333333333333333333333333333333333'
+
+  test('example: derives the migrated config', () => {
+    // The root key may also be listed as an owner.
+    const config = AccountConfig.fromUpgrade(root, {
+      owners: [
+        { owner: root, weight: 1 },
+        { owner: owner_1, weight: 1 },
+      ],
+      threshold: 2,
+    })
+    expect({
+      commitment: AccountConfig.getCommitment(config),
+      config,
+    }).toMatchInlineSnapshot(`
+      {
+        "commitment": "0xabca6d8f3a14b99ecaef378042e6a2ffa4f231125517e073cfbd3bcd69ac6ea1",
+        "config": {
+          "owners": [
+            {
+              "owner": "0x1111111111111111111111111111111111111111",
+              "weight": 1,
+            },
+            {
+              "owner": "0x3333333333333333333333333333333333333333",
+              "weight": 1,
+            },
+          ],
+          "salt": "0x42b3dad8fa6c40b50e6dbbbdaaace72d6c04250c16c1e263a52355983a30eb56",
+          "threshold": 2,
+          "version": 1n,
+        },
+      }
+    `)
+  })
+
+  test('behavior: binds the salt to the account', () => {
+    const options = {
+      owners: [{ owner: owner_1, weight: 1 }],
+      threshold: 1,
+    } as const
+    expect(AccountConfig.fromUpgrade(root, options).salt).not.toBe(
+      AccountConfig.fromUpgrade(owner_2, options).salt,
+    )
+  })
+
+  test('error: rejects an invalid account', () => {
+    expect(() =>
+      AccountConfig.fromUpgrade('0x1234', {
+        owners: [{ owner: owner_1, weight: 1 }],
+        threshold: 1,
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(`
+      [Address.InvalidAddressError: Address "0x1234" is invalid.
+
+      Details: Address is not a 20 byte (40 hexadecimal character) value.]
+    `)
+  })
+
+  test('error: rejects an invalid config', () => {
+    expect(() =>
+      AccountConfig.fromUpgrade(root, {
+        owners: [{ owner: owner_1, weight: 1 }],
+        threshold: 2,
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[AccountConfig.InvalidConfigError: Invalid account config: threshold exceeds total owner weight.]`,
+    )
+  })
+})
+
 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 }),
+    }).toMatchInlineSnapshot(`
+      {
+        "maxOwners": "0x7a4279bb3f1b8b54d703484317f64eae6814e827",
+        "single": "0x87c346a9029d675f296db533b12e146439cf20d5",
+      }
+    `)
+  })
+
   test('example: matches the frozen CREATE2 vector', () => {
     expect(account).toMatchInlineSnapshot(
-      `"0x90ba71cb7534da990a1182cf28c9bf415055e03d"`,
+      `"0x2318ebe50d1d476ec10854bfd949f96ea7737b68"`,
     )
     expect(account).not.toBe('0x8820d1497eeaf4f68e00b2cfc00a2f3b1dbb00da')
   })
@@ -120,7 +220,7 @@ describe('getAddress', () => {
         },
         { factory },
       ),
-    ).toMatchInlineSnapshot(`"0x7898a7d1dd96946d2a968de1540ca884a244320c"`)
+    ).toMatchInlineSnapshot(`"0x1baa996a4f142d99999aa22f1cb1eb97eed2a24a"`)
   })
 
   test('behavior: is stable and binds the salt', () => {
@@ -135,8 +235,8 @@ describe('getAddress', () => {
       ),
     }).toMatchInlineSnapshot(`
       {
-        "repeated": "0x90ba71cb7534da990a1182cf28c9bf415055e03d",
-        "salted": "0xa1a8472f4a01772db729d8ebc73fe46120750b83",
+        "repeated": "0x2318ebe50d1d476ec10854bfd949f96ea7737b68",
+        "salted": "0x70d2e44032514493b68641ce5182cc878baa51f0",
       }
     `)
   })
@@ -157,6 +257,18 @@ describe('getAddress', () => {
 })
 
 describe('getCommitment', () => {
+  test('example: matches the Tempo vectors', () => {
+    expect({
+      current: AccountConfig.getCommitment({ ...config, version: 1n }),
+      initial: AccountConfig.getCommitment(config),
+    }).toMatchInlineSnapshot(`
+      {
+        "current": "0xee570a0f26f17b41cdf0952a04ee01ea23495b0c0a59f9c904b0d60cb76453c3",
+        "initial": "0x79cc3a5fcbe18cb8cbbd2b41393750ccf3bbc20533a846755767fa10068ae01d",
+      }
+    `)
+  })
+
   test('example: matches the frozen initial and current vectors', () => {
     expect({
       current: AccountConfig.getCommitment({ ...config, version: 1n }),
@@ -164,20 +276,40 @@ describe('getCommitment', () => {
       initial: AccountConfig.getCommitment(config),
     }).toMatchInlineSnapshot(`
       {
-        "current": "0x6237ca5930f2265d4fb70a0305dd6ceea4df227053b4a62c304489ede946a2f8",
-        "currentNumber": "0x6237ca5930f2265d4fb70a0305dd6ceea4df227053b4a62c304489ede946a2f8",
-        "initial": "0xa9e7d1e2ad25e227a4de5f38f3bba31d854ffc8efec46aaa8649097a516bb4ee",
+        "current": "0xee570a0f26f17b41cdf0952a04ee01ea23495b0c0a59f9c904b0d60cb76453c3",
+        "currentNumber": "0xee570a0f26f17b41cdf0952a04ee01ea23495b0c0a59f9c904b0d60cb76453c3",
+        "initial": "0x79cc3a5fcbe18cb8cbbd2b41393750ccf3bbc20533a846755767fa10068ae01d",
       }
     `)
   })
 })
 
 describe('getSignPayload', () => {
+  test('example: matches the Tempo vectors', () => {
+    expect({
+      current: AccountConfig.getSignPayload({
+        account: tempo.account,
+        config: { version: 1n },
+        payload,
+      }),
+      initial: AccountConfig.getSignPayload({
+        account: tempo.account,
+        config,
+        payload,
+      }),
+    }).toMatchInlineSnapshot(`
+      {
+        "current": "0x285c850cb2803beb10f2f212dac73784a1a03b3991ba79081b24bfa91beb9182",
+        "initial": "0xe6fa513b5ab32da6f116443f13191096bce77b4850f4d51f3aa436fa7650c964",
+      }
+    `)
+  })
+
   test('example: matches the frozen version-0 vector', () => {
     expect(
       AccountConfig.getSignPayload({ account, config, payload }),
     ).toMatchInlineSnapshot(
-      `"0x728efe90611b01c91c2be0da56e7eb8e0d2c274c84f97182e274187dde0b8a20"`,
+      `"0x32144254ec42f7a37b97e3a843667b527479f933320be553265e6594dc44ea87"`,
     )
   })
 
@@ -325,8 +457,8 @@ describe('assert/validate', () => {
       valid: AccountConfig.validate(boundary),
     }).toMatchInlineSnapshot(`
       {
-        "account": "0x6acb25715a2b0cf05c098f753a87d9b38471e99f",
-        "commitment": "0x0dc47a7ab45ffa21a01bfd115427e26617b5a57d7ccbea57db2fd4537ba96f56",
+        "account": "0x8400988285be93cba9391d445e473601633e5d62",
+        "commitment": "0xa9282ca5b73ac63b7e27f49cafa6ab13bd2aa79fc45267cf27342db73150cd46",
         "rlpHash": "0xbaf0d030add91caaa10815d2e99c942f1e39b0d199216973781adb4fc1af6955",
         "rlpLength": 1145,
         "valid": true,
@@ -496,6 +628,7 @@ test('exports', () => {
       "from",
       "fromRpc",
       "fromTuple",
+      "fromUpgrade",
       "getAddress",
       "getCommitment",
       "getSignPayload",

package/tempo/AccountConfig.ts

@@ -33,17 +33,25 @@ export const signatureTypeByte = '0x05' as const
 export const zeroSalt = `0x${'00'.repeat(32)}` as const
 
 /** Domain prefix for the configurable account address derivation. */
-const accountDomain = 'tempo:multisig:account'
+const accountDomain = 'tempo:configurable-account:account'
 
 /** Domain prefix for account configuration commitments. */
-const configDomain = 'tempo:multisig:config'
+const configDomain = 'tempo:configurable-account:config'
 
-/** Keccak-256 of the canonical recovery wallet creation code. */
-const recoveryWalletInitCodeHash =
+/**
+ * Keccak-256 of the account proxy creation code.
+ *
+ * Placeholder until [TIP-1110](https://tips.sh/1110) fixes the canonical
+ * account proxy, which will change every derived address.
+ */
+const accountProxyInitCodeHash =
   '0x583cc63a2e37f645b43eac911b1a6d6de08b83abdc308c61364edda8cfc3bd37'
 
 /** Domain prefix for configurable account owner approvals. */
-const signatureDomain = 'tempo:multisig:signature'
+const signatureDomain = 'tempo:configurable-account:signature'
+
+/** Domain prefix for the salt of an account migrated in place. */
+const upgradeDomain = 'tempo:configurable-account:upgrade'
 
 /**
  * Complete account configuration witness.
@@ -335,12 +343,75 @@ export function fromTuple(tuple: Tuple): Config {
   return config
 }
 
+/**
+ * Derives the configuration an existing account installs when it migrates in
+ * place with the `upgradeAccount` precompile call
+ * ([TIP-1113](https://tips.sh/1113)).
+ *
+ * The account keeps its address. Its salt is
+ * `keccak256("tempo:configurable-account:upgrade" || account)` and its version
+ * is `1n`. Owners are sorted into canonical order and the config is validated.
+ * The account itself may be listed as an owner.
+ *
+ * @example
+ * ```ts twoslash
+ * import { AccountConfig } from 'ox/tempo'
+ *
+ * const config = AccountConfig.fromUpgrade(
+ *   '0x3333333333333333333333333333333333333333',
+ *   {
+ *     owners: [
+ *       {
+ *         owner: '0x1111111111111111111111111111111111111111',
+ *         weight: 1
+ *       }
+ *     ],
+ *     threshold: 1
+ *   }
+ * )
+ * // config.version === 1n
+ * ```
+ *
+ * @param account - The account migrating in place.
+ * @param options - The owners and threshold to install.
+ * @returns The installed account config.
+ */
+export function fromUpgrade<numberType = number>(
+  account: Address.Address,
+  options: fromUpgrade.Options<numberType>,
+): Config<1n, numberType> {
+  Address.assert(account)
+  return from({
+    owners: options.owners,
+    salt: Hash.keccak256(Hex.concat(Hex.fromString(upgradeDomain), account)),
+    threshold: options.threshold,
+    version: 1n,
+  })
+}
+
+export declare namespace fromUpgrade {
+  type Options<numberType = number> = {
+    /** Weighted owners to install. Sorted into canonical order. */
+    owners: readonly Owner<numberType>[]
+    /** Minimum total owner weight required for authorization. */
+    threshold: numberType
+  }
+
+  type ErrorType =
+    | Address.assert.ErrorType
+    | assert.ErrorType
+    | Hash.keccak256.ErrorType
+    | Hex.concat.ErrorType
+    | Hex.fromString.ErrorType
+    | Errors.GlobalErrorType
+}
+
 /**
  * Derives the stable configurable account address.
  *
  * The initial config is hashed into a CREATE2 salt using fixed-width
  * big-endian fields, not RLP. The account uses the chain-configured recovery
- * factory and wallet init-code hash.
+ * factory and account proxy init-code hash.
  *
  * The address is derived once from the initial version-0 config. Config
  * updates do not change it.
@@ -388,7 +459,7 @@ export function getAddress(
     ),
   )
   const account = ContractAddress.fromCreate2({
-    bytecodeHash: recoveryWalletInitCodeHash,
+    bytecodeHash: accountProxyInitCodeHash,
     from: options.factory,
     salt: accountSalt,
   })
@@ -421,7 +492,7 @@ export declare namespace getAddress {
  * Computes the commitment for an account configuration.
  *
  * The commitment uses raw fixed-width fields, not RLP or ABI encoding:
- * `keccak256("tempo:multisig:config" || salt || uint64be(version) || uint8(threshold) || uint8(owners.length) || owners)`.
+ * `keccak256("tempo:configurable-account:config" || salt || uint64be(version) || uint8(threshold) || uint8(owners.length) || owners)`.
  *
  * @example
  * ```ts twoslash
@@ -469,7 +540,7 @@ export declare namespace getCommitment {
 /**
  * Computes the digest a configurable account owner approves (signs).
  *
- * `keccak256("tempo:multisig:signature" || inner_digest || account || uint64be(version))`,
+ * `keccak256("tempo:configurable-account:signature" || inner_digest || account || uint64be(version))`,
  * where `inner_digest` is the transaction sign payload
  * ({@link ox#TxEnvelopeTempo.(getSignPayload:function)}).
  *

package/tempo/AccountOperation.test.ts

@@ -150,8 +150,8 @@ describe('getHash', () => {
       }),
     }).toMatchInlineSnapshot(`
       {
-        "keyAuthorization": "0xa83016f0e94c4a6125483ffeba3abb0a8df1bc0f5a503f63639e806b793520bb",
-        "transaction": "0x2d7e3c7c38a9acf85f0a9d70a39b0e9e5a05d92c7a73b633a47a45be4a112b3b",
+        "keyAuthorization": "0xd18f389ae23bdc81939861c9a1079201968a2ec5fbd67ad1063556b46af8914f",
+        "transaction": "0x246027f7c6940fb4b68a746c49819c1c45737aa6c975aafcce721b4a619a9ab1",
       }
     `)
   })
@@ -342,14 +342,14 @@ describe('serializeKeyAuthorization', () => {
     expect(results).toMatchInlineSnapshot(`
       [
         {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
-          "hash": "0xcd4283709cc1853dc8ed9cc4dd8c3b6a22e1b01f19ad3f6348f4bebe79590408",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
+          "hash": "0x8d72c92f8aca5cf651ff914a928a32b1717e51b70fce97e305aaab02617474f5",
           "signatureCount": 2,
           "version": 1n,
         },
         {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
-          "hash": "0x1f66e6adc4ddf8ac9d4575f518be11509ca616ac13d4e0a286b4eef7b96959f2",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
+          "hash": "0x1dce79ae000bb60526cbe3b18be29d517319ee0958b01e5e3e89608e19c13459",
           "signatureCount": 2,
           "version": 0n,
         },
@@ -443,15 +443,15 @@ describe('serializeTransaction', () => {
     expect(results).toMatchInlineSnapshot(`
       [
         {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
-          "hash": "0x6a034f208339f7eaa4a42b3fa03aad5df77ebe83659dac2e4d2b11226d221928",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
+          "hash": "0x75106153400c34efbeb7380828e3fef939340eb0a3a42dda6a22f798f94665d0",
           "signatureCount": 2,
           "type": "0x76",
           "version": 1n,
         },
         {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
-          "hash": "0x04d36e54d7a816b080dfa03370da6fbeb3523ce3eff5211d7f22a3c7e87476ee",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
+          "hash": "0x2718b956492b1f8ff4e25165ac425e9e7064580b76eb087ce764e263723152bc",
           "signatureCount": 2,
           "type": "0x76",
           "version": 0n,
@@ -528,7 +528,7 @@ describe('serializeTransaction', () => {
       [
         {
           "feePayerSignature": null,
-          "from": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "from": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "signatureCount": 2,
           "type": "0x78",
         },
@@ -538,7 +538,7 @@ describe('serializeTransaction', () => {
             "s": 6n,
             "yParity": 0,
           },
-          "from": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "from": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "signatureCount": 2,
           "type": "0x78",
         },
@@ -610,7 +610,7 @@ describe('from', () => {
     expect({ pending, submitting, success }).toMatchInlineSnapshot(`
       {
         "pending": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
           ],
@@ -630,7 +630,7 @@ describe('from', () => {
             "version": 1n,
           },
           "createdAt": 1,
-          "hash": "0x2d7e3c7c38a9acf85f0a9d70a39b0e9e5a05d92c7a73b633a47a45be4a112b3b",
+          "hash": "0x246027f7c6940fb4b68a746c49819c1c45737aa6c975aafcce721b4a619a9ab1",
           "signatureCount": 1,
           "status": "pending",
           "threshold": 2,
@@ -640,7 +640,7 @@ describe('from', () => {
           "weight": 1,
         },
         "submitting": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
             "0x01000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
@@ -662,7 +662,7 @@ describe('from', () => {
           },
           "createdAt": 1,
           "expiresAt": 10,
-          "hash": "0x2d7e3c7c38a9acf85f0a9d70a39b0e9e5a05d92c7a73b633a47a45be4a112b3b",
+          "hash": "0x246027f7c6940fb4b68a746c49819c1c45737aa6c975aafcce721b4a619a9ab1",
           "signatureCount": 2,
           "status": "submitting",
           "submissionId": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
@@ -673,7 +673,7 @@ describe('from', () => {
           "weight": 2,
         },
         "success": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
             "0x01000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
@@ -694,7 +694,7 @@ describe('from', () => {
             "version": 1n,
           },
           "createdAt": 1,
-          "hash": "0x2d7e3c7c38a9acf85f0a9d70a39b0e9e5a05d92c7a73b633a47a45be4a112b3b",
+          "hash": "0x246027f7c6940fb4b68a746c49819c1c45737aa6c975aafcce721b4a619a9ab1",
           "signatureCount": 2,
           "status": "success",
           "threshold": 2,
@@ -735,7 +735,7 @@ describe('from', () => {
       },
       `
       {
-        "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+        "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
         "approvals": [
           "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
         ],
@@ -812,7 +812,7 @@ describe('from', () => {
       },
       `
       {
-        "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+        "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
         "approvals": [
           "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
         ],
@@ -869,7 +869,7 @@ describe('from', () => {
     expect({ pending, success }).toMatchInlineSnapshot(`
       {
         "pending": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
           ],
@@ -889,8 +889,8 @@ describe('from', () => {
             "version": 1n,
           },
           "createdAt": 1,
-          "hash": "0xa83016f0e94c4a6125483ffeba3abb0a8df1bc0f5a503f63639e806b793520bb",
-          "keyAuthorization": "0xf838f782107980943333333333333333333333333333333333333333846b49d2008080808094ef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "hash": "0xd18f389ae23bdc81939861c9a1079201968a2ec5fbd67ad1063556b46af8914f",
+          "keyAuthorization": "0xf838f782107980943333333333333333333333333333333333333333846b49d20080808080940f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "signatureCount": 1,
           "status": "pending",
           "threshold": 2,
@@ -899,7 +899,7 @@ describe('from', () => {
           "weight": 1,
         },
         "success": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
             "0x01000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
@@ -920,8 +920,8 @@ describe('from', () => {
             "version": 1n,
           },
           "createdAt": 1,
-          "hash": "0xa83016f0e94c4a6125483ffeba3abb0a8df1bc0f5a503f63639e806b793520bb",
-          "keyAuthorization": "0xf901b3f782107980943333333333333333333333333333333333333333846b49d2008080808094ef6b17836e1b3647105c3084124485e3e1b0ab7fb9017805f9017494ef6b17836e1b3647105c3084124485e3e1b0ab7ff852a000000000000000000000000000000000000000000000000000000000000000000102eed69407e1ed8ea0e9601e5546b0a03aed683df360140701d694288f0cd85005f34168f731a468aef268c2f9456f01f90108b88201000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200b88201000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
+          "hash": "0xd18f389ae23bdc81939861c9a1079201968a2ec5fbd67ad1063556b46af8914f",
+          "keyAuthorization": "0xf901b3f782107980943333333333333333333333333333333333333333846b49d20080808080940f8659dd87410f00a1668211ecda7ac7f9c9fd13b9017805f90174940f8659dd87410f00a1668211ecda7ac7f9c9fd13f852a000000000000000000000000000000000000000000000000000000000000000000102eed69407e1ed8ea0e9601e5546b0a03aed683df360140701d694288f0cd85005f34168f731a468aef268c2f9456f01f90108b88201000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200b88201000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
           "signatureCount": 2,
           "status": "success",
           "threshold": 2,
@@ -967,7 +967,7 @@ describe('from', () => {
       },
       `
       {
-        "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+        "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
         "approvals": [
           "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
           "0x01000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
@@ -1013,7 +1013,7 @@ describe('RPC conversion', () => {
     expect({ keyAuthorizationRpc, transactionRpc }).toMatchInlineSnapshot(`
       {
         "keyAuthorizationRpc": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
           ],
@@ -1033,8 +1033,8 @@ describe('RPC conversion', () => {
             "version": "0x1",
           },
           "createdAt": 1,
-          "hash": "0xa83016f0e94c4a6125483ffeba3abb0a8df1bc0f5a503f63639e806b793520bb",
-          "keyAuthorization": "0xf838f782107980943333333333333333333333333333333333333333846b49d2008080808094ef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "hash": "0xd18f389ae23bdc81939861c9a1079201968a2ec5fbd67ad1063556b46af8914f",
+          "keyAuthorization": "0xf838f782107980943333333333333333333333333333333333333333846b49d20080808080940f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "signatureCount": 1,
           "status": "pending",
           "threshold": 2,
@@ -1043,7 +1043,7 @@ describe('RPC conversion', () => {
           "weight": 1,
         },
         "transactionRpc": {
-          "account": "0xef6b17836e1b3647105c3084124485e3e1b0ab7f",
+          "account": "0x0f8659dd87410f00a1668211ecda7ac7f9c9fd13",
           "approvals": [
             "0x01000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200",
           ],
@@ -1063,7 +1063,7 @@ describe('RPC conversion', () => {
             "version": "0x1",
           },
           "createdAt": 1,
-          "hash": "0x2d7e3c7c38a9acf85f0a9d70a39b0e9e5a05d92c7a73b633a47a45be4a112b3b",
+          "hash": "0x246027f7c6940fb4b68a746c49819c1c45737aa6c975aafcce721b4a619a9ab1",
           "signatureCount": 1,
           "status": "pending",
           "threshold": 2,

package/tempo/AccountSimulation.test.ts

@@ -113,6 +113,26 @@ describe('fromRpc', () => {
 })
 
 describe('toRpc', () => {
+  test('behavior: round-trips the grant signer', () => {
+    const signer = '0x2222222222222222222222222222222222222222'
+    const spec = AccountSimulation.fromRpc({ ...rpc, signer })
+    expect(spec.signer).toBe(signer)
+    expect(AccountSimulation.toRpc(spec).signer).toBe(signer)
+    expect(
+      'signer' in AccountSimulation.toRpc(AccountSimulation.fromRpc(rpc)),
+    ).toBe(false)
+  })
+
+  test('error: rejects an invalid grant signer', () => {
+    expect(() =>
+      AccountSimulation.fromRpc({ ...rpc, signer: '0x1234' }),
+    ).toThrowErrorMatchingInlineSnapshot(`
+      [Address.InvalidAddressError: Address "0x1234" is invalid.
+
+      Details: Address is not a 20 byte (40 hexadecimal character) value.]
+    `)
+  })
+
   test('behavior: encodes configurations and shims long key data', () => {
     expect(
       AccountSimulation.toRpc(AccountSimulation.fromRpc(rpc)),
@@ -147,6 +167,30 @@ describe('toRpc', () => {
     `)
   })
 
+  test('behavior: shims key data that is not a valid length hint', () => {
+    const keyData = (keyData: `0x${string}`) =>
+      AccountSimulation.toRpc(
+        AccountSimulation.fromRpc({
+          ...rpc,
+          approvals: [{ ...rpc.approvals[0], keyData }],
+        }),
+      ).approvals[0]?.keyData
+
+    expect({
+      empty: keyData('0x'),
+      four: keyData('0x01020304'),
+      one: keyData('0x01'),
+      three: keyData('0x010203'),
+    }).toMatchInlineSnapshot(`
+      {
+        "empty": "0x0000",
+        "four": "0x01020304",
+        "one": "0x01",
+        "three": "0x0003",
+      }
+    `)
+  })
+
   test('behavior: encodes the maximum uint64 configuration version', () => {
     const spec = AccountSimulation.fromRpc(rpc)