@blocklet/meta 1.8.69-beta-b0bb2d67 → 1.8.69-beta-76f8a46f

package/lib/did.d.ts

@@ -1,12 +1,3 @@
 /// <reference types="node" />
-declare const toBlockletDid: {
-    (name: string | Buffer): string;
-    toExternalBlocklet(name: string, userDid: string, { didOnly, nameOnly }?: {
-        didOnly?: boolean;
-        nameOnly?: boolean;
-    }): string | {
-        did: string;
-        name: string;
-    };
-};
+declare const toBlockletDid: (name: string | Buffer) => string;
 export = toBlockletDid;

package/lib/did.js

@@ -9,18 +9,4 @@ const toBlockletDid = (name) => {
     const pk = (0, util_1.toHex)(Buffer.from(typeof name === 'string' ? name.trim() : name));
     return (0, did_1.fromPublicKey)(pk, { role: mcrypto_1.types.RoleType.ROLE_ANY });
 };
-toBlockletDid.toExternalBlocklet = (name, userDid, { didOnly, nameOnly } = {}) => {
-    const blockletName = `${name}-${userDid.toLowerCase().substring(userDid.length - 6)}`;
-    if (nameOnly) {
-        return blockletName;
-    }
-    const blockletDid = toBlockletDid(blockletName);
-    if (didOnly) {
-        return blockletDid;
-    }
-    return {
-        name: blockletName,
-        did: blockletDid,
-    };
-};
 module.exports = toBlockletDid;

package/lib/index.d.ts

@@ -50,11 +50,13 @@ declare const _default: {
         defaultStoreUrl?: string | ((component: import("./types").TComponent) => string);
         fix?: boolean;
     }) => import("./types").TBlockletMeta;
-    validateMeta: (meta: any, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, schemaOptions, }?: {
+    validateMeta: (meta: any, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, ensureName, skipValidateDidName, schemaOptions, }?: {
         ensureMain?: boolean;
         ensureFiles?: boolean;
         ensureDist?: boolean;
         ensureComponentStore?: boolean;
+        ensureName?: boolean;
+        skipValidateDidName?: boolean;
         schemaOptions?: any;
     }) => import("./types").TBlockletMeta;
     fixAndValidateService: (meta: import("./types").TBlockletMeta) => import("./types").TBlockletMeta;
