@ocap/state 1.18.32 → 1.18.34

package/lib/states/account.js

@@ -4,20 +4,20 @@ const flatten = require('lodash/flatten');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { isFromPublicKey } = require('@arcblock/did');
 const { isEthereumDid, toChecksumAddress } = require('@arcblock/did/lib/type');
-const { toBase58, BN } = require('@ocap/util');
+const { toBase58, toAddress, BN } = require('@ocap/util');
 
 const { Joi, schemas } = require('@arcblock/validator');
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
-  address: Joi.DID().required(),
+  address: Joi.DID().prefix().required(),
   pk: Joi.string().allow(''),
-  issuer: Joi.DID().allow(''),
+  issuer: Joi.DID().prefix().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([]),
+  tokens: Joi.object().pattern(Joi.DID().prefix().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
+  migratedTo: Joi.array().items(Joi.DID().prefix()).default([]),
+  migratedFrom: Joi.array().items(Joi.DID().prefix()).default([]),
   context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
@@ -32,12 +32,12 @@ const create = (attrs, context) => {
     ...pick(attrs, ['address', 'pk', 'issuer', 'moniker', 'data', 'nonce', 'migratedFrom', 'tokens']),
   };
 
+  account.address = toAddress(ensureChecksumAddress(account.address));
+
   if (!account.moniker) {
     account.moniker = [account.address.slice(0, 6), account.address.slice(-5)].join('-');
   }
 
-  account.address = ensureChecksumAddress(account.address);
-
   return validate(account);
 };
 

package/lib/states/asset.js

@@ -1,12 +1,13 @@
 const pick = require('lodash/pick');
 const { Joi, schemas } = require('@arcblock/validator');
 const { CustomError: Error } = require('@ocap/util/lib/error');
+const { toAddress } = require('@ocap/util');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
   ...schemas.assetProps,
-  owner: Joi.DID().required(),
+  owner: Joi.DID().prefix().required(),
   consumedTime: Joi.date().iso().raw().allow(''),
   context: schemas.context,
 }).options({
@@ -40,6 +41,8 @@ const create = (attrs, context) => {
     ]),
   };
 
+  asset.address = toAddress(asset.address);
+
   return validate(asset);
 };
 

package/lib/states/delegation.js

@@ -1,5 +1,7 @@
 const pick = require('lodash/pick');
+const { toAddress } = require('@ocap/util');
 
+// FIXME: add better validation
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const create = (attrs, context) => {
@@ -12,6 +14,8 @@ const create = (attrs, context) => {
     delegation.data = null;
   }
 
+  delegation.address = toAddress(delegation.address);
+
   return delegation;
 };
 

package/lib/states/evidence.js

@@ -1,11 +1,11 @@
 const pick = require('lodash/pick');
 const { CustomError: Error } = require('@ocap/util/lib/error');
