@ocap/state 1.14.2 → 1.14.6

package/lib/states/account.js

@@ -1,6 +1,7 @@
 const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const flatten = require('lodash/flatten');
+const Error = require('@ocap/util/lib/error');
 const { isFromPublicKey } = require('@arcblock/did');
 const { toBase58, BN } = require('@ocap/util');
 
@@ -39,7 +40,7 @@ const create = (attrs, context) => {
 
 const update = (state, attrs, context) => {
   if (attrs.nonce && new BN(attrs.nonce).eq(new BN(state.nonce))) {
-    throw new Error('nonce must be greater in newer transactions');
+    throw new Error('INVALID_NONCE', 'nonce must be greater in newer transactions');
   }
 
   // ensure we are updating the correct pk
@@ -73,7 +74,7 @@ const validate = (state) => {
 
   const { value, error } = schema.validate(state);
   if (error) {
-    throw new Error(`Invalid account: ${error.details.map((x) => x.message).join(', ')}`);
+    throw new Error('INVALID_ACCOUNT', `Invalid account: ${error.details.map((x) => x.message).join(', ')}`);
   }
 
   if (!value.data) {

package/lib/states/asset.js

@@ -1,7 +1,41 @@
 const pick = require('lodash/pick');
+const Joi = require('@ocap/validator');
+const Error = require('@ocap/util/lib/error');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
+const props = {
+  address: Joi.DID().role('ROLE_ASSET').required(),
+  moniker: Joi.string().min(2).max(255).required(),
+  data: Joi.any().required(),
+  readonly: Joi.boolean().default(false),
+  transferrable: Joi.boolean().default(false),
+  ttl: Joi.number().min(0).default(0),
+  parent: Joi.DID().optional().allow(''),
+  issuer: Joi.DID().optional().allow(''),
+  endpoint: Joi.object({
+    id: Joi.string().uri({ scheme: ['http', 'https'] }).required(), // prettier-ignore
+    scope: Joi.string().valid('public', 'private').default('public'),
+  }).optional(),
+  display: Joi.object({
+    type: Joi.string().valid('svg', 'url', 'uri').required(),
+    content: Joi.string()
+      .when('type', { is: 'uri', then: Joi.string().dataUri().required() })
+      .when('type', { is: 'url', then: Joi.string().uri({ scheme: ['http', 'https'] }).required() }), // prettier-ignore
+  }).optional(),
+  tags: Joi.array().items(Joi.string().min(1)).optional(),
+};
+
+const schema = Joi.object({
+  ...props,
+  owner: Joi.DID().required(),
+  consumedTime: Joi.date().iso().raw().allow(''),
+  context: Joi.schemas.context,
+}).options({
+  stripUnknown: true,
+  noDefaults: false,
+});
+
 const create = (attrs, context) => {
   const asset = {
     consumedTime: '',
@@ -10,16 +44,25 @@ const create = (attrs, context) => {
     readonly: false,
     transferrable: true,
     ttl: 0, // means unlimited
-    stake: null,
+    tags: [],
     context: createStateContext(context),
-    ...pick(attrs, ['address', 'owner', 'issuer', 'moniker', 'parent', 'data', 'readonly', 'transferrable', 'ttl']),
+    ...pick(attrs, [
+      'address',
+      'owner',
+      'issuer',
+      'moniker',
+      'parent',
+      'data',
+      'readonly',
+      'transferrable',
+      'ttl',
+      'endpoint',
+      'display',
+      'tags',
+    ]),
   };
 
-  if (!asset.data) {
-    asset.data = null;
-  }
-
-  return asset;
+  return validate(asset);
 };
 
 const update = (state, attrs, context) => {
@@ -29,11 +72,30 @@ const update = (state, attrs, context) => {
     context: updateStateContext(state.context, context),
   };
 
-  if (!asset.data) {
-    asset.data = null;
+  return validate(asset);
+};
+
+const validate = (state) => {
+  const { value, error } = schema.validate(state);
+  if (error) {
+    throw new Error('INVALID_ASSET', `Invalid asset: ${error.details.map((x) => x.message).join(', ')}`);
   }
 
-  return asset;
+  ['endpoint', 'display'].forEach((key) => {
+    if (!value[key]) {
+      delete value[key];
+    }
+  });
+
+  return value;
 };
 
-module.exports = { create, update };
+module.exports = {
+  create,
+  update,
+  validate,
+  schema: Joi.object(props).options({
+    stripUnknown: true,
+    noDefaults: false,
+  }),
+};

package/lib/states/blacklist.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const Error = require('@ocap/util/lib/error');
 const { BloomFilter } = require('bloom-filters');
 
 class Blacklist {
@@ -10,7 +11,7 @@ class Blacklist {
         const json = JSON.parse(fs.readFileSync(dumpPath));
         filter = BloomFilter.fromJSON(json);
       } catch (err) {
-        throw new Error(`Cat not read serialized blacklist from json${dumpPath}`);
+        throw new Error('INTERNAL', `Cat not read serialized blacklist from json${dumpPath}`);
       }
     }
 

package/lib/states/chain.js

@@ -1,5 +1,6 @@
 const pick = require('lodash/pick');
 const isEqual = require('lodash/isEqual');
+const Error = require('@ocap/util/lib/error');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
@@ -18,7 +19,7 @@ const update = (state, updates) => {
   // eslint-disable-next-line no-restricted-syntax
   for (const attr of immutableAttrs) {
     if (updates[attr] && isEqual(updates[attr], state[attr]) === false) {
-      throw new Error(`Cannot update ${attr} field on chain state`);
+      throw new Error('FORBIDDEN', `Cannot update ${attr} field on chain state`);
     }
   }
 

package/lib/states/evidence.js

@@ -1,6 +1,7 @@
 const pick = require('lodash/pick');
-
+const Error = require('@ocap/util/lib/error');
 const Joi = require('@ocap/validator');
+
 const { create: createStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
@@ -21,7 +22,7 @@ const create = (attrs, context) => {
 const validate = (state) => {
   const { value, error } = schema.validate(state);
   if (error) {
-    throw new Error(`Invalid evidence state: ${error.details.map((x) => x.message).join(', ')}`);
+    throw new Error('INVALID_EVIDENCE', `Invalid evidence state: ${error.details.map((x) => x.message).join(', ')}`);
   }
 
   if (!value.data) {

package/lib/states/rollup-block.js

@@ -1,6 +1,7 @@
 const pick = require('lodash/pick');
-
+const Error = require('@ocap/util/lib/error');
 const Joi = require('@ocap/validator');
+
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
@@ -67,7 +68,7 @@ const update = (state, context) => {
 const validate = (state) => {
   const { value, error } = schema.validate(state);
   if (error) {
-    throw new Error(`Invalid rollup block: ${error.details.map((x) => x.message).join(', ')}`);
+    throw new Error('INVALID_ROLLUP_BLOCK', `Invalid rollup block: ${error.details.map((x) => x.message).join(', ')}`);
   }
 
   if (!value.data) {

package/lib/states/stake.js

@@ -1,6 +1,7 @@
 const pick = require('lodash/pick');
-
+const Error = require('@ocap/util/lib/error');
 const Joi = require('@ocap/validator');
+
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
@@ -60,7 +61,7 @@ const update = (state, attrs, context) => {
 const validate = (state) => {
   const { value, error } = schema.validate(state);
   if (error) {
-    throw new Error(`Invalid stake state: ${error.details.map((x) => x.message).join(', ')}`);
+    throw new Error('INVALID_STAKE', `Invalid stake state: ${error.details.map((x) => x.message).join(', ')}`);
   }
 
   if (!value.data) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.14.2",
+  "version": "1.14.6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -16,12 +16,12 @@
     "coverage": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@arcblock/did": "1.14.2",
-    "@ocap/contract": "1.14.2",
-    "@ocap/mcrypto": "1.14.2",
-    "@ocap/message": "1.14.2",
-    "@ocap/util": "1.14.2",
-    "@ocap/validator": "1.14.2",
+    "@arcblock/did": "1.14.6",
+    "@ocap/contract": "1.14.6",
+    "@ocap/mcrypto": "1.14.6",
+    "@ocap/message": "1.14.6",
+    "@ocap/util": "1.14.6",
+    "@ocap/validator": "1.14.6",
     "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": "6ef13ed89e546879db9c88a21691940963466617"
+  "gitHead": "dd379a7d1bd2a46be27a29e6f0c65fa161ec0b0c"
 }