@blocklet/meta 1.8.19 → 1.8.21

package/lib/constants.js

@@ -80,7 +80,6 @@ const BlockletEvents = Object.freeze({
   upgradeFailed: 'blocklet.upgradedFailed',
   downgraded: 'blocklet.downgraded',
   downgradeFailed: 'blocklet.downgradedFailed',
-  deployed: 'blocklet.deployed',
   updated: 'blocklet.updated',
   statusChange: 'blocklet.statusChange',
   removed: 'blocklet.removed',

package/lib/payment/v2.js

@@ -2,7 +2,7 @@
 const crypto = require('crypto');
 const debug = require('debug')('@blocklet/meta:payment');
 const joinURL = require('url-join');
-const axios = require('axios');
+const axios = require('axios').create();
 const stableStringify = require('json-stable-stringify');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
@@ -243,7 +243,9 @@ const getTokenTransfers = ({ priceToken, shares = [], components = [] }) => {
       const [token] = child.meta.payment.price || [];
       if (token && token.address !== priceToken.address) {
         throw new Error(
-          `component price token is not same with app price token: ${child.meta.title || child.meta.name}`
+          `The token address of the component "${
+            child.meta.title || child.meta.name
+          }" is inconsistent with the blocklet. Component: ${priceToken.address}, Composite Blocklet: ${token.address}`
         );
       }
 
@@ -251,10 +253,6 @@ const getTokenTransfers = ({ priceToken, shares = [], components = [] }) => {
 
       parentShareBN = parentShareBN.sub(fromTokenToUnit(childShare, priceToken.decimal));
 
-      if (parentShareBN.lt(ZeroBN)) {
-        throw new Error('Price is not enough for component sharing');
-      }
-
       const componentContracts = getTokenTransfers({
         priceToken: { ...priceToken, value: childShare },
         shares: child.meta.payment.share,
@@ -265,6 +263,13 @@ const getTokenTransfers = ({ priceToken, shares = [], components = [] }) => {
     }
   }
 
+  if (parentShareBN.lt(ZeroBN)) {
+    const needPrice = fromUnitToToken(fromTokenToUnit(price, priceToken.decimal).sub(parentShareBN));
+    throw new Error(
+      `Price for composite blocklet must be greater than ${needPrice} because paid components are included.`
+    );
+  }
+
   shares.forEach(({ name, address: accountAddress, value: ratio }) => {
     contracts.push({
       tokenAddress: priceToken.address,
@@ -604,10 +609,43 @@ const verifyNftFactory = async ({ factoryState, signerWallet }) => {
   return { components };
 };
 
+/**
+ * Check blocklet and all of components are free
+ * Throw Error if not free
+ *
+ * @param {BlockletMeta} meta
+ */
+const checkFreeBlocklet = async (blockletMeta) => {
+  if (!isFreeBlocklet(blockletMeta)) {
+    return Promise.reject(new Error('blocklet is not free'));
+  }
+
+  const { components } = await getComponents(blockletMeta);
+
+  const shouldAllComponentFree = (arr) => {
+    arr.forEach(({ meta, children }) => {
+      if (!isFreeBlocklet(meta) || !isFreeComponent(meta)) {
+        // throw new Error(`Found paid component "${meta.title || meta.name}" in free blocklet`);
+        throw new Error(
+          `Paid component "${meta.title || meta.name}" found in free blocklet "${
+            blockletMeta.title || blockletMeta.name
+          }", which is forbidden`
+        );
+      }
+      shouldAllComponentFree(children || []);
+    });
+  };
+
+  shouldAllComponentFree(components);
+
+  return true;
+};
+
 module.exports = {
   createNftFactoryItx,
   verifyPaymentIntegrity,
   verifyNftFactory,
+  checkFreeBlocklet,
   version: VERSION,
   _test: {
     getPriceTokens,

package/lib/schema.js

@@ -71,7 +71,6 @@ const scriptsSchema = Joi.object({
   e2eDev: Joi.string().trim().min(1),
   preInstall: Joi.string().trim().min(1),
   postInstall: Joi.string().trim().min(1),
-  preDeploy: Joi.string().trim().min(1),
   preStart: Joi.string().trim().min(1),
   postStart: Joi.string().trim().min(1),
   preStop: Joi.string().trim().min(1),
@@ -80,7 +79,6 @@ const scriptsSchema = Joi.object({
 })
   .rename('pre-install', 'preInstall')
   .rename('post-install', 'postInstall')
-  .rename('pre-deploy', 'preDeploy')
   .rename('pre-start', 'preStart')
   .rename('post-start', 'postStart')
   .rename('pre-stop', 'preStop')

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.19",
+  "version": "1.8.21",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,8 +18,8 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.19",
-    "@abtnode/util": "1.8.19",
+    "@abtnode/constant": "1.8.21",
+    "@abtnode/util": "1.8.21",
     "@arcblock/did": "1.17.19",
     "@arcblock/did-ext": "1.17.19",
     "@arcblock/did-util": "1.17.19",
@@ -53,5 +53,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "19d3e21ad3658e79a3ec60394d6c77793af7deb3"
+  "gitHead": "f990cddd5ef18ece7ada5d7573b8e0652d74abdc"
 }