Hot-fix - move keyring use to balance service

Koniverse · Dec 6, 2023 · f56988d · f56988d · saltict · Dec 6, 2023
1 parent 4591606
commit f56988d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/packages/extension-base/src/services/balance-service/helpers/subscribe/balance.ts b/packages/extension-base/src/services/balance-service/helpers/subscribe/balance.ts
@@ -3,16 +3,46 @@
 
 import { _AssetType, _ChainInfo } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountJson } from '@subwallet/extension-base/background/types';
 import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { _getSubstrateGenesisHash, _isChainEvmCompatible, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { BalanceItem } from '@subwallet/extension-base/types';
 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';
 import { subscribeSubstrateBalance } from './substrate';
 
+/**
+ * @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: string): AccountJson | null => {
+  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: string[], chainInfo: _ChainInfo): [string[], string[]] => {
   const isEvmChain = _isChainEvmCompatible(chainInfo);
   const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);

diff --git a/packages/extension-base/src/utils/account.ts b/packages/extension-base/src/utils/account.ts
@@ -1,9 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountJson, AddressJson } from '@subwallet/extension-base/background/types';
+import { AddressJson } from '@subwallet/extension-base/background/types';
 import { reformatAddress } from '@subwallet/extension-base/utils/index';
-import keyring from '@subwallet/ui-keyring';
 import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 
 import { decodeAddress, encodeAddress, isAddress, isEthereumAddress } from '@polkadot/util-crypto';
@@ -27,32 +26,3 @@ export function quickFormatAddressToCompare (address?: string) {
 export const convertSubjectInfoToAddresses = (subjectInfo: SubjectInfo): AddressJson[] => {
   return Object.values(subjectInfo).map((info): AddressJson => ({ address: info.json.address, 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: string): AccountJson | null => {
-  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;
-  }
-};