@blocklet/sdk 1.16.54-beta-20251027-105624-dfa978f8 → 1.16.54-beta-20251028-092308-569763e6

package/lib/service/blocklet.js

@@ -180,7 +180,7 @@ class BlockletService {
             'configBlocklet',
             'configNavigations',
         ];
-        const teamDid = process.env.BLOCKLET_DID;
+        const teamDid = process.env.BLOCKLET_APP_PID;
         const componentDid = process.env.BLOCKLET_COMPONENT_DID;
         const apiFallback = (fn) => (params = {}, ...args) => fn({ input: { ...params, teamDid }, ...args });
         // const apiConvertDid = (fn: Function) => (did: string) => fn({ input: { user: { did }, teamDid } });

package/lib/wallet.d.ts

@@ -26,7 +26,7 @@ export declare const getWallet: {
     getPermanentWallet: () => WalletObject<string>;
     getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
     getPkWallet: (type?: DIDTypeShortcut, appPk?: string) => WalletObject;
-    deriveWallet: (sub: string, type?: DIDTypeArg, index?: number) => Promise<WalletObject>;
+    deriveWallet: (sub: string, type?: DIDTypeArg, index?: number, keyType?: "sk" | "psk") => Promise<WalletObject>;
     getAccessWallet: () => WalletObject<string>;
 };
 /**
@@ -34,9 +34,10 @@ export declare const getWallet: {
  * @param sub - Subject identifier (e.g., 'email|user@example.com')
  * @param type - DID type shortcut (e.g., 'ethereum')
  * @param index - Index for deriving wallet (default: 0)
+ * @param keyType - Key type to use ('sk' or 'psk', default: 'sk')
  * @returns Wallet object with sign and signJWT methods
  */
-export declare const deriveWallet: (sub: string, type?: DIDTypeArg, index?: number) => Promise<WalletObject>;
+export declare const deriveWallet: (sub: string, type?: DIDTypeArg, index?: number, keyType?: "sk" | "psk") => Promise<WalletObject>;
 export declare const getPermanentWallet: () => WalletObject<string>;
 export declare const getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
 export declare const getAccessWallet: () => WalletObject<string>;

package/lib/wallet.js

