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

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

@@ -22,6 +22,7 @@ var _utils2 = require("@subwallet/extension-base/utils");
 var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -286,8 +287,6 @@ class KoniTabs {
     } = _ref11;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const authInfoSubject = this.#koniState.requestService.subscribeAuthorizeUrlSubject;
-
-    // Update unsubscribe from @polkadot/extension-base
     this.#accountSubs[id] = {
       subscription: authInfoSubject.subscribe(infos => {
         this.getAuthInfo(url, infos).then(authInfo => {
@@ -298,6 +297,8 @@ class KoniTabs {
       }),
       url
     };
+
+    // Update unsubscribe from @polkadot/extension-base
     port.onDisconnect.addListener(() => {
       this.accountsUnsubscribe(url, {
         id
@@ -421,10 +422,80 @@ class KoniTabs {
       date: new Date().getTime()
     }];
   }
-  async switchEvmChain(id, url, _ref13) {
+  async revokePermissions(url, id, _ref13) {
     let {
       params
     } = _ref13;
+    if (!params || !(0, _util.isArray)(params) || params.length === 0) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'No list of permissions found to revoke in the parameters.');
+    }
+
+    // Example of a request in MetaMask wallet
+    // await window.ethereum.request({
+    //   "method": "wallet_revokePermissions",
+    //   "params": [
+    //     {
+    //       "eth_accounts": {}
+    //     }
+    //   ]
+    // });
+    // Doc: https://docs.metamask.io/wallet/reference/wallet_revokepermissions/
+
+    const permissions = new Set(Object.keys(params[0]).filter(permission => _constants.PERMISSIONS_TO_REVOKE.includes(permission)));
+    const permissionPromise = async permission => {
+      if (permission === 'eth_accounts') {
+        return new Promise(resolve => {
+          this.#koniState.getAuthorize(value => {
+            const urlStripped = (0, _utils2.stripUrl)(url);
+            if (value && value[urlStripped]) {
+              const {
+                accountAuthType,
+                isAllowedMap
+              } = {
+                ...value[urlStripped]
+              };
+              if (!accountAuthType) {
+                resolve();
+              }
+              switch (accountAuthType) {
+                case 'substrate':
+                  resolve();
+                  break;
+                case 'evm':
+                  delete value[urlStripped];
+                  break;
+                case 'both':
+                  {
+                    value[urlStripped].isAllowedMap = Object.entries(isAllowedMap).reduce((allowedMap, _ref14) => {
+                      let [address, value] = _ref14;
+                      if ((0, _utilCrypto.isEthereumAddress)(address)) {
+                        allowedMap[address] = false;
+                      } else {
+                        allowedMap[address] = value;
+                      }
+                      return allowedMap;
+                    }, {});
+                    value[urlStripped].accountAuthType = 'substrate';
+                    break;
+                  }
+              }
+              this.#koniState.setAuthorize(value, () => {
+                resolve();
+              });
+            } else {
+              resolve();
+            }
+          });
+        });
+      }
+    };
+    await Promise.all(Array.from(permissions).map(permissionPromise));
+    return null;
+  }
+  async switchEvmChain(id, url, _ref15) {
+    let {
+      params
+    } = _ref15;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
     const chainIdDec = parseInt(chainId, 16);
@@ -456,11 +527,11 @@ class KoniTabs {
     }
     return null;
   }
