@ocap/state 1.24.8 → 1.25.0

package/lib/states/asset.js

@@ -41,6 +41,10 @@ const create = (attrs, context) => {
     ]),
   };
 
+  if (asset.tags === null) {
+    asset.tags = [];
+  }
+
   asset.address = toAddress(asset.address);
 
   return validate(asset);
@@ -53,6 +57,10 @@ const update = (state, attrs, context) => {
     context: updateStateContext(state.context, context),
   };
 
+  if (asset.tags === null) {
+    asset.tags = [];
+  }
+
   if (!asset.consumedTime) {
     asset.consumedTime = '';
   }

package/lib/states/factory.js

@@ -60,12 +60,19 @@ const create = (attrs, context) => {
   return validate(factory);
 };
 
-const update = (state, attrs, context) =>
-  validate({
+const update = (state, attrs, context) => {
+  const factory = {
     ...state,
     ...pick(attrs, ['numMinted', 'tokens']),
     context: updateStateContext(state.context, context),
-  });
+  };
+
+  if (factory.output?.tags === null) {
+    factory.output.tags = [];
+  }
+
+  return validate(factory);
+};
 
 const validate = (state) => {
   const { value, error } = stateSchema.validate(state);

package/lib/states/token.js

@@ -1,9 +1,20 @@
 const pick = require('lodash/pick');
+const cloneDeep = require('lodash/cloneDeep');
 const { toChecksumAddress } = require('@arcblock/did/lib/type');
 const { toAddress, BN } = require('@ocap/util');
+const { Joi } = require('@arcblock/validator');
 
 const { create: createStateContext } = require('../contexts/state');
 
+const metadataSchema = Joi.object({
+  communityUrl: Joi.string()
+    .uri({ scheme: ['https'], allowRelative: false })
+    .max(256)
+    .optional()
+    .allow(null, ''),
+  issuer: Joi.string().max(64).required(),
+}).options({ stripUnknown: true, noDefaults: false });
+
 const create = (attrs, context) => {
   const token = {
     context: createStateContext(context),
@@ -21,6 +32,8 @@ const create = (attrs, context) => {
       'foreignToken',
       'data',
       'issuer',
+      'website',
+      'metadata',
       'tokenFactoryAddress',
     ]),
   };
@@ -28,6 +41,9 @@ const create = (attrs, context) => {
   if (!token.data) {
     token.data = null;
   }
+  if (!token.metadata) {
+    token.metadata = null;
+  }
   if (!token.foreignToken) {
     token.foreignToken = null;
   } else {
@@ -42,7 +58,7 @@ const create = (attrs, context) => {
 const update = (state, attrs) =>
   validate({
     ...state,
-    ...pick(attrs, ['totalSupply']),
+    ...pick(attrs, ['totalSupply', 'metadata', 'icon', 'website']),
   });
 
 const validate = (state) => {
@@ -50,7 +66,17 @@ const validate = (state) => {
     throw new Error('INVALID_TOKEN', 'maxTotalSupply must be greater than or equal to totalSupply');
   }
 
-  return state;
+  const data = cloneDeep(state);
+
+  if (data.metadata?.value) {
+    const { value, error } = metadataSchema.validate(data.metadata.value, { stripUnknown: true });
+    if (error) {
+      throw new Error('INVALID_TOKEN', 'Invalid token metadata');
+    }
+    data.metadata.value = value;
+  }
+
+  return data;
 };
 
-module.exports = { create, update };
+module.exports = { create, update, metadataSchema };

package/lib/states/tx.js

@@ -648,8 +648,8 @@ const verifyTxReceipts = (receipts, typeUrl, ctx = {}) => {
       SetupSwapTx: ['swap'],
       RevokeSwapTx: ['swap'],
       RetrieveSwapTx: ['swap'],
-      MintTokenTx: ['swap', 'mint'],
-      BurnTokenTx: ['burn', 'swap'],
+      MintTokenTx: ['swap', 'mint', 'fee'],
+      BurnTokenTx: ['burn', 'swap', 'fee'],
     }[typeUrl] || [];
 
   for (const [target, changes] of Object.entries(targets)) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.24.8",
+  "version": "1.25.0",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -12,18 +12,18 @@
   "dependencies": {
     "bloom-filters": "^1.3.9",
     "lodash": "^4.17.21",
-    "@arcblock/did": "1.24.8",
-    "@arcblock/validator": "1.24.8",
-    "@ocap/contract": "1.24.8",
-    "@ocap/mcrypto": "1.24.8",
-    "@ocap/message": "1.24.8",
-    "@ocap/util": "1.24.8",
-    "@ocap/wallet": "1.24.8"
+    "@arcblock/did": "1.25.0",
+    "@arcblock/validator": "1.25.0",
+    "@ocap/contract": "1.25.0",
+    "@ocap/mcrypto": "1.25.0",
+    "@ocap/message": "1.25.0",
+    "@ocap/util": "1.25.0",
+    "@ocap/wallet": "1.25.0"
   },
   "devDependencies": {
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0",
-    "@ocap/e2e-test": "1.24.8"
+    "@ocap/e2e-test": "1.25.0"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",