@ocap/asset 1.14.23 → 1.15.0

package/lib/index.js

@@ -168,13 +168,16 @@ const findPrerenderKeys = (obj, keyword) => {
  * @param {object} params.issuer issuer object
  */
 const mintFromFactory = ({ factory, inputs, owner, issuer }) => {
-  const { output, address: factoryAddress, data } = factory;
-  debug('mintFromFactory.args', JSON.stringify({ output, factoryAddress, inputs, owner, issuer, data }, null, 2));
+  const { output, address: factoryAddress, numMinted, data } = factory;
+  debug(
+    'mintFromFactory.args',
+    JSON.stringify({ output, factoryAddress, numMinted, inputs, owner, issuer, data }, null, 2)
+  );
   const asset = JSON.parse(
     mustache.render(JSON.stringify(output), {
       input: inputs,
       data: data.value || data,
-      ctx: { factory: factoryAddress, owner, issuer },
+      ctx: { factory: factoryAddress, id: numMinted + 1, owner, issuer },
     })
   );
 
@@ -198,10 +201,13 @@ const preMintFromFactory = ({ factory, inputs, owner, issuer }) => {
   }
 
   let asset = null;
-  const { output, address: factoryAddress, data } = factory;
+  const { output, numMinted, address: factoryAddress, data } = factory;
   const { wallet, name } = issuer;
 
-  debug('preMintFromFactory.args', JSON.stringify({ output, factoryAddress, inputs, owner, issuer, data }, null, 2));
+  debug(
+    'preMintFromFactory.args',
+    JSON.stringify({ output, factoryAddress, numMinted, inputs, owner, issuer, data }, null, 2)
+  );
 
   const extra = {};
   const issuerObject = { id: wallet.address, pk: toBase58(wallet.publicKey), name };
@@ -211,7 +217,7 @@ const preMintFromFactory = ({ factory, inputs, owner, issuer }) => {
       mustache.render(JSON.stringify(templateObject), {
         input: { ...inputs, ...extra },
         data: data.value || data,
-        ctx: { factory: factoryAddress, owner, issuer: issuerObject },
+        ctx: { factory: factoryAddress, id: numMinted + 1, owner, issuer: issuerObject },
       })
     );
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/asset",
   "description": "Utility to work with asset and factory on ArcBlock blockchain",
-  "version": "1.14.23",
+  "version": "1.15.0",
   "author": {
     "name": "wangshijun",
     "email": "shijun@arcblock.io",
@@ -15,13 +15,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@arcblock/did": "1.14.23",
-    "@arcblock/did-util": "1.14.23",
-    "@arcblock/vc": "1.14.23",
-    "@ocap/contract": "1.14.23",
-    "@ocap/mcrypto": "1.14.23",
-    "@ocap/util": "1.14.23",
-    "@ocap/wallet": "1.14.23",
+    "@arcblock/did": "1.15.0",
+    "@arcblock/did-util": "1.15.0",
+    "@arcblock/vc": "1.15.0",
+    "@ocap/contract": "1.15.0",
+    "@ocap/mcrypto": "1.15.0",
+    "@ocap/util": "1.15.0",
+    "@ocap/wallet": "1.15.0",
     "debug": "^4.3.3",
     "empty-value": "^1.0.1",
     "flat": "^5.0.2",
@@ -73,5 +73,5 @@
     "test": "jest --forceExit --detectOpenHandles",
     "coverage": "yarn test -- --coverage"
   },
-  "gitHead": "1ed9c9d99862d035f9a5cc639f411e92ab88f3df"
+  "gitHead": "200364b55e5906688e2cad5fa0631735336cc423"
 }