@blocklet/meta 1.8.67-beta-794a8082 → 1.8.68-beta-500af7e5

package/lib/index.d.ts

@@ -74,7 +74,7 @@ declare const _default: {
             name: string;
         };
     };
-    getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: import("@arcblock/did").DIDType, index?: number) => import("@ocap/wallet").WalletObject<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;
     }) => {
@@ -85,6 +85,7 @@ declare const _default: {
         passportColor?: string;
         appUrl: string;
         wallet?: import("@ocap/wallet").WalletObject<string>;
+        permanentWallet?: import("@ocap/wallet").WalletObject<string>;
     };
     getBlockletEngine: (meta: import("./types").TBlockletMeta) => import("./types").TEngine;
     verifyMultiSig: (blockletMeta: import("./types").TBlockletMeta) => boolean;

package/lib/info.d.ts

@@ -10,5 +10,6 @@ declare const getBlockletInfo: (state: BlockletState, nodeSk?: string, { returnW
     passportColor?: string;
     appUrl: string;
     wallet?: WalletObject;
+    permanentWallet?: WalletObject;
 };
 export = getBlockletInfo;

package/lib/info.js

@@ -30,16 +30,18 @@ const getBlockletInfo = (state, nodeSk, { returnWallet = true } = {}) => {
     }
     const customSk = envs.find((x) => x.key === 'BLOCKLET_APP_SK');
     const customType = envs.find((x) => x.key === 'BLOCKLET_WALLET_TYPE');
+    const permanentSk = envs.find((x) => x.key === 'BLOCKLET_APP_PSK');
     let type;
     if (customType && customType.value === 'eth') {
         type = customType.value;
     }
     let wallet = null;
-    if (customSk && customSk.value && customType) {
-        wallet = (0, wallet_1.default)(customSk.value, null, type);
-    }
-    else if (customSk && customSk.value) {
-        wallet = (0, wallet_1.default)(customSk.value);
+    let permanentWallet = null;
+    if (customSk && customSk.value) {
+        wallet = (0, wallet_1.default)(customSk.value, undefined, type);
+        if (permanentSk && permanentSk.value && permanentSk.value !== customSk.value) {
+            permanentWallet = (0, wallet_1.default)(permanentSk.value, undefined, type);
+        }
     }
     else {
         if (!nodeSk || typeof nodeSk !== 'string') {
@@ -60,6 +62,7 @@ const getBlockletInfo = (state, nodeSk, { returnWallet = true } = {}) => {
         passportColor,
         appUrl,
         wallet,
+        permanentWallet: permanentWallet || wallet,
     };
 };
 module.exports = getBlockletInfo;

package/lib/util.js

@@ -275,10 +275,13 @@ const wipeSensitiveData = (blocklet) => {
             });
         }
         (d.environments || []).forEach((x) => {
-            if (['BLOCKLET_APP_SK'].includes(x.key)) {
+            if (['BLOCKLET_APP_SK', 'BLOCKLET_APP_PSK'].includes(x.key)) {
                 x.value = '__encrypted__';
             }
         });
+        (d.migratedFrom || []).forEach((x) => {
+            x.appSk = '__encrypted__';
+        });
         // @ts-ignore
         delete blocklet.configObj;
         // @ts-ignore

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, index?: number) => WalletObject;
+declare const getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: DIDType | string, index?: number) => WalletObject;
 export = getBlockletWallet;

package/lib/wallet.js

@@ -8,10 +8,11 @@ const did_ext_1 = require("@arcblock/did-ext");
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-const getBlockletWallet = (blockletDid, nodeSk, type = { role: mcrypto_1.types.RoleType.ROLE_APPLICATION }, index = 0) => {
+const getBlockletWallet = (blockletDid, nodeSk, type, index) => {
+    const t = type || { role: mcrypto_1.types.RoleType.ROLE_APPLICATION };
     if (!(0, did_1.isValid)(blockletDid)) {
         try {
-            return (0, wallet_1.fromSecretKey)(blockletDid, type);
+            return (0, wallet_1.fromSecretKey)(blockletDid, t);
         }
         catch (err) {
             throw new Error(`Cannot get blocklet wallet with invalid blocklet did or custom sk: ${err.message}`);
@@ -20,6 +21,6 @@ const getBlockletWallet = (blockletDid, nodeSk, type = { role: mcrypto_1.types.R
     if (!nodeSk) {
         throw new Error('Cannot get blocklet wallet with empty node sk');
     }
-    return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, type, index);
+    return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, t, index || 0);
 };
 module.exports = getBlockletWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.67-beta-794a8082",
+  "version": "1.8.68-beta-500af7e5",
   "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.67-beta-794a8082",
-    "@abtnode/constant": "1.8.67-beta-794a8082",
-    "@abtnode/util": "1.8.67-beta-794a8082",
-    "@arcblock/did": "1.18.54",
-    "@arcblock/did-ext": "1.18.54",
-    "@arcblock/did-util": "1.18.54",
-    "@arcblock/jwt": "1.18.54",
-    "@blocklet/constant": "1.8.67-beta-794a8082",
-    "@ocap/asset": "1.18.54",
-    "@ocap/mcrypto": "1.18.54",
-    "@ocap/types": "1.18.54",
-    "@ocap/util": "1.18.54",
-    "@ocap/wallet": "1.18.54",
+    "@abtnode/client": "1.8.68-beta-500af7e5",
+    "@abtnode/constant": "1.8.68-beta-500af7e5",
+    "@abtnode/util": "1.8.68-beta-500af7e5",
+    "@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.68-beta-500af7e5",
+    "@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",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -59,7 +59,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "^1.8.66",
+    "@abtnode/client": "^1.8.67",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "f4ad32bea4d80b12971fb6bef941bdbe2af6a834"
+  "gitHead": "9070621373f317a10ff0d289323bf725e30d3521"
 }