ox 0.14.39 → 0.14.40

package/tempo/TransactionRequest.test.ts

@@ -1,6 +1,74 @@
-import { TransactionRequest } from 'ox/tempo'
+import { type MultisigWitness, TransactionRequest } from 'ox/tempo'
 import { describe, expect, test } from 'vitest'
 
+const multisigWitnessRpc = {
+  account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+  approvals: [
+    {
+      keyType: 'secp256k1',
+      owner: '0x1111111111111111111111111111111111111111',
+      type: 'primitive',
+    },
+    {
+      type: 'multisig',
+      witness: {
+        account: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+        approvals: [
+          {
+            keyData: '0x0578',
+            keyType: 'webAuthn',
+            owner: '0x2222222222222222222222222222222222222222',
+          },
+        ],
+        config: {
+          owners: [
+            {
+              owner: '0x2222222222222222222222222222222222222222',
+              weight: 1,
+            },
+          ],
+          salt: `0x${'22'.repeat(32)}`,
+          threshold: 1,
+          version: 1,
+        },
+      },
+    },
+  ],
+  config: {
+    owners: [
+      {
+        owner: '0x1111111111111111111111111111111111111111',
+        weight: 1,
+      },
+      {
+        owner: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+        weight: 1,
+      },
+    ],
+    salt: `0x${'11'.repeat(32)}`,
+    threshold: 2,
+    version: 0,
+  },
+} as const satisfies MultisigWitness.Rpc
+
+const multisigWitness = {
+  ...multisigWitnessRpc,
+  approvals: [
+    multisigWitnessRpc.approvals[0],
+    {
+      ...multisigWitnessRpc.approvals[1],
+      witness: {
+        ...multisigWitnessRpc.approvals[1].witness,
+        config: {
+          ...multisigWitnessRpc.approvals[1].witness.config,
+          version: 1n,
+        },
+      },
+    },
+  ],
+  config: { ...multisigWitnessRpc.config, version: 0n },
+} as const satisfies MultisigWitness.MultisigWitness
+
 describe('fromRpc', () => {
   test('default', () => {
     const request = TransactionRequest.fromRpc({
@@ -69,6 +137,21 @@ describe('fromRpc', () => {
     expect(request.nonceKey).toBe(255n)
   })
 
+  test('behavior: multisig witness', () => {
+    const request = TransactionRequest.fromRpc({
+      from: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      multisigWitness: multisigWitnessRpc,
+      type: '0x76',
+    })
+
+    expect(request.multisigWitness?.config.version).toBe(0n)
+    const nested = request.multisigWitness?.approvals[1]
+    expect(nested?.type).toBe('multisig')
+    if (nested?.type !== 'multisig') throw new Error('expected multisig')
+    expect(nested.witness.config.version).toBe(1n)
+    expect(nested.witness.approvals[0]?.keyType).toBe('webAuthn')
+  })
+
   test('behavior: empty', () => {
     const request = TransactionRequest.fromRpc({})
     expect(request).toMatchInlineSnapshot('{}')
@@ -122,6 +205,20 @@ describe('toRpc', () => {
       }
     `)
   })
+
+  test('behavior: multisig witness', () => {
+    const request = TransactionRequest.toRpc({
+      from: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      multisigWitness,
+    })
+
+    expect(request.multisigWitness?.config.version).toBe(0)
+    const nested = request.multisigWitness?.approvals[1]
+    expect(nested?.type).toBe('multisig')
+    if (nested?.type !== 'multisig') throw new Error('expected multisig')
+    expect(nested.witness.config.version).toBe(1)
+    expect(request.type).toBe('0x76')
+  })
 })
 
 describe('roundtrip', () => {
@@ -144,6 +241,7 @@ describe('roundtrip', () => {
       nonceKey: 255n,
       gas: 100000n,
       maxFeePerGas: 1000000000n,
+      multisigWitness,
     }
 
     const rpc = TransactionRequest.toRpc(original)
@@ -164,6 +262,7 @@ describe('roundtrip', () => {
     expect(converted.nonceKey).toBe(original.nonceKey)
     expect(converted.gas).toBe(original.gas)
     expect(converted.maxFeePerGas).toBe(original.maxFeePerGas)
+    expect(converted.multisigWitness).toEqual(original.multisigWitness)
     expect(converted.type).toBe('tempo')
   })
 
@@ -181,6 +280,7 @@ describe('roundtrip', () => {
       validAfter: '0x32',
       nonceKey: '0xff',
       gas: '0x186a0',
+      multisigWitness: multisigWitnessRpc,
       type: '0x76',
     }
 
@@ -193,6 +293,7 @@ describe('roundtrip', () => {
     expect(rpc.validAfter).toBe(original.validAfter)
     expect(rpc.nonceKey).toBe(original.nonceKey)
     expect(rpc.gas).toBe(original.gas)
+    expect(rpc.multisigWitness).toEqual(original.multisigWitness)
     expect(rpc.type).toBe('0x76')
   })
 })

package/tempo/TransactionRequest.ts

@@ -4,6 +4,7 @@ import type { Compute } from '../core/internal/types.js'
 import * as ox_TransactionRequest from '../core/TransactionRequest.js'
 import * as AuthorizationTempo from './AuthorizationTempo.js'
 import * as KeyAuthorization from './KeyAuthorization.js'
+import * as MultisigWitness from './MultisigWitness.js'
 import * as TempoAddress from './TempoAddress.js'
 import * as TokenId from './TokenId.js'
 import * as Transaction from './Transaction.js'
@@ -38,6 +39,7 @@ export type TransactionRequest<
     keyType?: KeyType | undefined
     feePayer?: boolean | undefined
     feeToken?: TokenId.TokenIdOrAddress<addressType> | undefined
+    multisigWitness?: MultisigWitness.MultisigWitness<bigintType> | undefined
     nonceKey?: 'random' | bigintType | undefined
     validBefore?: numberType | undefined
     validAfter?: numberType | undefined
@@ -47,11 +49,12 @@ export type TransactionRequest<
 /** RPC representation of a {@link ox#TransactionRequest.TransactionRequest}. */
 export type Rpc = Omit<
   TransactionRequest<Hex.Hex, Hex.Hex, string, Hex.Hex>,
-  'authorizationList' | 'feeToken' | 'keyAuthorization'
+  'authorizationList' | 'feeToken' | 'keyAuthorization' | 'multisigWitness'
 > & {
   authorizationList?: AuthorizationTempo.ListRpc | undefined
   feeToken?: Hex.Hex | undefined
   keyAuthorization?: KeyAuthorization.Rpc | undefined
+  multisigWitness?: MultisigWitness.Rpc | undefined
   nonceKey?: Hex.Hex | undefined
 }
 
@@ -76,7 +79,7 @@ export type Rpc = Omit<
  * @returns A transaction request.
  */
 export function fromRpc(request: Rpc): TransactionRequest {
-  const { authorizationList: _, ...rest } = request
+  const { authorizationList: _, multisigWitness: __, ...rest } = request
   const request_ = ox_TransactionRequest.fromRpc(
     rest as any,
   ) as TransactionRequest
@@ -107,6 +110,8 @@ export function fromRpc(request: Rpc): TransactionRequest {
     request_.keyAuthorization = KeyAuthorization.fromRpc(
       request.keyAuthorization,
     )
+  if (request.multisigWitness)
+    request_.multisigWitness = MultisigWitness.fromRpc(request.multisigWitness)
   if (typeof request.validBefore !== 'undefined')
     request_.validBefore = Hex.toNumber(request.validBefore as Hex.Hex)
   if (typeof request.validAfter !== 'undefined')
@@ -120,6 +125,7 @@ export function fromRpc(request: Rpc): TransactionRequest {
 export declare namespace fromRpc {
   export type ErrorType =
     | AuthorizationTempo.fromRpcList.ErrorType
+    | MultisigWitness.fromRpc.ErrorType
     | Hex.toNumber.ErrorType
     | Hex.toBigInt.ErrorType
     | Errors.GlobalErrorType
@@ -204,6 +210,8 @@ export function toRpc(request: TransactionRequest): Rpc {
     request_rpc.keyAuthorization = KeyAuthorization.toRpc(
       request.keyAuthorization,
     )
+  if (request.multisigWitness)
+    request_rpc.multisigWitness = MultisigWitness.toRpc(request.multisigWitness)
   if (typeof request.validBefore !== 'undefined')
     request_rpc.validBefore = Hex.fromNumber(request.validBefore)
   if (typeof request.validAfter !== 'undefined')
@@ -222,6 +230,7 @@ export function toRpc(request: TransactionRequest): Rpc {
     typeof request.feePayer !== 'undefined' ||
     typeof request.feeToken !== 'undefined' ||
     typeof request.keyAuthorization !== 'undefined' ||
+    typeof request.multisigWitness !== 'undefined' ||
     typeof request.nonceKey !== 'undefined' ||
     typeof request.validBefore !== 'undefined' ||
     typeof request.validAfter !== 'undefined' ||
@@ -240,6 +249,7 @@ export function toRpc(request: TransactionRequest): Rpc {
 export declare namespace toRpc {
   export type ErrorType =
     | AuthorizationTempo.toRpcList.ErrorType
+    | MultisigWitness.toRpc.ErrorType
     | Hex.fromNumber.ErrorType
     | Errors.GlobalErrorType
 }

package/tempo/index.ts

@@ -159,6 +159,15 @@ export * as MultisigConfig from './MultisigConfig.js'
  * @category Reference
  */
 export * as MultisigOperation from './MultisigOperation.js'
+/**
+ * Native multisig RPC simulation witness utilities.
+ *
+ * Converts complete root and nested owner witnesses between their domain and
+ * Tempo JSON-RPC representations.
+ *
+ * @category Reference
+ */
+export * as MultisigWitness from './MultisigWitness.js'
 /**
  * Utilities for constructing period durations (in seconds) for recurring spending limits.
  *

package/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '0.14.39'
+export const version = '0.14.40'