ox 1.7.2 → 1.7.4

package/dist/zod/tempo/z.js

@@ -3,7 +3,7 @@ export * as AuthorizationTempo from './AuthorizationTempo.js';
 export * as KeyAuthorization from './KeyAuthorization.js';
 export * as MultisigConfig from './MultisigConfig.js';
 export * as MultisigOperation from './MultisigOperation.js';
-export * as MultisigWitness from './MultisigWitness.js';
+export * as MultisigSimulation from './MultisigSimulation.js';
 export * as PoolId from './PoolId.js';
 export * as RpcSchemaTempo from './RpcSchemaTempo.js';
 export * as SignatureEnvelope from './SignatureEnvelope.js';

package/dist/zod/tempo/z.js.map

@@ -1 +1 @@
-{"version":3,"file":"z.js","sourceRoot":"","sources":["../../../src/zod/tempo/z.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"z.js","sourceRoot":"","sources":["../../../src/zod/tempo/z.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "ox",
   "description": "Ethereum Standard Library",
   "type": "module",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "main": "./dist/index.js",
   "sideEffects": false,
   "license": "MIT",
@@ -604,10 +604,10 @@
       "types": "./dist/tempo/MultisigOperation.d.ts",
       "default": "./dist/tempo/MultisigOperation.js"
     },
-    "./tempo/MultisigWitness": {
-      "src": "./src/tempo/MultisigWitness.ts",
-      "types": "./dist/tempo/MultisigWitness.d.ts",
-      "default": "./dist/tempo/MultisigWitness.js"
+    "./tempo/MultisigSimulation": {
+      "src": "./src/tempo/MultisigSimulation.ts",
+      "types": "./dist/tempo/MultisigSimulation.d.ts",
+      "default": "./dist/tempo/MultisigSimulation.js"
     },
     "./tempo/Period": {
       "src": "./src/tempo/Period.ts",
@@ -1029,10 +1029,10 @@
       "types": "./dist/zod/tempo/MultisigOperation.d.ts",
       "default": "./dist/zod/tempo/MultisigOperation.js"
     },
-    "./zod/tempo/MultisigWitness": {
-      "src": "./src/zod/tempo/MultisigWitness.ts",
-      "types": "./dist/zod/tempo/MultisigWitness.d.ts",
-      "default": "./dist/zod/tempo/MultisigWitness.js"
+    "./zod/tempo/MultisigSimulation": {
+      "src": "./src/zod/tempo/MultisigSimulation.ts",
+      "types": "./dist/zod/tempo/MultisigSimulation.d.ts",
+      "default": "./dist/zod/tempo/MultisigSimulation.js"
     },
     "./zod/tempo/PoolId": {
       "src": "./src/zod/tempo/PoolId.ts",

package/src/tempo/AuthorizationTempo.test.ts

@@ -348,6 +348,7 @@ describe('fromRpc', () => {
         type: 'p256',
       },
     })
+    if (typeof result.signature === 'string') throw new Error('unreachable')
     expect(result.signature.type).toBe('p256')
     expect(result.signature).toHaveProperty('prehash', true)
     expect(result.signature).toHaveProperty('publicKey')
@@ -370,6 +371,7 @@ describe('fromRpc', () => {
           '0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d976305000000007b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22222c226f726967696e223a2268747470733a2f2f6578616d706c652e636f6d222c2263726f73734f726967696e223a66616c73657d',
       },
     })
+    if (typeof result.signature === 'string') throw new Error('unreachable')
     expect(result.signature.type).toBe('webAuthn')
     expect(result.signature).toHaveProperty('metadata')
     expect(result.signature).toHaveProperty('publicKey')
@@ -994,6 +996,7 @@ describe('toRpc', () => {
         type: 'p256',
       },
     })
+    if (typeof result.signature === 'string') throw new Error('unreachable')
     expect(result.signature.type).toBe('p256')
   })
 
@@ -1019,6 +1022,7 @@ describe('toRpc', () => {
         type: 'webAuthn',
       },
     })
+    if (typeof result.signature === 'string') throw new Error('unreachable')
     expect(result.signature.type).toBe('webAuthn')
   })
 })

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

