@blocklet/meta 1.8.14 → 1.8.17

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

@@ -140,7 +140,7 @@ const _getComponents = async (inputMeta, context = {}) => {
  *   id: string
  *   pk: string
  *   url: string
- *   componentDids: Array<string>
+ *   components: Array<{did: string, version: string}>
  * }} Store
  * @param {Array<Component>} components
  * @param {Array<Store>} _stores
@@ -151,9 +151,14 @@ const _getStores = (components, _stores = []) => {
     if (storeInfo && (!isFreeBlocklet(meta) || !isFreeComponent(meta))) {
       const store = _stores.find((x) => x.id === storeInfo.id);
       if (!store) {
-        _stores.push({ id: storeInfo.id, pk: storeInfo.pk, url: storeUrl, componentDids: new Set([meta.did]) });
-      } else {
-        store.componentDids.add(meta.did);
+        _stores.push({
+          id: storeInfo.id,
+          pk: storeInfo.pk,
+          url: storeUrl,
+          components: [{ did: meta.did, version: meta.version }],
+        });
+      } else if (!store.components.some((x) => x.did === meta.did && x.version === meta.version)) {
+        store.components.push({ did: meta.did, version: meta.version });
       }
     }
 
@@ -162,7 +167,7 @@ const _getStores = (components, _stores = []) => {
     }
   }
 
-  return _stores.map((x) => ({ ...x, componentDids: [...x.componentDids] }));
+  return _stores;
 };
 
 const getComponents = async (inputMeta) => {
@@ -260,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),
     });
@@ -291,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,
+  };
 };
 
 /**
@@ -306,12 +322,15 @@ const getContract = async ({ meta, priceTokens, components }) => {
  *       did: string
  *       url: string
  *       name: string
- *       paymentVersion: string
+ *       version: string
+ *       payment: {
+ *         version: string
+ *       }
  *       stores: Array<{
  *         signer: string
  *         pk: string
  *         signature: string
- *         componentDids: Array<string>
+ *         components: Array<{did: string, version: string}>
  *         paymentIntegrity: string
  *       }>
  *     }
@@ -342,8 +361,11 @@ const _createNftFactoryItx = ({ meta, issuers, serviceUrl, storeSignatures, fact
         did: meta.did,
         url: joinURL(serviceUrl, `/blocklet/${meta.did}`),
         name: meta.name,
-        paymentVersion: VERSION,
-        stores: storeSignatures.map((x) => pick(x, ['signer', 'pk', 'signature', 'componentDids', 'paymentIntegrity'])),
+        version: meta.version,
+        payment: {
+          version: VERSION,
+        },
+        stores: storeSignatures.map((x) => pick(x, ['signer', 'pk', 'signature', 'components', 'paymentIntegrity'])),
       },
     },
     hooks: [
@@ -377,24 +399,24 @@ const getFactoryInput = (inputTokens, { formatToken = true } = {}) => {
   };
 };
 
-const getPaymentIntegrity = async ({ contract, factoryInput, componentDids, meta, client, storeId }) => {
-  if (!contract && !factoryInput && !componentDids) {
+const getPaymentIntegrity = async ({ contract, factoryInput, storeComponents, meta, client, storeId }) => {
+  if (!contract && !factoryInput && !storeComponents) {
     const priceTokens = await getPriceTokens(meta, client);
     const { components, stores } = await getComponents(meta);
     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
-    componentDids = store?.componentDids || [];
+    storeComponents = store?.components || [];
   }
 
   const paymentData = {
     factoryInput,
     contract,
-    componentDids: componentDids || [],
+    components: storeComponents || [],
   };
 
   const integrity = md5(stableStringify(paymentData));
@@ -402,15 +424,12 @@ const getPaymentIntegrity = async ({ contract, factoryInput, componentDids, meta
   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, componentDids } = store;
+    const { id, url, pk, components: storeComponents } = store;
 
-    const paymentIntegrity = await getPaymentIntegrity({ factoryInput, contract, componentDids });
+    const paymentIntegrity = await getPaymentIntegrity({ factoryInput, contract, storeComponents });
 
     /**
      * protocol: /api/payment/signature
@@ -448,7 +467,7 @@ const getStoreSignatures = async ({ meta, client, priceTokens, components, store
       signer: res.signer,
       pk: res.pk,
       signature: res.signature,
-      componentDids,
+      components: storeComponents,
       paymentIntegrity,
       storeUrl: url,
     });
@@ -456,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,
@@ -472,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 {
@@ -499,6 +533,7 @@ const createNftFactoryItx = async ({ blockletMeta, ocapClient, issuers, storeUrl
       contract,
     }),
     stores: storeSignatures.map((x) => ({ id: x.signer, url: x.storeUrl })),
+    shares,
   };
 };
 
@@ -532,7 +567,7 @@ const verifyPaymentIntegrity = async ({ integrity: expected, blockletMeta, ocapC
  * }}
  *
  * @returns {{
- *   componentDids: Array<string>
+ *   components: Array<{did: string, version: string}>
  * }}
  */
 const verifyNftFactory = async ({ factoryState, signerWallet }) => {
@@ -547,7 +582,7 @@ const verifyNftFactory = async ({ factoryState, signerWallet }) => {
   }
 
   const c = factoryState.hooks.find((x) => x.type === 'contract');
-  const { componentDids } = store;
+  const { components } = store;
 
   // Token 的字段和 factory 中的字段不一致
   const factoryInput = getFactoryInput(
@@ -558,15 +593,15 @@ const verifyNftFactory = async ({ factoryState, signerWallet }) => {
   const integrity = await getPaymentIntegrity({
     contract: c.hook,
     factoryInput,
-    componentDids,
+    storeComponents: components,
   });
 
   if (signerWallet.sign(integrity) !== store.signature) {
-    debug(store, factoryInput, integrity, componentDids, c.hook);
+    debug(store, factoryInput, integrity, components, c.hook);
     throw new Error(`verify nft factory failed: ${factoryState.address}`);
   }
 
-  return { componentDids };
+  return { components };
 };
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.14",
+  "version": "1.8.17",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "lib/index.js",
   "files": [
@@ -18,16 +18,16 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.14",
-    "@abtnode/util": "1.8.14",
-    "@arcblock/did": "1.17.17",
-    "@arcblock/did-ext": "1.17.17",
-    "@arcblock/did-util": "1.17.17",
-    "@arcblock/jwt": "1.17.17",
-    "@ocap/asset": "1.17.17",
-    "@ocap/mcrypto": "1.17.17",
-    "@ocap/util": "1.17.17",
-    "@ocap/wallet": "1.17.17",
+    "@abtnode/constant": "1.8.17",
+    "@abtnode/util": "1.8.17",
+    "@arcblock/did": "1.17.19",
+    "@arcblock/did-ext": "1.17.19",
+    "@arcblock/did-util": "1.17.19",
+    "@arcblock/jwt": "1.17.19",
+    "@ocap/asset": "1.17.19",
+    "@ocap/mcrypto": "1.17.19",
+    "@ocap/util": "1.17.19",
+    "@ocap/wallet": "1.17.19",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -53,5 +53,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "4b0cee41fd03d09301e2c35af46dd9e513473ef8"
+  "gitHead": "aa1854b3b71a6250182bfcad794235099f38a514"
 }