@ocap/state 1.18.34 → 1.18.36

package/lib/states/rollup-block.js

@@ -27,6 +27,8 @@ const schema = Joi.object({
 
   minReward: Joi.BN().min(0).required(),
 
+  governance: Joi.boolean().default(false),
+
   context: schemas.context,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
@@ -48,6 +50,7 @@ const create = (attrs, context) => {
       'burnedAmount',
       'rewardAmount',
       'minReward',
+      'governance',
       'data',
     ]),
   };

package/lib/states/rollup.js

@@ -14,14 +14,18 @@ const validator = Joi.object({
 });
 
 const schema = Joi.object({
+  // a closed rollup must be paused
   address: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   tokenAddress: Joi.DID().prefix().role('ROLE_TOKEN').required(),
   contractAddress: Joi.DID().prefix().wallet('ethereum').required(),
+  vaultAddress: Joi.DID().wallet('ethereum').optional().allow(''), // FIXME: this should be enforced
   migrateHistory: Joi.array().items(Joi.DID().prefix().wallet('ethereum')).default([]),
+  vaultHistory: Joi.array().items(Joi.DID().prefix().wallet('ethereum')).default([]),
   paused: Joi.boolean().default(false),
+  closed: Joi.boolean().default(false),
 
   seedValidators: Joi.array().items(validator).min(1).required(),
-  validators: Joi.array().items(validator).default([]),
+  validators: Joi.array().items(validator).max(24).default([]),
 
   minStakeAmount: Joi.BN().positive().required(),
   maxStakeAmount: Joi.BN().min(Joi.ref('minStakeAmount')).required(),
@@ -72,13 +76,15 @@ const create = (attrs, context) => {
   const rollup = {
     context: createStateContext(context),
     paused: false,
+    closed: false,
     migrateHistory: [],
+    vaultHistory: [],
     blockHeight: 0,
     blockHash: '',
     ...pick(attrs, [
       'address',
-      'paused',
       'tokenAddress',
+      'vaultAddress',
       'contractAddress',
       'seedValidators',
       'validators',
@@ -177,6 +183,9 @@ const update = (state, updates, context) => {
 };
 
 const pause = (state, context) => {
+  if (state.closed) {
+    throw new Error('INVALID_PAUSE_ATTEMPT', 'rollup already closed');
+  }
   if (state.paused) {
     throw new Error('INVALID_PAUSE_ATTEMPT', 'rollup already paused');
   }
@@ -190,7 +199,27 @@ const pause = (state, context) => {
   return validate(rollup);
 };
 
+const close = (state, context) => {
+  if (state.closed) {
+    throw new Error('INVALID_CLOSE_ATTEMPT', 'rollup already closed');
+  }
+  if (!state.paused) {
+    throw new Error('INVALID_CLOSE_ATTEMPT', 'rollup must be paused');
+  }
+
+  const rollup = {
+    ...state,
+    closed: true,
+    context: updateStateContext(state.context, context),
+  };
+
+  return validate(rollup);
+};
+
 const resume = (state, context) => {
+  if (state.closed) {
+    throw new Error('INVALID_RESUME_ATTEMPT', 'rollup is closed');
+  }
   if (state.paused === false) {
     throw new Error('INVALID_RESUME_ATTEMPT', 'rollup not paused');
   }
@@ -204,15 +233,18 @@ const resume = (state, context) => {
   return validate(rollup);
 };
 
-const migrate = (state, to, context) => {
+const migrateContract = (state, to, context) => {
+  if (state.closed) {
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'rollup is closed');
+  }
   if (state.paused === false) {
     throw new Error('INVALID_MIGRATE_ATTEMPT', 'rollup not paused');
   }
   if (state.contractAddress === to) {
-    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate to self');
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate contract to self');
   }
   if (state.migrateHistory.includes(to)) {
-    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate to history contracts');
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate contract to history contracts');
   }
 
   const rollup = {
@@ -225,6 +257,30 @@ const migrate = (state, to, context) => {
   return validate(rollup);
 };
 
+const migrateVault = (state, to, context) => {
+  if (state.closed) {
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'rollup is closed');
+  }
+  if (state.paused === false) {
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'rollup not paused');
+  }
+  if (state.vaultAddress === to) {
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate vault to self');
+  }
+  if (state.vaultHistory.includes(to)) {
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate vault to history vaults');
+  }
+
+  const rollup = {
+    ...state,
+    vaultAddress: to,
+    vaultHistory: [...state.vaultHistory, state.vaultAddress],
+    context: updateStateContext(state.context, context),
+  };
+
+  return validate(rollup);
+};
+
 const validate = (state) => {
   const { value, error } = schema.validate(state);
   if (error) {
@@ -238,4 +294,4 @@ const validate = (state) => {
   return value;
 };
 
-module.exports = { create, update, pause, resume, migrate, validate, schema };
+module.exports = { create, update, pause, close, resume, migrateContract, migrateVault, validate, schema };

package/package.json

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