@ocap/tx-protocols 1.18.42 → 1.18.44

package/lib/index.js

@@ -9,6 +9,7 @@ const delegate = require('./protocols/account/delegate');
 const revokeDelegate = require('./protocols/account/revoke-delegate');
 const createAsset = require('./protocols/asset/create');
 const updateAsset = require('./protocols/asset/update');
+const consumeAsset = require('./protocols/asset/consume');
 const createFactory = require('./protocols/factory/create');
 const acquireAssetV2 = require('./protocols/asset/acquire-v2');
 const acquireAssetV3 = require('./protocols/asset/acquire-v3');
@@ -50,6 +51,7 @@ const createExecutor = ({ filter, runAsLambda }) => {
     // asset
     createAsset,
     updateAsset,
+    consumeAsset,
     acquireAssetV2,
     acquireAssetV3,
     mintAsset,

package/lib/protocols/asset/consume.js

@@ -0,0 +1,86 @@
+const { CustomError: Error } = require('@ocap/util/lib/error');
+const { Joi } = require('@arcblock/validator');
+const { Runner, pipes } = require('@ocap/tx-pipeline');
+const { account, asset } = require('@ocap/state');
+
+// eslint-disable-next-line global-require
+const debug = require('debug')(`${require('../../../package.json').name}:consume-asset`);
+
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+
+const runner = new Runner();
+
+// Verify itx
+const schema = Joi.object({
+  address: Joi.DID().prefix().role('ROLE_ASSET').required(),
+  data: Joi.any().optional(),
+}).options({ stripUnknown: true, noDefaults: false });
+runner.use((context, next) => {
+  const { itx } = context;
+  const { error } = schema.validate(itx);
+  if (error) {
+    return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
+  }
+
+  return next();
+});
+
+// Ensure asset exist
+runner.use(pipes.ExtractState({ from: 'itx.address', to: 'assetState', status: 'INVALID_ASSET', table: 'asset' }));
+
+// Ensure asset can be consumed
+runner.use((context, next) => {
+  const { issuer, owner, consumedTime } = context.assetState;
+  if (!issuer) {
+    return next(new Error('INVALID_TX', 'Asset without issuer can not be consumed'));
+  }
+  if (consumedTime) {
+    return next(new Error('INVALID_TX', `Asset already consumed on ${consumedTime}`));
+  }
+
+  context.signers = [owner, issuer];
+  return next();
+});
+
+// Ensure owner and issuer signed
+runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
+
+// Ensure sender exist
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
+// Update asset state
+runner.use(
+  async (context, next) => {
+    const { tx, itx, txTime, statedb, senderState, senderUpdates, assetState, updateVaults } = context;
+
+    const [newSenderState, newAssetState] = await Promise.all([
+      // update sender state
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
+        context
+      ),
+
+      // update asset state
+      statedb.asset.update(itx.address, asset.update(assetState, { consumedTime: txTime }, context), context),
+
+      updateVaults(),
+    ]);
+
+    context.senderState = newSenderState;
+    context.assetState = newAssetState;
+
+    debug('consume', newAssetState);
+
+    next();
+  },
+  { persistError: true }
+);
+
+module.exports = runner;

package/lib/protocols/asset/pipes/verify-itx-assets.js

@@ -21,11 +21,14 @@ module.exports = (context, next) => {
   if (expectedFactoryStates.length === expectedAssets.length) {
     // Just ensure that input assets are minted from any of the factory
     // They do not need to match on number
-    if (actualAssetStates.every((x) => x.parent && expectedAssets.includes(x.parent) && !x.consumedTime)) {
-      return next();
+    if (actualAssetStates.every((x) => x.parent && expectedAssets.includes(x.parent)) === false) {
+      return next(new Error('INVALID_ASSET', 'Input asset not minted from any of factory.input.assets'));
+    }
+    if (actualAssetStates.every((x) => !x.consumedTime) === false) {
+      return next(new Error('INVALID_ASSET', 'Some input asset already consumed'));
     }
 
-    return next(new Error('INVALID_ASSET', 'Input asset not minted from any of factory.input.assets'));
+    return next();
   }
 
   // For specific assets, they must not be consumed

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.42",
+  "version": "1.18.44",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.18.42",
-    "@arcblock/did-util": "1.18.42",
-    "@arcblock/jwt": "1.18.42",
-    "@arcblock/validator": "1.18.42",
-    "@ocap/asset": "1.18.42",
-    "@ocap/mcrypto": "1.18.42",
-    "@ocap/merkle-tree": "1.18.42",
-    "@ocap/message": "1.18.42",
-    "@ocap/state": "1.18.42",
-    "@ocap/tx-pipeline": "1.18.42",
-    "@ocap/util": "1.18.42",
-    "@ocap/wallet": "1.18.42",
+    "@arcblock/did": "1.18.44",
+    "@arcblock/did-util": "1.18.44",
+    "@arcblock/jwt": "1.18.44",
+    "@arcblock/validator": "1.18.44",
+    "@ocap/asset": "1.18.44",
+    "@ocap/mcrypto": "1.18.44",
+    "@ocap/merkle-tree": "1.18.44",
+    "@ocap/message": "1.18.44",
+    "@ocap/state": "1.18.44",
+    "@ocap/tx-pipeline": "1.18.44",
+    "@ocap/util": "1.18.44",
+    "@ocap/wallet": "1.18.44",
     "debug": "^4.3.4",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^27.5.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "e4c81bf4891fd7b1b1ce3b8e1ccf7c4b7c004593"
+  "gitHead": "563803a77461e59d630e283f0c00e975c47f6ebf"
 }