@ocap/tx-pipeline 1.6.5 → 1.6.10

package/README.md

@@ -14,7 +14,7 @@ Then:
 const TxPipeline = require('@ocap/tx-pipeline');
 const NedbAdapter = require('@ocap/statedb-nedb');
 
-const { DecodeTx, VerifyTx, VerifyBlacklist, VerifyReplay, DecodeItx, VerifySignature, ExtractState } = TxPipeline;
+const { DecodeTx, VerifyTx, VerifyBlacklist, DecodeItx, VerifySignature, ExtractState } = TxPipeline;
 // Pre-pipelines
 // Check-pipelines: formal
 // Verify-pipelines: against state db
@@ -27,7 +27,6 @@ const pipeline = new TxPipeline('transfer');
 pipeline.use(DecodeTx);
 pipeline.use(VerifyTx);
 pipeline.use(VerifyBlacklist);
-pipeline.use(VerifyReplay);
 pipeline.use(DecodeItx);
 pipeline.use(VerifySignature);
 pipeline.use(ExtractState({ from: 'tx.from', to: 'senderState' }));
@@ -52,13 +51,6 @@ pipeline
 
 ## Pipes not supported
 
-- [ ] VerifyDelegation
-- [ ] VerifyAccountMigration
-- [ ] VerifySender: enforce declare
-- [ ] VerifyModifiable: asset related
 - [ ] VerifyModerator: chain administration
-- [ ] UpdateReceiptDB: bloom-filter for anti-reply check
-- [ ] UpdateState: should do nothing
-- [ ] CheckDID: white list
 - [ ] CheckError: log info on error
 - [ ] AntiReplayExchangeAttack

package/lib/index.js

@@ -1,31 +1,30 @@
 const Runner = require('./runner');
-const Error = require('./error');
 const AntiLandAttack = require('./pipes/anti-land-attack');
 const DecodeItx = require('./pipes/decode-itx');
 const DecodeTx = require('./pipes/decode-tx');
 const ExtractReceiver = require('./pipes/extract-receiver');
 const ExtractSigner = require('./pipes/extract-signer');
 const ExtractState = require('./pipes/extract-state');
-const UpdateDelegationState = require('./pipes/update-delegation-state');
 const UpdateOwner = require('./pipes/update-owner');
 const VerifyAccountMigration = require('./pipes/verify-account-migration');
-const VerifyBalance = require('./pipes/verify-balance');
 const VerifyDelegation = require('./pipes/verify-delegation');
 const VerifyInfo = require('./pipes/verify-info');
-const VerifyItxSize = require('./pipes/verify-itx-size');
+const VerifyListSize = require('./pipes/verify-list-size');
 const VerifyMultiSig = require('./pipes/verify-multisig');
-const VerifyReplay = require('./pipes/verify-replay');
+const VerifyMultiSigV2 = require('./pipes/verify-multisig-v2');
 const VerifySender = require('./pipes/verify-sender');
+const VerifyServiceFee = require('./pipes/verify-service-fee');
 const VerifySignature = require('./pipes/verify-signature');
 const VerifySigner = require('./pipes/verify-signer');
 const VerifyTransferrable = require('./pipes/verify-transferrable');
 const VerifyTx = require('./pipes/verify-tx');
 const VerifyTxSize = require('./pipes/verify-tx-size');
+const VerifyTxInput = require('./pipes/verify-tx-input');
 const VerifyUpdater = require('./pipes/verify-updater');
