@subwallet/extension-base 1.2.4-0 → 1.2.5-0

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

@@ -21,12 +21,15 @@ exports.getExistUnstakeErrorMessage = void 0;
 exports.getInflationParams = getInflationParams;
 exports.getMinStakeErrorMessage = exports.getMaxValidatorErrorMessage = void 0;
 exports.getParaCurrentInflation = getParaCurrentInflation;
+exports.getRelayBlockedValidatorList = getRelayBlockedValidatorList;
+exports.getRelayEraRewardMap = getRelayEraRewardMap;
+exports.getRelayMaxNominations = getRelayMaxNominations;
+exports.getRelayTopValidatorByPoints = getRelayTopValidatorByPoints;
+exports.getRelayValidatorPointsMap = getRelayValidatorPointsMap;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getSupportedDaysByHistoryDepth = getSupportedDaysByHistoryDepth;
-exports.getTopValidatorByPoints = getTopValidatorByPoints;
 exports.getValidatorLabel = getValidatorLabel;
-exports.getValidatorPointsMap = getValidatorPointsMap;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.getYieldAvailableActionsByPosition = getYieldAvailableActionsByPosition;
 exports.getYieldAvailableActionsByType = getYieldAvailableActionsByType;
@@ -393,14 +396,13 @@ function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras, liveDay) {
     return maxSupportDay;
   }
 }
