@ocap/tx-protocols 1.14.7 → 1.14.11

package/lib/protocols/account/declare.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account } = require('@ocap/state');
 const { toBase58 } = require('@ocap/util');

package/lib/protocols/account/delegate.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 const get = require('lodash/get');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { delegation, account } = require('@ocap/state');

package/lib/protocols/account/migrate.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { fromPublicKey, toTypeInfo } = require('@arcblock/did');

package/lib/protocols/account/revoke-delegate.js

@@ -1,6 +1,6 @@
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { delegation, account } = require('@ocap/state');

package/lib/protocols/asset/update.js

@@ -1,5 +1,6 @@
+const deepDiff = require('deep-diff');
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset } = require('@ocap/state');
 
@@ -18,19 +19,23 @@ const schema = Joi.object({
   moniker: Joi.string().min(2).max(255).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
-runner.use(({ itx }, next) => {
+runner.use((context, next) => {
+  const { itx } = context;
   const { error } = schema.validate(itx);
   if (error) {
     return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
   }
+
+  context.newData = decodeAnySafe(itx.data);
   return next();
 });
 
-// Ensure asset exist owned by sender and can be modified
-runner.use(pipes.ExtractState({ from: 'itx.address', to: 'assetState', status: 'INVALID_ASSET' }));
+// Ensure asset exist
+runner.use(pipes.ExtractState({ from: 'itx.address', to: 'assetState', status: 'INVALID_ASSET', table: 'asset' }));
+runner.use(pipes.ExtractState({ from: 'assetState.issuer', to: 'issuerState', status: 'OK', table: 'account' }));
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Ensure asset owned by sender and can be modified
@@ -46,10 +51,30 @@ runner.use(
   ])
 );
 
+// Ensure we are in append-only mode update proposed by issuer
+runner.use(async (context, next) => {
+  const { itx, newData, senderState, assetState, issuerState } = context;
+  if (issuerState && senderState.address === issuerState.address) {
+    if (itx.moniker !== assetState.moniker) {
+      return next(new Error('FORBIDDEN', 'Asset moniker can only be updated by owner'));
+    }
+    if (newData.type !== assetState.data.type) {
+      return next(new Error('FORBIDDEN', 'Asset data type can only be updated by owner'));
+    }
+    const dataDiff = deepDiff(assetState.data.value, newData.value);
+    const appendOnly = dataDiff.every((x) => x.kind === 'N' || (x.kind === 'A' && x.item.kind === 'N'));
+    if (appendOnly === false) {
+      return next(new Error('APPEND_ONLY', 'Asset data value can only be updated in append only mode'));
+    }
+  }
+
+  return next();
+});
+
 // Update asset state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, assetState } = context;
+    const { tx, itx, newData, statedb, senderState, assetState } = context;
 
     const [newSenderState, newAssetState] = await Promise.all([
       // update owner state
@@ -62,7 +87,7 @@ runner.use(
       // update asset state
       statedb.asset.update(
         itx.address,
-        asset.update(assetState, { moniker: itx.moniker, data: decodeAnySafe(itx.data) }, context),
+        asset.update(assetState, { moniker: itx.moniker, data: newData }, context),
         context
       ),
     ]);

package/lib/protocols/governance/claim-stake.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset, stake, evidence } = require('@ocap/state');

package/lib/protocols/governance/stake.js

@@ -1,7 +1,7 @@
 const pick = require('lodash/pick');
 const { promisify } = require('util');
 const isEmpty = require('empty-value');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const Error = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { toStakeAddress } = require('@arcblock/did-util');

package/lib/protocols/rollup/claim-reward.js

@@ -1,7 +1,7 @@
 const uniqBy = require('lodash/uniqBy');
 const groupBy = require('lodash/groupBy');
 const cloneDeep = require('lodash/cloneDeep');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const Error = require('@ocap/util/lib/error');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');

package/lib/protocols/rollup/create-block.js

@@ -2,7 +2,7 @@
 const pick = require('lodash/pick');
 const Error = require('@ocap/util/lib/error');
 const MerkleTree = require('@ocap/merkle-tree');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { formatMessage } = require('@ocap/message');
 const { toStakeAddress } = require('@arcblock/did-util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');

package/lib/protocols/rollup/join.js

@@ -2,7 +2,7 @@
 const MerkleTree = require('@ocap/merkle-tree');
 const joinUrl = require('url-join');
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { BN, toHex } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup, stake, evidence } = require('@ocap/state');

package/lib/protocols/rollup/leave.js

@@ -1,7 +1,7 @@
 /* eslint-disable indent */
 const MerkleTree = require('@ocap/merkle-tree');
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup, stake, evidence } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');

package/lib/protocols/rollup/migrate-contract.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 

package/lib/protocols/rollup/migrate-token.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account } = require('@ocap/state');
 

package/lib/protocols/rollup/pause.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 

package/lib/protocols/rollup/resume.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 

package/lib/protocols/rollup/update.js

@@ -1,5 +1,5 @@
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 

package/lib/protocols/token/create.js

@@ -1,6 +1,6 @@
 const isEmpty = require('empty-value');
 const cloneDeep = require('lodash/cloneDeep');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const Error = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, token } = require('@ocap/state');

package/lib/protocols/token/deposit-v2.js

@@ -1,6 +1,6 @@
 /* eslint-disable indent */
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { BN, fromUnitToToken } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');

package/lib/protocols/token/withdraw-v2.js

@@ -1,6 +1,6 @@
 /* eslint-disable indent */
 const Error = require('@ocap/util/lib/error');
-const Joi = require('@ocap/validator');
+const Joi = require('@arcblock/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { BN, fromUnitToToken } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.14.7",
+  "version": "1.14.11",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.14.7",
-    "@arcblock/did-util": "1.14.7",
-    "@ocap/asset": "1.14.7",
-    "@ocap/mcrypto": "1.14.7",
-    "@ocap/merkle-tree": "1.14.7",
-    "@ocap/message": "1.14.7",
-    "@ocap/state": "1.14.7",
-    "@ocap/tx-pipeline": "1.14.7",
-    "@ocap/util": "1.14.7",
-    "@ocap/validator": "1.14.7",
-    "@ocap/wallet": "1.14.7",
-    "debug": "^4.3.2",
+    "@arcblock/did": "1.14.11",
+    "@arcblock/did-util": "1.14.11",
+    "@arcblock/validator": "1.14.11",
+    "@ocap/asset": "1.14.11",
+    "@ocap/mcrypto": "1.14.11",
+    "@ocap/merkle-tree": "1.14.11",
+    "@ocap/message": "1.14.11",
+    "@ocap/state": "1.14.11",
+    "@ocap/tx-pipeline": "1.14.11",
+    "@ocap/util": "1.14.11",
+    "@ocap/wallet": "1.14.11",
+    "debug": "^4.3.3",
+    "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
     "url-join": "^4.0.1"
@@ -45,5 +46,5 @@
     "jest": "^27.3.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "54d1d67b4c1902652083f4143a089da40489cf8d"
+  "gitHead": "df9681a5e8ef4cff1972c5e7be5137f72b60f1c7"
 }