@subwallet/extension-base 1.3.48-2 → 1.3.50-0

package/cjs/constants/staking.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PREDEFINED_STAKING_POOL = exports.PREDEFINED_EARNING_POOL_PROMISE = exports.MAX_NOMINATIONS = void 0;
+exports.PREDEFINED_STAKING_POOL = exports.PREDEFINED_EARNING_POOL_PROMISE = exports.MAX_NOMINATIONS = exports.CRON_REFRESH_EARNING_TARGETS = void 0;
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -19,4 +19,6 @@ exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;
 const MAX_NOMINATIONS = '16';
 exports.MAX_NOMINATIONS = MAX_NOMINATIONS;
 const PREDEFINED_EARNING_POOL_PROMISE = (0, _utils.fetchStaticData)('nomination-pool-recommendation');
-exports.PREDEFINED_EARNING_POOL_PROMISE = PREDEFINED_EARNING_POOL_PROMISE;
+exports.PREDEFINED_EARNING_POOL_PROMISE = PREDEFINED_EARNING_POOL_PROMISE;
+const CRON_REFRESH_EARNING_TARGETS = 10 * 60 * 1000; // 10 minutes depends on cron run time on server
+exports.CRON_REFRESH_EARNING_TARGETS = CRON_REFRESH_EARNING_TARGETS;

package/cjs/core/utils.js

@@ -44,11 +44,14 @@ function getMaxBigInt(a, b) {
   return a > b ? a : b;
 }
 function ledgerMustCheckNetwork(account) {
-  if (account && account.isHardware && account.isGeneric && !(0, _utilCrypto.isEthereumAddress)(account.address)) {
-    return account.originGenesisHash ? 'migration' : 'polkadot';
-  } else {
-    return 'unnecessary';
+  if (account && account.isHardware && account.isGeneric) {
+    if (!(0, _utilCrypto.isEthereumAddress)(account.address)) {
+      return account.originGenesisHash ? 'migration' : 'polkadot';
+    } else if (account.isSubstrateECDSA) {
+      return 'polkadot_ecdsa';
+    }
   }
+  return 'unnecessary';
 }
 
 // --- recipient address validation --- //
@@ -179,7 +182,13 @@ function _isSupportLedgerAccount(validateRecipientParams) {
       // For ledger generic
       const ledgerCheck = ledgerMustCheckNetwork(account);
       if (ledgerCheck !== 'unnecessary' && !allowLedgerGenerics.includes(destChainInfo.slug)) {
-        return `Ledger ${ledgerCheck === 'polkadot' ? 'Polkadot' : 'Migration'} address is not supported for this transfer`;
+        let ledgerTypeLabel = 'Migration';
+        if (ledgerCheck === 'polkadot') {
+          ledgerTypeLabel = 'Polkadot';
+        } else if (ledgerCheck === 'polkadot_ecdsa') {
+          ledgerTypeLabel = 'Polkadot (EVM)';
+        }
+        return `Ledger ${ledgerTypeLabel} address is not supported for this transfer`;
       }
     }
   }

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

