@ocap/tx-pipeline 1.18.58 → 1.18.60

package/lib/pipes/verify-account-migration.js

@@ -4,25 +4,46 @@ const { getListField } = require('@ocap/util/lib/get-list-field');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 
 // 因为 statedb 层读取数据时会自动获取迁移之后的账户，所以这里可以直接对比 state，而不用检查 migratedTo
-module.exports = function CreateVerifyAccountMigrationPipe({ signerKey = 'signerStates', senderKey = 'senderState' }) {
+module.exports = function CreateVerifyAccountMigrationPipe({ stateKey = '', addressKey = '', signerKey = '' }) {
   return function VerifyAccountMigration(context, next) {
-    const { tx } = context;
+    if (stateKey && addressKey) {
+      let addressList = get(context, addressKey);
+      let stateList = get(context, stateKey);
 
-    const sender = get(context, senderKey);
-    if (sender && sender.address !== tx.from) {
-      return next(new Error('ACCOUNT_MIGRATED', `Sender account ${sender.address} is migrated`, { persist: true }));
-    }
+      if (addressList && stateList) {
+        stateList = (Array.isArray(stateList) ? stateList : [stateList]).filter(Boolean);
+        addressList = (Array.isArray(addressList) ? addressList : [addressList]).filter(Boolean);
 
-    const signers = get(context, signerKey);
-    if (Array.isArray(signers) && signers.length) {
-      const signatures = getListField(tx, 'signatures');
-      for (const signature of signatures) {
-        const state = signers.find((x) => x.address === signature.signer);
-        if (!state || state.address !== signature.signer) {
+        if (stateList.length !== addressList.length) {
           return next(
-            new Error('ACCOUNT_MIGRATED', `Signer account ${signature.signer} is migrated`, { persist: true })
+            new Error('INVALID_TX', 'state and address list size mismatch for account migration verify', {
+              persist: false,
+            })
           );
         }
+
+        for (let i = 0; i < stateList.length; i += 1) {
+          const state = stateList[i];
+          const address = addressList[i];
+          if (state.address !== address) {
+            return next(new Error('ACCOUNT_MIGRATED', `account ${address} is migrated`, { persist: true }));
+          }
+        }
+      }
+    }
+
+    if (signerKey) {
+      const signers = get(context, signerKey);
+      if (Array.isArray(signers) && signers.length) {
+        const signatures = getListField(context.tx, 'signatures');
+        for (const signature of signatures) {
+          const state = signers.find((x) => x.address === signature.signer);
+          if (!state || state.address !== signature.signer) {
+            return next(
+              new Error('ACCOUNT_MIGRATED', `Signer account ${signature.signer} is migrated`, { persist: true })
+            );
+          }
+        }
       }
     }
 

package/lib/pipes/verify-updater.js

@@ -12,9 +12,9 @@ const debug = require('debug')(`${require('../../package.json').name}:pipe:verif
  * - Verify the asset updater, can be the owner or the issuer
  *
  * @param {object} params
- * @return {string} params.assetKey key to extract assets from context
- * @return {string} params.ownerKey key to extract owner from context
- * @return {string|array} params.updaterKey key to extract updater address from asset
+ * @param {string} params.assetKey key to extract assets from context
+ * @param {string} params.ownerKey key to extract owner from context
+ * @param {string} [params.updaterKey] key to extract updater address from asset
  */
 module.exports = function CreateVerifyUpdaterPipe({ assetKey, ownerKey, updaterKey = 'owner' }) {
   return function VerifyUpdater(context, next) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.58",
+  "version": "1.18.60",
   "description": "Pipeline runner and common pipelines to process transactions",
   "main": "lib/index.js",
   "files": [
@@ -29,16 +29,16 @@
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.58",
-    "@arcblock/did-util": "1.18.58",
-    "@ocap/mcrypto": "1.18.58",
-    "@ocap/message": "1.18.58",
-    "@ocap/state": "1.18.58",
-    "@ocap/util": "1.18.58",
-    "@ocap/wallet": "1.18.58",
+    "@arcblock/did": "1.18.60",
+    "@arcblock/did-util": "1.18.60",
+    "@ocap/mcrypto": "1.18.60",
+    "@ocap/message": "1.18.60",
+    "@ocap/state": "1.18.60",
+    "@ocap/util": "1.18.60",
+    "@ocap/wallet": "1.18.60",
     "debug": "^4.3.4",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "8823477faf437d609f66c3b432f5e3d6e0605dca"
+  "gitHead": "0991b0393f9510fd1fe748be4776a9761ba3a831"
 }