@ocap/tx-pipeline 1.18.128 → 1.18.130

package/lib/index.js

@@ -13,6 +13,7 @@ const VerifyListSize = require('./pipes/verify-list-size');
 const VerifyMultiSig = require('./pipes/verify-multisig');
 const VerifyMultiSigV2 = require('./pipes/verify-multisig-v2');
 const VerifySender = require('./pipes/verify-sender');
+const VerifyBlocked = require('./pipes/verify-blocked');
 const VerifyServiceFee = require('./pipes/verify-service-fee');
 const VerifySignature = require('./pipes/verify-signature');
 const VerifySigner = require('./pipes/verify-signer');
@@ -41,6 +42,7 @@ module.exports = {
     VerifyMultiSigV2,
     VerifyUpdater,
     VerifySender,
+    VerifyBlocked,
     VerifyServiceFee,
     VerifySignature,
     VerifySigner,

package/lib/pipes/anti-land-attack.js

@@ -1,23 +1,29 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
+const { isSameDid } = require('@ocap/util');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function CreateAntiLandAttackPipe({
   senderState = 'senderState',
   receiverState = 'receiverState',
-  receiverAddress = 'receiver',
 } = {}) {
   return function AntiLandAttack(context, next) {
     const sender = get(context, senderState);
     const receiver = get(context, receiverState);
 
-    if (receiver && sender.address === receiver.address) {
-      return next(new Error('INVALID_TX', 'Sender and receiver are the same'));
+    const senders = (Array.isArray(sender) ? sender : [sender]).filter(Boolean);
+    const receivers = (Array.isArray(receiver) ? receiver : [receiver]).filter(Boolean);
+
+    for (const s of senders) {
+      if (receivers.some((r) => isSameDid(r.address, s.address))) {
+        return next(new Error('INVALID_TX', `Sender should not exist in receiver list: ${s.address}`));
+      }
     }
 
-    const receiverAddr = get(context, receiverAddress);
-    if (sender.address === receiverAddr) {
-      return next(new Error('INVALID_TX', 'Sender and receiver are the same'));
+    for (const r of receivers) {
+      if (senders.some((s) => isSameDid(s.address, r.address))) {
+        return next(new Error('INVALID_TX', `Receiver should not exist in sender list: ${r.address}`));
+      }
     }
 
     next();

package/lib/pipes/verify-blocked.js

@@ -0,0 +1,14 @@
+const { CustomError: Error } = require('@ocap/util/lib/error');
+
+module.exports = function CreatedVerifyBlockedPipe(filter) {
+  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'));
+      }
+    }
+
+    next();
+  };
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.128",
+  "version": "1.18.130",
   "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.128",
-    "@arcblock/did-util": "1.18.128",
-    "@ocap/mcrypto": "1.18.128",
-    "@ocap/message": "1.18.128",
-    "@ocap/state": "1.18.128",
-    "@ocap/util": "1.18.128",
-    "@ocap/wallet": "1.18.128",
+    "@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",
     "debug": "^4.3.4",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "97c217e51a0c250f8804c67c893c09d9f4c127c8"
+  "gitHead": "d4846249beb92ef45faad7a23781f631523f288e"
 }