@ocap/tx-protocols 1.18.83 → 1.18.84

package/lib/protocols/asset/mint.js

@@ -5,7 +5,7 @@ const { Joi, schemas } = require('@arcblock/validator');
 const { account, asset, factory } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset`);
+const debug = require('debug')(`${require('../../../package.json').name}:mint-asset`);
 
 const verifyMintLimit = require('./pipes/verify-mint-limit');
 const verifyItxVariables = require('./pipes/verify-itx-variables');
@@ -60,7 +60,6 @@ runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerSta
 // 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([
@@ -124,10 +123,9 @@ runner.use(
       senderUpdates,
       assetStates = [],
       updateVaults,
+      ownerAddress,
     } = context;
 
-    const owner = ownerState ? ownerState.address : itx.owner;
-
     const factoryUpdates = { numMinted: factoryState.numMinted + 1 };
 
     const [newSenderState, newReceiverState, assetState, newFactoryState, newAssetStates] = await Promise.all([
@@ -141,12 +139,12 @@ runner.use(
       // create receiver if not exist: asset owner
       ownerState
         ? Promise.resolve(ownerState)
-        : statedb.account.create(owner, account.create({ address: owner }, context), context),
+        : statedb.account.create(ownerAddress, account.create({ address: ownerAddress }, context), context),
 
       // create asset
       statedb.asset.create(
         itx.address,
-        asset.create({ ...mintedAsset, owner, address: mintedAddress }, context),
+        asset.create({ ...mintedAsset, owner: ownerAddress, address: mintedAddress }, context),
         context
       ),
 

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

@@ -4,7 +4,7 @@ const { mintFromFactory } = require('@ocap/asset');
 const debug = require('debug')('@ocap/tx-protocols:pipes:verify-itx-address');
 
 module.exports = (mode) => (context, next) => {
-  const { itx, senderState, ownerState, factoryState, delegatorState, factoryInputs } = context;
+  const { itx, senderState, factoryState, delegatorState, factoryInputs } = context;
 
   let issuer = null;
   let owner = null;
@@ -14,10 +14,10 @@ module.exports = (mode) => (context, next) => {
     issuer = itx.issuer;
     context.assetOwner = owner;
   } else if (mode === 'acquire-v3') {
-    owner = ownerState || { address: itx.owner };
+    owner = { address: itx.owner };
     issuer = itx.issuer;
   } else if (mode === 'mint') {
-    owner = ownerState || { address: itx.owner };
+    owner = { address: itx.owner };
     issuer = {
       id: senderState.address,
       pk: senderState.pk,
@@ -41,12 +41,12 @@ module.exports = (mode) => (context, next) => {
       factoryInputs,
       factoryState,
       senderState,
-      ownerState,
       delegatorState,
     });
     return next(new Error('INVALID_ASSET', 'Invalid itx.address: does not match with minted asset address'));
   }
 
+  context.ownerAddress = owner.address;
   context.mintedAsset = minted.asset;
   context.mintedAddress = minted.address;
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.83",
+  "version": "1.18.84",
   "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.83",
-    "@arcblock/did-util": "1.18.83",
-    "@arcblock/jwt": "1.18.83",
-    "@arcblock/validator": "1.18.83",
-    "@ocap/asset": "1.18.83",
-    "@ocap/mcrypto": "1.18.83",
-    "@ocap/merkle-tree": "1.18.83",
-    "@ocap/message": "1.18.83",
-    "@ocap/state": "1.18.83",
-    "@ocap/tx-pipeline": "1.18.83",
-    "@ocap/util": "1.18.83",
-    "@ocap/wallet": "1.18.83",
+    "@arcblock/did": "1.18.84",
+    "@arcblock/did-util": "1.18.84",
+    "@arcblock/jwt": "1.18.84",
+    "@arcblock/validator": "1.18.84",
+    "@ocap/asset": "1.18.84",
+    "@ocap/mcrypto": "1.18.84",
+    "@ocap/merkle-tree": "1.18.84",
+    "@ocap/message": "1.18.84",
+    "@ocap/state": "1.18.84",
+    "@ocap/tx-pipeline": "1.18.84",
+    "@ocap/util": "1.18.84",
+    "@ocap/wallet": "1.18.84",
     "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": "4ff2fda0bfeca2c5c85a141fb9d228d91914bdaf"
+  "gitHead": "ae4342de4c0be784cae2421246167e0b982b0bc1"
 }