@subwallet/extension-base 1.1.10-0 → 1.1.11-0

package/cjs/constants/i18n.js

@@ -39,5 +39,5 @@ const languageOptions = [{
   value: 'ur'
 }];
 exports.languageOptions = languageOptions;
-const ENABLE_LANGUAGES = ['en', 'vi', 'zh', 'ja'];
+const ENABLE_LANGUAGES = ['en', 'vi', 'zh', 'ja', 'ru'];
 exports.ENABLE_LANGUAGES = ENABLE_LANGUAGES;

package/cjs/defaults.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PORT_MOBILE = exports.PORT_EXTENSION = exports.PORT_CONTENT = exports.PHISHING_PAGE_REDIRECT = exports.PASSWORD_EXPIRY_MS = exports.PASSWORD_EXPIRY_MIN = exports.MESSAGE_ORIGIN_PAGE = exports.MESSAGE_ORIGIN_CONTENT = exports.EXTENSION_PREFIX = exports.ALLOWED_PATH = void 0;
+exports.PORT_MOBILE = exports.PORT_EXTENSION = exports.PORT_CONTENT = exports.PHISHING_PAGE_REDIRECT = exports.PASSWORD_EXPIRY_MS = exports.PASSWORD_EXPIRY_MIN = exports.MESSAGE_ORIGIN_PAGE = exports.MESSAGE_ORIGIN_CONTENT = exports.ID_PREFIX = exports.EXTENSION_PREFIX = exports.ALLOWED_PATH = void 0;
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,6 +13,8 @@ const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 exports.PHISHING_PAGE_REDIRECT = PHISHING_PAGE_REDIRECT;
 const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
 exports.EXTENSION_PREFIX = EXTENSION_PREFIX;
+const ID_PREFIX = process.env.ID_PREFIX || EXTENSION_PREFIX || '';
+exports.ID_PREFIX = ID_PREFIX;
 const PORT_MOBILE = `${EXTENSION_PREFIX}mobile`;
 exports.PORT_MOBILE = PORT_MOBILE;
 const PORT_CONTENT = `${EXTENSION_PREFIX}koni-content`;

package/cjs/koni/api/nft/config.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_W3S_LINK = exports.IPFS_HARDBIN = exports.IPFS_GATEWAY_4EVERLAND = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
+exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_W3S_LINK = exports.IPFS_IO = exports.IPFS_GATEWAY_4EVERLAND = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
 exports.getRandomIpfsGateway = getRandomIpfsGateway;
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -47,14 +47,14 @@ const IPFS_W3S_LINK = 'https://w3s.link/ipfs/';
 exports.IPFS_W3S_LINK = IPFS_W3S_LINK;
 const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
 exports.GATEWAY_IPFS_IO = GATEWAY_IPFS_IO;
+const IPFS_IO = 'https://ipfs.io/ipfs/';
+exports.IPFS_IO = IPFS_IO;
 const DWEB_LINK = 'https://dweb.link/ipfs/';
 exports.DWEB_LINK = DWEB_LINK;
 const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 exports.IPFS_GATEWAY_4EVERLAND = IPFS_GATEWAY_4EVERLAND;
 const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
 exports.IPFS_FLEEK = IPFS_FLEEK;
-const IPFS_HARDBIN = 'https://hardbin.com/ipfs/';
-exports.IPFS_HARDBIN = IPFS_HARDBIN;
 let SUPPORTED_NFT_NETWORKS;
 exports.SUPPORTED_NFT_NETWORKS = SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
@@ -111,26 +111,24 @@ const RANDOM_IPFS_GATEWAY_SETTING = [{
 }, {
   provider: PINATA_IPFS_GATEWAY,
   weight: 1 // Rate limit too low
+}, {
+  provider: DWEB_LINK,
+  weight: 5
 }, {
   provider: GATEWAY_IPFS_IO,
   weight: 5
 }, {
-  provider: DWEB_LINK,
+  provider: IPFS_IO,
   weight: 5
+}, {
+  provider: NFT_STORAGE_GATEWAY,
+  weight: 50
 }];
 if (!_utils.RuntimeInfo.protocol || _utils.RuntimeInfo.protocol && !_utils.RuntimeInfo.protocol.startsWith('http')) {
-  RANDOM_IPFS_GATEWAY_SETTING.push({
-    provider: NFT_STORAGE_GATEWAY,
-    weight: 50
-  });
   RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_FLEEK,
     weight: 4
   });
