@ocap/tx-protocols 1.18.23 → 1.18.24

package/lib/protocols/asset/mint.js

@@ -39,17 +39,18 @@ runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 // Ensure factory exist
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
 
-// Used to assemble issuer object
-runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER', table: 'account' })); // prettier-ignore
+// Ensure issuer exist: read them here because some maybe migrated
+runner.use(pipes.ExtractState({ from: 'factoryState.trustedIssuers', to: 'issuerStates', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
 
 // Ensure factory owner exist and equal to sender
 runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'OWNER_ONLY_OPERATION',
-      message: 'Only factory owner is allowed to mint',
-      fn: ({ factoryState, senderState }) => factoryState.owner === senderState.address,
+      error: 'FORBIDDEN',
+      message: 'Only factory owner and trusted issuers are allowed to mint',
+      fn: ({ factoryState, senderState, issuerStates }) =>
+        senderState.address === factoryState.owner || issuerStates.find((x) => x.address === senderState.address),
       persist: true,
     },
   ])

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

@@ -2,7 +2,7 @@ const { CustomError: Error } = require('@ocap/util/lib/error');
 const { mintFromFactory } = require('@ocap/asset');
 
 module.exports = (mode) => (context, next) => {
-  const { itx, senderState, ownerState, factoryState, delegatorState, factoryOwnerState, factoryInputs } = context;
+  const { itx, senderState, ownerState, factoryState, delegatorState, factoryInputs } = context;
 
   let issuer = null;
   let owner = null;
@@ -17,9 +17,9 @@ module.exports = (mode) => (context, next) => {
   } else if (mode === 'mint') {
     owner = ownerState || { address: itx.owner };
     issuer = {
-      id: factoryOwnerState.address,
-      pk: factoryOwnerState.pk,
-      name: factoryOwnerState.moniker,
+      id: senderState.address,
+      pk: senderState.pk,
+      name: senderState.moniker,
     };
   }
 

package/lib/protocols/factory/create.js

@@ -107,6 +107,9 @@ runner.use((context, next) => {
   return next(new Error('INVALID_FACTORY_INPUT', 'Not all input.assets exist on chain'));
 });
 
+// ensure issuer exists
+runner.use(pipes.ExtractState({ from: 'factoryProps.trustedIssuers', to: 'issuerStates', table: 'account', status: 'INVALID_ISSUER_STATE' })); // prettier-ignore
+
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));
 runner.use(EnsureTxCost({ attachSenderChanges: true }));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.23",
+  "version": "1.18.24",
   "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.23",
-    "@arcblock/did-util": "1.18.23",
-    "@arcblock/jwt": "1.18.23",
-    "@arcblock/validator": "1.18.23",
-    "@ocap/asset": "1.18.23",
-    "@ocap/mcrypto": "1.18.23",
-    "@ocap/merkle-tree": "1.18.23",
-    "@ocap/message": "1.18.23",
-    "@ocap/state": "1.18.23",
-    "@ocap/tx-pipeline": "1.18.23",
-    "@ocap/util": "1.18.23",
-    "@ocap/wallet": "1.18.23",
+    "@arcblock/did": "1.18.24",
+    "@arcblock/did-util": "1.18.24",
+    "@arcblock/jwt": "1.18.24",
+    "@arcblock/validator": "1.18.24",
+    "@ocap/asset": "1.18.24",
+    "@ocap/mcrypto": "1.18.24",
+    "@ocap/merkle-tree": "1.18.24",
+    "@ocap/message": "1.18.24",
+    "@ocap/state": "1.18.24",
+    "@ocap/tx-pipeline": "1.18.24",
+    "@ocap/util": "1.18.24",
+    "@ocap/wallet": "1.18.24",
     "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": "bb57afdd756f4a9608e53e40c91060c32b97f2f8"
+  "gitHead": "2b3c7ab2de31bd3ef55ae32cec5c007d5e13d306"
 }