@ocap/tx-protocols 1.19.16 → 1.19.17

package/lib/protocols/account/delegate.js

@@ -21,25 +21,31 @@ runner.use(pipes.VerifyMultiSig(0));
 
 const rateLimit = Joi.object({
   interval: Joi.number().integer().greater(0).required(),
-  anchor: Joi.number().integer().min(0).optional().default(0),
+  anchor: Joi.number().integer().min(0).optional().allow(null).default(0),
 });
 
 const tokenLimit = Joi.object({
   address: Joi.DID().prefix().role('ROLE_TOKEN').required(),
-  toList: Joi.array().items(Joi.DID().prefix()).max(32).unique().optional().default([]),
-  txCount: Joi.number().integer().min(0).empty('').optional().default(0),
-  txAllowance: Joi.BN().optional().default('0'),
-  totalAllowance: Joi.BN().optional().default('0'),
-  validUntil: Joi.number().integer().min(0).empty('').optional().default(0),
-  rate: rateLimit.optional(),
+  toList: Joi.array().items(Joi.DID().prefix()).max(32).unique().optional().allow(null).default([]),
+  txCount: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  txAllowance: Joi.BN().optional().allow(null).default('0'),
+  totalAllowance: Joi.BN().optional().allow(null).default('0'),
+  validUntil: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  rate: rateLimit.optional().allow(null),
 });
 
 const assetLimit = Joi.object({
-  address: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).unique().max(1024).optional().default([]),
-  toList: Joi.array().items(Joi.DID().prefix()).unique().max(32).optional().default([]),
-  txCount: Joi.number().integer().min(0).empty('').optional().default(0),
-  validUntil: Joi.number().integer().min(0).empty('').optional().default(0),
-  rate: rateLimit.optional(),
+  address: Joi.array()
+    .items(Joi.DID().prefix().role('ROLE_ASSET'))
+    .unique()
+    .max(1024)
+    .optional()
+    .allow(null)
+    .default([]),
+  toList: Joi.array().items(Joi.DID().prefix()).unique().max(32).optional().allow(null).default([]),
+  txCount: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  validUntil: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  rate: rateLimit.optional().allow(null),
 });
 
 // verify itx
@@ -58,13 +64,14 @@ const schema = Joi.object({
           assetsList: Joi.array().items(assetLimit).max(32),
         })
           .optional()
+          .allow(null)
           .default({ tokensList: [], assetsList: [] }),
       })
     )
     .unique((a, b) => a.typeUrl === b.typeUrl)
     .min(1)
     .required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { error, value } = schema.validate(context.itx);

package/lib/protocols/account/migrate.js

