@subwallet/extension-base 1.2.3-1 → 1.2.5-0

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

@@ -45,7 +45,7 @@ const _BALANCE_CHAIN_GROUP = {
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
-  supportBridged: ['rococo_assethub']
+  supportBridged: ['rococo_assethub', 'statemint', 'statemine']
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
 const _BALANCE_TOKEN_GROUP = {
@@ -271,7 +271,7 @@ const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._DEFAULT_MANTA_ZK_CHAIN = _DEFAULT_MANTA_ZK_CHAIN;
 const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain'],
+  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub'],
   xcmPallet: ['polkadot', 'kusama']
   // default is xTokens pallet
 };

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

@@ -54,6 +54,7 @@ var _exportNames = {
   _getXcmAssetId: true,
   _getXcmAssetMultilocation: true,
   _getXcmTransferType: true,
+  _isRelayChain: true,
   _isSubstrateRelayChain: true,
   _isSubstrateParaChain: true,
   _getEvmAbiExplorer: true,
@@ -145,6 +146,7 @@ exports._isNativeTokenBySlug = _isNativeTokenBySlug;
 exports._isNativeTokenTransferredByEvm = _isNativeTokenTransferredByEvm;
 exports._isPureEvmChain = _isPureEvmChain;
 exports._isPureSubstrateChain = _isPureSubstrateChain;
+exports._isRelayChain = _isRelayChain;
 exports._isSmartContractToken = _isSmartContractToken;
 exports._isSubstrateChain = _isSubstrateChain;
 exports._isSubstrateParaChain = _isSubstrateParaChain;
@@ -305,7 +307,7 @@ function _isSubstrateChain(chainInfo) {
 
 function _getEvmChainId(chainInfo) {
   var _chainInfo$evmInfo;
-  return ((_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) || 1; // fallback to Ethereum
+  return (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId; // fallback to Ethereum
 }
 
 function _getSubstrateParaId(chainInfo) {
@@ -314,7 +316,7 @@ function _getSubstrateParaId(chainInfo) {
 }
 function _getSubstrateRelayParent(chainInfo) {
   var _chainInfo$substrateI2;
-  return ((_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.relaySlug) || '';
+  return (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.relaySlug;
 }
 function _getSubstrateGenesisHash(chainInfo) {
   var _chainInfo$substrateI3;
@@ -467,6 +469,9 @@ function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;
   return `${((_originChainInfo$subs = originChainInfo.substrateInfo) === null || _originChainInfo$subs === void 0 ? void 0 : _originChainInfo$subs.chainType) || ''}-${((_destinationChainInfo = destinationChainInfo.substrateInfo) === null || _destinationChainInfo === void 0 ? void 0 : _destinationChainInfo.chainType) || ''}`;
 }
+function _isRelayChain(chainInfo) {
+  return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
+}
 function _isSubstrateRelayChain(chainInfo) {
   var _chainInfo$substrateI14;
   return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _types._SubstrateChainType.RELAYCHAIN;

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/handlers/special.js

@@ -284,11 +284,11 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const xcmFee = new _util.BN(path.totalFee[1].amount || '0');
     const xcmAmount = missingAmount.add(xcmFee);
     const bnAltInputTokenBalance = new _util.BN(altInputTokenBalance.value || '0');
-    if (!bnAltInputTokenBalance.sub(xcmAmount).gt(_util.BN_ZERO)) {
+    if (!bnAltInputTokenBalance.sub(xcmAmount).sub(xcmFee).gt(_util.BN_ZERO)) {
       processValidation.failedStep = path.steps[1];
       processValidation.ok = false;
       processValidation.status = _types.YieldValidationStatus.NOT_ENOUGH_BALANCE;
-      const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee);
+      const maxBn = bnInputTokenBalance.add(new _util.BN(altInputTokenBalance.value)).sub(xcmFee).sub(xcmFee);
       const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), inputTokenInfo.decimals || 0);
       const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
       const symbol = altInputTokenInfo.symbol;
@@ -296,7 +296,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       const inputNetworkName = this.chainInfo.name;
       const altNetworkName = altNetwork.name;
       const currentValue = (0, _utils3.formatNumber)(bnInputTokenBalance.toString(), inputTokenInfo.decimals || 0);
-      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee);
+      const bnMaxXCM = new _util.BN(altInputTokenBalance.value).sub(xcmFee).sub(xcmFee);
       const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), inputTokenInfo.decimals || 0);
       processValidation.message = (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {

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/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -14,7 +14,8 @@ class MigrateTransactionHistoryBySymbol extends _Base.default {
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
+        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
+        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -13,7 +13,8 @@ class MigrateAssetSetting extends _Base.default {
   async run() {
     try {
       const changeSlugsMap = {
-        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
+        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
+        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/cjs/services/migration-service/scripts/index.js

@@ -57,8 +57,8 @@ var _default = {
   '1.1.28-01': _MigrateEarningVersion.default,
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.46-01': _AutoEnableSomeTokens.default,
-  '1.1.62-01': _MigrateAssetSetting.default,
-  '1.1.62-02': _MigrateTransactionHistoryBySymbol.default,
+  '1.1.69-03': _MigrateAssetSetting.default,
+  '1.1.69-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens

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/cjs/services/swap-service/handler/base-handler.js

@@ -68,11 +68,13 @@ class SwapBaseHandler {
     const xcmFeeComponent = params.process.totalFee[stepIndex].feeComponent[0]; // todo: can do better than indexing
     const xcmFee = new _bignumber.default(xcmFeeComponent.amount || '0');
     let xcmAmount = bnAmount.minus(bnFromAssetBalance);
+    let editedXcmFee = new _bignumber.default(0);
     if ((0, _utils._isNativeToken)(alternativeAsset)) {
       xcmAmount = xcmAmount.plus(xcmFee);
+      editedXcmFee = xcmFee.times(2);
     }
-    if (!bnAlternativeAssetBalance.minus(xcmAmount).gt(0)) {
-      const maxBn = bnFromAssetBalance.plus(new _bignumber.default(alternativeAssetBalance.value)).minus(xcmFee);
+    if (!bnAlternativeAssetBalance.minus((0, _utils._isNativeToken)(alternativeAsset) ? xcmAmount.plus(xcmFee) : xcmFee).gt(0)) {
+      const maxBn = bnFromAssetBalance.plus(new _bignumber.default(alternativeAssetBalance.value)).minus((0, _utils._isNativeToken)(alternativeAsset) ? editedXcmFee : xcmFee);
       const maxValue = (0, _utils3.formatNumber)(maxBn.toString(), fromAsset.decimals || 0);
       const altInputTokenInfo = this.chainService.getAssetBySlug(alternativeAssetSlug);
       const symbol = altInputTokenInfo.symbol;
@@ -81,7 +83,7 @@ class SwapBaseHandler {
       const inputNetworkName = chain.name;
       const altNetworkName = alternativeChain.name;
       const currentValue = (0, _utils3.formatNumber)(bnFromAssetBalance.toString(), fromAsset.decimals || 0);
-      const bnMaxXCM = new _bignumber.default(alternativeAssetBalance.value).minus(xcmFee);
+      const bnMaxXCM = new _bignumber.default(alternativeAssetBalance.value).minus((0, _utils._isNativeToken)(alternativeAsset) ? editedXcmFee : xcmFee);
       const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), fromAsset.decimals || 0);
       if (maxBn.lte(0) || bnFromAssetBalance.lte(0) || bnMaxXCM.lte(0)) {
         return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${fromAsset.symbol} and try again.`))];

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

@@ -34,7 +34,7 @@ class HydradxHandler {
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
       balanceService,
       chainService,
-      providerName: isTestnet ? 'HydraDX Testnet' : 'HydraDX',
+      providerName: isTestnet ? 'Hydration Testnet' : 'Hydration',
       providerSlug: isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET
     });
     this.providerSlug = isTestnet ? _swap2.SwapProviderId.HYDRADX_TESTNET : _swap2.SwapProviderId.HYDRADX_MAINNET;

package/core/logic-validation/earning.d.ts

@@ -4,7 +4,7 @@ export declare function _handleDisplayForEarningError(error: TransactionError):
     message: string;
 } | undefined;
 export declare const INSUFFICIENT_MESSAGES: string[];
-export declare function _handleDisplayInsufficientEarningError(error: Error, availableBalance: string, amount: string, minJoinPool: string): {
+export declare function _handleDisplayInsufficientEarningError(error: Error, isXCM: boolean, availableBalance: string, amount: string, minJoinPool: string): {
     title: string;
     message: string;
 } | undefined;

package/core/logic-validation/earning.js

@@ -12,8 +12,8 @@ export function _handleDisplayForEarningError(error) {
   return undefined;
 }
 export const INSUFFICIENT_MESSAGES = ['残高不足', 'Недостаточный баланс', 'Insufficient balance'];
-export function _handleDisplayInsufficientEarningError(error, availableBalance, amount, minJoinPool) {
-  if (!INSUFFICIENT_MESSAGES.some(v => error.message.includes(v))) {
+export function _handleDisplayInsufficientEarningError(error, isXCM, availableBalance, amount, minJoinPool) {
+  if (isXCM || !INSUFFICIENT_MESSAGES.some(v => error.message.includes(v))) {
     return undefined;
   }
   const bnAvailableBalance = new BigN(availableBalance);

package/core/logic-validation/transfer.js

@@ -170,13 +170,6 @@ export function checkBalanceWithTransactionFee(validationResponse, transactionIn
     // todo: estimateFee should be must-have, need to refactor interface
     return;
   }
-
-  // if (!nativeTokenAvailable.metadata) {
-  //   validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
-  //
-  //   return;
-  // }
-
   const {
     edAsWarning,
     extrinsicType,