@ocap/tx-pipeline 1.16.16 → 1.16.17

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function CreateAntiLandAttackPipe({
   senderState = 'senderState',

package/lib/pipes/decode-itx.js

@@ -1,6 +1,6 @@
 const { decodeAny } = require('@ocap/message');
 
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function DecodeItx(context, next) {
   try {

package/lib/pipes/decode-tx.js

@@ -1,7 +1,7 @@
 const Mcrypto = require('@ocap/mcrypto');
 const { getMessageType } = require('@ocap/message');
 const { fromBase64, toUint8Array } = require('@ocap/util');
-const Error = require('@ocap/util/lib/error');
+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`);

package/lib/pipes/extract-signer.js

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

package/lib/pipes/extract-state.js

@@ -2,11 +2,11 @@
 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 { CustomError: 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');
+const { toTypeInfo, toTypeInfoStr } = require('@arcblock/did');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:extract-state`);
@@ -77,7 +77,7 @@ module.exports = function CreateExtractStatePipe({ from, to, table, 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 type = toTypeInfoStr(missing);
         const role = (type.role || '').replace('ROLE_', '');
         return next(new Error(status, `Invalid state extracted for ${role || table}: ${missing}`, { persist: true }));
       }

package/lib/pipes/update-owner.js

@@ -1,6 +1,6 @@
 const get = require('lodash/get');
 const set = require('lodash/set');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../package.json').name}:pipe:update-owner`);

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

@@ -1,7 +1,7 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const getListField = require('@ocap/util/lib/get-list-field');
-const Error = require('@ocap/util/lib/error');
+const { getListField } = require('@ocap/util/lib/get-list-field');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 // 因为 statedb 层读取数据时会自动获取迁移之后的账户，所以这里可以直接对比 state，而不用检查 migratedTo
 module.exports = function CreateVerifyAccountMigrationPipe({ signerKey = 'signerStates', senderKey = 'senderState' }) {

package/lib/pipes/verify-delegation.js

@@ -3,8 +3,8 @@
 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 { CustomError: 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

package/lib/pipes/verify-info.js

@@ -1,4 +1,4 @@
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifyInfoPipe(conditions) {
   return async function VerifyInfo(context, next) {

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifyListSizePipe({ listKey }) {
   return function VerifyListSize(context, next) {

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

@@ -2,8 +2,8 @@
 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 { CustomError: 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');

package/lib/pipes/verify-multisig.js

@@ -1,6 +1,6 @@
 const cloneDeep = require('lodash/cloneDeep');
-const Error = require('@ocap/util/lib/error');
-const getListField = require('@ocap/util/lib/get-list-field');
+const { CustomError: 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');

package/lib/pipes/verify-sender.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifySenderPipe({ state = 'senderState' } = {}) {
   return function VerifySender(context, next) {

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

@@ -1,4 +1,4 @@
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 const { BN, fromTokenToUnit } = require('@ocap/util');
 
 module.exports = function VerifyServiceFee(context, next) {

package/lib/pipes/verify-signature.js

@@ -1,6 +1,6 @@
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
 const { fromPublicKey } = require('@ocap/wallet');
 const { createMessage } = require('@ocap/message');

package/lib/pipes/verify-signer.js

@@ -1,7 +1,7 @@
 /* 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');
+const { CustomError: 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`);

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

@@ -1,8 +1,8 @@
 /* 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 { CustomError: 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' }) {

package/lib/pipes/verify-transferrable.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function CreateVerifyTransferrablePipe({ assets }) {
   return function VerifyTransferrable(context, next) {

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

@@ -2,9 +2,9 @@
 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 { CustomError: 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);
 

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 const get = require('lodash/get');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 module.exports = function VerifyTxSize(context, next) {
   const { txSize, txType, tx, config } = context;

package/lib/pipes/verify-tx.js

@@ -1,8 +1,8 @@
 /* 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 { CustomError: Error } = require('@ocap/util/lib/error');
+const { getListField } = require('@ocap/util/lib/get-list-field');
 const { isFromPublicKey } = require('@arcblock/did');
 
 module.exports = function VerifyTx(context, next) {

package/lib/pipes/verify-updater.js

@@ -1,7 +1,7 @@
 /* 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');
+const { CustomError: 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`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16",
+  "version": "1.16.17",
   "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.16.16",
-    "@arcblock/did-util": "1.16.16",
-    "@ocap/mcrypto": "1.16.16",
-    "@ocap/message": "1.16.16",
-    "@ocap/state": "1.16.16",
-    "@ocap/util": "1.16.16",
-    "@ocap/wallet": "1.16.16",
+    "@arcblock/did": "1.16.17",
+    "@arcblock/did-util": "1.16.17",
+    "@ocap/mcrypto": "1.16.17",
+    "@ocap/message": "1.16.17",
+    "@ocap/state": "1.16.17",
+    "@ocap/util": "1.16.17",
+    "@ocap/wallet": "1.16.17",
     "debug": "^4.3.3",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "051f9620995cf24407374cc4811b0fa6ed6dc7ca"
+  "gitHead": "489ce5e03bce27ddcd535390228b11ab56e7a2e3"
 }