@@ -24,7 +24,7 @@ runner.use(pipes.VerifyMultiSig(0));
 const schema = Joi.object({
   address: Joi.DID().prefix().required(),
   pk: Joi.any().required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   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(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -32,9 +32,9 @@ 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.DID().prefix().role('ROLE_ASSET')).default([]),
-  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().allow(null).default([]),
   issuer: schemas.nftIssuer.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -35,9 +35,9 @@ const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
   inputsList: schemas.multiInput.min(1).required(),
   owner: schemas.tokenHolder.required(),
-  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().allow(null).default([]),
   issuer: schemas.nftIssuer.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/asset/consume.js

@@ -14,7 +14,7 @@ const runner = new Runner();
 // Verify itx
 const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { itx } = context;

package/lib/protocols/asset/mint.js

@@ -24,9 +24,9 @@ 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.DID().prefix().role('ROLE_ASSET')).default([]),
-  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().allow(null).default([]),
   owner: schemas.tokenHolder.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/asset/update.js

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

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   evidence: Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   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(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

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

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   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(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/governance/stake.js

@@ -29,8 +29,8 @@ const schema = Joi.object({
   inputsList: schemas.multiInput.min(1).required(),
   message: Joi.string().trim().min(1).max(256).required(),
   revokeWaitingPeriod: Joi.number().integer().min(0).default(0),
-  data: Joi.any().optional(),
-  nonce: Joi.string().trim().min(1).max(256).allow('').optional(),
+  data: Joi.any().optional().allow(null),
+  nonce: Joi.string().trim().min(1).max(256).allow('').optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -29,7 +29,7 @@ const schema = Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
   publisher: Joi.DID().prefix().wallet('ethereum').required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { tx, itx } = context;

package/lib/protocols/rollup/close.js

@@ -20,7 +20,7 @@ const schema = Joi.object({
     address: Joi.DID().prefix().wallet('ethereum').required(),
     value: Joi.BN().positive().required(),
   }),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -30,7 +30,7 @@ const schema = Joi.object({
   merkleRoot: Joi.string().regex(patterns.txHash).required(),
   previousHash: Joi.string().when('height', {
     is: 1,
-    then: Joi.string().optional().allow(''),
+    then: Joi.string().optional().allow(null).allow(''),
     otherwise: Joi.string().regex(patterns.txHash).required(),
   }),
   txsHash: Joi.string().regex(patterns.txHash).required(),
@@ -40,7 +40,7 @@ const schema = Joi.object({
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   minReward: Joi.BN().min(0).required(),
   governance: Joi.boolean().default(false),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 runner.use((context, next) => {

package/lib/protocols/rollup/join.js

@@ -30,7 +30,7 @@ const schema = Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
   signaturesList: schemas.multiSig.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/leave.js

@@ -25,7 +25,7 @@ const schema = Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
   signaturesList: schemas.multiSig.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/migrate.js

@@ -17,7 +17,7 @@ const schema = Joi.object({
   to: Joi.DID().prefix().wallet('ethereum').required(),
   type: Joi.string().trim().valid('vault', 'contract').required(),
   message: Joi.string().trim().min(1).max(512).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/pause.js

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

package/lib/protocols/rollup/resume.js

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

package/lib/protocols/rollup/update.js

@@ -45,7 +45,7 @@ const schema = Joi.object({
   minWithdrawFee: Joi.BN().positive().required(),
   maxWithdrawFee: Joi.BN().greater(Joi.ref('minWithdrawFee')).required(),
 
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/token/create.js

@@ -27,11 +27,11 @@ const schema = Joi.object({
   symbol: Joi.string().min(2).max(6).uppercase().required(),
   unit: Joi.string().min(1).max(6).lowercase().required(),
   decimal: Joi.number().min(6).max(18).required(),
-  icon: Joi.string().optional().valid(''),
+  icon: Joi.string().optional().allow(null).valid(''),
   totalSupply: Joi.BN().greater(0).max(MAX_TOTAL_SUPPLY).required(),
   initialSupply: Joi.BN().greater(0).max(Joi.ref('totalSupply')).required(),
-  foreignToken: schemas.foreignToken.optional().default(null),
-  data: Joi.any().optional(),
+  foreignToken: schemas.foreignToken.optional().allow(null).default(null),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 // 1. verify itx

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

@@ -26,7 +26,7 @@ const schema = Joi.object({
   }).required(),
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   actualFee: Joi.BN().min(0).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 const runner = new Runner();

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

@@ -22,10 +22,10 @@ const schema = Joi.object({
   token: schemas.tokenInput.required(),
   to: Joi.DID().prefix().wallet('ethereum').required(),
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
-  proposer: Joi.DID().prefix().wallet('ethereum').optional().allow('').default(''),
+  proposer: Joi.DID().prefix().wallet('ethereum').optional().allow(null).allow('').default(''),
   actualFee: Joi.BN().min(0).required(),
   maxFee: Joi.BN().min(0).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 const runner = new Runner();

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

@@ -19,7 +19,7 @@ const runner = new Runner();
 
 // 0. verify itx
 const exchangeInfoSchema = Joi.object({
-  value: Joi.any().optional(),
+  value: Joi.any().optional().allow(null),
   tokensList: Joi.array().items(schemas.tokenInput).default([]),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
 });
@@ -27,7 +27,7 @@ const schema = Joi.object({
   to: schemas.tokenHolder.required(),
   sender: exchangeInfoSchema.required(),
   receiver: exchangeInfoSchema.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -19,10 +19,10 @@ runner.use(pipes.VerifyMultiSig(0));
 // 1. verify itx
 const schema = Joi.object({
   to: schemas.tokenHolder.required(),
-  value: Joi.any().optional(),
+  value: Joi.any().optional().allow(null),
   tokensList: Joi.array().items(schemas.tokenInput).default([]),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -25,7 +25,7 @@ const verifyAssetOwner = promisify(pipes.VerifyUpdater({ assetKey: 'assets', own
 const schema = Joi.object({
   inputsList: schemas.multiInput.min(1).required(),
   outputsList: schemas.multiInput.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.16",
+  "version": "1.19.17",
   "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.19.16",
-    "@arcblock/did-util": "1.19.16",
-    "@arcblock/jwt": "1.19.16",
-    "@arcblock/validator": "1.19.16",
-    "@ocap/asset": "1.19.16",
-    "@ocap/mcrypto": "1.19.16",
-    "@ocap/merkle-tree": "1.19.16",
-    "@ocap/message": "1.19.16",
-    "@ocap/state": "1.19.16",
-    "@ocap/tx-pipeline": "1.19.16",
-    "@ocap/util": "1.19.16",
-    "@ocap/wallet": "1.19.16",
+    "@arcblock/did": "1.19.17",
+    "@arcblock/did-util": "1.19.17",
+    "@arcblock/jwt": "1.19.17",
+    "@arcblock/validator": "1.19.17",
+    "@ocap/asset": "1.19.17",
+    "@ocap/mcrypto": "1.19.17",
+    "@ocap/merkle-tree": "1.19.17",
+    "@ocap/message": "1.19.17",
+    "@ocap/state": "1.19.17",
+    "@ocap/tx-pipeline": "1.19.17",
+    "@ocap/util": "1.19.17",
+    "@ocap/wallet": "1.19.17",
     "debug": "^4.3.6",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "9c3c349e48fc3c5a63aba6068ba5d31cc46d81c9"
+  "gitHead": "d25d8b52053b0e3254a28c3b44ea5e447ce1c08a"
 }