@ocap/state 1.13.60 → 1.13.64

package/lib/states/rollup-block.js

@@ -24,6 +24,8 @@ const schema = Joi.object({
   burnedAmount: Joi.BN().min(0).optional().default('0'),
   rewardAmount: Joi.BN().min(0).optional().default('0'),
 
+  minReward: Joi.BN().min(0).required(),
+
   context: Joi.contextSchema,
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
@@ -44,6 +46,7 @@ const create = (attrs, context) => {
       'mintedAmount',
       'burnedAmount',
       'rewardAmount',
+      'minReward',
       'data',
     ]),
   };

package/lib/states/rollup.js

@@ -57,7 +57,9 @@ const schema = Joi.object({
   blockHash: Joi.string().regex(Joi.hashRegexp).optional().allow(''),
   issuer: Joi.DID().optional(),
 
-  leaveWaitingPeriod: Joi.number().integer().min(0).default(0),
+  leaveWaitingPeriod: Joi.number().integer().min(Joi.ref('minBlockInterval')).default(0),
+  publishWaitingPeriod: Joi.number().integer().min(Joi.ref('minBlockInterval')).default(0),
+  publishSlashRate: Joi.number().integer().min(1).max(10000).required(),
 
   context: Joi.contextSchema,
   data: Joi.any().optional(),
@@ -96,6 +98,8 @@ const create = (attrs, context) => {
       'minWithdrawFee',
       'maxWithdrawFee',
       'leaveWaitingPeriod',
+      'publishWaitingPeriod',
+      'publishSlashRate',
       'issuer',
       'data',
     ]),
@@ -155,6 +159,9 @@ const update = (state, updates, context) => {
       'maxWithdrawFee',
       'blockHeight',
       'blockHash',
+      'leaveWaitingPeriod',
+      'publishWaitingPeriod',
+      'publishSlashRate',
       'data',
     ]),
     context: updateStateContext(state.context, context),

package/lib/states/tx.js

@@ -1,4 +1,6 @@
 const get = require('lodash/get');
+const pick = require('lodash/pick');
+const merge = require('lodash/merge');
 const groupBy = require('lodash/groupBy');
 const upperFirst = require('lodash/upperFirst');
 const camelCase = require('lodash/camelCase');
@@ -9,7 +11,6 @@ const getListField = require('@ocap/util/lib/get-list-field');
 const ZERO = new BN(0);
 
 // Receiver = Whose asset have net gain
-// TODO: let's deprecate this, since it's not used anymore
 const getTxReceiver = ({ tx, itx, typeUrl }) => {
   switch (typeUrl) {
     case 'TransferTx':
@@ -386,7 +387,7 @@ const getTxReceipts = ({ tx, code }, ctx = {}) => {
 };
 
 const create = (context, code = 'OK') => {
-  const { txHash, txTime, tx } = context;
+  const { txHash, txTime, tx, itxExtras = {} } = context;
   const itx = decodeAny(tx.itx).value; // we should decode here because `context.itx` maybe changed
   const typeUrl = fromTypeUrl(tx.itx.typeUrl);
   const typeName = tx.itx.typeUrl.split(':').pop();
@@ -418,6 +419,7 @@ const create = (context, code = 'OK') => {
         encoded_value: tx.itx.value,
         type_url: tx.itx.typeUrl,
         ...itxJson,
+        ...itxExtras,
         data: itx.data || null,
       },
     },
@@ -428,8 +430,12 @@ const create = (context, code = 'OK') => {
   return result;
 };
 
+// Only a few props are allowed to be changed in tx state
+const update = (state, updates) => merge(state, pick(updates, ['finalized', 'tx.itxJson.actualFee']));
+
 module.exports = {
   create,
+  update,
   getTxReceiver,
   getTxSender,
   getTxReceipts,

package/package.json

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