@ocap/tx-pipeline 1.18.130 → 1.18.132

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.130",
+  "version": "1.18.132",
   "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.130",
-    "@arcblock/did-util": "1.18.130",
-    "@ocap/mcrypto": "1.18.130",
-    "@ocap/message": "1.18.130",
-    "@ocap/state": "1.18.130",
-    "@ocap/util": "1.18.130",
-    "@ocap/wallet": "1.18.130",
+    "@arcblock/did": "1.18.132",
+    "@arcblock/did-util": "1.18.132",
+    "@ocap/mcrypto": "1.18.132",
+    "@ocap/message": "1.18.132",
+    "@ocap/state": "1.18.132",
+    "@ocap/util": "1.18.132",
+    "@ocap/wallet": "1.18.132",
     "debug": "^4.3.4",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "d4846249beb92ef45faad7a23781f631523f288e"
+  "gitHead": "6699d47364eb94f564e0fcf6ea55b6e7ea005d0d"
 }