ox 1.7.1 → 1.7.4

package/src/tempo/RpcSchemaTempo.ts

@@ -1,9 +1,13 @@
+import type * as Address from '../core/Address.js'
 import type * as Block from '../core/Block.js'
 import type * as BlockOverrides from '../core/BlockOverrides.js'
 import type * as Hex from '../core/Hex.js'
 import type * as Log from '../core/Log.js'
 import type * as RpcSchema from '../core/RpcSchema.js'
 import type * as StateOverrides from '../core/StateOverrides.js'
+import type * as KeyAuthorization from './KeyAuthorization.js'
+import type * as MultisigConfig from './MultisigConfig.js'
+import type * as MultisigOperation from './MultisigOperation.js'
 import type * as TransactionRequest from './TransactionRequest.js'
 
 /**
@@ -53,3 +57,45 @@ export type Tempo = RpcSchema.From<{
     }
   }
 }>
+
+/** Union of all JSON-RPC methods for the `multisig_` namespace. */
+export type Multisig = RpcSchema.From<
+  | {
+      Request: {
+        method: 'multisig_approveKeyAuthorization'
+        params: [
+          | { keyAuthorization: KeyAuthorization.Rpc }
+          | { hash: Hex.Hex; signature: Hex.Hex },
+        ]
+      }
+      ReturnType: MultisigOperation.KeyAuthorizationRpc
+    }
+  | {
+      Request: {
+        method: 'multisig_approveRawTransaction'
+        params: [serializedTransaction: Hex.Hex]
+      }
+      ReturnType: Hex.Hex
+    }
+  | {
+      Request: {
+        method: 'multisig_approveRawTransactionSync'
+        params: [serializedTransaction: Hex.Hex, timeout?: number]
+      }
+      ReturnType: MultisigOperation.TransactionRpc
+    }
+  | {
+      Request: {
+        method: 'multisig_getConfig'
+        params: [{ address: Address.Address }]
+      }
+      ReturnType: MultisigConfig.Rpc | null
+    }
+  | {
+      Request: {
+        method: 'multisig_getOperation'
+        params: [hash: Hex.Hex]
+      }
+      ReturnType: MultisigOperation.Rpc | null
+    }
+>

package/src/tempo/SignatureEnvelope.test-d.ts

@@ -1,14 +1,8 @@
 import { expectTypeOf, test } from 'vp/test'
+import * as MultisigConfig from './MultisigConfig.js'
 import * as SignatureEnvelope from './SignatureEnvelope.js'
 
 const signature = {
-  r: '0x01',
-  s: '0x02',
-  type: 'secp256k1',
-  yParity: '0x0',
-} as const satisfies SignatureEnvelope.SignatureEnvelopeRpc
-
-const signatureDomain = {
   signature: {
     r: '0x01',
     s: '0x02',
@@ -17,81 +11,48 @@ const signatureDomain = {
   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(signatureDomain),
+    SignatureEnvelope.toRpc(signature),
   ).toEqualTypeOf<SignatureEnvelope.Secp256k1Rpc>()
 })
 
-test('MultisigRpc uses static initialized and bootstrap shapes', () => {
-  const initialized = {
-    account: '0x1111111111111111111111111111111111111111',
-    signatures: [signature],
-  } as const satisfies SignatureEnvelope.MultisigRpc
-  const bootstrap = {
-    init: {
-      owners: [
-        {
-          owner: '0x1111111111111111111111111111111111111111',
-          weight: 1,
-        },
-      ],
-      threshold: 1,
-    },
-    signatures: [signature],
-  } as const satisfies SignatureEnvelope.MultisigRpc
-  const bootstrapWithAccountUndefined: SignatureEnvelope.MultisigRpc = {
-    ...bootstrap,
-    account: undefined,
-  }
-
-  expectTypeOf(initialized.signatures).toMatchTypeOf<
-    readonly SignatureEnvelope.SignatureEnvelopeRpc[]
-  >()
-  expectTypeOf(bootstrap.signatures).toMatchTypeOf<
-    readonly SignatureEnvelope.SignatureEnvelopeRpc[]
-  >()
-  expectTypeOf(
-    bootstrapWithAccountUndefined,
-  ).toMatchTypeOf<SignatureEnvelope.MultisigRpc>()
-  expectTypeOf<
-    SignatureEnvelope.GetType<typeof bootstrap>
-  >().toEqualTypeOf<'multisig'>()
+test('MultisigRpc contains an untagged serialized multisig signature', () => {
+  const rpc = '0xf8' as const satisfies SignatureEnvelope.MultisigRpc
+  expectTypeOf(rpc).toMatchTypeOf<`0x${string}`>()
 })
 
-test('MultisigRpc rejects legacy shapes', () => {
-  const combined = {
-    account: '0x1111111111111111111111111111111111111111',
-    init: {
-      owners: [
-        {
-          owner: '0x1111111111111111111111111111111111111111',
-          weight: 1,
-        },
-      ],
-      threshold: 1,
-    },
+test('from derives an initial account', () => {
+  const multisig = SignatureEnvelope.from({
+    config,
     signatures: [signature],
-  } as const
-  // @ts-expect-error Bootstrap RPC signatures omit `account`.
-  const combinedRpc: SignatureEnvelope.MultisigRpc = combined
+  })
 
-  const serialized = {
-    account: '0x1111111111111111111111111111111111111111',
-    signatures: ['0x1234'],
-  } as const
-  // @ts-expect-error Owner approvals use structured RPC envelopes.
-  const serializedRpc: SignatureEnvelope.MultisigRpc = serialized
+  expectTypeOf(multisig).toMatchTypeOf<SignatureEnvelope.Multisig>()
+  expectTypeOf(multisig.config.version).toEqualTypeOf<bigint>()
+})
 
-  const tagged = {
-    account: '0x1111111111111111111111111111111111111111',
+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],
-    type: 'multisig',
-  } as const
-  // @ts-expect-error Multisig RPC signatures are untagged.
-  const taggedRpc: SignatureEnvelope.MultisigRpc = tagged
+  })
 
-  expectTypeOf(combinedRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
-  expectTypeOf(serializedRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
-  expectTypeOf(taggedRpc).toEqualTypeOf<SignatureEnvelope.MultisigRpc>()
+  const multisig = SignatureEnvelope.from({
+    account: '0x2222222222222222222222222222222222222222',
+    config: { ...config, version: 1 },
+    signatures: [signature],
+  })
+  expectTypeOf(multisig).toMatchTypeOf<SignatureEnvelope.Multisig>()
 })