@subwallet/extension-base 1.1.24-3 → 1.1.25-0

package/cjs/koni/api/staking/bonding/relayChain.js

@@ -394,7 +394,15 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
   const currentEra = _currentEra.toString();
   const nominations = _nominations.toJSON();
   let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-  const poolName = (0, _utils.transformPoolName)(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  const getPoolName = () => {
+    if (poolMetadata.isUtf8) {
+      return poolMetadata.toUtf8();
+    } else {
+      const str = poolMetadata.toString();
+      return (0, _util.isHex)(str) ? (0, _util.hexToString)(str) : str;
+    }
+  };
+  const poolName = getPoolName();
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
@@ -449,6 +457,10 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
     unstakings
   };
 }
+
+/**
+ * Deprecated
+ *  */
 async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const [_poolMemberInfo, _currentEra] = await Promise.all([chainApi.api.query.nominationPools.poolMembers(address), chainApi.api.query.staking.currentEra()]);
@@ -472,7 +484,15 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
   let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);
   const poolMetadata = _poolMetadata.toPrimitive();
-  const poolName = (0, _utils.transformPoolName)(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  const getPoolName = () => {
+    if (poolMetadata.isUtf8) {
+      return poolMetadata.toUtf8();
+    } else {
+      const str = poolMetadata.toString();
+      return (0, _util.isHex)(str) ? (0, _util.hexToString)(str) : str;
+    }
+  };
+  const poolName = getPoolName();
   const poolStashAccount = (0, _utils.parsePoolStashAddress)(chainApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
   const _nominations = await chainApi.api.query.staking.nominators(poolStashAccount);
   const nominations = _nominations.toJSON();

package/cjs/koni/api/staking/bonding/utils.js

@@ -105,8 +105,8 @@ async function parseIdentity(substrateApi, address, children) {
       const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
       const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
       const isReasonable = identityInfo.judgements.length > 0;
-      if (displayName && !displayName.startsWith('0x')) {
-        identity = displayName;
+      if (displayName) {
+        identity = (0, _util.isHex)(displayName) ? (0, _util.hexToString)(displayName) : displayName;
       } else {
         identity = twitter || web || riot;
       }

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

@@ -327,17 +327,22 @@ class KoniTabs {
     }
   }
   async getEvmCurrentAccount(url) {
-    let getAll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
         const allAccounts = this.#koniState.keyringService.accounts;
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
         const address = this.#koniState.keyringService.currentAccount.address;
-        if (address === _constants.ALL_ACCOUNT_KEY || !accountList.includes(address) || getAll) {
+        if (address === _constants.ALL_ACCOUNT_KEY || !address) {
           accounts = accountList;
-        } else if (address && accountList.includes(address)) {
-          accounts = [address];
+        } else {
+          if (accountList.includes(address)) {
+            const result = accountList.filter(adr => adr !== address);
+            result.unshift(address);
+            accounts = result;
+          } else {
+            accounts = accountList;
+          }
         }
         resolve(accounts);
       }).catch(console.error);
@@ -401,7 +406,7 @@ class KoniTabs {
     }
   }
   async getEvmPermission(url, id) {
-    const accounts = await this.getEvmCurrentAccount(url, true);
+    const accounts = await this.getEvmCurrentAccount(url);
     return [{
       id: id,
       invoker: url,
@@ -784,7 +789,7 @@ class KoniTabs {
     });
   }
   async canUseAccount(address, url) {
-    const allowedAccounts = await this.getEvmCurrentAccount(url, true);
+    const allowedAccounts = await this.getEvmCurrentAccount(url);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
   async evmSign(id, url, _ref20) {
@@ -792,7 +797,7 @@ class KoniTabs {
       method,
       params
     } = _ref20;
-    const allowedAccounts = await this.getEvmCurrentAccount(url, true);
+    const allowedAccounts = await this.getEvmCurrentAccount(url);
     const signResult = await this.#koniState.evmSign(id, url, method, params, allowedAccounts);
     if (signResult) {
       return signResult;
@@ -814,7 +819,7 @@ class KoniTabs {
     if (!networkKey) {
       throw new Error('Network unavailable. Please switch network or manually add network to wallet');
     }
-    const allowedAccounts = await this.getEvmCurrentAccount(url, true);
+    const allowedAccounts = await this.getEvmCurrentAccount(url);
     const transactionHash = await this.#koniState.evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams);
     if (!transactionHash) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);

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.24-3'
+  version: '1.1.25-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/balance.js

@@ -1,20 +1,49 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getAccountJsonByAddress = void 0;
 exports.subscribeBalance = subscribeBalance;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _account = require("@subwallet/extension-base/utils/account");
+var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _evm = require("./evm");
 var _substrate = require("./substrate");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+const getAccountJsonByAddress = address => {
+  try {
+    const pair = _uiKeyring.default.getPair(address);
+    if (pair) {
+      return {
+        address: pair.address,
+        type: pair.type,
+        ...pair.meta
+      };
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+};
+exports.getAccountJsonByAddress = getAccountJsonByAddress;
 const filterAddress = (addresses, chainInfo) => {
   const isEvmChain = (0, _utils._isChainEvmCompatible)(chainInfo);
   const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
@@ -24,7 +53,7 @@ const filterAddress = (addresses, chainInfo) => {
     const fetchList = [];
     const unfetchList = [];
     substrateAddresses.forEach(address => {
-      const account = (0, _account.getAccountJsonByAddress)(address);
+      const account = getAccountJsonByAddress(address);
       if (account) {
         if (account.isHardware) {
           const availGen = account.availableGenesisHashes || [];

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

@@ -247,7 +247,7 @@ exports._XCM_TYPE = _XCM_TYPE;
 const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS, 'vara_network'];
 exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
 const EVM_PASS_CONNECT_STATUS = {
-  acala: ['acala_evm', 'karura_evm']
+  arbitrum_one: ['*']
 };
 exports.EVM_PASS_CONNECT_STATUS = EVM_PASS_CONNECT_STATUS;
 const EVM_REFORMAT_DECIMALS = {

package/cjs/services/chain-service/handler/EvmApi.js

@@ -14,7 +14,6 @@ var _web = _interopRequireDefault(require("web3"));
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const acalaEvmNetworks = _constants.EVM_PASS_CONNECT_STATUS.acala;
 class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new _rxjs.BehaviorSubject(false);
@@ -74,10 +73,14 @@ class EvmApi {
     this.intervalCheckApi = this.createIntervalCheckApi();
     this.connect();
   }
+  get ignoreNetListen() {
+    const ignoreRpc = _constants.EVM_PASS_CONNECT_STATUS[this.chainSlug];
+    return ignoreRpc ? ignoreRpc.includes('*') || ignoreRpc.includes(this.apiUrl) : false;
+  }
   createIntervalCheckApi() {
     this.clearIntervalCheckApi();
     return setInterval(() => {
-      if (!acalaEvmNetworks.includes(this.chainSlug)) {
+      if (!this.ignoreNetListen) {
         this.api.eth.net.isListening().then(() => {
           this.onConnect();
         }).catch(() => {
@@ -98,7 +101,7 @@ class EvmApi {
     this.updateConnectionStatus(_types._ChainConnectionStatus.CONNECTING);
 
     // Check if api is ready
-    if (!acalaEvmNetworks.includes(this.chainSlug)) {
+    if (!this.ignoreNetListen) {
       this.api.eth.net.isListening().then(() => {
         this.isApiReadyOnce = true;
         this.onConnect();

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

@@ -5,17 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.EVERYTIME = void 0;
-var _DeleteChain = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteChain"));
+var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
+var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
+var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
 var _AutoEnableChainsTokens = _interopRequireDefault(require("./AutoEnableChainsTokens"));
+var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
 var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
 var _MigrateAutoLock = _interopRequireDefault(require("./MigrateAutoLock"));
 var _MigrateChainPatrol = _interopRequireDefault(require("./MigrateChainPatrol"));
-var _MigrateEthProvider = _interopRequireDefault(require("./MigrateEthProvider"));
 var _MigrateImportedToken = _interopRequireDefault(require("./MigrateImportedToken"));
 var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccount"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
-var _MigratePioneerProvider = _interopRequireDefault(require("./MigratePioneerProvider"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
@@ -40,7 +41,8 @@ var _default = {
   '1.1.7': _DeleteChain.default,
   '1.1.13-01': _MigrateTokenDecimals.default,
   '1.1.17-01': _MigratePioneerProvider.default,
-  '1.1.17-03': _EnableVaraChain.default
+  '1.1.17-03': _EnableVaraChain.default,
+  '1.1.24-01': _MigrateProvidersV1M1P.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/cjs/services/migration-service/scripts/{MigrateEthProvider.js → providers/MigrateEthProvider.js}

@@ -10,8 +10,8 @@ var _MigrateProvider = _interopRequireDefault(require("./MigrateProvider"));
 // SPDX-License-Identifier: Apache-2.0
 
 class MigrateEthProvider extends _MigrateProvider.default {
-  newProvider = 'ethereum';
+  slug = 'ethereum';
   oldProvider = 'Cloudflare';
-  slug = 'Llamarpc';
+  newProvider = 'Llamarpc';
 }
 exports.default = MigrateEthProvider;

package/cjs/services/migration-service/scripts/providers/MigrateGeneralProvider.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _MigrateProvider = _interopRequireDefault(require("./MigrateProvider"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateGeneralProvider extends _MigrateProvider.default {
+  constructor(state, target) {
+    super(state);
+    this.slug = target.slug;
+    this.oldProvider = target.oldProvider;
+    this.newProvider = target.newProvider;
+  }
+}
+exports.default = MigrateGeneralProvider;

package/cjs/services/migration-service/scripts/providers/MigrateMultiProviders.js

@@ -0,0 +1,21 @@
+"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"));
+var _MigrateGeneralProvider = _interopRequireDefault(require("./MigrateGeneralProvider"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateMultiProviders extends _Base.default {
+  async run() {
+    for (const target of this.targets) {
+      const migration = new _MigrateGeneralProvider.default(this.state, target);
+      await migration.run();
+    }
+  }
+}
+exports.default = MigrateMultiProviders;

package/cjs/services/migration-service/scripts/{MigrateProvider.js → providers/MigrateProvider.js}

@@ -14,7 +14,7 @@ class MigrateProvider extends _Base.default {
     const state = this.state;
     const chainState = state.getChainStateByKey(this.slug);
     const chainInfo = state.getChainInfo(this.slug);
-    if (chainState && chainState.active && chainState.currentProvider === this.oldProvider) {
+    if (chainState && chainState.active && chainInfo.providers[this.newProvider] && chainState.currentProvider === this.oldProvider) {
       await state.upsertChainInfo({
         mode: 'update',
         chainEditInfo: {

package/cjs/services/migration-service/scripts/providers/MigrateProvidersV1M1P24.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _MigrateMultiProviders = _interopRequireDefault(require("./MigrateMultiProviders"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateProvidersV1M1P24 extends _MigrateMultiProviders.default {
+  targets = [{
+    slug: 'polkadot',
+    oldProvider: 'Parity',
+    newProvider: 'Dwellir'
+  }, {
+    slug: 'kusama',
+    oldProvider: 'Parity',
+    newProvider: 'Dwellir'
+  }, {
+    slug: 'moonbeam',
+    oldProvider: 'OnFinality',
+    newProvider: 'Moonbeam Foundation'
+  }, {
+    slug: 'moonbase',
+    oldProvider: 'OnFinality',
+    newProvider: 'Moonbeam Foundation'
+  }];
+}
+exports.default = MigrateProvidersV1M1P24;

package/cjs/utils/account.js

@@ -1,14 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAccountJsonByAddress = exports.convertSubjectInfoToAddresses = void 0;
+exports.convertSubjectInfoToAddresses = void 0;
 exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
 exports.simpleAddress = void 0;
 var _index = require("@subwallet/extension-base/utils/index");
-var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -33,32 +31,4 @@ const convertSubjectInfoToAddresses = subjectInfo => {
     ...info.json.meta
   }));
 };
-
-/**
- * @function getAccountJsonByAddress
- * @desc Get account info by address
- * <p>
- *   Note: Use on the background only
- * </p>
- * @param {string} address - Address
- * @returns {AccountJson|null}  - Account info or null if not found
- */
-exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;
-const getAccountJsonByAddress = address => {
-  try {
-    const pair = _uiKeyring.default.getPair(address);
-    if (pair) {
-      return {
-        address: pair.address,
-        type: pair.type,
-        ...pair.meta
-      };
-    } else {
-      return null;
-    }
-  } catch (e) {
-    console.warn(e);
-    return null;
-  }
-};
-exports.getAccountJsonByAddress = getAccountJsonByAddress;
+exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;

package/koni/api/staking/bonding/relayChain.d.ts

@@ -31,6 +31,9 @@ export declare function subscribeRelayChainNominatorMetadata(chainInfo: _ChainIn
  * */
 export declare function getRelayChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function subscribeRelayChainPoolMemberMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, poolMemberInfo: PalletNominationPoolsPoolMember): Promise<NominatorMetadata>;
+/**
+ * Deprecated
+ *  */
 export declare function getRelayChainPoolMemberMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getRelayValidatorsInfo(chain: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;
 export declare function getRelayPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<NominationPoolInfo[]>;

package/koni/api/staking/bonding/relayChain.js

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, parseIdentity, parsePoolStashAddress, transformPoolName } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getCommission, getExistUnstakeErrorMessage, getMaxValidatorErrorMessage, getMinStakeErrorMessage, parseIdentity, parsePoolStashAddress } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
@@ -369,7 +369,15 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   const currentEra = _currentEra.toString();
   const nominations = _nominations.toJSON();
   let stakingStatus = StakingStatus.NOT_EARNING;
-  const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  const getPoolName = () => {
+    if (poolMetadata.isUtf8) {
+      return poolMetadata.toUtf8();
+    } else {
+      const str = poolMetadata.toString();
+      return isHex(str) ? hexToString(str) : str;
+    }
+  };
+  const poolName = getPoolName();
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
@@ -423,6 +431,10 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
     unstakings
   };
 }
+
+/**
+ * Deprecated
+ *  */
 export async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const [_poolMemberInfo, _currentEra] = await Promise.all([chainApi.api.query.nominationPools.poolMembers(address), chainApi.api.query.staking.currentEra()]);
@@ -446,7 +458,15 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   let stakingStatus = StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);
   const poolMetadata = _poolMetadata.toPrimitive();
-  const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  const getPoolName = () => {
+    if (poolMetadata.isUtf8) {
+      return poolMetadata.toUtf8();
+    } else {
+      const str = poolMetadata.toString();
+      return isHex(str) ? hexToString(str) : str;
+    }
+  };
+  const poolName = getPoolName();
   const poolStashAccount = parsePoolStashAddress(chainApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
   const _nominations = await chainApi.api.query.staking.nominators(poolStashAccount);
   const nominations = _nominations.toJSON();

package/koni/api/staking/bonding/utils.js

@@ -75,8 +75,8 @@ export async function parseIdentity(substrateApi, address, children) {
       const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
       const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
       const isReasonable = identityInfo.judgements.length > 0;
-      if (displayName && !displayName.startsWith('0x')) {
-        identity = displayName;
+      if (displayName) {
+        identity = isHex(displayName) ? hexToString(displayName) : displayName;
       } else {
         identity = twitter || web || riot;
       }

package/koni/background/handlers/Tabs.js

@@ -285,17 +285,23 @@ export default class KoniTabs {
       return this.#koniState.authorizeUrlV2(url, request);
     }
   }
-  async getEvmCurrentAccount(url, getAll = false) {
+  async getEvmCurrentAccount(url) {
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
         const allAccounts = this.#koniState.keyringService.accounts;
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
         const address = this.#koniState.keyringService.currentAccount.address;
-        if (address === ALL_ACCOUNT_KEY || !accountList.includes(address) || getAll) {
+        if (address === ALL_ACCOUNT_KEY || !address) {
           accounts = accountList;
-        } else if (address && accountList.includes(address)) {
-          accounts = [address];
+        } else {
+          if (accountList.includes(address)) {
+            const result = accountList.filter(adr => adr !== address);
+            result.unshift(address);
+            accounts = result;
+          } else {
+            accounts = accountList;
+          }
         }
         resolve(accounts);
       }).catch(console.error);
@@ -359,7 +365,7 @@ export default class KoniTabs {
     }
   }
   async getEvmPermission(url, id) {
-    const accounts = await this.getEvmCurrentAccount(url, true);
+    const accounts = await this.getEvmCurrentAccount(url);
     return [{
       id: id,
       invoker: url,
@@ -735,14 +741,14 @@ export default class KoniTabs {
     });
   }
   async canUseAccount(address, url) {
-    const allowedAccounts = await this.getEvmCurrentAccount(url, true);
+    const allowedAccounts = await this.getEvmCurrentAccount(url);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
   async evmSign(id, url, {
     method,
     params
   }) {
-    const allowedAccounts = await this.getEvmCurrentAccount(url, true);
+    const allowedAccounts = await this.getEvmCurrentAccount(url);
     const signResult = await this.#koniState.evmSign(id, url, method, params, allowedAccounts);
     if (signResult) {
       return signResult;
@@ -763,7 +769,7 @@ export default class KoniTabs {
     if (!networkKey) {
       throw new Error('Network unavailable. Please switch network or manually add network to wallet');
     }
-    const allowedAccounts = await this.getEvmCurrentAccount(url, true);
+    const allowedAccounts = await this.getEvmCurrentAccount(url);
     const transactionHash = await this.#koniState.evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams);
     if (!transactionHash) {
       throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.24-3",
+  "version": "1.1.25-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -773,11 +773,6 @@
       "require": "./cjs/services/migration-service/scripts/MigrateChainPatrol.js",
       "default": "./services/migration-service/scripts/MigrateChainPatrol.js"
     },
-    "./services/migration-service/scripts/MigrateEthProvider": {
-      "types": "./services/migration-service/scripts/MigrateEthProvider.d.ts",
-      "require": "./cjs/services/migration-service/scripts/MigrateEthProvider.js",
-      "default": "./services/migration-service/scripts/MigrateEthProvider.js"
-    },
     "./services/migration-service/scripts/MigrateImportedToken": {
       "types": "./services/migration-service/scripts/MigrateImportedToken.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateImportedToken.js",
@@ -793,16 +788,6 @@
       "require": "./cjs/services/migration-service/scripts/MigrateNetworkSettings.js",
       "default": "./services/migration-service/scripts/MigrateNetworkSettings.js"
     },
-    "./services/migration-service/scripts/MigratePioneerProvider": {
-      "types": "./services/migration-service/scripts/MigratePioneerProvider.d.ts",
-      "require": "./cjs/services/migration-service/scripts/MigratePioneerProvider.js",
-      "default": "./services/migration-service/scripts/MigratePioneerProvider.js"
-    },
-    "./services/migration-service/scripts/MigrateProvider": {
-      "types": "./services/migration-service/scripts/MigrateProvider.d.ts",
-      "require": "./cjs/services/migration-service/scripts/MigrateProvider.js",
-      "default": "./services/migration-service/scripts/MigrateProvider.js"
-    },
     "./services/migration-service/scripts/MigrateSettings": {
       "types": "./services/migration-service/scripts/MigrateSettings.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateSettings.js",
@@ -823,6 +808,36 @@
       "require": "./cjs/services/migration-service/scripts/MigrateWalletReference.js",
       "default": "./services/migration-service/scripts/MigrateWalletReference.js"
     },
+    "./services/migration-service/scripts/providers/MigrateEthProvider": {
+      "types": "./services/migration-service/scripts/providers/MigrateEthProvider.d.ts",
+      "require": "./cjs/services/migration-service/scripts/providers/MigrateEthProvider.js",
+      "default": "./services/migration-service/scripts/providers/MigrateEthProvider.js"
+    },
+    "./services/migration-service/scripts/providers/MigrateGeneralProvider": {
+      "types": "./services/migration-service/scripts/providers/MigrateGeneralProvider.d.ts",
+      "require": "./cjs/services/migration-service/scripts/providers/MigrateGeneralProvider.js",
+      "default": "./services/migration-service/scripts/providers/MigrateGeneralProvider.js"
+    },
+    "./services/migration-service/scripts/providers/MigrateMultiProviders": {
+      "types": "./services/migration-service/scripts/providers/MigrateMultiProviders.d.ts",
+      "require": "./cjs/services/migration-service/scripts/providers/MigrateMultiProviders.js",
+      "default": "./services/migration-service/scripts/providers/MigrateMultiProviders.js"
+    },
+    "./services/migration-service/scripts/providers/MigratePioneerProvider": {
+      "types": "./services/migration-service/scripts/providers/MigratePioneerProvider.d.ts",
+      "require": "./cjs/services/migration-service/scripts/providers/MigratePioneerProvider.js",
+      "default": "./services/migration-service/scripts/providers/MigratePioneerProvider.js"
+    },
+    "./services/migration-service/scripts/providers/MigrateProvider": {
+      "types": "./services/migration-service/scripts/providers/MigrateProvider.d.ts",
+      "require": "./cjs/services/migration-service/scripts/providers/MigrateProvider.js",
+      "default": "./services/migration-service/scripts/providers/MigrateProvider.js"
+    },
+    "./services/migration-service/scripts/providers/MigrateProvidersV1M1P24": {
+      "types": "./services/migration-service/scripts/providers/MigrateProvidersV1M1P24.d.ts",
+      "require": "./cjs/services/migration-service/scripts/providers/MigrateProvidersV1M1P24.js",
+      "default": "./services/migration-service/scripts/providers/MigrateProvidersV1M1P24.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -1347,11 +1362,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.27",
-    "@subwallet/extension-base": "^1.1.24-3",
-    "@subwallet/extension-chains": "^1.1.24-3",
-    "@subwallet/extension-dapp": "^1.1.24-3",
-    "@subwallet/extension-inject": "^1.1.24-3",
+    "@subwallet/chain-list": "0.2.28",
+    "@subwallet/extension-base": "^1.1.25-0",
+    "@subwallet/extension-chains": "^1.1.25-0",
+    "@subwallet/extension-dapp": "^1.1.25-0",
+    "@subwallet/extension-inject": "^1.1.25-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@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.24-3'
+  version: '1.1.25-0'
 };

package/services/balance-service/helpers/subscribe/balance.d.ts

@@ -1,4 +1,15 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
+import { AccountJson } from '@subwallet/extension-base/background/types';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { BalanceItem } from '@subwallet/extension-base/types';
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;
 export declare function subscribeBalance(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem[]) => void): () => void;

package/services/balance-service/helpers/subscribe/balance.js

@@ -6,9 +6,36 @@ import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { _getSubstrateGenesisHash, _isChainEvmCompatible, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses } from '@subwallet/extension-base/utils';
-import { getAccountJsonByAddress } from '@subwallet/extension-base/utils/account';
+import keyring from '@subwallet/ui-keyring';
 import { subscribeEVMBalance } from "./evm.js";
 import { subscribeSubstrateBalance } from "./substrate/index.js";
+
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+export const getAccountJsonByAddress = address => {
+  try {
+    const pair = keyring.getPair(address);
+    if (pair) {
+      return {
+        address: pair.address,
+        type: pair.type,
+        ...pair.meta
+      };
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+};
 const filterAddress = (addresses, chainInfo) => {
   const isEvmChain = _isChainEvmCompatible(chainInfo);
   const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);

package/services/chain-service/constants.d.ts

@@ -90,9 +90,7 @@ export declare const _XCM_TYPE: {
     PR: string;
 };
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
-export declare const EVM_PASS_CONNECT_STATUS: {
-    acala: string[];
-};
+export declare const EVM_PASS_CONNECT_STATUS: Record<string, string[]>;
 export declare const EVM_REFORMAT_DECIMALS: {
     acala: string[];
 };

package/services/chain-service/constants.js

@@ -224,7 +224,7 @@ export const _XCM_TYPE = {
 
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network'];
 export const EVM_PASS_CONNECT_STATUS = {
-  acala: ['acala_evm', 'karura_evm']
+  arbitrum_one: ['*']
 };
 export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']

package/services/chain-service/handler/EvmApi.d.ts

@@ -28,6 +28,7 @@ export declare class EvmApi implements _EvmApi {
     recoverConnect(): Promise<void>;
     private createProvider;
     constructor(chainSlug: string, apiUrl: string, { providerName }?: _ApiOptions);
+    get ignoreNetListen(): boolean;
     createIntervalCheckApi(): NodeJS.Timer;
     clearIntervalCheckApi(): void;
     connect(): void;

package/services/chain-service/handler/EvmApi.js

@@ -7,7 +7,6 @@ import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { BehaviorSubject } from 'rxjs';
 import Web3 from 'web3';
-const acalaEvmNetworks = EVM_PASS_CONNECT_STATUS.acala;
 export class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new BehaviorSubject(false);
@@ -66,10 +65,14 @@ export class EvmApi {
     this.intervalCheckApi = this.createIntervalCheckApi();
     this.connect();
   }
+  get ignoreNetListen() {
+    const ignoreRpc = EVM_PASS_CONNECT_STATUS[this.chainSlug];
+    return ignoreRpc ? ignoreRpc.includes('*') || ignoreRpc.includes(this.apiUrl) : false;
+  }
   createIntervalCheckApi() {
     this.clearIntervalCheckApi();
     return setInterval(() => {
-      if (!acalaEvmNetworks.includes(this.chainSlug)) {
+      if (!this.ignoreNetListen) {
         this.api.eth.net.isListening().then(() => {
           this.onConnect();
         }).catch(() => {
@@ -90,7 +93,7 @@ export class EvmApi {
     this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
 
     // Check if api is ready
-    if (!acalaEvmNetworks.includes(this.chainSlug)) {
+    if (!this.ignoreNetListen) {
       this.api.eth.net.isListening().then(() => {
         this.isApiReadyOnce = true;
         this.onConnect();

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

@@ -1,17 +1,18 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import DeleteChain from '@subwallet/extension-base/services/migration-service/scripts/DeleteChain';
+import MigrateEthProvider from "./providers/MigrateEthProvider.js";
+import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
+import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
 import AutoEnableChainsTokens from "./AutoEnableChainsTokens.js";
+import DeleteChain from "./DeleteChain.js";
 import EnableVaraChain from "./EnableVaraChain.js";
 import MigrateAuthUrls from "./MigrateAuthUrls.js";
 import MigrateAutoLock from "./MigrateAutoLock.js";
 import MigrateChainPatrol from "./MigrateChainPatrol.js";
-import MigrateEthProvider from "./MigrateEthProvider.js";
 import MigrateImportedToken from "./MigrateImportedToken.js";
 import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
-import MigratePioneerProvider from "./MigratePioneerProvider.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
@@ -32,6 +33,7 @@ export default {
   '1.1.7': DeleteChain,
   '1.1.13-01': MigrateTokenDecimals,
   '1.1.17-01': MigratePioneerProvider,
-  '1.1.17-03': EnableVaraChain
+  '1.1.17-03': EnableVaraChain,
+  '1.1.24-01': MigrateProvidersV1M1P24
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/migration-service/scripts/{MigrateEthProvider.js → providers/MigrateEthProvider.js}

@@ -3,7 +3,7 @@
 
 import MigrateProvider from "./MigrateProvider.js";
 export default class MigrateEthProvider extends MigrateProvider {
-  newProvider = 'ethereum';
+  slug = 'ethereum';
   oldProvider = 'Cloudflare';
-  slug = 'Llamarpc';
+  newProvider = 'Llamarpc';
 }

package/services/migration-service/scripts/providers/MigrateGeneralProvider.d.ts

@@ -0,0 +1,13 @@
+import State from '@subwallet/extension-base/koni/background/handlers/State';
+import MigrateProvider from './MigrateProvider';
+export interface MigrateProviderTarget {
+    slug: string;
+    oldProvider: string;
+    newProvider: string;
+}
+export default class MigrateGeneralProvider extends MigrateProvider {
+    readonly newProvider: string;
+    readonly oldProvider: string;
+    readonly slug: string;
+    constructor(state: State, target: MigrateProviderTarget);
+}

package/services/migration-service/scripts/providers/MigrateGeneralProvider.js

@@ -0,0 +1,12 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import MigrateProvider from "./MigrateProvider.js";
+export default class MigrateGeneralProvider extends MigrateProvider {
+  constructor(state, target) {
+    super(state);
+    this.slug = target.slug;
+    this.oldProvider = target.oldProvider;
+    this.newProvider = target.newProvider;
+  }
+}

package/services/migration-service/scripts/providers/MigrateMultiProviders.d.ts

@@ -0,0 +1,6 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { MigrateProviderTarget } from './MigrateGeneralProvider';
+export default abstract class MigrateMultiProviders extends BaseMigrationJob {
+    abstract targets: MigrateProviderTarget[];
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/providers/MigrateMultiProviders.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import MigrateGeneralProvider from "./MigrateGeneralProvider.js";
+export default class MigrateMultiProviders extends BaseMigrationJob {
+  async run() {
+    for (const target of this.targets) {
+      const migration = new MigrateGeneralProvider(this.state, target);
+      await migration.run();
+    }
+  }
+}

package/services/migration-service/scripts/{MigrateProvider.js → providers/MigrateProvider.js}

@@ -7,7 +7,7 @@ export default class MigrateProvider extends BaseMigrationJob {
     const state = this.state;
     const chainState = state.getChainStateByKey(this.slug);
     const chainInfo = state.getChainInfo(this.slug);
-    if (chainState && chainState.active && chainState.currentProvider === this.oldProvider) {
+    if (chainState && chainState.active && chainInfo.providers[this.newProvider] && chainState.currentProvider === this.oldProvider) {
       await state.upsertChainInfo({
         mode: 'update',
         chainEditInfo: {

package/services/migration-service/scripts/providers/MigrateProvidersV1M1P24.d.ts

@@ -0,0 +1,5 @@
+import { MigrateProviderTarget } from './MigrateGeneralProvider';
+import MigrateMultiProviders from './MigrateMultiProviders';
+export default class MigrateProvidersV1M1P24 extends MigrateMultiProviders {
+    targets: MigrateProviderTarget[];
+}

package/services/migration-service/scripts/providers/MigrateProvidersV1M1P24.js

@@ -0,0 +1,23 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import MigrateMultiProviders from "./MigrateMultiProviders.js";
+export default class MigrateProvidersV1M1P24 extends MigrateMultiProviders {
+  targets = [{
+    slug: 'polkadot',
+    oldProvider: 'Parity',
+    newProvider: 'Dwellir'
+  }, {
+    slug: 'kusama',
+    oldProvider: 'Parity',
+    newProvider: 'Dwellir'
+  }, {
+    slug: 'moonbeam',
+    oldProvider: 'OnFinality',
+    newProvider: 'Moonbeam Foundation'
+  }, {
+    slug: 'moonbase',
+    oldProvider: 'OnFinality',
+    newProvider: 'Moonbeam Foundation'
+  }];
+}

package/utils/account.d.ts

@@ -1,15 +1,5 @@
-import { AccountJson, AddressJson } from '@subwallet/extension-base/background/types';
+import { AddressJson } from '@subwallet/extension-base/background/types';
 import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 export declare const simpleAddress: (address: string) => string;
 export declare function quickFormatAddressToCompare(address?: string): string | undefined;
 export declare const convertSubjectInfoToAddresses: (subjectInfo: SubjectInfo) => AddressJson[];
-/**
- * @function getAccountJsonByAddress
- * @desc Get account info by address
- * <p>
- *   Note: Use on the background only
- * </p>
- * @param {string} address - Address
- * @returns {AccountJson|null}  - Account info or null if not found
- */
-export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;

package/utils/account.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { reformatAddress } from '@subwallet/extension-base/utils/index';
-import keyring from '@subwallet/ui-keyring';
 import { decodeAddress, encodeAddress, isAddress, isEthereumAddress } from '@polkadot/util-crypto';
 export const simpleAddress = address => {
   if (isEthereumAddress(address)) {
@@ -22,31 +21,4 @@ export const convertSubjectInfoToAddresses = subjectInfo => {
     type: info.type,
     ...info.json.meta
   }));
-};
-
-/**
- * @function getAccountJsonByAddress
- * @desc Get account info by address
- * <p>
- *   Note: Use on the background only
- * </p>
- * @param {string} address - Address
- * @returns {AccountJson|null}  - Account info or null if not found
- */
-export const getAccountJsonByAddress = address => {
-  try {
-    const pair = keyring.getPair(address);
-    if (pair) {
-      return {
-        address: pair.address,
-        type: pair.type,
-        ...pair.meta
-      };
-    } else {
-      return null;
-    }
-  } catch (e) {
-    console.warn(e);
-    return null;
-  }
 };

package/services/migration-service/scripts/{MigrateEthProvider.d.ts → providers/MigrateEthProvider.d.ts}

@@ -1,6 +1,6 @@
 import MigrateProvider from './MigrateProvider';
 export default class MigrateEthProvider extends MigrateProvider {
-    newProvider: string;
-    oldProvider: string;
     slug: string;
+    oldProvider: string;
+    newProvider: string;
 }