-function getValidatorPointsMap(eraRewardMap) {
+function getRelayValidatorPointsMap(eraRewardMap) {
   // mapping store validator and totalPoints
   const validatorTotalPointsMap = {};
   Object.values(eraRewardMap).forEach(info => {
     const individual = info.individual;
     Object.entries(individual).forEach(_ref => {
-      let [validator, rawPoints] = _ref;
-      const points = rawPoints.replaceAll(',', '');
+      let [validator, points] = _ref;
       if (!validatorTotalPointsMap[validator]) {
         validatorTotalPointsMap[validator] = new _bignumber.default(points);
       } else {
@@ -410,7 +412,7 @@ function getValidatorPointsMap(eraRewardMap) {
   });
   return validatorTotalPointsMap;
 }
-function getTopValidatorByPoints(validatorPointsList) {
+function getRelayTopValidatorByPoints(validatorPointsList) {
   const sortValidatorPointsList = Object.fromEntries(Object.entries(validatorPointsList).sort((a, b) => a[1].minus(b[1]).toNumber()).reverse());
 
   // keep 50% first validator
@@ -420,6 +422,36 @@ function getTopValidatorByPoints(validatorPointsList) {
   const top50PercentRecord = Object.fromEntries(top50PercentEntries);
   return Object.keys(top50PercentRecord);
 }
+function getRelayBlockedValidatorList(validators) {
+  const blockValidatorList = [];
+  for (const validator of validators) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorAddress = validator[0].toHuman()[0];
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorPrefs = validator[1].toHuman();
+    const isBlocked = validatorPrefs.blocked;
+    if (isBlocked) {
+      blockValidatorList.push(validatorAddress);
+    }
+  }
+  return blockValidatorList;
+}
+function getRelayEraRewardMap(eraRewardPointArray, startEraForPoints) {
+  const eraRewardMap = {};
+  for (const item of eraRewardPointArray) {
+    eraRewardMap[startEraForPoints] = item.toPrimitive();
+    startEraForPoints++;
+  }
+  return eraRewardMap;
+}
+async function getRelayMaxNominations(substrateApi) {
+  var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$cal;
+  await substrateApi.isReady;
+  const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
+  const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
+  const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
+  return maxNominationsByNominationQuota || maxNominations;
+}
 const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
   const number = (0, _number.formatNumber)(bnMinStake.toString(), tokenInfo.decimals || 0, _number.balanceFormatter);

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

@@ -276,7 +276,7 @@ class KoniTabs {
       anyType
     } = _ref10;
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, accountAuthType);
+    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, (authInfo === null || authInfo === void 0 ? void 0 : authInfo.accountAuthType) || accountAuthType);
   }
   accountsSubscribeV2(url, _ref11, id, port) {
     let {
@@ -289,8 +289,9 @@ class KoniTabs {
     this.#accountSubs[id] = {
       subscription: authInfoSubject.subscribe(infos => {
         this.getAuthInfo(url, infos).then(authInfo => {
+          const accountAuthType_ = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.accountAuthType) || accountAuthType;
           const accounts = this.#koniState.keyringService.accounts;
-          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType_));
         }).catch(console.error);
       }),
       url

package/cjs/packageInfo.js

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

package/cjs/page/index.js

@@ -41,9 +41,11 @@ function sendMessage(message, request, subscriber) {
 }
 
 // the enable function, called by the dapp to allow access
-async function enable(origin) {
+
+async function enable(origin, opt) {
   await sendMessage('pub(authorize.tabV2)', {
-    origin
+    origin,
+    accountAuthType: (opt === null || opt === void 0 ? void 0 : opt.accountAuthType) || 'substrate'
   });
   return new _Injected.default(sendMessage);
 }

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

@@ -51,17 +51,14 @@ class RelayNativeStakingPoolHandler extends _base.default {
     await defaultCallback();
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
-      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+      var _substrateApi$api$con, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
       if (cancel) {
         unsub();
         return;
       }
-      let maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
       const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
-      const maxNominatorRewarded = (_substrateApi$api$con3 = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
-      const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
-      const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
-      maxNominations = maxNominationsByNominationQuota !== null && maxNominationsByNominationQuota !== void 0 ? maxNominationsByNominationQuota : maxNominations;
+      const maxNominatorRewarded = (_substrateApi$api$con = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con === void 0 ? void 0 : _substrateApi$api$con.toString();
+      const maxNominations = await (0, _utils.getRelayMaxNominations)(substrateApi);
       const currentEra = _currentEra.toString();
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
@@ -140,54 +137,15 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const [_nominations, _bonded, _activeEra] = await Promise.all([(_substrateApi$api$que7 = substrateApi.api.query) === null || _substrateApi$api$que7 === void 0 ? void 0 : (_substrateApi$api$que8 = _substrateApi$api$que7.staking) === null || _substrateApi$api$que8 === void 0 ? void 0 : _substrateApi$api$que8.nominators(address), (_substrateApi$api$que9 = substrateApi.api.query) === null || _substrateApi$api$que9 === void 0 ? void 0 : (_substrateApi$api$que10 = _substrateApi$api$que9.staking) === null || _substrateApi$api$que10 === void 0 ? void 0 : _substrateApi$api$que10.bonded(address), (_substrateApi$api$que11 = substrateApi.api.query) === null || _substrateApi$api$que11 === void 0 ? void 0 : (_substrateApi$api$que12 = _substrateApi$api$que11.staking) === null || _substrateApi$api$que12 === void 0 ? void 0 : _substrateApi$api$que12.activeEra()]);
     const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
     const _maxNominatorRewardedPerValidator = (substrateApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
-    const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+    const maxNominatorRewardedPerValidator = unlimitedNominatorRewarded ? undefined : parseInt(_maxNominatorRewardedPerValidator);
     const nominations = _nominations.toPrimitive();
     const bonded = _bonded.toHuman();
+    const addressFormatted = (0, _utils4.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo));
     const activeStake = ledger.active.toString();
     const totalStake = ledger.total.toString();
     const unstakingBalance = (ledger.total - ledger.active).toString();
-    const nominationList = [];
     const unstakingList = [];
-    if (nominations) {
-      const validatorList = nominations.targets;
-      await Promise.all(validatorList.map(async validatorAddress => {
-        let nominationStatus = _types.EarningStatus.NOT_EARNING;
-        let eraStakerOtherList = [];
-        let identity;
-        if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
-          // todo: review all relaychains later
-          const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, 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)]);
-          identity = _identity;
-          const eraStaker = _eraStaker.toPrimitive();
-          eraStakerOtherList = eraStaker.others;
-        }
-        const sortedNominators = eraStakerOtherList.sort((a, b) => {
-          return new _bignumber.default(b.value).minus(a.value).toNumber();
-        });
-        const topNominators = sortedNominators.map(nominator => {
-          return nominator.who;
-        });
-        if (!topNominators.includes((0, _utils4.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
-          // if nominator has target but not in nominator list
-          nominationStatus = _types.EarningStatus.WAITING;
-        } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes((0, _utils4.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
-          // if address in top nominators
-          nominationStatus = _types.EarningStatus.EARNING_REWARD;
-        }
-        nominationList.push({
-          chain,
-          validatorAddress,
-          status: nominationStatus,
-          validatorIdentity: identity,
-          activeStake: '0' // relaychain allocates stake accordingly
-        });
-      }));
-    }
-
+    const nominationList = (await this.handleNominationsList(substrateApi, chain, nominations, currentEra, addressFormatted, maxNominatorRewardedPerValidator)) || [];
     let stakingStatus = _types.EarningStatus.NOT_EARNING;
     const bnActiveStake = new _util.BN(activeStake);
     let waitingNominationCount = 0;
@@ -231,6 +189,51 @@ class RelayNativeStakingPoolHandler extends _base.default {
       unstakings: unstakingList
     };
   }
+  async handleNominationsList(substrateApi, chain, nominations, currentEra, address, maxNominatorRewardedPerValidator) {
+    const nominationList = [];
+    if (!nominations) {
+      return [];
+    }
+    const validatorList = nominations.targets;
+    await Promise.all(validatorList.map(async validatorAddress => {
+      let nominationStatus = _types.EarningStatus.NOT_EARNING;
+      let eraStakerOtherList = [];
+      let identity;
+      if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        // todo: review all relaychains later
+        const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, 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)]);
+        identity = _identity;
+        const eraStaker = _eraStaker.toPrimitive();
+        eraStakerOtherList = eraStaker.others;
+      }
+      const sortedNominators = eraStakerOtherList.sort((a, b) => {
+        return new _bignumber.default(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
+        return nominator.who;
+      });
+      if (!topNominators.includes(address)) {
+        // if nominator has target but not in nominator list
+        nominationStatus = _types.EarningStatus.WAITING;
+      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(address)) {
+        // if address in top nominators
+        nominationStatus = _types.EarningStatus.EARNING_REWARD;
+      }
+      nominationList.push({
+        chain,
+        validatorAddress,
+        status: nominationStatus,
+        validatorIdentity: identity,
+        activeStake: '0' // relaychain allocates stake accordingly
+      });
+    }));
+
+    return nominationList;
+  }
   async subscribePoolPosition(useAddresses, resultCallback) {
     var _substrateApi$api$que13;
     let cancel = false;
@@ -292,7 +295,6 @@ class RelayNativeStakingPoolHandler extends _base.default {
 
   async getPoolTargets() {
     var _chainApi$api$query$s;
-    const decimals = this.nativeToken.decimals || 0;
     const chainApi = await this.substrateApi.isReady;
     const poolInfo = await this.getPoolInfo();
     if (!poolInfo || !poolInfo.statistic) {
@@ -302,11 +304,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const currentEra = _era.toString();
     const activeEraInfo = _activeEraInfo.toPrimitive();
     const activeEra = activeEraInfo.index;
-    const allValidators = [];
-    const validatorInfoList = [];
     const maxEraRewardPointsEras = _constants2.MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
-    let startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
+    const startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
     let _eraStakersPromise;
     if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
       // todo: review all relaychains later
@@ -315,43 +315,65 @@ class RelayNativeStakingPoolHandler extends _base.default {
       _eraStakersPromise = chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra));
     }
     const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), _eraStakersPromise, chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
-    const eraRewardMap = {};
-    for (const item of _eraRewardPoints[0]) {
-      eraRewardMap[startEraForPoints] = item.toHuman();
-      startEraForPoints++;
-    }
-    const validatorPointsMap = (0, _utils.getValidatorPointsMap)(eraRewardMap);
-    const topValidatorList = (0, _utils.getTopValidatorByPoints)(validatorPointsMap);
-
-    // filter blocked validators
+    const eraRewardMap = (0, _utils.getRelayEraRewardMap)(_eraRewardPoints[0], startEraForPoints);
+    const validatorPointsMap = (0, _utils.getRelayValidatorPointsMap)(eraRewardMap);
+    const topValidatorList = (0, _utils.getRelayTopValidatorByPoints)(validatorPointsMap);
     const validators = _validators;
-    const blockValidatorList = [];
-    for (const validator of validators) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const validatorAddress = validator[0].toHuman()[0];
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const validatorPrefs = validator[1].toHuman();
-      const isBlocked = validatorPrefs.blocked;
-      if (isBlocked) {
-        blockValidatorList.push(validatorAddress);
-      }
-    }
-    const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
+    const blockedValidatorList = (0, _utils.getRelayBlockedValidatorList)(validators);
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
-    const rawMinBond = _minBond.toHuman();
-    const minBond = rawMinBond.replaceAll(',', '');
+    const minBond = _minBond.toPrimitive();
+    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    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 = _commissionInfo.toHuman();
+      extraInfoMap[address] = {
+        commission: commissionInfo.commission,
+        blocked: commissionInfo.blocked,
+        identity,
+        isVerified: isVerified
+      };
+    }));
+    const decimals = this.nativeToken.decimals || 0;
+    const bnAvgStake = (0, _utils3.applyDecimal)(bnTotalEraStake.divn(validatorInfoList.length), decimals);
+    for (const validator of validatorInfoList) {
+      const commissionString = extraInfoMap[validator.address].commission;
+      const commission = (0, _utils.getCommission)(commissionString);
+      validator.expectedReturn = this.getValidatorExpectedReturn(this.chain, validator, poolInfo.statistic.totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake);
+      validator.commission = commission;
+      validator.blocked = extraInfoMap[validator.address].blocked;
+      validator.identity = extraInfoMap[validator.address].identity;
+      validator.isVerified = extraInfoMap[validator.address].isVerified;
+    }
+    return validatorInfoList;
+  }
+  getValidatorExpectedReturn(chain, validator, totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake) {
+    if (_constants2._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
+      return (0, _utils.calculateAlephZeroValidatorReturn)(totalApy, commission);
+    } else if (_constants2._STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
+      const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
+      const rewardPerValidator = (0, _utils3.applyDecimal)(new _util.BN(stakingRewards.sessionExtraRewardPayout).divn(allValidatorAddresses.length), decimals);
+      const validatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals).toNumber();
+      return (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, commission);
+    } else {
+      const bnValidatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals);
+      return (0, _utils.calculateValidatorStakedReturn)(totalApy, bnValidatorStake, bnAvgStake, commission);
+    }
+  }
+  parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
-    const bnDecimals = new _util.BN((10 ** decimals).toString());
-    const eraStakers = _eraStakers;
-    for (const item of eraStakers) {
+    const allValidatorAddresses = [];
+    const validatorInfoList = [];
+    for (const item of _eraStakers) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorInfo = item[0].toHuman();
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorStat = item[1].toPrimitive();
       const validatorAddress = rawValidatorInfo[1];
-      if (!blockValidatorList.includes(validatorAddress)) {
+      if (!blockedValidatorList.includes(validatorAddress)) {
         var _validatorPointsMap$v;
         let isTopQuartile = false;
         if (topValidatorList.includes(validatorAddress)) {
@@ -372,7 +394,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
             nominatorCount = others.length;
           }
         }
-        allValidators.push(validatorAddress);
+        allValidatorAddresses.push(validatorAddress);
         validatorInfoList.push({
           address: validatorAddress,
           totalStake: bnTotalStake.toString(),
@@ -384,46 +406,15 @@ class RelayNativeStakingPoolHandler extends _base.default {
           expectedReturn: 0,
           blocked: false,
           isVerified: false,
-          minBond,
+          minBond: minBond.toString(),
           isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded),
           eraRewardPoint: ((_validatorPointsMap$v = validatorPointsMap[validatorAddress]) !== null && _validatorPointsMap$v !== void 0 ? _validatorPointsMap$v : _util.BN_ZERO).toString(),
           topQuartile: isTopQuartile
         });
       }
     }
