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

package/koni/background/handlers/State.js

@@ -6,7 +6,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
-import { generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
+import { convertErrorFormat, generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
@@ -35,7 +35,7 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { isAccountAll, isManifestV3, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
@@ -548,44 +548,6 @@ export default class KoniState {
       }));
     }
   }
-  async switchNetworkAccount(id, url, networkKey, changeAddress) {
-    const chainInfo = this.chainService.getChainInfoByKey(networkKey);
-    const chainState = this.chainService.getChainStateByKey(networkKey);
-    const {
-      address,
-      currentGenesisHash
-    } = this.keyringService.currentAccount;
-    return this.requestService.addConfirmation(id, url, 'switchNetworkRequest', {
-      networkKey,
-      address: changeAddress
-    }, {
-      address: changeAddress
-    }).then(({
-      isApproved
-    }) => {
-      if (isApproved) {
-        const useAddress = changeAddress || address;
-        if (chainInfo && !_isChainEnabled(chainState)) {
-          this.enableChain(networkKey).catch(console.error);
-        }
-        if (useAddress !== ALL_ACCOUNT_KEY) {
-          const pair = keyring.getPair(useAddress);
-          assert(pair, t('Unable to find account'));
-          keyring.saveAccountMeta(pair, {
-            ...pair.meta,
-            genesisHash: _getSubstrateGenesisHash(chainInfo)
-          });
-        }
-        if (address !== changeAddress || _getSubstrateGenesisHash(chainInfo) !== currentGenesisHash || isApproved) {
-          this.setCurrentAccount({
-            address: useAddress,
-            currentGenesisHash: _getSubstrateGenesisHash(chainInfo)
-          });
-        }
-      }
-      return isApproved;
-    });
-  }
   async addNetworkConfirm(id, url, networkData) {
     return this.requestService.addConfirmation(id, url, 'addNetworkRequest', networkData).then(async ({
       isApproved
@@ -1098,9 +1060,10 @@ export default class KoniState {
     };
     const validationSteps = [topic ? validationAuthWCMiddleware : validationAuthMiddleware, validationEvmSignMessageMiddleware];
     const result = await generateValidationProcess(this, url, payloadValidation, validationSteps, topic);
+    const errorsFormated = convertErrorFormat(result.errors);
     const payloadAfterValidated = {
       ...result.payloadAfterValidated,
-      errors: result.errors,
+      errors: errorsFormated,
       id
     };
     return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(({
@@ -1161,9 +1124,13 @@ export default class KoniState {
       errors,
       networkKey: networkKey_
     } = result;
-    if (errors && errors.length > 0 && confirmationType) {
+    const errorsFormated = convertErrorFormat(errors);
+    if (errorsFormated && errorsFormated.length > 0 && confirmationType) {
       if (ERROR_CONFIRMATION_TYPE.includes(confirmationType)) {
-        return this.requestService.addConfirmation(id, url, confirmationType, result, {}).then(() => {
+        return this.requestService.addConfirmation(id, url, confirmationType, {
+          ...result,
+          errors: errorsFormated
+        }, {}).then(() => {
           throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);
         });
       }
@@ -1172,7 +1139,7 @@ export default class KoniState {
     const networkKey = networkKey_ || '';
     const requestPayload = {
       ...transactionValidated,
-      errors: errors
+      errors: errorsFormated
     };
     const eType = transactionValidated.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE;
     const transactionData = {
@@ -1232,14 +1199,17 @@ export default class KoniState {
   async onMV3Update() {
     const migrationStatus = await SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
-      // Open migration tab
-      const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
-      await openPopup(url);
+      if (isManifestV3) {
+        // Open migration tab
+        const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
+        await openPopup(url);
 
-      // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
+        // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
+      } else {
+        this.migrateMV3LocalStorage(JSON.stringify(self.localStorage)).catch(console.error);
+      }
     }
   }
-
   async migrateMV3LocalStorage(data) {
     try {
       const parsedData = JSON.parse(data);

package/koni/background/handlers/Tabs.d.ts

@@ -34,6 +34,7 @@ export default class KoniTabs {
     private getEvmCurrentAccount;
     private getEvmState;
     private getEvmPermission;
+    private revokePermissions;
     private switchEvmChain;
     private addEvmToken;
     private addEvmChain;

package/koni/background/handlers/Tabs.js

@@ -8,7 +8,7 @@ import { createSubscription, unsubscribe } from '@subwallet/extension-base/backg
 import { EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import RequestBytesSign from '@subwallet/extension-base/background/RequestBytesSign';
 import RequestExtrinsicSign from '@subwallet/extension-base/background/RequestExtrinsicSign';
-import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS, PERMISSIONS_TO_REVOKE } from '@subwallet/extension-base/constants';
 import { generateValidationProcess, validationAuthMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
@@ -17,7 +17,8 @@ import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/
 import { canDerive, getEVMChainInfo, stripUrl } from '@subwallet/extension-base/utils';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
-import { isNumber } from '@polkadot/util';
+import { isArray, isNumber } from '@polkadot/util';
+import { isEthereumAddress } from '@polkadot/util-crypto';
 function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthType) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   let authTypeFilter = ({
@@ -246,8 +247,6 @@ export default class KoniTabs {
   }, id, port) {
     const cb = 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 => {
@@ -258,6 +257,8 @@ export default class KoniTabs {
       }),
       url
     };
+
+    // Update unsubscribe from @polkadot/extension-base
     port.onDisconnect.addListener(() => {
       this.accountsUnsubscribe(url, {
         id
@@ -380,6 +381,74 @@ export default class KoniTabs {
       date: new Date().getTime()
     }];
   }
+  async revokePermissions(url, id, {
+    params
+  }) {
+    if (!params || !isArray(params) || params.length === 0) {
+      throw new EvmProviderError(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 => PERMISSIONS_TO_REVOKE.includes(permission)));
+    const permissionPromise = async permission => {
+      if (permission === 'eth_accounts') {
+        return new Promise(resolve => {
+          this.#koniState.getAuthorize(value => {
+            const urlStripped = 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, [address, value]) => {
+                      if (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, {
     params
   }) {
@@ -831,6 +900,8 @@ export default 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':
@@ -870,7 +941,7 @@ export default 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, {
     genesisHash,
@@ -936,7 +1007,7 @@ export default 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(EvmProviderErrorType.INTERNAL_ERROR, e.message);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.27-0",
+  "version": "1.2.29-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2043,9 +2043,10 @@
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^2.1.0",
+    "@galacticcouncil/sdk": "^4.2.0",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
+    "@metamask/eth-sig-util": "^7.0.3",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
@@ -2069,17 +2070,17 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.83",
-    "@subwallet/extension-base": "^1.2.27-0",
-    "@subwallet/extension-chains": "^1.2.27-0",
-    "@subwallet/extension-dapp": "^1.2.27-0",
-    "@subwallet/extension-inject": "^1.2.27-0",
-    "@subwallet/keyring": "^0.1.5",
-    "@subwallet/ui-keyring": "^0.1.5",
+    "@subwallet/chain-list": "0.2.86",
+    "@subwallet/extension-base": "^1.2.29-0",
+    "@subwallet/extension-chains": "^1.2.29-0",
+    "@subwallet/extension-dapp": "^1.2.29-0",
+    "@subwallet/extension-inject": "^1.2.29-0",
+    "@subwallet/keyring": "^0.1.6",
+    "@subwallet/ui-keyring": "^0.1.6",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "^2.13.1",
-    "@walletconnect/types": "^2.13.1",
-    "@walletconnect/utils": "^2.13.1",
+    "@walletconnect/sign-client": "^2.14.0",
+    "@walletconnect/types": "^2.14.0",
+    "@walletconnect/utils": "^2.14.0",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",
@@ -2097,6 +2098,7 @@
     "graphql": "^16.8.1",
     "i18next": "^21.9.2",
     "is-buffer": "^2.0.5",
+    "joi": "^17.13.3",
     "json-rpc-engine": "^6.1.0",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",

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

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

@@ -70,6 +70,21 @@ const filterAddress = (addresses, chainInfo) => {
     return [fetchList, [...unfetchList, ...evmAddresses]];
   }
 };
+const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
+  const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20, _AssetType.VFT]);
+  const now = new Date().getTime();
+  Object.values(tokens).forEach(token => {
+    const items = addresses.map(address => ({
+      address,
+      tokenSlug: token.slug,
+      free: '0',
+      locked: '0',
+      state,
+      timestamp: now
+    }));
+    callback(items);
+  });
+};
 
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
 export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoMap, substrateApiMap, evmApiMap, callback, extrinsicType) {
@@ -82,19 +97,7 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
     const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20, _AssetType.VFT]);
-      const now = new Date().getTime();
-      Object.values(tokens).forEach(token => {
-        const items = notSupportAddresses.map(address => ({
-          address,
-          tokenSlug: token.slug,
-          free: '0',
-          locked: '0',
-          state: APIItemState.NOT_SUPPORT,
-          timestamp: now
-        }));
-        callback(items);
-      });
+      handleUnsupportedOrPendingAddresses(notSupportAddresses, chainSlug, chainAssetMap, APIItemState.NOT_SUPPORT, callback);
     }
     const evmApi = evmApiMap[chainSlug];
     if (_isPureEvmChain(chainInfo)) {
@@ -106,6 +109,9 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
         evmApi
       });
     }
+    if (!substrateApiMap[chainSlug].isApiReady) {
+      handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, APIItemState.PENDING, callback);
+    }
     const substrateApi = await substrateApiMap[chainSlug].isReady;
     return subscribeSubstrateBalance(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });

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

@@ -112,10 +112,9 @@ const subscribeWithSystemAccountPallet = async ({
   extrinsicType,
   substrateApi
 }) => {
-  var _substrateApi$api$tx, _substrateApi$api$tx$;
   const systemAccountKey = 'query_system_account';
   const poolMembersKey = 'query_nominationPools_poolMembers';
-  const isNominationPoolMigrated = !!((_substrateApi$api$tx = substrateApi.api.tx) !== null && _substrateApi$api$tx !== void 0 && (_substrateApi$api$tx$ = _substrateApi$api$tx.nominationPools) !== null && _substrateApi$api$tx$ !== void 0 && _substrateApi$api$tx$.migrateDelegation);
+  const isNominationPoolMigrated = await checkNominationPoolCompleteMigrated(substrateApi);
   const params = [{
     section: 'query',
     module: systemAccountKey.split('_')[1],
@@ -158,6 +157,19 @@ const subscribeWithSystemAccountPallet = async ({
     subscription.unsubscribe();
   };
 };
+const checkNominationPoolCompleteMigrated = async substrateApi => {
+  if (!substrateApi.api.tx.nominationPools || !substrateApi.api.query.staking) {
+    return false;
+  }
+  const isNominationPoolMigrated = !!substrateApi.api.tx.nominationPools.migrateDelegation && !!substrateApi.api.query.staking.counterForVirtualStakers && !!substrateApi.api.query.staking.virtualStakers;
+  if (!isNominationPoolMigrated) {
+    return false;
+  }
+  const [nominationPoolCounterRaw, nominationPoolInfoRaw] = await Promise.all([substrateApi.api.query.staking.counterForVirtualStakers(), substrateApi.api.query.staking.virtualStakers.entries()]);
+  const nominationPoolCounter = nominationPoolCounterRaw.toPrimitive();
+  const nominationPoolInfoLength = nominationPoolInfoRaw.length;
+  return nominationPoolCounter !== 0 && nominationPoolInfoLength !== 0;
+};
 const subscribeForeignAssetBalance = async ({
   addresses,
   assetMap,

package/services/balance-service/transfer/xcm/index.js

@@ -39,26 +39,21 @@ export const createXcmExtrinsic = async ({
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
   const chainApi = await substrateApi.isReady;
   const api = chainApi.api;
-  let extrinsic;
-  if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain)) {
-    if (['astar', 'shiden'].includes(originChainInfo.slug) && !_isNativeToken(originTokenInfo)) {
-      extrinsic = getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    } else {
-      extrinsic = getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-    }
-  } else if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    extrinsic = getExtrinsicByXcmPalletPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
-  } else {
-    extrinsic = getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  const polkadotXcmSpecialCases = _XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChainInfo.slug) && _isNativeToken(originTokenInfo);
+  if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
+    return getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  return extrinsic;
+  if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
+    return getExtrinsicByXcmPalletPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+  }
+  return getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
 };
 export const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
   try {
     var _paymentInfo$partialF;
     const destChainInfo = chainInfoMap[destinationTokenInfo.originChain];
     const originChainInfo = chainInfoMap[originTokenInfo.originChain];
-    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap';
+    const address = '5DRewsYzhJqZXU3SRaWy1FSt5iDr875ao91aw5fjrJmDG4Ap'; // todo: move this
 
     // mock receiving account from sender
     const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(destChainInfo) && !_isChainEvmCompatible(originChainInfo) ? u8aToHex(addressToEvm(address)) : address;

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

@@ -76,6 +76,7 @@ export declare const _ZK_ASSET_PREFIX = "zk";
 export declare const _DEFAULT_MANTA_ZK_CHAIN = "calamari";
 export declare const _XCM_CHAIN_GROUP: {
     polkadotXcm: string[];
+    polkadotXcmSpecialCases: string[];
     xcmPallet: string[];
 };
 export declare const _XCM_TYPE: {

package/services/chain-service/constants.js

@@ -261,7 +261,8 @@ export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 
 export const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos'],
+  polkadotXcmSpecialCases: ['astar', 'shiden'],
   xcmPallet: ['polkadot', 'kusama', 'rococo']
   // default is xTokens pallet
 };

package/services/chain-service/index.js

@@ -18,7 +18,7 @@ import { logger as createLogger } from '@polkadot/util/logger';
 const filterChainInfoMap = (data, ignoredChains) => {
   return Object.fromEntries(Object.entries(data).filter(([slug, info]) => !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(([, info]) => chainInfo[info.originChain]));
 };

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

@@ -13,7 +13,6 @@ export declare const _STAKING_CHAIN_GROUP: {
     krest_network: string[];
     manta: string[];
 };
-export declare const _UPDATED_RUNTIME_STAKING_GROUP: string[];
 export declare const MaxEraRewardPointsEras = 14;
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;

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

@@ -18,7 +18,6 @@ export const _STAKING_CHAIN_GROUP = {
   krest_network: ['krest_network'],
   manta: ['manta_network']
 };
-export const _UPDATED_RUNTIME_STAKING_GROUP = ['kusama', 'polkadot', 'westend', 'availTuringTest', 'avail_mainnet', 'dentnet'];
 export const MaxEraRewardPointsEras = 14;
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment

package/services/earning-service/handlers/lending/interlay.js

@@ -54,7 +54,6 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apr: 1.29,
           exchangeRate: exchangeRate / decimals
         }],
         maxCandidatePerFarmer: 1,
@@ -64,7 +63,6 @@ export default class InterlayLendingPoolHandler extends BaseLendingPoolHandler {
           defaultUnstake: '0',
           fastUnstake: '0'
         },
-        totalApr: 1.29,
         tvl: '291890000000000'
       }
     };

package/services/earning-service/handlers/liquid-staking/parallel.js

@@ -39,7 +39,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
 
   async getPoolStat() {
     const substrateApi = await this.substrateApi.isReady;
-    const [_exchangeRate, _currentBlockHeader, _currentTimestamp, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.rpc.chain.getHeader(), substrateApi.api.query.timestamp.now(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
+    const [_exchangeRate, _stakingLedgers] = await Promise.all([substrateApi.api.query.liquidStaking.exchangeRate(), substrateApi.api.query.liquidStaking.stakingLedgers.entries()]);
     let tvl = BN_ZERO;
     for (const _stakingLedger of _stakingLedgers) {
       const _ledger = _stakingLedger[1];
@@ -47,16 +47,7 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
       tvl = tvl.add(new BN(ledger.total.toString()));
     }
     const exchangeRate = _exchangeRate.toPrimitive();
-    const currentBlockHeader = _currentBlockHeader.toPrimitive();
-    const currentTimestamp = _currentTimestamp.toPrimitive();
-    const beginBlock = currentBlockHeader.number - 24 * 60 * 60 / 6 * 14;
-    const _beginBlockHash = await substrateApi.api.rpc.chain.getBlockHash(beginBlock);
-    const beginBlockHash = _beginBlockHash.toString();
-    const [_beginTimestamp, _beginExchangeRate] = await Promise.all([substrateApi.api.query.timestamp.now.at(beginBlockHash), substrateApi.api.query.liquidStaking.exchangeRate.at(beginBlockHash)]);
-    const beginTimestamp = _beginTimestamp.toPrimitive();
-    const beginExchangeRate = _beginExchangeRate.toPrimitive();
     const decimals = 10 ** this.rateDecimals;
-    const apy = (exchangeRate / beginExchangeRate) ** (365 * 24 * 60 * 60000 / (currentTimestamp - beginTimestamp)) - 1;
     const minStake = substrateApi.api.consts.liquidStaking.minStake.toString();
     const minUnstake = substrateApi.api.consts.liquidStaking.minUnstake.toString();
     this.updateExchangeRate(exchangeRate);
@@ -70,7 +61,6 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
       statistic: {
         assetEarning: [{
           slug: this.rewardAssets[0],
-          apy: apy * 100,
           exchangeRate: exchangeRate / decimals
         }],
         unstakingPeriod: 24 * 28,
@@ -81,7 +71,6 @@ export default class ParallelLiquidStakingPoolHandler extends BaseLiquidStakingP
           defaultUnstake: minUnstake,
           fastUnstake: '0'
         },
-        totalApy: apy * 100,
         tvl: tvl.toString()
       }
     };