ox 0.14.38 → 0.14.39

package/tempo/MultisigOperation.test.ts

@@ -36,6 +36,7 @@ const config = MultisigConfig.from({
   ],
   threshold: 2,
 })
+const initializedConfig = MultisigConfig.from({ ...config, version: 1n })
 const account = MultisigConfig.getAddress(config)
 const ownerSignature_1 = owners[0]!.signature
 const approval_1 = SignatureEnvelope.serialize(ownerSignature_1)
@@ -62,23 +63,23 @@ const keyAuthorization = KeyAuthorization.serialize(
 
 const transactionHash_ = MultisigConfig.getSignPayload({
   account,
+  config: initializedConfig,
   payload: TxEnvelopeTempo.getSignPayload(
     TxEnvelopeTempo.deserialize(transaction),
   ),
-  version: 1n,
 })
 const keyAuthorizationHash = MultisigConfig.getSignPayload({
   account,
+  config: initializedConfig,
   payload: KeyAuthorization.getSignPayload(
     KeyAuthorization.deserialize(keyAuthorization),
   ),
-  version: 1n,
 })
 
 const base = {
   account,
   approvals: [approval_1],
-  config,
+  config: initializedConfig,
   configVersion: 1n,
   createdAt: 1,
   init: false,
@@ -249,8 +250,8 @@ describe('selectApprovals', () => {
     })
     const childHash = MultisigConfig.getSignPayload({
       account: child,
+      config: { version: 2n },
       payload: hash,
-      version: 2n,
     })
     const childApprovals = [
       signApproval(owners[1]!, childHash),
@@ -269,6 +270,7 @@ describe('selectApprovals', () => {
         rootApproval,
         SignatureEnvelope.serialize({
           account: child,
+          config: MultisigConfig.from({ ...childConfig, version: 2n }),
           signatures: [SignatureEnvelope.deserialize(childApprovals[0]!)],
           type: 'multisig',
         }),
@@ -283,6 +285,7 @@ describe('selectApprovals', () => {
         rootApproval,
         SignatureEnvelope.serialize({
           account: child,
+          config: MultisigConfig.from({ ...childConfig, version: 2n }),
           signatures: childApprovals.map((approval) =>
             SignatureEnvelope.deserialize(approval),
           ),
@@ -389,8 +392,8 @@ describe('selectApprovals', () => {
     })
     const childHash = MultisigConfig.getSignPayload({
       account: child,
+      config: { version: 1n },
       payload: hash,
-      version: 1n,
     })
 
     await expect(
@@ -399,6 +402,7 @@ describe('selectApprovals', () => {
         approvals: [
           SignatureEnvelope.serialize({
             account: child,
+            config: MultisigConfig.from({ ...childConfig, version: 1n }),
             signatures: [
               SignatureEnvelope.deserialize(
                 signApproval(owners[1]!, childHash),
@@ -415,7 +419,7 @@ describe('selectApprovals', () => {
     )
   })
 
-  test('rejects keychain and bootstrap nested approvals', async () => {
+  test('rejects keychain and accepts initial nested approvals', async () => {
     const childConfig = MultisigConfig.from({
       owners: [{ owner: owners[1]!.address, weight: 1 }],
       threshold: 1,
@@ -437,8 +441,8 @@ describe('selectApprovals', () => {
     })
     const childHash = MultisigConfig.getSignPayload({
       account: child,
+      config: childConfig,
       payload: hash,
-      version: 0n,
     })
 
     await expect(
@@ -459,31 +463,36 @@ describe('selectApprovals', () => {
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       `[MultisigOperation.InvalidApprovalError: Invalid multisig approval: keychain signatures cannot approve a multisig operation.]`,
     )
-    await expect(
-      MultisigOperation.selectApprovals({
-        account,
-        approvals: [
-          SignatureEnvelope.serialize({
-            account: child,
-            init: childConfig,
-            signatures: [
-              SignatureEnvelope.deserialize(
-                signApproval(owners[1]!, childHash),
-              ),
-            ],
-            type: 'multisig',
-          }),
-        ],
-        config,
-        hash,
-        resolveConfig: () => ({ config: childConfig, version: 0n }),
-      }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[MultisigOperation.InvalidApprovalError: Invalid multisig approval: nested multisig owner 0x7888d60e9cc26c8569d394fce435c248f1e49c3b cannot carry init.]`,
-    )
+    const selection = await MultisigOperation.selectApprovals({
+      account,
+      approvals: [
+        SignatureEnvelope.serialize({
+          account: child,
+          config: childConfig,
+          signatures: [
+            SignatureEnvelope.deserialize(signApproval(owners[1]!, childHash)),
+          ],
+          type: 'multisig',
+        }),
+      ],
+      config,
+      hash,
+      resolveConfig: () => ({ config: childConfig, version: 0n }),
+    })
+    expect({
+      signatureCount: selection.signatureCount,
+      threshold: selection.threshold,
+      weight: selection.weight,
+    }).toMatchInlineSnapshot(`
+      {
+        "signatureCount": 1,
+        "threshold": 1,
+        "weight": 1,
+      }
+    `)
   })
 
-  test('rejects nested account cycles', async () => {
+  test('rejects nested account cycles while serializing', () => {
     const config = MultisigConfig.from({
       owners: [{ owner: account, weight: 1 }],
       threshold: 1,
@@ -496,30 +505,21 @@ describe('selectApprovals', () => {
     })
     const nestedHash = MultisigConfig.getSignPayload({
       account,
+      config: { version: 2n },
       payload: hash,
-      version: 2n,
     })
 
-    await expect(
-      MultisigOperation.selectApprovals({
+    expect(() =>
+      SignatureEnvelope.serialize({
         account,
-        approvals: [
-          SignatureEnvelope.serialize({
-            account,
-            signatures: [
-              SignatureEnvelope.deserialize(
-                signApproval(owners[0]!, nestedHash),
-              ),
-            ],
-            type: 'multisig',
-          }),
+        config: MultisigConfig.from({ ...config, version: 2n }),
+        signatures: [
+          SignatureEnvelope.deserialize(signApproval(owners[0]!, nestedHash)),
         ],
-        config,
-        hash,
-        resolveConfig: () => ({ config, version: 2n }),
+        type: 'multisig',
       }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[MultisigOperation.InvalidApprovalError: Invalid multisig approval: nested multisig owner 0xf81b7763d3a6876195d780865bd783dbd97dd36e is invalid.]`,
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[SignatureEnvelope.InvalidMultisigApprovalError: Invalid native multisig owner approval: multisig account cannot be an owner.]`,
     )
   })
 
@@ -547,13 +547,13 @@ describe('selectApprovals', () => {
     })
     const childHash = MultisigConfig.getSignPayload({
       account: child,
+      config: { version: 1n },
       payload: hash,
-      version: 1n,
     })
     const grandchildHash = MultisigConfig.getSignPayload({
       account: grandchild,
+      config: { version: 1n },
       payload: childHash,
-      version: 1n,
     })
 
     await expect(
@@ -562,9 +562,14 @@ describe('selectApprovals', () => {
         approvals: [
           SignatureEnvelope.serialize({
             account: child,
+            config: MultisigConfig.from({ ...childConfig, version: 1n }),
             signatures: [
               {
                 account: grandchild,
+                config: MultisigConfig.from({
+                  ...grandchildConfig,
+                  version: 1n,
+                }),
                 signatures: [
                   SignatureEnvelope.deserialize(
                     signApproval(owners[2]!, grandchildHash),
@@ -632,8 +637,11 @@ describe('serializeTransaction', () => {
       const value = TxEnvelopeTempo.deserialize(serialized)
       results.push({
         account: value.signature?.account,
+        configVersion:
+          value.signature?.type === 'multisig'
+            ? value.signature.config.version
+            : undefined,
         hash: Hash.keccak256(serialized),
-        init: value.signature?.type === 'multisig' && !!value.signature.init,
         signatureCount:
           value.signature?.type === 'multisig'
             ? value.signature.signatures.length
@@ -646,15 +654,15 @@ describe('serializeTransaction', () => {
       [
         {
           "account": "0xf81b7763d3a6876195d780865bd783dbd97dd36e",
-          "hash": "0x704768725a4e798e2656f0f355f99507522c97b2947f551a5ee696216a2ba6fe",
-          "init": false,
+          "configVersion": 1n,
+          "hash": "0x8309740edaf304284186f7bcfe4527745cd4eb48e7441795ebdd970798091f8f",
           "signatureCount": 2,
           "type": "0x76",
         },
         {
           "account": "0xf81b7763d3a6876195d780865bd783dbd97dd36e",
-          "hash": "0x08131922349c385f9112fefc617fa6f6258a71df1125ec243bb3ee7cff59b700",
-          "init": true,
+          "configVersion": 0n,
+          "hash": "0x636af84d8445d87cbcd33039d5a3a2274a5911036b1b7ceb740ac41e2f638611",
           "signatureCount": 2,
           "type": "0x76",
         },
@@ -833,6 +841,7 @@ describe('from', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": 1n,
           },
           "configVersion": 1n,
           "createdAt": 1,
@@ -865,6 +874,7 @@ describe('from', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": 1n,
           },
           "configVersion": 1n,
           "createdAt": 1,
@@ -899,6 +909,7 @@ describe('from', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": 1n,
           },
           "configVersion": 1n,
           "createdAt": 1,
@@ -929,10 +940,10 @@ describe('from', () => {
       ...transactionPending,
       hash: MultisigConfig.getSignPayload({
         account,
+        config: initializedConfig,
         payload: TxEnvelopeTempo.getSignPayload(
           TxEnvelopeTempo.deserialize(transaction),
         ),
-        version: 1n,
       }),
       transaction,
     })
@@ -961,6 +972,7 @@ describe('from', () => {
           ],
           "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "threshold": 2,
+          "version": 1n,
         },
         "configVersion": 1n,
         "createdAt": 1,
@@ -991,10 +1003,10 @@ describe('from', () => {
       ...transactionPending,
       hash: MultisigConfig.getSignPayload({
         account,
+        config: initializedConfig,
         payload: TxEnvelopeTempo.getSignPayload(
           TxEnvelopeTempo.deserialize(transaction),
         ),
-        version: 1n,
       }),
       transaction,
     })
@@ -1008,10 +1020,10 @@ describe('from', () => {
       configVersion: 0n,
       hash: MultisigConfig.getSignPayload({
         account,
+        config,
         payload: TxEnvelopeTempo.getSignPayload(
           TxEnvelopeTempo.deserialize(transaction),
         ),
-        version: 0n,
       }),
       init: true,
     })
@@ -1040,6 +1052,7 @@ describe('from', () => {
           ],
           "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "threshold": 2,
+          "version": 0n,
         },
         "configVersion": 0n,
         "createdAt": 1,
@@ -1063,10 +1076,10 @@ describe('from', () => {
       configVersion: 0n,
       hash: MultisigConfig.getSignPayload({
         account,
+        config,
         payload: TxEnvelopeTempo.getSignPayload(
           TxEnvelopeTempo.deserialize(transaction),
         ),
-        version: 0n,
       }),
     })
 
@@ -1091,6 +1104,7 @@ describe('from', () => {
         KeyAuthorization.from(authorization, {
           signature: {
             account,
+            config: initializedConfig,
             signatures: [
               SignatureEnvelope.deserialize(approval_1),
               SignatureEnvelope.deserialize(approval_2),
@@ -1124,6 +1138,7 @@ describe('from', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": 1n,
           },
           "configVersion": 1n,
           "createdAt": 1,
@@ -1156,12 +1171,13 @@ describe('from', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": 1n,
           },
           "configVersion": 1n,
           "createdAt": 1,
           "hash": "0xf6995eb69c12c03d3d13b357abf7cac22b4effe52fba8ff02e5aef26161f77a0",
           "init": false,
-          "keyAuthorization": "0xf9015ff782107980943333333333333333333333333333333333333333846b49d2008080808094f81b7763d3a6876195d780865bd783dbd97dd36eb9012405f9012094f81b7763d3a6876195d780865bd783dbd97dd36ef90108b88201000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200b88201000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
+          "keyAuthorization": "0xf901b3f782107980943333333333333333333333333333333333333333846b49d2008080808094f81b7763d3a6876195d780865bd783dbd97dd36eb9017805f9017494f81b7763d3a6876195d780865bd783dbd97dd36ef852a000000000000000000000000000000000000000000000000000000000000000000102eed69407e1ed8ea0e9601e5546b0a03aed683df360140701d694288f0cd85005f34168f731a468aef268c2f9456f01f90108b88201000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000065ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c8734640c4998ff7e374b06ce1a64a2ecd82ab036384fb83d9a79b127a27d503200b88201000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000047cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc4766997807775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d100",
           "signatureCount": 2,
           "status": "success",
           "threshold": 2,
@@ -1179,7 +1195,7 @@ describe('from', () => {
       KeyAuthorization.from(authorization, {
         signature: {
           account,
-          init: config,
+          config,
           signatures: [
             SignatureEnvelope.deserialize(approval_1),
             SignatureEnvelope.deserialize(approval_2),
@@ -1194,8 +1210,8 @@ describe('from', () => {
       configVersion: 0n,
       hash: MultisigConfig.getSignPayload({
         account,
+        config,
         payload: KeyAuthorization.getSignPayload(authorization),
-        version: 0n,
       }),
       init: true,
       keyAuthorization: keyAuthorization_,
@@ -1229,6 +1245,7 @@ describe('from', () => {
           ],
           "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
           "threshold": 2,
+          "version": 0n,
         },
         "configVersion": 0n,
         "createdAt": 1,
@@ -1252,6 +1269,9 @@ describe('RPC conversion', () => {
     const transactionRpc = MultisigOperation.toRpc(transactionPending)
     const keyAuthorizationRpc = MultisigOperation.toRpc(keyAuthorizationPending)
 
+    expect(() =>
+      JSON.stringify({ keyAuthorizationRpc, transactionRpc }),
+    ).not.toThrow()
     expect({ keyAuthorizationRpc, transactionRpc }).toMatchInlineSnapshot(`
       {
         "keyAuthorizationRpc": {
@@ -1272,6 +1292,7 @@ describe('RPC conversion', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": "0x1",
           },
           "configVersion": "0x1",
           "createdAt": 1,
@@ -1303,6 +1324,7 @@ describe('RPC conversion', () => {
             ],
             "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "threshold": 2,
+            "version": "0x1",
           },
           "configVersion": "0x1",
           "createdAt": 1,
@@ -1440,10 +1462,10 @@ describe('validation', () => {
         account: '0x0000000000000000000000000000000000000000',
         hash: MultisigConfig.getSignPayload({
           account: '0x0000000000000000000000000000000000000000',
+          config: initializedConfig,
           payload: TxEnvelopeTempo.getSignPayload(
             TxEnvelopeTempo.deserialize(transaction),
           ),
-          version: 1n,
         }),
       },
     },
@@ -1513,7 +1535,7 @@ describe('validation', () => {
         approvals: [
           SignatureEnvelope.serialize({
             account,
-            init: config,
+            config,
             signatures: [ownerSignature_1],
             type: 'multisig',
           }),
@@ -1550,6 +1572,7 @@ describe('validation', () => {
         KeyAuthorization.from(authorization, {
           signature: {
             account,
+            config: initializedConfig,
             signatures: [
               SignatureEnvelope.deserialize(approval_1),
               SignatureEnvelope.deserialize(approval_3),
@@ -1573,12 +1596,12 @@ describe('validation', () => {
     const signatures = [
       ...SignatureEnvelope.sortMultisigApprovals({
         account,
+        config: initializedConfig,
         payload: KeyAuthorization.getSignPayload(authorization),
         signatures: [
           SignatureEnvelope.deserialize(approval_1),
           SignatureEnvelope.deserialize(approval_2),
         ],
-        version: 1n,
       }),
     ].reverse()
     const operation = {
@@ -1586,7 +1609,12 @@ describe('validation', () => {
       approvals: [approval_1, approval_2],
       keyAuthorization: KeyAuthorization.serialize(
         KeyAuthorization.from(authorization, {
-          signature: { account, signatures, type: 'multisig' },
+          signature: {
+            account,
+            config: initializedConfig,
+            signatures,
+            type: 'multisig',
+          },
         }),
       ),
       signatureCount: 2,
@@ -1608,6 +1636,7 @@ describe('validation', () => {
         KeyAuthorization.from(authorization, {
           signature: {
             account,
+            config: initializedConfig,
             signatures: [
               SignatureEnvelope.deserialize(approval_1),
               SignatureEnvelope.deserialize(approval_1),
@@ -1628,37 +1657,49 @@ describe('validation', () => {
 
   test('rejects reordered nested key authorization approvals', () => {
     const authorization = KeyAuthorization.deserialize(keyAuthorization)
+    const nestedConfig = MultisigConfig.from({
+      owners: [{ owner: owner_2, weight: 1 }],
+      threshold: 1,
+      version: 1n,
+    })
     const childSignatures = SignatureEnvelope.sortMultisigApprovals({
       account: owner_1,
+      config: nestedConfig,
       payload: keyAuthorizationHash,
       signatures: [
         SignatureEnvelope.deserialize(approval_1),
         SignatureEnvelope.deserialize(approval_2),
       ],
-      version: 1n,
     })
     const retainedNested = SignatureEnvelope.from({
       account: owner_1,
+      config: nestedConfig,
       signatures: childSignatures,
       type: 'multisig',
     })
     const selectedNested = SignatureEnvelope.from({
       account: owner_1,
+      config: nestedConfig,
       signatures: [...childSignatures].reverse(),
       type: 'multisig',
     })
     const selected = SignatureEnvelope.sortMultisigApprovals({
       account,
+      config: initializedConfig,
       payload: KeyAuthorization.getSignPayload(authorization),
       signatures: [selectedNested, SignatureEnvelope.deserialize(approval_2)],
-      version: 1n,
     })
     const operation = {
       ...keyAuthorizationPending,
       approvals: [SignatureEnvelope.serialize(retainedNested), approval_2],
       keyAuthorization: KeyAuthorization.serialize(
         KeyAuthorization.from(authorization, {
-          signature: { account, signatures: selected, type: 'multisig' },
+          signature: {
+            account,
+            config: initializedConfig,
+            signatures: selected,
+            type: 'multisig',
+          },
         }),
       ),
       signatureCount: 2,
@@ -1697,12 +1738,12 @@ describe('validation', () => {
     })
     const signatures = SignatureEnvelope.sortMultisigApprovals({
       account,
+      config,
       payload: KeyAuthorization.getSignPayload(authorization),
       signatures: [
         SignatureEnvelope.deserialize(approval_1),
         SignatureEnvelope.deserialize(approval_2),
       ],
-      version: 0n,
     })
     const approvals = signatures.map((signature) =>
       SignatureEnvelope.serialize(signature),
@@ -1716,15 +1757,15 @@ describe('validation', () => {
       createdAt: 1,
       hash: MultisigConfig.getSignPayload({
         account,
+        config,
         payload: KeyAuthorization.getSignPayload(authorization),
-        version: 0n,
       }),
       init: true,
       keyAuthorization: KeyAuthorization.serialize(
         KeyAuthorization.from(authorization, {
           signature: {
             account,
-            init: config,
+            config,
             signatures,
             type: 'multisig',
           },