ox 0.14.44 → 0.14.46

package/tempo/TransactionRequest.test-d.ts

@@ -10,11 +10,12 @@ test('transaction requests use domain multisig simulation specs', () => {
     bigint | undefined
   >()
 
-  const approval = request.multisigSimulation?.approvals[0]
-  if (approval?.type === 'multisig')
-    expectTypeOf(approval.spec.approvals[0]?.keyType).toEqualTypeOf<
-      MultisigSimulation.NestedPrimitiveApproval['keyType']
-    >()
+  expectTypeOf(request.multisigSimulation?.approvals[0]?.keyType).toEqualTypeOf<
+    MultisigSimulation.PrimitiveApproval['keyType']
+  >()
+  expectTypeOf(request.keyAuthorizationSimulation).toEqualTypeOf<
+    MultisigSimulation.Spec | undefined
+  >()
 })
 
 test('RPC requests use encoded multisig configurations', () => {

package/tempo/TransactionRequest.test.ts

@@ -6,27 +6,11 @@ import {
 import { describe, expect, test } from 'vitest'
 
 const multisigSimulationRpc = {
-  account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
   approvals: [
     {
-      keyType: 'secp256k1',
+      keyType: 'webAuthn',
+      keyData: '0x0005',
       owner: '0x1111111111111111111111111111111111111111',
-      type: 'primitive',
-    },
-    {
-      spec: {
-        account: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
-        approvals: [
-          {
-            keyData: '0x0578',
-            keyType: 'webAuthn',
-            owner: '0x2222222222222222222222222222222222222222',
-          },
-        ],
-        config:
-          '0xf83ba022222222222222222222222222222222222222222222222222222222222222220101d7d694222222222222222222222222222222222222222201',
-      },
-      type: 'multisig',
     },
   ],
   config:
@@ -34,26 +18,11 @@ const multisigSimulationRpc = {
 } as const satisfies MultisigSimulation.Rpc
 
 const multisigSimulation = {
-  account: multisigSimulationRpc.account,
   approvals: [
-    multisigSimulationRpc.approvals[0],
     {
-      spec: {
-        account: multisigSimulationRpc.approvals[1].spec.account,
-        approvals: multisigSimulationRpc.approvals[1].spec.approvals,
-        config: MultisigConfig.from({
-          owners: [
-            {
-              owner: '0x2222222222222222222222222222222222222222',
-              weight: 1,
-            },
-          ],
-          salt: `0x${'22'.repeat(32)}`,
-          threshold: 1,
-          version: 1n,
-        }),
-      },
-      type: 'multisig',
+      keyType: 'webAuthn',
+      keyData: '0x0005',
+      owner: '0x1111111111111111111111111111111111111111',
     },
   ],
   config: MultisigConfig.from({
@@ -149,36 +118,11 @@ describe('fromRpc', () => {
 
     expect(request.multisigSimulation).toMatchInlineSnapshot(`
       {
-        "account": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         "approvals": [
           {
-            "keyType": "secp256k1",
+            "keyData": "0x0005",
+            "keyType": "webAuthn",
             "owner": "0x1111111111111111111111111111111111111111",
-            "type": "primitive",
-          },
-          {
-            "spec": {
-              "account": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-              "approvals": [
-                {
-                  "keyData": "0x0578",
-                  "keyType": "webAuthn",
-                  "owner": "0x2222222222222222222222222222222222222222",
-                },
-              ],
-              "config": {
-                "owners": [
-                  {
-                    "owner": "0x2222222222222222222222222222222222222222",
-                    "weight": 1,
-                  },
-                ],
-                "salt": "0x2222222222222222222222222222222222222222222222222222222222222222",
-                "threshold": 1,
-                "version": 1n,
-              },
-            },
-            "type": "multisig",
           },
         ],
         "config": {
@@ -264,26 +208,11 @@ describe('toRpc', () => {
       {
         "from": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         "multisigSimulation": {
-          "account": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           "approvals": [
             {
-              "keyType": "secp256k1",
+              "keyData": "0x0005",
+              "keyType": "webAuthn",
               "owner": "0x1111111111111111111111111111111111111111",
-              "type": "primitive",
-            },
-            {
-              "spec": {
-                "account": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-                "approvals": [
-                  {
-                    "keyData": "0x0578",
-                    "keyType": "webAuthn",
-                    "owner": "0x2222222222222222222222222222222222222222",
-                  },
-                ],
-                "config": "0xf83ba022222222222222222222222222222222222222222222222222222222222222220101d7d694222222222222222222222222222222222222222201",
-              },
-              "type": "multisig",
             },
           ],
           "config": "0xf852a011111111111111111111111111111111111111111111111111111111111111118002eed694111111111111111111111111111111111111111101d694bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb01",
@@ -314,6 +243,7 @@ describe('roundtrip', () => {
       nonceKey: 255n,
       gas: 100000n,
       maxFeePerGas: 1000000000n,
+      keyAuthorizationSimulation: multisigSimulation,
       multisigSimulation,
     }
 
@@ -335,6 +265,9 @@ describe('roundtrip', () => {
     expect(converted.nonceKey).toBe(original.nonceKey)
     expect(converted.gas).toBe(original.gas)
     expect(converted.maxFeePerGas).toBe(original.maxFeePerGas)
+    expect(converted.keyAuthorizationSimulation).toEqual(
+      original.keyAuthorizationSimulation,
+    )
     expect(converted.multisigSimulation).toEqual(original.multisigSimulation)
     expect(converted.type).toBe('tempo')
   })
@@ -353,6 +286,7 @@ describe('roundtrip', () => {
       validAfter: '0x32',
       nonceKey: '0xff',
       gas: '0x186a0',
+      keyAuthorizationSimulation: multisigSimulationRpc,
       multisigSimulation: multisigSimulationRpc,
       type: '0x76',
     }
@@ -366,6 +300,9 @@ describe('roundtrip', () => {
     expect(rpc.validAfter).toBe(original.validAfter)
     expect(rpc.nonceKey).toBe(original.nonceKey)
     expect(rpc.gas).toBe(original.gas)
+    expect(rpc.keyAuthorizationSimulation).toEqual(
+      original.keyAuthorizationSimulation,
+    )
     expect(rpc.multisigSimulation).toEqual(original.multisigSimulation)
     expect(rpc.type).toBe('0x76')
   })

package/tempo/TransactionRequest.ts

@@ -5,12 +5,13 @@ import * as ox_TransactionRequest from '../core/TransactionRequest.js'
 import * as AuthorizationTempo from './AuthorizationTempo.js'
 import * as KeyAuthorization from './KeyAuthorization.js'
 import * as MultisigSimulation from './MultisigSimulation.js'
+import type * as SignatureEnvelope from './SignatureEnvelope.js'
 import * as TempoAddress from './TempoAddress.js'
 import * as TokenId from './TokenId.js'
 import * as Transaction from './Transaction.js'
 import type { Call } from './TxEnvelopeTempo.js'
 
-type KeyType = 'secp256k1' | 'p256' | 'webAuthn'
+type KeyType = SignatureEnvelope.Type | 'multisig'
 
 /**
  * A Transaction Request that is generic to all transaction types.
@@ -37,6 +38,7 @@ export type TransactionRequest<
     feePayer?: boolean | undefined
     feeToken?: TokenId.TokenIdOrAddress<addressType> | undefined
     keyAuthorization?: KeyAuthorization.KeyAuthorization<true> | undefined
+    keyAuthorizationSimulation?: MultisigSimulation.Spec | undefined
     keyData?: Hex.Hex | undefined
     keyType?: KeyType | undefined
     multisigSimulation?: MultisigSimulation.Spec | undefined
@@ -49,11 +51,16 @@ 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' | 'multisigSimulation'
+  | 'authorizationList'
+  | 'feeToken'
+  | 'keyAuthorization'
+  | 'multisigSimulation'
+  | 'keyAuthorizationSimulation'
 > & {
   authorizationList?: AuthorizationTempo.ListRpc | undefined
   feeToken?: Hex.Hex | undefined
   keyAuthorization?: KeyAuthorization.Rpc | undefined
+  keyAuthorizationSimulation?: MultisigSimulation.Rpc | undefined
   multisigSimulation?: MultisigSimulation.Rpc | undefined
   nonceKey?: Hex.Hex | undefined
 }
@@ -79,7 +86,12 @@ export type Rpc = Omit<
  * @returns A transaction request.
  */
 export function fromRpc(request: Rpc): TransactionRequest {
-  const { authorizationList: _, multisigSimulation: __, ...rest } = request
+  const {
+    authorizationList: _,
+    multisigSimulation: __,
+    keyAuthorizationSimulation: ___,
+    ...rest
+  } = request
   const request_ = ox_TransactionRequest.fromRpc(
     rest as any,
   ) as TransactionRequest
@@ -110,6 +122,10 @@ export function fromRpc(request: Rpc): TransactionRequest {
     request_.keyAuthorization = KeyAuthorization.fromRpc(
       request.keyAuthorization,
     )
+  if (request.keyAuthorizationSimulation)
+    request_.keyAuthorizationSimulation = MultisigSimulation.fromRpc(
+      request.keyAuthorizationSimulation,
+    )
   if (request.multisigSimulation)
     request_.multisigSimulation = MultisigSimulation.fromRpc(
       request.multisigSimulation,
@@ -212,6 +228,10 @@ export function toRpc(request: TransactionRequest): Rpc {
     request_rpc.keyAuthorization = KeyAuthorization.toRpc(
       request.keyAuthorization,
     )
+  if (request.keyAuthorizationSimulation)
+    request_rpc.keyAuthorizationSimulation = MultisigSimulation.toRpc(
+      request.keyAuthorizationSimulation,
+    )
   if (request.multisigSimulation)
     request_rpc.multisigSimulation = MultisigSimulation.toRpc(
       request.multisigSimulation,

package/tempo/index.ts

@@ -144,7 +144,9 @@ export * as KeyAuthorization from './KeyAuthorization.js'
  *   ],
  * })
  *
- * const account = MultisigConfig.getAddress(initialConfig)
+ * const account = MultisigConfig.getAddress(initialConfig, {
+ *   factory: '0x7171717171717171717171717171717171717171'
+ * })
  * ```
  *
  * @category Reference