-  async addEvmToken(id, url, _ref14) {
+  async addEvmToken(id, url, _ref16) {
     var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
-    } = _ref14;
+    } = _ref16;
     const input = params;
     const _tokenType = (input === null || input === void 0 ? void 0 : (_input$type = input.type) === null || _input$type === void 0 ? void 0 : _input$type.toLowerCase()) || '';
     if (_tokenType !== 'erc20' && _tokenType !== 'erc721') {
@@ -513,10 +584,10 @@ class KoniTabs {
 
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
-  async addEvmChain(id, url, _ref15) {
+  async addEvmChain(id, url, _ref17) {
     let {
       params
-    } = _ref15;
+    } = _ref17;
     const input = params;
     if (input && input.length > 0) {
       const {
@@ -719,11 +790,11 @@ class KoniTabs {
     const networkCheckInterval = setInterval(networkCheck, _constants.CRON_GET_API_MAP_STATUS);
     const provider = await this.getEvmProvider(url);
     const eventMap = {};
-    eventMap.data = _ref16 => {
+    eventMap.data = _ref18 => {
       let {
         method,
         params
-      } = _ref16;
+      } = _ref18;
       emitEvent('message', {
         type: method,
         data: params
@@ -732,8 +803,8 @@ class KoniTabs {
     eventMap.error = rs => {
       emitEvent('error', rs);
     };
-    Object.entries(eventMap).forEach(_ref17 => {
-      let [event, callback] = _ref17;
+    Object.entries(eventMap).forEach(_ref19 => {
+      let [event, callback] = _ref19;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       (provider === null || provider === void 0 ? void 0 : provider.on) && (provider === null || provider === void 0 ? void 0 : provider.on(event, callback));
     });
@@ -747,8 +818,8 @@ class KoniTabs {
       if (this.evmEventEmitterMap[url][id]) {
         delete this.evmEventEmitterMap[url][id];
       }
-      Object.entries(eventMap).forEach(_ref18 => {
-        let [event, callback] = _ref18;
+      Object.entries(eventMap).forEach(_ref20 => {
+        let [event, callback] = _ref20;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         (provider === null || provider === void 0 ? void 0 : provider.removeListener) && (provider === null || provider === void 0 ? void 0 : provider.removeListener(event, callback));
       });
@@ -783,11 +854,11 @@ class KoniTabs {
     }
     return provider;
   }
-  async performWeb3Method(id, url, _ref19, callback) {
+  async performWeb3Method(id, url, _ref21, callback) {
     let {
       method,
       params
-    } = _ref19;
+    } = _ref21;
     const provider = await this.getEvmProvider(url);
     this.checkAndHandleProviderStatus(provider);
     return new Promise((resolve, reject) => {
@@ -823,11 +894,11 @@ class KoniTabs {
     const allowedAccounts = await this.getEvmCurrentAccount(url);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
-  async evmSign(id, url, _ref20) {
+  async evmSign(id, url, _ref22) {
     let {
       method,
       params
-    } = _ref20;
+    } = _ref22;
     const signResult = await this.#koniState.evmSign(id, url, method, params);
     if (signResult) {
       return signResult;
@@ -835,10 +906,10 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
     }
   }
-  async evmSendTransaction(id, url, _ref21) {
+  async evmSendTransaction(id, url, _ref23) {
     let {
       params
-    } = _ref21;
+    } = _ref23;
     const transactionParams = params[0];
     const transactionHash = await this.#koniState.evmSendTransaction(id, url, transactionParams);
     if (!transactionHash) {
@@ -881,6 +952,8 @@ class KoniTabs {
           return await this.getEvmPermission(url, id);
         case 'wallet_getPermissions':
           return await this.getEvmPermission(url, id);
+        case 'wallet_revokePermissions':
+          return await this.revokePermissions(url, id, request);
         case 'wallet_addEthereumChain':
           return await this.addEvmChain(id, url, request);
         case 'wallet_switchEthereumChain':
@@ -920,13 +993,13 @@ class KoniTabs {
     return true;
   }
   isEvmPublicRequest(type, request) {
-    return type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method);
+    return type === 'evm(request)' && ['eth_chainId', 'net_version', 'wallet_requestPermissions', 'wallet_getPermissions'].includes(request === null || request === void 0 ? void 0 : request.method) || type === 'evm(events.subscribe)';
   }
-  async addPspToken(id, url, _ref22) {
+  async addPspToken(id, url, _ref24) {
     let {
       genesisHash,
       tokenInfo: input
-    } = _ref22;
+    } = _ref24;
     const _tokenType = input.type;
     if (_tokenType !== 'psp22' && _tokenType !== 'psp34') {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Assets type {{tokenType}} is not supported'.replace('{{tokenType}}', _tokenType));
@@ -987,7 +1060,7 @@ class KoniTabs {
 
     // Wait for account ready and chain ready
     await Promise.all([this.#koniState.eventService.waitAccountReady, this.#koniState.eventService.waitChainReady]);
-    if (type !== 'pub(authorize.tabV2)' && !this.isEvmPublicRequest(type, request)) {
+    if (!['pub(authorize.tabV2)', 'pub(accounts.subscribeV2)'].includes(type) && !this.isEvmPublicRequest(type, request)) {
       await this.#koniState.ensureUrlAuthorizedV2(url).catch(e => {
         if (type.startsWith('evm')) {
           throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, e.message);

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.26-0'
+  version: '1.2.28-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -191,6 +191,16 @@ const subscribeForeignAssetBalance = async _ref2 => {
           const balances = rs[foreignAssetsAccountKey];
           const items = balances.map((_balance, index) => {
             const balanceInfo = _balance;
+            if (!balanceInfo) {
+              // no balance info response
+              return {
+                address: addresses[index],
+                tokenSlug: tokenInfo.slug,
+                free: '0',
+                locked: '0',
+                state: _KoniTypes.APIItemState.READY
+              };
+            }
             const transferableBalance = (0, _foreignAssetPallet._getForeignAssetPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
             const totalLockedFromTransfer = (0, _foreignAssetPallet._getForeignAssetPalletLockedBalance)(balanceInfo);
             return {
@@ -365,8 +375,18 @@ const subscribeAssetsAccountPallet = async _ref6 => {
         const balances = rs[assetsAccountKey];
         const items = balances.map((_balance, index) => {
           const balanceInfo = _balance;
+          if (!balanceInfo) {
+            // no balance info response
+            return {
+              address: addresses[index],
+              tokenSlug: tokenInfo.slug,
+              free: '0',
+              locked: '0',
+              state: _KoniTypes.APIItemState.READY
+            };
+          }
           const transferableBalance = (0, _assetsPallet._getAssetsPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
-          const totalLockedFromTransfer = (0, _assetsPallet._getAssetsPalletLockedBalance)(balanceInfo);
+          const totalLockedFromTransfer = (0, _assetsPallet._getAssetsPalletLocked)(balanceInfo);
           return {
             address: addresses[index],
             tokenSlug: tokenInfo.slug,

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

@@ -28,7 +28,7 @@ const filterChainInfoMap = (data, ignoredChains) => {
     return !info.bitcoinInfo && !ignoredChains.includes(slug);
   }));
 };
-const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'ton', 'ton_testnet'];
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'ton', 'ton_testnet', 'storyPartner_testnet'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(_ref2 => {
     let [, info] = _ref2;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._UPDATED_RUNTIME_STAKING_GROUP = exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
+exports._STAKING_CHAIN_GROUP = exports.ST_LIQUID_TOKEN_ABI = exports.MaxEraRewardPointsEras = exports.MANTA_VALIDATOR_POINTS_PER_BLOCK = exports.MANTA_MIN_DELEGATION = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -25,8 +25,6 @@ const _STAKING_CHAIN_GROUP = {
   manta: ['manta_network']
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
-const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet', 'dentnet'];
-exports._UPDATED_RUNTIME_STAKING_GROUP = _UPDATED_RUNTIME_STAKING_GROUP;
 const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

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

@@ -199,7 +199,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
       let nominationStatus = _types.EarningStatus.NOT_EARNING;
       let eraStakerOtherList = [];
       let identity;
-      if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+      if (substrateApi.api.query.staking.erasStakersPaged) {
         // todo: review all relaychains later
         const [[_identity], _eraStaker] = await Promise.all([(0, _utils3.parseIdentity)(substrateApi, validatorAddress), substrateApi.api.query.staking.erasStakersPaged.entries(currentEra, validatorAddress)]);
         identity = _identity;
@@ -307,20 +307,19 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const maxEraRewardPointsEras = _constants2.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 = (0, _utils.getRelayEraRewardMap)(_eraRewardPoints[0], startEraForPoints);
     const validatorPointsMap = (0, _utils.getRelayValidatorPointsMap)(eraRewardMap);
     const topValidatorList = (0, _utils.getRelayTopValidatorByPoints)(validatorPointsMap);
-    const validators = _validators;
-    const blockedValidatorList = (0, _utils.getRelayBlockedValidatorList)(validators);
-    const waitingValidatorList = (0, _utils.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 = (0, _utils.getRelayBlockedValidatorList)(allValidatorList);
+    const waitingValidatorList = (0, _utils.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) {
@@ -334,7 +333,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.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
@@ -348,17 +349,19 @@ class RelayNativeStakingPoolHandler extends _base.default {
       };
     }));
     const decimals = this.nativeToken.decimals || 0;
-    const bnAvgStake = (0, _utils3.applyDecimal)(bnTotalEraStake.divn(validatorInfoList.length), decimals);
-    for (const validator of validatorInfoList) {
+    const bnAvgStake = (0, _utils3.applyDecimal)(bnTotalEraStake.divn(currentSelectedValidatorList.length), decimals);
+    for (const validator of allValidatorInfoList) {
       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);
+
+      // 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 (_constants2._STAKING_CHAIN_GROUP.aleph.includes(chain)) {
@@ -377,10 +380,13 @@ class RelayNativeStakingPoolHandler extends _base.default {
       }
     }
   }
-  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();
@@ -398,7 +404,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
         const otherStake = bnTotalStake.sub(bnOwnStake);
         totalStakeMap[validatorAddress] = bnTotalStake;
         let nominatorCount = 0;
-        if (_constants2._UPDATED_RUNTIME_STAKING_GROUP.includes(this.chain)) {
+        if (rawValidatorStat.nominatorCount) {
           nominatorCount = rawValidatorStat.nominatorCount;
         } else {
           if ('others' in rawValidatorStat) {
@@ -409,7 +415,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
           }
         }
         allValidatorAddresses.push(validatorAddress);
-        validatorInfoList.push({
+        allValidatorInfo.currentSelectedValidatorList.push({
           address: validatorAddress,
           totalStake: bnTotalStake.toString(),
           ownStake: bnOwnStake.toString(),
@@ -427,13 +433,13 @@ class RelayNativeStakingPoolHandler extends _base.default {
         });
       }
     }
-    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
@@ -448,7 +454,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
         });
       }
     }
-    return [totalStakeMap, allValidatorAddresses, validatorInfoList];
+    return [totalStakeMap, allValidatorAddresses, allValidatorInfo];
   }
   /* Get pool targets */
 

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

@@ -10,7 +10,6 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _constants2 = require("@subwallet/extension-base/services/earning-service/constants");
 var _types = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -170,7 +169,7 @@ class NominationPoolHandler extends _base.default {
       const validatorList = nominations.targets;
       await Promise.all(validatorList.map(async validatorAddress => {
         let eraStakerOtherList = [];
-        if (_constants2._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/cjs/services/mkt-campaign-service/index.js

@@ -247,35 +247,59 @@ 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/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -26,7 +26,6 @@ class EvmRequestHandler {
   confirmationsQueueSubject = new _rxjs.BehaviorSubject({
     addNetworkRequest: {},
     addTokenRequest: {},
-    switchNetworkRequest: {},
     evmSignatureRequest: {},
     evmSendTransactionRequest: {},
     evmWatchTransactionRequest: {},

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

@@ -57,6 +57,7 @@ var _option = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("option");
 var _updateSessions = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("updateSessions");
 var _onSessionProposal = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionProposal");
 var _onSessionRequest = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionRequest");
+var _onPingReply = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onPingReply");
 var _createListener = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("createListener");
 var _removeListener = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("removeListener");
 var _checkClient = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("checkClient");
@@ -72,6 +73,9 @@ class WalletConnectService {
     Object.defineProperty(this, _createListener, {
       value: _createListener2
     });
+    Object.defineProperty(this, _onPingReply, {
+      value: _onPingReply2
+    });
     Object.defineProperty(this, _onSessionRequest, {
       value: _onSessionRequest2
     });
@@ -318,11 +322,31 @@ function _onSessionRequest2(requestEvent) {
     }).catch(console.error);
   }
 }
+async function _onPingReply2(_ref4) {
+  let {
+    topic
+  } = _ref4;
+  // Doc: https://specs.walletconnect.com/2.0/specs/clients/sign/session-events#session_ping
+
+  (0, _classPrivateFieldLooseBase2.default)(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 && (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) {
+      await (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client].ping({
+        topic
+      });
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}
 function _createListener2() {
   var _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19;
   (_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
   (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', data => console.log('ping', data));
+  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', (0, _classPrivateFieldLooseBase2.default)(this, _onPingReply)[_onPingReply].bind(this));
   (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_event', data => console.log('event', data));
   (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_update', data => console.log('update', data));
   (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));

package/constants/index.d.ts

@@ -29,5 +29,6 @@ export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";
 export declare const ORDINAL_METHODS: string[];
+export declare const PERMISSIONS_TO_REVOKE: string[];
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -32,5 +32,6 @@ export const GAS_PRICE_RATIO = 1 + 2 / 100;
 export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';
 export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
+export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
 export * from "./staking.js";
 export * from "./storage.js";