@subwallet/extension-base 1.1.24-4 → 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-4'
+  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/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-4",
+  "version": "1.1.25-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1363,10 +1363,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.28",
-    "@subwallet/extension-base": "^1.1.24-4",
-    "@subwallet/extension-chains": "^1.1.24-4",
-    "@subwallet/extension-dapp": "^1.1.24-4",
-    "@subwallet/extension-inject": "^1.1.24-4",
+    "@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-4'
+  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/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;
-  }
 };