ox 0.14.38 → 0.14.39

package/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. */
@@ -109,8 +109,8 @@ export function getHash(options: getHash.Options): Hex.Hex {
         )
   return MultisigConfig.getSignPayload({
     account,
+    config: { version: configVersion },
     payload,
-    version: configVersion,
   })
 }
 
@@ -281,20 +281,15 @@ export function serializeTransaction(
   assertRetainedApprovals(value, approvals)
   const signatures = SignatureEnvelope.sortMultisigApprovals({
     account: value.account,
+    config: value.config,
     payload: TxEnvelopeTempo.getSignPayload(envelope),
     signatures: approvals,
-    version: value.configVersion,
   })
-  const signature = value.init
-    ? SignatureEnvelope.from({
-        init: true,
-        initialConfig: value.config,
-        signatures,
-      })
-    : SignatureEnvelope.from({
-        account: value.account,
-        signatures,
-      })
+  const signature = SignatureEnvelope.from({
+    account: value.account,
+    config: value.config,
+    signatures,
+  })
   return TxEnvelopeTempo.serialize(
     envelope,
     value.transaction.startsWith(TxEnvelopeTempo.feePayerMagic)
@@ -343,7 +338,10 @@ export function from<const operation extends Operation>(
   operation: operation,
 ): from.ReturnValue<operation> {
   try {
-    const config = MultisigConfig.from(operation.config)
+    const config = MultisigConfig.from({
+      ...operation.config,
+      version: operation.configVersion,
+    })
     if (
       typeof config.threshold !== 'number' ||
       config.owners.some((owner) => typeof owner.weight !== 'number')
@@ -351,12 +349,13 @@ export function from<const operation extends Operation>(
       throw new InvalidOperationError({
         reason: 'config threshold and owner weights must be numbers',
       })
-    assertBase(operation, config)
-    if (operation.type === 'transaction') assertTransaction(operation)
-    else if (operation.type === 'keyAuthorization')
-      assertKeyAuthorization(operation, config)
+    const value = { ...operation, config } as Operation
+    assertBase(value, config)
+    if (value.type === 'transaction') assertTransaction(value)
+    else if (value.type === 'keyAuthorization')
+      assertKeyAuthorization(value, config)
     else throw new InvalidOperationError({ reason: 'unknown operation type' })
-    return { ...operation, config } as never
+    return value as never
   } catch (cause) {
     if (cause instanceof InvalidOperationError) throw cause
     throw new InvalidOperationError({ cause })
@@ -404,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 })
@@ -442,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
 }
@@ -513,10 +517,6 @@ async function selectApprovals_internal(
         throw new InvalidApprovalError({
           reason: `owner ${group.address} has conflicting signature types`,
         })
-      if (nested.some((signature) => signature.init))
-        throw new InvalidApprovalError({
-          reason: `nested multisig owner ${group.address} cannot carry init`,
-        })
       if (
         path.length >= MultisigConfig.maxNestingDepth ||
         path.includes(group.address.toLowerCase())
@@ -529,6 +529,10 @@ async function selectApprovals_internal(
           reason: `nested multisig owner ${group.address} requires a config resolver`,
         })
       const resolved = await options.resolveConfig({ account: group.address })
+      const config = MultisigConfig.from({
+        ...resolved.config,
+        version: resolved.version,
+      })
       const selected = await selectApprovals_internal(
         {
           account: group.address,
@@ -537,11 +541,11 @@ async function selectApprovals_internal(
               SignatureEnvelope.serialize(approval),
             ),
           ),
-          config: MultisigConfig.from(resolved.config),
+          config,
           hash: MultisigConfig.getSignPayload({
             account: group.address,
+            config,
             payload: options.hash,
-            version: resolved.version,
           }),
           resolveConfig: options.resolveConfig,
         },
@@ -552,6 +556,7 @@ async function selectApprovals_internal(
         signature: SignatureEnvelope.serialize(
           SignatureEnvelope.from({
             account: group.address,
+            config,
             signatures: selected.approvals.map((approval) =>
               SignatureEnvelope.from(approval),
             ),
@@ -564,6 +569,7 @@ async function selectApprovals_internal(
           signature: SignatureEnvelope.serialize(
             SignatureEnvelope.from({
               account: group.address,
+              config,
               signatures: selected.selectedApprovals.map((approval) =>
                 SignatureEnvelope.from(approval),
               ),
@@ -739,6 +745,7 @@ function assertBase(operation: Operation, config: MultisigConfig.Config): void {
     const signature = assertApproval(
       operation.account,
       approval as SignatureEnvelope.Serialized,
+      config,
     )
     const address = SignatureEnvelope.extractAddress({
       payload: operation.hash,
@@ -944,13 +951,9 @@ function assertKeyAuthorization(
         reason: 'key authorization signatureCount does not match its signature',
       })
     assertSelectedApprovals(operation, signature.signatures, authorization)
-    if (!!signature.init !== operation.init)
+    if (!sameConfig(signature.config, config))
       throw new InvalidOperationError({
-        reason: 'key authorization bootstrap state does not match',
-      })
-    if (signature.init && !sameConfig(signature.init, config))
-      throw new InvalidOperationError({
-        reason: 'key authorization bootstrap config does not match',
+        reason: 'key authorization config does not match',
       })
   }
   assertOperationHash(
@@ -974,10 +977,12 @@ function assertKeyAuthorization(
 function assertApproval(
   account: Address.Address,
   serialized: SignatureEnvelope.Serialized,
+  config: MultisigConfig.Config,
 ): SignatureEnvelope.SignatureEnvelope {
   const approval = SignatureEnvelope.deserialize(serialized)
   SignatureEnvelope.assert({
     account,
+    config,
     signatures: [approval],
     type: 'multisig',
   })
@@ -1039,8 +1044,8 @@ function assertSelectedApprovals(
 
   const digest = MultisigConfig.getSignPayload({
     account: operation.account,
+    config: operation.config,
     payload: KeyAuthorization_.getSignPayload(authorization),
-    version: operation.configVersion,
   })
   const addresses = selected.map((signature) =>
     SignatureEnvelope.extractAddress({ payload: digest, signature }),
@@ -1075,7 +1080,7 @@ function includesApproval(
     )
   if (retained.account.toLowerCase() !== selected.account.toLowerCase())
     return false
-  // Nested versions are not serialized, so selected child approvals must preserve the validated retained order.
+  if (!sameConfig(retained.config, selected.config)) return false
   let index = 0
   for (const approval of selected.signatures) {
     while (
@@ -1119,8 +1124,8 @@ function isWeightReachable(
 function assertOperationHash(operation: Operation, payload: Hex.Hex): void {
   const hash = MultisigConfig.getSignPayload({
     account: operation.account,
+    config: operation.config,
     payload,
-    version: operation.configVersion,
   })
   if (hash.toLowerCase() !== operation.hash.toLowerCase())
     throw new InvalidOperationError({
@@ -1157,6 +1162,7 @@ function sameConfig(
       configB.salt ?? MultisigConfig.zeroSalt,
     ) &&
     configA.threshold === configB.threshold &&
+    configA.version === configB.version &&
     configA.owners.length === configB.owners.length &&
     configA.owners.every((owner, index) => {
       const other = configB.owners[index]!

package/tempo/SignatureEnvelope.test-d.ts

@@ -1,4 +1,5 @@
 import { expectTypeOf, test } from 'vitest'
+import * as MultisigConfig from './MultisigConfig.js'
 import * as SignatureEnvelope from './SignatureEnvelope.js'
 
 const signatureRpc = {
@@ -17,67 +18,81 @@ const signature = {
   type: 'secp256k1',
 } as const satisfies SignatureEnvelope.Secp256k1
 
+const config = MultisigConfig.from({
+  owners: [
+    {
+      owner: '0x1111111111111111111111111111111111111111',
+      weight: 1,
+    },
+  ],
+  threshold: 1,
+})
+
 test('toRpc preserves the signature type', () => {
   expectTypeOf(
     SignatureEnvelope.toRpc(signature),
   ).toEqualTypeOf<SignatureEnvelope.Secp256k1Rpc>()
 })
 
-test('MultisigRpc uses static initialized and bootstrap shapes', () => {
-  const initialized = {
+test('MultisigRpc carries one complete witness shape', () => {
+  const rpc = {
     account: '0x1111111111111111111111111111111111111111',
+    config: MultisigConfig.toRpc(config),
     signatures: [signatureRpc],
   } as const satisfies SignatureEnvelope.MultisigRpc
-  const bootstrap = {
-    init: {
-      owners: [
-        {
-          owner: '0x1111111111111111111111111111111111111111',
-          weight: 1,
-        },
-      ],
-      threshold: 1,
-    },
-    signatures: [signatureRpc],
-  } as const satisfies SignatureEnvelope.MultisigRpc
-  const bootstrapWithAccountUndefined: SignatureEnvelope.MultisigRpc = {
-    ...bootstrap,
-    account: undefined,
-  }
 
-  expectTypeOf(initialized.signatures).toMatchTypeOf<
-    readonly SignatureEnvelope.SignatureEnvelopeRpc[]
-  >()
-  expectTypeOf(bootstrap.signatures).toMatchTypeOf<
+  expectTypeOf(rpc.config).toMatchTypeOf<MultisigConfig.Rpc>()
+  expectTypeOf(rpc.signatures).toMatchTypeOf<
     readonly SignatureEnvelope.SignatureEnvelopeRpc[]
   >()
-  expectTypeOf(
-    bootstrapWithAccountUndefined,
-  ).toMatchTypeOf<SignatureEnvelope.MultisigRpc>()
   expectTypeOf<
-    SignatureEnvelope.GetType<typeof bootstrap>
+    SignatureEnvelope.GetType<typeof rpc>
   >().toEqualTypeOf<'multisig'>()
 })
 
-test('MultisigRpc rejects legacy shapes', () => {
-  const combined = {
+test('from derives an initial account', () => {
+  const multisig = SignatureEnvelope.from({
+    config,
+    signatures: [signature],
+  })
+
+  expectTypeOf(multisig).toMatchTypeOf<SignatureEnvelope.Multisig>()
+  expectTypeOf(multisig.config.version).toEqualTypeOf<bigint>()
+})
+
+test('from requires an account for a current config', () => {
+  // @ts-expect-error Current configurations require an explicit account.
+  SignatureEnvelope.from({
+    config: { ...config, version: 1 },
+    signatures: [signature],
+  })
+
+  const multisig = SignatureEnvelope.from({
+    account: '0x2222222222222222222222222222222222222222',
+    config: { ...config, version: 1 },
+    signatures: [signature],
+  })
+  expectTypeOf(multisig).toMatchTypeOf<SignatureEnvelope.Multisig>()
+})
+
+test('MultisigRpc rejects old witness shapes', () => {
+  const accountOnly = {
     account: '0x1111111111111111111111111111111111111111',
-    init: {
-      owners: [
-        {
-          owner: '0x1111111111111111111111111111111111111111',
-          weight: 1,
-        },
-      ],
-      threshold: 1,
-    },
     signatures: [signatureRpc],
   } as const
-  // @ts-expect-error Bootstrap RPC signatures omit `account`.
-  const combinedRpc: SignatureEnvelope.MultisigRpc = combined
+  // @ts-expect-error Multisig RPC signatures require config.
+  const accountOnlyRpc: SignatureEnvelope.MultisigRpc = accountOnly
+
+  const init = {
+    init: config,
+    signatures: [signatureRpc],
+  } as const
+  // @ts-expect-error Multisig RPC signatures no longer accept init.
+  const initRpc: SignatureEnvelope.MultisigRpc = init
 
   const serialized = {
     account: '0x1111111111111111111111111111111111111111',
+    config: MultisigConfig.toRpc(config),
     signatures: ['0x1234'],
   } as const
   // @ts-expect-error Owner approvals use structured RPC envelopes.
@@ -85,13 +100,15 @@ test('MultisigRpc rejects legacy shapes', () => {
 
   const tagged = {
     account: '0x1111111111111111111111111111111111111111',
+    config: MultisigConfig.toRpc(config),
     signatures: [signatureRpc],
     type: 'multisig',
   } as const
   // @ts-expect-error Multisig RPC signatures are untagged.
   const taggedRpc: SignatureEnvelope.MultisigRpc = tagged
 
-  expectTypeOf(combinedRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
+  expectTypeOf(accountOnlyRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
+  expectTypeOf(initRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
   expectTypeOf(serializedRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
   expectTypeOf(taggedRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
 })