@subwallet/extension-base 1.3.52-0 → 1.3.54-0

package/services/earning-service/handlers/native-staking/dtao.js

@@ -41,7 +41,7 @@ export default class SubnetTaoStakingPoolHandler extends TaoNativeStakingPoolHan
   canHandleSlug(slug) {
     return slug.startsWith(`${this.slug}__`);
   }
-  async getEarningSlippage(params) {
+  async getEarningImpact(params) {
     const substrateApi = await this.substrateApi.isReady;
     const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(params.netuid)).toJSON();
     const alphaIn = new BigN((subnetInfo === null || subnetInfo === void 0 ? void 0 : subnetInfo.alphaIn) || 0);
@@ -49,15 +49,18 @@ export default class SubnetTaoStakingPoolHandler extends TaoNativeStakingPoolHan
     const k = alphaIn.multipliedBy(taoIn);
     const value = new BigN(params.value);
     const rate = taoIn.dividedBy(alphaIn);
+    const feeRate = await this.bittensorCache.fetchSubnetFeeRate(params.netuid);
     if (params.type === ExtrinsicType.STAKING_BOND) {
       const newTaoIn = taoIn.plus(value);
       const newAlphaIn = k.dividedBy(newTaoIn);
       const alphaReturned = alphaIn.minus(newAlphaIn);
       const alphaIdeal = value.multipliedBy(alphaIn).dividedBy(taoIn);
       const slippage = alphaIdeal.minus(alphaReturned).dividedBy(alphaIdeal);
+      const bnStakingTaoFee = value.multipliedBy(feeRate);
       return {
         slippage: slippage.plus(0.0001).toNumber(),
-        rate: rate.toNumber()
+        rate: rate.toNumber(),
+        stakingTaoFee: bnStakingTaoFee.toString()
       };
     } else if (params.type === ExtrinsicType.STAKING_UNBOND) {
       const newAlphaIn = alphaIn.plus(value);
@@ -65,9 +68,12 @@ export default class SubnetTaoStakingPoolHandler extends TaoNativeStakingPoolHan
       const taoReturned = taoIn.minus(newTaoReserve);
       const taoIdeal = value.multipliedBy(taoIn).dividedBy(alphaIn);
       const slippage = taoIdeal.minus(taoReturned).dividedBy(taoIdeal);
+      const taoAmount = value.multipliedBy(rate);
+      const bnStakingTaoFee = taoAmount.multipliedBy(feeRate);
       return {
         slippage: slippage.plus(0.0001).toNumber(),
-        rate: rate.toNumber()
+        rate: rate.toNumber(),
+        stakingTaoFee: bnStakingTaoFee.toString()
       };
     }
     return {

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

@@ -2,14 +2,12 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType, NominationInfo, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
-import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { BaseYieldPositionInfo, OptimalYieldPath, PalletStakingNominations, PalletStakingStakingLedger, StakeCancelWithdrawalParams, SubmitChangeValidatorStaking, SubmitJoinNativeStaking, SubmitYieldJoinData, TransactionData, ValidatorInfo, YieldPoolInfo, YieldPoolMethodInfo, YieldPositionInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
 import { BN } from '@polkadot/util';
 import BaseNativeStakingPoolHandler from './base';
 export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPoolHandler {
     availableMethod: YieldPoolMethodInfo;
-    constructor(state: KoniState, chain: string);
     subscribePoolInfo(callback: (data: YieldPoolInfo) => void): Promise<VoidFunction>;
     parseNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, ledger: PalletStakingStakingLedger, currentEra: string, minStake: BN): Promise<Omit<YieldPositionInfo, keyof BaseYieldPositionInfo>>;
     handleNominationsList(substrateApi: _SubstrateApi, chain: string, nominations: PalletStakingNominations, currentEra: string, address: string, maxNominatorRewardedPerValidator: number | undefined): Promise<NominationInfo[]>;

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

@@ -6,7 +6,7 @@ import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 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, _SUPPORT_CHANGE_VALIDATOR_CHAIN, 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 { BasicTxErrorType, EarningStatus, StakingTxErrorType, UnstakingStatus } from '@subwallet/extension-base/types';
 import { balanceFormatter, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
@@ -22,17 +22,8 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     cancelUnstake: true,
     withdraw: true,
     claimReward: false,
-    changeValidator: false
+    changeValidator: true
   };
-  constructor(state, chain) {
-    super(state, chain);
-    if (_SUPPORT_CHANGE_VALIDATOR_CHAIN.includes(chain)) {
-      this.availableMethod = {
-        ...this.availableMethod,
-        changeValidator: true
-      };
-    }
-  }
   /* Subscribe pool info */
 
   async subscribePoolInfo(callback) {

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

@@ -80,6 +80,7 @@ export declare class BittensorCache {
     get(): Promise<ValidatorResponse>;
     private fetchData;
     fetchApr(netuid: number): Promise<ValidatorAprResponse>;
+    fetchSubnetFeeRate(netuid: number): Promise<string>;
 }
 export declare const getAlphaToTaoRate: (substrateApi: _SubstrateApi, netuid: number) => Promise<string>;
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {

package/services/earning-service/handlers/native-staking/tao.js

@@ -10,6 +10,7 @@ import BaseParaStakingPoolHandler from '@subwallet/extension-base/services/earni
 import { BasicTxErrorType, EarningStatus, StakingTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
 import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
 import { fetchFromProxyService, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { fetchStaticCache } from '@subwallet/extension-base/utils/fetchStaticCache';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject, combineLatest } from 'rxjs';
@@ -44,21 +45,12 @@ export class BittensorCache {
   }
   async fetchData() {
     try {
-      const resp = await fetchFromProxyService(ProxyServiceRoute.BITTENSOR, '/dtao/validator/latest/v1?limit=100', {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json'
-        }
+      const fetchData = await fetchStaticCache('earning/dtao/validator.json', {
+        data: {}
       });
-      if (!resp.ok) {
-        console.error('Fetch bittensor delegates fail:', resp.status);
-        return this.cache || {
-          data: []
-        };
-      }
-      const rawData = await resp.json();
+      const validators = Object.values(fetchData.data);
       const data = {
-        data: rawData.data.filter(validator => parseFloat(validator.root_stake) > 0)
+        data: validators.filter(validator => parseFloat(validator.root_stake) > 0)
       };
       this.cache = data;
       this.promise = null;
@@ -71,7 +63,8 @@ export class BittensorCache {
             this.cache = newData;
           }
         }).catch(console.error);
-      }, 60 * 2000);
+      }, 60 * 1000); // Cache 1 minute
+
       return data;
     } catch (error) {
       console.error(error);
@@ -102,6 +95,23 @@ export class BittensorCache {
       };
     }
   }
+  async fetchSubnetFeeRate(netuid) {
+    try {
+      var _subnet$fee_rate;
+      const resp = await fetchFromProxyService(ProxyServiceRoute.BITTENSOR, '/subnet/latest/v1', {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      });
+      const rawData = await resp.json();
+      const subnet = rawData.data.find(item => item.netuid === netuid);
+      return (_subnet$fee_rate = subnet === null || subnet === void 0 ? void 0 : subnet.fee_rate) !== null && _subnet$fee_rate !== void 0 ? _subnet$fee_rate : '0.0005';
+    } catch (error) {
+      console.error(error);
+      return '0.0005'; // Default fee rate if fetch fails
+    }
+  }
 }
 
 // export async function fetchTaoDelegateState (address: string): Promise<RawDelegateState> {

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

