@subwallet/extension-base 1.1.45-0 → 1.1.47-0

package/cjs/constants/index.js

@@ -29,12 +29,13 @@ var _exportNames = {
   IGNORE_GET_SUBSTRATE_FEATURES_LIST: true,
   IGNORE_QR_SIGNER: true,
   XCM_MIN_AMOUNT_RATIO: true,
+  XCM_FEE_RATIO: true,
   GAS_PRICE_RATIO: true,
   NETWORK_MULTI_GAS_FEE: true,
   ORDINAL_COLLECTION: true,
   ORDINAL_METHODS: true
 };
-exports.XCM_MIN_AMOUNT_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -112,6 +113,8 @@ const IGNORE_QR_SIGNER = [];
 exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
 const XCM_MIN_AMOUNT_RATIO = 1.2;
 exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
+const XCM_FEE_RATIO = 1.2;
+exports.XCM_FEE_RATIO = XCM_FEE_RATIO;
 const GAS_PRICE_RATIO = 1 + 2 / 100;
 exports.GAS_PRICE_RATIO = GAS_PRICE_RATIO;
 const NETWORK_MULTI_GAS_FEE = ['*'];

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

@@ -1936,7 +1936,7 @@ class KoniExtension {
     } else {
       const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
       let estimatedFee;
-      let maxTransferable = new _util.BN(freeBalance.value);
+      let maxTransferable = new _bignumber.default(freeBalance.value);
       try {
         if (isXcmTransfer) {
           const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
@@ -1944,7 +1944,7 @@ class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            maxTransferable = maxTransferable.sub(new _util.BN(tokenInfo.minAmount || '0'));
+            maxTransferable = maxTransferable.minus(new _bignumber.default(tokenInfo.minAmount || '0').multipliedBy(_constants.XCM_FEE_RATIO));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
             const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils2._isChainEvmCompatible)(desChainInfo) && !(0, _utils2._isChainEvmCompatible)(orgChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
@@ -2001,10 +2001,10 @@ class KoniExtension {
         estimatedFee = '0';
         console.warn('Unable to estimate fee', e);
       }
-      maxTransferable = maxTransferable.sub(new _util.BN(estimatedFee));
+      maxTransferable = maxTransferable.minus(new _bignumber.default(estimatedFee));
       return {
         ...freeBalance,
-        value: maxTransferable.gt(_util.BN_ZERO) ? maxTransferable.toString() || '0' : '0'
+        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toString() || '0' : '0'
       };
     }
   }

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.45-0'
+  version: '1.1.47-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -40,7 +40,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],

package/cjs/services/migration-service/scripts/databases/AutoEnableSomeTokens.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class AutoEnableSomeTokens extends _Base.default {
+  async run() {
+    try {
+      const slugs = ['statemint-NATIVE-DOT', 'statemint-LOCAL-DED', 'statemint-LOCAL-PINK', 'moonbeam-LOCAL-xcDOT', 'moonbeam-LOCAL-xcPINK'];
+      const migratedAssetSetting = {};
+      for (const slug of slugs) {
+        migratedAssetSetting[slug] = {
+          visible: true
+        };
+        await this.state.chainService.updateAssetSetting(slug, {
+          visible: true
+        }, true);
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = AutoEnableSomeTokens;

package/cjs/services/migration-service/scripts/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.EVERYTIME = void 0;
+var _AutoEnableSomeTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens"));
 var _DeleteEarningData = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData"));
 var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol"));
 var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
@@ -55,7 +56,8 @@ var _default = {
   '1.1.28-01': _MigrateEarningVersion.default,
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.44-01': _MigrateAssetSetting.default,
-  '1.1.45-01': _MigrateTransactionHistoryBySymbol.default
+  '1.1.45-01': _MigrateTransactionHistoryBySymbol.default,
+  '1.1.46-01': _AutoEnableSomeTokens.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

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

@@ -11,7 +11,6 @@ var _Authorize = _interopRequireDefault(require("@subwallet/extension-base/store
 var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _rxjs = require("rxjs");
-var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -212,17 +211,58 @@ class AuthRequestHandler {
       }
     };
   };
+  authorizePromiseMap = {};
   async authorizeUrlV2(url, request) {
     let authList = await this.getAuthList();
-    const accountAuthType = request.accountAuthType || 'substrate';
+    let accountAuthType = request.accountAuthType || 'substrate';
     request.accountAuthType = accountAuthType;
     if (!authList) {
       authList = {};
     }
+    const id = (0, _getId.getId)();
+    const promiseHandler = (0, _utils2.createPromiseHandler)();
+    const {
+      promise,
+      reject,
+      resolve
+    } = promiseHandler;
     const idStr = (0, _utils2.stripUrl)(url);
+    const isExistedAuthBothBefore = Object.entries(this.authorizeUrlSubject.value).find(_ref3 => {
+      let [key, data] = _ref3;
+      return key === idStr && data.accountAuthType === 'both';
+    });
+    if (isExistedAuthBothBefore) {
+      return true;
+    }
+
+    // Add promise to the map
+    this.authorizePromiseMap[id] = promiseHandler;
+    // Remove promise from the map after finish
+    promise.finally(() => {
+      delete this.authorizePromiseMap[id];
+    });
+
     // Do not enqueue duplicate authorization requests.
-    const isDuplicate = Object.values(this.#authRequestsV2).some(_request => _request.idStr === idStr && _request.accountAuthType === request.accountAuthType);
-    (0, _util.assert)(!isDuplicate, 'The source {{url}} has a pending authorization request'.replace('{{url}}', url));
+    const mergeKeys = [];
+    Object.entries(this.#authRequestsV2).forEach(_ref4 => {
+      let [key, _request] = _ref4;
+      if (_request.idStr === idStr) {
+        if (_request.accountAuthType !== request.accountAuthType) {
+          request.accountAuthType = 'both';
+          accountAuthType = 'both';
+        }
+        mergeKeys.push(key);
+      }
+    });
+
+    // Resolve with current promise
+    if (mergeKeys.length > 0) {
+      mergeKeys.forEach(key => {
+        delete this.#authRequestsV2[key];
+        const backupHandler = this.authorizePromiseMap[key];
+        promise.then(backupHandler.resolve).catch(backupHandler.reject);
+      });
+    }
     const existedAuth = authList[idStr];
     const existedAccountAuthType = existedAuth === null || existedAuth === void 0 ? void 0 : existedAuth.accountAuthType;
     const confirmAnotherType = existedAccountAuthType !== 'both' && existedAccountAuthType !== request.accountAuthType;
@@ -236,8 +276,8 @@ class AuthRequestHandler {
       if (inBlackList) {
         throw new Error('The source {{url}} is not allowed to interact with this extension'.replace('{{url}}', url));
       }
-      request.allowedAccounts = Object.entries(existedAuth.isAllowedMap).map(_ref3 => {
-        let [address, allowed] = _ref3;
+      request.allowedAccounts = Object.entries(existedAuth.isAllowedMap).map(_ref5 => {
+        let [address, allowed] = _ref5;
         return allowed ? address : '';
       }).filter(item => item !== '');
       let allowedListByRequestType = [...request.allowedAccounts];
@@ -270,21 +310,19 @@ class AuthRequestHandler {
         return true;
       }
     }
-    return new Promise((resolve, reject) => {
-      const id = (0, _getId.getId)();
-      this.#authRequestsV2[id] = {
-        ...this.authCompleteV2(id, url, resolve, reject),
-        id,
-        idStr,
-        request,
-        url,
-        accountAuthType: accountAuthType
-      };
-      this.updateIconAuthV2();
-      if (Object.keys(this.#authRequestsV2).length < 2) {
-        this.#requestService.popupOpen();
-      }
-    });
+    this.#authRequestsV2[id] = {
+      ...this.authCompleteV2(id, url, resolve, reject),
+      id,
+      idStr,
+      request,
+      url,
+      accountAuthType: accountAuthType
+    };
+    this.updateIconAuthV2();
+    if (Object.keys(this.#authRequestsV2).length < 2 && !(mergeKeys.length > 0 && mergeKeys[mergeKeys.length - 1] !== id)) {
+      this.#requestService.popupOpen();
+    }
+    return promise;
   }
   getAuthRequestV2(id) {
     return this.#authRequestsV2[id];

package/constants/index.d.ts

@@ -23,6 +23,7 @@ export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
+export declare const XCM_FEE_RATIO = 1.2;
 export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";

package/constants/index.js

@@ -26,6 +26,7 @@ export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
+export const XCM_FEE_RATIO = 1.2;
 export const GAS_PRICE_RATIO = 1 + 2 / 100;
 export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';

package/koni/background/handlers/Extension.js

@@ -10,7 +10,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingTxErrorType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, XCM_FEE_RATIO, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { resolveAzeroAddressToDomain, resolveAzeroDomainToAddress } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
@@ -33,7 +33,7 @@ import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/servi
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
@@ -42,7 +42,7 @@ import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { TypeRegistry } from '@polkadot/types';
-import { assert, BN, BN_ZERO, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
+import { assert, BN, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
 import { addressToEvm, base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 function getSuri(seed, type) {
@@ -1878,7 +1878,7 @@ export default class KoniExtension {
     } else {
       const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
       let estimatedFee;
-      let maxTransferable = new BN(freeBalance.value);
+      let maxTransferable = new BigN(freeBalance.value);
       try {
         if (isXcmTransfer) {
           const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
@@ -1886,7 +1886,7 @@ export default class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            maxTransferable = maxTransferable.sub(new BN(tokenInfo.minAmount || '0'));
+            maxTransferable = maxTransferable.minus(new BigN(tokenInfo.minAmount || '0').multipliedBy(XCM_FEE_RATIO));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
             const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(desChainInfo) && !_isChainEvmCompatible(orgChainInfo) ? u8aToHex(addressToEvm(address)) : address;
@@ -1943,7 +1943,7 @@ export default class KoniExtension {
         estimatedFee = '0';
         console.warn('Unable to estimate fee', e);
       }
-      maxTransferable = maxTransferable.sub(new BN(estimatedFee));
+      maxTransferable = maxTransferable.minus(new BigN(estimatedFee));
       return {
         ...freeBalance,
         value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toString() || '0' : '0'

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.45-0",
+  "version": "1.1.47-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -935,6 +935,11 @@
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
       "default": "./services/migration-service/scripts/ClearOldStorage.js"
     },
+    "./services/migration-service/scripts/databases/AutoEnableSomeTokens": {
+      "types": "./services/migration-service/scripts/databases/AutoEnableSomeTokens.d.ts",
+      "require": "./cjs/services/migration-service/scripts/databases/AutoEnableSomeTokens.js",
+      "default": "./services/migration-service/scripts/databases/AutoEnableSomeTokens.js"
+    },
     "./services/migration-service/scripts/databases/MigrateAssetSetting": {
       "types": "./services/migration-service/scripts/databases/MigrateAssetSetting.d.ts",
       "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js",
@@ -1791,11 +1796,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.47",
-    "@subwallet/extension-base": "^1.1.45-0",
-    "@subwallet/extension-chains": "^1.1.45-0",
-    "@subwallet/extension-dapp": "^1.1.45-0",
-    "@subwallet/extension-inject": "^1.1.45-0",
+    "@subwallet/chain-list": "0.2.52",
+    "@subwallet/extension-base": "^1.1.47-0",
+    "@subwallet/extension-chains": "^1.1.47-0",
+    "@subwallet/extension-dapp": "^1.1.47-0",
+    "@subwallet/extension-inject": "^1.1.47-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@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.45-0'
+  version: '1.1.47-0'
 };

package/services/chain-service/constants.js

@@ -29,7 +29,7 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],

package/services/migration-service/scripts/databases/AutoEnableSomeTokens.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class AutoEnableSomeTokens extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/databases/AutoEnableSomeTokens.js

@@ -0,0 +1,22 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class AutoEnableSomeTokens extends BaseMigrationJob {
+  async run() {
+    try {
+      const slugs = ['statemint-NATIVE-DOT', 'statemint-LOCAL-DED', 'statemint-LOCAL-PINK', 'moonbeam-LOCAL-xcDOT', 'moonbeam-LOCAL-xcPINK'];
+      const migratedAssetSetting = {};
+      for (const slug of slugs) {
+        migratedAssetSetting[slug] = {
+          visible: true
+        };
+        await this.state.chainService.updateAssetSetting(slug, {
+          visible: true
+        }, true);
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/index.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import AutoEnableSomeTokens from '@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens';
 import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
 import MigrateTransactionHistoryBySymbol from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol';
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
@@ -47,7 +48,8 @@ export default {
   '1.1.28-01': MigrateEarningVersion,
   '1.1.41-01': DeleteChainStaking,
   '1.1.44-01': MigrateAssetSetting,
-  '1.1.45-01': MigrateTransactionHistoryBySymbol
+  '1.1.45-01': MigrateTransactionHistoryBySymbol,
+  '1.1.46-01': AutoEnableSomeTokens
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -29,6 +29,7 @@ export default class AuthRequestHandler {
         url?: string;
     }): _ChainInfo | undefined;
     private authCompleteV2;
+    private authorizePromiseMap;
     authorizeUrlV2(url: string, request: RequestAuthorizeTab): Promise<boolean>;
     getAuthRequestV2(id: string): AuthRequestV2;
     get subscribeEvmChainChange(): BehaviorSubject<AuthUrls>;

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

@@ -4,10 +4,9 @@
 import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { PREDEFINED_CHAIN_DAPP_CHAIN_MAP, WEB_APP_URL } from '@subwallet/extension-base/services/request-service/constants';
 import AuthorizeStore from '@subwallet/extension-base/stores/Authorize';
-import { getDomainFromUrl, stripUrl } from '@subwallet/extension-base/utils';
+import { createPromiseHandler, getDomainFromUrl, stripUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { BehaviorSubject } from 'rxjs';
-import { assert } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 const AUTH_URLS_KEY = 'authUrls';
 export default class AuthRequestHandler {
@@ -200,17 +199,54 @@ export default class AuthRequestHandler {
       }
     };
   };
+  authorizePromiseMap = {};
   async authorizeUrlV2(url, request) {
     let authList = await this.getAuthList();
-    const accountAuthType = request.accountAuthType || 'substrate';
+    let accountAuthType = request.accountAuthType || 'substrate';
     request.accountAuthType = accountAuthType;
     if (!authList) {
       authList = {};
     }
+    const id = getId();
+    const promiseHandler = createPromiseHandler();
+    const {
+      promise,
+      reject,
+      resolve
+    } = promiseHandler;
     const idStr = stripUrl(url);
+    const isExistedAuthBothBefore = Object.entries(this.authorizeUrlSubject.value).find(([key, data]) => key === idStr && data.accountAuthType === 'both');
+    if (isExistedAuthBothBefore) {
+      return true;
+    }
+
+    // Add promise to the map
+    this.authorizePromiseMap[id] = promiseHandler;
+    // Remove promise from the map after finish
+    promise.finally(() => {
+      delete this.authorizePromiseMap[id];
+    });
+
     // Do not enqueue duplicate authorization requests.
-    const isDuplicate = Object.values(this.#authRequestsV2).some(_request => _request.idStr === idStr && _request.accountAuthType === request.accountAuthType);
-    assert(!isDuplicate, 'The source {{url}} has a pending authorization request'.replace('{{url}}', url));
+    const mergeKeys = [];
+    Object.entries(this.#authRequestsV2).forEach(([key, _request]) => {
+      if (_request.idStr === idStr) {
+        if (_request.accountAuthType !== request.accountAuthType) {
+          request.accountAuthType = 'both';
+          accountAuthType = 'both';
+        }
+        mergeKeys.push(key);
+      }
+    });
+
+    // Resolve with current promise
+    if (mergeKeys.length > 0) {
+      mergeKeys.forEach(key => {
+        delete this.#authRequestsV2[key];
+        const backupHandler = this.authorizePromiseMap[key];
+        promise.then(backupHandler.resolve).catch(backupHandler.reject);
+      });
+    }
     const existedAuth = authList[idStr];
     const existedAccountAuthType = existedAuth === null || existedAuth === void 0 ? void 0 : existedAuth.accountAuthType;
     const confirmAnotherType = existedAccountAuthType !== 'both' && existedAccountAuthType !== request.accountAuthType;
@@ -255,21 +291,19 @@ export default class AuthRequestHandler {
         return true;
       }
     }
-    return new Promise((resolve, reject) => {
-      const id = getId();
-      this.#authRequestsV2[id] = {
-        ...this.authCompleteV2(id, url, resolve, reject),
-        id,
-        idStr,
-        request,
-        url,
-        accountAuthType: accountAuthType
-      };
-      this.updateIconAuthV2();
-      if (Object.keys(this.#authRequestsV2).length < 2) {
-        this.#requestService.popupOpen();
-      }
-    });
+    this.#authRequestsV2[id] = {
+      ...this.authCompleteV2(id, url, resolve, reject),
+      id,
+      idStr,
+      request,
+      url,
+      accountAuthType: accountAuthType
+    };
+    this.updateIconAuthV2();
+    if (Object.keys(this.#authRequestsV2).length < 2 && !(mergeKeys.length > 0 && mergeKeys[mergeKeys.length - 1] !== id)) {
+      this.#requestService.popupOpen();
+    }
+    return promise;
   }
   getAuthRequestV2(id) {
     return this.#authRequestsV2[id];