+const VerifyTokenBalance = require('./pipes/verify-token-balance');
 
 module.exports = {
   Runner,
-  Error,
   pipes: {
     AntiLandAttack,
     DecodeItx,
@@ -33,21 +32,22 @@ module.exports = {
     ExtractReceiver,
     ExtractSigner,
     ExtractState,
-    UpdateDelegationState,
     UpdateOwner,
     VerifyAccountMigration,
-    VerifyBalance,
     VerifyDelegation,
     VerifyInfo,
-    VerifyItxSize,
+    VerifyListSize,
     VerifyMultiSig,
+    VerifyMultiSigV2,
     VerifyUpdater,
-    VerifyReplay,
     VerifySender,
+    VerifyServiceFee,
     VerifySignature,
     VerifySigner,
     VerifyTransferrable,
     VerifyTx,
     VerifyTxSize,
+    VerifyTxInput,
+    VerifyTokenBalance,
   },
 };

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

@@ -1,16 +1,22 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('../error');
+const 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 (sender.address === receiver.address) {
+    if (receiver && sender.address === receiver.address) {
+      return next(new Error('INVALID_TX', 'Sender and receiver are the same'));
+    }
+
+    const receiverAddr = get(context, receiverAddress);
+    if (sender.address === receiverAddr) {
       return next(new Error('INVALID_TX', 'Sender and receiver are the same'));
     }
 

package/lib/pipes/decode-itx.js

@@ -1,12 +1,12 @@
 const { decodeAny } = require('@ocap/message');
 
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 module.exports = function DecodeItx(context, next) {
   try {
     const decoded = decodeAny(context.tx.itx);
-    Object.defineProperty(context, 'itx', { value: decoded.value });
-    Object.defineProperty(context, 'txType', { value: context.tx.itx.typeUrl });
+    Object.defineProperty(context, 'itx', { value: decoded.value, enumerable: true });
+    Object.defineProperty(context, 'txType', { value: context.tx.itx.typeUrl, enumerable: true });
   } catch (err) {
     return next(new Error('INVALID_TX', 'Failed to decode itx'));
   }

package/lib/pipes/decode-tx.js

@@ -1,12 +1,11 @@
 const Mcrypto = require('@ocap/mcrypto');
 const { getMessageType } = require('@ocap/message');
 const { fromBase64, toUint8Array } = require('@ocap/util');
+const Error = require('@ocap/util/lib/error');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:decode-tx`);
 
-const CustomError = require('../error');
-
 const sha256 = Mcrypto.Hasher.SHA2.hash256;
 const toTxHash = (buffer) => sha256(buffer, 1).replace(/^0x/, '').toUpperCase();
 const Transaction = getMessageType('Transaction').fn;
@@ -15,13 +14,16 @@ module.exports = function DecodeTx(context, next) {
   try {
     const txBuffer = toUint8Array(fromBase64(context.txBase64));
 
-    Object.defineProperty(context, 'tx', { value: Transaction.deserializeBinary(txBuffer).toObject() });
-    Object.defineProperty(context, 'txSize', { value: Buffer.byteLength(txBuffer) });
-    Object.defineProperty(context, 'txHash', { value: toTxHash(txBuffer) });
-    Object.defineProperty(context, 'txTime', { value: new Date().toISOString() });
+    Object.defineProperty(context, 'tx', {
+      value: Transaction.deserializeBinary(txBuffer).toObject(),
+      enumerable: true,
+    });
+    Object.defineProperty(context, 'txSize', { value: Buffer.byteLength(txBuffer), enumerable: true });
+    Object.defineProperty(context, 'txHash', { value: toTxHash(txBuffer), enumerable: true });
+    Object.defineProperty(context, 'txTime', { value: new Date().toISOString(), enumerable: true });
   } catch (err) {
     debug('failed to decode transaction', { txBase64: context.txBase64, error: err });
-    return next(new CustomError('INVALID_TX', 'Can not decode base64 encoded transaction'));
+    return next(new Error('INVALID_TX', 'Can not decode base64 encoded transaction'));
   }
 
   next();

package/lib/pipes/extract-signer.js

@@ -1,7 +1,6 @@
 const set = require('lodash/set');
 const getListField = require('@ocap/util/lib/get-list-field');
-
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 module.exports = function CreateExtractSignerPipe({
   signerKey = 'signerStates',

package/lib/pipes/extract-state.js

@@ -2,15 +2,31 @@
 const get = require('lodash/get');
 const set = require('lodash/set');
 const isEmpty = require('empty-value');
+const Error = require('@ocap/util/lib/error');
+const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 const { types } = require('@ocap/mcrypto');
+const { tables } = require('@ocap/state');
 const { toTypeInfo } = require('@arcblock/did');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:extract-state`);
 
-const Error = require('../error');
+const getRelatedAddrList = (x) => (x.hash ? [x.hash] : getRelatedAddresses(x));
+
+/**
+ * Extract state from state db
+ *
+ * @param {object} params
+ * @return {string} params.from  path to extract id for state
+ * @return {string} params.to  path to populate extracted state
+ * @return {string} params.table  which statedb to query, default is auto detect, can be [account,asset,delegation,factory,token]
+ * @return {string} params.status  error code when the extracted state is empty
+ */
+module.exports = function CreateExtractStatePipe({ from, to, table, status = 'OK' }) {
+  if (table && tables.includes(table) === false) {
+    throw new Error('INTERNAL', 'Invalid table param for ExtractState pipe');
+  }
 
-module.exports = function CreateExtractStatePipe({ from, to, status = 'OK' }) {
   return async function ExtractState(context, next) {
     if (typeof get(context, to) !== 'undefined') {
       // Do not overwrite if the key already exists
@@ -19,38 +35,56 @@ module.exports = function CreateExtractStatePipe({ from, to, status = 'OK' }) {
 
     const address = get(context, from);
     if (isEmpty(address)) {
-      set(context, to, null);
+      set(context, to, undefined);
       return next();
     }
 
-    if (address) {
-      const addresses = Array.isArray(address) ? address : [address];
-      const value = (
-        await Promise.all(
-          addresses.map((x) => {
+    const list = Array.isArray(address) ? address : [address];
+    const result = (
+      await Promise.all(
+        list.map((x) => {
+          if (typeof table === 'undefined') {
             const type = toTypeInfo(x);
             if (type.role === types.RoleType.ROLE_ASSET) {
               return context.statedb.asset.get(x, context);
             }
-            if (type.role === types.RoleType.ROLE_DELEGATE) {
+            if (type.role === types.RoleType.ROLE_DELEGATION) {
               return context.statedb.delegation.get(x, context);
             }
+            if (type.role === types.RoleType.ROLE_TOKEN) {
+              return context.statedb.token.get(x, context);
+            }
+            if (type.role === types.RoleType.ROLE_FACTORY) {
+              return context.statedb.factory.get(x, context);
+            }
+            if (type.role === types.RoleType.ROLE_STAKE) {
+              return context.statedb.stake.get(x, context);
+            }
+            if (type.role === types.RoleType.ROLE_ROLLUP) {
+              return context.statedb.rollup.get(x, context);
+            }
 
             // FIXME: maybe buggy here, since we have many role types
             return context.statedb.account.get(x, context);
-          })
-        )
-      ).filter(Boolean);
+          }
 
-      debug('extract', { address, value });
+          return context.statedb[table].get(x, context);
+        })
+      )
+    ).filter(Boolean);
 
-      if (isEmpty(value) && status !== 'OK') {
-        return next(new Error(status, `Invalid state extracted for ${address}`));
+    if (status !== 'OK') {
+      const missing = list.find((x) => !result.find((r) => getRelatedAddrList(r).includes(x)));
+      debug('extract', { address, result, missing });
+      if (missing) {
+        const type = toTypeInfo(missing, true);
+        const role = (type.role || '').replace('ROLE_', '');
+        return next(new Error(status, `Invalid state extracted for ${role || table}: ${missing}`, { persist: true }));
       }
-
-      set(context, to, Array.isArray(address) ? value : value.shift());
     }
 
+    set(context, to, Array.isArray(address) ? result : result.shift());
+
     next();
   };
 };

package/lib/pipes/update-owner.js

@@ -1,23 +1,21 @@
 const get = require('lodash/get');
 const set = require('lodash/set');
+const Error = require('@ocap/util/lib/error');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:update-owner`);
 
-const Error = require('../error');
-
 module.exports = function CreateUpdateOwnerPipe({ assets, owner }) {
   return async function UpdateOwner(context, next) {
-    const { statedb, states } = context;
-
-    const ownerState = get(context, owner);
-    const ownerAddress = typeof ownerState === 'string' ? ownerState : ownerState.address;
-
     let items = get(context, assets);
     if (!items) {
       return next();
     }
 
+    const { statedb, states } = context;
+    const ownerState = get(context, owner);
+    const ownerAddress = typeof ownerState === 'string' ? ownerState : ownerState.address;
+
     const isList = Array.isArray(items);
     items = isList ? items : [items];
 
@@ -33,7 +31,7 @@ module.exports = function CreateUpdateOwnerPipe({ assets, owner }) {
       );
       set(context, assets, isList ? updated : updated.shift());
     } catch (err) {
-      return next(new Error('INTERNAL', err.message));
+      return next(new Error('INTERNAL', err.message, { persist: true }));
     }
 
     next();

package/lib/pipes/verify-account-migration.js

@@ -1,8 +1,7 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
 const getListField = require('@ocap/util/lib/get-list-field');
-
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 // 因为 statedb 层读取数据时会自动获取迁移之后的账户，所以这里可以直接对比 state，而不用检查 migratedTo
 module.exports = function CreateVerifyAccountMigrationPipe({ signerKey = 'signerStates', senderKey = 'senderState' }) {
@@ -11,7 +10,7 @@ module.exports = function CreateVerifyAccountMigrationPipe({ signerKey = 'signer
 
     const sender = get(context, senderKey);
     if (sender && sender.address !== tx.from) {
-      return next(new Error('ACCOUNT_MIGRATED', `Sender account ${sender.address} is migrated`));
+      return next(new Error('ACCOUNT_MIGRATED', `Sender account ${sender.address} is migrated`, { persist: true }));
     }
 
     const signers = get(context, signerKey);
@@ -20,7 +19,9 @@ module.exports = function CreateVerifyAccountMigrationPipe({ signerKey = 'signer
       for (const signature of signatures) {
         const state = signers.find((x) => x.address === signature.signer);
         if (!state || state.address !== signature.signer) {
-          return next(new Error('ACCOUNT_MIGRATED', `Signer account ${signature.signer} is migrated`));
+          return next(
+            new Error('ACCOUNT_MIGRATED', `Signer account ${signature.signer} is migrated`, { persist: true })
+          );
         }
       }
     }

package/lib/pipes/verify-delegation.js

@@ -3,14 +3,13 @@
 const get = require('lodash/get');
 const set = require('lodash/set');
 const isEmpty = require('empty-value');
+const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { toDelegateAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:verify-delegation`);
 
-const Error = require('../error');
-
 // Must be piped after `extract-state` or `extract-signer` pipe
 module.exports = function CreateVerifyDelegationPipe({
   type = 'signature',
@@ -21,7 +20,7 @@ module.exports = function CreateVerifyDelegationPipe({
   return async function VerifyDelegation(context, next) {
     const { tx, txType, statedb } = context;
 
-    const getDelegationState = (signerState, delegatorAddress, delegatorState) => {
+    const getDelegationState = (signerState, delegatorState) => {
       if (delegatorState) {
         const address = toDelegateAddress(signerState.address, delegatorState.address);
         debug('query', { from: signerState.address, to: signerState.address, address });
@@ -49,14 +48,21 @@ module.exports = function CreateVerifyDelegationPipe({
       const signerState = get(context, signerKey);
       const delegatorState = get(context, delegatorKey);
 
-      const delegationState = await getDelegationState(signerState, tx.delegator, delegatorState);
+      const delegationState = await getDelegationState(signerState, delegatorState);
       if (!delegationState) {
-        return next(new Error('INVALID_DELEGATION', 'No delegation found between sender and delegator'));
+        console.error('invalid_delegation', {
+          signerAddress: signerState.address,
+          delegatorAddress: get(delegatorState, 'address'),
+        });
+
+        return next(
+          new Error('INVALID_DELEGATION', 'No delegation found between sender and delegator', { persist: true })
+        );
       }
 
       const errorCode = await checkDelegation(delegationState);
       if (errorCode) {
-        return next(new Error(errorCode, 'Delegation check failed'));
+        return next(new Error(errorCode, 'Delegation check failed', { persist: true }));
       }
 
       set(context, delegationKey, delegationState);
@@ -79,14 +85,21 @@ module.exports = function CreateVerifyDelegationPipe({
         const signerState = signerStates.find((x) => x.address === signer);
         const delegatorState = delegatorStates.find((x) => x.address === delegator);
 
-        const delegationState = await getDelegationState(signerState, delegator, delegatorState);
+        const delegationState = await getDelegationState(signerState, delegatorState);
         if (!delegationState) {
-          return next(new Error('INVALID_DELEGATION', 'No delegation found between signer and delegator'));
+          console.error('invalid_delegation', {
+            signerAddress: signerState.address,
+            delegatorAddress: get(delegatorState, 'address'),
+          });
+
+          return next(
+            new Error('INVALID_DELEGATION', 'No delegation found between signer and delegator', { persist: true })
+          );
         }
 
         const errorCode = await checkDelegation(delegationState);
         if (errorCode) {
-          return next(new Error(errorCode, 'Delegation check failed'));
+          return next(new Error(errorCode, 'Delegation check failed', { persist: true }));
         }
 
         delegationStates.push(delegationState);

package/lib/pipes/verify-info.js

@@ -1,12 +1,11 @@
-/* eslint-disable no-restricted-syntax */
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifyInfoPipe(conditions) {
-  return function VerifyInfo(context, next) {
+  return async function VerifyInfo(context, next) {
     const checks = Array.isArray(conditions) ? conditions : [conditions];
     for (const check of checks) {
       if (!check.fn(context)) {
-        return next(new Error(check.error, check.message || 'Transaction info verify failed'));
+        return next(new Error(check.error, check.message || check.error, { persist: !!check.persist }));
       }
     }
 

package/lib/pipes/verify-list-size.js

@@ -0,0 +1,19 @@
+/* eslint-disable no-restricted-syntax */
+const get = require('lodash/get');
+const Error = require('@ocap/util/lib/error');
+
+module.exports = function CreateVerifyListSizePipe({ listKey }) {
+  return function VerifyListSize(context, next) {
+    const maxListSize = get(context, 'config.transaction.maxListSize');
+
+    const keys = Array.isArray(listKey) ? listKey : [listKey];
+    for (const key of keys) {
+      const tmp = get(context, key);
+      if (Array.isArray(tmp) && tmp.length > maxListSize) {
+        return next(new Error('INVALID_TX_SIZE', `Size of ${listKey} can not exceeded ${maxListSize} items`));
+      }
+    }
+
+    next();
+  };
+};

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

@@ -0,0 +1,71 @@
+/* eslint-disable no-restricted-syntax */
+const get = require('lodash/get');
+const omit = require('lodash/omit');
+const cloneDeep = require('lodash/cloneDeep');
+const Error = require('@ocap/util/lib/error');
+const getListField = require('@ocap/util/lib/get-list-field');
+const { toTypeInfo } = require('@arcblock/did');
+const { fromPublicKey } = require('@ocap/wallet');
+const { createMessage, decodeAny } = require('@ocap/message');
+
+module.exports = function CreateVerifyMultiSigV2Pipe({ signersKey }) {
+  return function VerifyMultiSigV2(context, next) {
+    const signers = get(context, signersKey);
+    if (signers.length === 0) {
+      return next();
+    }
+
+    // Verify signature count
+    const tx = cloneDeep(context.tx);
+    const signatures = getListField(tx, 'signatures');
+    if (signatures.length !== signers.length) {
+      return next(new Error('INVALID_SIGNATURE', `Expect ${signers.length} signatures but found ${signatures.length}`));
+    }
+
+    // Ensure each signer has signed
+    for (const signer of signers) {
+      const sig = signatures.find((x) => [x.delegator, x.signer].includes(signer));
+      if (!sig) {
+        return next(new Error('INVALID_SIGNATURE', `Signature for ${signer} not found in tx.signatures`));
+      }
+    }
+
+    // Cleanup signatures for later verification
+    signatures.forEach((sig) => {
+      const decoded = sig.data ? decodeAny(sig.data) : sig.data;
+      // HACK: this exist because duplicate serialization of Any type data for json/vc
+      if (decoded && ['json', 'vc'].includes(decoded.type)) {
+        try {
+          decoded.value = JSON.parse(Buffer.from(decoded.value, 'base64'));
+        } catch (e) {
+          // Do nothing
+        }
+      }
+
+      sig.data = decoded;
+    });
+
+    // Verify Signature content
+    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];
+
+      // 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 message = createMessage('Transaction', tx);
+      try {
+        if (wallet.verify(message.serializeBinary(), signature) === false) {
+          return next(new Error('INVALID_SIGNATURE', `Signature for ${address} is not valid`));
+        }
+      } catch (err) {
+        return next(new Error('INVALID_SIGNATURE', `Signature for ${address} verify failed: ${err.message}`));
+      }
+    }
+
+    next();
+  };
+};

package/lib/pipes/verify-multisig.js

@@ -1,11 +1,10 @@
 const cloneDeep = require('lodash/cloneDeep');
+const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { toTypeInfo } = require('@arcblock/did');
 const { fromPublicKey } = require('@ocap/wallet');
 const { createMessage, decodeAny } = require('@ocap/message');
 
-const Error = require('../error');
-
 module.exports = function CreateVerifyMultiSigPipe(numSigs = 0) {
   return function VerifyMultiSig(context, next) {
     const tx = cloneDeep(context.tx);
@@ -23,6 +22,9 @@ module.exports = function CreateVerifyMultiSigPipe(numSigs = 0) {
 
     while (signatures.length > 0) {
       const { signer, pk, delegator, signature, data } = signatures.shift();
+
+      // 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));
 

package/lib/pipes/verify-sender.js

@@ -1,13 +1,13 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifySenderPipe({ state = 'senderState' } = {}) {
   return function VerifySender(context, next) {
     const sender = get(context, state);
     if (context.txType === 'fg:t:declare') {
       if (sender) {
-        return next(new Error('INVALID_SENDER_STATE', 'Sender account already exist in ledger'));
+        return next(new Error('INVALID_SENDER_STATE', 'Sender account already exist in ledger', { persist: true }));
       }
 
       return next();
@@ -17,6 +17,6 @@ module.exports = function CreateVerifySenderPipe({ state = 'senderState' } = {})
       return next();
     }
 
-    return next(new Error('INVALID_SENDER_STATE', 'Sender account not exist in ledger'));
+    return next(new Error('INVALID_SENDER_STATE', 'Sender account not exist in ledger', { persist: true }));
   };
 };

package/lib/pipes/verify-service-fee.js

@@ -0,0 +1,15 @@
+const Error = require('@ocap/util/lib/error');
+const { BN, fromTokenToUnit } = require('@ocap/util');
+
+module.exports = function VerifyServiceFee(context, next) {
+  const { tx, config, txType } = context;
+  const fee = config.transaction.txFee[txType] || 0;
+  const expected = fromTokenToUnit(fee, config.token.decimal);
+  const actual = new BN(tx.serviceFee || 0);
+
+  if (actual.eq(expected) === false) {
+    return next(new Error('INVALID_SERVICE_FEE', 'Service fee for tx does not match chain config'));
+  }
+
+  next();
+};

package/lib/pipes/verify-signature.js

@@ -1,34 +1,38 @@
+const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
+const Error = require('@ocap/util/lib/error');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
 const { fromPublicKey } = require('@ocap/wallet');
 const { createMessage } = require('@ocap/message');
 
-const Error = require('../error');
-
 module.exports = function VerifySignature(context, next) {
   const tx = cloneDeep(context.tx);
   const { signature } = tx;
 
   delete tx.signature;
-  delete tx.signatures;
-  delete tx.signaturesList;
+  // The latest multi sig is done before the sender signature
+  const multiSignV2Txs = get(context, 'config.transaction.multiSignV2Txs', []);
+  if (multiSignV2Txs.includes(context.txType) === false) {
+    delete tx.signatures;
+    delete tx.signaturesList;
+  }
 
   // if delegator is empty, pk / from address shall be a pair
   // if delegator is not empty, pk / delegator address shall be a pair
   const { pk, delegator, from } = tx;
   const signer = delegator || from;
   if (isFromPublicKey(signer, pk) === false) {
-    return next(new Error('INVALID_SIGNATURE', 'Signature is invalid: signer and pk does not match'));
+    return next(new Error('INVALID_SIGNATURE', 'signer and pk does not match'));
   }
 
   const message = createMessage('Transaction', tx);
   const wallet = fromPublicKey(pk, toTypeInfo(signer));
   try {
     if (wallet.verify(message.serializeBinary(), signature) === false) {
-      return next(new Error('INVALID_SIGNATURE', 'Signature is invalid'));
+      return next(new Error('INVALID_SIGNATURE', 'tx.signature is invalid'));
     }
   } catch (err) {
-    return next(new Error('INVALID_SIGNATURE', 'Signature is invalid'));
+    return next(new Error('INVALID_SIGNATURE', 'tx.signature verify failed'));
   }
 
   next();

package/lib/pipes/verify-signer.js

@@ -1,12 +1,11 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
+const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:verify-signer`);
 
-const Error = require('../error');
-
 module.exports = function CreateVerifySignerPipe({ signer }) {
   return function VerifySigner(context, next) {
     const expected = get(context, signer);
@@ -19,7 +18,8 @@ module.exports = function CreateVerifySignerPipe({ signer }) {
       return next(new Error('INVALID_TX', 'Multisig can not be empty'));
     }
 
-    const [{ signer: actual }] = signatures;
+    const [{ signer: signerDid, delegator }] = signatures;
+    const actual = delegator || signerDid;
     debug('verify', { expected, actual });
     if (actual !== expected) {
       return next(new Error('INVALID_TX', `Expect multisig to be signed by ${expected} but got ${actual}`));

package/lib/pipes/verify-token-balance.js

@@ -0,0 +1,73 @@
+/* eslint-disable no-restricted-syntax */
+const get = require('lodash/get');
+const isEmpty = require('empty-value');
+const Error = require('@ocap/util/lib/error');
+const getListField = require('@ocap/util/lib/get-list-field');
+const { BN } = require('@ocap/util');
+
+module.exports = function CreateVerifyTokenBalancePipe({ ownerKey, conditionKey, tokensKey = 'tokens' }) {
+  return function VerifyTokenBalance(context, next) {
+    let conditions = get(context, conditionKey);
+    if (isEmpty(conditions)) {
+      return next();
+    }
+
+    let owners = get(context, ownerKey, []);
+    if (isEmpty(owners)) {
+      return next(new Error('INVALID_TX', 'Token owner not found', { persist: true }));
+    }
+
+    conditions = Array.isArray(conditions) ? conditions : [conditions];
+    owners = Array.isArray(owners) ? owners : [owners];
+
+    for (const condition of conditions) {
+      const owner = owners.find((x) => x.address === condition.owner);
+      if (!owner) {
+        return next(new Error('INVALID_TX', `Token owner ${condition.owner} not found`, { persist: true }));
+      }
+
+      const { tokens: actual } = owner;
+      const requirements = getListField(condition, tokensKey);
+
+      for (const requirement of requirements) {
+        const { address, value } = requirement;
+
+        // ensure requirement is valid
+        if (!address || !value) {
+          return next(
+            new Error('INTERNAL', 'Invalid requirement params provided for VerifyTokenBalance pipe', { persist: true })
+          );
+        }
+
+        // ensure secondary token
+        if (isEmpty(actual)) {
+          return next(
+            new Error('INSUFFICIENT_FUND', `Account(${owner.address}) does not own any token`, { persist: true })
+          );
+        }
+
+        if (!actual[address]) {
+          return next(
+            new Error('INSUFFICIENT_FUND', `Account(${owner.address}) does not own token(${address})`, {
+              persist: true,
+            })
+          );
+        }
+
+        const expectedBalance = new BN(value);
+        const actualBalance = new BN(actual[address]);
+        if (actualBalance.lt(expectedBalance)) {
+          return next(
+            new Error(
+              'INSUFFICIENT_FUND',
+              `Account(${owner.address}) does not have enough token(${address}) to complete the transaction, expected (${expectedBalance}), actual (${actualBalance})`,
+              { persist: true }
+            )
+          );
+        }
+      }
+    }
+
+    next();
+  };
+};

package/lib/pipes/verify-transferrable.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifyTransferrablePipe({ assets }) {
   return function VerifyTransferrable(context, next) {
@@ -8,7 +8,9 @@ module.exports = function CreateVerifyTransferrablePipe({ assets }) {
     items = (Array.isArray(items) ? items : [items]).filter(Boolean);
     for (const item of items) {
       if (item.transferrable === false) {
-        return next(new Error('UNTRANSFERRABLE_ASSET', `Asset ${item.address} is not transferrable`));
+        return next(
+          new Error('UNTRANSFERRABLE_ASSET', `Asset ${item.address} is not transferrable`, { persist: true })
+        );
       }
     }
 

package/lib/pipes/verify-tx-input.js

@@ -0,0 +1,79 @@
+/* eslint-disable no-restricted-syntax */
+const get = require('lodash/get');
+const isEmpty = require('empty-value');
+const { BN } = require('@ocap/util');
+const Error = require('@ocap/util/lib/error');
+const getListField = require('@ocap/util/lib/get-list-field');
+const createSortedList = require('@ocap/util/lib/create-sorted-list');
+
+const ZERO = new BN(0);
+
+module.exports = function CreateVerifyTxInputPipe({
+  fieldKey = 'itx.inputs',
+  inputsKey = 'inputs',
+  sendersKey = 'senders',
+  tokensKey = 'tokens',
+  assetsKey = 'assets',
+}) {
+  return function VerifyTxInput(context, next) {
+    const inputs = getListField(context, fieldKey);
+    const getTokens = (x) => x.tokensList || x.tokens;
+    const getAssets = (x) => x.assetsList || x.assets;
+
+    // For backwards compatibility: merge primary and secondary tokens
+    const address = get(context, 'config.token.address');
+    inputs.forEach((x) => {
+      getTokens(x).forEach((t) => {
+        if (!t.address) {
+          t.address = address;
+        }
+      });
+    });
+
+    const senders = createSortedList(inputs.map((x) => x.owner));
+    const tokens = createSortedList(inputs.map((x) => getTokens(x).map((t) => t.address)));
+    const assets = createSortedList(inputs.map((x) => getAssets(x)));
+
+    const checks = [
+      {
+        error: 'INSUFFICIENT_DATA',
+        message: `${fieldKey} should not be empty`,
+        fn: () => !isEmpty(inputs),
+      },
+      {
+        error: 'INVALID_TX',
+        message: `${fieldKey} should not contain duplicate owner`,
+        fn: () => inputs.length === senders.length,
+      },
+      {
+        error: 'INVALID_TX',
+        message: `Each ${fieldKey} item should not contain duplicate token`,
+        fn: () =>
+          inputs.every((x) => createSortedList(getTokens(x).map((t) => t.address)).length === getTokens(x).length),
+      },
+      {
+        error: 'INVALID_TX',
+        message: `Each ${fieldKey} item should not contain duplicate asset`,
+        fn: () => inputs.every((x) => createSortedList(getAssets(x)).length === getAssets(x).length),
+      },
+      {
+        error: 'INVALID_TX',
+        message: `Token amount must be greater than 0 in each ${fieldKey} item`,
+        fn: () => inputs.every((x) => getTokens(x).every(({ value }) => new BN(value).gt(ZERO))),
+      },
+    ];
+
+    for (const { error, message, fn } of checks) {
+      if (!fn()) {
+        return next(new Error(error, message));
+      }
+    }
+
+    context[inputsKey] = inputs;
+    context[sendersKey] = senders;
+    context[tokensKey] = tokens;
+    context[assetsKey] = assets;
+
+    next();
+  };
+};

package/lib/pipes/verify-tx-size.js

@@ -1,12 +1,15 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('../error');
+const Error = require('@ocap/util/lib/error');
 
 module.exports = function VerifyTxSize(context, next) {
-  const defaultSizeLimit = get(context, 'config.transaction.maxTxSize.default');
-  const sizeLimit = get(context, `config.transaction.maxTxSize.${context.tx.itx.typeUrl}`, defaultSizeLimit);
-  if (context.txSize > sizeLimit) {
-    return next(new Error('INVALID_TX_SIZE', `Transaction size exceeded ${sizeLimit} bytes`));
+  const { txSize, txType, tx, config } = context;
+  const defaultSizeLimit = get(config, 'transaction.maxTxSize.default');
+  const sizeLimit = get(config, `transaction.maxTxSize.${tx.itx.typeUrl}`, defaultSizeLimit);
+  if (txSize > sizeLimit) {
+    return next(
+      new Error('INVALID_TX_SIZE', `Transaction size too large for ${txType}: expect ${sizeLimit}, got ${txSize}`)
+    );
   }
 
   next();

package/lib/pipes/verify-tx.js

@@ -1,9 +1,9 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
 const isEmpty = require('empty-value');
+const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { isFromPublicKey } = require('@arcblock/did');
-const Error = require('../error');
 
 module.exports = function VerifyTx(context, next) {
   // 0. validate required fields
@@ -17,8 +17,9 @@ module.exports = function VerifyTx(context, next) {
   const { itx, chainId, nonce, pk, from, delegator } = context.tx;
 
   // 1. validate field values
-  if (chainId !== get(context, 'config.chainId')) {
-    return next(new Error('INVALID_CHAIN_ID', 'Invalid chain id'));
+  const expected = get(context, 'config.chainId');
+  if (chainId !== expected) {
+    return next(new Error('INVALID_CHAIN_ID', `Invalid chain id: expected ${expected}, got ${chainId}`));
   }
   const n = Number(nonce);
   // eslint-disable-next-line no-restricted-globals

package/lib/pipes/verify-updater.js

@@ -1,13 +1,11 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
+const Error = require('@ocap/util/lib/error');
+const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:verify-owner`);
 
-const Error = require('../error');
-
-const getRelatedAddresses = (state) => [state.address].concat(state.migratedFrom || []).filter(Boolean);
-
 /**
  * Usage scenarios
  * - Verify the asset owner, only the owner can change ownership of the asset
@@ -21,18 +19,32 @@ const getRelatedAddresses = (state) => [state.address].concat(state.migratedFrom
 module.exports = function CreateVerifyUpdaterPipe({ assetKey, ownerKey, updaterKey = 'owner' }) {
   return function VerifyUpdater(context, next) {
     const owner = get(context, ownerKey);
-    const ownerAddress = typeof owner === 'string' ? [owner] : getRelatedAddresses(owner);
-    const updaterKeys = typeof updaterKey === 'string' ? [updaterKey] : updaterKey;
-
     let assets = get(context, assetKey);
     assets = (Array.isArray(assets) ? assets : [assets]).filter(Boolean);
 
+    if (!owner) {
+      // If owner is not found, but assets is not empty, we should throw an error
+      if (assets.length) {
+        return next(new Error('INVALID_OWNER', 'Asset owner is empty', { persist: true }));
+      }
+
+      // Otherwise, we can continue
+      return next();
+    }
+
+    const ownerAddress = typeof owner === 'string' ? [owner] : getRelatedAddresses(owner);
+    const updaterKeys = typeof updaterKey === 'string' ? [updaterKey] : updaterKey;
+
     debug('verify', { ownerAddress, assets, updaterKeys });
 
     for (const asset of assets) {
       const updaters = updaterKeys.map((x) => asset[x]).filter(Boolean);
       if (!updaters.length || updaters.every((updater) => ownerAddress.includes(updater) === false)) {
-        return next(new Error('INVALID_OWNER', `Asset ${asset.address} can not be updated by ${ownerAddress}`));
+        return next(
+          new Error('INVALID_OWNER', `Asset ${asset.address} can not be updated by ${ownerAddress}`, {
+            persist: true,
+          })
+        );
       }
     }
 

package/lib/runner.js

@@ -1,8 +1,5 @@
 const EventEmitter = require('events');
 
-// eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../package.json').name}:runner`);
-
 /* istanbul ignore next */
 function nextTick(fn) {
   // eslint-disable-next-line
@@ -19,38 +16,39 @@ class PipelineRunner extends EventEmitter {
     this.pipes = [];
   }
 
-  use(pipe) {
-    this.pipes.push(pipe);
+  use(pipe, opts = {}) {
+    this.pipes.push({ fn: pipe, opts });
   }
 
   run(context, done) {
-    const call = async (pipe, err, next) => {
-      const paramCount = pipe.length;
+    const call = async (fn, err, next, opts) => {
+      const paramCount = fn.length;
       const hasError = Boolean(err);
 
       try {
         if (hasError && paramCount === 3) {
-          // error-handling pipe
-          await pipe(err, context, next);
-          debug('call error pipe', pipe.name || '<anonymous>');
+          await fn(err, context, next);
           return;
         }
         if (!hasError && paramCount < 3) {
-          // tx-processing pipe
-          await pipe(context, next);
-          debug('call pipe ok', pipe.name || '<anonymous>');
+          await fn(context, next);
           return;
         }
 
         // Here we are skipping remaining
       } catch (e) {
         if (process.env.NODE_ENV !== 'test') {
-          console.error('call pipe failed', pipe.name || '<anonymous>', e);
+          console.error('call pipe failed', fn.name || '<anonymous>', e);
         }
 
         // 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
@@ -69,7 +67,8 @@ class PipelineRunner extends EventEmitter {
       }
 
       // call the pipeline fn
-      await call(pipe, err, next);
+      const { fn, opts } = pipe;
+      await call(fn, err, next, opts);
     };
 
     next();

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.5",
+  "version": "1.6.10",
   "description": "Pipeline runner and common pipelines to process transactions",
   "main": "lib/index.js",
   "files": [
@@ -12,30 +12,33 @@
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
-    "coverage": "npm run test -- --coverage"
+    "start": "node tools/start-chain.js",
+    "test": "jest --forceExit --detectOpenHandles",
+    "test:ci": "jest --forceExit --detectOpenHandles --coverage",
+    "coverage": "start-server-and-test start http://127.0.0.1:4002 test:ci"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "devDependencies": {
-    "jest": "^26.6.3"
+    "jest": "^27.3.1",
+    "start-server-and-test": "^1.14.0"
   },
   "resolutions": {
     "bn.js": "5.1.3",
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "^1.6.5",
-    "@arcblock/did-util": "^1.6.5",
-    "@ocap/mcrypto": "^1.6.5",
-    "@ocap/message": "^1.6.5",
-    "@ocap/sdk": "^1.6.5",
-    "@ocap/util": "^1.6.5",
-    "@ocap/wallet": "^1.6.5",
-    "debug": "^4.3.1",
+    "@arcblock/did": "1.6.10",
+    "@arcblock/did-util": "1.6.10",
+    "@ocap/mcrypto": "1.6.10",
+    "@ocap/message": "1.6.10",
+    "@ocap/state": "1.6.10",
+    "@ocap/util": "1.6.10",
+    "@ocap/wallet": "1.6.10",
+    "debug": "^4.3.3",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "5779448f13824de38978df3c84c9da0c1e1ad989"
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1"
 }

package/lib/error.js

@@ -1,13 +0,0 @@
-class CustomError extends Error {
-  constructor(code = 'GENERIC', ...params) {
-    super(...params);
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, CustomError);
-    }
-
-    this.code = code;
-  }
-}
-
-module.exports = CustomError;

package/lib/pipes/update-delegation-state.js

@@ -1,11 +0,0 @@
-// eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../package.json').name}:pipe:update-delegation-state`);
-
-// const Error = require('../error');
-
-module.exports = function CreateUpdatePipe({ stateKey = 'delegationState', statesKey = 'delegationStates' }) {
-  return function UpdateDelegationState(context, next) {
-    debug('update delegation state', { stateKey, statesKey });
-    next();
-  };
-};

package/lib/pipes/verify-balance.js

@@ -1,20 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-const get = require('lodash/get');
-const { decodeBigInt } = require('@ocap/message');
-const { BN } = require('@ocap/util');
-const Error = require('../error');
-
-module.exports = function CreateVerifyBalancePipe({ state, value }) {
-  return function VerifyBalance(context, next) {
-    const account = get(context, state);
-    const raw = get(context, value);
-    const requirement = new BN(raw ? decodeBigInt(raw) : '0');
-    const balance = new BN(account.balance);
-
-    if (balance.lt(requirement)) {
-      return next(new Error('INSUFFICIENT_FUND', 'Account balance not enough to complete the transaction'));
-    }
-
-    next();
-  };
-};

package/lib/pipes/verify-itx-size.js

@@ -1,19 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-const get = require('lodash/get');
-const Error = require('../error');
-
-module.exports = function CreateVerifyItxSizePipe({ value }) {
-  return function VerifyItxSize(context, next) {
-    const maxListSize = get(context, 'config.transaction.maxListSize');
-
-    const keys = Array.isArray(value) ? value : [value];
-    for (const key of keys) {
-      const tmp = get(context, key);
-      if (tmp.length > maxListSize) {
-        return next(new Error('INVALID_TX_SIZE', `Asset list can not exceeded ${maxListSize} items`));
-      }
-    }
-
-    next();
-  };
-};

package/lib/pipes/verify-replay.js

@@ -1,19 +0,0 @@
-const get = require('lodash/get');
-
-const Error = require('../error');
-
-// Simple anti-replay on transaction hash with bloom-filter
-module.exports = function CreateVerifyReplayPipe({ filter, key = 'txHash' }) {
-  return function VerifyReplay(context, next) {
-    const hash = get(context, key);
-    if (hash) {
-      if (filter.has(hash)) {
-        return next(new Error('INVALID_NONCE', 'Can not replay an existing transaction'));
-      }
-
-      filter.add(hash);
-    }
-
-    next();
-  };
-};