@subwallet/extension-base 1.2.27-0 → 1.2.28-0

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

@@ -6,7 +6,7 @@ import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getRelayWaitingValidatorList, 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 { _STAKING_CHAIN_GROUP, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
 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';
@@ -192,7 +192,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       let nominationStatus = EarningStatus.NOT_EARNING;
       let eraStakerOtherList = [];
       let identity;
-      if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+      if (substrateApi.api.query.staking.erasStakersPaged) {
         // todo: review all relaychains later
         const [[_identity], _eraStaker] = await Promise.all([parseIdentity(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
         identity = _identity;
@@ -300,20 +300,19 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const maxEraRewardPointsEras = MaxEraRewardPointsEras;
     const endEraForPoints = parseInt(activeEra) - 1;
     const startEraForPoints = Math.max(endEraForPoints - maxEraRewardPointsEras + 1, 0);
-    let _eraStakersPromise;
-    if (chainApi.api.query.staking.erasStakersOverview) {
-      // todo: review all relaychains later
-      _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra));
-    } else {
-      _eraStakersPromise = chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra));
-    }
+    const _eraStakersPromise = chainApi.api.query.staking.erasStakersOverview // todo: review all relaychains later
+    ? chainApi.api.query.staking.erasStakersOverview.entries(parseInt(currentEra)) : 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 = getRelayEraRewardMap(_eraRewardPoints[0], startEraForPoints);
     const validatorPointsMap = getRelayValidatorPointsMap(eraRewardMap);
     const topValidatorList = getRelayTopValidatorByPoints(validatorPointsMap);
-    const validators = _validators;
-    const blockedValidatorList = getRelayBlockedValidatorList(validators);
-    const waitingValidatorList = getRelayWaitingValidatorList(validators);
+    const allValidatorList = _validators;
+
+    // todo: optimize naming for all filtered validatorList: all, block, waiting, selected, waiting but is not selected, waiting but is not blocked, ...
+    const blockedValidatorList = getRelayBlockedValidatorList(allValidatorList);
+    const waitingValidatorList = getRelayWaitingValidatorList(allValidatorList); // all validators that are not blocked
+
+    // todo: improve handle waitingValidatorLedger
     const _waitingValidatorLedger = await chainApi.api.query.staking.ledger.multi(waitingValidatorList);
     const waitingValidatorLedger = {};
     if (_waitingValidatorLedger) {
@@ -327,7 +326,9 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new BN(_totalEraStake.toString());
     const minBond = _minBond.toPrimitive();
-    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const [totalStakeMap, allValidatorAddresses, allValidatorInfo] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const currentSelectedValidatorList = allValidatorInfo.currentSelectedValidatorList;
+    const allValidatorInfoList = [...currentSelectedValidatorList, ...allValidatorInfo.waitingValidatorList];
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -341,17 +342,19 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       };
     }));
     const decimals = this.nativeToken.decimals || 0;
-    const bnAvgStake = applyDecimal(bnTotalEraStake.divn(validatorInfoList.length), decimals);
-    for (const validator of validatorInfoList) {
+    const bnAvgStake = applyDecimal(bnTotalEraStake.divn(currentSelectedValidatorList.length), decimals);
+    for (const validator of allValidatorInfoList) {
       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);
+
+      // the waiting validator is missing info for calculating APY
+      validator.expectedReturn = currentSelectedValidatorList.includes(validator) ? this.getValidatorExpectedReturn(this.chain, validator, poolInfo.statistic.totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake) : 0;
       validator.commission = commission;
       validator.blocked = extraInfoMap[validator.address].blocked;
       validator.identity = extraInfoMap[validator.address].identity;
       validator.isVerified = extraInfoMap[validator.address].isVerified;
     }
-    return validatorInfoList;
+    return allValidatorInfoList;
   }
   getValidatorExpectedReturn(chain, validator, totalApy, commission, _stakingRewards, allValidatorAddresses, decimals, totalStakeMap, bnAvgStake) {
     if (_STAKING_CHAIN_GROUP.aleph.includes(chain)) {
@@ -370,10 +373,13 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       }
     }
   }
