@ocap/state 1.16.14 → 1.16.17

package/lib/states/account.js

@@ -1,12 +1,12 @@
 const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const flatten = require('lodash/flatten');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 const { isFromPublicKey } = require('@arcblock/did');
 const { isEthereumDid, toChecksumAddress } = require('@arcblock/did/lib/type');
 const { toBase58, BN } = require('@ocap/util');
 
-const Joi = require('@arcblock/validator');
+const { Joi, schemas } = require('@arcblock/validator');
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
@@ -18,7 +18,7 @@ const schema = Joi.object({
   tokens: Joi.object().pattern(Joi.DID().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
   migratedTo: Joi.array().items(Joi.DID()).default([]),
   migratedFrom: Joi.array().items(Joi.DID()).default([]),
-  context: Joi.schemas.context,
+  context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 

package/lib/states/asset.js

@@ -1,6 +1,6 @@
 const pick = require('lodash/pick');
-const Joi = require('@arcblock/validator');
-const Error = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
@@ -30,7 +30,7 @@ const schema = Joi.object({
   ...props,
   owner: Joi.DID().required(),
   consumedTime: Joi.date().iso().raw().allow(''),
-  context: Joi.schemas.context,
+  context: schemas.context,
 }).options({
   stripUnknown: true,
   noDefaults: false,

package/lib/states/blacklist.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 const { BloomFilter } = require('bloom-filters');
 
 class Blacklist {

package/lib/states/chain.js

@@ -1,6 +1,6 @@
 const pick = require('lodash/pick');
 const isEqual = require('lodash/isEqual');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 

package/lib/states/evidence.js

@@ -1,12 +1,12 @@
 const pick = require('lodash/pick');
-const Error = require('@ocap/util/lib/error');
-const Joi = require('@arcblock/validator');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 
 const { create: createStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
   hash: Joi.string().trim().required(),
-  context: Joi.schemas.context,
+  context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 

package/lib/states/rollup-block.js

@@ -1,23 +1,23 @@
 const pick = require('lodash/pick');
-const Error = require('@ocap/util/lib/error');
-const Joi = require('@arcblock/validator');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas, patterns } = require('@arcblock/validator');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
-  hash: Joi.string().regex(Joi.patterns.txHash).required(),
+  hash: Joi.string().regex(patterns.txHash).required(),
   height: Joi.number().integer().greater(0).required(),
-  merkleRoot: Joi.string().regex(Joi.patterns.txHash).required(),
+  merkleRoot: Joi.string().regex(patterns.txHash).required(),
   previousHash: Joi.string().when('height', {
     is: 1,
     then: Joi.string().optional().allow(''),
-    otherwise: Joi.string().regex(Joi.patterns.txHash).required(),
+    otherwise: Joi.string().regex(patterns.txHash).required(),
   }),
-  txsHash: Joi.string().regex(Joi.patterns.txHash).required(),
-  txs: Joi.array().items(Joi.string().regex(Joi.patterns.txHash).required()).min(1).unique().required(),
+  txsHash: Joi.string().regex(patterns.txHash).required(),
+  txs: Joi.array().items(Joi.string().regex(patterns.txHash).required()).min(1).unique().required(),
 
   proposer: Joi.DID().wallet('ethereum').required(),
-  signatures: Joi.schemas.multiSig.min(1).required(),
+  signatures: schemas.multiSig.min(1).required(),
 
   rollup: Joi.DID().role('ROLE_ROLLUP').required(),
 
@@ -27,7 +27,7 @@ const schema = Joi.object({
 
   minReward: Joi.BN().min(0).required(),
 
-  context: Joi.schemas.context,
+  context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 

package/lib/states/rollup.js

@@ -1,7 +1,7 @@
 const pick = require('lodash/pick');
-const Error = require('@ocap/util/lib/error');
+const { CustomError: Error } = require('@ocap/util/lib/error');
 
-const Joi = require('@arcblock/validator');
+const { Joi, schemas, patterns } = require('@arcblock/validator');
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const validator = Joi.object({
@@ -56,14 +56,14 @@ const schema = Joi.object({
   maxWithdrawFee: Joi.BN().min(Joi.ref('minWithdrawFee')).required(),
 
   blockHeight: Joi.number().integer().min(0).required(),
-  blockHash: Joi.string().regex(Joi.patterns.txHash).optional().allow(''),
+  blockHash: Joi.string().regex(patterns.txHash).optional().allow(''),
   issuer: Joi.DID().optional(),
 
   leaveWaitingPeriod: Joi.number().integer().min(Joi.ref('minBlockInterval')).default(0),
   publishWaitingPeriod: Joi.number().integer().min(Joi.ref('minBlockInterval')).default(0),
   publishSlashRate: Joi.number().integer().min(1).max(10000).required(),
 
-  context: Joi.schemas.context,
+  context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 

package/lib/states/stake.js

@@ -1,6 +1,6 @@
 const pick = require('lodash/pick');
-const Error = require('@ocap/util/lib/error');
-const Joi = require('@arcblock/validator');
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi, schemas } = require('@arcblock/validator');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
@@ -15,7 +15,7 @@ const schema = Joi.object({
   revokeWaitingPeriod: Joi.number().integer().min(0).default(0),
   revokedTokens: Joi.object({}).pattern(Joi.DID().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
   revokedAssets: Joi.array().items(Joi.DID().role('ROLE_ASSET')).default([]),
-  context: Joi.schemas.context,
+  context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 

package/lib/states/tx.js

@@ -6,7 +6,7 @@ const upperFirst = require('lodash/upperFirst');
 const camelCase = require('lodash/camelCase');
 const { fromTypeUrl, formatMessage, decodeAny } = require('@ocap/message');
 const { toBase64, BN } = require('@ocap/util');
-const getListField = require('@ocap/util/lib/get-list-field');
+const { getListField } = require('@ocap/util/lib/get-list-field');
 
 const ZERO = new BN(0);
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14",
+  "version": "1.16.17",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -16,12 +16,12 @@
     "coverage": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@arcblock/did": "1.16.14",
-    "@arcblock/validator": "1.16.14",
-    "@ocap/contract": "1.16.14",
-    "@ocap/mcrypto": "1.16.14",
-    "@ocap/message": "1.16.14",
-    "@ocap/util": "1.16.14",
+    "@arcblock/did": "1.16.17",
+    "@arcblock/validator": "1.16.17",
+    "@ocap/contract": "1.16.17",
+    "@ocap/mcrypto": "1.16.17",
+    "@ocap/message": "1.16.17",
+    "@ocap/util": "1.16.17",
     "bloom-filters": "^1.3.1",
     "lodash": "^4.17.21"
   },
@@ -31,5 +31,5 @@
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
-  "gitHead": "5f1bb9c7d6044e20c77e9cccea8cda2d6c5ae29f"
+  "gitHead": "489ce5e03bce27ddcd535390228b11ab56e7a2e3"
 }