ox 1.7.0 → 1.7.2

package/src/zod/tempo/_test/SignatureEnvelope.test.ts

@@ -19,22 +19,21 @@ const p256 = {
   type: 'p256',
 } as const
 
-const multisig = {
-  account: '0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c',
-  signatures: [secp256k1],
+const config = {
+  owners: [
+    {
+      owner: '0x7e5f4552091a69125d5dfcb7b8c2659029395bdf',
+      weight: 1,
+    },
+  ],
+  salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
+  threshold: 1,
+  version: '0x0',
 } as const
 
-const multisigBootstrap = {
-  init: {
-    owners: [
-      {
-        owner: '0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c',
-        weight: 1,
-      },
-    ],
-    salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
-    threshold: 1,
-  },
+const multisig = {
+  account: '0x9dba7f426b711d4893c11611eacf7cc334e7146b',
+  config,
   signatures: [secp256k1],
 } as const
 
@@ -62,24 +61,22 @@ describe('SignatureEnvelope', () => {
     )
   })
 
-  test('decodes an initialized multisig envelope', () => {
+  test('decodes a multisig envelope', () => {
     expect(z.decode(z_SignatureEnvelope.SignatureEnvelope, multisig)).toEqual(
       core_SignatureEnvelope.fromRpc(multisig),
     )
   })
 
-  test('decodes a bootstrap multisig envelope', () => {
-    expect(
-      z.decode(z_SignatureEnvelope.SignatureEnvelope, multisigBootstrap),
-    ).toEqual(core_SignatureEnvelope.fromRpc(multisigBootstrap))
-  })
-
   test('decodes recursive multisig approvals', () => {
     const nested = {
       ...multisig,
       signatures: [
         {
           account: '0x1111111111111111111111111111111111111111',
+          config: {
+            ...config,
+            version: '0x1',
+          },
           signatures: [secp256k1],
         },
       ],
@@ -96,26 +93,17 @@ describe('SignatureEnvelope', () => {
     )
   })
 
-  test('round-trips initialized multisig via encode', () => {
+  test('round-trips multisig via encode', () => {
     const decoded = z.decode(z_SignatureEnvelope.SignatureEnvelope, multisig)
     expect(z.encode(z_SignatureEnvelope.SignatureEnvelope, decoded)).toEqual(
       core_SignatureEnvelope.toRpc(decoded),
     )
   })
 
-  test('round-trips bootstrap multisig via encode', () => {
-    const decoded = z.decode(
-      z_SignatureEnvelope.SignatureEnvelope,
-      multisigBootstrap,
-    )
-    expect(z.encode(z_SignatureEnvelope.SignatureEnvelope, decoded)).toEqual(
-      multisigBootstrap,
-    )
-  })
-
   test('rejects invalid recursive multisig domains before encode', () => {
     const invalid = {
       account: multisig.account,
+      config: { ...config, version: 0n },
       signatures: [
         {
           inner: core_SignatureEnvelope.fromRpc(secp256k1),
@@ -168,10 +156,12 @@ describe('SignatureEnvelope', () => {
     } as const
     const depth2 = {
       account: '0x1111111111111111111111111111111111111111',
+      config: { ...config, version: '0x1' },
       signatures: [secp256k1],
     } as const
     const depth3 = {
       account: '0x2222222222222222222222222222222222222222',
+      config: { ...config, version: '0x1' },
       signatures: [depth2],
     } as const
 
@@ -189,11 +179,12 @@ describe('SignatureEnvelope', () => {
     ).toMatchInlineSnapshot(`false`)
   })
 
-  test('rejects mixed multisig initialization fields', () => {
+  test('rejects old multisig witness shapes', () => {
     expect(
       z.safeDecode(z_SignatureEnvelope.SignatureEnvelope, {
-        ...multisigBootstrap,
+        init: config,
         account: multisig.account,
+        signatures: [secp256k1],
       } as never).success,
     ).toMatchInlineSnapshot(`false`)
   })

package/src/zod/tempo/_test/TransactionRequest.test.ts

@@ -44,15 +44,67 @@ describe('TransactionRequest', () => {
     )
   })
 
-  test('gas-model hints and capabilities round-trip', () => {
+  test('capabilities and key hints round-trip', () => {
     const hints = {
       capabilities: { balanceDiffs: true },
       keyData: '0x0578',
       keyId: '0xcccccccccccccccccccccccccccccccccccccccc',
       keyType: 'webAuthn',
-      multisigInit: {
-        salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        threshold: 2,
+    } as const
+
+    const decoded = z.decode(z_TransactionRequest.TransactionRequest, {
+      ...rpc,
+      ...hints,
+    })
+    expect(decoded).toMatchObject(hints)
+
+    const encoded = z.encode(z_TransactionRequest.TransactionRequest, decoded)
+    expect(encoded).toMatchObject(hints)
+    expect(encoded).toEqual(core_TransactionRequest.toRpc(decoded))
+  })
+
+  test('multisig witness round-trips', () => {
+    const witness = {
+      account: '0xcccccccccccccccccccccccccccccccccccccccc',
+      approvals: [
+        {
+          keyData: '0x0578',
+          keyType: 'webAuthn',
+          owner: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+          type: 'primitive',
+        },
+        {
+          type: 'multisig',
+          witness: {
+            account: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+            approvals: [
+              {
+                keyType: 'secp256k1',
+                owner: '0xdddddddddddddddddddddddddddddddddddddddd',
+              },
+              {
+                owner: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+              },
+            ],
+            config: {
+              owners: [
+                {
+                  owner: '0xdddddddddddddddddddddddddddddddddddddddd',
+                  weight: 1,
+                },
+                {
+                  owner: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+                  weight: 1,
+                },
+              ],
+              salt: '0x2222222222222222222222222222222222222222222222222222222222222222',
+              threshold: 2,
+              version: 2,
+            },
+          },
+        },
+      ],
+      config: {
         owners: [
           {
             owner: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
@@ -63,18 +115,134 @@ describe('TransactionRequest', () => {
             weight: 1,
           },
         ],
+        salt: '0x1111111111111111111111111111111111111111111111111111111111111111',
+        threshold: 2,
+        version: 1,
       },
-      multisigSignatureCount: 2,
     } as const
 
     const decoded = z.decode(z_TransactionRequest.TransactionRequest, {
       ...rpc,
-      ...hints,
+      multisigWitness: witness,
     })
-    expect(decoded).toMatchObject(hints)
+    expect(decoded.multisigWitness).toMatchInlineSnapshot(`
+      {
+        "account": "0xcccccccccccccccccccccccccccccccccccccccc",
+        "approvals": [
+          {
+            "keyData": "0x0578",
+            "keyType": "webAuthn",
+            "owner": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+            "type": "primitive",
+          },
+          {
+            "type": "multisig",
+            "witness": {
+              "account": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "approvals": [
+                {
+                  "keyType": "secp256k1",
+                  "owner": "0xdddddddddddddddddddddddddddddddddddddddd",
+                },
+                {
+                  "owner": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                },
+              ],
+              "config": {
+                "owners": [
+                  {
+                    "owner": "0xdddddddddddddddddddddddddddddddddddddddd",
+                    "weight": 1,
+                  },
+                  {
+                    "owner": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                    "weight": 1,
+                  },
+                ],
+                "salt": "0x2222222222222222222222222222222222222222222222222222222222222222",
+                "threshold": 2,
+                "version": 2n,
+              },
+            },
+          },
+        ],
+        "config": {
+          "owners": [
+            {
+              "owner": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "weight": 1,
+            },
+            {
+              "owner": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "weight": 1,
+            },
+          ],
+          "salt": "0x1111111111111111111111111111111111111111111111111111111111111111",
+          "threshold": 2,
+          "version": 1n,
+        },
+      }
+    `)
 
     const encoded = z.encode(z_TransactionRequest.TransactionRequest, decoded)
-    expect(encoded).toMatchObject(hints)
+    expect(encoded.multisigWitness).toMatchInlineSnapshot(`
+      {
+        "account": "0xcccccccccccccccccccccccccccccccccccccccc",
+        "approvals": [
+          {
+            "keyData": "0x0578",
+            "keyType": "webAuthn",
+            "owner": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+            "type": "primitive",
+          },
+          {
+            "type": "multisig",
+            "witness": {
+              "account": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "approvals": [
+                {
+                  "keyType": "secp256k1",
+                  "owner": "0xdddddddddddddddddddddddddddddddddddddddd",
+                },
+                {
+                  "owner": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                },
+              ],
+              "config": {
+                "owners": [
+                  {
+                    "owner": "0xdddddddddddddddddddddddddddddddddddddddd",
+                    "weight": 1,
+                  },
+                  {
+                    "owner": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                    "weight": 1,
+                  },
+                ],
+                "salt": "0x2222222222222222222222222222222222222222222222222222222222222222",
+                "threshold": 2,
+                "version": 2,
+              },
+            },
+          },
+        ],
+        "config": {
+          "owners": [
+            {
+              "owner": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+              "weight": 1,
+            },
+            {
+              "owner": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "weight": 1,
+            },
+          ],
+          "salt": "0x1111111111111111111111111111111111111111111111111111111111111111",
+          "threshold": 2,
+          "version": 1,
+        },
+      }
+    `)
     expect(encoded).toEqual(core_TransactionRequest.toRpc(decoded))
   })
 

package/src/zod/tempo/z.ts

@@ -2,6 +2,8 @@
 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 PoolId from './PoolId.js'
 export * as RpcSchemaTempo from './RpcSchemaTempo.js'
 export * as SignatureEnvelope from './SignatureEnvelope.js'