-  RANDOM_IPFS_GATEWAY_SETTING.push({
-    provider: IPFS_HARDBIN,
-    weight: 1
-  });
   RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_GATEWAY_4EVERLAND,
     weight: 2

package/cjs/koni/background/handlers/Extension.js

@@ -78,16 +78,31 @@ class KoniExtension {
   #koniState;
   #timeAutoLock = _constants4.DEFAULT_AUTO_LOCK_TIME;
   #skipAutoLock = false;
+  #alwaysLock = false;
+  #firstTime = true;
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
-      this.#timeAutoLock = rs.timeAutoLock;
-      clearTimeout(this.#lockTimeOut);
-      this.#lockTimeOut = setTimeout(() => {
-        if (!this.#skipAutoLock) {
-          this.keyringLock();
+      // Check time auto lock change
+      if (this.#timeAutoLock !== rs.timeAutoLock) {
+        this.#timeAutoLock = rs.timeAutoLock;
+        this.#alwaysLock = !rs.timeAutoLock;
+        clearTimeout(this.#lockTimeOut);
+        if (this.#timeAutoLock > 0) {
+          this.#lockTimeOut = setTimeout(() => {
+            if (!this.#skipAutoLock) {
+              this.keyringLock();
+            }
+          }, this.#timeAutoLock * 60 * 1000);
+        } else if (this.#alwaysLock) {
+          if (!this.#firstTime) {
+            this.keyringLock();
+          }
         }
-      }, this.#timeAutoLock * 60 * 1000);
+      }
+      if (this.#firstTime) {
+        this.#firstTime = false;
+      }
     };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
@@ -1170,6 +1185,9 @@ class KoniExtension {
         resolve();
       });
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return addressDict;
   }
   async accountsForgetOverride(_ref36) {
@@ -1348,6 +1366,9 @@ class KoniExtension {
           _uiKeyring.keyring.restoreAccount(file, password, withMasterPassword);
           this._addAddressToAuthList(address, isAllowed);
         });
+        if (this.#alwaysLock) {
+          this.keyringLock();
+        }
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1370,6 +1391,9 @@ class KoniExtension {
           _uiKeyring.keyring.restoreAccounts(file, password);
           this._addAddressesToAuthList(addressList, isAllowed);
         });
+        if (this.#alwaysLock) {
+          this.keyringLock();
+        }
       } catch (error) {
         throw new Error(error.message);
       }
@@ -2245,6 +2269,9 @@ class KoniExtension {
           resolve();
         });
       });
