ox 1.7.4 → 1.7.5

package/src/tempo/Transaction.test.ts

@@ -2,7 +2,7 @@ import { Transaction } from 'ox/tempo'
 import { describe, expect, test } from 'vp/test'
 
 const multisigRpcSignature =
-  '0xf897949dba7f426b711d4893c11611eacf7cc334e7146bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b' as const
+  '0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b' as const
 
 describe('fromRpc', () => {
   test('default', () => {
@@ -526,7 +526,7 @@ describe('roundtrip', () => {
       calls: [],
       chainId: '0x1',
       feeToken: '0x20c0000000000000000000000000000000000000',
-      from: '0x9dba7f426b711d4893c11611eacf7cc334e7146b',
+      from: '0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b',
       gas: '0x43f5d',
       hash: '0x353fdfc38a2f26115daadee9f5b8392ce62b84f410957967e2ed56b35338cdd0',
       maxFeePerGas: '0x2',
@@ -543,9 +543,9 @@ describe('roundtrip', () => {
       signature: transaction.signature,
     }).toMatchInlineSnapshot(`
       {
-        "rpc": "0xf897949dba7f426b711d4893c11611eacf7cc334e7146bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b",
+        "rpc": "0xf89794c4a590afa7337e5cd5eb3aa60cacf91c5400044bf83ba000000000000000000000000000000000000000000000000000000000000000008001d7d6947e5f4552091a69125d5dfcb7b8c2659029395bdf01f843b841869437e01f64bebeb78a8a6b30bfd3a993819c8cad82c807515d9b9e9b36f98535dfaa5eebc597715d05f6ce4927747f14fa4cd2acc717fdcd3877146437f8f41b",
         "signature": {
-          "account": "0x9dba7f426b711d4893c11611eacf7cc334e7146b",
+          "account": "0xc4a590afa7337e5cd5eb3aa60cacf91c5400044b",
           "config": {
             "owners": [
               {

package/src/tempo/TransactionRequest.test.ts

@@ -6,27 +6,11 @@ import {
 import { describe, expect, test } from 'vp/test'
 
 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({
@@ -179,36 +148,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": {
@@ -331,26 +275,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",
@@ -457,6 +386,7 @@ describe('roundtrip', () => {
       nonceKey: 255n,
       gas: 100000n,
       maxFeePerGas: 1000000000n,
+      keyAuthorizationSimulation: multisigSimulation,
       multisigSimulation,
     }
 
@@ -478,6 +408,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')
   })
@@ -496,6 +429,7 @@ describe('roundtrip', () => {
       validAfter: '0x32',
       nonceKey: '0xff',
       gas: '0x186a0',
+      keyAuthorizationSimulation: multisigSimulationRpc,
       multisigSimulation: multisigSimulationRpc,
       type: '0x76',
     }
@@ -509,6 +443,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/src/tempo/TransactionRequest.ts

@@ -13,7 +13,7 @@ import * as Transaction from './Transaction.js'
 import * as TxEnvelopeTempo from './TxEnvelopeTempo.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.
@@ -41,6 +41,7 @@ export type TransactionRequest<
     feePayerSignature?: Signature.Signature<true, numberType> | null | undefined
     feeToken?: Address.Address | undefined
     keyAuthorization?: KeyAuthorization.KeyAuthorization<true> | undefined
+    keyAuthorizationSimulation?: MultisigSimulation.Spec | undefined
     keyData?: Hex.Hex | undefined
     keyId?: Address.Address | undefined
     keyType?: KeyType | undefined
@@ -60,12 +61,14 @@ export type Rpc = Omit<
   | 'feeToken'
   | 'keyAuthorization'
   | 'multisigSimulation'
+  | 'keyAuthorizationSimulation'
   | 'signature'
 > & {
   authorizationList?: AuthorizationTempo.ListRpc | undefined
   feePayerSignature?: Signature.Rpc | null | undefined
   feeToken?: Hex.Hex | undefined
   keyAuthorization?: KeyAuthorization.Rpc | undefined
+  keyAuthorizationSimulation?: MultisigSimulation.Rpc | undefined
   multisigSimulation?: MultisigSimulation.Rpc | undefined
   nonceKey?: Hex.Hex | undefined
   signature?: SignatureEnvelope.SignatureEnvelopeRpc | undefined
@@ -94,7 +97,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
@@ -129,6 +137,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,
@@ -222,6 +234,7 @@ export function toRpc(request: toRpc.Input): Rpc {
     typeof request.keyData !== 'undefined' ||
     typeof request.keyId !== 'undefined' ||
     typeof request.keyType !== 'undefined' ||
+    typeof request.keyAuthorizationSimulation !== 'undefined' ||
     typeof request.multisigSimulation !== 'undefined' ||
     typeof request.nonceKey !== 'undefined' ||
     typeof request.validBefore !== 'undefined' ||
@@ -272,6 +285,10 @@ export function toRpc(request: toRpc.Input): Rpc {
   if (typeof request.keyId !== 'undefined') request_rpc.keyId = request.keyId
   if (typeof request.keyType !== 'undefined')
     request_rpc.keyType = request.keyType
+  if (typeof request.keyAuthorizationSimulation !== 'undefined')
+    request_rpc.keyAuthorizationSimulation = MultisigSimulation.toRpc(
+      request.keyAuthorizationSimulation,
+    )
   if (typeof request.multisigSimulation !== 'undefined')
     request_rpc.multisigSimulation = MultisigSimulation.toRpc(
       request.multisigSimulation,

package/src/tempo/index.ts

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