@ocap/state 1.13.64 → 1.13.65

package/lib/contexts/state.js

@@ -2,15 +2,16 @@
 
 const create = ({ txHash, txTime }) => ({
   genesisTime: txTime || '',
-  genesisTx: txHash || null,
+  genesisTx: txHash || '',
   renaissanceTime: txTime || '',
-  renaissanceTx: txHash || null,
+  renaissanceTx: txHash || '',
 });
 
 const update = (context, { txHash, txTime }) => ({
   ...context,
+  genesisTx: context.genesisTx || '',
   renaissanceTime: txTime || '',
-  renaissanceTx: txHash || null,
+  renaissanceTx: txHash || '',
 });
 
 module.exports = { create, update };

package/lib/joi/index.js

@@ -9,9 +9,9 @@ const hashRegexp = /^(0x)?([A-Fa-f0-9]{64})$/;
 
 const contextSchema = Joi.object({
   genesisTime: Joi.date().iso().required().raw(),
-  genesisTx: Joi.string().regex(hashRegexp).required(),
+  genesisTx: Joi.string().regex(hashRegexp).required().allow(''),
   renaissanceTime: Joi.date().iso().required().raw(),
-  renaissanceTx: Joi.string().regex(hashRegexp).required(),
+  renaissanceTx: Joi.string().regex(hashRegexp).required().allow(''),
 });
 
 const tokenInputSchema = Joi.object({

package/lib/states/account.js

@@ -1,35 +1,40 @@
 const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const flatten = require('lodash/flatten');
-const { toBase64, toUint8Array, BN } = require('@ocap/util');
+const { isFromPublicKey } = require('@arcblock/did');
+const { toBase58, BN } = require('@ocap/util');
 
+const Joi = require('../joi');
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
+const schema = Joi.object({
+  address: Joi.DID().required(),
+  pk: Joi.string().allow(''),
+  issuer: Joi.DID().allow(''),
+  moniker: Joi.string().trim().min(2).max(40).allow(''),
+  nonce: Joi.number().min(0).default(0),
+  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.contextSchema,
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+
 const create = (attrs, context) => {
   const account = {
-    balance: '0',
-    gasBalance: '0',
     nonce: 0,
-    numTxs: 0,
-    numAssets: 0,
     migratedTo: [],
     migratedFrom: [],
-    stake: null,
     tokens: {},
     context: createStateContext(context),
     ...pick(attrs, ['address', 'pk', 'issuer', 'moniker', 'data', 'nonce', 'migratedFrom', 'tokens']),
   };
 
-  // ensure we have correct pk
-  if (typeof account.pk !== 'string') {
-    account.pk = toBase64(toUint8Array(account.pk));
+  if (!account.moniker) {
+    account.moniker = [account.address.slice(0, 6), account.address.slice(-5)].join('-');
   }
 
-  if (!account.data) {
-    account.data = null;
-  }
-
-  return account;
+  return validate(account);
 };
 
 const update = (state, attrs, context) => {
@@ -37,20 +42,47 @@ const update = (state, attrs, context) => {
     throw new Error('nonce must be greater in newer transactions');
   }
 
+  // ensure we are updating the correct pk
+  if (attrs.pk && isFromPublicKey(state.address, attrs.pk) === false) {
+    delete attrs.pk;
+  }
+
   const account = {
     ...state,
-    ...pick(attrs, ['moniker', 'data', 'migratedTo', 'nonce', 'tokens']),
+    ...pick(attrs, ['moniker', 'data', 'migratedTo', 'nonce', 'tokens', 'pk']),
     migratedTo: uniq(flatten(attrs.migratedTo ? [attrs.migratedTo].concat(state.migratedTo) : state.migratedTo)),
     context: updateStateContext(state.context, context),
   };
 
-  if (!account.data) {
-    account.data = null;
+  return validate(account);
+};
+
+const updateOrCreate = (state, attrs, context) => {
+  if (state) {
+    return update(state, attrs, context);
+  }
+
+  return create(attrs, context);
+};
+
+const validate = (state) => {
+  // ensure we have correct pk
+  if (state.pk && typeof state.pk !== 'string') {
+    state.pk = toBase58(state.pk);
+  }
+
+  const { value, error } = schema.validate(state);
+  if (error) {
+    throw new Error(`Invalid account: ${error.details.map((x) => x.message).join(', ')}`);
+  }
+
+  if (!value.data) {
+    value.data = null;
   }
 
-  return account;
+  return value;
 };
 
 const isMigrated = (state) => (state.migratedTo || []).length > 0;
 
-module.exports = { create, update, isMigrated };
+module.exports = { create, update, updateOrCreate, validate, isMigrated };

package/lib/states/stake.js

@@ -7,12 +7,12 @@ const schema = Joi.object({
   address: Joi.DID().role('ROLE_STAKE').trim().required(),
   sender: Joi.DID().trim().required(),
   receiver: Joi.DID().trim().required(),
-  tokens: Joi.object().default({}),
+  tokens: Joi.object({}).pattern(Joi.DID().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
   assets: Joi.array().items(Joi.DID().role('ROLE_ASSET')).default([]),
   revocable: Joi.boolean().default(true),
   message: Joi.string().trim().min(1).max(256).required(),
   revokeWaitingPeriod: Joi.number().integer().min(0).default(0),
-  revokedTokens: Joi.object().default({}),
+  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.contextSchema,
   data: Joi.any().optional(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.64",
+  "version": "1.13.65",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -16,21 +16,21 @@
     "coverage": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@arcblock/did": "1.13.64",
-    "@ocap/contract": "1.13.64",
-    "@ocap/message": "1.13.64",
-    "@ocap/util": "1.13.64",
+    "@arcblock/did": "1.13.65",
+    "@ocap/contract": "1.13.65",
+    "@ocap/message": "1.13.65",
+    "@ocap/util": "1.13.65",
     "bloom-filters": "^1.3.1",
     "debug": "^4.3.2",
     "joi": "^17.4.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@ocap/mcrypto": "1.13.64",
+    "@ocap/mcrypto": "1.13.65",
     "jest": "^27.3.1"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
-  "gitHead": "49c94d9fd5f12ec63c34ad609d041a92f68322a8"
+  "gitHead": "4011996e1800845142aa5c889b58726129a99ec3"
 }