-    const extraInfoMap = {};
-    await Promise.all(allValidators.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 = _commissionInfo.toHuman();
-      extraInfoMap[address] = {
-        commission: commissionInfo.commission,
-        blocked: commissionInfo.blocked,
-        identity,
-        isVerified: isVerified
-      };
-    }));
-    const bnAvgStake = bnTotalEraStake.divn(validatorInfoList.length).div(bnDecimals);
-    for (const validator of validatorInfoList) {
-      const commission = extraInfoMap[validator.address].commission;
-      const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
-      if (_constants2._STAKING_CHAIN_GROUP.aleph.includes(this.chain)) {
-        validator.expectedReturn = (0, _utils.calculateAlephZeroValidatorReturn)(poolInfo.statistic.totalApy, (0, _utils.getCommission)(commission));
-      } else if (_constants2._STAKING_CHAIN_GROUP.ternoa.includes(this.chain)) {
-        const rewardPerValidator = new _util.BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
-        const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
-        validator.expectedReturn = (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, (0, _utils.getCommission)(commission));
-      } else {
-        validator.expectedReturn = (0, _utils.calculateValidatorStakedReturn)(poolInfo.statistic.totalApy, bnValidatorStake, bnAvgStake, (0, _utils.getCommission)(commission));
-      }
-      validator.commission = parseFloat(commission.split('%')[0]);
-      validator.blocked = extraInfoMap[validator.address].blocked;
-      validator.identity = extraInfoMap[validator.address].identity;
-      validator.isVerified = extraInfoMap[validator.address].isVerified;
-    }
-    return validatorInfoList;
+    return [totalStakeMap, allValidatorAddresses, validatorInfoList];
   }
-
   /* Get pool targets */
 
   /* Join pool action */

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