-const { Joi, schemas } = require('@arcblock/validator');
+const { Joi, schemas, patterns } = require('@arcblock/validator');
 
 const { create: createStateContext } = require('../contexts/state');
 
 const schema = Joi.object({
-  hash: Joi.string().trim().required(),
+  hash: Joi.string().regex(patterns.txHash).required(),
   context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/states/factory.js

@@ -1,15 +1,16 @@
 const pick = require('lodash/pick');
 const { Joi, schemas } = require('@arcblock/validator');
 const { compile, merge, getQuota } = require('@ocap/contract');
+const { toAddress } = require('@ocap/util');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const stateSchema = Joi.object({
   ...schemas.factoryProps,
-  owner: Joi.DID().required(),
+  owner: Joi.DID().prefix().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({}),
+  tokens: Joi.object().pattern(Joi.DID().prefix().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
   context: schemas.context,
 }).options({
   stripUnknown: true,
@@ -54,6 +55,8 @@ const create = (attrs, context) => {
   const quota = getQuota(factory.input);
   factory.hooks = (factory.hooks || []).map((x) => compileHook(x, quota));
 
+  factory.address = toAddress(factory.address);
+
   return validate(factory);
 };
 

package/lib/states/rollup-block.js

@@ -16,10 +16,10 @@ const schema = Joi.object({
   txsHash: Joi.string().regex(patterns.txHash).required(),
   txs: Joi.array().items(Joi.string().regex(patterns.txHash).required()).min(1).unique().required(),
 
-  proposer: Joi.DID().wallet('ethereum').required(),
+  proposer: Joi.DID().prefix().wallet('ethereum').required(),
   signatures: schemas.multiSig.min(1).required(),
 
-  rollup: Joi.DID().role('ROLE_ROLLUP').required(),
+  rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
 
   mintedAmount: Joi.BN().min(0).optional().default('0'),
   burnedAmount: Joi.BN().min(0).optional().default('0'),

package/lib/states/rollup.js

@@ -1,22 +1,23 @@
 const pick = require('lodash/pick');
 const { CustomError: Error } = require('@ocap/util/lib/error');
+const { toAddress } = require('@ocap/util');
 
 const { Joi, schemas, patterns } = require('@arcblock/validator');
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 const validator = Joi.object({
   pk: Joi.string().required(),
-  address: Joi.DID().required(),
+  address: Joi.DID().prefix().required(),
   endpoint: Joi.string()
     .uri({ scheme: [/https?/] })
     .required(),
 });
 
 const schema = Joi.object({
-  address: Joi.DID().role('ROLE_ROLLUP').required(),
-  tokenAddress: Joi.DID().role('ROLE_TOKEN').required(),
-  contractAddress: Joi.DID().wallet('ethereum').required(),
-  migrateHistory: Joi.array().items(Joi.DID().wallet('ethereum')).default([]),
+  address: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
+  tokenAddress: Joi.DID().prefix().role('ROLE_TOKEN').required(),
+  contractAddress: Joi.DID().prefix().wallet('ethereum').required(),
+  migrateHistory: Joi.array().items(Joi.DID().prefix().wallet('ethereum')).default([]),
   paused: Joi.boolean().default(false),
 
   seedValidators: Joi.array().items(validator).min(1).required(),
@@ -57,7 +58,7 @@ const schema = Joi.object({
 
   blockHeight: Joi.number().integer().min(0).required(),
   blockHash: Joi.string().regex(patterns.txHash).optional().allow(''),
-  issuer: Joi.DID().optional(),
+  issuer: Joi.DID().prefix().optional(),
 
   leaveWaitingPeriod: Joi.number().integer().min(Joi.ref('minBlockInterval')).default(0),
   publishWaitingPeriod: Joi.number().integer().min(Joi.ref('minBlockInterval')).default(0),
@@ -109,6 +110,8 @@ const create = (attrs, context) => {
     ]),
   };
 
+  rollup.address = toAddress(rollup.address);
+
   return validate(rollup);
 };
 

package/lib/states/stake.js

@@ -1,21 +1,22 @@
 const pick = require('lodash/pick');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Joi, schemas } = require('@arcblock/validator');
+const { toAddress } = require('@ocap/util');
 
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
 
 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({}).pattern(Joi.DID().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
-  assets: Joi.array().items(Joi.DID().role('ROLE_ASSET')).default([]),
-  slashers: Joi.array().items(Joi.DID()).default([]),
+  address: Joi.DID().prefix().role('ROLE_STAKE').trim().required(),
+  sender: Joi.DID().prefix().trim().required(),
+  receiver: Joi.DID().prefix().trim().required(),
+  tokens: Joi.object({}).pattern(Joi.DID().prefix().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
+  assets: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
+  slashers: Joi.array().items(Joi.DID().prefix()).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({}).pattern(Joi.DID().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
-  revokedAssets: Joi.array().items(Joi.DID().role('ROLE_ASSET')).default([]),
+  revokedTokens: Joi.object({}).pattern(Joi.DID().prefix().role('ROLE_TOKEN'), Joi.BN().min(0)).default({}),
+  revokedAssets: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
   context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
@@ -44,6 +45,8 @@ const create = (attrs, context) => {
     ]),
   };
 
+  stake.address = toAddress(stake.address);
+
   return validate(stake);
 };
 

package/lib/states/token.js

@@ -1,5 +1,6 @@
 const pick = require('lodash/pick');
 const { toChecksumAddress } = require('@arcblock/did/lib/type');
+const { toAddress } = require('@ocap/util');
 
 const { create: createStateContext } = require('../contexts/state');
 
@@ -31,6 +32,8 @@ const create = (attrs, context) => {
     token.foreignToken.contractAddress = toChecksumAddress(token.foreignToken.contractAddress);
   }
 
+  token.address = toAddress(token.address);
+
   return token;
 };
 

package/package.json

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