fix(tempo): complete config witness support

Author: jxom

.changeset/calm-witnesses-sign.md

@@ -1,8 +1,8 @@
 ---
-'ox': patch
+'ox': minor
 ---
 
-Updated native multisig configurations and signatures to use TIP-1061 configuration witnesses.
+Changed native multisig configuration and signature APIs to require complete TIP-1061 witnesses with a `version`.
 
 ```ts
 const config = MultisigConfig.from({

src/tempo/MultisigConfig.ts

@@ -218,6 +218,7 @@ export function from<numberType = number>(
 export function from<numberType = number>(
   config: Input<bigint | number, numberType>,
 ): Config<bigint, numberType>
+// eslint-disable-next-line jsdoc/require-jsdoc
 export function from<numberType = number>(
   config: Input<bigint | number, numberType>,
 ): Config<bigint, numberType> {
@@ -606,7 +607,7 @@ export class InvalidConfigError extends Errors.BaseError {
   }
 }
 
-/** Asserts that a configuration version fits the protocol's `uint64`. */
+/** @internal */
 function assertVersion(version: unknown): asserts version is bigint | number {
   if (
     (typeof version !== 'bigint' && typeof version !== 'number') ||

src/tempo/MultisigOperation.test-d.ts

@@ -47,9 +47,15 @@ test('preserves operation kinds during RPC conversion', () => {
 })
 
 test('uses JSON-RPC quantities only in RPC operations', () => {
+  expectTypeOf<
+    MultisigOperation.Operation['config']['version']
+  >().toEqualTypeOf<bigint>()
   expectTypeOf<
     MultisigOperation.Operation['configVersion']
   >().toEqualTypeOf<bigint>()
+  expectTypeOf<
+    MultisigOperation.Rpc['config']['version']
+  >().toEqualTypeOf<Hex.Hex>()
   expectTypeOf<
     MultisigOperation.Rpc['configVersion']
   >().toEqualTypeOf<Hex.Hex>()

src/tempo/MultisigOperation.test.ts

@@ -1269,6 +1269,9 @@ describe('RPC conversion', () => {
     const transactionRpc = MultisigOperation.toRpc(transactionPending)
     const keyAuthorizationRpc = MultisigOperation.toRpc(keyAuthorizationPending)
 
+    expect(() =>
+      JSON.stringify({ keyAuthorizationRpc, transactionRpc }),
+    ).not.toThrow()
     expect({ keyAuthorizationRpc, transactionRpc }).toMatchInlineSnapshot(`
       {
         "keyAuthorizationRpc": {
@@ -1289,7 +1292,7 @@ describe('RPC conversion', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
-            "version": 1n,
+            "version": "0x1",
           },
           "configVersion": "0x1",
           "createdAt": 1,
@@ -1321,7 +1324,7 @@ describe('RPC conversion', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
-            "version": 1n,
+            "version": "0x1",
           },
           "configVersion": "0x1",
           "createdAt": 1,

src/tempo/MultisigOperation.ts

@@ -14,7 +14,7 @@ export type Base<quantity = bigint> = {
   /** Every retained serialized owner approval. */
   approvals: readonly Hex.Hex[]
   /** Root configuration used to verify approvals. */
-  config: MultisigConfig.Config
+  config: MultisigConfig.Config<quantity>
   /** Root configuration version. */
   configVersion: quantity
   /** Unix creation time in milliseconds. */
@@ -403,7 +403,11 @@ export function fromRpc<const operation extends Rpc>(
       throw new InvalidOperationError({
         reason: 'configVersion must use canonical quantity encoding',
       })
-    return from({ ...operation, configVersion } as Operation) as never
+    return from({
+      ...operation,
+      config: MultisigConfig.fromRpc(operation.config),
+      configVersion,
+    } as Operation) as never
   } catch (cause) {
     if (cause instanceof InvalidOperationError) throw cause
     throw new InvalidOperationError({ cause })
@@ -441,6 +445,7 @@ export function toRpc<const operation extends Operation>(
   const value = from(operation)
   return {
     ...value,
+    config: MultisigConfig.toRpc(value.config),
     configVersion: Hex.fromNumber(value.configVersion),
   } as never
 }

src/tempo/SignatureEnvelope.test.ts

@@ -3322,14 +3322,32 @@ describe('multisig', () => {
       ],
     },
     {
-      field: 'version',
+      field: 'oversized version',
       value: [
         ('0x' + '00'.repeat(32)) as Hex.Hex,
         ('0x' + '01'.repeat(9)) as Hex.Hex,
         '0x01',
         [['0x7e5f4552091a69125d5dfcb7b8c2659029395bdf', '0x01']],
       ],
     },
+    {
+      field: 'zero version',
+      value: [
+        ('0x' + '00'.repeat(32)) as Hex.Hex,
+        '0x00',
+        '0x01',
+        [['0x7e5f4552091a69125d5dfcb7b8c2659029395bdf', '0x01']],
+      ],
+    },
+    {
+      field: 'zero-prefixed version',
+      value: [
+        ('0x' + '00'.repeat(32)) as Hex.Hex,
+        '0x0001',
+        '0x01',
+        [['0x7e5f4552091a69125d5dfcb7b8c2659029395bdf', '0x01']],
+      ],
+    },
     {
       field: 'threshold',
       value: [
@@ -3348,7 +3366,7 @@ describe('multisig', () => {
         [['0x7e5f4552091a69125d5dfcb7b8c2659029395bdf', '0x0001']],
       ],
     },
-  ])('error: rejects a noncanonical $field width', ({ value }) => {
+  ])('error: rejects a noncanonical $field', ({ value }) => {
     const malformed = Hex.concat(
       '0x05',
       Rlp.fromHex([

src/tempo/SignatureEnvelope.ts

@@ -799,6 +799,7 @@ function deserialize_(
       Hex.size(salt) !== 32 ||
       Array.isArray(version) ||
       Hex.size(version) > 8 ||
+      (version !== '0x' && Hex.slice(version, 0, 1) === '0x00') ||
       Array.isArray(threshold) ||
       Hex.size(threshold) > 1 ||
       !Array.isArray(owners) ||

src/tempo/multisig.e2e.test.ts

@@ -9,7 +9,7 @@ import * as TxEnvelopeTempo from './TxEnvelopeTempo.js'
 
 const chainId = chain.id
 const updateConfig = AbiFunction.from(
-  'function updateConfig(uint8 threshold, (address owner, uint8 weight)[] owners)',
+  'function updateConfig((bytes32 salt, uint64 version, uint8 threshold, (address owner, uint8 weight)[] owners) current, uint8 threshold, (address owner, uint8 weight)[] owners)',
 )
 
 describe('behavior: multisig (TIP-1061)', () => {
@@ -206,6 +206,7 @@ describe('behavior: multisig (TIP-1061)', () => {
         {
           to: '0xaacc000000000000000000000000000000000000',
           data: AbiFunction.encodeData(updateConfig, [
+            initialConfig,
             rotatedConfig.threshold,
             rotatedConfig.owners,
           ]),
@@ -713,6 +714,7 @@ describe('behavior: multisig (TIP-1061)', () => {
         {
           to: '0xaacc000000000000000000000000000000000000',
           data: AbiFunction.encodeData(updateConfig, [
+            initialConfig,
             initialConfig.threshold,
             initialConfig.owners,
           ]),

test/tempo/multisig.ts

@@ -1,3 +1,3 @@
 export const port = 3001
 
-export const tag = 'sha-4e74a2c'
+export const tag = 'sha-896b990'