-  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
+  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
     const allValidatorAddresses = [];
-    const validatorInfoList = [];
+    const allValidatorInfo = {
+      currentSelectedValidatorList: [],
+      waitingValidatorList: []
+    };
     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();
@@ -391,7 +397,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         const otherStake = bnTotalStake.sub(bnOwnStake);
         totalStakeMap[validatorAddress] = bnTotalStake;
         let nominatorCount = 0;
-        if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        if (rawValidatorStat.nominatorCount) {
           nominatorCount = rawValidatorStat.nominatorCount;
         } else {
           if ('others' in rawValidatorStat) {
@@ -402,7 +408,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
           }
         }
         allValidatorAddresses.push(validatorAddress);
-        validatorInfoList.push({
+        allValidatorInfo.currentSelectedValidatorList.push({
           address: validatorAddress,
           totalStake: bnTotalStake.toString(),
           ownStake: bnOwnStake.toString(),
@@ -420,13 +426,13 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         });
       }
     }
-    for (const waitingValidator of Object.keys(waitingValidatorList)) {
+    for (const waitingValidator of Object.keys(waitingValidatorLedger)) {
       if (!allValidatorAddresses.includes(waitingValidator)) {
         allValidatorAddresses.push(waitingValidator);
-        validatorInfoList.push({
+        allValidatorInfo.waitingValidatorList.push({
           address: waitingValidator,
-          totalStake: waitingValidatorList[waitingValidator],
-          ownStake: waitingValidatorList[waitingValidator],
+          totalStake: waitingValidatorLedger[waitingValidator],
+          ownStake: waitingValidatorLedger[waitingValidator],
           otherStake: '0',
           nominatorCount: 0,
           // to be added later
@@ -441,7 +447,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         });
       }
     }
-    return [totalStakeMap, allValidatorAddresses, validatorInfoList];
+    return [totalStakeMap, allValidatorAddresses, allValidatorInfo];
   }
   /* Get pool targets */
 

package/services/earning-service/handlers/nomination-pool/index.js

@@ -6,7 +6,6 @@ import { APIItemState, BasicTxErrorType, ChainType, ExtrinsicType, StakingTxErro
 import { calculateChainStakedReturnV2, calculateInflation, getAvgValidatorEraReward, getExistUnstakeErrorMessage, getMinStakeErrorMessage, getSupportedDaysByHistoryDepth, parsePoolStashAddress } 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 { _UPDATED_RUNTIME_STAKING_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { EarningStatus, UnstakingStatus, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -162,7 +161,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let eraStakerOtherList = [];
-        if (_UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        if (substrateApi.api.query.staking.erasStakersPaged) {
           // todo: review all relaychains later
           const _eraStaker = await substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress);
           eraStakerOtherList = _eraStaker.flatMap(paged => paged[1].toPrimitive().others);

package/services/mkt-campaign-service/index.js

@@ -239,35 +239,59 @@ export default class MktCampaignService {
         const isValidArr = conditionBalance.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionEarning && conditionEarning.length) {
         const isValidArr = conditionEarning.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionNft && conditionNft.length) {
         const isValidArr = conditionNft.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionCrowdloan && conditionCrowdloan.length) {
         const isValidArr = conditionCrowdloan.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionHasMoney && conditionHasMoney.length) {
         const isValidArr = conditionHasMoney.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
     }
     if (isPassValidation && isPassValidation.length) {
-      return isPassValidation.some(_i => _i);
+      if (item.comparison_operator === 'AND') {
+        return isPassValidation.every(_i => _i);
+      } else {
+        return isPassValidation.some(_i => _i);
+      }
     } else {
       return true;
     }

package/services/mkt-campaign-service/types.d.ts

@@ -82,6 +82,8 @@ export interface AppCommonData {
     position_params: PositionParam[];
     conditions: MktCampaignCondition;
     info?: AppBasicInfoData;
+    comparison_operator: 'AND' | 'OR';
+    locations: string[];
 }
 export interface AppPopupData extends AppCommonData {
     priority: number;

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

@@ -19,7 +19,6 @@ export default class EvmRequestHandler {
   confirmationsQueueSubject = new BehaviorSubject({
     addNetworkRequest: {},
     addTokenRequest: {},
-    switchNetworkRequest: {},
     evmSignatureRequest: {},
     evmSendTransactionRequest: {},
     evmWatchTransactionRequest: {},

package/services/wallet-connect-service/index.js

@@ -44,6 +44,7 @@ var _option = /*#__PURE__*/_classPrivateFieldLooseKey("option");
 var _updateSessions = /*#__PURE__*/_classPrivateFieldLooseKey("updateSessions");
 var _onSessionProposal = /*#__PURE__*/_classPrivateFieldLooseKey("onSessionProposal");
 var _onSessionRequest = /*#__PURE__*/_classPrivateFieldLooseKey("onSessionRequest");
+var _onPingReply = /*#__PURE__*/_classPrivateFieldLooseKey("onPingReply");
 var _createListener = /*#__PURE__*/_classPrivateFieldLooseKey("createListener");
 var _removeListener = /*#__PURE__*/_classPrivateFieldLooseKey("removeListener");
 var _checkClient = /*#__PURE__*/_classPrivateFieldLooseKey("checkClient");
@@ -58,6 +59,9 @@ export default class WalletConnectService {
     Object.defineProperty(this, _createListener, {
       value: _createListener2
     });
+    Object.defineProperty(this, _onPingReply, {
+      value: _onPingReply2
+    });
     Object.defineProperty(this, _onSessionRequest, {
       value: _onSessionRequest2
     });
@@ -302,11 +306,30 @@ function _onSessionRequest2(requestEvent) {
     }).catch(console.error);
   }
 }
+async function _onPingReply2({
+  topic
+}) {
+  // Doc: https://specs.walletconnect.com/2.0/specs/clients/sign/session-events#session_ping
+
+  _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
+  try {
+    var _requestSession$names, _requestSession$names2;
+    const requestSession = this.getSession(topic);
+    const sessionAccounts = (((_requestSession$names = requestSession.namespaces.eip155) === null || _requestSession$names === void 0 ? void 0 : _requestSession$names.accounts) || []).concat(((_requestSession$names2 = requestSession.namespaces.polkadot) === null || _requestSession$names2 === void 0 ? void 0 : _requestSession$names2.accounts) || []);
+    if (sessionAccounts.length > 0 && _classPrivateFieldLooseBase(this, _client)[_client]) {
+      await _classPrivateFieldLooseBase(this, _client)[_client].ping({
+        topic
+      });
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}
 function _createListener2() {
   var _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19;
   (_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_proposal', _classPrivateFieldLooseBase(this, _onSessionProposal)[_onSessionProposal].bind(this));
   (_classPrivateFieldLoo15 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_request', _classPrivateFieldLooseBase(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', data => console.log('ping', data));
+  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', _classPrivateFieldLooseBase(this, _onPingReply)[_onPingReply].bind(this));
   (_classPrivateFieldLoo17 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_event', data => console.log('event', data));
   (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_update', data => console.log('update', data));
   (_classPrivateFieldLoo19 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_delete', _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions].bind(this));

package/types/yield/info/chain/target.d.ts

@@ -25,6 +25,10 @@ export interface ValidatorInfo {
     eraRewardPoint?: string;
     topQuartile?: boolean;
 }
+export interface AllValidatorInfo {
+    currentSelectedValidatorList: ValidatorInfo[];
+    waitingValidatorList: ValidatorInfo[];
+}
 export declare type YieldPoolTarget = NominationPoolInfo | ValidatorInfo;
 export interface RequestGetYieldPoolTargets {
     slug: string;