@@ -40,7 +40,7 @@ class EarningService {
   yieldPositionSubject = new _rxjs.BehaviorSubject({});
   yieldPositionListSubject = new _rxjs.BehaviorSubject([]); // virtual list of yieldPositionSubject with filter values
 
-  useOnlineCacheOnly = false;
+  useOnlineCacheOnly = true;
   constructor(state) {
     this.state = state;
     this.dbService = state.dbService;

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.applyDecimal = applyDecimal;
 exports.calculateReward = calculateReward;
 exports.isActionFromValidator = isActionFromValidator;
 exports.isNominationPool = exports.isNativeStakingPool = exports.isLiquidPool = exports.isLendingPool = void 0;
@@ -133,4 +134,8 @@ exports.isLiquidPool = isLiquidPool;
 const isLendingPool = pool => {
   return pool.type === _types.YieldPoolType.LENDING;
 };
-exports.isLendingPool = isLendingPool;
+exports.isLendingPool = isLendingPool;
+function applyDecimal(bnNumber, decimals) {
+  const bnDecimals = new _util.BN((10 ** decimals).toString());
+  return bnNumber.div(bnDecimals);
+}

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WEB_APP_URL = exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = void 0;
+exports.WEB_APP_URL = exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = exports.DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -21,6 +21,8 @@ const WEB_APP_URL = [
 // Local
 'subwallet-webapp.pages.dev',
 // Pull request build
-'web.subwallet.app' // Production
+'web.subwallet.app' // Production,
 ];
-exports.WEB_APP_URL = WEB_APP_URL;
+exports.WEB_APP_URL = WEB_APP_URL;
+const DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = ['https://polkadot.js.org/apps/', 'https://ipfs.io/ipns/dotapps.io'];
+exports.DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL;

package/cjs/services/request-service/handler/AuthRequestHandler.js

@@ -29,6 +29,25 @@ class AuthRequestHandler {
     this.keyringService = keyringService;
     this.#requestService = requestService;
     this.#chainService = chainService;
+    this.init().catch(console.error);
+  }
+  async init() {
+    const authList = await this.getAuthList();
+    let needUpdateAuthList = false;
+    Object.entries(authList).forEach(_ref => {
+      let [key, value] = _ref;
+      const existKeyAllBothConnect = _constants.DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL.find(url_ => url_.includes(key));
+      if (existKeyAllBothConnect && value.accountAuthType !== 'both') {
+        needUpdateAuthList = true;
+        authList[key] = {
+          ...value,
+          accountAuthType: 'both'
+        };
+      }
+    });
+    if (needUpdateAuthList) {
+      this.setAuthorize(authList);
+    }
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -42,12 +61,12 @@ class AuthRequestHandler {
     return Object.keys(this.#authRequestsV2).length;
   }
   get allAuthRequestsV2() {
-    return Object.values(this.#authRequestsV2).map(_ref => {
+    return Object.values(this.#authRequestsV2).map(_ref2 => {
       let {
         id,
         request,
         url
-      } = _ref;
+      } = _ref2;
       return {
         id,
         request,
@@ -200,11 +219,11 @@ class AuthRequestHandler {
           reject(error);
         });
       },
-      resolve: _ref2 => {
+      resolve: _ref3 => {
         let {
           accounts,
           result
-        } = _ref2;
+        } = _ref3;
         complete(result, () => {
           resolve(result);
         }, accounts);
@@ -214,7 +233,9 @@ class AuthRequestHandler {
   authorizePromiseMap = {};
   async authorizeUrlV2(url, request) {
     let authList = await this.getAuthList();
-    let accountAuthType = request.accountAuthType || 'substrate';
+    const idStr = (0, _utils2.stripUrl)(url);
+    const isAllowedDappConnectAllType = !!_constants.DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL.find(url_ => url.includes(url_));
+    let accountAuthType = isAllowedDappConnectAllType ? 'both' : request.accountAuthType || 'substrate';
     request.accountAuthType = accountAuthType;
     if (!authList) {
       authList = {};
@@ -226,9 +247,8 @@ class AuthRequestHandler {
       reject,
       resolve
     } = promiseHandler;
-    const idStr = (0, _utils2.stripUrl)(url);
-    const isExistedAuthBothBefore = Object.entries(this.authorizeUrlSubject.value).find(_ref3 => {
-      let [key, data] = _ref3;
+    const isExistedAuthBothBefore = Object.entries(this.authorizeUrlSubject.value).find(_ref4 => {
+      let [key, data] = _ref4;
       return key === idStr && data.accountAuthType === 'both';
     });
     if (isExistedAuthBothBefore) {
@@ -244,8 +264,8 @@ class AuthRequestHandler {
 
     // Do not enqueue duplicate authorization requests.
     const mergeKeys = [];
-    Object.entries(this.#authRequestsV2).forEach(_ref4 => {
-      let [key, _request] = _ref4;
+    Object.entries(this.#authRequestsV2).forEach(_ref5 => {
+      let [key, _request] = _ref5;
       if (_request.idStr === idStr) {
         if (_request.accountAuthType !== request.accountAuthType) {
           request.accountAuthType = 'both';
@@ -276,8 +296,8 @@ class AuthRequestHandler {
       if (inBlackList) {
         throw new Error('The source {{url}} is not allowed to interact with this extension'.replace('{{url}}', url));
       }
-      request.allowedAccounts = Object.entries(existedAuth.isAllowedMap).map(_ref5 => {
-        let [address, allowed] = _ref5;
+      request.allowedAccounts = Object.entries(existedAuth.isAllowedMap).map(_ref6 => {
+        let [address, allowed] = _ref6;
         return allowed ? address : '';
       }).filter(item => item !== '');
       let allowedListByRequestType = [...request.allowedAccounts];

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

@@ -1,6 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { EarningStatus, PalletStakingEraRewardPoints, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import BigNumber from 'bignumber.js';
 import { ApiPromise } from '@polkadot/api';
@@ -158,8 +159,11 @@ export declare function getEarningStatusByNominations(bnTotalActiveStake: BN, no
 export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";
 export declare function getAvgValidatorEraReward(supportedDays: number, eraRewardHistory: Codec[]): BigNumber;
 export declare function getSupportedDaysByHistoryDepth(erasPerDay: number, maxSupportedEras: number, liveDay?: number): number;
-export declare function getValidatorPointsMap(eraRewardMap: Record<string, PalletStakingEraRewardPoints>): Record<string, BigNumber>;
-export declare function getTopValidatorByPoints(validatorPointsList: Record<string, BigNumber>): string[];
+export declare function getRelayValidatorPointsMap(eraRewardMap: Record<string, PalletStakingEraRewardPoints>): Record<string, BigNumber>;
+export declare function getRelayTopValidatorByPoints(validatorPointsList: Record<string, BigNumber>): string[];
+export declare function getRelayBlockedValidatorList(validators: any[]): string[];
+export declare function getRelayEraRewardMap(eraRewardPointArray: Codec[], startEraForPoints: number): Record<string, PalletStakingEraRewardPoints>;
+export declare function getRelayMaxNominations(substrateApi: _SubstrateApi): Promise<string>;
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;
 export declare const getMaxValidatorErrorMessage: (chainInfo: _ChainInfo, max: number) => string;
 export declare const getExistUnstakeErrorMessage: (chain: string, type?: StakingType, isStakeMore?: boolean) => string;

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

@@ -354,13 +354,12 @@ export function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras, liv
     return maxSupportDay;
   }
 }
-export function getValidatorPointsMap(eraRewardMap) {
+export function getRelayValidatorPointsMap(eraRewardMap) {
   // mapping store validator and totalPoints
   const validatorTotalPointsMap = {};
   Object.values(eraRewardMap).forEach(info => {
     const individual = info.individual;
-    Object.entries(individual).forEach(([validator, rawPoints]) => {
-      const points = rawPoints.replaceAll(',', '');
+    Object.entries(individual).forEach(([validator, points]) => {
       if (!validatorTotalPointsMap[validator]) {
         validatorTotalPointsMap[validator] = new BigNumber(points);
       } else {
@@ -370,7 +369,7 @@ export function getValidatorPointsMap(eraRewardMap) {
   });
   return validatorTotalPointsMap;
 }
-export function getTopValidatorByPoints(validatorPointsList) {
+export function getRelayTopValidatorByPoints(validatorPointsList) {
   const sortValidatorPointsList = Object.fromEntries(Object.entries(validatorPointsList).sort((a, b) => a[1].minus(b[1]).toNumber()).reverse());
 
   // keep 50% first validator
@@ -380,6 +379,36 @@ export function getTopValidatorByPoints(validatorPointsList) {
   const top50PercentRecord = Object.fromEntries(top50PercentEntries);
   return Object.keys(top50PercentRecord);
 }
+export function getRelayBlockedValidatorList(validators) {
+  const blockValidatorList = [];
+  for (const validator of validators) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorAddress = validator[0].toHuman()[0];
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorPrefs = validator[1].toHuman();
+    const isBlocked = validatorPrefs.blocked;
+    if (isBlocked) {
+      blockValidatorList.push(validatorAddress);
+    }
+  }
+  return blockValidatorList;
+}
+export function getRelayEraRewardMap(eraRewardPointArray, startEraForPoints) {
+  const eraRewardMap = {};
+  for (const item of eraRewardPointArray) {
+    eraRewardMap[startEraForPoints] = item.toPrimitive();
+    startEraForPoints++;
+  }
+  return eraRewardMap;
+}
+export async function getRelayMaxNominations(substrateApi) {
+  var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$cal;
+  await substrateApi.isReady;
+  const maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
+  const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
+  const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
+  return maxNominationsByNominationQuota || maxNominations;
+}
 export const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = _getChainNativeTokenBasicInfo(chainInfo);
   const number = formatNumber(bnMinStake.toString(), tokenInfo.decimals || 0, balanceFormatter);

package/koni/background/handlers/Tabs.js

@@ -237,7 +237,7 @@ export default class KoniTabs {
     anyType
   }) {
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, accountAuthType);
+    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, (authInfo === null || authInfo === void 0 ? void 0 : authInfo.accountAuthType) || accountAuthType);
   }
   accountsSubscribeV2(url, {
     accountAuthType
@@ -249,8 +249,9 @@ export default class KoniTabs {
     this.#accountSubs[id] = {
       subscription: authInfoSubject.subscribe(infos => {
         this.getAuthInfo(url, infos).then(authInfo => {
+          const accountAuthType_ = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.accountAuthType) || accountAuthType;
           const accounts = this.#koniState.keyringService.accounts;
-          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType_));
         }).catch(console.error);
       }),
       url

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.4-0",
+  "version": "1.2.5-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1922,10 +1922,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.67",
-    "@subwallet/extension-base": "^1.2.4-0",
-    "@subwallet/extension-chains": "^1.2.4-0",
-    "@subwallet/extension-dapp": "^1.2.4-0",
-    "@subwallet/extension-inject": "^1.2.4-0",
+    "@subwallet/extension-base": "^1.2.5-0",
+    "@subwallet/extension-chains": "^1.2.5-0",
+    "@subwallet/extension-dapp": "^1.2.5-0",
+    "@subwallet/extension-inject": "^1.2.5-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

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.2.4-0'
+  version: '1.2.5-0'
 };

package/page/index.d.ts

@@ -1,5 +1,5 @@
 import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportResponseMessage } from '../background/types';
-import { EvmProvider } from '@subwallet/extension-inject/types';
+import { AuthRequestOption, EvmProvider } from '@subwallet/extension-inject/types';
 import Injected from './Injected';
 export interface Handler {
     resolve: (data?: any) => void;
@@ -10,7 +10,7 @@ export declare type Handlers = Record<string, Handler>;
 export declare function sendMessage<TMessageType extends MessageTypesWithNullRequest>(message: TMessageType): Promise<ResponseTypes[TMessageType]>;
 export declare function sendMessage<TMessageType extends MessageTypesWithNoSubscriptions>(message: TMessageType, request: RequestTypes[TMessageType]): Promise<ResponseTypes[TMessageType]>;
 export declare function sendMessage<TMessageType extends MessageTypesWithSubscriptions>(message: TMessageType, request: RequestTypes[TMessageType], subscriber: (data: SubscriptionMessageTypes[TMessageType]) => void): Promise<ResponseTypes[TMessageType]>;
-export declare function enable(origin: string): Promise<Injected>;
+export declare function enable(origin: string, opt?: AuthRequestOption): Promise<Injected>;
 export declare function handleResponse<TMessageType extends MessageTypes>(data: TransportResponseMessage<TMessageType> & {
     subscription?: string;
 }): void;

package/page/index.js

@@ -38,9 +38,11 @@ export function sendMessage(message, request, subscriber) {
 }
 
 // the enable function, called by the dapp to allow access
-export async function enable(origin) {
+
+export async function enable(origin, opt) {
   await sendMessage('pub(authorize.tabV2)', {
-    origin
+    origin,
+    accountAuthType: (opt === null || opt === void 0 ? void 0 : opt.accountAuthType) || 'substrate'
   });
   return new Injected(sendMessage);
 }

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

@@ -1,16 +1,19 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { ExtrinsicType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ExtrinsicType, NominationInfo, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { BaseYieldPositionInfo, OptimalYieldPath, PalletStakingStakingLedger, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, ValidatorInfo, YieldPoolInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
+import { BaseYieldPositionInfo, OptimalYieldPath, PalletStakingNominations, PalletStakingStakingLedger, StakeCancelWithdrawalParams, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, ValidatorInfo, YieldPoolInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { DeriveSessionProgress } from '@polkadot/api-derive/types';
 import { BN } from '@polkadot/util';
 import BaseNativeStakingPoolHandler from './base';
 export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPoolHandler {
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletStakingStakingLedger, currentEra: string, minStake: BN, _deriveSessionProgress: DeriveSessionProgress): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
+    handleNominationsList(substrateApi: _SubstrateApi, chain: string, nominations: PalletStakingNominations, currentEra: string, address: string, maxNominatorRewardedPerValidator: number | undefined): Promise<NominationInfo[]>;
     subscribePoolPosition(useAddresses: string[], resultCallback: (rs: YieldPositionInfo) => void): Promise<VoidFunction>;
     getPoolTargets(): Promise<ValidatorInfo[]>;
+    private getValidatorExpectedReturn;
+    private parseEraStakerData;
     validateYieldJoin(data: SubmitYieldJoinData, path: OptimalYieldPath): Promise<TransactionError[]>;
     createJoinExtrinsic(data: SubmitJoinNativeStaking, positionInfo?: YieldPositionInfo, bondDest?: string): Promise<[TransactionData, YieldTokenBaseInfo]>;
     validateYieldLeave(amount: string, address: string, fastLeave: boolean, selectedTarget?: string): Promise<TransactionError[]>;

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

@@ -3,11 +3,11 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, getTopValidatorByPoints, getValidatorPointsMap } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { _STAKING_CHAIN_GROUP, _UPDATED_RUNTIME_STAKING_GROUP, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
-import { parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
+import { applyDecimal, parseIdentity } from '@subwallet/extension-base/services/earning-service/utils';
 import { EarningStatus, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -44,17 +44,14 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     await defaultCallback();
     await substrateApi.isReady;
     const unsub = await ((_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.currentEra(async _currentEra => {
-      var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3, _substrateApi$api$cal, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
+      var _substrateApi$api$con, _substrateApi$api$que2, _substrateApi$api$que3, _substrateApi$api$que4, _substrateApi$api$que5, _substrateApi$api$que6;
       if (cancel) {
         unsub();
         return;
       }
-      let maxNominations = ((_substrateApi$api$con = substrateApi.api.consts.staking) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.maxNominations) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '16';
       const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
-      const maxNominatorRewarded = (_substrateApi$api$con3 = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
-      const _maxNominationsByNominationQuota = await ((_substrateApi$api$cal = substrateApi.api.call.stakingApi) === null || _substrateApi$api$cal === void 0 ? void 0 : _substrateApi$api$cal.nominationsQuota(0)); // todo: review param. Currently return constant for all param.
-      const maxNominationsByNominationQuota = _maxNominationsByNominationQuota === null || _maxNominationsByNominationQuota === void 0 ? void 0 : _maxNominationsByNominationQuota.toString();
-      maxNominations = maxNominationsByNominationQuota !== null && maxNominationsByNominationQuota !== void 0 ? maxNominationsByNominationQuota : maxNominations;
+      const maxNominatorRewarded = (_substrateApi$api$con = substrateApi.api.consts.staking.maxNominatorRewardedPerValidator) === null || _substrateApi$api$con === void 0 ? void 0 : _substrateApi$api$con.toString();
+      const maxNominations = await getRelayMaxNominations(substrateApi);
       const currentEra = _currentEra.toString();
       const maxUnlockingChunks = substrateApi.api.consts.staking.maxUnlockingChunks.toString();
       const unlockingEras = substrateApi.api.consts.staking.bondingDuration.toString();
@@ -133,54 +130,15 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const [_nominations, _bonded, _activeEra] = await Promise.all([(_substrateApi$api$que7 = substrateApi.api.query) === null || _substrateApi$api$que7 === void 0 ? void 0 : (_substrateApi$api$que8 = _substrateApi$api$que7.staking) === null || _substrateApi$api$que8 === void 0 ? void 0 : _substrateApi$api$que8.nominators(address), (_substrateApi$api$que9 = substrateApi.api.query) === null || _substrateApi$api$que9 === void 0 ? void 0 : (_substrateApi$api$que10 = _substrateApi$api$que9.staking) === null || _substrateApi$api$que10 === void 0 ? void 0 : _substrateApi$api$que10.bonded(address), (_substrateApi$api$que11 = substrateApi.api.query) === null || _substrateApi$api$que11 === void 0 ? void 0 : (_substrateApi$api$que12 = _substrateApi$api$que11.staking) === null || _substrateApi$api$que12 === void 0 ? void 0 : _substrateApi$api$que12.activeEra()]);
     const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
     const _maxNominatorRewardedPerValidator = (substrateApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
-    const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+    const maxNominatorRewardedPerValidator = unlimitedNominatorRewarded ? undefined : parseInt(_maxNominatorRewardedPerValidator);
     const nominations = _nominations.toPrimitive();
     const bonded = _bonded.toHuman();
+    const addressFormatted = reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo));
     const activeStake = ledger.active.toString();
     const totalStake = ledger.total.toString();
     const unstakingBalance = (ledger.total - ledger.active).toString();
-    const nominationList = [];
     const unstakingList = [];
-    if (nominations) {
-      const validatorList = nominations.targets;
-      await Promise.all(validatorList.map(async validatorAddress => {
-        let nominationStatus = EarningStatus.NOT_EARNING;
-        let eraStakerOtherList = [];
-        let identity;
-        if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
-          // todo: review all relaychains later
-          const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, 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)]);
-          identity = _identity;
-          const eraStaker = _eraStaker.toPrimitive();
-          eraStakerOtherList = eraStaker.others;
-        }
-        const sortedNominators = eraStakerOtherList.sort((a, b) => {
-          return new BigN(b.value).minus(a.value).toNumber();
-        });
-        const topNominators = sortedNominators.map(nominator => {
-          return nominator.who;
-        });
-        if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
-          // if nominator has target but not in nominator list
-          nominationStatus = EarningStatus.WAITING;
-        } else if (topNominators.slice(0, unlimitedNominatorRewarded ? undefined : maxNominatorRewardedPerValidator).includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
-          // if address in top nominators
-          nominationStatus = EarningStatus.EARNING_REWARD;
-        }
-        nominationList.push({
-          chain,
-          validatorAddress,
-          status: nominationStatus,
-          validatorIdentity: identity,
-          activeStake: '0' // relaychain allocates stake accordingly
-        });
-      }));
-    }
-
+    const nominationList = (await this.handleNominationsList(substrateApi, chain, nominations, currentEra, addressFormatted, maxNominatorRewardedPerValidator)) || [];
     let stakingStatus = EarningStatus.NOT_EARNING;
     const bnActiveStake = new BN(activeStake);
     let waitingNominationCount = 0;
@@ -224,6 +182,51 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       unstakings: unstakingList
     };
   }
+  async handleNominationsList(substrateApi, chain, nominations, currentEra, address, maxNominatorRewardedPerValidator) {
+    const nominationList = [];
+    if (!nominations) {
+      return [];
+    }
+    const validatorList = nominations.targets;
+    await Promise.all(validatorList.map(async validatorAddress => {
+      let nominationStatus = EarningStatus.NOT_EARNING;
+      let eraStakerOtherList = [];
+      let identity;
+      if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        // todo: review all relaychains later
+        const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, 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)]);
+        identity = _identity;
+        const eraStaker = _eraStaker.toPrimitive();
+        eraStakerOtherList = eraStaker.others;
+      }
+      const sortedNominators = eraStakerOtherList.sort((a, b) => {
+        return new BigN(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
+        return nominator.who;
+      });
+      if (!topNominators.includes(address)) {
+        // if nominator has target but not in nominator list
+        nominationStatus = EarningStatus.WAITING;
+      } else if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes(address)) {
+        // if address in top nominators
+        nominationStatus = EarningStatus.EARNING_REWARD;
+      }
+      nominationList.push({
+        chain,
+        validatorAddress,
+        status: nominationStatus,
+        validatorIdentity: identity,
+        activeStake: '0' // relaychain allocates stake accordingly
+      });
+    }));
+
+    return nominationList;
+  }
   async subscribePoolPosition(useAddresses, resultCallback) {
     var _substrateApi$api$que13;
     let cancel = false;
@@ -285,7 +288,6 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
 
   async getPoolTargets() {
     var _chainApi$api$query$s;
-    const decimals = this.nativeToken.decimals || 0;
     const chainApi = await this.substrateApi.isReady;
     const poolInfo = await this.getPoolInfo();
     if (!poolInfo || !poolInfo.statistic) {
@@ -295,11 +297,9 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const currentEra = _era.toString();
     const activeEraInfo = _activeEraInfo.toPrimitive();
     const activeEra = activeEraInfo.index;
-    const allValidators = [];
-    const validatorInfoList = [];
     const maxEraRewardPointsEras = MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
-    let startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
+    const startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
     let _eraStakersPromise;
     if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
       // todo: review all relaychains later
@@ -308,43 +308,65 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       _eraStakersPromise = chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra));
     }
     const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), _eraStakersPromise, chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
-    const eraRewardMap = {};
-    for (const item of _eraRewardPoints[0]) {
-      eraRewardMap[startEraForPoints] = item.toHuman();
-      startEraForPoints++;
-    }
-    const validatorPointsMap = getValidatorPointsMap(eraRewardMap);
-    const topValidatorList = getTopValidatorByPoints(validatorPointsMap);
-
-    // filter blocked validators
+    const eraRewardMap = getRelayEraRewardMap(_eraRewardPoints[0], startEraForPoints);
+    const validatorPointsMap = getRelayValidatorPointsMap(eraRewardMap);
+    const topValidatorList = getRelayTopValidatorByPoints(validatorPointsMap);
     const validators = _validators;
-    const blockValidatorList = [];
-    for (const validator of validators) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const validatorAddress = validator[0].toHuman()[0];
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-      const validatorPrefs = validator[1].toHuman();
-      const isBlocked = validatorPrefs.blocked;
-      if (isBlocked) {
-        blockValidatorList.push(validatorAddress);
-      }
-    }
-    const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
+    const blockedValidatorList = getRelayBlockedValidatorList(validators);
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new BN(_totalEraStake.toString());
-    const rawMinBond = _minBond.toHuman();
-    const minBond = rawMinBond.replaceAll(',', '');
+    const minBond = _minBond.toPrimitive();
+    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    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 = _commissionInfo.toHuman();
+      extraInfoMap[address] = {
+        commission: commissionInfo.commission,
+        blocked: commissionInfo.blocked,
+        identity,
+        isVerified: isVerified
+      };
+    }));
+    const decimals = this.nativeToken.decimals || 0;
+    const bnAvgStake = applyDecimal(bnTotalEraStake.divn(validatorInfoList.length), decimals);
+    for (const validator of validatorInfoList) {
+      const commissionString = extraInfoMap[validator.address].commission;
+      const commission = getCommission(commissionString);
+      validator.expectedReturn = this.getValidatorExpectedReturn(this.chain, validator, poolInfo.statistic.totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake);
+      validator.commission = commission;
+      validator.blocked = extraInfoMap[validator.address].blocked;
+      validator.identity = extraInfoMap[validator.address].identity;
+      validator.isVerified = extraInfoMap[validator.address].isVerified;
+    }
+    return validatorInfoList;
+  }
+  getValidatorExpectedReturn(chain, validator, totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake) {
+    if (_STAKING_CHAIN_GROUP.aleph.includes(chain)) {
+      return calculateAlephZeroValidatorReturn(totalApy, commission);
+    } else if (_STAKING_CHAIN_GROUP.ternoa.includes(chain)) {
+      const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
+      const rewardPerValidator = applyDecimal(new BN(stakingRewards.sessionExtraRewardPayout).divn(allValidatorAddresses.length), decimals);
+      const validatorStake = applyDecimal(totalStakeMap[validator.address], decimals).toNumber();
+      return calculateTernoaValidatorReturn(rewardPerValidator.toNumber(), validatorStake, commission);
+    } else {
+      const bnValidatorStake = applyDecimal(totalStakeMap[validator.address], decimals);
+      return calculateValidatorStakedReturn(totalApy, bnValidatorStake, bnAvgStake, commission);
+    }
+  }
+  parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
-    const bnDecimals = new BN((10 ** decimals).toString());
-    const eraStakers = _eraStakers;
-    for (const item of eraStakers) {
+    const allValidatorAddresses = [];
+    const validatorInfoList = [];
+    for (const item of _eraStakers) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorInfo = item[0].toHuman();
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorStat = item[1].toPrimitive();
       const validatorAddress = rawValidatorInfo[1];
-      if (!blockValidatorList.includes(validatorAddress)) {
+      if (!blockedValidatorList.includes(validatorAddress)) {
         var _validatorPointsMap$v;
         let isTopQuartile = false;
         if (topValidatorList.includes(validatorAddress)) {
@@ -365,7 +387,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
             nominatorCount = others.length;
           }
         }
-        allValidators.push(validatorAddress);
+        allValidatorAddresses.push(validatorAddress);
         validatorInfoList.push({
           address: validatorAddress,
           totalStake: bnTotalStake.toString(),
@@ -377,46 +399,15 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
           expectedReturn: 0,
           blocked: false,
           isVerified: false,
-          minBond,
+          minBond: minBond.toString(),
           isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded),
           eraRewardPoint: ((_validatorPointsMap$v = validatorPointsMap[validatorAddress]) !== null && _validatorPointsMap$v !== void 0 ? _validatorPointsMap$v : BN_ZERO).toString(),
           topQuartile: isTopQuartile
         });
       }
     }
-    const extraInfoMap = {};
-    await Promise.all(allValidators.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 = _commissionInfo.toHuman();
-      extraInfoMap[address] = {
-        commission: commissionInfo.commission,
-        blocked: commissionInfo.blocked,
-        identity,
-        isVerified: isVerified
-      };
-    }));
-    const bnAvgStake = bnTotalEraStake.divn(validatorInfoList.length).div(bnDecimals);
-    for (const validator of validatorInfoList) {
-      const commission = extraInfoMap[validator.address].commission;
-      const bnValidatorStake = totalStakeMap[validator.address].div(bnDecimals);
-      if (_STAKING_CHAIN_GROUP.aleph.includes(this.chain)) {
-        validator.expectedReturn = calculateAlephZeroValidatorReturn(poolInfo.statistic.totalApy, getCommission(commission));
-      } else if (_STAKING_CHAIN_GROUP.ternoa.includes(this.chain)) {
-        const rewardPerValidator = new BN(stakingRewards.sessionExtraRewardPayout).divn(allValidators.length).div(bnDecimals);
-        const validatorStake = totalStakeMap[validator.address].div(bnDecimals).toNumber();
-        validator.expectedReturn = calculateTernoaValidatorReturn(rewardPerValidator.toNumber(), validatorStake, getCommission(commission));
-      } else {
-        validator.expectedReturn = calculateValidatorStakedReturn(poolInfo.statistic.totalApy, bnValidatorStake, bnAvgStake, getCommission(commission));
-      }
-      validator.commission = parseFloat(commission.split('%')[0]);
-      validator.blocked = extraInfoMap[validator.address].blocked;
-      validator.identity = extraInfoMap[validator.address].identity;
-      validator.isVerified = extraInfoMap[validator.address].isVerified;
-    }
-    return validatorInfoList;
+    return [totalStakeMap, allValidatorAddresses, validatorInfoList];
   }
-
   /* Get pool targets */
 
   /* Join pool action */

package/services/earning-service/service.js

@@ -33,7 +33,7 @@ export default class EarningService {
   yieldPositionSubject = new BehaviorSubject({});
   yieldPositionListSubject = new BehaviorSubject([]); // virtual list of yieldPositionSubject with filter values
 
-  useOnlineCacheOnly = false;
+  useOnlineCacheOnly = true;
   constructor(state) {
     this.state = state;
     this.dbService = state.dbService;

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

@@ -1,5 +1,6 @@
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { LendingYieldPoolInfo, LiquidYieldPoolInfo, NativeYieldPoolInfo, NominationYieldPoolInfo, YieldAssetExpectedEarning, YieldCompoundingPeriod, YieldPoolInfo, YieldPoolType } from '@subwallet/extension-base/types';
+import { BN } from '@polkadot/util';
 export declare function calculateReward(apr: number, amount?: number, compoundingPeriod?: YieldCompoundingPeriod, isApy?: boolean): YieldAssetExpectedEarning;
 /**
  * @returns
@@ -16,3 +17,4 @@ export declare const isNominationPool: (pool: YieldPoolInfo) => pool is Nominati
 export declare const isNativeStakingPool: (pool: YieldPoolInfo) => pool is NativeYieldPoolInfo;
 export declare const isLiquidPool: (pool: YieldPoolInfo) => pool is LiquidYieldPoolInfo;
 export declare const isLendingPool: (pool: YieldPoolInfo) => pool is LendingYieldPoolInfo;
+export declare function applyDecimal(bnNumber: BN, decimals: number): BN;

package/services/earning-service/utils/index.js

@@ -3,7 +3,7 @@
 
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { YieldCompoundingPeriod, YieldPoolType } from '@subwallet/extension-base/types';
-import { hexToString, isHex } from '@polkadot/util';
+import { BN, hexToString, isHex } from '@polkadot/util';
 export function calculateReward(apr, amount = 0, compoundingPeriod = YieldCompoundingPeriod.YEARLY, isApy = false) {
   if (!apr) {
     return {};
@@ -117,4 +117,8 @@ export const isLiquidPool = pool => {
 };
 export const isLendingPool = pool => {
   return pool.type === YieldPoolType.LENDING;
-};
+};
+export function applyDecimal(bnNumber, decimals) {
+  const bnDecimals = new BN((10 ** decimals).toString());
+  return bnNumber.div(bnDecimals);
+}

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

@@ -1,3 +1,4 @@
 export declare const EXTENSION_REQUEST_URL = "extension";
 export declare const PREDEFINED_CHAIN_DAPP_CHAIN_MAP: Record<string, string[]>;
 export declare const WEB_APP_URL: string[];
+export declare const DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL: string[];

package/services/request-service/constants.js

@@ -13,5 +13,7 @@ export const WEB_APP_URL = [
 // Local
 'subwallet-webapp.pages.dev',
 // Pull request build
-'web.subwallet.app' // Production
-];
+'web.subwallet.app' // Production,
+];
+
+export const DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = ['https://polkadot.js.org/apps/', 'https://ipfs.io/ipns/dotapps.io'];

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -15,6 +15,7 @@ export default class AuthRequestHandler {
     private readonly evmChainSubject;
     readonly authSubjectV2: BehaviorSubject<AuthorizeRequest[]>;
     constructor(requestService: RequestService, chainService: ChainService, keyringService: KeyringService);
+    private init;
     private getAddressList;
     get numAuthRequestsV2(): number;
     private get allAuthRequestsV2();

package/services/request-service/handler/AuthRequestHandler.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { PREDEFINED_CHAIN_DAPP_CHAIN_MAP, WEB_APP_URL } from '@subwallet/extension-base/services/request-service/constants';
+import { DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL, PREDEFINED_CHAIN_DAPP_CHAIN_MAP, WEB_APP_URL } from '@subwallet/extension-base/services/request-service/constants';
 import AuthorizeStore from '@subwallet/extension-base/stores/Authorize';
 import { createPromiseHandler, getDomainFromUrl, stripUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -22,6 +22,24 @@ export default class AuthRequestHandler {
     this.keyringService = keyringService;
     this.#requestService = requestService;
     this.#chainService = chainService;
+    this.init().catch(console.error);
+  }
+  async init() {
+    const authList = await this.getAuthList();
+    let needUpdateAuthList = false;
+    Object.entries(authList).forEach(([key, value]) => {
+      const existKeyAllBothConnect = DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL.find(url_ => url_.includes(key));
+      if (existKeyAllBothConnect && value.accountAuthType !== 'both') {
+        needUpdateAuthList = true;
+        authList[key] = {
+          ...value,
+          accountAuthType: 'both'
+        };
+      }
+    });
+    if (needUpdateAuthList) {
+      this.setAuthorize(authList);
+    }
   }
   getAddressList(value = false) {
     const addressList = Object.keys(this.keyringService.accounts);
@@ -202,7 +220,9 @@ export default class AuthRequestHandler {
   authorizePromiseMap = {};
   async authorizeUrlV2(url, request) {
     let authList = await this.getAuthList();
-    let accountAuthType = request.accountAuthType || 'substrate';
+    const idStr = stripUrl(url);
+    const isAllowedDappConnectAllType = !!DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL.find(url_ => url.includes(url_));
+    let accountAuthType = isAllowedDappConnectAllType ? 'both' : request.accountAuthType || 'substrate';
     request.accountAuthType = accountAuthType;
     if (!authList) {
       authList = {};
@@ -214,7 +234,6 @@ export default class AuthRequestHandler {
       reject,
       resolve
     } = promiseHandler;
-    const idStr = stripUrl(url);
     const isExistedAuthBothBefore = Object.entries(this.authorizeUrlSubject.value).find(([key, data]) => key === idStr && data.accountAuthType === 'both');
     if (isExistedAuthBothBefore) {
       return true;