@ocap/state 1.13.70 → 1.13.74

package/lib/states/rollup.js

@@ -1,4 +1,5 @@
 const pick = require('lodash/pick');
+const Error = require('@ocap/util/lib/error');
 
 const Joi = require('@ocap/validator');
 const { create: createStateContext, update: updateStateContext } = require('../contexts/state');
@@ -15,6 +16,7 @@ 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([]),
   paused: Joi.boolean().default(false),
 
   seedValidators: Joi.array().items(validator).min(1).required(),
@@ -68,6 +70,8 @@ const schema = Joi.object({
 const create = (attrs, context) => {
   const rollup = {
     context: createStateContext(context),
+    paused: false,
+    migrateHistory: [],
     blockHeight: 0,
     blockHash: '',
     ...pick(attrs, [
@@ -112,31 +116,30 @@ const update = (state, updates, context) => {
   // latest block height must be incremented on each update
   // latest block hash must be updated together with block height
   if (updates.blockHeight && !updates.blockHash) {
-    throw new Error('Invalid rollup updates: blockHash must be updated together with blockHeight');
+    throw new Error('INVALID_ROLLUP_UPDATE', 'blockHash must be updated together with blockHeight');
   }
   if (updates.blockHash && !updates.blockHeight) {
-    throw new Error('Invalid rollup updates: blockHeight must be updated together with blockHash');
+    throw new Error('INVALID_ROLLUP_UPDATE', 'blockHeight must be updated together with blockHash');
   }
   if (updates.blockHeight && updates.blockHash) {
     if (updates.blockHeight !== state.blockHeight + 1) {
-      throw new Error('Invalid rollup updates: blockHeight must be incremented');
+      throw new Error('INVALID_ROLLUP_UPDATE', 'blockHeight must be incremented');
     }
     if (updates.blockHash === state.blockHash) {
-      throw new Error('Invalid rollup updates: blockHash can not remain unchanged between blocks');
+      throw new Error('INVALID_ROLLUP_UPDATE', 'blockHash can not remain unchanged between blocks');
     }
   }
 
   if (typeof updates.blockHeight !== 'undefined' && !updates.blockHeight) {
-    throw new Error('Invalid rollup updates: blockHeight can not be unset');
+    throw new Error('INVALID_ROLLUP_UPDATE', 'blockHeight can not be unset');
   }
   if (typeof updates.blockHash !== 'undefined' && !updates.blockHash) {
-    throw new Error('Invalid rollup updates: blockHash can not be unset');
+    throw new Error('INVALID_ROLLUP_UPDATE', 'blockHash can not be unset');
   }
 
   const rollup = {
     ...state,
     ...pick(updates, [
-      'paused',
       'validators',
       'minStakeAmount',
       'maxStakeAmount',
@@ -170,10 +173,59 @@ const update = (state, updates, context) => {
   return validate(rollup);
 };
 
+const pause = (state, context) => {
+  if (state.paused) {
+    throw new Error('INVALID_PAUSE_ATTEMPT', 'rollup already paused');
+  }
+
+  const rollup = {
+    ...state,
+    paused: true,
+    context: updateStateContext(state.context, context),
+  };
+
+  return validate(rollup);
+};
+
+const resume = (state, context) => {
+  if (state.paused === false) {
+    throw new Error('INVALID_RESUME_ATTEMPT', 'rollup not paused');
+  }
+
+  const rollup = {
+    ...state,
+    paused: false,
+    context: updateStateContext(state.context, context),
+  };
+
+  return validate(rollup);
+};
+
+const migrate = (state, to, context) => {
+  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');
+  }
+  if (state.migrateHistory.includes(to)) {
+    throw new Error('INVALID_MIGRATE_ATTEMPT', 'can not migrate to history contracts');
+  }
+
+  const rollup = {
+    ...state,
+    contractAddress: to,
+    migrateHistory: [...state.migrateHistory, state.contractAddress],
+    context: updateStateContext(state.context, context),
+  };
+
+  return validate(rollup);
+};
+
 const validate = (state) => {
   const { value, error } = schema.validate(state);
   if (error) {
-    throw new Error(`Invalid rollup: ${error.details.map((x) => x.message).join(', ')}`);
+    throw new Error('INVALID_ROLLUP_PROPS', error.details.map((x) => x.message).join(', '));
   }
 
   if (!value.data) {
@@ -183,4 +235,4 @@ const validate = (state) => {
   return value;
 };
 
-module.exports = { create, update, validate, schema };
+module.exports = { create, update, pause, resume, migrate, validate, schema };

package/lib/states/token.js

@@ -1,4 +1,5 @@
 const pick = require('lodash/pick');
+const { toChecksumAddress } = require('@arcblock/did/lib/type');
 
 const { create: createStateContext } = require('../contexts/state');
 
@@ -26,6 +27,8 @@ const create = (attrs, context) => {
   }
   if (!token.foreignToken) {
     token.foreignToken = null;
+  } else {
+    token.foreignToken.contractAddress = toChecksumAddress(token.foreignToken.contractAddress);
   }
 
   return token;

package/package.json

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