ox 1.6.2 → 1.6.3

package/src/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '1.6.2'
+export const version = '1.6.3'

package/src/zod/tempo/KeyAuthorization.ts

@@ -9,6 +9,16 @@ import {
 import * as z from 'zod/mini'
 import * as z_SignatureEnvelope from './SignatureEnvelope.js'
 
+const SignatureRpc = z.union([
+  z_SignatureEnvelope.PrimitiveRpc,
+  z_SignatureEnvelope.MultisigRpc,
+])
+
+const Signature = z.union([
+  z_SignatureEnvelope.Primitive,
+  z_SignatureEnvelope.Multisig,
+])
+
 /** RPC token spending limit schema. */
 export const RpcTokenLimit = z.object({
   limit: z_Hex.Hex,
@@ -38,7 +48,7 @@ export const Rpc = z.object({
   keyId: z_Address.Address,
   keyType: z_SignatureEnvelope.Type,
   limits: z.optional(z.nullable(z.readonly(z.array(RpcTokenLimit)))),
-  signature: z_SignatureEnvelope.PrimitiveRpc,
+  signature: SignatureRpc,
   witness: z.optional(z.nullable(z_Hex.Hex)),
 })
 
@@ -69,7 +79,7 @@ const domainShape = {
   expiry: z.optional(z.number()),
   limits: z.optional(z.readonly(z.array(TokenLimit))),
   scopes: z.optional(z.readonly(z.array(Scope))),
-  signature: z_SignatureEnvelope.Primitive,
+  signature: Signature,
   type: z_SignatureEnvelope.Type,
   witness: z.optional(z_Hex.Hex),
 }

package/src/zod/tempo/_test/KeyAuthorization.test.ts

@@ -141,15 +141,29 @@ describe('KeyAuthorization', () => {
     ).toBe(false)
   })
 
-  test('rejects multisig signatures', () => {
+  test('round-trips multisig signatures', () => {
     const multisigRpc = {
       account: '0x1111111111111111111111111111111111111111',
       signatures: [rpc.signature],
     } as const
+    const withMultisig = { ...rpc, signature: multisigRpc }
+    const decoded = z.decode(z_KeyAuthorization.KeyAuthorization, withMultisig)
+    expect(decoded).toEqual(core_KeyAuthorization.fromRpc(withMultisig))
+    expect(z.encode(z_KeyAuthorization.KeyAuthorization, decoded)).toEqual(
+      core_KeyAuthorization.toRpc(decoded),
+    )
+  })
+
+  test('rejects keychain signatures', () => {
+    const keychainRpc = {
+      signature: rpc.signature,
+      type: 'keychain',
+      userAddress: '0x1111111111111111111111111111111111111111',
+    } as const
     expect(
       z.safeDecode(z_KeyAuthorization.KeyAuthorization, {
         ...rpc,
-        signature: multisigRpc,
+        signature: keychainRpc,
       } as never).success,
     ).toBe(false)
 
@@ -158,9 +172,9 @@ describe('KeyAuthorization', () => {
       z.safeEncode(z_KeyAuthorization.KeyAuthorization, {
         ...authorization,
         signature: {
-          account: multisigRpc.account,
-          signatures: [authorization.signature],
-          type: 'multisig',
+          inner: authorization.signature,
+          type: 'keychain',
+          userAddress: keychainRpc.userAddress,
         },
       } as never).success,
     ).toBe(false)