@subwallet/extension-base 1.1.53-beta.0 → 1.1.54-0

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

@@ -281,23 +281,11 @@ class RelayNativeStakingPoolHandler extends _base.default {
     if (!poolInfo || !poolInfo.statistic) {
       return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
     }
-    const [_era, _activeEraInfo] = await Promise.all([chainApi.api.query.staking.currentEra(), chainApi.api.query.staking.activeEra()]);
+    const _era = await chainApi.api.query.staking.currentEra();
     const currentEra = _era.toString();
-    const activeEraInfo = _activeEraInfo.toPrimitive();
-    const activeEra = activeEraInfo.index;
     const allValidators = [];
     const validatorInfoList = [];
-    const maxEraRewardPointsEras = _constants2.MaxEraRewardPointsEras;
-    const endEraForPoints = parseInt(activeEra) - 1;
-    let startEraForPoints = endEraForPoints - maxEraRewardPointsEras + 1;
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators, ..._eraRewardPoints] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries(), chainApi.api.query.staking.erasRewardPoints.multi([...Array(maxEraRewardPointsEras).keys()].map(i => i + startEraForPoints))]);
-    const eraRewardMap = {};
-    for (const item of _eraRewardPoints[0]) {
-      eraRewardMap[startEraForPoints] = item.toHuman();
-      startEraForPoints++;
-    }
-    const validatorPointsMap = (0, _utils.getValidatorPointsMap)(eraRewardMap);
-    const topValidatorList = (0, _utils.getTopValidatorByPoints)(validatorPointsMap);
+    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), 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()]);
 
     // filter blocked validators
     const validators = _validators;
@@ -328,11 +316,6 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const rawValidatorStat = item[1].toHuman();
       const validatorAddress = rawValidatorInfo[1];
       if (!blockValidatorList.includes(validatorAddress)) {
-        var _validatorPointsMap$v;
-        let isTopQuartile = false;
-        if (topValidatorList.includes(validatorAddress)) {
-          isTopQuartile = true;
-        }
         const rawTotalStake = rawValidatorStat.total;
         const rawOwnStake = rawValidatorStat.own;
         const bnTotalStake = new _util.BN(rawTotalStake.replaceAll(',', ''));
@@ -357,9 +340,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
           blocked: false,
           isVerified: false,
           minBond,
-          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded),
-          eraRewardPoint: ((_validatorPointsMap$v = validatorPointsMap[validatorAddress]) !== null && _validatorPointsMap$v !== void 0 ? _validatorPointsMap$v : _util.BN_ZERO).toString(),
-          topQuartile: isTopQuartile
+          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
         });
       }
     }

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

@@ -646,18 +646,6 @@ class TransactionService {
           };
           break;
         }
-      case _KoniTypes.ExtrinsicType.SWAP:
-        {
-          const data = (0, _utils3.parseTransactionData)(transaction.data); // TODO: switch by provider
-          const inputAsset = this.state.chainService.getAssetBySlug(data.quote.pair.from);
-          historyItem.amount = {
-            value: data.quote.fromAmount,
-            symbol: (0, _utils._getAssetSymbol)(inputAsset),
-            decimals: (0, _utils._getAssetDecimals)(inputAsset)
-          };
-          historyItem.additionalInfo = data;
-          break;
-        }
       case _KoniTypes.ExtrinsicType.UNKNOWN:
         break;
     }