@@ -64,16 +66,7 @@ declare const _default: {
     fixInterfaces: (meta: any, removeMerged?: boolean) => any;
     fixName: (meta: any) => any;
     fixService: (meta: import("./types").TBlockletMeta) => import("./types").TBlockletMeta;
-    toBlockletDid: {
-        (name: string | Buffer): string;
-        toExternalBlocklet(name: string, userDid: string, { didOnly, nameOnly }?: {
-            didOnly?: boolean;
-            nameOnly?: boolean;
-        }): string | {
-            did: string;
-            name: string;
-        };
-    };
+    toBlockletDid: (name: string | Buffer) => string;
     getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: string | import("@arcblock/did").DIDType, index?: number) => import("@ocap/wallet").WalletObject<string>;
     getBlockletInfo: (state: import("@abtnode/client").BlockletState, nodeSk?: string, { returnWallet }?: {
         returnWallet?: boolean;

package/lib/name.d.ts

@@ -3,9 +3,13 @@
  * @param did 需要检查是否为新版 did 的值
  */
 export declare const validateNewDid: (did: string) => void;
-export declare const validateName: (name: string) => void;
+export declare const validateName: (name: string, { checkDid }?: {
+    checkDid?: boolean;
+}) => void;
 declare const _default: {
-    validateName: (name: string) => void;
+    validateName: (name: string, { checkDid }?: {
+        checkDid?: boolean;
+    }) => void;
     validateNewDid: (did: string) => void;
 };
 export default _default;

package/lib/name.js

@@ -18,10 +18,12 @@ const validateNewDid = (did) => {
     }
 };
 exports.validateNewDid = validateNewDid;
-const validateName = (name) => {
+const validateName = (name, { checkDid = true } = {}) => {
     if ((0, did_1.isValid)(name)) {
         // new did mode
-        (0, exports.validateNewDid)(name);
+        if (checkDid) {
+            (0, exports.validateNewDid)(name);
+        }
     }
     else {
         // old did mode

package/lib/parse.js

@@ -13,6 +13,7 @@ const schema_1 = require("./schema");
 const fix_1 = require("./fix");
 const debug = (0, debug_1.default)('@blocklet/meta:parse');
 const { BLOCKLET_META_FILE, BLOCKLET_META_FILE_ALT } = constants_1.default;
+const isSourceFromStore = (source) => 'name' in source || 'did' in source;
 /**
  * Get blocklet meta from blocklet.yml
  * @param {string} dir blocklet directory
@@ -63,15 +64,17 @@ const parse = (dir, { ensureMain = false, ensureFiles = false, ensureDist = fals
     (0, fix_1.fixName)(result);
     (0, fix_1.fixPerson)(result);
     (0, fix_1.fixService)(result);
-    if (defaultStoreUrl && result.components?.length) {
-        result.components.forEach((x) => {
-            if ('name' in x.source) {
-                if (!x.source.store) {
-                    x.source.store = typeof defaultStoreUrl === 'function' ? defaultStoreUrl((0, cloneDeep_1.default)(x)) : defaultStoreUrl;
+    ['components', 'staticComponents'].forEach((prop) => {
+        if (defaultStoreUrl && result[prop]?.length) {
+            result[prop].forEach((x) => {
+                if (isSourceFromStore(x.source)) {
+                    if (!x.source.store) {
+                        x.source.store = typeof defaultStoreUrl === 'function' ? defaultStoreUrl((0, cloneDeep_1.default)(x)) : defaultStoreUrl;
+                    }
                 }
-            }
-        });
-    }
+            });
+        }
+    });
     // We will overwrite did anyway
     result.path = `/${result.group}/${result.name}`;
     // Ensure camelCase

package/lib/payment/v2.js

@@ -54,7 +54,10 @@ exports.version = VERSION;
 const ZeroBN = new util_1.BN(0);
 const defaultDecimals = 1e6; // we only support 6 decimals on share ratio
 const defaultDecimalsBN = new util_1.BN(defaultDecimals);
-const getComponentConfig = (meta) => meta.components || meta.children;
+const getComponentConfig = (meta) => []
+    .concat(meta.components || meta.children)
+    .concat(meta.staticComponents)
+    .filter(Boolean);
 const safeMul = (a, b) => Number((0, util_1.fromUnitToToken)((0, util_1.fromTokenToUnit)(a)
     .mul(new util_1.BN(b * defaultDecimals))
     .div(defaultDecimalsBN)));

package/lib/schema.d.ts

@@ -23,11 +23,13 @@ declare const navigationSchema: JOI.ArraySchema<any[]>;
 declare const themeSchema: JOI.ObjectSchema<any>;
 declare const authConfigSchema: JOI.ObjectSchema<any>;
 declare const blockletMetaSchema: JOI.ObjectSchema<any>;
-declare const createBlockletSchema: (baseDir: string, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, ...schemaOptions }?: {
+declare const createBlockletSchema: (baseDir: string, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, ensureName, skipValidateDidName, ...schemaOptions }?: {
     ensureMain?: boolean;
     ensureFiles?: boolean;
     ensureDist?: boolean;
     ensureComponentStore?: boolean;
+    ensureName?: boolean;
+    skipValidateDidName?: boolean;
 }) => JOI.ObjectSchema;
 export { blockletMetaSchema, blockletNameSchema, componentSchema, createBlockletSchema, descriptionSchema, distSchema, endpointSchema, engineSchema, environmentSchema, environmentNameSchema, interfaceSchema, logoSchema, mountPointSchema, updateMountPointSchema, navigationItemSchema, navigationSchema, personSchema, scriptsSchema, serviceSchema, signatureSchema, themeSchema, titleSchema, statsSchema, cacheableSchema, authConfigSchema, };
 declare const _default: {
@@ -35,11 +37,13 @@ declare const _default: {
     componentSchema: JOI.ObjectSchema<any>;
     endpointSchema: JOI.ObjectSchema<any>;
     serviceSchema: JOI.ObjectSchema<any>;
-    createBlockletSchema: (baseDir: string, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, ...schemaOptions }?: {
+    createBlockletSchema: (baseDir: string, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, ensureName, skipValidateDidName, ...schemaOptions }?: {
         ensureMain?: boolean;
         ensureFiles?: boolean;
         ensureDist?: boolean;
         ensureComponentStore?: boolean;
+        ensureName?: boolean;
+        skipValidateDidName?: boolean;
     }) => JOI.ObjectSchema<any>;
     interfaceSchema: JOI.ObjectSchema<any>;
     environmentSchema: JOI.ObjectSchema<any>;

package/lib/schema.js

@@ -312,60 +312,75 @@ const statsSchema = Joi.object({
 });
 exports.statsSchema = statsSchema;
 const urlListSchema = Joi.alternatives().try(Joi.string().uri(), Joi.array().items(Joi.string().uri()).min(1));
-const componentSchemaProps = {
+const componentSourceSchema = Joi.alternatives().try(Joi.object({
+    url: urlListSchema.required(),
+    // 虽然 url 无法像 store 一样根据 version 获取指定版本的 component, 但是 version 仍然可以用于限制 component 版本
+    version: Joi.alternatives().try(Joi.string().valid('latest'), Joi.semverRange().valid()),
+}), Joi.object({
+    store: urlListSchema,
     name: blockletNameSchema.required(),
+    // TODO 目前只能支持锁死的版本号，接下载需要支持自适应的版本号，比如 4.x
+    version: Joi.alternatives().try(Joi.string().valid('latest'), Joi.semverRange().valid()).default('latest'),
+}));
+const componentSchemaProps = {
+    source: componentSourceSchema.required(),
+    // Can the dynamic component be deleted before I delete myself
+    required: Joi.boolean(),
+    // These props in dynamic component is for suggestion only and can be changed by user or other dynamic component
     title: titleSchema,
     description: descriptionSchema,
     mountPoint: mountPointSchema,
-    services: Joi.array().items(serviceSchema).unique('name'),
-    source: Joi.alternatives().try(Joi.object({
-        url: urlListSchema.required(),
-    }), Joi.object({
-        store: urlListSchema,
-        name: blockletNameSchema.required(),
-        // TODO 目前只能支持锁死的版本号，接下载需要支持自适应的版本号，比如 4.x
-        version: Joi.alternatives().try(Joi.string().valid('latest'), Joi.semver().valid()).default('latest'),
-    })),
-    resolved: Joi.alternatives().try(Joi.string().uri(), Joi.string()),
-    mountPoints: Joi.array() // deprecated
-        .items(Joi.object({
-        root: Joi.object({
-            interfaceName: Joi.string().trim().required(),
-            prefix: Joi.string().trim().min(1).required(),
-        }).required(),
-        child: Joi.object({
-            interfaceName: Joi.string().trim().required(),
-        }).required(),
-        services: Joi.array().items(serviceSchema).unique('name'),
-    }))
-        .optional(),
+    // backward compatible, useless
+    name: blockletNameSchema,
 };
-const createComponentSchema = (allowEmptyStore) => Joi.object(componentSchemaProps).custom((value, helper) => {
-    if (!value.mountPoint && (!value.mountPoints || !value.mountPoints.length)) {
-        // @ts-expect-error
-        return helper.message('child mountPoint is required');
-    }
-    if (!value.source && !value.resolved) {
-        // @ts-expect-error
-        return helper.message('child source is required');
-    }
+const staticComponentSchemaProps = {
+    source: componentSourceSchema.required(),
+    name: blockletNameSchema.required(),
+    title: titleSchema,
+    description: descriptionSchema,
+    mountPoint: mountPointSchema.required(),
+};
+const createComponentSchema = (schema, allowEmptyStore) => Joi.object(schema).custom((value, helper) => {
     if (!allowEmptyStore && value.source && value.source.name && !value.source.store) {
         // @ts-expect-error
         return helper.message(`missing 'store' in source of component ${value.name}`);
     }
     return value;
 });
-const componentSchema = createComponentSchema().meta({
+const componentSchema = createComponentSchema(componentSchemaProps).meta({
     className: 'TComponent',
     unknownType: 'any',
 });
 exports.componentSchema = componentSchema;
-const componentSchemaWithoutStoreCheck = createComponentSchema(true);
-const componentsSchema = (checkStore) => Joi.array()
-    .items(checkStore ? componentSchema : componentSchemaWithoutStoreCheck)
-    .unique('name')
-    .optional()
-    .default([]);
+const staticComponentSchema = createComponentSchema(staticComponentSchemaProps).meta({
+    className: 'TStaticComponent',
+    unknownType: 'any',
+});
+const componentSchemaWithoutStoreCheck = createComponentSchema(componentSchemaProps, true);
+const staticComponentSchemaWithoutStoreCheck = createComponentSchema(staticComponentSchemaProps, true);
+const componentsSchema = ({ isStatic, checkStore } = {}) => {
+    const arr = isStatic
+        ? [staticComponentSchema, staticComponentSchemaWithoutStoreCheck]
+        : [componentSchema, componentSchemaWithoutStoreCheck];
+    let schema = Joi.array()
+        .items(checkStore ? arr[0] : arr[1])
+        .optional()
+        .custom((value, helper) => {
+        if (isStatic) {
+            const names = value.map((x) => x.name);
+            const duplicateName = names.find((x, i) => names.indexOf(x) !== i);
+            if (duplicateName) {
+                // @ts-expect-error
+                return helper.message(`find duplicate name "${duplicateName}" in components`);
+            }
+        }
+        return value;
+    });
+    if (!isStatic) {
+        schema = schema.default([]);
+    }
+    return schema;
+};
 const signatureSchema = Joi.object({
     type: Joi.string().required(),
     name: Joi.string().required(),
@@ -452,7 +467,7 @@ exports.authConfigSchema = authConfigSchema;
 const blockletMetaProps = {
     did: Joi.DID().trim().required(),
     version: Joi.semver().valid().required(),
-    name: blockletNameSchema.optional(),
+    name: Joi.string().optional(),
     description: descriptionSchema.required(),
     group: Joi.string()
         .valid(...BLOCKLET_GROUPS)
@@ -635,6 +650,7 @@ const blockletMetaProps = {
     lastPublishedAt: Joi.string().isoDate().optional(),
     // blocklet component support
     components: componentsSchema(),
+    staticComponents: componentsSchema({ isStatic: true }),
     // navigation & theme
     navigation: navigationSchema,
     theme: themeSchema,
@@ -652,7 +668,7 @@ const blockletMetaSchema = Joi.object(blockletMetaProps).options({ stripUnknown:
     unknownType: 'any',
 });
 exports.blockletMetaSchema = blockletMetaSchema;
-const createBlockletSchema = (baseDir, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, ...schemaOptions } = {}) => {
+const createBlockletSchema = (baseDir, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, ensureName = false, skipValidateDidName = false, ...schemaOptions } = {}) => {
     if (!baseDir || !fs_1.default.existsSync(baseDir)) {
         // eslint-disable-next-line no-param-reassign
         ensureFiles = false;
@@ -673,7 +689,9 @@ const createBlockletSchema = (baseDir, { ensureMain = false, ensureFiles = false
             : Joi.string().trim())
             .optional(),
         dist: ensureDist ? distSchema.required() : distSchema.optional(),
-        components: componentsSchema(ensureComponentStore),
+        components: componentsSchema({ checkStore: ensureComponentStore }),
+        staticComponents: componentsSchema({ isStatic: true, checkStore: ensureComponentStore }),
+        name: ensureName ? Joi.string().optional() : Joi.string().required(),
     })
         .options({ stripUnknown: true, noDefaults: false, ...schemaOptions })
         .rename('children', 'components')
@@ -692,6 +710,7 @@ const createBlockletSchema = (baseDir, { ensureMain = false, ensureFiles = false
         /* ------------- 兼容旧的逻辑，旧逻辑使用 name 生成一个 did ------------- */
         // 此时 name 必须存在
         if (name) {
+            (0, name_1.validateName)(name, { checkDid: !skipValidateDidName });
             const expectDid = (0, did_2.default)(name);
             if (expectDid !== did) {
                 // @ts-ignore

package/lib/types/schema.d.ts

@@ -20,21 +20,11 @@ export interface TBlockletMeta {
     components?: {
         description?: TDescription;
         mountPoint?: TMountPoint;
-        mountPoints?: {
-            child: {
-                interfaceName: string;
-            };
-            root: {
-                interfaceName: string;
-                prefix: string;
-            };
-            services?: TService[];
-        }[];
-        name: TBlockletName;
-        resolved?: string | string;
-        services?: TService[];
-        source?: {
+        name?: TBlockletName;
+        required?: boolean;
+        source: {
             url: string | string[];
+            version?: 'latest' | string;
         } | {
             name: TBlockletName;
             store?: string | string[];
@@ -66,7 +56,7 @@ export interface TBlockletMeta {
     logoUrl?: string;
     main: string;
     maintainers?: TPerson[];
-    name?: TBlockletName;
+    name?: string;
     navigation?: TNavigation;
     nftFactory?: string;
     path?: string;
@@ -108,6 +98,20 @@ export interface TBlockletMeta {
     scripts?: TScripts;
     signatures?: TSignature[];
     specVersion?: string;
+    staticComponents?: {
+        description?: TDescription;
+        mountPoint: TMountPoint;
+        name: TBlockletName;
+        source: {
+            url: string | string[];
+            version?: 'latest' | string;
+        } | {
+            name: TBlockletName;
+            store?: string | string[];
+            version?: 'latest' | string;
+        };
+        title?: TTitle;
+    }[];
     stats?: TStats;
     storeId?: string;
     support?: string | string;
@@ -123,21 +127,11 @@ export type TBlockletName = string;
 export interface TComponent {
     description?: TDescription;
     mountPoint?: TMountPoint;
-    mountPoints?: {
-        child: {
-            interfaceName: string;
-        };
-        root: {
-            interfaceName: string;
-            prefix: string;
-        };
-        services?: TService[];
-    }[];
-    name: TBlockletName;
-    resolved?: string | string;
-    services?: TService[];
-    source?: {
+    name?: TBlockletName;
+    required?: boolean;
+    source: {
         url: string | string[];
+        version?: 'latest' | string;
     } | {
         name: TBlockletName;
         store?: string | string[];

package/lib/util-meta.js

@@ -126,6 +126,7 @@ const getSourceUrlsFromConfig = (config) => {
             return [config.source.url].flat();
         }
         const { store, version, name } = config.source;
+        // FIXME: @linchen the format or version is semverRange, blocklet store should support it
         return [store]
             .flat()
             .map((x) => (0, url_join_1.default)(x, BLOCKLET_STORE_API_BLOCKLET_PREFIX, (0, did_1.default)(name), !version || version === 'latest' ? '' : version, 'blocklet.json'));

package/lib/util.d.ts

@@ -4,6 +4,7 @@ import type { TBlockletMeta, TEnvironment } from './types';
 type TConfig = TEnvironment & {
     key: string;
 };
+type Component = BlockletState | ComponentState;
 declare const getComponentId: (component?: {
     meta?: {
         did?: string;
@@ -54,20 +55,20 @@ declare const forEachBlocklet: (blocklet: BlockletState | ComponentState, cb: Fu
 declare const forEachBlockletSync: (blocklet: any, cb: Function) => Promise<unknown>;
 declare const forEachChild: (blocklet: any, cb: Function, params?: any) => Promise<any>;
 declare const forEachChildSync: (blocklet: BlockletState, cb: Function) => Promise<any>;
-declare const findComponent: (blocklet: BlockletState | ComponentState, isEqualFn: (component: ComponentState, context: {
-    ancestors: Array<ComponentState>;
+declare const findComponent: (blocklet: Component, isEqualFn: (component: Component, context: {
+    ancestors: Array<Component>;
 }) => boolean, { _ancestors, returnAncestors, }?: {
-    _ancestors?: Array<ComponentState>;
+    _ancestors?: Array<Component>;
     returnAncestors?: boolean;
-}) => ComponentState | {
-    component: ComponentState;
-    ancestors: Array<ComponentState>;
+}) => Component | {
+    component: Component;
+    ancestors: Array<Component>;
 };
 declare const findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | Array<string>, { returnAncestors, }?: {
     returnAncestors?: boolean;
-}) => ComponentState | {
-    component: ComponentState;
-    ancestors: Array<ComponentState>;
+}) => Component | {
+    component: Component;
+    ancestors: Array<Component>;
 };
 declare const isEnvShareable: (env?: TConfig) => boolean;
 declare const getSharedConfigObj: (component: BlockletState, ancestors?: any[]) => any;
@@ -170,20 +171,20 @@ declare const _default: {
             version: string;
         };
     }) => string;
-    findComponent: (blocklet: BlockletState | ComponentState, isEqualFn: (component: ComponentState, context: {
-        ancestors: ComponentState[];
+    findComponent: (blocklet: Component, isEqualFn: (component: Component, context: {
+        ancestors: Component[];
     }) => boolean, { _ancestors, returnAncestors, }?: {
-        _ancestors?: ComponentState[];
+        _ancestors?: Component[];
         returnAncestors?: boolean;
-    }) => ComponentState | {
-        component: ComponentState;
-        ancestors: ComponentState[];
+    }) => Component | {
+        component: Component;
+        ancestors: Component[];
     };
     findComponentById: (blocklet: BlockletState | ComponentState, componentId: string | string[], { returnAncestors, }?: {
         returnAncestors?: boolean;
-    }) => ComponentState | {
-        component: ComponentState;
-        ancestors: ComponentState[];
+    }) => Component | {
+        component: Component;
+        ancestors: Component[];
     };
     getParentComponentName: (name?: string) => string;
     getConnectAppUrl: ({ request, baseUrl }: {

package/lib/util.js

@@ -216,7 +216,10 @@ const isPreferenceKey = (x) => x.key.startsWith(BLOCKLET_PREFERENCE_PREFIX) ===
 exports.isPreferenceKey = isPreferenceKey;
 const getAppMissingConfigs = (blocklet = {}) => {
     const missingConfigs = [];
-    forEachBlockletSync(blocklet, (b, { ancestors }) => {
+    forEachBlockletSync(blocklet, (b, { ancestors, level }) => {
+        if (level === 0 && b.meta?.group === BlockletGroup.gateway) {
+            return;
+        }
         const configs = b.configs || [];
         const sharedConfigObj = getSharedConfigObj(b, ancestors);
         configs.forEach((item) => {

package/lib/validate.d.ts

@@ -1,10 +1,12 @@
 import { TBlockletMeta } from './types';
 declare const fixAndValidateService: (meta: TBlockletMeta) => TBlockletMeta;
-declare const validateMeta: (meta: any, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, schemaOptions, }?: {
+declare const validateMeta: (meta: any, { ensureMain, ensureFiles, ensureDist, ensureComponentStore, ensureName, skipValidateDidName, schemaOptions, }?: {
     ensureMain?: boolean;
     ensureFiles?: boolean;
     ensureDist?: boolean;
     ensureComponentStore?: boolean;
+    ensureName?: boolean;
+    skipValidateDidName?: boolean;
     schemaOptions?: any;
 }) => TBlockletMeta;
 export default validateMeta;

package/lib/validate.js

@@ -20,12 +20,14 @@ const fixAndValidateService = (meta) => {
     return meta;
 };
 exports.fixAndValidateService = fixAndValidateService;
-const validateMeta = (meta, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, schemaOptions = {}, } = {}) => {
+const validateMeta = (meta, { ensureMain = false, ensureFiles = false, ensureDist = false, ensureComponentStore = true, ensureName = false, skipValidateDidName = false, schemaOptions = {}, } = {}) => {
     const schema = (0, schema_1.createBlockletSchema)(null, {
         ensureMain,
         ensureFiles,
         ensureDist,
         ensureComponentStore,
+        ensureName,
+        skipValidateDidName,
         ...schemaOptions,
     });
     const { value, error } = schema.validate(meta);

package/lib/wallet.d.ts

@@ -5,5 +5,5 @@ import { DIDType } from '@arcblock/did';
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-declare const getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: DIDType | string, index?: number) => WalletObject;
-export = getBlockletWallet;
+declare const getApplicationWallet: (blockletDid: string, nodeSk?: string, type?: DIDType | string, index?: number) => WalletObject;
+export = getApplicationWallet;

package/lib/wallet.js

@@ -8,7 +8,7 @@ const did_ext_1 = require("@arcblock/did-ext");
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-const getBlockletWallet = (blockletDid, nodeSk, type, index) => {
+const getApplicationWallet = (blockletDid, nodeSk, type, index) => {
     const t = type || { role: mcrypto_1.types.RoleType.ROLE_APPLICATION };
     if (!(0, did_1.isValid)(blockletDid)) {
         try {
@@ -23,4 +23,4 @@ const getBlockletWallet = (blockletDid, nodeSk, type, index) => {
     }
     return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, t, index || 0);
 };
-module.exports = getBlockletWallet;
+module.exports = getApplicationWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-b0bb2d67",
+  "version": "1.8.69-beta-76f8a46f",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,19 +24,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.69-beta-b0bb2d67",
-    "@abtnode/constant": "1.8.69-beta-b0bb2d67",
-    "@abtnode/util": "1.8.69-beta-b0bb2d67",
-    "@arcblock/did": "1.18.57",
-    "@arcblock/did-ext": "1.18.57",
-    "@arcblock/did-util": "1.18.57",
-    "@arcblock/jwt": "1.18.57",
-    "@blocklet/constant": "1.8.69-beta-b0bb2d67",
-    "@ocap/asset": "1.18.57",
-    "@ocap/mcrypto": "1.18.57",
-    "@ocap/types": "1.18.57",
-    "@ocap/util": "1.18.57",
-    "@ocap/wallet": "1.18.57",
+    "@abtnode/client": "1.8.69-beta-76f8a46f",
+    "@abtnode/constant": "1.8.69-beta-76f8a46f",
+    "@abtnode/util": "1.8.69-beta-76f8a46f",
+    "@arcblock/did": "1.18.58",
+    "@arcblock/did-ext": "1.18.58",
+    "@arcblock/did-util": "1.18.58",
+    "@arcblock/jwt": "1.18.58",
+    "@blocklet/constant": "1.8.69-beta-76f8a46f",
+    "@ocap/asset": "1.18.58",
+    "@ocap/mcrypto": "1.18.58",
+    "@ocap/types": "1.18.58",
+    "@ocap/util": "1.18.58",
+    "@ocap/wallet": "1.18.58",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "d6853c4b55a67526748017268257b869a5092cb1"
+  "gitHead": "07415e674443b85648ea80b734f7a3690abfc15e"
 }