@@ -2082,16 +2082,17 @@ class KoniExtension {
   async validateERC721Token(data) {
     var _data$metadata;
     const evmApi = this.#koniState.getEvmApi(data.originChain);
+    const contractAddress = (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress;
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const tokenContract = new evmApi.api.eth.Contract(_utils2._ERC721_ABI, (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress);
+    const tokenContract = new evmApi.api.eth.Contract(_utils2._ERC721_ABI, contractAddress);
     try {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
       await tokenContract.methods.tokenOfOwnerByIndex('0xB7fdD27a8Df011816205a6e3cAA097DC4D8C2C5d', 1).call();
       return true;
     } catch (err) {
       const error = err;
-      if (error.message.includes('ERC721Enumerable: owner index out of bounds')) {
+      if (error.message.includes('index out of bounds')) {
         return true;
       } else {
         return false;

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.48-2'
+  version: '1.3.50-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/earning-service/constants/chains.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = exports.CHANNEL_ID = void 0;
+exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = exports._STAKING_CHAIN_GROUP = exports.TON_CHAINS = exports.ST_LIQUID_TOKEN_ABI = exports.STAKING_IDENTITY_API_SLUG = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = exports.CHANNEL_ID = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -42,5 +42,10 @@ const MANTA_MIN_DELEGATION = 500;
 exports.MANTA_MIN_DELEGATION = MANTA_MIN_DELEGATION;
 const CHANNEL_ID = 7;
 exports.CHANNEL_ID = CHANNEL_ID;
+const STAKING_IDENTITY_API_SLUG = {
+  polkadot: 'polkadot_people',
+  kusama: 'peopleKusama'
+};
+exports.STAKING_IDENTITY_API_SLUG = STAKING_IDENTITY_API_SLUG;
 const _SUPPORT_CHANGE_VALIDATOR_CHAIN = ['polkadot', 'kusama'];
 exports._SUPPORT_CHANGE_VALIDATOR_CHAIN = _SUPPORT_CHANGE_VALIDATOR_CHAIN;

package/cjs/services/earning-service/handlers/base.js

@@ -37,6 +37,9 @@ class BasePoolHandler {
 
   /** Pool's available method */
 
+  /** Whether the pool can override identity of validator */
+  canOverrideIdentity = false;
+
   /**
    * @constructor
    * @param {KoniState} state - Koni state
@@ -60,6 +63,17 @@ class BasePoolHandler {
   get substrateApi() {
     return this.state.getSubstrateApi(this.chain);
   }
+  get substrateIdentityApi() {
+    const otherChainSupported = _constants2.STAKING_IDENTITY_API_SLUG[this.chain];
+    if (otherChainSupported) {
+      const api = this.state.getSubstrateApi(otherChainSupported) || this.substrateApi;
+      if (api.isApiReady && api.isApiConnected) {
+        return api;
+      }
+      return this.substrateApi;
+    }
+    return this.substrateApi;
+  }
   get evmApi() {
     return this.state.getEvmApi(this.chain);
   }

package/cjs/services/earning-service/handlers/native-staking/amplitude.js

@@ -118,7 +118,8 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     let unstakingBalance = '0';
     if (delegatorState) {
       // delegatorState can be null while unstaking all
-      const identityPromises = delegatorState.map(delegate => (0, _utils2.parseIdentity)(substrateApi, delegate.owner));
+      const substrateIdentityApi = this.substrateIdentityApi;
+      const identityPromises = delegatorState.map(delegate => (0, _utils2.parseIdentity)(substrateIdentityApi, delegate.owner));
       const identities = await Promise.all(identityPromises);
       for (let i = 0; i < delegatorState.length; i++) {
         const delegate = delegatorState[i];
@@ -309,7 +310,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
 
   /* Get pool targets */
 
-  async getKrestPoolTargets(chainApi) {
+  async getKrestPoolTargets(chainApi, chainIdentityApi) {
     var _chainApi$api$consts$;
     const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
     const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
@@ -317,7 +318,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     const identityPromises = _allCollators.map(collator => {
       const collatorInfo = collator[1].toPrimitive();
       const address = collatorInfo.id;
-      return (0, _utils2.parseIdentity)(chainApi, address);
+      return (0, _utils2.parseIdentity)(chainIdentityApi, address);
     });
     const identities = await Promise.all(identityPromises);
     return _allCollators.map((_collator, i) => {
@@ -350,7 +351,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
       };
     });
   }
-  async getOtherPoolTargets(chainApi) {
+  async getOtherPoolTargets(chainApi, chainIdentityApi) {
     const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
     const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
     const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
@@ -360,7 +361,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     const identityPromises = _allCollators.map(collator => {
       const collatorInfo = collator[1].toPrimitive();
       const address = collatorInfo.id;
-      return (0, _utils2.parseIdentity)(chainApi, address);
+      return (0, _utils2.parseIdentity)(chainIdentityApi, address);
     });
     const identities = await Promise.all(identityPromises);
     return _allCollators.map((_collator, i) => {
@@ -396,10 +397,11 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
   }
   async getPoolTargets() {
     const chainApi = await this.substrateApi.isReady;
+    const chainIdentityApi = this.substrateIdentityApi;
     if (_constants2._STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
-      return this.getKrestPoolTargets(chainApi);
+      return this.getKrestPoolTargets(chainApi, chainIdentityApi);
     } else {
-      return this.getOtherPoolTargets(chainApi);
+      return this.getOtherPoolTargets(chainApi, chainIdentityApi);
     }
   }
 

package/cjs/services/earning-service/handlers/native-staking/base.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _constants = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
 var _util = require("@polkadot/util");
 var _base = _interopRequireDefault(require("../base"));
@@ -35,6 +36,7 @@ class BaseNativeStakingPoolHandler extends _base.default {
     this.slug = `${symbol}___native_staking___${_chainInfo.slug}`;
     this.name = `${_chainInfo.name} Native Staking`;
     this.shortName = _chainInfo.name.replaceAll(' Relay Chain', '');
+    this.canOverrideIdentity = !!_constants.STAKING_IDENTITY_API_SLUG[chain];
   }
   getDescription() {
     let amount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '0';

package/cjs/services/earning-service/handlers/native-staking/para-chain.js

@@ -141,6 +141,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
   async parseNominatorMetadata(chainInfo, address, substrateApi, delegatorState) {
     const nominationList = [];
     const unstakingMap = {};
+    const substrateIdentityApi = this.substrateIdentityApi;
     let bnTotalActiveStake = _util.BN_ZERO;
     let bnTotalStake = _util.BN_ZERO;
     let bnTotalUnstaking = _util.BN_ZERO;
@@ -148,7 +149,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateIdentityApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
       const currentBlock = _currentBlock.toPrimitive();
       const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
@@ -299,6 +300,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
   async getMantaPoolTargets() {
     var _this$chainInfo$subst;
     const apiProps = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
     const allCollators = [];
     const DECIMAL = (_this$chainInfo$subst = this.chainInfo.substrateInfo) === null || _this$chainInfo$subst === void 0 ? void 0 : _this$chainInfo$subst.decimals;
     const POINTS_PER_BLOCK = _constants2.MANTA_VALIDATOR_POINTS_PER_BLOCK; // producing 1 block will get 20 points for validator
@@ -358,7 +360,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     }));
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {
-      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils2.parseIdentity)(apiProps, collator.address)]);
+      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils2.parseIdentity)(substrateIdentityApi, collator.address)]);
       const rawInfo = _info.toHuman();
       const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
       extraInfoMap[collator.address] = {
@@ -378,6 +380,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
   }
   async getParachainPoolTargets() {
     const apiProps = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
     const allCollators = [];
     const [_allCollators, _collatorCommission, _selectedCandidates] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission(), apiProps.api.query.parachainStaking.selectedCandidates()]);
     const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
@@ -412,7 +415,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     }
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {
-      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils2.parseIdentity)(apiProps, collator.address)]);
+      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), (0, _utils2.parseIdentity)(substrateIdentityApi, collator.address)]);
       const rawInfo = _info.toHuman();
       const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
       extraInfoMap[collator.address] = {

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -214,6 +214,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     if (!nominations) {
       return [];
     }
+    const substrateIdentityApi = this.substrateIdentityApi;
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
       let nominationStatus = _types.EarningStatus.NOT_EARNING;
@@ -221,11 +222,11 @@ class RelayNativeStakingPoolHandler extends _base.default {
       let identity;
       if (substrateApi.api.query.staking.erasStakersPaged) {
         // todo: review all relaychains later
-        const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
+        const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateIdentityApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
         identity = _identity;
         eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
       } else {
-        const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+        const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateIdentityApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
         identity = _identity;
         const eraStaker = _eraStaker.toPrimitive();
         eraStakerOtherList = eraStaker.others;
@@ -332,6 +333,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
   async getPoolTargets() {
     var _chainApi$api$query$s;
     const chainApi = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
     const poolInfo = await this.getPoolInfo();
     if (!poolInfo || !poolInfo.statistic) {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR));
@@ -375,7 +377,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const [_commissionInfo, [identity, isVerified]] = await Promise.all([chainApi.api.query.staking.validators(address), (0, _utils3.parseIdentity)(chainApi, address)]);
+      const [_commissionInfo, [identity, isVerified]] = await Promise.all([chainApi.api.query.staking.validators(address), (0, _utils3.parseIdentity)(substrateIdentityApi, address)]);
       const commissionInfo = _commissionInfo.toHuman();
       extraInfoMap[address] = {
         commission: commissionInfo.commission,

package/cjs/services/earning-service/service.js

@@ -37,6 +37,7 @@ class EarningService {
   });
   earningRewardHistorySubject = new _rxjs.BehaviorSubject({});
   minAmountPercentSubject = new _rxjs.BehaviorSubject({});
+  poolTargetsFetchingCached = new _rxjs.BehaviorSubject({});
 
   // earning
   yieldPoolInfoSubject = new _rxjs.BehaviorSubject({});
@@ -155,12 +156,39 @@ class EarningService {
     await this.loadData();
 
     // Pin list with value from map
-    this.yieldPositionSubject.subscribe({
-      next: data => {
+    (0, _rxjs.combineLatest)({
+      poolTarget: this.poolTargetsFetchingCached,
+      yieldPositionInfo: this.yieldPositionSubject
+    }).subscribe({
+      next: _ref => {
+        let {
+          poolTarget,
+          yieldPositionInfo
+        } = _ref;
         const activeMap = this.state.getActiveChainInfoMap();
-        const activePositions = Object.values(data).filter(item => {
+        const activePositions = Object.values(yieldPositionInfo).filter(item => {
           return !!activeMap[item.chain] && !this.inactivePoolSlug.has(item.slug);
         });
+        if (this.useOnlineCacheOnly) {
+          activePositions.forEach(item => {
+            const handler = this.getPoolHandler(item.slug);
+            if (handler !== null && handler !== void 0 && handler.canOverrideIdentity) {
+              const hasValidatorIdentity = item.nominations.some(validator => !!validator.validatorIdentity);
+              if (!hasValidatorIdentity) {
+                const validatorTargetRecord = poolTarget[item.slug];
+                if (validatorTargetRecord && Object.keys(validatorTargetRecord).length) {
+                  item.nominations = item.nominations.map(validator => {
+                    var _validatorTargetRecor;
+                    return {
+                      ...validator,
+                      validatorIdentity: ((_validatorTargetRecor = validatorTargetRecord[validator.validatorAddress]) === null || _validatorTargetRecor === void 0 ? void 0 : _validatorTargetRecor.identity) || validator.validatorIdentity
+                    };
+                  });
+                }
+              }
+            }
+          });
+        }
         this.yieldPositionListSubject.next(Object.values(activePositions));
       }
     });
@@ -245,6 +273,11 @@ class EarningService {
     // Start subscribe pools' reward history
     this.runSubscribeEarningRewardHistoryInterval();
 
+    // cache identities of validators in native staking
+    if (this.useOnlineCacheOnly && !this.validatorInfoCachingInterval) {
+      this.runIntervalGetPoolTargets().catch(console.error);
+    }
+
     // Update promise handler
     this.startPromiseHandler.resolve();
     this.stopPromiseHandler = (0, _utils2.createPromiseHandler)();
@@ -272,6 +305,12 @@ class EarningService {
     // Stop subscribe pools' reward history
     this.runUnsubscribeEarningRewardHistoryInterval();
 
+    // clear interval cache identities of validators in native staking
+    if (this.useOnlineCacheOnly && this.validatorInfoCachingInterval) {
+      clearInterval(this.validatorInfoCachingInterval);
+      this.validatorInfoCachingInterval = undefined;
+    }
+
     // Update promise handler
     this.stopPromiseHandler.resolve();
     this.startPromiseHandler = (0, _utils2.createPromiseHandler)();
@@ -454,14 +493,14 @@ class EarningService {
   }
   async removeYieldPositions(chains, addresses) {
     const removeKeys = [];
-    chains && chains.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(_ref => {
-      let [key, value] = _ref;
+    chains && chains.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(_ref2 => {
+      let [key, value] = _ref2;
       if (chains.indexOf(value.chain) > -1 && !removeKeys.includes(key)) {
         removeKeys.push(key);
       }
     });
-    addresses && addresses.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(_ref2 => {
-      let [key, value] = _ref2;
+    addresses && addresses.length > 0 && Object.entries(this.yieldPositionSubject.getValue()).forEach(_ref3 => {
+      let [key, value] = _ref3;
       if (addresses.indexOf(value.address) > -1 && !removeKeys.includes(key)) {
         removeKeys.push(key);
       }
@@ -740,6 +779,56 @@ class EarningService {
     }
     return targets;
   }
+  async getPoolTargetsToCached(slug) {
+    try {
+      const poolTargets = await this.getPoolTargets(slug);
+      if (poolTargets.length) {
+        const newData = poolTargets.reduce((record, target) => {
+          record[target.address] = target;
+          return record;
+        }, {});
+        return {
+          ...newData
+        };
+      }
+    } catch (e) {
+      console.error(e);
+    }
+    const prevValueCached = this.poolTargetsFetchingCached.getValue();
+    return {
+      ...prevValueCached[slug]
+    };
+  }
+  async runIntervalGetPoolTargets() {
+    let poolInfosSubjectValue = {
+      ...this.yieldPoolInfoSubject.getValue()
+    };
+    if (!Object.keys(poolInfosSubjectValue).length) {
+      try {
+        poolInfosSubjectValue = await fetchPoolsData();
+      } catch (e) {
+        console.log('Error fetching pools data:', e);
+      }
+    }
+    const poolNeedUpdateIdentityValidators = Object.values(poolInfosSubjectValue).reduce((list, pool) => {
+      if (pool.type === _types2.YieldPoolType.NATIVE_STAKING && _constants2.STAKING_IDENTITY_API_SLUG[pool.chain]) {
+        list.push(pool.slug);
+      }
+      return list;
+    }, []);
+    const updatePoolTarget = () => {
+      Promise.all(poolNeedUpdateIdentityValidators.map(slug => this.getPoolTargetsToCached(slug))).then(data => {
+        const poolTargetsFetchingCached = this.poolTargetsFetchingCached.getValue();
+        data.forEach((targets, index) => {
+          const slug = poolNeedUpdateIdentityValidators[index];
+          poolTargetsFetchingCached[slug] = targets;
+        });
+        this.poolTargetsFetchingCached.next(poolTargetsFetchingCached);
+      }).catch(console.error);
+    };
+    updatePoolTarget();
+    this.validatorInfoCachingInterval = setInterval(updatePoolTarget, _constants.CRON_REFRESH_EARNING_TARGETS);
+  }
 
   /* Get pool's targets */
 

package/cjs/services/swap-service/handler/chainflip-handler.js

@@ -72,16 +72,15 @@ class ChainflipSwapHandler {
     } = params;
     const pair = quote.pair;
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
-    const toAsset = this.chainService.getAssetBySlug(pair.to);
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
     const receiver = (0, _utils2._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
-    const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
-    const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     const minReceive = new _bignumber.default(quote.rate).times(1 - slippage).toString();
     const processMetadata = params.process.steps[params.currentStep].metadata;
     const quoteMetadata = processMetadata;
+    const fromAssetId = quoteMetadata.fromAssetId;
+    const toAssetId = quoteMetadata.toAssetId;
     if (!processMetadata || !quoteMetadata) {
       throw new Error('Metadata for Chainflip not found');
     }
@@ -114,6 +113,7 @@ class ChainflipSwapHandler {
       method: 'GET'
     }, this.isTestnet);
     const data = await response.json();
+    console.log('Chainflip channel info:', data);
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
     }
@@ -223,6 +223,8 @@ class ChainflipSwapHandler {
         receiver: (0, _utils2._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
+        fromAssetId: metadata.fromAssetId,
+        toAssetId: metadata.toAssetId,
         version: 2
       }
     };

package/cjs/utils/account/transform.js

@@ -195,9 +195,7 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
   } else if (signMode === _types2.AccountSignMode.GENERIC_LEDGER) {
     switch (networkType) {
       case _types2.AccountChainType.SUBSTRATE:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS,
-        // ...EARN_LDOT_ACTIONS,
-        // ...EARN_SDOT_ACTIONS,
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS,
         // ...EARN_QDOT_ACTIONS,
         ...OTHER_ACTIONS];
       case _types2.AccountChainType.ETHEREUM:
@@ -226,14 +224,12 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
     if (specialNetwork === 'bifrost') {
       result.push(...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS);
     }
-
-    // if (specialNetwork === 'acala') {
-    //   result.push(...EARN_LDOT_ACTIONS);
-    // }
-
-    // if (specialNetwork === 'parallel') {
-    //   result.push(...EARN_SDOT_ACTIONS);
-    // }
+    if (specialNetwork === 'acala') {
+      result.push(...EARN_LDOT_ACTIONS);
+    }
+    if (specialNetwork === 'parallel') {
+      result.push(...EARN_SDOT_ACTIONS);
+    }
 
     // if (specialNetwork === 'interlay') {
     //   result.push(...EARN_QDOT_ACTIONS);

package/constants/staking.d.ts

@@ -5,3 +5,4 @@ export declare type ChainRecommendValidator = {
     maxCount: number;
     preSelectValidators: string;
 };
+export declare const CRON_REFRESH_EARNING_TARGETS: number;

package/constants/staking.js

@@ -10,4 +10,5 @@ export const PREDEFINED_STAKING_POOL = {
   availTuringTest: 11
 };
 export const MAX_NOMINATIONS = '16';
-export const PREDEFINED_EARNING_POOL_PROMISE = fetchStaticData('nomination-pool-recommendation');
+export const PREDEFINED_EARNING_POOL_PROMISE = fetchStaticData('nomination-pool-recommendation');
+export const CRON_REFRESH_EARNING_TARGETS = 10 * 60 * 1000; // 10 minutes depends on cron run time on server

package/core/utils.js

@@ -25,11 +25,14 @@ export function getMaxBigInt(a, b) {
   return a > b ? a : b;
 }
 export function ledgerMustCheckNetwork(account) {
-  if (account && account.isHardware && account.isGeneric && !isEthereumAddress(account.address)) {
-    return account.originGenesisHash ? 'migration' : 'polkadot';
-  } else {
-    return 'unnecessary';
+  if (account && account.isHardware && account.isGeneric) {
+    if (!isEthereumAddress(account.address)) {
+      return account.originGenesisHash ? 'migration' : 'polkadot';
+    } else if (account.isSubstrateECDSA) {
+      return 'polkadot_ecdsa';
+    }
   }
+  return 'unnecessary';
 }
 
 // --- recipient address validation --- //
@@ -160,7 +163,13 @@ export function _isSupportLedgerAccount(validateRecipientParams) {
       // For ledger generic
       const ledgerCheck = ledgerMustCheckNetwork(account);
       if (ledgerCheck !== 'unnecessary' && !allowLedgerGenerics.includes(destChainInfo.slug)) {
-        return `Ledger ${ledgerCheck === 'polkadot' ? 'Polkadot' : 'Migration'} address is not supported for this transfer`;
+        let ledgerTypeLabel = 'Migration';
+        if (ledgerCheck === 'polkadot') {
+          ledgerTypeLabel = 'Polkadot';
+        } else if (ledgerCheck === 'polkadot_ecdsa') {
+          ledgerTypeLabel = 'Polkadot (EVM)';
+        }
+        return `Ledger ${ledgerTypeLabel} address is not supported for this transfer`;
       }
     }
   }

package/koni/background/handlers/Extension.js

@@ -2027,16 +2027,17 @@ export default class KoniExtension {
   async validateERC721Token(data) {
     var _data$metadata;
     const evmApi = this.#koniState.getEvmApi(data.originChain);
+    const contractAddress = (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress;
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const tokenContract = new evmApi.api.eth.Contract(_ERC721_ABI, (_data$metadata = data.metadata) === null || _data$metadata === void 0 ? void 0 : _data$metadata.contractAddress);
+    const tokenContract = new evmApi.api.eth.Contract(_ERC721_ABI, contractAddress);
     try {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
       await tokenContract.methods.tokenOfOwnerByIndex('0xB7fdD27a8Df011816205a6e3cAA097DC4D8C2C5d', 1).call();
       return true;
     } catch (err) {
       const error = err;
-      if (error.message.includes('ERC721Enumerable: owner index out of bounds')) {
+      if (error.message.includes('index out of bounds')) {
         return true;
       } else {
         return false;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.48-2",
+  "version": "1.3.50-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2866,12 +2866,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.110",
-    "@subwallet/extension-base": "^1.3.48-2",
-    "@subwallet/extension-chains": "^1.3.48-2",
-    "@subwallet/extension-dapp": "^1.3.48-2",
-    "@subwallet/extension-inject": "^1.3.48-2",
+    "@subwallet/extension-base": "^1.3.50-0",
+    "@subwallet/extension-chains": "^1.3.50-0",
+    "@subwallet/extension-dapp": "^1.3.50-0",
+    "@subwallet/extension-inject": "^1.3.50-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.48-2",
+    "@subwallet/subwallet-api-sdk": "^1.3.50-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

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.3.48-2'
+  version: '1.3.50-0'
 };

package/services/earning-service/constants/chains.d.ts

@@ -22,4 +22,5 @@ export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export declare const MANTA_MIN_DELEGATION = 500;
 export declare const CHANNEL_ID = 7;
+export declare const STAKING_IDENTITY_API_SLUG: Record<string, string>;
 export declare const _SUPPORT_CHANGE_VALIDATOR_CHAIN: string[];

package/services/earning-service/constants/chains.js

@@ -29,4 +29,8 @@ export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
 export const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export const MANTA_MIN_DELEGATION = 500;
 export const CHANNEL_ID = 7;
+export const STAKING_IDENTITY_API_SLUG = {
+  polkadot: 'polkadot_people',
+  kusama: 'peopleKusama'
+};
 export const _SUPPORT_CHANGE_VALIDATOR_CHAIN = ['polkadot', 'kusama'];

package/services/earning-service/handlers/base.d.ts

@@ -28,6 +28,8 @@ export default abstract class BasePoolHandler {
     readonly transactionChainType: ChainType;
     /** Pool's available method */
     abstract readonly availableMethod: YieldPoolMethodInfo;
+    /** Whether the pool can override identity of validator */
+    canOverrideIdentity: boolean;
     /**
      * @constructor
      * @param {KoniState} state - Koni state
@@ -38,6 +40,7 @@ export default abstract class BasePoolHandler {
     get group(): string;
     get isActive(): boolean;
     protected get substrateApi(): _SubstrateApi;
+    protected get substrateIdentityApi(): _SubstrateApi;
     protected get evmApi(): _EvmApi;
     get chainInfo(): _ChainInfo;
     protected get nativeToken(): _ChainAsset;

package/services/earning-service/handlers/base.js

@@ -3,7 +3,7 @@
 
 import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { DEFAULT_YIELD_FIRST_STEP } from '@subwallet/extension-base/services/earning-service/constants';
+import { DEFAULT_YIELD_FIRST_STEP, STAKING_IDENTITY_API_SLUG } from '@subwallet/extension-base/services/earning-service/constants';
 import { createClaimNotification, createWithdrawNotifications } from '@subwallet/extension-base/services/inapp-notification-service/utils';
 import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_TEN } from '@polkadot/util';
@@ -31,6 +31,9 @@ export default class BasePoolHandler {
 
   /** Pool's available method */
 
+  /** Whether the pool can override identity of validator */
+  canOverrideIdentity = false;
+
   /**
    * @constructor
    * @param {KoniState} state - Koni state
@@ -54,6 +57,17 @@ export default class BasePoolHandler {
   get substrateApi() {
     return this.state.getSubstrateApi(this.chain);
   }
+  get substrateIdentityApi() {
+    const otherChainSupported = STAKING_IDENTITY_API_SLUG[this.chain];
+    if (otherChainSupported) {
+      const api = this.state.getSubstrateApi(otherChainSupported) || this.substrateApi;
+      if (api.isApiReady && api.isApiConnected) {
+        return api;
+      }
+      return this.substrateApi;
+    }
+    return this.substrateApi;
+  }
   get evmApi() {
     return this.state.getEvmApi(this.chain);
   }

package/services/earning-service/handlers/native-staking/amplitude.d.ts

@@ -10,8 +10,8 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     checkAccountHaveStake(useAddresses: string[]): Promise<string[]>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     getPoolReward(useAddresses: string[], callBack: (rs: EarningRewardItem) => void): Promise<VoidFunction>;
-    getKrestPoolTargets(chainApi: _SubstrateApi): Promise<ValidatorInfo[]>;
-    getOtherPoolTargets(chainApi: _SubstrateApi): Promise<ValidatorInfo[]>;
+    getKrestPoolTargets(chainApi: _SubstrateApi, chainIdentityApi: _SubstrateApi): Promise<ValidatorInfo[]>;
+    getOtherPoolTargets(chainApi: _SubstrateApi, chainIdentityApi: _SubstrateApi): Promise<ValidatorInfo[]>;
     getPoolTargets(): Promise<ValidatorInfo[]>;
     get defaultSubmitStep(): YieldStepBaseInfo;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;

package/services/earning-service/handlers/native-staking/amplitude.js

@@ -111,7 +111,8 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     let unstakingBalance = '0';
     if (delegatorState) {
       // delegatorState can be null while unstaking all
-      const identityPromises = delegatorState.map(delegate => parseIdentity(substrateApi, delegate.owner));
+      const substrateIdentityApi = this.substrateIdentityApi;
+      const identityPromises = delegatorState.map(delegate => parseIdentity(substrateIdentityApi, delegate.owner));
       const identities = await Promise.all(identityPromises);
       for (let i = 0; i < delegatorState.length; i++) {
         const delegate = delegatorState[i];
@@ -302,7 +303,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
 
   /* Get pool targets */
 
-  async getKrestPoolTargets(chainApi) {
+  async getKrestPoolTargets(chainApi, chainIdentityApi) {
     var _chainApi$api$consts$;
     const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
     const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
@@ -310,7 +311,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     const identityPromises = _allCollators.map(collator => {
       const collatorInfo = collator[1].toPrimitive();
       const address = collatorInfo.id;
-      return parseIdentity(chainApi, address);
+      return parseIdentity(chainIdentityApi, address);
     });
     const identities = await Promise.all(identityPromises);
     return _allCollators.map((_collator, i) => {
@@ -343,7 +344,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
       };
     });
   }
-  async getOtherPoolTargets(chainApi) {
+  async getOtherPoolTargets(chainApi, chainIdentityApi) {
     const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
     const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
     const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
@@ -353,7 +354,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     const identityPromises = _allCollators.map(collator => {
       const collatorInfo = collator[1].toPrimitive();
       const address = collatorInfo.id;
-      return parseIdentity(chainApi, address);
+      return parseIdentity(chainIdentityApi, address);
     });
     const identities = await Promise.all(identityPromises);
     return _allCollators.map((_collator, i) => {
@@ -389,10 +390,11 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
   }
   async getPoolTargets() {
     const chainApi = await this.substrateApi.isReady;
+    const chainIdentityApi = this.substrateIdentityApi;
     if (_STAKING_CHAIN_GROUP.krest_network.includes(this.chain)) {
-      return this.getKrestPoolTargets(chainApi);
+      return this.getKrestPoolTargets(chainApi, chainIdentityApi);
     } else {
-      return this.getOtherPoolTargets(chainApi);
+      return this.getOtherPoolTargets(chainApi, chainIdentityApi);
     }
   }
 

package/services/earning-service/handlers/native-staking/base.js

@@ -3,6 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { STAKING_IDENTITY_API_SLUG } from '@subwallet/extension-base/services/earning-service/constants';
 import { BasicTxErrorType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { noop } from '@polkadot/util';
 import BasePoolHandler from "../base.js";
@@ -28,6 +29,7 @@ export default class BaseNativeStakingPoolHandler extends BasePoolHandler {
     this.slug = `${symbol}___native_staking___${_chainInfo.slug}`;
     this.name = `${_chainInfo.name} Native Staking`;
     this.shortName = _chainInfo.name.replaceAll(' Relay Chain', '');
+    this.canOverrideIdentity = !!STAKING_IDENTITY_API_SLUG[chain];
   }
   getDescription(amount = '0') {
     const _chainAsset = this.nativeToken;

package/services/earning-service/handlers/native-staking/para-chain.js

@@ -134,6 +134,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   async parseNominatorMetadata(chainInfo, address, substrateApi, delegatorState) {
     const nominationList = [];
     const unstakingMap = {};
+    const substrateIdentityApi = this.substrateIdentityApi;
     let bnTotalActiveStake = BN_ZERO;
     let bnTotalStake = BN_ZERO;
     let bnTotalUnstaking = BN_ZERO;
@@ -141,7 +142,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateIdentityApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
       const currentBlock = _currentBlock.toPrimitive();
       const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
@@ -292,6 +293,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   async getMantaPoolTargets() {
     var _this$chainInfo$subst;
     const apiProps = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
     const allCollators = [];
     const DECIMAL = (_this$chainInfo$subst = this.chainInfo.substrateInfo) === null || _this$chainInfo$subst === void 0 ? void 0 : _this$chainInfo$subst.decimals;
     const POINTS_PER_BLOCK = MANTA_VALIDATOR_POINTS_PER_BLOCK; // producing 1 block will get 20 points for validator
@@ -351,7 +353,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     }));
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {
-      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
+      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(substrateIdentityApi, collator.address)]);
       const rawInfo = _info.toHuman();
       const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
       extraInfoMap[collator.address] = {
@@ -371,6 +373,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   }
   async getParachainPoolTargets() {
     const apiProps = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
     const allCollators = [];
     const [_allCollators, _collatorCommission, _selectedCandidates] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission(), apiProps.api.query.parachainStaking.selectedCandidates()]);
     const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
@@ -405,7 +408,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     }
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {
-      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(apiProps, collator.address)]);
+      const [_info, [identity, isReasonable]] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo(collator.address), parseIdentity(substrateIdentityApi, collator.address)]);
       const rawInfo = _info.toHuman();
       const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
       extraInfoMap[collator.address] = {

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -207,6 +207,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     if (!nominations) {
       return [];
     }
+    const substrateIdentityApi = this.substrateIdentityApi;
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
       let nominationStatus = EarningStatus.NOT_EARNING;
@@ -214,11 +215,11 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       let identity;
       if (substrateApi.api.query.staking.erasStakersPaged) {
         // todo: review all relaychains later
-        const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
+        const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateIdentityApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
         identity = _identity;
         eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);
       } else {
-        const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+        const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateIdentityApi, validatorAddress), substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
         identity = _identity;
         const eraStaker = _eraStaker.toPrimitive();
         eraStakerOtherList = eraStaker.others;
@@ -325,6 +326,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
   async getPoolTargets() {
     var _chainApi$api$query$s;
     const chainApi = await this.substrateApi.isReady;
+    const substrateIdentityApi = this.substrateIdentityApi;
     const poolInfo = await this.getPoolInfo();
     if (!poolInfo || !poolInfo.statistic) {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
@@ -368,7 +370,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const [_commissionInfo, [identity, isVerified]] = await Promise.all([chainApi.api.query.staking.validators(address), parseIdentity(chainApi, address)]);
+      const [_commissionInfo, [identity, isVerified]] = await Promise.all([chainApi.api.query.staking.validators(address), parseIdentity(substrateIdentityApi, address)]);
       const commissionInfo = _commissionInfo.toHuman();
       extraInfoMap[address] = {
         commission: commissionInfo.commission,

package/services/earning-service/service.d.ts

@@ -16,12 +16,14 @@ export default class EarningService implements StoppableServiceInterface, Persis
     private earningRewardSubject;
     private earningRewardHistorySubject;
     private minAmountPercentSubject;
+    private poolTargetsFetchingCached;
     readonly yieldPoolInfoSubject: BehaviorSubject<Record<string, YieldPoolInfo>>;
     readonly yieldPositionSubject: BehaviorSubject<Record<string, YieldPositionInfo>>;
     readonly yieldPositionListSubject: BehaviorSubject<YieldPositionInfo[]>;
     private dbService;
     private eventService;
     private useOnlineCacheOnly;
+    private validatorInfoCachingInterval;
     private inactivePoolReady;
     constructor(state: KoniState);
     disableOnlineCacheOnly(): void;
@@ -93,6 +95,8 @@ export default class EarningService implements StoppableServiceInterface, Persis
      * @return {Promise<YieldPoolTarget[]>} List of pool's target
      * */
     getPoolTargets(slug: string): Promise<YieldPoolTarget[]>;
+    getPoolTargetsToCached(slug: string): Promise<Record<string, YieldPoolTarget>>;
+    private runIntervalGetPoolTargets;
     earlyValidateJoin(request: RequestEarlyValidateYield): Promise<ResponseEarlyValidateYield>;
     generateOptimalSteps(params: OptimalYieldPathParams): Promise<OptimalYieldPath>;
     validateYieldJoin(params: ValidateYieldProcessParams): Promise<TransactionError[]>;

package/services/earning-service/service.js

@@ -3,16 +3,16 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL, CRON_REFRESH_EARNING_TARGETS, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { _getChainSubstrateTokenSymbol, _isChainEnabled } from '@subwallet/extension-base/services/chain-service/utils';
-import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
+import { _STAKING_CHAIN_GROUP, STAKING_IDENTITY_API_SLUG } from '@subwallet/extension-base/services/earning-service/constants';
 import BaseLiquidStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/liquid-staking/base';
 import MythosNativeStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/native-staking/mythos';
 import { BasicTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
 import { addLazy, createPromiseHandler, filterAddressByChainInfo, removeLazy } from '@subwallet/extension-base/utils';
 import { fetchStaticCache } from '@subwallet/extension-base/utils/fetchStaticCache';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, combineLatest } from 'rxjs';
 import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler, SubnetTaoStakingPoolHandler, TaoNativeStakingPoolHandler } from "./handlers/index.js";
 const fetchPoolsData = async () => {
   const fetchData = await fetchStaticCache('earning/yield-pools.json', {
@@ -30,6 +30,7 @@ export default class EarningService {
   });
   earningRewardHistorySubject = new BehaviorSubject({});
   minAmountPercentSubject = new BehaviorSubject({});
+  poolTargetsFetchingCached = new BehaviorSubject({});
 
   // earning
   yieldPoolInfoSubject = new BehaviorSubject({});
@@ -148,12 +149,38 @@ export default class EarningService {
     await this.loadData();
 
     // Pin list with value from map
-    this.yieldPositionSubject.subscribe({
-      next: data => {
+    combineLatest({
+      poolTarget: this.poolTargetsFetchingCached,
+      yieldPositionInfo: this.yieldPositionSubject
+    }).subscribe({
+      next: ({
+        poolTarget,
+        yieldPositionInfo
+      }) => {
         const activeMap = this.state.getActiveChainInfoMap();
-        const activePositions = Object.values(data).filter(item => {
+        const activePositions = Object.values(yieldPositionInfo).filter(item => {
           return !!activeMap[item.chain] && !this.inactivePoolSlug.has(item.slug);
         });
+        if (this.useOnlineCacheOnly) {
+          activePositions.forEach(item => {
+            const handler = this.getPoolHandler(item.slug);
+            if (handler !== null && handler !== void 0 && handler.canOverrideIdentity) {
+              const hasValidatorIdentity = item.nominations.some(validator => !!validator.validatorIdentity);
+              if (!hasValidatorIdentity) {
+                const validatorTargetRecord = poolTarget[item.slug];
+                if (validatorTargetRecord && Object.keys(validatorTargetRecord).length) {
+                  item.nominations = item.nominations.map(validator => {
+                    var _validatorTargetRecor;
+                    return {
+                      ...validator,
+                      validatorIdentity: ((_validatorTargetRecor = validatorTargetRecord[validator.validatorAddress]) === null || _validatorTargetRecor === void 0 ? void 0 : _validatorTargetRecor.identity) || validator.validatorIdentity
+                    };
+                  });
+                }
+              }
+            }
+          });
+        }
         this.yieldPositionListSubject.next(Object.values(activePositions));
       }
     });
@@ -238,6 +265,11 @@ export default class EarningService {
     // Start subscribe pools' reward history
     this.runSubscribeEarningRewardHistoryInterval();
 
+    // cache identities of validators in native staking
+    if (this.useOnlineCacheOnly && !this.validatorInfoCachingInterval) {
+      this.runIntervalGetPoolTargets().catch(console.error);
+    }
+
     // Update promise handler
     this.startPromiseHandler.resolve();
     this.stopPromiseHandler = createPromiseHandler();
@@ -265,6 +297,12 @@ export default class EarningService {
     // Stop subscribe pools' reward history
     this.runUnsubscribeEarningRewardHistoryInterval();
 
+    // clear interval cache identities of validators in native staking
+    if (this.useOnlineCacheOnly && this.validatorInfoCachingInterval) {
+      clearInterval(this.validatorInfoCachingInterval);
+      this.validatorInfoCachingInterval = undefined;
+    }
+
     // Update promise handler
     this.stopPromiseHandler.resolve();
     this.startPromiseHandler = createPromiseHandler();
@@ -730,6 +768,56 @@ export default class EarningService {
     }
     return targets;
   }
+  async getPoolTargetsToCached(slug) {
+    try {
+      const poolTargets = await this.getPoolTargets(slug);
+      if (poolTargets.length) {
+        const newData = poolTargets.reduce((record, target) => {
+          record[target.address] = target;
+          return record;
+        }, {});
+        return {
+          ...newData
+        };
+      }
+    } catch (e) {
+      console.error(e);
+    }
+    const prevValueCached = this.poolTargetsFetchingCached.getValue();
+    return {
+      ...prevValueCached[slug]
+    };
+  }
+  async runIntervalGetPoolTargets() {
+    let poolInfosSubjectValue = {
+      ...this.yieldPoolInfoSubject.getValue()
+    };
+    if (!Object.keys(poolInfosSubjectValue).length) {
+      try {
+        poolInfosSubjectValue = await fetchPoolsData();
+      } catch (e) {
+        console.log('Error fetching pools data:', e);
+      }
+    }
+    const poolNeedUpdateIdentityValidators = Object.values(poolInfosSubjectValue).reduce((list, pool) => {
+      if (pool.type === YieldPoolType.NATIVE_STAKING && STAKING_IDENTITY_API_SLUG[pool.chain]) {
+        list.push(pool.slug);
+      }
+      return list;
+    }, []);
+    const updatePoolTarget = () => {
+      Promise.all(poolNeedUpdateIdentityValidators.map(slug => this.getPoolTargetsToCached(slug))).then(data => {
+        const poolTargetsFetchingCached = this.poolTargetsFetchingCached.getValue();
+        data.forEach((targets, index) => {
+          const slug = poolNeedUpdateIdentityValidators[index];
+          poolTargetsFetchingCached[slug] = targets;
+        });
+        this.poolTargetsFetchingCached.next(poolTargetsFetchingCached);
+      }).catch(console.error);
+    };
+    updatePoolTarget();
+    this.validatorInfoCachingInterval = setInterval(updatePoolTarget, CRON_REFRESH_EARNING_TARGETS);
+  }
 
   /* Get pool's targets */
 

package/services/swap-service/handler/chainflip-handler.js

@@ -6,7 +6,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
-import { _getAssetSymbol, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
 import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
@@ -64,16 +64,15 @@ export class ChainflipSwapHandler {
     } = params;
     const pair = quote.pair;
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
-    const toAsset = this.chainService.getAssetBySlug(pair.to);
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const chainType = _isChainSubstrateCompatible(chainInfo) ? ChainType.SUBSTRATE : ChainType.EVM;
     const receiver = _reformatAddressWithChain(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
-    const fromAssetId = _getAssetSymbol(fromAsset);
-    const toAssetId = _getAssetSymbol(toAsset);
     const minReceive = new BigNumber(quote.rate).times(1 - slippage).toString();
     const processMetadata = params.process.steps[params.currentStep].metadata;
     const quoteMetadata = processMetadata;
+    const fromAssetId = quoteMetadata.fromAssetId;
+    const toAssetId = quoteMetadata.toAssetId;
     if (!processMetadata || !quoteMetadata) {
       throw new Error('Metadata for Chainflip not found');
     }
@@ -106,6 +105,7 @@ export class ChainflipSwapHandler {
       method: 'GET'
     }, this.isTestnet);
     const data = await response.json();
+    console.log('Chainflip channel info:', data);
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
     }
@@ -215,6 +215,8 @@ export class ChainflipSwapHandler {
         receiver: _reformatAddressWithChain(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
+        fromAssetId: metadata.fromAssetId,
+        toAssetId: metadata.toAssetId,
         version: 2
       }
     };

package/types/swap/index.d.ts

@@ -226,4 +226,6 @@ export interface HydrationSwapStepMetadata extends BaseSwapStepMetadata {
 export interface ChainFlipSwapStepMetadata extends BaseSwapStepMetadata {
     srcChain: string;
     destChain: string;
+    fromAssetId: string;
+    toAssetId: string;
 }

package/utils/account/transform.js

@@ -184,9 +184,7 @@ export const getAccountTransactionActions = (signMode, networkType, type, _meta,
   } else if (signMode === AccountSignMode.GENERIC_LEDGER) {
     switch (networkType) {
       case AccountChainType.SUBSTRATE:
-        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS,
-        // ...EARN_LDOT_ACTIONS,
-        // ...EARN_SDOT_ACTIONS,
+        return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS, ...EARN_LDOT_ACTIONS, ...EARN_SDOT_ACTIONS,
         // ...EARN_QDOT_ACTIONS,
         ...OTHER_ACTIONS];
       case AccountChainType.ETHEREUM:
@@ -215,14 +213,12 @@ export const getAccountTransactionActions = (signMode, networkType, type, _meta,
     if (specialNetwork === 'bifrost') {
       result.push(...EARN_VDOT_ACTIONS, ...EARN_VMANTA_ACTIONS);
     }
-
-    // if (specialNetwork === 'acala') {
-    //   result.push(...EARN_LDOT_ACTIONS);
-    // }
-
-    // if (specialNetwork === 'parallel') {
-    //   result.push(...EARN_SDOT_ACTIONS);
-    // }
+    if (specialNetwork === 'acala') {
+      result.push(...EARN_LDOT_ACTIONS);
+    }
+    if (specialNetwork === 'parallel') {
+      result.push(...EARN_SDOT_ACTIONS);
+    }
 
     // if (specialNetwork === 'interlay') {
     //   result.push(...EARN_QDOT_ACTIONS);