@ocap/state 1.14.0 → 1.14.4

package/lib/contexts/state.js

@@ -9,6 +9,8 @@ const create = ({ txHash, txTime }) => ({
 
 const update = (context, { txHash, txTime }) => ({
   ...context,
+  // NOTE: for historical reasons, some account state does not have genesisTime
+  genesisTime: context.genesisTime || '2020-01-15T00:00:00.000Z',
   genesisTx: context.genesisTx || '',
   renaissanceTime: txTime || '',
   renaissanceTx: txHash || '',

package/lib/states/asset.js

@@ -1,7 +1,40 @@
 const pick = require('lodash/pick');
+const Joi = require('@ocap/validator');
 
 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 +43,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 +71,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: ${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/package.json

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