+      if (this.#alwaysLock) {
+        this.keyringLock();
+      }
       return {
         errors: [],
         success: true
@@ -2768,6 +2795,9 @@ class KoniExtension {
       };
     }
     this.#koniState.updateKeyringState();
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return {
       status: true,
       errors: []
@@ -2821,8 +2851,7 @@ class KoniExtension {
   // Lock wallet
 
   keyringLock() {
-    _uiKeyring.keyring.lockAll();
-    this.#koniState.updateKeyringState();
+    this.#koniState.keyringService.lock();
     clearTimeout(this.#lockTimeOut);
   }
 
@@ -2921,6 +2950,9 @@ class KoniExtension {
       // In case evm chain, must be cut 2 character after 0x
       signature: isEvm ? `0x${result.signature.slice(4)}` : result.signature
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return true;
   }
 
@@ -3020,6 +3052,9 @@ class KoniExtension {
       _uiKeyring.keyring.addPair(childPair, true);
       this._addAddressToAuthList(address, true);
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return true;
   }
   validateDerivePath(_ref74) {
@@ -3542,11 +3577,13 @@ class KoniExtension {
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
     clearTimeout(this.#lockTimeOut);
-    this.#lockTimeOut = setTimeout(() => {
-      if (!this.#skipAutoLock) {
-        this.keyringLock();
-      }
-    }, this.#timeAutoLock * 60 * 1000);
+    if (this.#timeAutoLock > 0) {
+      this.#lockTimeOut = setTimeout(() => {
+        if (!this.#skipAutoLock) {
+          this.keyringLock();
+        }
+      }, this.#timeAutoLock * 60 * 1000);
+    }
     switch (type) {
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.10-0'
+  version: '1.1.11-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/constants.js

@@ -61,7 +61,7 @@ const _NFT_CHAIN_GROUP = {
 // Staking--------------------------------------------------------------------------------------------------------------
 exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
@@ -102,7 +102,8 @@ const _STAKING_ERA_LENGTH_MAP = {
   kilt: 2,
   kilt_peregrine: 2,
   edgeware: 6,
-  kate: 6
+  kate: 6,
+  creditcoin: 24
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {

package/cjs/services/keyring-service/index.js

@@ -94,6 +94,10 @@ class KeyringService {
     this.eventService.emit('account.updateCurrent', currentAccountData);
     this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
   }
+  lock() {
+    _uiKeyring.keyring.lockAll();
+    this.updateKeyringState();
+  }
   resetWallet(resetAll) {
     _uiKeyring.keyring.resetWallet(resetAll);
     this.updateKeyringState();

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -45,13 +45,19 @@ class EvmRequestHandler {
   getConfirmationsQueueSubject() {
     return this.confirmationsQueueSubject;
   }
-  addConfirmation(id, url, type, payload) {
+  async addConfirmation(id, url, type, payload) {
     let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
     let validator = arguments.length > 5 ? arguments[5] : undefined;
     const confirmations = this.confirmationsQueueSubject.getValue();
     const confirmationType = confirmations[type];
     const payloadJson = JSON.stringify(payload);
     const isInternal = (0, _request.isInternalRequest)(url);
+    if (['evmSignatureRequest', 'evmSendTransactionRequest'].includes(type)) {
+      const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+      if (isAlwaysRequired) {
+        this.#requestService.keyringService.lock();
+      }
+    }
 
     // Check duplicate request
     const duplicated = Object.values(confirmationType).find(c => c.url === url && c.payloadJson === payloadJson);
@@ -193,6 +199,12 @@ class EvmRequestHandler {
       } else if (t === 'evmSendTransactionRequest') {
         result.payload = await this.signTransaction(request);
       }
+      if (t === 'evmSignatureRequest' || t === 'evmSendTransactionRequest') {
+        const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+        if (isAlwaysRequired) {
+          this.#requestService.keyringService.lock();
+        }
+      }
     }
   }
   async completeConfirmation(request) {

package/cjs/services/request-service/handler/SubstrateRequestHandler.js

@@ -67,8 +67,12 @@ class SubstrateRequestHandler {
   get numSubstrateRequests() {
     return Object.keys(this.#substrateRequests).length;
   }
-  sign(url, request, account, _id) {
+  async sign(url, request, account, _id) {
     const id = _id || (0, _getId.getId)();
+    const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+    if (isAlwaysRequired) {
+      this.#requestService.keyringService.lock();
+    }
     return new Promise((resolve, reject) => {
       this.#substrateRequests[id] = {
         ...this.signComplete(id, resolve, reject),
@@ -81,7 +85,11 @@ class SubstrateRequestHandler {
       this.#requestService.popupOpen();
     });
   }
-  signTransaction(id, address, url, payload) {
+  async signTransaction(id, address, url, payload) {
+    const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+    if (isAlwaysRequired) {
+      this.#requestService.keyringService.lock();
+    }
     return new Promise((resolve, reject) => {
       const pair = _uiKeyring.default.getPair(address);
       const account = {

package/cjs/services/request-service/index.js

@@ -21,9 +21,9 @@ class RequestService {
 
   // Common
   constructor(chainService, settingService, keyringService) {
-    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
+    this.keyringService = keyringService;
     this.#popupHandler = new _handler.PopupHandler(this);
     this.#metadataRequestHandler = new _handler.MetadataRequestHandler(this);
     this.#authRequestHandler = new _handler.AuthRequestHandler(this, this.#chainService, this.keyringService);

package/cjs/services/setting-service/SettingService.js

@@ -53,6 +53,15 @@ class SettingService {
   setPassPhishing(data, callback) {
     this.passPhishingStore.set('PassPhishing', data, callback);
   }
+
+  // Use for mobile only
+  get isAlwaysRequired() {
+    return new Promise(resolve => {
+      this.settingsStore.get('Settings', value => {
+        resolve(!value.timeAutoLock);
+      });
+    });
+  }
   resetWallet() {
     this.settingsStore.set('Settings', _constants2.DEFAULT_SETTING);
     this.passPhishingStore.set('PassPhishing', {});

package/cjs/utils/getId.js

@@ -10,5 +10,5 @@ var _defaults = require("../defaults");
 
 let counter = 0;
 function getId() {
-  return `${_defaults.EXTENSION_PREFIX}.${Date.now()}.${++counter}`;
+  return `${_defaults.ID_PREFIX}.${Date.now()}.${++counter}`;
 }

package/constants/i18n.js

@@ -32,4 +32,4 @@ export const languageOptions = [{
   text: 'اردو',
   value: 'ur'
 }];
-export const ENABLE_LANGUAGES = ['en', 'vi', 'zh', 'ja'];
+export const ENABLE_LANGUAGES = ['en', 'vi', 'zh', 'ja', 'ru'];

package/defaults.d.ts

@@ -1,6 +1,7 @@
 declare const ALLOWED_PATH: readonly ["/", "/settings/security", "/accounts/connect-ledger", "/accounts/restore-json", "/accounts/detail", "/accounts/new-seed-phrase"];
 declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
 declare const EXTENSION_PREFIX: string;
+declare const ID_PREFIX: string;
 declare const PORT_MOBILE: string;
 declare const PORT_CONTENT: string;
 declare const PORT_EXTENSION: string;
@@ -8,4 +9,4 @@ declare const MESSAGE_ORIGIN_PAGE: string;
 declare const MESSAGE_ORIGIN_CONTENT: string;
 declare const PASSWORD_EXPIRY_MIN = 15;
 declare const PASSWORD_EXPIRY_MS: number;
-export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, PORT_MOBILE, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };
+export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, ID_PREFIX, PORT_MOBILE, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };

package/defaults.js

@@ -4,6 +4,7 @@
 const ALLOWED_PATH = ['/', '/settings/security', '/accounts/connect-ledger', '/accounts/restore-json', '/accounts/detail', '/accounts/new-seed-phrase'];
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
+const ID_PREFIX = process.env.ID_PREFIX || EXTENSION_PREFIX || '';
 const PORT_MOBILE = `${EXTENSION_PREFIX}mobile`;
 const PORT_CONTENT = `${EXTENSION_PREFIX}koni-content`;
 const PORT_EXTENSION = `${EXTENSION_PREFIX}koni-extension`;
@@ -11,4 +12,4 @@ const MESSAGE_ORIGIN_PAGE = `${EXTENSION_PREFIX}koni-page`;
 const MESSAGE_ORIGIN_CONTENT = `${EXTENSION_PREFIX}koni-content`;
 const PASSWORD_EXPIRY_MIN = 15;
 const PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MIN * 60 * 1000;
-export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, PORT_MOBILE, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };
+export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, ID_PREFIX, PORT_MOBILE, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };

package/koni/api/nft/config.d.ts

@@ -17,10 +17,10 @@ export declare const UNIQUE_IPFS_GATEWAY = "https://ipfs.unique.network/ipfs/";
 export declare const NFT_STORAGE_GATEWAY = "https://nftstorage.link/ipfs/";
 export declare const IPFS_W3S_LINK = "https://w3s.link/ipfs/";
 export declare const GATEWAY_IPFS_IO = "https://gateway.ipfs.io/ipfs/";
+export declare const IPFS_IO = "https://ipfs.io/ipfs/";
 export declare const DWEB_LINK = "https://dweb.link/ipfs/";
 export declare const IPFS_GATEWAY_4EVERLAND = "https://4everland.io/ipfs/";
 export declare const IPFS_FLEEK = "https://ipfs.fleek.co/ipfs/";
-export declare const IPFS_HARDBIN = "https://hardbin.com/ipfs/";
 export declare enum SUPPORTED_NFT_NETWORKS {
     karura = "karura",
     acala = "acala",

package/koni/api/nft/config.js

@@ -21,10 +21,10 @@ export const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';
 export const NFT_STORAGE_GATEWAY = 'https://nftstorage.link/ipfs/';
 export const IPFS_W3S_LINK = 'https://w3s.link/ipfs/';
 export const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
+export const IPFS_IO = 'https://ipfs.io/ipfs/';
 export const DWEB_LINK = 'https://dweb.link/ipfs/';
 export const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 export const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
-export const IPFS_HARDBIN = 'https://hardbin.com/ipfs/';
 export let SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
   SUPPORTED_NFT_NETWORKS["karura"] = "karura";
@@ -76,26 +76,24 @@ const RANDOM_IPFS_GATEWAY_SETTING = [{
 }, {
   provider: PINATA_IPFS_GATEWAY,
   weight: 1 // Rate limit too low
+}, {
+  provider: DWEB_LINK,
+  weight: 5
 }, {
   provider: GATEWAY_IPFS_IO,
   weight: 5
 }, {
-  provider: DWEB_LINK,
+  provider: IPFS_IO,
   weight: 5
+}, {
+  provider: NFT_STORAGE_GATEWAY,
+  weight: 50
 }];
 if (!RuntimeInfo.protocol || RuntimeInfo.protocol && !RuntimeInfo.protocol.startsWith('http')) {
-  RANDOM_IPFS_GATEWAY_SETTING.push({
-    provider: NFT_STORAGE_GATEWAY,
-    weight: 50
-  });
   RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_FLEEK,
     weight: 4
   });
-  RANDOM_IPFS_GATEWAY_SETTING.push({
-    provider: IPFS_HARDBIN,
-    weight: 1
-  });
   RANDOM_IPFS_GATEWAY_SETTING.push({
     provider: IPFS_GATEWAY_4EVERLAND,
     weight: 2

package/koni/background/handlers/Extension.js

@@ -68,16 +68,31 @@ export default class KoniExtension {
   #koniState;
   #timeAutoLock = DEFAULT_AUTO_LOCK_TIME;
   #skipAutoLock = false;
+  #alwaysLock = false;
+  #firstTime = true;
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
-      this.#timeAutoLock = rs.timeAutoLock;
-      clearTimeout(this.#lockTimeOut);
-      this.#lockTimeOut = setTimeout(() => {
-        if (!this.#skipAutoLock) {
-          this.keyringLock();
+      // Check time auto lock change
+      if (this.#timeAutoLock !== rs.timeAutoLock) {
+        this.#timeAutoLock = rs.timeAutoLock;
+        this.#alwaysLock = !rs.timeAutoLock;
+        clearTimeout(this.#lockTimeOut);
+        if (this.#timeAutoLock > 0) {
+          this.#lockTimeOut = setTimeout(() => {
+            if (!this.#skipAutoLock) {
+              this.keyringLock();
+            }
+          }, this.#timeAutoLock * 60 * 1000);
+        } else if (this.#alwaysLock) {
+          if (!this.#firstTime) {
+            this.keyringLock();
+          }
         }
-      }, this.#timeAutoLock * 60 * 1000);
+      }
+      if (this.#firstTime) {
+        this.#firstTime = false;
+      }
     };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
@@ -1126,6 +1141,9 @@ export default class KoniExtension {
         resolve();
       });
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return addressDict;
   }
   async accountsForgetOverride({
@@ -1296,6 +1314,9 @@ export default class KoniExtension {
           keyring.restoreAccount(file, password, withMasterPassword);
           this._addAddressToAuthList(address, isAllowed);
         });
+        if (this.#alwaysLock) {
+          this.keyringLock();
+        }
       } catch (error) {
         throw new Error(error.message);
       }
@@ -1317,6 +1338,9 @@ export default class KoniExtension {
           keyring.restoreAccounts(file, password);
           this._addAddressesToAuthList(addressList, isAllowed);
         });
+        if (this.#alwaysLock) {
+          this.keyringLock();
+        }
       } catch (error) {
         throw new Error(error.message);
       }
@@ -2177,6 +2201,9 @@ export default class KoniExtension {
           resolve();
         });
       });
+      if (this.#alwaysLock) {
+        this.keyringLock();
+      }
       return {
         errors: [],
         success: true
@@ -2693,6 +2720,9 @@ export default class KoniExtension {
       };
     }
     this.#koniState.updateKeyringState();
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return {
       status: true,
       errors: []
@@ -2744,8 +2774,7 @@ export default class KoniExtension {
   // Lock wallet
 
   keyringLock() {
-    keyring.lockAll();
-    this.#koniState.updateKeyringState();
+    this.#koniState.keyringService.lock();
     clearTimeout(this.#lockTimeOut);
   }
 
@@ -2841,6 +2870,9 @@ export default class KoniExtension {
       // In case evm chain, must be cut 2 character after 0x
       signature: isEvm ? `0x${result.signature.slice(4)}` : result.signature
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return true;
   }
 
@@ -2937,6 +2969,9 @@ export default class KoniExtension {
       keyring.addPair(childPair, true);
       this._addAddressToAuthList(address, true);
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return true;
   }
   validateDerivePath({
@@ -3442,11 +3477,13 @@ export default class KoniExtension {
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
     clearTimeout(this.#lockTimeOut);
-    this.#lockTimeOut = setTimeout(() => {
-      if (!this.#skipAutoLock) {
-        this.keyringLock();
-      }
-    }, this.#timeAutoLock * 60 * 1000);
+    if (this.#timeAutoLock > 0) {
+      this.#lockTimeOut = setTimeout(() => {
+        if (!this.#skipAutoLock) {
+          this.keyringLock();
+        }
+      }, this.#timeAutoLock * 60 * 1000);
+    }
     switch (type) {
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.10-0",
+  "version": "1.1.11-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1221,11 +1221,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.12",
-    "@subwallet/extension-base": "^1.1.10-0",
-    "@subwallet/extension-chains": "^1.1.10-0",
-    "@subwallet/extension-dapp": "^1.1.10-0",
-    "@subwallet/extension-inject": "^1.1.10-0",
+    "@subwallet/chain-list": "0.2.13",
+    "@subwallet/extension-base": "^1.1.11-0",
+    "@subwallet/extension-chains": "^1.1.11-0",
+    "@subwallet/extension-dapp": "^1.1.11-0",
+    "@subwallet/extension-inject": "^1.1.11-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.10-0'
+  version: '1.1.11-0'
 };

package/services/chain-service/constants.js

@@ -49,7 +49,7 @@ export const _NFT_CHAIN_GROUP = {
 // Staking--------------------------------------------------------------------------------------------------------------
 
 export const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
@@ -89,7 +89,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
   kilt: 2,
   kilt_peregrine: 2,
   edgeware: 6,
-  kate: 6
+  kate: 6,
+  creditcoin: 24
 };
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {

package/services/keyring-service/index.d.ts

@@ -18,5 +18,6 @@ export declare class KeyringService {
     get addresses(): SubjectInfo;
     get currentAccount(): CurrentAccountInfo;
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
+    lock(): void;
     resetWallet(resetAll: boolean): void;
 }

package/services/keyring-service/index.js

@@ -87,6 +87,10 @@ export class KeyringService {
     this.eventService.emit('account.updateCurrent', currentAccountData);
     this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
   }
+  lock() {
+    keyring.lockAll();
+    this.updateKeyringState();
+  }
   resetWallet(resetAll) {
     keyring.resetWallet(resetAll);
     this.updateKeyringState();

package/services/request-service/handler/EvmRequestHandler.js

@@ -38,11 +38,17 @@ export default class EvmRequestHandler {
   getConfirmationsQueueSubject() {
     return this.confirmationsQueueSubject;
   }
-  addConfirmation(id, url, type, payload, options = {}, validator) {
+  async addConfirmation(id, url, type, payload, options = {}, validator) {
     const confirmations = this.confirmationsQueueSubject.getValue();
     const confirmationType = confirmations[type];
     const payloadJson = JSON.stringify(payload);
     const isInternal = isInternalRequest(url);
+    if (['evmSignatureRequest', 'evmSendTransactionRequest'].includes(type)) {
+      const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+      if (isAlwaysRequired) {
+        this.#requestService.keyringService.lock();
+      }
+    }
 
     // Check duplicate request
     const duplicated = Object.values(confirmationType).find(c => c.url === url && c.payloadJson === payloadJson);
@@ -182,6 +188,12 @@ export default class EvmRequestHandler {
       } else if (t === 'evmSendTransactionRequest') {
         result.payload = await this.signTransaction(request);
       }
+      if (t === 'evmSignatureRequest' || t === 'evmSendTransactionRequest') {
+        const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+        if (isAlwaysRequired) {
+          this.#requestService.keyringService.lock();
+        }
+      }
     }
   }
   async completeConfirmation(request) {

package/services/request-service/handler/SubstrateRequestHandler.js

@@ -57,8 +57,12 @@ export default class SubstrateRequestHandler {
   get numSubstrateRequests() {
     return Object.keys(this.#substrateRequests).length;
   }
-  sign(url, request, account, _id) {
+  async sign(url, request, account, _id) {
     const id = _id || getId();
+    const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+    if (isAlwaysRequired) {
+      this.#requestService.keyringService.lock();
+    }
     return new Promise((resolve, reject) => {
       this.#substrateRequests[id] = {
         ...this.signComplete(id, resolve, reject),
@@ -71,7 +75,11 @@ export default class SubstrateRequestHandler {
       this.#requestService.popupOpen();
     });
   }
-  signTransaction(id, address, url, payload) {
+  async signTransaction(id, address, url, payload) {
+    const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+    if (isAlwaysRequired) {
+      this.#requestService.keyringService.lock();
+    }
     return new Promise((resolve, reject) => {
       const pair = keyring.getPair(address);
       const account = {

package/services/request-service/index.d.ts

@@ -10,8 +10,8 @@ import { SignerPayloadJSON } from '@polkadot/types/types/extrinsic';
 import { AuthUrls, MetaRequest } from './types';
 export default class RequestService {
     #private;
-    private keyringService;
     readonly settingService: SettingService;
+    readonly keyringService: KeyringService;
     constructor(chainService: ChainService, settingService: SettingService, keyringService: KeyringService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;

package/services/request-service/index.js

@@ -15,9 +15,9 @@ export default class RequestService {
 
   // Common
   constructor(chainService, settingService, keyringService) {
-    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
+    this.keyringService = keyringService;
     this.#popupHandler = new PopupHandler(this);
     this.#metadataRequestHandler = new MetadataRequestHandler(this);
     this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService, this.keyringService);

package/services/setting-service/SettingService.d.ts

@@ -10,5 +10,6 @@ export default class SettingService {
     passPhishingSubject(): Subject<Record<string, PassPhishing>>;
     getPassPhishingList(update: (value: Record<string, PassPhishing>) => void): void;
     setPassPhishing(data: Record<string, PassPhishing>, callback?: () => void): void;
+    get isAlwaysRequired(): Promise<boolean>;
     resetWallet(): void;
 }

package/services/setting-service/SettingService.js

@@ -45,6 +45,15 @@ export default class SettingService {
   setPassPhishing(data, callback) {
     this.passPhishingStore.set('PassPhishing', data, callback);
   }
+
+  // Use for mobile only
+  get isAlwaysRequired() {
+    return new Promise(resolve => {
+      this.settingsStore.get('Settings', value => {
+        resolve(!value.timeAutoLock);
+      });
+    });
+  }
   resetWallet() {
     this.settingsStore.set('Settings', DEFAULT_SETTING);
     this.passPhishingStore.set('PassPhishing', {});

package/services/transaction-service/index.d.ts

@@ -11,13 +11,13 @@ import { BehaviorSubject } from 'rxjs';
 import { TransactionConfig } from 'web3-core';
 import { HexString } from '@polkadot/util/types';
 export default class TransactionService {
+    private readonly balanceService;
     private readonly chainService;
-    private readonly eventService;
     private readonly databaseService;
-    private readonly requestService;
-    private readonly balanceService;
+    private readonly eventService;
     private readonly historyService;
     private readonly notificationService;
+    private readonly requestService;
     private readonly transactionSubject;
     private get transactions();
     constructor(chainService: ChainService, eventService: EventService, requestService: RequestService, balanceService: BalanceService, historyService: HistoryService, notificationService: NotificationService, databaseService: DatabaseService);

package/utils/getId.js

@@ -1,8 +1,8 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { EXTENSION_PREFIX } from "../defaults.js";
+import { ID_PREFIX } from "../defaults.js";
 let counter = 0;
 export function getId() {
-  return `${EXTENSION_PREFIX}.${Date.now()}.${++counter}`;
+  return `${ID_PREFIX}.${Date.now()}.${++counter}`;
 }