@@ -3,10 +3,10 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
-import { EarningRewardHistoryItem, EarningRewardItem, EarningRewardJson, HandleYieldStepData, HandleYieldStepParams, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningSlippage, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldLeave, RequestYieldWithdrawal, ResponseEarlyValidateYield, SubmitChangeValidatorStaking, TransactionData, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolTarget, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { EarningRewardHistoryItem, EarningRewardItem, EarningRewardJson, HandleYieldStepData, HandleYieldStepParams, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestEarningImpact, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestYieldLeave, RequestYieldWithdrawal, ResponseEarlyValidateYield, SubmitChangeValidatorStaking, TransactionData, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolTarget, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
-import { EarningSlippageResult } from './handlers/native-staking/dtao';
+import { EarningImpactResult } from './handlers/native-staking/dtao';
 import { BasePoolHandler } from './handlers';
 export declare const fetchPoolsData: () => Promise<Record<string, YieldPoolInfo>>;
 export default class EarningService implements StoppableServiceInterface, PersistDataServiceInterface {
@@ -107,7 +107,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     handleYieldWithdraw(params: RequestYieldWithdrawal): Promise<TransactionData>;
     handleYieldCancelUnstake(params: RequestStakeCancelWithdrawal): Promise<TransactionData>;
     handleYieldClaimReward(params: RequestStakeClaimReward): Promise<TransactionData>;
-    yieldGetEarningSlippage(params: RequestEarningSlippage): Promise<EarningSlippageResult>;
+    yieldGetEarningImpact(params: RequestEarningImpact): Promise<EarningImpactResult>;
     handleYieldChangeValidator(params: SubmitChangeValidatorStaking): Promise<TransactionData>;
     resetWallet(): Promise<void>;
 }

package/services/earning-service/service.js

@@ -947,14 +947,14 @@ export default class EarningService {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
     }
   }
-  async yieldGetEarningSlippage(params) {
+  async yieldGetEarningImpact(params) {
     await this.eventService.waitChainReady;
     const {
       slug
     } = params;
     const handler = this.getPoolHandler(slug);
     if (handler) {
-      return handler.getEarningSlippage(params);
+      return handler.getEarningImpact(params);
     } else {
       return Promise.reject(new TransactionError(BasicTxErrorType.INTERNAL_ERROR));
     }

package/services/keyring-service/context/handlers/Json.js

@@ -154,7 +154,17 @@ export class AccountJsonHandler extends AccountBaseHandler {
           accountProxies,
           modifyPairs
         } = json;
-        const pairs = jsons.map(pair => keyring.createFromJson(pair));
+        const pairs = jsons.reduce((rs, pair) => {
+          try {
+            rs.push(keyring.createFromJson(pair));
+          } catch (e) {
+            console.error(e);
+          }
+          return rs;
+        }, []);
+        if (!(pairs !== null && pairs !== void 0 && pairs.length)) {
+          throw new Error(t('No valid accounts found to import'));
+        }
         const accountProxyMap = combineAccountsWithKeyPair(pairs, modifyPairs, accountProxies);
         const result = Object.values(accountProxyMap).map(proxy => {
           const rs = {
@@ -196,9 +206,24 @@ export class AccountJsonHandler extends AccountBaseHandler {
       try {
         const {
           accountProxies,
-          modifyPairs
+          modifyPairs: modifyPairsRestored
         } = file;
-        const pairs = jsons.map(pair => keyring.createFromJson(pair));
+        const modifyPairs = {};
+        const pairs = jsons.reduce((rs, pairJson) => {
+          try {
+            const pair = keyring.createFromJson(pairJson);
+            if (modifyPairsRestored !== null && modifyPairsRestored !== void 0 && modifyPairsRestored[pair.address]) {
+              modifyPairs[pair.address] = modifyPairsRestored[pair.address];
+            }
+            rs.push(pair);
+          } catch (e) {
+            console.error(e);
+          }
+          return rs;
+        }, []);
+        if (!(pairs !== null && pairs !== void 0 && pairs.length)) {
+          throw new Error(t('No valid accounts found to import'));
+        }
         const accountProxyMap = combineAccountsWithKeyPair(pairs, modifyPairs, accountProxies);
         const rawProxyIds = _proxyIds && _proxyIds.length ? _proxyIds : Object.keys(accountProxyMap);
         let _exists;

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -7,8 +7,12 @@ export default class MigrateTransactionHistoryBySymbol extends BaseMigrationJob
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
-        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
+        'bifrost_testnet-NATIVE-BNC': 'bifrost_testnet-NATIVE-BFC',
+        'energy_web_x_rococo-NATIVE-VT': 'energy_web_x_rococo-NATIVE-EWT',
+        'chainflip_dot-NATIVE-DOT': 'chainflip_dot-NATIVE-Unit',
+        'autonomys_taurus-NATIVE-AI3': 'autonomys_taurus-NATIVE-tAI3',
+        'fraxtal-NATIVE-frxETH': 'fraxtal-ERC20-frxETH-0xFC00000000000000000000000000000000000006',
+        'arbitrum_one-ERC20-USDT-0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9': 'arbitrum_one-ERC20-USD₮0-0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async ([oldSlug, newSlug], i) => {

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

@@ -6,8 +6,12 @@ export default class MigrateAssetSetting extends BaseMigrationJob {
   async run() {
     try {
       const changeSlugsMap = {
-        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
-        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
+        'bifrost_testnet-NATIVE-BNC': 'bifrost_testnet-NATIVE-BFC',
+        'energy_web_x_rococo-NATIVE-VT': 'energy_web_x_rococo-NATIVE-EWT',
+        'chainflip_dot-NATIVE-DOT': 'chainflip_dot-NATIVE-Unit',
+        'autonomys_taurus-NATIVE-AI3': 'autonomys_taurus-NATIVE-tAI3',
+        'fraxtal-NATIVE-frxETH': 'fraxtal-ERC20-frxETH-0xFC00000000000000000000000000000000000006',
+        'arbitrum_one-ERC20-USDT-0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9': 'arbitrum_one-ERC20-USD₮0-0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

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

@@ -54,8 +54,8 @@ export default {
   '1.1.33-01': MigrateLedgerAccountV2,
   '1.1.41-01': DeleteChainStaking,
   // '1.1.46-01': AutoEnableSomeTokens,
-  '1.2.28-01': MigrateAssetSetting,
-  '1.2.28-02': MigrateTransactionHistoryBySymbol,
+  '1.3.53-01': MigrateAssetSetting,
+  '1.3.53-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash,
   '1.2.13-01': ReloadMetadata,
   '1.2.32-01': MigratePairData,

package/services/swap-service/index.js

@@ -43,24 +43,30 @@ export class SwapService {
       ..._request,
       isSupportKyberVersion: true
     };
-    const quotes = await subwalletApiSdk.swapApi.fetchSwapQuoteData(request);
-    if (Array.isArray(quotes)) {
-      quotes.forEach(quoteData => {
-        if (!_SUPPORTED_SWAP_PROVIDERS.includes(quoteData.provider)) {
-          return;
-        }
-        if (!quoteData.quote || Object.keys(quoteData.quote).length === 0) {
-          return;
-        }
-        if (!('errorClass' in quoteData.quote)) {
-          availableQuotes.push({
-            quote: quoteData.quote
-          });
-        } else {
-          availableQuotes.push({
-            error: new SwapError(quoteData.quote.errorType, quoteData.quote.message)
-          });
-        }
+    try {
+      const quotes = await subwalletApiSdk.swapApi.fetchSwapQuoteData(request);
+      if (Array.isArray(quotes)) {
+        quotes.forEach(quoteData => {
+          if (!_SUPPORTED_SWAP_PROVIDERS.includes(quoteData.provider)) {
+            return;
+          }
+          if (!quoteData.quote || Object.keys(quoteData.quote).length === 0) {
+            return;
+          }
+          if (!('errorClass' in quoteData.quote)) {
+            availableQuotes.push({
+              quote: quoteData.quote
+            });
+          } else {
+            availableQuotes.push({
+              error: new SwapError(quoteData.quote.errorType, quoteData.quote.message)
+            });
+          }
+        });
+      }
+    } catch (err) {
+      availableQuotes.push({
+        error: new SwapError(SwapErrorType.ASSET_NOT_SUPPORTED)
       });
     }
     return availableQuotes;

package/services/transaction-service/utils.js

@@ -16,6 +16,21 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('explorer.subspace.network')) {
     return 'accounts';
   }
+  if (explorerLink.includes('edgscan.ink')) {
+    return 'accounts';
+  }
+  if (explorerLink.includes('devnet-explorer.mosaicchain.io')) {
+    return 'accounts';
+  }
+  if (explorerLink.includes('statescan.io')) {
+    return '#/accounts';
+  }
+  if (explorerLink.includes('explorer.joystream.org')) {
+    return '#/accounts';
+  }
+  if (explorerLink.includes('explorer.gen6.app')) {
+    return '#/accounts';
+  }
   if (explorerLink.includes('deeperscan.io')) {
     return 'account';
   }
@@ -25,24 +40,18 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('3dpscan.io')) {
     return 'account';
   }
-  if (explorerLink.includes('statescan.io')) {
-    return '#/accounts';
-  }
-  if (explorerLink.includes('explorer.gen6.app')) {
-    return '#/accounts';
-  }
-  if (explorerLink.includes('astral.autonomys')) {
-    return 'accounts';
+  if (explorerLink.includes('main.dentnet.io')) {
+    return 'account';
   }
   if (explorerLink.includes('taostats.io')) {
     return 'account';
   }
+  if (explorerLink.includes('uniquescan.io')) {
+    return 'account';
+  }
   if (explorerLink.includes('tonviewer.com')) {
     return '';
   }
-  if (explorerLink.includes('devnet-explorer.mosaicchain.io')) {
-    return 'accounts';
-  }
   if (explorerLink.includes('pdexmon.com')) {
     return 'holders';
   }
@@ -52,7 +61,7 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (_isPureEvmChain(chainInfo) || _isPureBitcoinChain(chainInfo)) {
     return 'tx';
   }
-  if (['moonbeam'].includes(chainInfo.slug)) {
+  if (['moonbeam', 'crabParachain'].includes(chainInfo.slug)) {
     return 'tx';
   }
   if (_isPureCardanoChain(chainInfo) || _isPureTonChain(chainInfo)) {
@@ -61,15 +70,15 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
     return 'transaction';
   }
-  if (['gen6_public'].includes(chainInfo.slug)) {
+  if (['gen6_public', 'joystream'].includes(chainInfo.slug)) {
     return '#/extrinsics';
   }
+  if (['edgeware'].includes(chainInfo.slug)) {
+    return 'extrinsics';
+  }
   if (['mosaicTest', 'polkadex'].includes(chainInfo.slug)) {
     return 'transactions';
   }
-  if (['autonomys'].includes(chainInfo.slug)) {
-    return 'extrinsics';
-  }
   const explorerLink = _getBlockExplorerFromChain(chainInfo);
   if (explorerLink && explorerLink.includes('statescan.io')) {
     return '#/extrinsics';

package/services/wallet-connect-service/constants.d.ts

@@ -3,6 +3,7 @@ import { SignClientTypes } from '@walletconnect/types';
 export declare const PROJECT_ID_EXTENSION = "6da34c0b48164d27681924dd9a46d6be";
 export declare const PROJECT_ID_MOBILE = "6da34c0b48164d27681924dd9a46d6be";
 export declare const RELAY_URL = "wss://relay.walletconnect.com";
+export declare const RELAY_FALLBACK_URL = "wss://relay.walletconnect.org";
 export declare const DEFAULT_WALLET_CONNECT_OPTIONS: SignClientTypes.Options;
 export declare const ALL_WALLET_CONNECT_EVENT: SignClientTypes.Event[];
 export declare const WALLET_CONNECT_SUPPORTED_METHODS: WalletConnectSigningMethod[];
@@ -10,3 +11,4 @@ export declare const WALLET_CONNECT_REQUEST_KEY = "wallet-connect";
 export declare const WALLET_CONNECT_EIP155_NAMESPACE = "eip155";
 export declare const WALLET_CONNECT_POLKADOT_NAMESPACE = "polkadot";
 export declare const WALLET_CONNECT_SUPPORT_NAMESPACES: string[];
+export declare const WALLET_CONNECT_SESSION_TIMEOUT = 20000;

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

@@ -6,6 +6,7 @@ import { targetIsMobile } from '@subwallet/extension-base/utils';
 export const PROJECT_ID_EXTENSION = '6da34c0b48164d27681924dd9a46d6be';
 export const PROJECT_ID_MOBILE = '6da34c0b48164d27681924dd9a46d6be';
 export const RELAY_URL = 'wss://relay.walletconnect.com';
+export const RELAY_FALLBACK_URL = 'wss://relay.walletconnect.org';
 export const DEFAULT_WALLET_CONNECT_OPTIONS = {
   logger: 'error',
   projectId: targetIsMobile ? PROJECT_ID_MOBILE : PROJECT_ID_EXTENSION,
@@ -22,4 +23,5 @@ export const WALLET_CONNECT_SUPPORTED_METHODS = [POLKADOT_SIGNING_METHODS.POLKAD
 export const WALLET_CONNECT_REQUEST_KEY = 'wallet-connect';
 export const WALLET_CONNECT_EIP155_NAMESPACE = 'eip155';
 export const WALLET_CONNECT_POLKADOT_NAMESPACE = 'polkadot';
-export const WALLET_CONNECT_SUPPORT_NAMESPACES = [WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_POLKADOT_NAMESPACE];
+export const WALLET_CONNECT_SUPPORT_NAMESPACES = [WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_POLKADOT_NAMESPACE];
+export const WALLET_CONNECT_SESSION_TIMEOUT = 20000; // 20 seconds

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

@@ -6,11 +6,12 @@ import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateF
 import { formatJsonRpcError } from '@json-rpc-tools/utils';
 import Eip155RequestHandler from '@subwallet/extension-base/services/wallet-connect-service/handler/Eip155RequestHandler';
 import { SWStorage } from '@subwallet/extension-base/storage';
+import { wait } from '@subwallet/extension-base/utils';
 import SignClient from '@walletconnect/sign-client';
 import { getInternalError, getSdkError } from '@walletconnect/utils';
 import { BehaviorSubject } from 'rxjs';
 import PolkadotRequestHandler from "./handler/PolkadotRequestHandler.js";
-import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
+import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, RELAY_FALLBACK_URL, RELAY_URL, WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_SESSION_TIMEOUT, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
 import { convertConnectRequest, convertNotSupportRequest, isSupportWalletConnectChain } from "./helpers.js";
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from "./types.js";
 const storage = SWStorage.instance;
@@ -116,7 +117,19 @@ export default class WalletConnectService {
   async initClient(force) {
     _classPrivateFieldLooseBase(this, _removeListener)[_removeListener]();
     if (force || (await this.haveData())) {
-      _classPrivateFieldLooseBase(this, _client)[_client] = await SignClient.init(_classPrivateFieldLooseBase(this, _option)[_option]);
+      try {
+        _classPrivateFieldLooseBase(this, _client)[_client] = await SignClient.init(_classPrivateFieldLooseBase(this, _option)[_option]);
+      } catch (e) {
+        if (_classPrivateFieldLooseBase(this, _option)[_option].relayUrl === RELAY_URL) {
+          _classPrivateFieldLooseBase(this, _option)[_option] = {
+            ..._classPrivateFieldLooseBase(this, _option)[_option],
+            relayUrl: RELAY_FALLBACK_URL
+          };
+          _classPrivateFieldLooseBase(this, _client)[_client] = await SignClient.init(_classPrivateFieldLooseBase(this, _option)[_option]);
+        } else {
+          throw e;
+        }
+      }
     }
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
     _classPrivateFieldLooseBase(this, _createListener)[_createListener]();
@@ -139,17 +152,21 @@ export default class WalletConnectService {
     await this.initClient();
   }
   async connect(uri) {
-    var _classPrivateFieldLoo3;
-    if (!(await this.haveData())) {
+    var _classPrivateFieldLoo3, _classPrivateFieldLoo4;
+    if (!(await this.haveData()) || !((_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(this, _client)[_client]) !== null && _classPrivateFieldLoo3 !== void 0 && _classPrivateFieldLoo3.core.relayer.connected)) {
       await this.initClient(true);
     }
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo3 === void 0 ? void 0 : _classPrivateFieldLoo3.pair({
+
+    // The purpose of designing a timeout for pairing is to prevent the promise from not being resolved if there are issues during the pairing process.
+    await Promise.race([(_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.pair({
       uri
-    }));
+    }), wait(WALLET_CONNECT_SESSION_TIMEOUT).then(() => {
+      throw new Error(getInternalError('EXPIRED').message);
+    })]);
   }
   async approveSession(result) {
-    var _classPrivateFieldLoo4;
+    var _classPrivateFieldLoo5;
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
     Object.entries(result.namespaces).forEach(([namespace, {
       methods
@@ -157,32 +174,32 @@ export default class WalletConnectService {
       methods = [...methods, ...this.findMethodsMissing(WALLET_CONNECT_EIP155_NAMESPACE === namespace ? methodEVMRequire : methodDOTRequire, methods)];
       result.namespaces[namespace].methods = methods;
     });
-    await ((_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.approve(result));
+    await ((_classPrivateFieldLoo5 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo5 === void 0 ? void 0 : _classPrivateFieldLoo5.approve(result));
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
   async rejectSession(id) {
-    var _classPrivateFieldLoo5;
+    var _classPrivateFieldLoo6;
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo5 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo5 === void 0 ? void 0 : _classPrivateFieldLoo5.reject({
+    await ((_classPrivateFieldLoo6 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo6 === void 0 ? void 0 : _classPrivateFieldLoo6.reject({
       id: id,
       reason: getSdkError('USER_REJECTED')
     }));
   }
   async responseRequest(response) {
-    var _classPrivateFieldLoo6;
+    var _classPrivateFieldLoo7;
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
-    await ((_classPrivateFieldLoo6 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo6 === void 0 ? void 0 : _classPrivateFieldLoo6.respond(response));
+    await ((_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.respond(response));
   }
   async resetWallet(resetAll) {
-    var _classPrivateFieldLoo7, _classPrivateFieldLoo9, _classPrivateFieldLoo11;
+    var _classPrivateFieldLoo8, _classPrivateFieldLoo10, _classPrivateFieldLoo12;
     _classPrivateFieldLooseBase(this, _removeListener)[_removeListener]();
 
     // Disconnect session
-    const sessions = ((_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.session.values) || [];
+    const sessions = ((_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.session.values) || [];
     for (const session of sessions) {
       try {
-        var _classPrivateFieldLoo8;
-        await ((_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.disconnect({
+        var _classPrivateFieldLoo9;
+        await ((_classPrivateFieldLoo9 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.disconnect({
           topic: session.topic,
           reason: getSdkError('USER_DISCONNECTED')
         }));
@@ -192,11 +209,11 @@ export default class WalletConnectService {
     }
 
     // Disconnect pair
-    const pairs = ((_classPrivateFieldLoo9 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.pairing.values) || [];
+    const pairs = ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.pairing.values) || [];
     for (const pair of pairs) {
       try {
-        var _classPrivateFieldLoo10;
-        await ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.disconnect({
+        var _classPrivateFieldLoo11;
+        await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.disconnect({
           topic: pair.topic,
           reason: getSdkError('USER_DISCONNECTED')
         }));
@@ -204,12 +221,12 @@ export default class WalletConnectService {
         console.error(e);
       }
     }
-    const keys = (await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.getKeys())) || [];
+    const keys = (await ((_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));
     for (const key of deleteKeys) {
       try {
-        var _classPrivateFieldLoo12;
-        await ((_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.removeItem(key));
+        var _classPrivateFieldLoo13;
+        await ((_classPrivateFieldLoo13 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.core.storage.removeItem(key));
       } catch (e) {
         console.error(e);
       }
@@ -218,8 +235,8 @@ export default class WalletConnectService {
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
-    var _classPrivateFieldLoo13;
-    await ((_classPrivateFieldLoo13 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.disconnect({
+    var _classPrivateFieldLoo14;
+    await ((_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.disconnect({
       topic: topic,
       reason: getSdkError('USER_DISCONNECTED')
     }));
@@ -326,18 +343,18 @@ async function _onPingReply2({
   }
 }
 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', _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));
+  var _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20;
+  (_classPrivateFieldLoo15 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_proposal', _classPrivateFieldLooseBase(this, _onSessionProposal)[_onSessionProposal].bind(this));
+  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_request', _classPrivateFieldLooseBase(this, _onSessionRequest)[_onSessionRequest].bind(this));
+  (_classPrivateFieldLoo17 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_ping', _classPrivateFieldLooseBase(this, _onPingReply)[_onPingReply].bind(this));
+  (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_event', data => console.log('event', data));
+  (_classPrivateFieldLoo19 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_update', data => console.log('update', data));
+  (_classPrivateFieldLoo20 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.on('session_delete', _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions].bind(this));
 }
 function _removeListener2() {
   ALL_WALLET_CONNECT_EVENT.forEach(event => {
-    var _classPrivateFieldLoo20;
-    (_classPrivateFieldLoo20 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.removeAllListeners(event);
+    var _classPrivateFieldLoo21;
+    (_classPrivateFieldLoo21 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo21 === void 0 ? void 0 : _classPrivateFieldLoo21.removeAllListeners(event);
   });
 }
 function _checkClient2() {