@ocap/tx-protocols 1.18.32 → 1.18.33

package/lib/protocols/account/declare.js

@@ -10,7 +10,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // verify itx
 const schema = Joi.object({
-  issuer: Joi.DID().optional().allow(''),
+  issuer: Joi.DID().prefix().optional().allow(''),
   moniker: Joi.string()
     .regex(/^[a-zA-Z0-9][-a-zA-Z0-9_]{2,40}$/)
     .required(),

package/lib/protocols/account/delegate.js

@@ -19,8 +19,8 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // verify itx
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_DELEGATION').required(),
-  to: Joi.DID().required(),
+  address: Joi.DID().prefix().role('ROLE_DELEGATION').required(),
+  to: Joi.DID().prefix().required(),
   opsList: Joi.array()
     .items(
       Joi.object({

package/lib/protocols/account/migrate.js

@@ -17,7 +17,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // verify itx
 const schema = Joi.object({
-  address: Joi.DID().required(),
+  address: Joi.DID().prefix().required(),
   pk: Joi.any().required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/account/revoke-delegate.js

@@ -19,8 +19,8 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // Verify itx
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_DELEGATION').required(),
-  to: Joi.DID().required(),
+  address: Joi.DID().prefix().role('ROLE_DELEGATION').required(),
+  to: Joi.DID().prefix().required(),
   typeUrlsList: Joi.array().items(Joi.string().required()).min(1).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/asset/acquire-v2.js

@@ -2,12 +2,13 @@
 const { promisify } = require('util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset, factory } = require('@ocap/state');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
 
 // custom pipes
-const verifyAcquireParams = require('./pipes/verify-acquire-params');
 const verifyMintLimit = require('./pipes/verify-mint-limit');
 const verifyItxVariables = require('./pipes/verify-itx-variables');
 const verifyItxAssets = require('./pipes/verify-itx-assets');
@@ -25,7 +26,25 @@ const verifyTokenBalance = promisify(pipes.VerifyTokenBalance({ ownerKey: 'sende
 const runner = new Runner();
 
 runner.use(pipes.VerifyMultiSig(0));
-runner.use(verifyAcquireParams('acquire-v2'));
+
+// verify itx
+const schema = Joi.object({
+  factory: Joi.DID().prefix().role('ROLE_FACTORY').required(),
+  address: Joi.DID().prefix().role('ROLE_ASSET').required(),
+  assetsList: Joi.array()
+    .items(Joi.alternatives().try(Joi.DID().prefix().role('ROLE_ASSET'), Joi.DID().prefix().role('ROLE_FACTORY')))
+    .default([]),
+  variablesList: Joi.array().items(schemas.variableInput).min(1).required(),
+  issuer: schemas.nftIssuer.required(),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use(({ itx }, next) => {
+  const { error } = schema.validate(itx);
+  if (error) {
+    return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
+  }
+  return next();
+});
 
 // ensure asset not exist
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'duplicateAsset', status: 'OK', table: 'asset' }));

package/lib/protocols/asset/acquire-v3.js

@@ -6,6 +6,8 @@ const isEqual = require('lodash/isEqual');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset, factory } = require('@ocap/state');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v3`);
@@ -13,7 +15,6 @@ const debug = require('debug')(`${require('../../../package.json').name}:acquire
 const { applyTokenUpdates, applyTokenChange } = require('../../util');
 
 // custom pipes
-const verifyAcquireParams = require('./pipes/verify-acquire-params');
 const verifyMintLimit = require('./pipes/verify-mint-limit');
 const verifyItxVariables = require('./pipes/verify-itx-variables');
 const verifyItxAssets = require('./pipes/verify-itx-assets');
@@ -29,7 +30,22 @@ const verifyAssetOwner = promisify(pipes.VerifyUpdater({ assetKey: 'assets', own
 const runner = new Runner();
 
 // 1. extract & verify itx input
-runner.use(verifyAcquireParams('acquire-v3'));
+const schema = Joi.object({
+  factory: Joi.DID().prefix().role('ROLE_FACTORY').required(),
+  address: Joi.DID().prefix().role('ROLE_ASSET').required(),
+  inputsList: schemas.multiInput.min(1).required(),
+  owner: Joi.DID().prefix().required(),
+  variablesList: Joi.array().items(schemas.variableInput).min(1).required(),
+  issuer: schemas.nftIssuer.required(),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use(({ itx }, next) => {
+  const { error } = schema.validate(itx);
+  if (error) {
+    return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
+  }
+  return next();
+});
 
 // ensure asset not exist
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'duplicateAsset', status: 'OK', table: 'asset' }));

package/lib/protocols/asset/mint.js

@@ -1,11 +1,12 @@
 /* eslint-disable function-paren-newline */
 const { Runner, pipes } = require('@ocap/tx-pipeline');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 const { account, asset, factory } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset`);
 
-const verifyAcquireParams = require('./pipes/verify-acquire-params');
 const verifyMintLimit = require('./pipes/verify-mint-limit');
 const verifyItxVariables = require('./pipes/verify-itx-variables');
 const verifyItxAssets = require('./pipes/verify-itx-assets');
@@ -17,7 +18,25 @@ const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
 runner.use(pipes.VerifyMultiSig(0));
-runner.use(verifyAcquireParams('mint'));
+
+// verify itx
+const schema = Joi.object({
+  factory: Joi.DID().prefix().role('ROLE_FACTORY').required(),
+  address: Joi.DID().prefix().role('ROLE_ASSET').required(),
+  assetsList: Joi.array()
+    .items(Joi.alternatives().try(Joi.DID().prefix().role('ROLE_ASSET'), Joi.DID().prefix().role('ROLE_FACTORY')))
+    .default([]),
+  variablesList: Joi.array().items(schemas.variableInput).min(1).required(),
+  owner: Joi.DID().prefix().required(),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use(({ itx }, next) => {
+  const { error } = schema.validate(itx);
+  if (error) {
+    return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
+  }
+  return next();
+});
 
 // ensure asset not exist
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'duplicateAsset', status: 'OK', table: 'asset' }));

package/lib/protocols/asset/update.js

@@ -18,7 +18,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // Verify itx
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_ASSET').required(),
+  address: Joi.DID().prefix().role('ROLE_ASSET').required(),
   moniker: Joi.string().min(2).max(255).optional().allow(''),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/governance/claim-stake.js

@@ -18,7 +18,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // 1. verify itx output
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_STAKE').required(),
+  address: Joi.DID().prefix().role('ROLE_STAKE').required(),
   evidence: Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),

package/lib/protocols/governance/revoke-stake.js

@@ -19,7 +19,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // 0. verify itx
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_STAKE').required(),
+  address: Joi.DID().prefix().role('ROLE_STAKE').required(),
   outputsList: schemas.multiInput.min(1).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/governance/slash-stake.js

@@ -19,7 +19,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // 0. verify itx
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_STAKE').required(),
+  address: Joi.DID().prefix().role('ROLE_STAKE').required(),
   message: Joi.string().trim().min(1).max(256).required(),
   outputsList: schemas.multiInput.min(1).required(),
   data: Joi.any().optional(),

package/lib/protocols/governance/stake.js

@@ -22,9 +22,9 @@ const runner = new Runner();
 
 // 0. verify itx
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_STAKE').required(),
-  receiver: Joi.DID().required(),
-  slashersList: Joi.array().items(Joi.DID()).default([]),
+  address: Joi.DID().prefix().role('ROLE_STAKE').required(),
+  receiver: Joi.DID().prefix().required(),
+  slashersList: Joi.array().items(Joi.DID().prefix()).default([]),
   locked: Joi.boolean().default(false),
   inputsList: schemas.multiInput.min(1).required(),
   message: Joi.string().trim().min(1).max(256).required(),

package/lib/protocols/rollup/claim-reward.js

@@ -20,13 +20,13 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   blockHeight: Joi.number().integer().greater(0).required(),
   blockHash: Joi.string().regex(patterns.txHash).required(),
   evidence: Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
-  publisher: Joi.DID().wallet('ethereum').required(),
+  publisher: Joi.DID().prefix().wallet('ethereum').required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {

package/lib/protocols/rollup/create-block.js

@@ -34,9 +34,9 @@ const schema = Joi.object({
   }),
   txsHash: Joi.string().regex(patterns.txHash).required(),
   txsList: Joi.array().items(Joi.string().regex(patterns.txHash).required()).min(1).unique().required(),
-  proposer: Joi.DID().wallet('ethereum').required(),
+  proposer: Joi.DID().prefix().wallet('ethereum').required(),
   signaturesList: schemas.multiSig.min(1).required(),
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   minReward: Joi.BN().min(0).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/rollup/join.js

@@ -22,7 +22,7 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   endpoint: Joi.string()
     .uri({ scheme: [/https?/] })
     .required(),

package/lib/protocols/rollup/leave.js

@@ -19,7 +19,7 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   evidence: Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),

package/lib/protocols/rollup/migrate-contract.js

@@ -12,8 +12,8 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
-  to: Joi.DID().wallet('ethereum').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
+  to: Joi.DID().prefix().wallet('ethereum').required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {

package/lib/protocols/rollup/migrate-token.js

@@ -12,11 +12,11 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
-  from: Joi.DID().wallet('ethereum').required(),
-  to: Joi.DID().wallet('ethereum').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
+  from: Joi.DID().prefix().wallet('ethereum').required(),
+  to: Joi.DID().prefix().wallet('ethereum').required(),
   token: Joi.object({
-    address: Joi.DID().wallet('ethereum').required(),
+    address: Joi.DID().prefix().wallet('ethereum').required(),
     value: Joi.BN().positive().required(),
   }),
   data: Joi.any().optional(),

package/lib/protocols/rollup/pause.js

@@ -12,7 +12,7 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {

package/lib/protocols/rollup/resume.js

@@ -12,7 +12,7 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {

package/lib/protocols/rollup/update.js

@@ -16,7 +16,7 @@ const runner = new Runner();
 
 // 1. verify itx: client must use previous rollup state to construct this itx
 const schema = Joi.object({
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
 
   minStakeAmount: Joi.BN().greater(0).required(),
   maxStakeAmount: Joi.BN().greater(Joi.ref('minStakeAmount')).required(),

package/lib/protocols/token/create.js

@@ -21,7 +21,7 @@ const runner = new Runner();
 runner.use(pipes.VerifyMultiSig(0));
 
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_TOKEN').required(),
+  address: Joi.DID().prefix().role('ROLE_TOKEN').required(),
   name: Joi.string().min(1).max(32).required(),
   description: Joi.string().min(1).max(128).required(),
   symbol: Joi.string().min(2).max(6).uppercase().required(),

package/lib/protocols/token/deposit-v2.js

@@ -19,12 +19,12 @@ const { applyTokenUpdates, applyTokenChange, getTxFee, getBNSum, getRewardLocker
 
 const schema = Joi.object({
   token: schemas.tokenInput.required(),
-  to: Joi.DID().wallet('ethereum').required(),
-  proposer: Joi.DID().wallet('ethereum').required(),
+  to: Joi.DID().prefix().wallet('ethereum').required(),
+  proposer: Joi.DID().prefix().wallet('ethereum').required(),
   evidence: Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   actualFee: Joi.BN().min(0).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/token/withdraw-v2.js

@@ -20,9 +20,9 @@ const verifyMultiSigV2 = pipes.VerifyMultiSigV2({ signersKey: 'signers' });
 
 const schema = Joi.object({
   token: schemas.tokenInput.required(),
-  to: Joi.DID().wallet('ethereum').required(),
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
-  proposer: Joi.DID().wallet('ethereum').optional().allow('').default(''),
+  to: Joi.DID().prefix().wallet('ethereum').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
+  proposer: Joi.DID().prefix().wallet('ethereum').optional().allow('').default(''),
   actualFee: Joi.BN().min(0).required(),
   maxFee: Joi.BN().min(0).required(),
   data: Joi.any().optional(),

package/lib/protocols/trade/exchange-v2.js

@@ -1,4 +1,6 @@
 const isEmpty = require('empty-value');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 const { getListField } = require('@ocap/util/lib/get-list-field');
 const { createSortedList } = require('@ocap/util/lib/create-sorted-list');
 const { decodeBigInt } = require('@ocap/message');
@@ -15,16 +17,28 @@ const { applyTokenChange } = require('../../util');
 
 const runner = new Runner();
 
+// 0. verify itx
+const exchangeInfoSchema = Joi.object({
+  value: Joi.any().optional(),
+  tokensList: Joi.array().items(schemas.tokenInput).default([]),
+  assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
+});
+const schema = Joi.object({
+  to: Joi.DID().prefix().role('ROLE_ACCOUNT').required(),
+  sender: exchangeInfoSchema.required(),
+  receiver: exchangeInfoSchema.required(),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use(({ itx }, next) => {
+  const { error } = schema.validate(itx);
+  return next(error ? new Error('INVALID_TX', `Invalid itx: ${error.message}`) : null);
+});
+
 runner.use(pipes.VerifyMultiSig(1));
 runner.use(pipes.ExtractReceiver({ from: ['tx.signaturesList', 'tx.signatures', 'itx.to'] }));
 
 runner.use(
   pipes.VerifyInfo([
-    {
-      error: 'INSUFFICIENT_DATA',
-      message: 'itx.sender, itx.receiver and itx.to can not be empty',
-      fn: ({ itx }) => itx.sender && itx.receiver && itx.to,
-    },
     {
       error: 'INVALID_TX',
       message: 'Can not exchange without any token or assets',
@@ -64,16 +78,6 @@ runner.use(
         return true;
       },
     },
-    {
-      error: 'INVALID_TX',
-      message: 'Sender token value must be positive',
-      fn: (context) => context.senderTokens.every((x) => new BN(x.value).gt(new BN(0))),
-    },
-    {
-      error: 'INVALID_TX',
-      message: 'Receiver token value must be positive',
-      fn: (context) => context.receiverTokens.every((x) => new BN(x.value).gt(new BN(0))),
-    },
   ])
 );
 

package/lib/protocols/trade/transfer-v2.js

@@ -1,6 +1,8 @@
 const isEmpty = require('empty-value');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 const { getListField } = require('@ocap/util/lib/get-list-field');
 const { decodeBigInt } = require('@ocap/message');
+const { Joi, schemas } = require('@arcblock/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account } = require('@ocap/state');
@@ -16,13 +18,27 @@ const runner = new Runner();
 
 runner.use(pipes.VerifyMultiSig(0));
 
+// 1. verify itx
+const schema = Joi.object({
+  to: Joi.DID().prefix().role('ROLE_ACCOUNT').required(),
+  value: Joi.any().optional(),
+  tokensList: Joi.array().items(schemas.tokenInput).default([]),
+  assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use(({ itx }, next) => {
+  const { error } = schema.validate(itx);
+  if (error) {
+    return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
+  }
+  return next();
+});
 runner.use((context, next) => {
   context.assets = getListField(context, 'itx.assets');
   context.tokens = getListField(context, 'itx.tokens');
   context.tokenAddress = context.tokens.map((x) => x.address);
   next();
 });
-
 runner.use(
   pipes.VerifyInfo([
     {

package/lib/protocols/trade/transfer-v3.js

@@ -3,6 +3,8 @@
 /* eslint-disable no-restricted-syntax */
 const { promisify } = require('util');
 const isEqual = require('lodash/isEqual');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset } = require('@ocap/state');
@@ -19,6 +21,17 @@ const runner = new Runner();
 
 const verifyAssetOwner = promisify(pipes.VerifyUpdater({ assetKey: 'assets', ownerKey: 'owner' }));
 
+// 0. verify itx
+const schema = Joi.object({
+  inputsList: schemas.multiInput.min(1).required(),
+  outputsList: schemas.multiInput.min(1).required(),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use(({ itx }, next) => {
+  const { error } = schema.validate(itx);
+  return next(error ? new Error('INVALID_TX', `Invalid itx: ${error.message}`) : null);
+});
+
 // 0. extract itx
 runner.use(
   pipes.VerifyTxInput({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.32",
+  "version": "1.18.33",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.18.32",
-    "@arcblock/did-util": "1.18.32",
-    "@arcblock/jwt": "1.18.32",
-    "@arcblock/validator": "1.18.32",
-    "@ocap/asset": "1.18.32",
-    "@ocap/mcrypto": "1.18.32",
-    "@ocap/merkle-tree": "1.18.32",
-    "@ocap/message": "1.18.32",
-    "@ocap/state": "1.18.32",
-    "@ocap/tx-pipeline": "1.18.32",
-    "@ocap/util": "1.18.32",
-    "@ocap/wallet": "1.18.32",
+    "@arcblock/did": "1.18.33",
+    "@arcblock/did-util": "1.18.33",
+    "@arcblock/jwt": "1.18.33",
+    "@arcblock/validator": "1.18.33",
+    "@ocap/asset": "1.18.33",
+    "@ocap/mcrypto": "1.18.33",
+    "@ocap/merkle-tree": "1.18.33",
+    "@ocap/message": "1.18.33",
+    "@ocap/state": "1.18.33",
+    "@ocap/tx-pipeline": "1.18.33",
+    "@ocap/util": "1.18.33",
+    "@ocap/wallet": "1.18.33",
     "debug": "^4.3.4",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^27.5.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "44a7e8ee3e89535a4e18fbbc2ad6ff408c8e2474"
+  "gitHead": "0d03089c6651d92a3451e9bbbc865c18c2f5d8ad"
 }

package/lib/protocols/asset/pipes/verify-acquire-params.js

@@ -1,30 +0,0 @@
-const { CustomError: Error } = require('@ocap/util/lib/error');
-const { getListField } = require('@ocap/util/lib/get-list-field');
-
-module.exports =
-  (mode) =>
-  ({ itx }, next) => {
-    if (!itx.factory) {
-      return next(new Error('INSUFFICIENT_DATA', 'itx.factory must not be empty'));
-    }
-    if (!itx.address) {
-      return next(new Error('INSUFFICIENT_DATA', 'itx.address must not be empty'));
-    }
-    if (mode === 'acquire-v2') {
-      if (!itx.issuer) {
-        return next(new Error('INSUFFICIENT_DATA', 'itx.issuer must not be empty'));
-      }
-    }
-    if (['mint', 'acquire-v3'].includes(mode)) {
-      if (!itx.owner) {
-        return next(new Error('INSUFFICIENT_DATA', 'itx.owner must not be empty'));
-      }
-    }
-
-    const variables = getListField(itx, 'variables');
-    if (!Array.isArray(variables) && !variables.length) {
-      return next(new Error('INSUFFICIENT_DATA', 'itx.variables must not be empty'));
-    }
-
-    return next();
-  };