@ocap/tx-pipeline 1.18.131 → 1.18.133

package/lib/pipes/verify-blocked.js

@@ -1,11 +1,30 @@
+/* eslint-disable no-await-in-loop */
+const get = require('lodash/get');
 const { CustomError: Error } = require('@ocap/util/lib/error');
+const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
 
-module.exports = function CreatedVerifyBlockedPipe(filter) {
+module.exports = function CreatedVerifyBlockedPipe({ filter = null, stateKeys = ['tx.from'] } = {}) {
   return async function VerifyTx(context, next) {
-    if (typeof filter?.isBlocked === 'function' && context.tx?.from) {
-      const blocked = await filter.isBlocked(context.tx.from);
-      if (blocked) {
-        return next(new Error('FORBIDDEN', 'Sender blocked'));
+    const f = filter || context.filter;
+    if (typeof f?.isBlocked === 'function') {
+      const suspects = [];
+      stateKeys.forEach((stateKey) => {
+        const state = get(context, stateKey);
+        if (state) {
+          if (typeof state === 'string') {
+            suspects.push(state);
+          } else {
+            const states = Array.isArray(state) ? state : [state];
+            states.forEach((x) => suspects.push(...getRelatedAddresses(x)));
+          }
+        }
+      });
+
+      for (const suspect of suspects) {
+        const blocked = await f.isBlocked(suspect);
+        if (blocked) {
+          return next(new Error('FORBIDDEN', `Account blocked: ${suspect}`));
+        }
       }
     }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.131",
+  "version": "1.18.133",
   "description": "Pipeline runner and common pipelines to process transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,7 +21,7 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "devDependencies": {
-    "jest": "^27.5.1",
+    "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0"
   },
   "resolutions": {
@@ -29,16 +29,16 @@
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.131",
-    "@arcblock/did-util": "1.18.131",
-    "@ocap/mcrypto": "1.18.131",
-    "@ocap/message": "1.18.131",
-    "@ocap/state": "1.18.131",
-    "@ocap/util": "1.18.131",
-    "@ocap/wallet": "1.18.131",
-    "debug": "^4.3.4",
+    "@arcblock/did": "1.18.133",
+    "@arcblock/did-util": "1.18.133",
+    "@ocap/mcrypto": "1.18.133",
+    "@ocap/message": "1.18.133",
+    "@ocap/state": "1.18.133",
+    "@ocap/util": "1.18.133",
+    "@ocap/wallet": "1.18.133",
+    "debug": "^4.3.6",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "1e07d8baecba883a20db0a1ab44aeba211e97b30"
+  "gitHead": "cd4b69aef69b4e30265c3897a22fb63c902c5d4e"
 }