@abtnode/core 1.16.24-beta-3d2e25fd → 1.16.24-beta-08e03567

package/lib/blocklet/downloader/resolve-download.js

@@ -9,6 +9,7 @@ const defaultLogger = require('@abtnode/logger')('@abtnode/core:resolve-download
 const { getBlockletMeta } = require('../../util');
 
 const { ensureBlockletExpanded, expandTarball, getBundleDir } = require('../../util/blocklet');
+const { installExternalDependencies } = require('../../util/install-external-dependencies');
 
 const asyncFs = fs.promises;
 
@@ -76,6 +77,8 @@ const resolveDownload = async (tarFile, dist, { removeTarFile = true, logger = d
     fs.mkdirSync(installDir, { recursive: true });
 
     await fs.move(downloadDir, installDir, { overwrite: true });
+
+    installExternalDependencies(installDir);
   } catch (error) {
     fs.removeSync(downloadDir);
     fs.removeSync(tmp);
@@ -142,6 +145,8 @@ const resolveDiffDownload = async (
     logger.info('Move downloadDir to installDir', { downloadDir, bundleDir });
     await fs.move(downloadDir, bundleDir, { overwrite: true });
 
+    installExternalDependencies(bundleDir);
+
     return { meta, installDir: bundleDir };
   } catch (error) {
     fs.removeSync(downloadDir);

package/lib/blocklet/manager/disk.js

@@ -220,6 +220,40 @@ const pm2StatusMap = {
  */
 const getBlockletEngineNameByPlatform = (blockletMeta) => getBlockletEngine(blockletMeta).interpreter;
 
+const getWalletAppNotification = async (blocklet, tempBlockletInfo) => {
+  let blockletInfo = tempBlockletInfo;
+  if (!blockletInfo) {
+    const nodeInfo = await states.node.read();
+    blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+  }
+
+  return {
+    actions: [
+      {
+        name: 'Visit',
+        link: blockletInfo.appUrl,
+      },
+    ],
+    attachments: [
+      {
+        type: 'dapp',
+        data: {
+          url: blockletInfo.appUrl,
+          appDID: blocklet.appPid,
+          logo:
+            blocklet.environmentObj.BLOCKLET_APP_LOGO ||
+            joinUrl(
+              blockletInfo.appUrl,
+              normalizePathPrefix(joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo')) || '/'
+            ),
+          title: blockletInfo.name,
+          desc: blockletInfo.description,
+        },
+      },
+    ],
+  };
+};
+
 class DiskBlockletManager extends BaseBlockletManager {
   constructor({
     dataDirs,
@@ -711,7 +745,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         blocklet1.meta.title
       }: ${error.message}`;
       this._createNotification(did, {
-        title: '',
+        title: 'Component start failed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -793,7 +827,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
 
       this._createNotification(did, {
-        title: '',
+        title: 'Component stop succeed',
         description: `${
           componentDids?.length ? getComponentNamesWithVersion(blocklet, componentDids) : 'All components'
         } is successfully stopped for ${blocklet.meta.title}.`,
@@ -891,7 +925,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         result.meta.title
       }: ${err.message || 'queue exception'}`;
       this._createNotification(did, {
-        title: '',
+        title: 'Component restart failed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -1106,7 +1140,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context: { ...context, createAuditLog: false } }); // trigger router refresh
 
     this._createNotification(newBlocklet.meta.did, {
-      title: '',
+      title: 'Component delete succeed',
       description: `${child.meta.title} is successfully deleted for ${newBlocklet.meta.title}.`,
       entityType: 'blocklet',
       entityId: newBlocklet.meta.did,
@@ -1434,6 +1468,45 @@ class DiskBlockletManager extends BaseBlockletManager {
 
         this.configSynchronizer.syncComponentConfig(childDid, rootDid, { serverSk });
       }
+
+      try {
+        const observableConfigs = [
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT,
+          BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
+        ];
+
+        const shouldSendWalletNotification = observableConfigs.some((x) => newConfigs.some((y) => y.key === x));
+        const receiverUsers = await this.teamManager.getOwnerAndAdminUsers(newState.appPid, 1);
+        const receiver = receiverUsers.map((x) => x.did);
+
+        if (shouldSendWalletNotification && receiver) {
+          const nodeInfo = await states.node.read();
+          const blockletInfo = getBlockletInfo(newState, nodeInfo.sk);
+          const walletExtra = await getWalletAppNotification(newState, blockletInfo);
+
+          const notification = {
+            receiver,
+            teamDid: newState.appPid,
+            title: 'Blocklet Config Changed',
+            description: `Blocklet ${blockletInfo.name} config changed`,
+            action: `/blocklets/${did}/overview`,
+            entityType: 'blocklet',
+            entityId: newState.appPid,
+            severity: 'success',
+            blockletUrl: blockletInfo.appUrl,
+            extra: { wallet: walletExtra },
+          };
+
+          await this.teamManager.createNotification(notification);
+        }
+      } catch (error) {
+        logger.error('Failed to send wallet notification after updated config', { did, error });
+      }
     }
 
     return newState;
@@ -2302,7 +2375,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         },
       });
       this._createNotification(did, {
-        title: '',
+        title: 'Component download failed',
         description: `${childrenToDownload
           .map((x) => `${x.meta.title}@${x.meta.version}`)
           .join(', ')} download failed for ${title}: ${err.message}`,
@@ -2466,7 +2539,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         ? `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${blocklet.meta.title}.`
         : `${blocklet.meta.title} is successfully started`;
       this._createNotification(did, {
-        title: '',
+        title: 'Component start succeed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -2492,7 +2565,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         : `${blocklet.meta.title} start failed: ${error.message}`;
 
       this._createNotification(did, {
-        title: '',
+        title: 'Component start failed',
         description,
         entityType: 'blocklet',
         entityId: did,
@@ -2814,7 +2887,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     users,
   }) {
     this._createNotification(did, {
-      title: '',
+      title: title.en,
       description: description.en,
       entityType: 'blocklet',
       entityId: did,
@@ -3221,16 +3294,25 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
 
       if (createNotification) {
-        this._createNotification(did, {
-          title: 'Blocklet Installed',
-          description: `Blocklet ${meta.title} is installed successfully. (Source: ${
-            deployedFrom || fromBlockletSource(source)
-          })`,
-          action: `/blocklets/${did}/overview`,
-          entityType: 'blocklet',
-          entityId: did,
-          severity: 'success',
-        });
+        // 发送通知不阻塞后续安装流程
+        try {
+          const walletExtra = await getWalletAppNotification(blocklet);
+
+          this._createNotification(did, {
+            title: 'Blocklet Installed',
+            description: `Blocklet ${meta.title} is installed successfully. (Source: ${
+              deployedFrom || fromBlockletSource(source)
+            })`,
+            action: `/blocklets/${did}/overview`,
+            entityType: 'blocklet',
+            entityId: did,
+            severity: 'success',
+            receiver: blocklet?.controller?.nftOwner,
+            extra: { wallet: walletExtra },
+          });
+        } catch (error) {
+          logger.error('create installed notification failed', { error, did });
+        }
       }
 
       await this._rollbackCache.remove({ did: blocklet.meta.did });
@@ -3384,7 +3466,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         this.emit(notificationEvent, { ...blocklet, componentDids, context });
 
         this._createNotification(did, {
-          title: '',
+          title: `Component ${actionName} succeed`,
           description: `${getComponentNamesWithVersion(
             newBlocklet,
             componentDids
@@ -3440,7 +3522,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       });
 
       this._createNotification(did, {
-        title: '',
+        title: `Component ${actionName} failed`,
         description: `${getComponentNamesWithVersion(newBlocklet, componentDids)} ${actionName} failed for ${title}: ${
           err.message
         }.`,
@@ -3730,13 +3812,15 @@ class DiskBlockletManager extends BaseBlockletManager {
           }${WELLKNOWN_BLOCKLET_ADMIN_PATH}`;
         }
       } catch (error) {
-        logger.error('[_createNotification] get blocklet url failed', { error });
+        logger.error('[_createNotification] get blocklet url failed', { did, error });
       }
 
       // if blocklet is external, no need to create notification in server
       const extra = await states.blockletExtras.getMeta(did);
       const isExternal = !!extra?.controller;
-      if (!isExternal) {
+
+      // 如果指定了 receiver, 或者是内部 blocklet, 则创建 notification
+      if (notification.receiver || !isExternal) {
         await states.notification.create({ ...notification, blockletUrl });
       }
       await this.teamManager.createNotification({
@@ -3746,7 +3830,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         blockletUrl,
       });
     } catch (error) {
-      logger.error('create notification failed', { error });
+      logger.error('create notification failed', { did, error });
     }
   }
 

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -196,7 +196,7 @@ const installComponentFromUrl = async ({
     });
 
     manager._createNotification(rootDid, {
-      title: '',
+      title: `Component ${actionName} failed`,
       description: `${getComponentNamesWithVersion(newBlocklet, componentDids)} ${actionName} failed for ${
         newBlocklet.meta.title
       }: ${err.message || 'queue exception'}.`,

package/lib/blocklet/manager/helper/upgrade-components.js

@@ -151,7 +151,7 @@ const upgrade = async ({ updateId, componentDids, context, states, manager }) =>
     });
 
     manager._createNotification(did, {
-      title: '',
+      title: 'Component upgrade failed',
       description: `${getComponentNamesWithVersion(oldBlocklet, componentDids)} upgrade failed for ${
         oldBlocklet.meta.title
       }: ${err.message || 'queue exception'}.`,

package/lib/event/index.js

@@ -13,6 +13,7 @@ const {
   BLOCKLET_CONFIGURABLE_KEY,
 } = require('@blocklet/constant');
 const { EVENTS, BACKUPS } = require('@abtnode/constant');
+
 const { NodeMonitSender } = require('../monitor/node-monit-sender');
 const handleInstanceInStore = require('../util/public-to-store');
 const { isCLI } = require('../util');
@@ -66,7 +67,7 @@ module.exports = ({
   };
 
   // Listen events from eventHub and call eventHandler
-  [...Object.values(BlockletEvents), ...Object.values(EVENTS)].forEach((name) => {
+  [...Object.values(BlockletEvents), ...Object.values(TeamEvents), ...Object.values(EVENTS)].forEach((name) => {
     eventHub.on(name, (data) => {
       if (name === BlockletEvents.removed) {
         // Cleanup cache in teamManager for every node instance
@@ -145,6 +146,7 @@ module.exports = ({
       }
 
       await teamAPI.refreshBlockletInterfacePermissions(blocklet.meta);
+      logger.info('refreshed blocklet interface permissions after installed', { did: blocklet.meta.did });
     } catch (error) {
       logger.error('create.url.mapping.error', { event: name, error });
       notificationState.create({

package/lib/monitor/blocklet-runtime-monitor.js

@@ -154,7 +154,7 @@ class BlockletRuntimeMonitor extends EventEmitter {
 
   async monitAll() {
     if (this.inProgress) {
-      this.logger.error('monitoring is in progress');
+      this.logger.debug('monitoring is in progress');
       return;
     }
 

package/lib/monitor/node-runtime-monitor.js

@@ -105,7 +105,7 @@ class NodeRuntimeMonitor extends EventEmitter {
 
   async monit() {
     if (this.inProgress) {
-      this.logger.error('monitoring is in progress');
+      this.logger.debug('monitoring is in progress');
       return;
     }
 

package/lib/team/manager.js

@@ -137,11 +137,11 @@ class TeamManager extends EventEmitter {
     return this.getState(teamDid, 'notification');
   }
 
-  async createNotification({ teamDid, ...payload }) {
+  async createNotification({ teamDid, receiver, ...payload }) {
     const notification = await this.getState(teamDid, 'notification');
     const doc = await notification.create({ ...payload, teamDid });
     const metaDid = await this.states.blocklet.getBlockletMetaDid(teamDid);
-    this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, { meta: { did: metaDid }, ...payload, ...doc, teamDid });
+    this.emit(EVENTS.NOTIFICATION_BLOCKLET_CREATE, { meta: { did: metaDid }, ...payload, ...doc, teamDid, receiver });
   }
 
   async getProjectState(teamDid) {

package/lib/util/blocklet.js

@@ -106,7 +106,6 @@ const { validate: validateEngine, get: getEngine } = require('../blocklet/manage
 const isRequirementsSatisfied = require('./requirement');
 const { getDidDomainForBlocklet } = require('./get-domain-for-blocklet');
 const { expandBundle, findInterfacePortByName, prettyURL, templateReplace, getServerDidDomain } = require('./index');
-const { installExternalDependencies } = require('./install-external-dependencies');
 
 /**
  * get blocklet engine info, default is node
@@ -565,9 +564,6 @@ const startBlockletProcess = async (
       const env = getRuntimeEnvironments(b, nodeEnvironments, ancestors);
       const startedAt = Date.now();
 
-      // install external dependencies
-      await Promise.resolve(installExternalDependencies(b, { env }));
-
       // run hook
       await preFlight(b, { env });
 

package/lib/util/install-external-dependencies.js

@@ -2,27 +2,38 @@ const { spawnSync } = require('child_process');
 const fs = require('fs-extra');
 const path = require('path');
 
-function installExternalDependencies(blocklet, { env }) {
-  if (!env.BLOCKLET_APP_DIR) {
-    throw new Error('BLOCKLET_APP_DIR is required');
+function installExternalDependencies(appDir) {
+  if (!appDir) {
+    throw new Error('appDir is required');
+  }
+  if (!fs.existsSync(appDir)) {
+    throw new Error(`not a correct appDir directory: ${appDir}`);
   }
 
   // 读取 BLOCKLET_APP_DIR 的 package.json
-  const packageJsonPath = path.resolve(env.BLOCKLET_APP_DIR, 'package.json');
+  const packageJsonPath = path.resolve(appDir, 'package.json');
+
   if (!fs.existsSync(packageJsonPath)) {
     return;
   }
 
   const packageJson = fs.readJsonSync(packageJsonPath);
 
-  if (!packageJson.externalManager) {
+  // FIXME: 梁柱, 等未来所有的 blocklet 使用了正式版, 废弃 singleExternals
+  const { singleExternals, blockletExternalDependencies } = packageJson;
+  const externals = singleExternals || blockletExternalDependencies;
+  if (!externals || !externals?.length) {
     return;
   }
 
-  const result = spawnSync(packageJson.externalManager, ['install'], {
-    cwd: env.BLOCKLET_APP_DIR,
+  const result = spawnSync('npm', ['install'], {
+    cwd: appDir,
     stdio: 'pipe',
     shell: true,
+    env: {
+      ...process.env,
+      NODE_ENV: 'production',
+    },
   });
 
   if (result.status !== 0 && result.stderr && result.stderr.toString().trim()) {

package/lib/webhook/index.js

@@ -1,8 +1,9 @@
 const logger = require('@abtnode/logger')('@abtnode/core:webhook:index');
-
 const { evaluateURLs } = require('@abtnode/util/lib/url-evaluation');
 const checkURLAccessible = require('@abtnode/util/lib/url-evaluation/check-accessible-node');
 const { EVENTS } = require('@abtnode/constant');
+const isEmpty = require('lodash/isEmpty');
+
 const WebHookSender = require('./sender');
 const WalletSender = require('./sender/wallet');
 const createQueue = require('../util/queue');
@@ -78,7 +79,7 @@ module.exports = ({ events, dataDirs, instance }) => {
   const webhookState = states.webhook;
   const notification = states.notification; // eslint-disable-line
 
-  const sendMessage = async (message) => {
+  const sendMessage = async ({ extra, ...message } = {}) => {
     try {
       const webhookList = await webhookState.list();
       const nodeInfo = await nodeState.read();
@@ -98,7 +99,7 @@ module.exports = ({ events, dataDirs, instance }) => {
             const senderInstance = WebHookSender.getMessageSender(item.type);
             senderFns[item.type] = senderInstance.send.bind(senderInstance);
           }
-          const options = { ...message, nodeInfo, node: instance };
+          let options = { ...message, nodeInfo, node: instance };
           if (item.type === 'slack') {
             // eslint-disable-next-line
             options.urlInfo = await getSlackUrlInfo({
@@ -106,7 +107,10 @@ module.exports = ({ events, dataDirs, instance }) => {
               path: message.action,
               serverUrls: baseUrls,
             });
+          } else if (item.type === WalletSender.type && !isEmpty(extra?.wallet)) {
+            options = { ...options, ...extra.wallet };
           }
+
           try {
             // eslint-disable-next-line
             await senderFns[item.type](item.params, options);
@@ -135,9 +139,9 @@ module.exports = ({ events, dataDirs, instance }) => {
 
   [EVENTS.NOTIFICATION_CREATE, EVENTS.NOTIFICATION_BLOCKLET_CREATE].forEach((event) => {
     events.on(event, (data) => {
-      const { title, description, severity, action, entityType, blockletUrl, entityId } = data;
-      if (!reduceQueue({ title, description, entityType, entityId, severity })) {
-        queue.push({ title, description, status: severity, action, entityType, blockletUrl });
+      const { title, description, severity, action, entityType, blockletUrl, entityId, extra, receiver } = data;
+      if (!reduceQueue({ title, description, entityType, entityId, severity, extra })) {
+        queue.push({ title, description, status: severity, action, entityType, blockletUrl, extra, receiver });
       }
     });
   });

package/lib/webhook/sender/wallet/index.js

@@ -5,7 +5,7 @@ const BaseSender = require('../base');
 
 class WalletSender extends BaseSender {
   async send(params, data = {}) {
-    const { title, description, nodeInfo, node } = data;
+    const { title, description, nodeInfo, node, receiver, actions, attachments } = data;
 
     try {
       const sender = {
@@ -17,28 +17,37 @@ class WalletSender extends BaseSender {
       const message = {
         title,
         body: description,
+        actions,
+        attachments,
       };
 
-      const { users } = await node.getUsers({
-        teamDid: nodeInfo.did,
-        paging: { pageSize: 100 },
-        query: { includePassports: true },
-      });
-      const adminUsers = users
-        .filter(
-          (x) =>
-            x.approved &&
-            (x.passports || []).some(
-              (y) => [ROLES.OWNER, ROLES.ADMIN].includes(y.name) && y.status === PASSPORT_STATUS.VALID
-            )
-        )
-        .map((x) => x.did);
-
-      if (!adminUsers.length) {
+      let to = [];
+
+      if (receiver) {
+        to = Array.isArray(receiver) ? receiver : [receiver];
+      } else {
+        const { users } = await node.getUsers({
+          teamDid: nodeInfo.did,
+          paging: { pageSize: 100 },
+          query: { includePassports: true },
+        });
+
+        to = users
+          .filter(
+            (x) =>
+              x.approved &&
+              (x.passports || []).some(
+                (y) => [ROLES.OWNER, ROLES.ADMIN].includes(y.name) && y.status === PASSPORT_STATUS.VALID
+              )
+          )
+          .map((x) => x.did);
+      }
+
+      if (!to.length) {
         return;
       }
 
-      await sendToUser(adminUsers, message, sender, process.env.ABT_NODE_SERVICE_PORT);
+      await sendToUser(to, message, sender, process.env.ABT_NODE_SERVICE_PORT);
     } catch (error) {
       delete error.request;
       delete error.response;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24-beta-3d2e25fd",
+  "version": "1.16.24-beta-08e03567",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.24-beta-3d2e25fd",
-    "@abtnode/auth": "1.16.24-beta-3d2e25fd",
-    "@abtnode/certificate-manager": "1.16.24-beta-3d2e25fd",
-    "@abtnode/constant": "1.16.24-beta-3d2e25fd",
-    "@abtnode/cron": "1.16.24-beta-3d2e25fd",
-    "@abtnode/logger": "1.16.24-beta-3d2e25fd",
-    "@abtnode/models": "1.16.24-beta-3d2e25fd",
-    "@abtnode/queue": "1.16.24-beta-3d2e25fd",
-    "@abtnode/rbac": "1.16.24-beta-3d2e25fd",
-    "@abtnode/router-provider": "1.16.24-beta-3d2e25fd",
-    "@abtnode/static-server": "1.16.24-beta-3d2e25fd",
-    "@abtnode/timemachine": "1.16.24-beta-3d2e25fd",
-    "@abtnode/util": "1.16.24-beta-3d2e25fd",
+    "@abtnode/analytics": "1.16.24-beta-08e03567",
+    "@abtnode/auth": "1.16.24-beta-08e03567",
+    "@abtnode/certificate-manager": "1.16.24-beta-08e03567",
+    "@abtnode/constant": "1.16.24-beta-08e03567",
+    "@abtnode/cron": "1.16.24-beta-08e03567",
+    "@abtnode/logger": "1.16.24-beta-08e03567",
+    "@abtnode/models": "1.16.24-beta-08e03567",
+    "@abtnode/queue": "1.16.24-beta-08e03567",
+    "@abtnode/rbac": "1.16.24-beta-08e03567",
+    "@abtnode/router-provider": "1.16.24-beta-08e03567",
+    "@abtnode/static-server": "1.16.24-beta-08e03567",
+    "@abtnode/timemachine": "1.16.24-beta-08e03567",
+    "@abtnode/util": "1.16.24-beta-08e03567",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24-beta-3d2e25fd",
-    "@blocklet/env": "1.16.24-beta-3d2e25fd",
-    "@blocklet/meta": "1.16.24-beta-3d2e25fd",
-    "@blocklet/resolver": "1.16.24-beta-3d2e25fd",
-    "@blocklet/sdk": "1.16.24-beta-3d2e25fd",
-    "@did-space/client": "^0.3.64",
+    "@blocklet/constant": "1.16.24-beta-08e03567",
+    "@blocklet/env": "1.16.24-beta-08e03567",
+    "@blocklet/meta": "1.16.24-beta-08e03567",
+    "@blocklet/resolver": "1.16.24-beta-08e03567",
+    "@blocklet/sdk": "1.16.24-beta-08e03567",
+    "@did-space/client": "^0.3.66",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
     "@ocap/util": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6dce348d0d02a6c0ef5735a0b73bfd8b2e1503fd"
+  "gitHead": "464a7b3b6dd7f205d828e6e4f48f37e80741f762"
 }