@@ -754,14 +742,6 @@ class TransactionService {
       }
     } else if ([_KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.STAKING_UNBOND, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
       this.state.eventService.emit('transaction.submitStaking', transaction.chain);
-    } else if (transaction.extrinsicType === _KoniTypes.ExtrinsicType.SWAP) {
-      const inputData = (0, _utils3.parseTransactionData)(transaction.data);
-      const toAssetSlug = inputData.quote.pair.to;
-
-      // todo: consider async
-      this.state.chainService.updateAssetSetting(toAssetSlug, {
-        visible: true
-      }, true).catch(console.error);
     }
   }
   onSuccess(_ref4) {

package/cjs/services/transaction-service/utils.js

@@ -3,11 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getChainflipExplorerLink = getChainflipExplorerLink;
 exports.getExplorerLink = getExplorerLink;
 exports.parseTransactionData = parseTransactionData;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -55,8 +53,4 @@ function getExplorerLink(chainInfo, value, type) {
     return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}${route}/${value}`;
   }
   return undefined;
-}
-function getChainflipExplorerLink(data, chainInfo) {
-  const chainflipDomain = (0, _utils._isChainTestNet)(chainInfo) ? _utils2.CHAIN_FLIP_TESTNET_EXPLORER : _utils2.CHAIN_FLIP_MAINNET_EXPLORER;
-  return `${chainflipDomain}/channels/${data.depositChannelId}`;
 }

package/cjs/types/fee/index.js

@@ -1,27 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _evm = require("./evm");
-Object.keys(_evm).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _evm[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _evm[key];
-    }
-  });
-});
-var _fee = require("./fee");
-Object.keys(_fee).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fee[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _fee[key];
-    }
-  });
-});
+"use strict";

package/cjs/utils/index.js

@@ -236,18 +236,6 @@ Object.keys(_fetchEvmChainInfo).forEach(function (key) {
     }
   });
 });
-var _swap = require("./swap");
-Object.keys(_swap).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _swap[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _swap[key];
-    }
-  });
-});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/koni/api/staking/bonding/utils.d.ts

@@ -1,7 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
-import { EarningStatus, PalletStakingEraRewardPoints, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { EarningStatus, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import BigNumber from 'bignumber.js';
 import { ApiPromise } from '@polkadot/api';
 import { Codec } from '@polkadot/types/types';
@@ -158,8 +158,6 @@ export declare function getEarningStatusByNominations(bnTotalActiveStake: BN, no
 export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";
 export declare function getAvgValidatorEraReward(supportedDays: number, eraRewardHistory: Codec[]): BigNumber;
 export declare function getSupportedDaysByHistoryDepth(erasPerDay: number, maxSupportedEras: number): 15 | 30;
-export declare function getValidatorPointsMap(eraRewardMap: Record<string, PalletStakingEraRewardPoints>): Record<string, BigNumber>;
-export declare function getTopValidatorByPoints(validatorPointsList: Record<string, BigNumber>): string[];
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;
 export declare const getMaxValidatorErrorMessage: (chainInfo: _ChainInfo, max: number) => string;
 export declare const getExistUnstakeErrorMessage: (chain: string, type?: StakingType, isStakeMore?: boolean) => string;

package/koni/api/staking/bonding/utils.js

@@ -197,13 +197,13 @@ export function getYieldAvailableActionsByPosition(yieldPosition, yieldPoolInfo,
   const result = [];
   if ([YieldPoolType.NATIVE_STAKING, YieldPoolType.NOMINATION_POOL].includes(yieldPoolInfo.type)) {
     result.push(YieldAction.STAKE);
-    const bnActiveStake = new BigNumber(yieldPosition.activeStake);
-    if (yieldPosition.activeStake && bnActiveStake.gt('0')) {
+    const bnActiveStake = new BN(yieldPosition.activeStake);
+    if (yieldPosition.activeStake && bnActiveStake.gt(BN_ZERO)) {
       result.push(YieldAction.UNSTAKE);
       const isAstarNetwork = _STAKING_CHAIN_GROUP.astar.includes(yieldPosition.chain);
       const isAmplitudeNetwork = _STAKING_CHAIN_GROUP.amplitude.includes(yieldPosition.chain);
-      const bnUnclaimedReward = new BigNumber(unclaimedReward || '0');
-      if ((yieldPosition.type === YieldPoolType.NOMINATION_POOL || isAmplitudeNetwork) && bnUnclaimedReward.gt('0') || isAstarNetwork) {
+      const bnUnclaimedReward = new BN(unclaimedReward || '0');
+      if ((yieldPosition.type === YieldPoolType.NOMINATION_POOL || isAmplitudeNetwork) && bnUnclaimedReward.gt(BN_ZERO) || isAstarNetwork) {
         result.push(YieldAction.CLAIM_REWARD);
       }
     }
@@ -216,8 +216,8 @@ export function getYieldAvailableActionsByPosition(yieldPosition, yieldPoolInfo,
     }
   } else if (yieldPoolInfo.type === YieldPoolType.LIQUID_STAKING) {
     result.push(YieldAction.START_EARNING);
-    const activeBalance = new BigNumber(yieldPosition.activeStake);
-    if (activeBalance.gt('0')) {
+    const activeBalance = new BN(yieldPosition.activeStake || '0');
+    if (activeBalance.gt(BN_ZERO)) {
       result.push(YieldAction.UNSTAKE);
     }
     const hasWithdrawal = yieldPosition.unstakings.some(unstakingInfo => unstakingInfo.status === UnstakingStatus.CLAIMABLE);
@@ -350,32 +350,6 @@ export function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras) {
     return 15;
   }
 }
-export function getValidatorPointsMap(eraRewardMap) {
-  // mapping store validator and totalPoints
-  const validatorTotalPointsMap = {};
-  Object.values(eraRewardMap).forEach(info => {
-    const individual = info.individual;
-    Object.entries(individual).forEach(([validator, rawPoints]) => {
-      const points = rawPoints.replaceAll(',', '');
-      if (!validatorTotalPointsMap[validator]) {
-        validatorTotalPointsMap[validator] = new BigNumber(points);
-      } else {
-        validatorTotalPointsMap[validator] = validatorTotalPointsMap[validator].plus(points);
-      }
-    });
-  });
-  return validatorTotalPointsMap;
-}
-export function getTopValidatorByPoints(validatorPointsList) {
-  const sortValidatorPointsList = Object.fromEntries(Object.entries(validatorPointsList).sort((a, b) => a[1].minus(b[1]).toNumber()).reverse());
-
-  // keep 50% first validator
-  const entries = Object.entries(sortValidatorPointsList);
-  const endIndex = Math.ceil(entries.length / 2);
-  const top50PercentEntries = entries.slice(0, endIndex);
-  const top50PercentRecord = Object.fromEntries(top50PercentEntries);
-  return Object.keys(top50PercentRecord);
-}
 export const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = _getChainNativeTokenBasicInfo(chainInfo);
   const number = formatNumber(bnMinStake.toString(), tokenInfo.decimals || 0, balanceFormatter);

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

@@ -237,10 +237,5 @@ export default class KoniExtension {
     private completeCampaignBanner;
     private subscribeBuyTokens;
     private subscribeBuyServices;
-    private subscribeSwapPairs;
-    private handleSwapRequest;
-    private getLatestSwapQuote;
-    private validateSwapProcess;
-    private handleSwapStep;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -3943,78 +3943,6 @@ export default class KoniExtension {
 
   /* Buy service */
 
-  /* Swap service */
-  async subscribeSwapPairs(id, port) {
-    const cb = createSubscription(id, port);
-    let ready = false;
-    await this.#koniState.swapService.waitForStarted();
-    const callback = rs => {
-      if (ready) {
-        cb(rs);
-      }
-    };
-    const subscription = this.#koniState.swapService.subscribeSwapPairs(callback);
-    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
-    });
-    ready = true;
-    return this.#koniState.swapService.getSwapPairs();
-  }
-  async handleSwapRequest(request) {
-    return this.#koniState.swapService.handleSwapRequest(request);
-  }
-  async getLatestSwapQuote(swapRequest) {
-    return this.#koniState.swapService.getLatestQuotes(swapRequest);
-  }
-  async validateSwapProcess(params) {
-    return this.#koniState.swapService.validateSwapProcess(params);
-  }
-  async handleSwapStep(inputData) {
-    const {
-      address,
-      process,
-      quote,
-      recipient
-    } = inputData;
-    if (!quote || !address || !process) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
-    }
-    const isLastStep = inputData.currentStep + 1 === process.steps.length;
-    const swapValidations = await this.#koniState.swapService.validateSwapProcess({
-      address,
-      process,
-      selectedQuote: quote,
-      recipient
-    });
-    if (swapValidations.length > 0) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(swapValidations);
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const {
-      chainType,
-      extrinsic,
-      extrinsicType,
-      transferNativeAmount,
-      txChain,
-      txData
-    } = await this.#koniState.swapService.handleSwapProcess(inputData);
-    return await this.#koniState.transactionService.handleTransaction({
-      address,
-      chain: txChain,
-      transaction: extrinsic,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      data: txData,
-      extrinsicType,
-      // change this depends on step
-      chainType,
-      resolveOnDone: !isLastStep,
-      transferNativeAmount
-    });
-  }
-  /* Swap service */
-
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -4544,19 +4472,6 @@ export default class KoniExtension {
       case 'pri(database.exportJson)':
         return this.#koniState.dbService.getExportJson();
       /* Database */
-
-      /* Swap service */
-      case 'pri(swapService.subscribePairs)':
-        return this.subscribeSwapPairs(id, port);
-      case 'pri(swapService.handleSwapRequest)':
-        return this.handleSwapRequest(request);
-      case 'pri(swapService.getLatestQuote)':
-        return this.getLatestSwapQuote(request);
-      case 'pri(swapService.validateSwapProcess)':
-        return this.validateSwapProcess(request);
-      case 'pri(swapService.handleSwapStep)':
-        return this.handleSwapStep(request);
-      /* Swap service */
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

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

@@ -21,7 +21,6 @@ import { AuthUrls, MetaRequest, SignRequest } from '@subwallet/extension-base/se
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
-import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
@@ -72,7 +71,6 @@ export default class KoniState {
     readonly buyService: BuyService;
     readonly earningService: EarningService;
     readonly feeService: FeeService;
-    readonly swapService: SwapService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;

package/koni/background/handlers/State.js

@@ -28,11 +28,10 @@ import SettingService from '@subwallet/extension-base/services/setting-service/S
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
-import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, TARGET_ENV, wait } from '@subwallet/extension-base/utils';
+import { isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -105,7 +104,6 @@ export default class KoniState {
     this.transactionService = new TransactionService(this);
     this.earningService = new EarningService(this);
     this.feeService = new FeeService(this);
-    this.swapService = new SwapService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -228,7 +226,6 @@ export default class KoniState {
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
     await this.earningService.init();
-    await this.swapService.init();
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
@@ -1204,34 +1201,17 @@ export default class KoniState {
       maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
       data: transactionParams.data
     };
-    const getTransactionGas = async () => {
-      try {
-        transaction.gas = await web3.eth.estimateGas({
-          ...transaction
-        });
-      } catch (e) {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
-      }
-    };
 
     // Calculate transaction data
     try {
-      await Promise.race([getTransactionGas(), wait(3000).then(async () => {
-        if (!transaction.gas) {
-          await this.chainService.initSingleApi(networkKey);
-          await getTransactionGas();
-        }
-      })]);
+      transaction.gas = await web3.eth.estimateGas({
+        ...transaction
+      });
     } catch (e) {
       // @ts-ignore
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
-    if (!transaction.gas) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS);
-    }
     let estimateGas;
 
     // TODO: Review, If not override, transaction maybe fail because fee too low
@@ -1416,7 +1396,7 @@ export default class KoniState {
     // Stopping services
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1448,7 +1428,7 @@ export default class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start()]);
 
     // Complete starting
     starting.resolve();

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.53-beta.0",
+  "version": "1.1.54-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -44,11 +44,6 @@
       "require": "./cjs/background/errors/ProviderError.js",
       "default": "./background/errors/ProviderError.js"
     },
-    "./background/errors/SwapError": {
-      "types": "./background/errors/SwapError.d.ts",
-      "require": "./cjs/background/errors/SwapError.js",
-      "default": "./background/errors/SwapError.js"
-    },
     "./background/errors/SWError": {
       "types": "./background/errors/SWError.d.ts",
       "require": "./cjs/background/errors/SWError.js",
@@ -1360,31 +1355,6 @@
       "require": "./cjs/services/subscan-service/types.js",
       "default": "./services/subscan-service/types.js"
     },
-    "./services/swap-service": {
-      "types": "./services/swap-service/index.d.ts",
-      "require": "./cjs/services/swap-service/index.js",
-      "default": "./services/swap-service/index.js"
-    },
-    "./services/swap-service/handler/base-handler": {
-      "types": "./services/swap-service/handler/base-handler.d.ts",
-      "require": "./cjs/services/swap-service/handler/base-handler.js",
-      "default": "./services/swap-service/handler/base-handler.js"
-    },
-    "./services/swap-service/handler/chainflip-handler": {
-      "types": "./services/swap-service/handler/chainflip-handler.d.ts",
-      "require": "./cjs/services/swap-service/handler/chainflip-handler.js",
-      "default": "./services/swap-service/handler/chainflip-handler.js"
-    },
-    "./services/swap-service/handler/hydradx-handler": {
-      "types": "./services/swap-service/handler/hydradx-handler.d.ts",
-      "require": "./cjs/services/swap-service/handler/hydradx-handler.js",
-      "default": "./services/swap-service/handler/hydradx-handler.js"
-    },
-    "./services/swap-service/utils": {
-      "types": "./services/swap-service/utils.d.ts",
-      "require": "./cjs/services/swap-service/utils.js",
-      "default": "./services/swap-service/utils.js"
-    },
     "./services/transaction-service": {
       "types": "./services/transaction-service/index.d.ts",
       "require": "./cjs/services/transaction-service/index.js",
@@ -1590,31 +1560,11 @@
       "require": "./cjs/types/fee/index.js",
       "default": "./types/fee/index.js"
     },
-    "./types/fee/evm": {
-      "types": "./types/fee/evm.d.ts",
-      "require": "./cjs/types/fee/evm.js",
-      "default": "./types/fee/evm.js"
-    },
-    "./types/fee/fee": {
-      "types": "./types/fee/fee.d.ts",
-      "require": "./cjs/types/fee/fee.js",
-      "default": "./types/fee/fee.js"
-    },
     "./types/ordinal": {
       "types": "./types/ordinal.d.ts",
       "require": "./cjs/types/ordinal.js",
       "default": "./types/ordinal.js"
     },
-    "./types/service-base": {
-      "types": "./types/service-base.d.ts",
-      "require": "./cjs/types/service-base.js",
-      "default": "./types/service-base.js"
-    },
-    "./types/swap": {
-      "types": "./types/swap/index.d.ts",
-      "require": "./cjs/types/swap/index.js",
-      "default": "./types/swap/index.js"
-    },
     "./types/transaction": {
       "types": "./types/transaction.d.ts",
       "require": "./cjs/types/transaction.js",
@@ -1831,11 +1781,6 @@
     "./utils/staticData/crowdloanFunds.json": "./utils/staticData/crowdloanFunds.json",
     "./utils/staticData/marketingCampaigns.json": "./utils/staticData/marketingCampaigns.json",
     "./utils/staticData/termAndCondition.json": "./utils/staticData/termAndCondition.json",
-    "./utils/swap": {
-      "types": "./utils/swap.d.ts",
-      "require": "./cjs/utils/swap.js",
-      "default": "./utils/swap.js"
-    },
     "./utils/translate": {
       "types": "./utils/translate.d.ts",
       "require": "./cjs/utils/translate.js",
@@ -1846,12 +1791,10 @@
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
-    "@chainflip/sdk": "^1.3.0",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^1.2.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
@@ -1873,11 +1816,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.55-beta.3",
-    "@subwallet/extension-base": "^1.1.53-0",
-    "@subwallet/extension-chains": "^1.1.53-0",
-    "@subwallet/extension-dapp": "^1.1.53-0",
-    "@subwallet/extension-inject": "^1.1.53-0",
+    "@subwallet/chain-list": "0.2.54",
+    "@subwallet/extension-base": "^1.1.54-0",
+    "@subwallet/extension-chains": "^1.1.54-0",
+    "@subwallet/extension-dapp": "^1.1.54-0",
+    "@subwallet/extension-inject": "^1.1.54-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1914,4 +1857,4 @@
     "web3-eth-contract": "^1.10.0",
     "web3-utils": "^1.10.0"
   }
-}
+}

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

package/services/balance-service/index.js

@@ -185,8 +185,7 @@ export class BalanceService {
       const chainInfoMap = this.state.chainService.getChainInfoMap();
       const evmApiMap = this.state.chainService.getEvmApiMap();
       const substrateApiMap = this.state.chainService.getSubstrateApiMap();
-      let unsub = noop;
-      unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
+      const unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, result => {
         const rs = result[0];
         if (rs.tokenSlug === tSlug) {
           hasError = false;
@@ -198,17 +197,15 @@ export class BalanceService {
           if (callback) {
             callback(balance);
           } else {
-            var _unsub;
             // Auto unsubscribe if no callback
-            (_unsub = unsub) === null || _unsub === void 0 ? void 0 : _unsub();
+            unsub();
           }
           resolve([unsub, balance]);
         }
       });
       setTimeout(() => {
         if (hasError) {
-          var _unsub2;
-          (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
+          unsub();
           reject(new Error(t('Failed to get balance. Please check your internet connection or change your network endpoint')));
         }
       }, 9999);

package/services/base/types.d.ts

@@ -1,4 +1,3 @@
-import { OptimalProcessParams, OptimalProcessResult } from '@subwallet/extension-base/types/service-base';
 import { PromiseHandler } from '@subwallet/extension-base/utils/promise';
 export declare enum ServiceStatus {
     NOT_INITIALIZED = "not_initialized",
@@ -33,6 +32,3 @@ export interface CronServiceInterface {
     startCron: () => Promise<void>;
     stopCron: () => Promise<void>;
 }
-export interface ServiceWithProcessInterface {
-    generateOptimalProcess(params: OptimalProcessParams): Promise<OptimalProcessResult>;
-}

package/services/chain-service/constants.js

@@ -28,7 +28,7 @@ export const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
   statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates