@abtnode/core 1.16.0 → 1.16.1-beta-cd775909

package/lib/blocklet/manager/helper/migrate-application-to-struct-v2.js

@@ -6,7 +6,7 @@ const Client = require('@ocap/client');
 
 const logger = require('@abtnode/logger')('@abtnode/core:migrate-application-to-struct-v2');
 
-const { forEachBlockletSync, forEachChildSync, getSharedConfigObj, getChainInfo } = require('@blocklet/meta/lib/util');
+const { forEachBlockletSync, getSharedConfigObj, getBlockletChainInfo } = require('@blocklet/meta/lib/util');
 const { SLOT_FOR_IP_DNS_SITE } = require('@abtnode/constant');
 
 const {
@@ -92,28 +92,7 @@ const fillBlockletData = (data, app, id) => {
 const appSystemFiles = ['logo.svg', 'rbac.db', 'session.db', 'user.db', '.assets', BLOCKLET_UPLOADS_DIR];
 
 const getChainHost = (blocklet) => {
-  if (!blocklet) {
-    return 'none';
-  }
-
-  const chainInfo = getChainInfo(blocklet.configObj);
-  if (chainInfo.host !== 'none') {
-    return chainInfo.host;
-  }
-
-  let childChainHost;
-  forEachChildSync(blocklet, (b) => {
-    if (childChainHost) {
-      return;
-    }
-
-    const childChainInfo = getChainInfo(b.configObj);
-    if (childChainInfo.host !== 'none') {
-      childChainHost = childChainInfo.host;
-    }
-  });
-
-  return childChainHost || 'none';
+  return getBlockletChainInfo(blocklet).host;
 };
 
 const migrateAppOnChain = async (blocklet, oldSk, newSk) => {

package/lib/util/blocklet.js

@@ -19,13 +19,13 @@ const semver = require('semver');
 const axios = require('@abtnode/util/lib/axios');
 const { stableStringify } = require('@arcblock/vc');
 
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
+const { fromSecretKey } = require('@ocap/wallet');
 const { toHex, toBase58, isHex, toDid } = require('@ocap/util');
-const { types } = require('@ocap/mcrypto');
 const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
 const sleep = require('@abtnode/util/lib/sleep');
+const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const { formatEnv } = require('@abtnode/util/lib/security');
 const ensureEndpointHealthy = require('@abtnode/util/lib/ensure-endpoint-healthy');
 const CustomError = require('@abtnode/util/lib/custom-error');
@@ -1508,12 +1508,7 @@ const consumeServerlessNFT = async ({ nftId, nodeInfo, blocklet }) => {
       throw new Error(`get nft state failed, chainHost: ${blocklet.controller.chainHost}, nftId: ${nftId}`);
     }
 
-    const type = WalletType({
-      role: types.RoleType.ROLE_APPLICATION,
-      pk: types.KeyType.ED25519,
-      hash: types.HashType.SHA3,
-    });
-    const wallet = fromSecretKey(nodeInfo.sk, type);
+    const wallet = getNodeWallet(nodeInfo.sk);
     const appURL = blocklet.environments.find((item) => item.key === 'BLOCKLET_APP_URL').value;
 
     const body = { nftId, appURL };

package/lib/util/store.js

@@ -5,6 +5,7 @@ const isBase64 = require('is-base64');
 const { BLOCKLET_STORE_API_PREFIX, BLOCKLET_STORE_META_PATH } = require('@abtnode/constant');
 const { validateMeta, fixAndValidateService } = require('@blocklet/meta/lib/validate');
 const verifyMultiSig = require('@blocklet/meta/lib/verify-multi-sig');
+const isRequirementsSatisfied = require('./requirement');
 
 const { name } = require('../../package.json');
 const logger = require('@abtnode/logger')(`${name}:util:registry`); // eslint-disable-line
@@ -14,6 +15,8 @@ const request = require('./request');
 const fixAndVerifyMetaFromStore = (meta) => {
   const sanitized = validateMeta(meta, { ensureDist: false, schemaOptions: { noDefaults: true, stripUnknown: true } });
 
+  isRequirementsSatisfied(meta.requirements);
+
   if (meta.children) {
     sanitized.children = meta.children;
     delete sanitized.components;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0",
+  "version": "1.16.1-beta-cd775909",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0",
-    "@abtnode/certificate-manager": "1.16.0",
-    "@abtnode/constant": "1.16.0",
-    "@abtnode/cron": "1.16.0",
-    "@abtnode/db": "1.16.0",
-    "@abtnode/logger": "1.16.0",
-    "@abtnode/queue": "1.16.0",
-    "@abtnode/rbac": "1.16.0",
-    "@abtnode/router-provider": "1.16.0",
-    "@abtnode/static-server": "1.16.0",
-    "@abtnode/timemachine": "1.16.0",
-    "@abtnode/util": "1.16.0",
+    "@abtnode/auth": "1.16.1-beta-cd775909",
+    "@abtnode/certificate-manager": "1.16.1-beta-cd775909",
+    "@abtnode/constant": "1.16.1-beta-cd775909",
+    "@abtnode/cron": "1.16.1-beta-cd775909",
+    "@abtnode/db": "1.16.1-beta-cd775909",
+    "@abtnode/logger": "1.16.1-beta-cd775909",
+    "@abtnode/queue": "1.16.1-beta-cd775909",
+    "@abtnode/rbac": "1.16.1-beta-cd775909",
+    "@abtnode/router-provider": "1.16.1-beta-cd775909",
+    "@abtnode/static-server": "1.16.1-beta-cd775909",
+    "@abtnode/timemachine": "1.16.1-beta-cd775909",
+    "@abtnode/util": "1.16.1-beta-cd775909",
     "@arcblock/did": "1.18.65",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.65",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.65",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.65",
-    "@blocklet/constant": "1.16.0",
-    "@blocklet/meta": "1.16.0",
-    "@blocklet/sdk": "1.16.0",
+    "@blocklet/constant": "1.16.1-beta-cd775909",
+    "@blocklet/meta": "1.16.1-beta-cd775909",
+    "@blocklet/sdk": "1.16.1-beta-cd775909",
     "@did-space/client": "^0.2.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.65",
@@ -91,5 +91,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "da461546c6db9c7d347689708af27654c17ac28e"
+  "gitHead": "9fd68e48cd87d5d8feafcf37dac1b586c1dccd8f"
 }