ox 0.14.42 → 0.14.44

package/tempo/SignatureEnvelope.test.ts

@@ -68,6 +68,9 @@ const signature_keychain_webauthn = SignatureEnvelope.from({
   version: 'v2',
 })
 
+const signature_multisig_rpc =
+  '0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b' as const
+
 describe('assert', () => {
   describe('secp256k1', () => {
     test('behavior: validates valid signature', () => {
@@ -1131,7 +1134,7 @@ describe('from', () => {
         },
         `
         {
-          "account": "0x8820d1497eeaf4f68e00b2cfc00a2f3b1dbb00da",
+          "account": "0xf4b916c5aea0fb199bd942389be00db0690c961f",
           "config": {
             "owners": [
               {
@@ -2468,6 +2471,72 @@ describe('fromRpc', () => {
       expect(envelope.keyId).toBe('0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c')
     })
   })
+
+  describe('multisig', () => {
+    test('behavior: converts an untagged serialized multisig signature', () => {
+      expect(
+        SignatureEnvelope.fromRpc(signature_multisig_rpc),
+      ).toMatchInlineSnapshot(`
+        {
+          "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
+          "config": {
+            "owners": [
+              {
+                "owner": "0x7e5f4552091a69125d5dfcb7b8c2659029395bdf",
+                "weight": 1,
+              },
+            ],
+            "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "threshold": 1,
+            "version": 0n,
+          },
+          "signatures": [
+            {
+              "signature": {
+                "r": 60871800714128149016591846789173983752390955456021923556141688418770269698437n,
+                "s": 24367763726302312398084372528434045669788111037623467391175388828437596076276n,
+                "yParity": 0,
+              },
+              "type": "secp256k1",
+            },
+          ],
+          "type": "multisig",
+        }
+      `)
+    })
+
+    test('error: rejects a payload with the transaction type byte', () => {
+      expect(() =>
+        SignatureEnvelope.fromRpc(`0x05${signature_multisig_rpc.slice(2)}`),
+      ).toThrowErrorMatchingInlineSnapshot(`
+        [SignatureEnvelope.InvalidSerializedError: Unable to deserialize signature envelope: invalid multisig wire shape: expected exactly three fields
+
+        Serialized: 0x0505f89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b]
+      `)
+    })
+
+    test('error: rejects trailing bytes', () => {
+      expect(() =>
+        SignatureEnvelope.fromRpc(`${signature_multisig_rpc}00`),
+      ).toThrowErrorMatchingInlineSnapshot(`
+        [SignatureEnvelope.InvalidSerializedError: Unable to deserialize signature envelope: invalid multisig RPC signature
+
+        Serialized: 0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b00]
+      `)
+    })
+
+    test('error: rejects a structured multisig signature', () => {
+      expect(() =>
+        SignatureEnvelope.fromRpc({
+          account: '0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b',
+          config: {},
+          signatures: [],
+        } as never),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `[SignatureEnvelope.CoercionError: Unable to coerce value (\`{"account":"0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b","config":{},"signatures":[]}\`) to a valid signature envelope.]`,
+      )
+    })
+  })
 })
 
 describe('toRpc', () => {
@@ -2565,6 +2634,7 @@ describe('toRpc', () => {
       const rpc = SignatureEnvelope.toRpc(
         signature_keychain_p256,
       ) as SignatureEnvelope.KeychainRpc
+      if (typeof rpc.signature === 'string') throw new Error('unreachable')
 
       expect(rpc.type).toBe('keychain')
       expect(rpc.userAddress).toBe(signature_keychain_p256.userAddress)
@@ -2577,6 +2647,7 @@ describe('toRpc', () => {
       const rpc = SignatureEnvelope.toRpc(
         signature_keychain_webauthn,
       ) as SignatureEnvelope.KeychainRpc
+      if (typeof rpc.signature === 'string') throw new Error('unreachable')
 
       expect(rpc.type).toBe('keychain')
       expect(rpc.userAddress).toBe(signature_keychain_webauthn.userAddress)
@@ -2620,6 +2691,18 @@ describe('toRpc', () => {
       expect(rpc.keyId).toBeUndefined()
     })
   })
+
+  describe('multisig', () => {
+    test('behavior: removes the transaction type byte', () => {
+      const envelope = SignatureEnvelope.deserialize(
+        `0x05${signature_multisig_rpc.slice(2)}`,
+      )
+
+      expect(SignatureEnvelope.toRpc(envelope)).toMatchInlineSnapshot(
+        `"${signature_multisig_rpc}"`,
+      )
+    })
+  })
 })
 
 describe('roundtrip: toRpc <-> fromRpc', () => {
@@ -2854,18 +2937,18 @@ describe('CoercionError', () => {
 
 describe('multisig', () => {
   const initial =
-    '0x05f897949dba7f426b711d4893c11611eacf7cc334e7146bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b' as const
+    '0x05f89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b' as const
   const current =
-    '0x05f897949dba7f426b711d4893c11611eacf7cc334e7146bf83ba000000000000000000000000000000000000000000000000000000000000000000101d7d6942b5ad5c4795c026514f8317c7a215e218dccd6cf01f843b8414a0e5b5b4a90f08e6e8d676a73a22dc2cf022ffdcc9299512b5d9a6daf66e0504a395a2ef6f6c0f173910b875c45d01aa66d928e56ba6f49bbc8186f80268bf51b' as const
+    '0x05f89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000000101d7d6942b5ad5c4795c026514f8317c7a215e218dccd6cf01f843b8414a0e5b5b4a90f08e6e8d676a73a22dc2cf022ffdcc9299512b5d9a6daf66e0504a395a2ef6f6c0f173910b875c45d01aa66d928e56ba6f49bbc8186f80268bf51b' as const
   const nested =
-    '0x05f8f0949969e2243075b27a8eab61009c59b77ab13b83f6f83ba033333333333333333333333333333333333333333333333333333333333333338001d7d6944f9f5b162a7464bcc260ce44d7ae0d935f9c583701f89cb89a05f897944f9f5b162a7464bcc260ce44d7ae0d935f9c5837f83ba022222222222222222222222222222222222222222222222222222222222222228001d7d6946813eb9362372eef6200f3b1dbc3f819671cba6901f843b841032aa6f3ea7b0b7069720d0f3891983c493d149326c5c957d864ed7371b8475e3e95325079b24491f4b6d68920e4b3bacd7c6094df6ed88b8674864ab559c8fb1b' as const
+    '0x05f8f0945f0287385ec182f906c238bec5f87692d48b23f2f83ba033333333333333333333333333333333333333333333333333333333333333338001d7d69470845f2897b639686cb383799d605c52315d785501f89cb89a05f8979470845f2897b639686cb383799d605c52315d7855f83ba022222222222222222222222222222222222222222222222222222222222222228001d7d6946813eb9362372eef6200f3b1dbc3f819671cba6901f843b841032aa6f3ea7b0b7069720d0f3891983c493d149326c5c957d864ed7371b8475e3e95325079b24491f4b6d68920e4b3bacd7c6094df6ed88b8674864ab559c8fb1b' as const
 
-  test('example: decodes and re-encodes the frozen initial witness', () => {
+  test('example: decodes and re-encodes the frozen initial signature', () => {
     const envelope = SignatureEnvelope.deserialize(initial)
 
     expect(envelope).toMatchInlineSnapshot(`
       {
-        "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
+        "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
         "config": {
           "owners": [
             {
@@ -2893,12 +2976,12 @@ describe('multisig', () => {
     expect(SignatureEnvelope.serialize(envelope)).toBe(initial)
   })
 
-  test('example: decodes and re-encodes the frozen current witness', () => {
+  test('example: decodes and re-encodes the frozen current signature', () => {
     const envelope = SignatureEnvelope.deserialize(current)
 
     expect(envelope).toMatchInlineSnapshot(`
       {
-        "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
+        "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
         "config": {
           "owners": [
             {
@@ -2926,16 +3009,16 @@ describe('multisig', () => {
     expect(SignatureEnvelope.serialize(envelope)).toBe(current)
   })
 
-  test('example: decodes and re-encodes the frozen nested witness', () => {
+  test('example: decodes and re-encodes the frozen nested signature', () => {
     const envelope = SignatureEnvelope.deserialize(nested)
 
     expect(envelope).toMatchInlineSnapshot(`
       {
-        "account": "0x9969e2243075b27a8eab61009c59b77ab13b83f6",
+        "account": "0x5f0287385ec182f906c238bec5f87692d48b23f2",
         "config": {
           "owners": [
             {
-              "owner": "0x4f9f5b162a7464bcc260ce44d7ae0d935f9c5837",
+              "owner": "0x70845f2897b639686cb383799d605c52315d7855",
               "weight": 1,
             },
           ],
@@ -2945,7 +3028,7 @@ describe('multisig', () => {
         },
         "signatures": [
           {
-            "account": "0x4f9f5b162a7464bcc260ce44d7ae0d935f9c5837",
+            "account": "0x70845f2897b639686cb383799d605c52315d7855",
             "config": {
               "owners": [
                 {
@@ -2995,7 +3078,7 @@ describe('multisig', () => {
 
     expect(decoded).toMatchInlineSnapshot(`
       [
-        "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
+        "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
         [
           "0x0000000000000000000000000000000000000000000000000000000000000000",
           "0x",
@@ -3014,7 +3097,7 @@ describe('multisig', () => {
     `)
   })
 
-  test('behavior: round trips initial and current RPC witnesses', () => {
+  test('behavior: round trips initial and current RPC signatures', () => {
     const initialEnvelope = SignatureEnvelope.deserialize(initial)
     const currentEnvelope = SignatureEnvelope.deserialize(current)
     const rpc = {
@@ -3024,50 +3107,8 @@ describe('multisig', () => {
 
     expect(rpc).toMatchInlineSnapshot(`
       {
-        "current": {
-          "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
-          "config": {
-            "owners": [
-              {
-                "owner": "0x2b5ad5c4795c026514f8317c7a215e218dccd6cf",
-                "weight": 1,
-              },
-            ],
-            "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "threshold": 1,
-            "version": 1,
-          },
-          "signatures": [
-            {
-              "r": "0x4a0e5b5b4a90f08e6e8d676a73a22dc2cf022ffdcc9299512b5d9a6daf66e050",
-              "s": "0x4a395a2ef6f6c0f173910b875c45d01aa66d928e56ba6f49bbc8186f80268bf5",
-              "type": "secp256k1",
-              "yParity": "0x0",
-            },
-          ],
-        },
-        "initial": {
-          "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
-          "config": {
-            "owners": [
-              {
-                "owner": "0x7e5f4552091a69125d5dfcb7b8c2659029395bdf",
-                "weight": 1,
-              },
-            ],
-            "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "threshold": 1,
-            "version": 0,
-          },
-          "signatures": [
-            {
-              "r": "0x869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f985",
-              "s": "0x35dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f4",
-              "type": "secp256k1",
-              "yParity": "0x0",
-            },
-          ],
-        },
+        "current": "0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000000101d7d6942b5ad5c4795c026514f8317c7a215e218dccd6cf01f843b8414a0e5b5b4a90f08e6e8d676a73a22dc2cf022ffdcc9299512b5d9a6daf66e0504a395a2ef6f6c0f173910b875c45d01aa66d928e56ba6f49bbc8186f80268bf51b",
+        "initial": "0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b",
       }
     `)
     expect(SignatureEnvelope.fromRpc(rpc.initial)).toStrictEqual(
@@ -3078,7 +3119,7 @@ describe('multisig', () => {
     )
   })
 
-  test('behavior: derives the account only for an initial witness', () => {
+  test('behavior: derives the account only for an initial config', () => {
     const initialEnvelope = SignatureEnvelope.deserialize(initial)
     if (initialEnvelope.type !== 'multisig') throw new Error('unreachable')
     if (initialEnvelope.config.version !== 0n) throw new Error('unreachable')
@@ -3142,14 +3183,14 @@ describe('multisig', () => {
       signatureCount: envelope.signatures.length,
     }).toMatchInlineSnapshot(`
       {
-        "hash": "0x1cb47fcf31fb1ebb3177ec1744eeda195e4d789920d1214af32baaa6150ad5e2",
+        "hash": "0x507fa2d2bc6cf5e7753d4d7cb92fe3d199f64c6eaa9a0bd1d14bfb366028a379",
         "length": 787,
         "signatureCount": 8,
       }
     `)
   })
 
-  test('behavior: accepts initial and current nested witnesses', () => {
+  test('behavior: accepts initial and current nested signatures', () => {
     const initialEnvelope = SignatureEnvelope.deserialize(initial)
     const currentEnvelope = SignatureEnvelope.deserialize(current)
     if (
@@ -3191,7 +3232,7 @@ describe('multisig', () => {
     )
   })
 
-  test('error: rejects a self-owned current witness', () => {
+  test('error: rejects a self-owned current signature', () => {
     const envelope = SignatureEnvelope.deserialize(current)
     if (envelope.type !== 'multisig') throw new Error('unreachable')
     const account = envelope.config.owners[0]!.owner
@@ -3282,14 +3323,14 @@ describe('multisig', () => {
     {
       name: 'two fields',
       value: Rlp.fromHex([
-        '0x9dba7f426b711d4893c11611eacf7cc334e7146b',
+        '0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b',
         [Hex.slice(initial, -65)],
       ]),
     },
     {
       name: 'trailing field',
       value: Rlp.fromHex([
-        '0x9dba7f426b711d4893c11611eacf7cc334e7146b',
+        '0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b',
         MultisigConfig.toTuple(
           MultisigConfig.from({
             owners: [
@@ -3370,7 +3411,7 @@ describe('multisig', () => {
     const malformed = Hex.concat(
       '0x05',
       Rlp.fromHex([
-        '0x9dba7f426b711d4893c11611eacf7cc334e7146b',
+        '0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b',
         value as never,
         [Hex.slice(initial, -65)],
       ]),

package/tempo/SignatureEnvelope.ts

@@ -53,8 +53,6 @@ type SignatureEnvelopeKey =
   | 'version'
 
 type SignatureEnvelopeRpcKey =
-  | 'account'
-  | 'config'
   | 'keyId'
   | 'metadata'
   | 'preHash'
@@ -63,7 +61,6 @@ type SignatureEnvelopeRpcKey =
   | 'r'
   | 's'
   | 'signature'
-  | 'signatures'
   | 'type'
   | 'userAddress'
   | 'v'
@@ -161,7 +158,7 @@ export type SignatureEnvelopeRpc =
       Secp256k1Rpc | P256Rpc | WebAuthnRpc | KeychainRpc,
       SignatureEnvelopeRpcKey
     >
-  | MultisigRpcOneOf
+  | MultisigRpc
 
 /** Primitive signature envelope accepted by protocol sidecars. */
 export type Primitive<bigintType = bigint, numberType = number> = OneOf<
@@ -215,7 +212,7 @@ export type KeychainRpc = {
 export interface Multisig<bigintType = bigint, numberType = number> {
   /** Native multisig account address. */
   account: Address.Address
-  /** Complete applicable multisig configuration witness. */
+  /** Complete applicable multisig configuration. */
   config: MultisigConfig.Config<bigintType, numberType>
   /**
    * Owner approvals over the multisig owner approval digest. Each approval is
@@ -240,33 +237,8 @@ type MultisigOneOf<bigintType = bigint, numberType = number> = Multisig<
   version?: undefined
 }
 
-/** RPC-formatted native multisig signature. */
-export type MultisigRpc = {
-  /** Native multisig account address. */
-  account: Address.Address
-  /** Complete applicable multisig configuration witness. */
-  config: MultisigConfig.Config<number>
-  /** Structured owner approvals. */
-  signatures: readonly SignatureEnvelopeRpc[]
-  /** Multisig RPC signatures are untagged. */
-  type?: undefined
-}
-
-type MultisigRpcOneOf = MultisigRpc & {
-  keyId?: undefined
-  metadata?: undefined
-  preHash?: undefined
-  pubKeyX?: undefined
-  pubKeyY?: undefined
-  r?: undefined
-  s?: undefined
-  signature?: undefined
-  userAddress?: undefined
-  v?: undefined
-  version?: undefined
-  webauthnData?: undefined
-  yParity?: undefined
-}
+/** Canonical RLP-encoded native multisig signature without the `0x05` type byte. */
+export type MultisigRpc = Hex.Hex
 
 export type P256<bigintType = bigint, numberType = number> = {
   prehash: boolean
@@ -1081,7 +1053,7 @@ export declare namespace from {
     | {
         /** Initial native multisig account, derived from config when omitted. */
         account?: Address.Address | undefined
-        /** Initial version-0 multisig configuration witness. */
+        /** Initial version-0 multisig configuration. */
         config: MultisigConfig.Input<0 | 0n>
         /** Primitive or nested owner approvals. */
         signatures: readonly SignatureEnvelope[]
@@ -1090,7 +1062,7 @@ export declare namespace from {
     | {
         /** Native multisig account. */
         account: Address.Address
-        /** Complete applicable multisig configuration witness. */
+        /** Complete applicable multisig configuration. */
         config: MultisigConfig.Input
         /** Primitive or nested owner approvals. */
         signatures: readonly SignatureEnvelope[]
@@ -1140,6 +1112,20 @@ export declare namespace from {
  * @returns The signature envelope with bigint values.
  */
 export function fromRpc(envelope: SignatureEnvelopeRpc): SignatureEnvelope {
+  if (typeof envelope === 'string') {
+    const serialized = Hex.concat(serializedMultisigType, envelope)
+    const result = deserialize(serialized)
+    if (
+      result.type !== 'multisig' ||
+      !Hex.isEqual(serialize(result), serialized)
+    )
+      throw new InvalidSerializedError({
+        reason: 'invalid multisig RPC signature',
+        serialized: envelope,
+      })
+    return result
+  }
+
   if (envelope.type === 'secp256k1')
     return {
       signature: Signature.fromRpc(envelope),
@@ -1222,21 +1208,6 @@ export function fromRpc(envelope: SignatureEnvelopeRpc): SignatureEnvelope {
     }
   }
 
-  if (
-    (envelope as { type?: string | undefined }).type === 'multisig' ||
-    ('config' in envelope && 'signatures' in envelope)
-  ) {
-    const multisig = envelope as MultisigRpc
-    const result = {
-      account: multisig.account,
-      config: MultisigConfig.from(multisig.config),
-      signatures: multisig.signatures.map((signature) => fromRpc(signature)),
-      type: 'multisig',
-    } satisfies Multisig
-    assert(result)
-    return result
-  }
-
   throw new CoercionError({ envelope })
 }
 
@@ -1244,8 +1215,10 @@ export declare namespace fromRpc {
   type ErrorType =
     | assert.ErrorType
     | CoercionError
+    | Hex.concat.ErrorType
+    | Hex.isEqual.ErrorType
     | InvalidSerializedError
-    | MultisigConfig.assert.ErrorType
+    | serialize.ErrorType
     | Signature.fromRpc.ErrorType
     | Errors.GlobalErrorType
 }
@@ -1526,7 +1499,7 @@ export declare namespace sortMultisigApprovals {
   type Value = {
     /** The native multisig account address. */
     account: Address.Address
-    /** Complete applicable multisig configuration witness. */
+    /** Complete applicable multisig configuration. */
     config: MultisigConfig.Input
     /** The inner transaction sign payload (`tx.signature_hash()`). */
     payload: Hex.Hex | Bytes.Bytes
@@ -1611,15 +1584,7 @@ export function toRpc<const envelope extends toRpc.Input>(
 
   if (type === 'multisig') {
     const multisig = envelope as Multisig
-    assert(multisig)
-    return {
-      account: multisig.account,
-      config: {
-        ...multisig.config,
-        version: Hex.toNumber(Hex.fromNumber(multisig.config.version)),
-      },
-      signatures: multisig.signatures.map((signature) => toRpc(signature)),
-    } as never
+    return Hex.slice(serialize(multisig), 1) as never
   }
 
   throw new CoercionError({ envelope })
@@ -1647,7 +1612,8 @@ export declare namespace toRpc {
     | assert.ErrorType
     | CoercionError
     | Hex.fromNumber.ErrorType
-    | Hex.toNumber.ErrorType
+    | Hex.slice.ErrorType
+    | serialize.ErrorType
     | Signature.toRpc.ErrorType
     | Errors.GlobalErrorType
 }

package/tempo/Transaction.test.ts

@@ -1,6 +1,9 @@
 import { Transaction } from 'ox/tempo'
 import { describe, expect, test } from 'vitest'
 
+const multisigRpcSignature =
+  '0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b' as const
+
 describe('fromRpc', () => {
   test('default', () => {
     const transaction = Transaction.fromRpc({
@@ -527,3 +530,61 @@ describe('toRpc', () => {
     `)
   })
 })
+
+describe('roundtrip', () => {
+  test('behavior: multisig RPC signature', () => {
+    const rpc = {
+      accessList: [],
+      blockHash:
+        '0xc350d807505fb835650f0013632c5515592987ba169bbc6626d9fc54d91f0f0b',
+      blockNumber: '0x12f296f',
+      calls: [],
+      chainId: '0x1',
+      feeToken: '0x20c0000000000000000000000000000000000000',
+      from: '0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b',
+      gas: '0x43f5d',
+      hash: '0x353fdfc38a2f26115daadee9f5b8392ce62b84f410957967e2ed56b35338cdd0',
+      maxFeePerGas: '0x2',
+      maxPriorityFeePerGas: '0x1',
+      nonce: '0x357',
+      signature: multisigRpcSignature,
+      transactionIndex: '0x2',
+      type: '0x76',
+    } as const satisfies Transaction.TempoRpc
+    const transaction = Transaction.fromRpc(rpc)
+
+    expect({
+      rpc: Transaction.toRpc(transaction).signature,
+      signature: transaction.signature,
+    }).toMatchInlineSnapshot(`
+      {
+        "rpc": "0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b",
+        "signature": {
+          "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
+          "config": {
+            "owners": [
+              {
+                "owner": "0x7e5f4552091a69125d5dfcb7b8c2659029395bdf",
+                "weight": 1,
+              },
+            ],
+            "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "threshold": 1,
+            "version": 0n,
+          },
+          "signatures": [
+            {
+              "signature": {
+                "r": 60871800714128149016591846789173983752390955456021923556141688418770269698437n,
+                "s": 24367763726302312398084372528434045669788111037623467391175388828437596076276n,
+                "yParity": 0,
+              },
+              "type": "secp256k1",
+            },
+          ],
+          "type": "multisig",
+        },
+      }
+    `)
+  })
+})

package/tempo/TransactionRequest.test-d.ts

@@ -1,24 +1,24 @@
 import { expectTypeOf, test } from 'vitest'
-import type * as MultisigWitness from './MultisigWitness.js'
+import type * as MultisigSimulation from './MultisigSimulation.js'
 import type * as TransactionRequest from './TransactionRequest.js'
 
 declare const request: TransactionRequest.TransactionRequest
 declare const rpc: TransactionRequest.Rpc
 
-test('transaction requests use domain multisig witnesses', () => {
-  expectTypeOf(request.multisigWitness?.config.version).toEqualTypeOf<
+test('transaction requests use domain multisig simulation specs', () => {
+  expectTypeOf(request.multisigSimulation?.config.version).toEqualTypeOf<
     bigint | undefined
   >()
 
-  const approval = request.multisigWitness?.approvals[0]
+  const approval = request.multisigSimulation?.approvals[0]
   if (approval?.type === 'multisig')
-    expectTypeOf(approval.witness.approvals[0]?.keyType).toEqualTypeOf<
-      MultisigWitness.NestedPrimitiveApproval['keyType']
+    expectTypeOf(approval.spec.approvals[0]?.keyType).toEqualTypeOf<
+      MultisigSimulation.NestedPrimitiveApproval['keyType']
     >()
 })
 
-test('RPC requests use numeric multisig config versions', () => {
-  expectTypeOf(rpc.multisigWitness?.config.version).toEqualTypeOf<
-    number | undefined
+test('RPC requests use encoded multisig configurations', () => {
+  expectTypeOf(rpc.multisigSimulation?.config).toEqualTypeOf<
+    `0x${string}` | undefined
   >()
 })