@ocap/state 1.17.11 → 1.17.14

package/lib/states/asset.js

@@ -4,30 +4,8 @@ const { CustomError: 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,
+  ...schemas.assetProps,
   owner: Joi.DID().required(),
   consumedTime: Joi.date().iso().raw().allow(''),
   context: schemas.context,
@@ -98,8 +76,5 @@ module.exports = {
   create,
   update,
   validate,
-  schema: Joi.object(props).options({
-    stripUnknown: true,
-    noDefaults: false,
-  }),
+  schema: schemas.assetSchema,
 };

package/lib/states/factory.js

@@ -1,8 +1,21 @@
 const pick = require('lodash/pick');
+const { Joi, schemas } = require('@arcblock/validator');
 const { compile, merge, getQuota } = require('@ocap/contract');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
+const stateSchema = Joi.object({
+  ...schemas.factoryProps,
+  owner: Joi.DID().required(),
+  numMinted: Joi.number().min(0).default(0),
+  lastSettlement: Joi.date().iso().raw().allow(''),
+  tokens: Joi.object().pattern(Joi.DID().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
+  context: schemas.context,
+}).options({
+  stripUnknown: true,
+  noDefaults: false,
+});
+
 const compileHook = (hook, quota) => {
   if (hook.type === 'contract') {
     hook.compiled = merge(compile(hook.hook, quota));
@@ -13,18 +26,9 @@ const compileHook = (hook, quota) => {
 
 const create = (attrs, context) => {
   const factory = {
-    address: '',
-    owner: '',
-    name: '',
-    description: '',
-    settlement: 'instant',
-    limit: 0,
     numMinted: 0,
     lastSettlement: '',
-    balance: '0',
     tokens: {},
-    trustedIssuers: [],
-    stake: null,
     context: createStateContext(context),
     ...pick(attrs, [
       'address',
@@ -50,13 +54,29 @@ const create = (attrs, context) => {
   const quota = getQuota(factory.input);
   factory.hooks = (factory.hooks || []).map((x) => compileHook(x, quota));
 
-  return factory;
+  return validate(factory);
 };
 
-const update = (state, attrs, context) => ({
-  ...state,
-  ...pick(attrs, ['numMinted', 'tokens']),
-  context: updateStateContext(state.context, context),
-});
+const update = (state, attrs, context) =>
+  validate({
+    ...state,
+    ...pick(attrs, ['numMinted', 'tokens']),
+    context: updateStateContext(state.context, context),
+  });
+
+const validate = (state) => {
+  const { value, error } = stateSchema.validate(state);
+  if (error) {
+    throw new Error(`Invalid factory: ${error.details.map((x) => x.message).join(', ')}`);
+  }
+
+  ['display'].forEach((key) => {
+    if (!value[key]) {
+      delete value[key];
+    }
+  });
+
+  return value;
+};
 
-module.exports = { create, update };
+module.exports = { create, update, validate };

package/package.json

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