@blocklet/sdk 1.16.6-beta-08670107 → 1.16.6-beta-56be9f01

package/lib/connect/shared.js

@@ -12,16 +12,18 @@ const wallet_1 = __importDefault(require("../wallet"));
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
 const getDelegator = () => {
-    const { BLOCKLET_APP_SK, BLOCKLET_APP_PSK, BLOCKLET_WALLET_TYPE } = process.env;
+    // BLOCKLET_WALLET_TYPE is for backward compatibility
+    const { BLOCKLET_APP_SK, BLOCKLET_APP_PSK, BLOCKLET_WALLET_TYPE, CHAIN_TYPE } = process.env;
     if (BLOCKLET_APP_SK && BLOCKLET_APP_PSK && BLOCKLET_APP_SK !== BLOCKLET_APP_PSK) {
-        return (0, wallet_1.default)(BLOCKLET_WALLET_TYPE, BLOCKLET_APP_PSK);
+        return (0, wallet_1.default)(CHAIN_TYPE || BLOCKLET_WALLET_TYPE, BLOCKLET_APP_PSK);
     }
     return null;
 };
 exports.getDelegator = getDelegator;
 const getDelegatee = () => {
-    const { BLOCKLET_APP_SK, BLOCKLET_WALLET_TYPE } = process.env;
-    return (0, wallet_1.default)(BLOCKLET_WALLET_TYPE, BLOCKLET_APP_SK);
+    // BLOCKLET_WALLET_TYPE is for backward compatibility
+    const { BLOCKLET_APP_SK, BLOCKLET_WALLET_TYPE, CHAIN_TYPE } = process.env;
+    return (0, wallet_1.default)(CHAIN_TYPE || BLOCKLET_WALLET_TYPE, BLOCKLET_APP_SK);
 };
 exports.getDelegatee = getDelegatee;
 const getDelegation = (delegator, delegatee) => {

package/lib/service/auth.js

@@ -16,7 +16,9 @@ const wallet_2 = __importDefault(require("../wallet"));
 const { NODE_SERVICES, WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
-const type = process.env.BLOCKLET_WALLET_TYPE !== 'eth'
+// BLOCKLET_WALLET_TYPE is for backward compatibility
+const chainType = process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE;
+const type = chainType !== 'ethereum' && chainType !== 'eth'
     ? (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 })
     : 'eth';
 const fixAvatar = (user) => {

package/lib/wallet.d.ts

@@ -1,7 +1,7 @@
 import { WalletObject } from '@ocap/wallet';
 import { DIDTypeShortcut } from '@arcblock/did';
 /**
- * @param {string} [type=process.env.BLOCKLET_WALLET_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
+ * @param {string} [type=process.env.CHAIN_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
  * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex
  * @return {WalletObject}  {WalletObject}
  */

package/lib/wallet.js

@@ -3,13 +3,16 @@ const wallet_1 = require("@ocap/wallet");
 const mcrypto_1 = require("@ocap/mcrypto");
 const did_1 = require("@arcblock/did");
 /**
- * @param {string} [type=process.env.BLOCKLET_WALLET_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
+ * @param {string} [type=process.env.CHAIN_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
  * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex
  * @return {WalletObject}  {WalletObject}
  */
-const getWallet = (type = process.env.BLOCKLET_WALLET_TYPE, appSk = process.env.BLOCKLET_APP_SK) => {
+const getWallet = (type, appSk = process.env.BLOCKLET_APP_SK) => {
     let t;
     let sk;
+    // BLOCKLET_WALLET_TYPE is for backward compatibility
+    // eslint-disable-next-line no-param-reassign
+    type = type || process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE;
     if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
         sk = appSk.slice(0, 66);
         t = (0, wallet_1.WalletType)(type);
@@ -20,7 +23,8 @@ const getWallet = (type = process.env.BLOCKLET_WALLET_TYPE, appSk = process.env.
     }
     return (0, wallet_1.fromSecretKey)(sk, t);
 };
-const getPermanentWallet = () => getWallet(process.env.BLOCKLET_WALLET_TYPE, process.env.BLOCKLET_APP_PSK);
+// BLOCKLET_WALLET_TYPE is for backward compatibility
+const getPermanentWallet = () => getWallet(process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE, process.env.BLOCKLET_APP_PSK);
 const getEthereumWallet = (permanent = false) => getWallet('ethereum', permanent ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK);
 getWallet.getPermanentWallet = getPermanentWallet;
 getWallet.getEthereumWallet = getEthereumWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-08670107",
+  "version": "1.16.6-beta-56be9f01",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.6-beta-08670107",
-    "@abtnode/constant": "1.16.6-beta-08670107",
+    "@abtnode/client": "1.16.6-beta-56be9f01",
+    "@abtnode/constant": "1.16.6-beta-56be9f01",
     "@arcblock/did": "1.18.76",
     "@arcblock/did-auth": "1.18.76",
     "@arcblock/jwt": "1.18.76",
     "@arcblock/ws": "1.18.76",
-    "@blocklet/constant": "1.16.6-beta-08670107",
-    "@blocklet/env": "1.16.6-beta-08670107",
-    "@blocklet/meta": "1.16.6-beta-08670107",
+    "@blocklet/constant": "1.16.6-beta-56be9f01",
+    "@blocklet/env": "1.16.6-beta-56be9f01",
+    "@blocklet/meta": "1.16.6-beta-56be9f01",
     "@did-connect/authenticator": "^2.1.53",
     "@did-connect/handler": "^2.1.53",
     "@nedb/core": "^2.1.5",
@@ -72,5 +72,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "11bbd8ea245fdb5920338f104cbe059e90a0e1b5"
+  "gitHead": "f93c24693ed27c4a2821ec33c345696afe6f001a"
 }