@subwallet/extension-base 1.1.24-0 → 1.1.24-2

package/cjs/services/storage-service/DatabaseService.js

@@ -65,14 +65,19 @@ class DatabaseService {
   async getStoredBalance() {
     return this.stores.balance.table.toArray();
   }
-  async updateBalanceStore(address, item) {
+  async updateBalanceStore(item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
       return this.stores.balance.upsert({
-        address,
         ...item
       });
     }
   }
+  async updateBulkBalanceStore(items) {
+    const filtered = items.filter(item => item.state !== _KoniTypes.APIItemState.PENDING);
+    if (filtered.length) {
+      return this.stores.balance.bulkUpsert(filtered);
+    }
+  }
   async removeFromBalanceStore(assets) {
     return this.stores.balance.removeBySlugs(assets);
   }

package/cjs/services/storage-service/db-stores/Balance.js

@@ -10,17 +10,17 @@ var _BaseStoreWithAddress = _interopRequireDefault(require("../db-stores/BaseSto
 // SPDX-License-Identifier: Apache-2.0
 
 class BalanceStore extends _BaseStoreWithAddress.default {
-  async getBalanceMapByAddress(address) {
-    const data = await this.table.where('address').equals(address).toArray();
+  async getBalanceMapByAddresses(addresses) {
+    const data = await this.table.where('address').anyOf(addresses).toArray();
     const balanceMap = {};
     data.forEach(storedBalance => {
-      balanceMap[storedBalance.tokenSlug] = {
-        tokenSlug: storedBalance.tokenSlug,
-        state: storedBalance.state,
-        free: storedBalance.free,
-        locked: storedBalance.locked,
-        substrateInfo: storedBalance.substrateInfo,
-        timestamp: storedBalance.timestamp
+      const address = storedBalance.address;
+      const slug = storedBalance.tokenSlug;
+      if (!balanceMap[address]) {
+        balanceMap[address] = {};
+      }
+      balanceMap[address][slug] = {
+        ...storedBalance
       };
     });
     return balanceMap;

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

@@ -129,11 +129,19 @@ class SubscanService {
   }
   getExtrinsicsList(chain, address) {
     let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    let blockRange = arguments.length > 3 ? arguments[3] : undefined;
+    const _blockRange = (() => {
+      if (!blockRange || !blockRange.to) {
+        return null;
+      }
+      return `${blockRange.from || 0}-${blockRange.to}`;
+    })();
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/extrinsics'), {
         page,
         row: QUERY_ROW,
-        address
+        address,
+        block_range: _blockRange
       });
       if (rs.status !== 200) {
         throw new _SWError.SWError('SubscanService.getExtrinsicsList', await rs.text());
@@ -143,22 +151,38 @@ class SubscanService {
     });
   }
   async fetchAllPossibleExtrinsicItems(chain, address, cbAfterEachRequest) {
-    let count = 0;
+    let limit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+      page: 10,
+      record: 1000
+    };
+    let maxCount = 0;
+    let currentCount = 0;
+    const blockRange = {
+      from: null,
+      to: null
+    };
     const resultMap = {};
     const _getExtrinsicItems = async page => {
-      const res = await this.getExtrinsicsList(chain, address, page);
+      const res = await this.getExtrinsicsList(chain, address, page, blockRange);
       if (!res || !res.count || !res.extrinsics || !res.extrinsics.length) {
         return;
       }
-      if (res.count > count) {
-        count = res.count;
+      if (res.count > maxCount) {
+        maxCount = res.count;
       }
       cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.extrinsics);
       res.extrinsics.forEach(item => {
         resultMap[item.extrinsic_hash] = item;
       });
-      if (Object.values(resultMap).length < count) {
+      currentCount += res.extrinsics.length;
+      if (page > limit.page || currentCount > limit.record) {
+        return;
+      }
+      if (currentCount < maxCount) {
         await (0, _utils.wait)(100);
+        if (page === 0) {
+          blockRange.to = res.extrinsics[0].block_num;
+        }
         await _getExtrinsicItems(++page);
       }
     };
@@ -168,16 +192,16 @@ class SubscanService {
   getTransfersList(chain, address) {
     let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     let direction = arguments.length > 3 ? arguments[3] : undefined;
-    const requestBody = {
-      page,
-      row: QUERY_ROW,
-      address
-    };
-    if (direction) {
-      requestBody.direction = direction;
-    }
+    let blockRange = arguments.length > 4 ? arguments[4] : undefined;
     return this.addRequest(async () => {
-      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), requestBody);
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), {
+        page,
+        row: QUERY_ROW,
+        address,
+        direction: direction || null,
+        from_block: (blockRange === null || blockRange === void 0 ? void 0 : blockRange.from) || null,
+        to_block: (blockRange === null || blockRange === void 0 ? void 0 : blockRange.to) || null
+      });
       if (rs.status !== 200) {
         throw new _SWError.SWError('SubscanService.getTransfersList', await rs.text());
       }
@@ -186,27 +210,47 @@ class SubscanService {
     });
   }
   async fetchAllPossibleTransferItems(chain, address, direction, cbAfterEachRequest) {
-    let count = 0;
+    let limit = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
+      page: 10,
+      record: 1000
+    };
+    let maxCount = 0;
+    let currentCount = 0;
+    const blockRange = {
+      from: null,
+      to: null
+    };
     const resultMap = {};
     const _getTransferItems = async page => {
-      const res = await this.getTransfersList(chain, address, page, direction);
+      const res = await this.getTransfersList(chain, address, page, direction, blockRange);
       if (!res || !res.count || !res.transfers || !res.transfers.length) {
         return;
       }
-      if (res.count > count) {
-        count = res.count;
+      if (res.count > maxCount) {
+        maxCount = res.count;
       }
       cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.transfers);
       res.transfers.forEach(item => {
-        resultMap[item.hash] = item;
+        if (!resultMap[item.hash]) {
+          resultMap[item.hash] = [item];
+        } else {
+          resultMap[item.hash].push(item);
+        }
       });
-      if (Object.values(resultMap).length < count) {
+      currentCount += res.transfers.length;
+      if (page > limit.page || currentCount > limit.record) {
+        return;
+      }
+      if (currentCount < maxCount) {
         await (0, _utils.wait)(100);
+        if (page === 0) {
+          blockRange.to = res.transfers[0].block_num;
+        }
         await _getTransferItems(++page);
       }
     };
     await _getTransferItems(0);
-    return Object.values(resultMap);
+    return resultMap;
   }
 }
 exports.SubscanService = SubscanService;

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

@@ -121,7 +121,8 @@ class TransactionService {
             if (!web3) {
               validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
-              const gasPrice = await web3.api.eth.getGasPrice();
+              const _price = await web3.api.eth.getGasPrice();
+              const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
               const gasLimit = await web3.api.eth.estimateGas(transaction);
               estimateFee.value = (gasLimit * parseInt(gasPrice)).toString();
             }
@@ -932,8 +933,8 @@ class TransactionService {
           }).forEach(_ref11 => {
             let {
               event: {
-                method,
-                data: [error]
+                data: [error],
+                method
               }
             } = _ref11;
             if (method === 'ExtrinsicFailed') {

package/cjs/types/balance.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/types/index.js

@@ -3,6 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _balance = require("./balance");
+Object.keys(_balance).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _balance[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _balance[key];
+    }
+  });
+});
 var _buy = require("./buy");
 Object.keys(_buy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/utils/{address.js → account.js}

@@ -1,12 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertSubjectInfoToAddresses = void 0;
+exports.getAccountJsonByAddress = 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
@@ -31,4 +33,32 @@ const convertSubjectInfoToAddresses = subjectInfo => {
     ...info.json.meta
   }));
 };
-exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;
+
+/**
+ * @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;

package/cjs/utils/eth.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.signatureToHex = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+var _constants = require("@subwallet/extension-base/constants");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethers = require("ethers");
 var _util = require("@polkadot/util");
@@ -69,4 +70,8 @@ const signatureToHex = sig => {
   const hexV = (0, _util.hexStripPrefix)((0, _util.numberToHex)(v));
   return hexR + hexS + hexV;
 };
-exports.signatureToHex = signatureToHex;
+exports.signatureToHex = signatureToHex;
+const recalculateGasPrice = (_price, chain) => {
+  return _constants.NETWORK_MULTI_GAS_FEE.includes(chain) ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
+};
+exports.recalculateGasPrice = recalculateGasPrice;

package/cjs/utils/index.js

@@ -78,6 +78,18 @@ var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _canDerive = require("./canDerive");
+var _account = require("./account");
+Object.keys(_account).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _account[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _account[key];
+    }
+  });
+});
 var _array = require("./array");
 Object.keys(_array).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/constants/index.d.ts

@@ -20,5 +20,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 GAS_PRICE_RATIO = 1.05;
+export declare const NETWORK_MULTI_GAS_FEE: string[];
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -23,5 +23,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 GAS_PRICE_RATIO = 1.05;
+export const NETWORK_MULTI_GAS_FEE = ['astarEvm'];
 export * from "./staking.js";
 export * from "./storage.js";

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

@@ -6,6 +6,9 @@ import { Codec } from '@polkadot/types/types';
 export declare function subscribeAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function subscribeAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption, unstakingInfo: Record<string, number>): Promise<NominatorMetadata>;
+/**
+ * Deprecated
+ * */
 export declare function getAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getAmplitudeCollatorsInfo(chain: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
 export declare function getAmplitudeBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, selectedValidatorInfo: ValidatorInfo, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -61,8 +61,7 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityInfo = substrateApi.api.query.identity ? (await substrateApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
-    const identity = identityInfo ? parseIdentity(identityInfo) : undefined;
+    const [identity] = await parseIdentity(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new BN(activeStake);
     let delegationStatus = StakingStatus.NOT_EARNING;
@@ -111,6 +110,10 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
     unstakings: unstakingList
   };
 }
+
+/**
+ * Deprecated
+ * */
 export async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   if (isEthereumAddress(address)) {
     return;
@@ -137,8 +140,7 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityInfo = chainApi.api.query.identity ? (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
-    const identity = identityInfo ? parseIdentity(identityInfo) : undefined;
+    const [identity] = await parseIdentity(substrateApi, delegatorState.owner);
     activeStake = delegatorState.amount.toString();
     const bnActiveStake = new BN(activeStake);
     let delegationStatus = StakingStatus.NOT_EARNING;

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

@@ -6,6 +6,9 @@ import { Codec } from '@polkadot/types/types';
 export declare function subscribeAstarStakingMetadata(chain: string, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getAstarStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function subscribeAstarNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletDappsStakingAccountLedger): Promise<NominatorMetadata>;
+/**
+ * Deprecated
+ * */
 export declare function getAstarNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getAstarDappsInfo(networkKey: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
 export declare function getAstarBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, dappInfo: ValidatorInfo): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -148,6 +148,10 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
     status: stakingStatus
   };
 }
+
+/**
+ * Deprecated
+ * */
 export async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
   if (isEthereumAddress(address)) {
     return;

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

@@ -5,6 +5,9 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 export declare function validateUnbondingCondition(nominatorMetadata: NominatorMetadata, amount: string, chain: string, chainStakingMetadata: ChainStakingMetadata, selectedValidator?: string): TransactionError[];
 export declare function validateBondingCondition(chainInfo: _ChainInfo, amount: string, selectedValidators: ValidatorInfo[], address: string, chainStakingMetadata: ChainStakingMetadata, nominatorMetadata?: NominatorMetadata): TransactionError[];
 export declare function getChainStakingMetadata(chainInfo: _ChainInfo, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
+/**
+ * Deprecated
+ * */
 export declare function getNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getValidatorsInfo(networkKey: string, substrateApi: _SubstrateApi, decimals: number, chainStakingMetadata: ChainStakingMetadata): Promise<ValidatorInfo[]>;
 export declare function getNominationPoolsInfo(chain: string, substrateApi: _SubstrateApi): Promise<import("@subwallet/extension-base/background/KoniTypes").NominationPoolInfo[]>;

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

@@ -31,6 +31,10 @@ export async function getChainStakingMetadata(chainInfo, substrateApi) {
   }
   return getRelayChainStakingMetadata(chainInfo, substrateApi);
 }
+
+/**
+ * Deprecated
+ * */
 export async function getNominatorMetadata(chainInfo, address, substrateApi) {
   if (_STAKING_CHAIN_GROUP.astar.includes(chainInfo.slug)) {
     return getAstarNominatorMetadata(chainInfo, address, substrateApi);
@@ -104,6 +108,7 @@ export async function getCancelWithdrawalExtrinsic(substrateApi, chain, selected
 export function subscribeEssentialChainStakingMetadata(substrateApiMap, chainInfoMap, callback) {
   const unsubList = [];
 
+  // TODO: replace with for of to improve performance
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   Object.values(chainInfoMap).forEach(async chainInfo => {
     if (!substrateApiMap[chainInfo.slug]) {

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

@@ -9,6 +9,9 @@ export declare function validateParaChainBondingCondition(chainInfo: _ChainInfo,
 export declare function subscribeParaChainStakingMetadata(chain: string, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getParaChainStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function subscribeParaChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: PalletParachainStakingDelegator): Promise<NominatorMetadata>;
+/**
+ * Deprecated
+ * */
 export declare function getParaChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getParachainCollatorsInfo(chain: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
 export declare function getParaBondingExtrinsic(chainInfo: _ChainInfo, substrateApi: _SubstrateApi, amount: string, selectedCollatorInfo: ValidatorInfo, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;

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

@@ -27,7 +27,7 @@ export function validateParaChainUnbondingCondition(amount, nominatorMetadata, c
   const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new BN(targetNomination.validatorMinStake || '0');
   const bnMinStake = BN.max(bnCollatorMinStake, bnChainMinStake);
-  const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainStakingMetadata.chain);
+  const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainStakingMetadata.chain, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type);
   if (targetNomination.hasUnstaking) {
     errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST, existUnstakeErrorMessage));
   }
@@ -45,7 +45,7 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
   const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
   const minStakeErrorMessage = getMinStakeErrorMessage(chainInfo, bnMinStake);
   const maxValidatorErrorMessage = getMaxValidatorErrorMessage(chainInfo, chainStakingMetadata.maxValidatorPerNominator);
-  const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainInfo.slug, true);
+  const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
   if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE, minStakeErrorMessage));
@@ -152,13 +152,10 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
   const roundInfo = _roundInfo.toPrimitive();
   const currentRound = roundInfo.current;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    var _substrateApi$api$que;
-    const [_delegationScheduledRequests, _identity, _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (_substrateApi$api$que = substrateApi.api.query.identity) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.identityOf(delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    const [_delegationScheduledRequests, [identity], _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const collatorInfo = _collatorInfo.toPrimitive();
     const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
-    const identityInfo = _identity === null || _identity === void 0 ? void 0 : _identity.toHuman();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
-    const identity = parseIdentity(identityInfo);
     let hasUnstaking = false;
     let delegationStatus = StakingStatus.NOT_EARNING;
 
@@ -220,6 +217,10 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
     unstakings: Object.values(unstakingMap)
   };
 }
+
+/**
+ * Deprecated
+ * */
 export async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   if (_isChainEvmCompatible(chainInfo) && !isEthereumAddress(address)) {
     return;
@@ -243,14 +244,12 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
   }
   let bnTotalActiveStake = BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, _identity, _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), chainApi.api.query.identity.identityOf(delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    const [_delegationScheduledRequests, [identity], _roundInfo, _collatorInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateApi, delegation.owner), chainApi.api.query.parachainStaking.round(), chainApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const rawCollatorInfo = _collatorInfo.toHuman();
     const minDelegation = (rawCollatorInfo === null || rawCollatorInfo === void 0 ? void 0 : rawCollatorInfo.lowestTopDelegationAmount).replaceAll(',', '');
-    const identityInfo = _identity.toHuman();
     const roundInfo = _roundInfo.toPrimitive();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const currentRound = roundInfo.current;
-    const identity = parseIdentity(identityInfo);
     let hasUnstaking = false;
     let delegationStatus = StakingStatus.NOT_EARNING;
 
@@ -340,19 +339,9 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
   }
   const extraInfoMap = {};
   await Promise.all(allCollators.map(async collator => {
-    var _apiProps$api$query, _apiProps$api$query$i;
-    const [_info, _identity] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (_apiProps$api$query = apiProps.api.query) === null || _apiProps$api$query === void 0 ? void 0 : (_apiProps$api$query$i = _apiProps$api$query.identity) === null || _apiProps$api$query$i === void 0 ? void 0 : _apiProps$api$query$i.identityOf(collator.address) // some chains might not have identity pallet
-    ]);
+    const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
     const rawInfo = _info.toHuman();
-    const rawIdentity = _identity ? _identity.toHuman() : null;
     const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
-    let isReasonable = false;
-    let identity;
-    if (rawIdentity !== null) {
-      // Check if identity is eth address
-      isReasonable = rawIdentity.judgements.length > 0;
-      identity = parseIdentity(rawIdentity);
-    }
     extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,

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

@@ -26,6 +26,9 @@ export declare function validateRelayBondingCondition(chainInfo: _ChainInfo, amo
 export declare function subscribeRelayChainStakingMetadata(chainInfo: _ChainInfo, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getRelayChainStakingMetadata(chainInfo: _ChainInfo, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function subscribeRelayChainNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletStakingStakingLedger): Promise<NominatorMetadata>;
+/**
+ * Deprecated
+ * */
 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>;
 export declare function getRelayChainPoolMemberMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;