@blocklet/meta 1.8.15 → 1.8.16

package/lib/info.js

@@ -12,17 +12,20 @@ module.exports = (state, nodeSk, { returnWallet = true } = {}) => {
 
   const customDescription = envs.find((x) => x.key === 'BLOCKLET_APP_DESCRIPTION');
   const customPassportColor = envs.find((x) => x.key === 'BLOCKLET_PASSPORT_COLOR');
+  const customAppUrl = envs.find((x) => x.key === 'BLOCKLET_APP_URL');
 
   const { did } = state.meta;
   const name = getDisplayName(state);
   const description = get(customDescription, 'value', state.meta.description);
   const passportColor = get(customPassportColor, 'value', 'auto');
+  const appUrl = get(customAppUrl, 'value', '');
 
   if (!returnWallet) {
     return {
       did,
       name,
       description,
+      appUrl,
     };
   }
 
@@ -54,6 +57,7 @@ module.exports = (state, nodeSk, { returnWallet = true } = {}) => {
     name,
     description,
     passportColor,
+    appUrl,
     wallet,
   };
 };

package/lib/parse-navigation.js

@@ -140,7 +140,7 @@ const doParseNavigation = (navigation, blocklet, prefix = '/', _level = 1) => {
           }
 
           if (childNav.role) {
-            item.role = item.icon || childNav.role;
+            item.role = item.role || childNav.role;
           }
 
           if (childNav.section) {

package/lib/payment/v2.js

@@ -265,9 +265,10 @@ const getTokenTransfers = ({ priceToken, shares = [], components = [] }) => {
     }
   }
 
-  shares.forEach(({ address: accountAddress, value: ratio }) => {
+  shares.forEach(({ name, address: accountAddress, value: ratio }) => {
     contracts.push({
       tokenAddress: priceToken.address,
+      accountName: name,
       accountAddress,
       amount: parentShareBN.mul(new BN(ratio * defaultDecimals)).div(defaultDecimalsBN),
     });
@@ -296,9 +297,19 @@ const getContract = async ({ meta, priceTokens, components }) => {
 
   const contracts = getTokenTransfers({ priceToken, shares, components });
 
-  return contracts
+  const code = contracts
     .map((x) => `transferToken('${x.tokenAddress}','${x.accountAddress}','${x.amount.toString()}')`)
     .join(';\n');
+
+  const shareList = contracts.map((x) => ({
+    ...x,
+    amount: fromUnitToToken(x.amount, priceToken.decimal),
+  }));
+
+  return {
+    code,
+    shares: shareList,
+  };
 };
 
 /**
@@ -395,7 +406,7 @@ const getPaymentIntegrity = async ({ contract, factoryInput, storeComponents, me
     const store = stores.find((x) => x.id === storeId);
 
     // eslint-disable-next-line no-param-reassign
-    contract = await getContract({ meta, components, priceTokens });
+    contract = (await getContract({ meta, components, priceTokens })).code;
     // eslint-disable-next-line no-param-reassign
     factoryInput = await getFactoryInput(priceTokens);
     // eslint-disable-next-line no-param-reassign
@@ -413,10 +424,7 @@ const getPaymentIntegrity = async ({ contract, factoryInput, storeComponents, me
   return integrity;
 };
 
-const getStoreSignatures = async ({ meta, client, priceTokens, components, stores }) => {
-  const factoryInput = getFactoryInput(priceTokens);
-  const contract = await getContract({ meta, client, priceTokens, components });
-
+const getStoreSignatures = async ({ meta, stores, factoryInput, contract }) => {
   const storeSignatures = [];
   for (const store of stores) {
     const { id, url, pk, components: storeComponents } = store;
@@ -467,13 +475,12 @@ const getStoreSignatures = async ({ meta, client, priceTokens, components, store
 
   return {
     storeSignatures,
-    factoryInput,
-    contract,
   };
 };
 
 /**
  * Used by CLI and Store to independent compute factory itx
+ *
  * @param {{
  *   blockletMeta: BlockletMeta,
  *   ocapClient: OcapClient,
@@ -483,18 +490,34 @@ const getStoreSignatures = async ({ meta, client, priceTokens, components, store
  * @returns {{
  *   itx: Itx
  *   store: Array<{id, url}>
+ *   shares: Array<{
+ *     accountName: string
+ *     accountAddress: DID
+ *     tokenAddress: DID
+ *     amount: string|number,
+ *   }>
  * }}
  */
 const createNftFactoryItx = async ({ blockletMeta, ocapClient, issuers, storeUrl }) => {
   const priceTokens = await getPriceTokens(blockletMeta, ocapClient);
   const { components, stores } = await getComponents(blockletMeta);
 
-  const { factoryInput, contract, storeSignatures } = await getStoreSignatures({
+  const factoryInput = getFactoryInput(priceTokens);
+  const { code: contract, shares } = await getContract({
+    meta: blockletMeta,
+    client: ocapClient,
+    priceTokens,
+    components,
+  });
+
+  const { storeSignatures } = await getStoreSignatures({
     meta: blockletMeta,
     client: ocapClient,
     priceTokens,
     components,
     stores,
+    factoryInput,
+    contract,
   });
 
   return {
@@ -510,6 +533,7 @@ const createNftFactoryItx = async ({ blockletMeta, ocapClient, issuers, storeUrl
       contract,
     }),
     stores: storeSignatures.map((x) => ({ id: x.signer, url: x.storeUrl })),
+    shares,
   };
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.15",
+  "version": "1.8.16",
   "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.15",
-    "@abtnode/util": "1.8.15",
+    "@abtnode/constant": "1.8.16",
+    "@abtnode/util": "1.8.16",
     "@arcblock/did": "1.17.17",
     "@arcblock/did-ext": "1.17.17",
     "@arcblock/did-util": "1.17.17",
@@ -53,5 +53,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "57106db1b559b906734df5b8eac7ce87cae72980"
+  "gitHead": "2605cf6ebf2a0c3bb5524cb0f1385ad565fd85d6"
 }