@@ -47,7 +47,7 @@ const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     // Support full wallet.sign signature: sign(data, encoding?, hashBeforeSign?)
     remoteWallet.sign = async (payload, encoding, hashBeforeSign) => {
         try {
-            const { signature } = await (0, signature_1.remoteSign)(payload, { keyType, encoding, hashBeforeSign });
+            const { signature } = await (0, signature_1.remoteSign)(payload, { keyType, encoding, hashBeforeSign, type });
             if (!signature) {
                 throw new Error('Empty signature returned from blocklet-service');
             }
@@ -61,7 +61,7 @@ const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     // Match the signature: signJWT(payload?, doSign?, version?)
     remoteWallet.signJWT = async (payload, doSign, version) => {
         try {
-            const { token } = await (0, signature_1.remoteSignJWT)(payload, { doSign, version, keyType });
+            const { token } = await (0, signature_1.remoteSignJWT)(payload, { doSign, version, keyType, type });
             if (!token) {
                 throw new Error('Empty JWT token returned from blocklet-service');
             }
@@ -74,7 +74,7 @@ const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     // Add remote signETH method
     remoteWallet.signETH = async (data, hashBeforeSign) => {
         try {
-            const { signature } = await (0, signature_1.remoteSignETH)(data, { hashBeforeSign, keyType });
+            const { signature } = await (0, signature_1.remoteSignETH)(data, { hashBeforeSign, keyType, type: 'ethereum' });
             if (!signature) {
                 throw new Error('Empty signature returned from blocklet-service');
             }
@@ -105,8 +105,13 @@ const getWallet = (type, appSk = process.env.BLOCKLET_APP_SK, keyType = 'sk') =>
         ? (0, wallet_1.WalletType)(type)
         : (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 });
     if (!appSk) {
-        // Select public key based on keyType
-        const appPk = keyType === 'psk' ? process.env.BLOCKLET_APP_PPK : process.env.BLOCKLET_APP_PK;
+        let appPk;
+        if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
+            appPk = keyType === 'psk' ? process.env.BLOCKLET_APP_PPK_ETH : process.env.BLOCKLET_APP_PK_ETH;
+        }
+        else {
+            appPk = keyType === 'psk' ? process.env.BLOCKLET_APP_PPK : process.env.BLOCKLET_APP_PK;
+        }
         if (!appPk) {
             throw new Error(`Missing public key for ${keyType.toUpperCase()} wallet: BLOCKLET_APP_P${keyType.toUpperCase()}`);
         }
@@ -125,16 +130,17 @@ exports.getWallet = getWallet;
  * @param sub - Subject identifier (e.g., 'email|user@example.com')
  * @param type - DID type shortcut (e.g., 'ethereum')
  * @param index - Index for deriving wallet (default: 0)
+ * @param keyType - Key type to use ('sk' or 'psk', default: 'sk')
  * @returns Wallet object with sign and signJWT methods
  */
-const deriveWallet = async (sub, type, index) => {
-    const appSk = process.env.BLOCKLET_APP_SK;
+const deriveWallet = async (sub, type, index, keyType = 'sk') => {
+    const appSk = keyType === 'psk' ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK;
     // If we have a secret key, use local fromAppDid
     if (appSk) {
         return (0, did_ext_1.fromAppDid)(sub, appSk, type, index);
     }
     // No secret key available, use remote fromAppDid
-    const walletJSON = await (0, signature_1.remoteDeriveWallet)(sub, type, index);
+    const walletJSON = await (0, signature_1.remoteDeriveWallet)(sub, type, index, { keyType });
     const wallet = (0, wallet_1.fromJSON)(walletJSON);
     if (!(0, wallet_1.isValid)(wallet, true)) {
         throw new Error('Invalid response from remote fromAppDid: wallet is invalid');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251027-105624-dfa978f8",
+  "version": "1.16.54-beta-20251028-092308-569763e6",
   "description": "graphql client to read/write data on abt node",
   "homepage": "https://www.arcblock.io/docs/blocklet-sdk-nodejs",
   "main": "lib/index.js",
@@ -28,19 +28,19 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.54-beta-20251027-105624-dfa978f8",
-    "@abtnode/db-cache": "1.16.54-beta-20251027-105624-dfa978f8",
-    "@abtnode/util": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@abtnode/constant": "1.16.54-beta-20251028-092308-569763e6",
+    "@abtnode/db-cache": "1.16.54-beta-20251028-092308-569763e6",
+    "@abtnode/util": "1.16.54-beta-20251028-092308-569763e6",
     "@arcblock/did": "^1.26.3",
     "@arcblock/did-connect-js": "^1.26.3",
     "@arcblock/did-ext": "^1.26.3",
     "@arcblock/jwt": "^1.26.3",
     "@arcblock/ws": "^1.26.3",
-    "@blocklet/constant": "1.16.54-beta-20251027-105624-dfa978f8",
-    "@blocklet/env": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@blocklet/constant": "1.16.54-beta-20251028-092308-569763e6",
+    "@blocklet/env": "1.16.54-beta-20251028-092308-569763e6",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251027-105624-dfa978f8",
-    "@blocklet/server-js": "1.16.54-beta-20251027-105624-dfa978f8",
+    "@blocklet/meta": "1.16.54-beta-20251028-092308-569763e6",
+    "@blocklet/server-js": "1.16.54-beta-20251028-092308-569763e6",
     "@blocklet/theme": "^3.1.51",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
@@ -84,5 +84,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "03b0bb26807c6c427ca700f48566ecc913f1353e"
+  "gitHead": "6143a5fe06862e017da9a2dca2b0ff18c318587b"
 }