@ocap/state 1.18.17 → 1.18.19

package/lib/states/stake.js

@@ -10,6 +10,7 @@ const schema = Joi.object({
   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([]),
   revocable: Joi.boolean().default(true),
   message: Joi.string().trim().min(1).max(256).required(),
   revokeWaitingPeriod: Joi.number().integer().min(0).default(0),
@@ -23,6 +24,7 @@ const create = (attrs, context) => {
   const stake = {
     tokens: {},
     assets: [],
+    slashers: [],
     revocable: true,
     revokedTokens: {},
     revokedAssets: [],
@@ -34,6 +36,7 @@ const create = (attrs, context) => {
       'receiver',
       'tokens',
       'assets',
+      'slashers',
       'revocable',
       'data',
       'message',

package/lib/states/tx.js

@@ -78,12 +78,14 @@ const getTransferReceipts = (tx) => {
 
 const getReceiptsFromTxInput = (inputs, symbol, action = 'transfer') => {
   const receipts = [];
-  inputs.forEach(({ owner, tokens, assets }) => {
-    const receipt = { address: owner, changes: [] };
-    tokens.forEach(({ address, value }) => {
+  inputs.forEach((x) => {
+    const receipt = { address: x.owner, changes: [] };
+    getListField(x, 'tokens').forEach(({ address, value }) => {
       receipt.changes.push({ target: address, action, value: `${symbol}${value}` });
     });
-    assets.forEach((address) => receipt.changes.push({ target: address, action, value: `${symbol}1` }));
+    getListField(x, 'assets').forEach((address) =>
+      receipt.changes.push({ target: address, action, value: `${symbol}1` })
+    );
     receipts.push(receipt);
   });
 
@@ -225,7 +227,7 @@ const getStakeReceipts = (tx) => {
   return [stakeReceipt, ...getReceiptsFromTxInput(inputs, '-', 'stake')];
 };
 
-const getClaimStakeReceipts = (tx, ctx) => {
+const getClaimStakeReceipts = (tx, ctx, action) => {
   const { address } = tx.itxJson;
   const { outputs } = ctx;
 
@@ -233,22 +235,22 @@ const getClaimStakeReceipts = (tx, ctx) => {
   const tokens = {};
   const assets = [];
   outputs.forEach((output) => {
-    output.tokens.forEach((x) => {
+    getListField(output, 'tokens').forEach((x) => {
       if (typeof tokens[x.address] === 'undefined') {
         tokens[x.address] = new BN(0);
       }
       tokens[x.address] = tokens[x.address].add(new BN(x.value));
     });
-    assets.push(...output.assets);
+    assets.push(...getListField(output, 'assets'));
   });
 
   const stakeReceipt = { address, changes: [] };
-  assets.forEach((x) => stakeReceipt.changes.push({ target: x, action: 'stake', value: '-1' }));
+  assets.forEach((x) => stakeReceipt.changes.push({ target: x, action, value: '-1' }));
   Object.keys(tokens).forEach((x) =>
-    stakeReceipt.changes.push({ target: x, action: 'stake', value: `-${tokens[x].toString(10)}` })
+    stakeReceipt.changes.push({ target: x, action, value: `-${tokens[x].toString(10)}` })
   );
 
-  return [stakeReceipt, ...getReceiptsFromTxInput(outputs, '', 'claim')];
+  return [stakeReceipt, ...getReceiptsFromTxInput(outputs, '', action)];
 };
 
 const getCreateTokenReceipts = (tx) => {
@@ -364,7 +366,9 @@ const getTxReceipts = ({ tx, code }, ctx = {}) => {
   } else if (['StakeTx'].includes(typeUrl)) {
     receipts = receipts.concat(getStakeReceipts(tx, ctx));
   } else if (['ClaimStakeTx'].includes(typeUrl)) {
-    receipts = receipts.concat(getClaimStakeReceipts(tx, ctx));
+    receipts = receipts.concat(getClaimStakeReceipts(tx, ctx, 'claim'));
+  } else if (['SlashStakeTx'].includes(typeUrl)) {
+    receipts = receipts.concat(getClaimStakeReceipts(tx, ctx, 'slash'));
   }
 
   receipts = receipts.concat(getReceiptsFromContext(ctx));

package/package.json

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