@ocap/tx-pipeline 1.18.22 → 1.18.24

package/lib/pipes/decode-tx.js

@@ -1,4 +1,4 @@
-const Mcrypto = require('@ocap/mcrypto');
+const { toTxHash } = require('@ocap/mcrypto');
 const { getMessageType } = require('@ocap/message');
 const { fromBase64, toUint8Array } = require('@ocap/util');
 const { CustomError: Error } = require('@ocap/util/lib/error');
@@ -6,8 +6,6 @@ const { CustomError: Error } = require('@ocap/util/lib/error');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:decode-tx`);
 
-const sha256 = Mcrypto.Hasher.SHA2.hash256;
-const toTxHash = (buffer) => sha256(buffer, 1).replace(/^0x/, '').toUpperCase();
 const Transaction = getMessageType('Transaction').fn;
 
 module.exports = function DecodeTx(context, next) {

package/lib/runner.js

@@ -21,6 +21,13 @@ class PipelineRunner extends EventEmitter {
   }
 
   run(context, done) {
+    const attachErrorProps = (err, opts) => {
+      if (opts && opts.persistError) {
+        err.props = err.props || {};
+        err.props.persist = true;
+      }
+    };
+
     const call = async (fn, err, next, opts) => {
       const paramCount = fn.length;
       const hasError = Boolean(err);
@@ -31,12 +38,19 @@ class PipelineRunner extends EventEmitter {
           return;
         }
         if (!hasError && paramCount < 3) {
-          await fn(context, next);
+          await fn(context, (e) => {
+            if (e) {
+              attachErrorProps(e, opts);
+            }
+            next(e);
+          });
           return;
         }
 
         // Here we are skipping remaining
       } catch (e) {
+        attachErrorProps(e, opts);
+
         if (process.env.NODE_ENV !== 'test') {
           console.error('call pipe failed', fn.name || '<anonymous>', e);
         }
@@ -44,11 +58,6 @@ class PipelineRunner extends EventEmitter {
         // replace the error
         // eslint-disable-next-line no-param-reassign
         err = e;
-
-        if (opts && opts.persistError) {
-          err.props = err.props || {};
-          err.props.persist = true;
-        }
       }
 
       // continue
@@ -62,7 +71,7 @@ class PipelineRunner extends EventEmitter {
 
       // all done
       if (!pipe) {
-        defer(() => done(err, context), err);
+        defer(() => done(err, context));
         return;
       }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.22",
+  "version": "1.18.24",
   "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.22",
-    "@arcblock/did-util": "1.18.22",
-    "@ocap/mcrypto": "1.18.22",
-    "@ocap/message": "1.18.22",
-    "@ocap/state": "1.18.22",
-    "@ocap/util": "1.18.22",
-    "@ocap/wallet": "1.18.22",
+    "@arcblock/did": "1.18.24",
+    "@arcblock/did-util": "1.18.24",
+    "@ocap/mcrypto": "1.18.24",
+    "@ocap/message": "1.18.24",
+    "@ocap/state": "1.18.24",
+    "@ocap/util": "1.18.24",
+    "@ocap/wallet": "1.18.24",
     "debug": "^4.3.4",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "7f833da5b1ed75fd2f2427925d0cbb84af33b36b"
+  "gitHead": "2b3c7ab2de31bd3ef55ae32cec5c007d5e13d306"
 }