@@ -55,18 +55,7 @@ test('accepts multisig signatures', () => {
     KeyAuthorization.Signed['signature']
   >()
 
-  const multisigRpc = {
-    account: multisig.account,
-    config: MultisigConfig.toRpc(multisig.config),
-    signatures: [
-      {
-        r: '0x01',
-        s: '0x02',
-        type: 'secp256k1',
-        yParity: '0x0',
-      },
-    ],
-  } as const satisfies SignatureEnvelope.MultisigRpc
+  const multisigRpc = '0xf8' as const satisfies SignatureEnvelope.MultisigRpc
 
   const rpc: KeyAuthorization.Rpc = {
     chainId: '0x1',

package/src/tempo/KeyAuthorization.test.ts

@@ -69,6 +69,8 @@ const signature_multisig = {
   signatures: [SignatureEnvelope.from(signature_secp256k1)],
   type: 'multisig',
 } as const satisfies SignatureEnvelope.Multisig
+const signature_multisig_rpc =
+  '0xf89794be95c3f554e9fc85ec51be69a3d807a0d55bcf2cf83ba000000000000000000000000000000000000000000000000000000000000000000101d7d694f39fd6e51aad88f6f4ce6ab8827279cfffb9226601f843b841fa78c5905fb0b9d6066ef531f962a62bc6ef0d5eb59ecb134056d206f75aaed7780926ff2601a935c2c79707d9e1799948c9f19dcdde1e090e903b19a07923d01c' as const
 
 const signature_keychain = {
   inner: SignatureEnvelope.from(signature_secp256k1),
@@ -502,16 +504,42 @@ describe('from', () => {
 })
 
 describe('fromRpc', () => {
-  test('multisig', () => {
+  test('behavior: multisig', () => {
     const authorization = KeyAuthorization.fromRpc({
       chainId: '0x1',
       expiry: null,
       keyId: address,
       keyType: 'secp256k1',
-      signature: SignatureEnvelope.toRpc(signature_multisig),
+      signature: signature_multisig_rpc,
     })
 
-    expect(authorization.signature).toEqual(signature_multisig)
+    expect(authorization.signature).toMatchInlineSnapshot(`
+      {
+        "account": "0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c",
+        "config": {
+          "owners": [
+            {
+              "owner": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+              "weight": 1,
+            },
+          ],
+          "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "threshold": 1,
+          "version": 1n,
+        },
+        "signatures": [
+          {
+            "signature": {
+              "r": "0xfa78c5905fb0b9d6066ef531f962a62bc6ef0d5eb59ecb134056d206f75aaed7",
+              "s": "0x780926ff2601a935c2c79707d9e1799948c9f19dcdde1e090e903b19a07923d0",
+              "yParity": 1,
+            },
+            "type": "secp256k1",
+          },
+        ],
+        "type": "multisig",
+      }
+    `)
   })
 
   test('rejects a keychain signature', () => {
@@ -1306,6 +1334,19 @@ describe('serialize', () => {
 })
 
 describe('toRpc', () => {
+  test('behavior: multisig', () => {
+    const authorization = KeyAuthorization.toRpc({
+      address,
+      chainId: 1n,
+      signature: signature_multisig,
+      type: 'secp256k1',
+    })
+
+    expect(authorization.signature).toMatchInlineSnapshot(
+      `"${signature_multisig_rpc}"`,
+    )
+  })
+
   test('secp256k1', () => {
     const authorization = KeyAuthorization.from({
       address,

package/src/tempo/KeyAuthorization.ts

@@ -90,9 +90,9 @@ export type Signature<numberType = number> = OneOf<
 >
 
 /** RPC-formatted signature that can authorize an access key. */
-export type SignatureRpc = OneOf<
-  SignatureEnvelope.PrimitiveRpc | SignatureEnvelope.MultisigRpc
->
+export type SignatureRpc =
+  | SignatureEnvelope.MultisigRpc
+  | SignatureEnvelope.PrimitiveRpc
 
 /** Input type for a Key Authorization. */
 export type Input = KeyAuthorization<false, bigint, number>

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

@@ -11,6 +11,8 @@ declare const operation: MultisigOperation.Operation
 declare const operationRpc: MultisigOperation.Rpc
 declare const getHashOptions: MultisigOperation.getHash.Options
 declare const selectApprovalsOptions: MultisigOperation.selectApprovals.Options
+declare const serializedKeyAuthorization: Hex.Hex
+declare const serializeKeyAuthorizationOptions: MultisigOperation.serializeKeyAuthorization.Options
 declare const serializeTransactionOptions: MultisigOperation.serializeTransaction.Options
 
 test('preserves operation kinds during validation', () => {
@@ -50,15 +52,9 @@ test('uses JSON-RPC quantities only in RPC operations', () => {
   expectTypeOf<
     MultisigOperation.Operation['config']['version']
   >().toEqualTypeOf<bigint>()
-  expectTypeOf<
-    MultisigOperation.Operation['configVersion']
-  >().toEqualTypeOf<bigint>()
   expectTypeOf<
     MultisigOperation.Rpc['config']['version']
   >().toEqualTypeOf<Hex.Hex>()
-  expectTypeOf<
-    MultisigOperation.Rpc['configVersion']
-  >().toEqualTypeOf<Hex.Hex>()
 })
 
 test('operation helpers return narrow types', async () => {
@@ -68,6 +64,12 @@ test('operation helpers return narrow types', async () => {
   expectTypeOf(
     await MultisigOperation.selectApprovals(selectApprovalsOptions),
   ).toEqualTypeOf<MultisigOperation.selectApprovals.ReturnValue>()
+  expectTypeOf(
+    MultisigOperation.serializeKeyAuthorization(
+      serializedKeyAuthorization,
+      serializeKeyAuthorizationOptions,
+    ),
+  ).toEqualTypeOf<Hex.Hex>()
   expectTypeOf(
     MultisigOperation.serializeTransaction(
       transaction,