@ocap/tx-pipeline 1.18.166 → 1.19.1

package/lib/pipes/extract-receiver.js

@@ -3,7 +3,7 @@ const get = require('lodash/get');
 const set = require('lodash/set');
 
 module.exports = function CreateExtractReceiverPipe({ from, to = 'receiver' }) {
-  return async function ExtractReceiver(context, next) {
+  return function ExtractReceiver(context, next) {
     const keys = Array.isArray(from) ? from : [from];
     for (const key of keys) {
       const value = get(context, key);

package/lib/pipes/verify-multisig-v2.js

@@ -9,7 +9,7 @@ const { fromPublicKey } = require('@ocap/wallet');
 const { createMessage, decodeAny } = require('@ocap/message');
 
 module.exports = function CreateVerifyMultiSigV2Pipe({ signersKey }) {
-  return function VerifyMultiSigV2(context, next) {
+  return async function VerifyMultiSigV2(context, next) {
     const signers = get(context, signersKey);
     if (signers.length === 0) {
       return next();
@@ -49,19 +49,22 @@ module.exports = function CreateVerifyMultiSigV2Pipe({ signersKey }) {
     tx.signature = '';
     tx.signaturesList = signatures.map((x) => omit(x, 'signature'));
     for (let i = 0; i < signatures.length; i++) {
-      const { signer, pk, delegator, signature } = signatures[i];
+      const { signer, pk, delegator, signature, extra = '' } = signatures[i];
 
       // if delegator is empty, pk and signer shall be a pair
       // if delegator is not empty, pk and delegator shall be a pair
       const address = delegator || signer;
-      const wallet = fromPublicKey(pk, toTypeInfo(address));
+      const type = toTypeInfo(address);
+      const wallet = fromPublicKey(pk, type);
 
       const message = createMessage('Transaction', tx);
       try {
-        if (wallet.verify(message.serializeBinary(), signature) === false) {
+        // eslint-disable-next-line no-await-in-loop
+        if ((await wallet.verify(message.serializeBinary(), signature, true, extra)) === false) {
           return next(new Error('INVALID_SIGNATURE', `Signature for ${address} is not valid`));
         }
       } catch (err) {
+        console.error(err);
         return next(new Error('INVALID_SIGNATURE', `Signature for ${address} verify failed: ${err.message}`));
       }
     }

package/lib/pipes/verify-multisig.js

@@ -6,7 +6,7 @@ const { fromPublicKey } = require('@ocap/wallet');
 const { createMessage, decodeAny } = require('@ocap/message');
 
 module.exports = function CreateVerifyMultiSigPipe(numSigs = 0) {
-  return function VerifyMultiSig(context, next) {
+  return async function VerifyMultiSig(context, next) {
     const tx = cloneDeep(context.tx);
     const signatures = getListField(tx, 'signatures');
     if (signatures.length !== numSigs) {
@@ -40,7 +40,8 @@ module.exports = function CreateVerifyMultiSigPipe(numSigs = 0) {
 
       tx.signatures = [{ signer, pk, delegator, data: decoded }].concat(signatures);
       const message = createMessage('Transaction', tx);
-      if (wallet.verify(message.serializeBinary(), signature) === false) {
+      // eslint-disable-next-line no-await-in-loop
+      if ((await wallet.verify(message.serializeBinary(), signature)) === false) {
         return next(new Error('INVALID_SIGNATURE', `Multi signature for ${address} is not valid`));
       }
     }

package/lib/pipes/verify-signature.js

@@ -3,9 +3,10 @@ const cloneDeep = require('lodash/cloneDeep');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
 const { fromPublicKey } = require('@ocap/wallet');
+const { types } = require('@ocap/mcrypto');
 const { createMessage } = require('@ocap/message');
 
-module.exports = function VerifySignature(context, next) {
+module.exports = async function VerifySignature(context, next) {
   const tx = cloneDeep(context.tx);
   const { signature } = tx;
 
@@ -26,12 +27,15 @@ module.exports = function VerifySignature(context, next) {
   }
 
   const message = createMessage('Transaction', tx);
-  const wallet = fromPublicKey(pk, toTypeInfo(signer));
+  const type = toTypeInfo(signer);
+  const wallet = fromPublicKey(pk, type);
+  const extra = type.role === types.RoleType.ROLE_PASSKEY ? get(context, 'extra.txExtra') : '';
   try {
-    if (wallet.verify(message.serializeBinary(), signature) === false) {
+    if ((await wallet.verify(message.serializeBinary(), signature, true, extra || '')) === false) {
       return next(new Error('INVALID_SIGNATURE', 'tx.signature is invalid'));
     }
   } catch (err) {
+    console.error(err);
     return next(new Error('INVALID_SIGNATURE', 'tx.signature verify failed'));
   }
 

package/lib/pipes/verify-state-diff.js

@@ -93,7 +93,7 @@ function fixMigratedReceipts(receipts, statesMap) {
  * verify that account balances are updated correctly by comparing before and after states
  */
 module.exports = function CreateVerifyStateDiffPipe({ snapshotKey = 'stateSnapshot' } = {}) {
-  return async function VerifyStateDiff(context, next) {
+  return function VerifyStateDiff(context, next) {
     const { logger, [snapshotKey]: snapshotStates } = context;
 
     if (!snapshotStates) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.166",
+  "version": "1.19.1",
   "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.166",
-    "@arcblock/did-util": "1.18.166",
-    "@ocap/mcrypto": "1.18.166",
-    "@ocap/message": "1.18.166",
-    "@ocap/state": "1.18.166",
-    "@ocap/util": "1.18.166",
-    "@ocap/wallet": "1.18.166",
+    "@arcblock/did": "1.19.1",
+    "@arcblock/did-util": "1.19.1",
+    "@ocap/mcrypto": "1.19.1",
+    "@ocap/message": "1.19.1",
+    "@ocap/state": "1.19.1",
+    "@ocap/util": "1.19.1",
+    "@ocap/wallet": "1.19.1",
     "debug": "^4.3.6",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "58c8356b3b8c238728560e4c3fef6ed1704d3ac4"
+  "gitHead": "21184488172c6c824ebd1714f728ff2aee4a3ac0"
 }