@subwallet/extension-base 1.1.33-beta.1 → 1.1.34-0

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

@@ -18,12 +18,10 @@ var _campaignService = _interopRequireDefault(require("@subwallet/extension-base
 var _chainService = require("@subwallet/extension-base/services/chain-service");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _service = _interopRequireDefault(require("@subwallet/extension-base/services/earning-service/service"));
 var _eventService = require("@subwallet/extension-base/services/event-service");
 var _historyService = require("@subwallet/extension-base/services/history-service");
 var _keyringService = require("@subwallet/extension-base/services/keyring-service");
 var _migrationService = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service"));
-var _mintCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mint-campaign-service"));
 var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
 var _requestService = _interopRequireDefault(require("@subwallet/extension-base/services/request-service"));
@@ -102,13 +100,11 @@ class KoniState {
     this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new _balanceService.BalanceService(this);
     this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService, this.subscanService);
-    this.mintCampaignService = new _mintCampaignService.default(this);
+    this.transactionService = new _transactionService.default(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
     this.walletConnectService = new _walletConnectService.default(this, this.requestService);
     this.migrationService = new _migrationService.default(this, this.eventService);
     this.campaignService = new _campaignService.default(this);
     this.buyService = new _buyService.default(this);
-    this.transactionService = new _transactionService.default(this);
-    this.earningService = new _service.default(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -230,7 +226,6 @@ class KoniState {
     await this.migrationService.run();
     this.campaignService.init();
     this.eventService.emit('chain.ready', true);
-    await this.earningService.init();
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
@@ -253,13 +248,20 @@ class KoniState {
   }
   async startSubscription() {
     await this.eventService.waitKeyringReady;
-    await this.eventService.waitAssetReady;
     this.dbService.subscribeChainStakingMetadata([], data => {
       this.chainStakingMetadataSubject.next(data);
     });
     this.dbService.subscribeMantaPayConfig(_constants2._DEFAULT_MANTA_ZK_CHAIN, data => {
       this.mantaPayConfigSubject.next(data);
     });
+    let unsub;
+    this.keyringService.accountSubject.subscribe(accounts => {
+      // TODO: improve this
+      unsub && unsub.unsubscribe();
+      unsub = this.dbService.subscribeNominatorMetadata(Object.keys(accounts), data => {
+        this.stakingNominatorMetadataSubject.next(data);
+      });
+    });
   }
   onReady() {
     // Todo: Need optimize in the future to, only run important services onetime to save resources
@@ -1429,7 +1431,7 @@ 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.earningService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1462,7 +1464,7 @@ class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.earningService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start()]);
 
     // Complete starting
     starting.resolve();
@@ -1564,7 +1566,7 @@ class KoniState {
     return await this.cron.reloadNft();
   }
   async reloadStaking() {
-    await this.earningService.reloadEarning(true);
+    await this.subscription.reloadStaking();
     return true;
   }
   async reloadBalance() {
@@ -1763,13 +1765,5 @@ class KoniState {
       specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0')
     };
   }
-  getCrowdloanContributions(_ref11) {
-    let {
-      address,
-      page,
-      relayChain
-    } = _ref11;
-    return this.subscanService.getCrowdloanContributions(relayChain, address, page);
-  }
 }
 exports.default = KoniState;

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

@@ -72,8 +72,7 @@ function handlers(_ref, port) {
     (0, _util.assert)(port, 'Port has been disconnected');
     port.postMessage({
       id,
-      response,
-      sender: 'BACKGROUND'
+      response
     });
   }).catch(error => {
     console.error(error);
@@ -85,8 +84,7 @@ function handlers(_ref, port) {
         error: error.message,
         errorCode: error.code,
         errorData: error.data,
-        id,
-        sender: 'BACKGROUND'
+        id
       });
     }
   });

package/cjs/koni/background/subscription.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.KoniSubscription = void 0;
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _staking = require("@subwallet/extension-base/koni/api/staking");
+var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
+var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _balance = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/balance");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
@@ -19,8 +21,8 @@ class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
     balance: undefined,
-    yieldPoolStats: undefined,
-    yieldPosition: undefined
+    stakingOnChain: undefined,
+    essentialChainStakingMetadata: undefined
   };
   constructor(state, dbService) {
     this.dbService = dbService;
@@ -47,6 +49,10 @@ class KoniSubscription {
       this.subscriptionMap.crowdloan();
       delete this.subscriptionMap.crowdloan;
     }
+    if (this.subscriptionMap.stakingOnChain) {
+      this.subscriptionMap.stakingOnChain();
+      delete this.subscriptionMap.stakingOnChain;
+    }
   }
   async start() {
     var _this$state$keyringSe;
@@ -55,6 +61,7 @@ class KoniSubscription {
     if (currentAddress) {
       this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
+      this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     }
     this.eventHandler = (events, eventTypes) => {
       var _serviceInfo$currentA;
@@ -69,6 +76,7 @@ class KoniSubscription {
       }
       this.subscribeBalances(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
       this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
+      this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
     };
     this.state.eventService.onLazy(this.eventHandler.bind(this));
   }
@@ -98,6 +106,55 @@ class KoniSubscription {
       this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(console.error);
   }
+  subscribeStakingOnChain(address, substrateApiMap, onlyRunOnFirstTime) {
+    this.state.resetStaking(address);
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
+    this.updateSubscription('essentialChainStakingMetadata', this.initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime)); // TODO: might not need to re-subscribe on changing account
+  }
+
+  initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
+    const stakingCallback = (networkKey, rs) => {
+      this.state.setStakingItem(networkKey, rs);
+    };
+    const nominatorStateCallback = nominatorMetadata => {
+      this.state.updateStakingNominatorMetadata(nominatorMetadata);
+    };
+    const unsub = (0, _staking.stakingOnChainApi)(addresses, substrateApiMap, this.state.getActiveChainInfoMap(), stakingCallback, nominatorStateCallback);
+    if (onlyRunOnFirstTime) {
+      unsub && unsub();
+      return;
+    }
+    return () => {
+      unsub && unsub();
+    };
+  }
+  initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime) {
+    const unsub = (0, _bonding.subscribeEssentialChainStakingMetadata)(substrateApiMap, this.state.getActiveChainInfoMap(), (networkKey, rs) => {
+      this.state.updateChainStakingMetadata(rs, {
+        era: rs.era,
+        minStake: rs.minStake,
+        maxValidatorPerNominator: rs.maxValidatorPerNominator,
+        // temporary fix for Astar, there's no limit for now
+        maxWithdrawalRequestPerValidator: rs.maxWithdrawalRequestPerValidator,
+        // by default
+        allowCancelUnstaking: rs.allowCancelUnstaking,
+        unstakingPeriod: rs.unstakingPeriod,
+        expectedReturn: rs.expectedReturn,
+        inflation: rs.inflation
+      });
+    });
+    if (onlyRunOnFirstTime) {
+      unsub && unsub();
+      return;
+    }
+    return () => {
+      unsub && unsub();
+    };
+  }
   initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
     const filteredChainInfoMap = {};
     Object.values(chainStateMap).forEach(chainState => {
@@ -124,11 +181,15 @@ class KoniSubscription {
       this.state.setCrowdloanItem(networkKey, rs);
     });
     if (onlyRunOnFirstTime) {
-      subscriptionPromise.then(unsub => unsub === null || unsub === void 0 ? void 0 : unsub()).catch(this.logger.warn);
+      subscriptionPromise.then(unsub => {
+        unsub && unsub();
+      }).catch(this.logger.warn);
       return;
     }
     return () => {
-      subscriptionPromise.then(unsub => unsub === null || unsub === void 0 ? void 0 : unsub()).catch(this.logger.warn);
+      subscriptionPromise.then(unsub => {
+        unsub && unsub();
+      }).catch(this.logger.warn);
     };
   }
   subscribeNft(address, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
@@ -168,16 +229,52 @@ class KoniSubscription {
       this.state.updateStakingReward(rewardItem);
     });
   }
-  async reloadBalance() {
+  async subscribeStakingRewardFastInterval(address) {
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    const pooledStakingItems = await this.state.getPooledStakingRecordsByAddress(addresses);
+    const pooledAddresses = [];
+    pooledStakingItems.forEach(pooledItem => {
+      if (!pooledAddresses.includes(pooledItem.address)) {
+        pooledAddresses.push(pooledItem.address);
+      }
+    });
+    const chainInfoMap = this.state.getChainInfoMap();
+    const targetChainMap = {};
+    Object.entries(chainInfoMap).forEach(_ref2 => {
+      let [key, network] = _ref2;
+      const chainState = this.state.getChainStateByKey(key);
+      if ((0, _utils._isChainEnabled)(chainState) && (0, _utils._isChainSupportSubstrateStaking)(network)) {
+        targetChainMap[key] = network;
+      }
+    });
+    const activeNetworks = [];
+    Object.keys(targetChainMap).forEach(key => {
+      activeNetworks.push(key);
+    });
+    const updateState = result => {
+      this.state.updateStakingReward(result);
+    };
+    await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), (0, _paraChain.getAmplitudeUnclaimedStakingReward)(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
+  }
+  async reloadStaking() {
     var _this$state$keyringSe2;
     const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
+    this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
+    await (0, _utils2.waitTimeout)(1800);
+  }
+  async reloadBalance() {
+    var _this$state$keyringSe3;
+    const currentAddress = (_this$state$keyringSe3 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe3 === void 0 ? void 0 : _this$state$keyringSe3.address;
     await this.state.handleResetBalance(currentAddress, true);
     this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
     await (0, _utils2.waitTimeout)(1800);
   }
   async reloadCrowdloan() {
-    var _this$state$keyringSe3;
-    const currentAddress = (_this$state$keyringSe3 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe3 === void 0 ? void 0 : _this$state$keyringSe3.address;
+    var _this$state$keyringSe4;
+    const currentAddress = (_this$state$keyringSe4 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe4 === void 0 ? void 0 : _this$state$keyringSe4.address;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await (0, _utils2.waitTimeout)(1800);
   }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.33-0'
+  version: '1.1.34-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -33,9 +33,7 @@ async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI
       unsubLocalToken = await subscribeTokensAccountsPallet(addresses, chain, networkAPI.api, callBack, true);
     } else if (_constants2._BALANCE_CHAIN_GROUP.statemine.includes(chain)) {
       unsubLocalToken = await subscribeAssetsAccountPallet(addresses, chain, networkAPI.api, callBack);
-    } else if (_constants2._BALANCE_CHAIN_GROUP.genshiro.includes(chain)) {
-      unsubLocalToken = await (0, _equilibrium.subscribeEqBalanceAccountPallet)(addresses, chain, networkAPI.api, callBack, true);
-    } else if (_constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
+    } else if (_constants2._BALANCE_CHAIN_GROUP.genshiro.includes(chain) || _constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
       unsubLocalToken = await (0, _equilibrium.subscribeEquilibriumTokenBalance)(addresses, chain, networkAPI.api, callBack, true);
     } else if (_constants2._BALANCE_CHAIN_GROUP.centrifuge.includes(chain)) {
       unsubLocalToken = await subscribeOrmlTokensPallet(addresses, chain, networkAPI.api, callBack);

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

@@ -11,21 +11,18 @@ var _helpers = require("./helpers");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const targetEnvs = ['extension', 'mobile'];
 class CampaignService {
   #state;
   constructor(state) {
     this.#state = state;
   }
   init() {
-    if (targetEnvs.includes(_utils.TARGET_ENV)) {
-      this.fetchCampaign().catch(e => {
-        console.error('Error on fetch campaigns', e);
-      });
-      this.runCampaign().catch(e => {
-        console.error('Error on run campaigns', e);
-      });
-    }
+    this.fetchCampaign().catch(e => {
+      console.error('Error on fetch campaigns', e);
+    });
+    this.runCampaign().catch(e => {
+      console.error('Error on run campaigns', e);
+    });
   }
   async fetchCampaign() {
     const respData = await (0, _fetchStaticData.fetchStaticData)('marketing-campaigns');

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -65,6 +65,21 @@ const _NFT_CHAIN_GROUP = {
 
 // Staking--------------------------------------------------------------------------------------------------------------
 exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
+const _STAKING_CHAIN_GROUP = {
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet'],
+  para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network'],
+  astar: ['astar', 'shiden', 'shibuya'],
+  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
+  // amplitude and kilt only share some common logic
+  krest_network: ['krest_network'],
+  kilt: ['kilt', 'kilt_peregrine'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet'],
+  bifrost: ['bifrost', 'bifrost_testnet'],
+  aleph: ['aleph', 'alephTest'],
+  // A0 has distinct tokenomics
+  ternoa: ['ternoa', 'ternoa_alphanet']
+};
+exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
 const _STAKING_ERA_LENGTH_MAP = {
   // in hours
   alephTest: 24,
@@ -263,7 +278,7 @@ const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
 exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
-const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 30000;
+const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 300000;
 
 // TODO: review
 exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = LATEST_CHAIN_DATA_FETCHING_INTERVAL;

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

@@ -226,9 +226,8 @@ class ChainService {
   getActiveChainInfos() {
     const result = {};
     Object.values(this.getChainStateMap()).forEach(chainState => {
-      const chainInfo = this.getChainInfoByKey(chainState.slug);
-      if (chainState.active && chainInfo && chainInfo.chainStatus === _types._ChainStatus.ACTIVE) {
-        result[chainState.slug] = chainInfo;
+      if (chainState.active) {
+        result[chainState.slug] = this.getChainInfoByKey(chainState.slug);
       }
     });
     return result;
@@ -411,8 +410,7 @@ class ChainService {
 
     // TODO: reconsider the flow of initiation
     this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
-    const storedAssetRefMap = await this.dbService.getAssetRefMap();
-    this.dataMap.assetRefMap = storedAssetRefMap && Object.values(storedAssetRefMap).length > 0 ? storedAssetRefMap : _chainList.AssetRefMap;
+    this.dataMap.assetRefMap = _chainList.AssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -424,8 +422,6 @@ class ChainService {
   }
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
-    this.handleLatestData();
-    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), _constants.LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {
@@ -450,18 +446,6 @@ class ChainService {
       console.error('Error fetching latest chain data');
     }
   }
-  handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
-    if (latestBlockedAssetRefList.length > 0) {
-      latestBlockedAssetRefList.forEach(blockedAssetRef => {
-        delete this.dataMap.assetRefMap[blockedAssetRef];
-      });
-    } else {
-      this.dataMap.assetRefMap = _chainList.AssetRefMap;
-    }
-    this.dbService.setAssetRef(this.dataMap.assetRefMap).catch(console.error);
-    this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
-    this.logger.log('Finished updating latest asset ref');
-  }
   handleLatestPriceId(latestPriceIds) {
     Object.entries(latestPriceIds).forEach(_ref3 => {
       let [slug, priceId] = _ref3;
@@ -477,9 +461,6 @@ class ChainService {
     this.fetchLatestChainData().then(latestChainInfo => {
       this.handleLatestProviderData(latestChainInfo);
     }).catch(console.error);
-    this.fetchLatestBlockedAssetRef().then(latestAssetRef => {
-      this.handleLatestBlockedAssetRef(latestAssetRef);
-    }).catch(console.error);
 
     // this.fetchLatestPriceIdsData().then((latestPriceIds) => {
     //   this.handleLatestPriceId(latestPriceIds);
@@ -685,9 +666,6 @@ class ChainService {
   async fetchLatestPriceIdsData() {
     return await (0, _utils2.fetchStaticData)('chain-assets/price-map');
   }
-  async fetchLatestBlockedAssetRef() {
-    return await (0, _utils2.fetchStaticData)('chain-assets/disabled-xcm-channels');
-  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = _chainList.ChainInfoMap;

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

@@ -60,7 +60,6 @@ exports._isSmartContractToken = _isSmartContractToken;
 exports._isSubstrateChain = _isSubstrateChain;
 exports._isSubstrateParaChain = _isSubstrateParaChain;
 exports._isSubstrateRelayChain = _isSubstrateRelayChain;
-exports._isSupportOrdinal = void 0;
 exports._isTokenEvmSmartContract = _isTokenEvmSmartContract;
 exports._isTokenTransferredByEvm = _isTokenTransferredByEvm;
 exports._isTokenWasmSmartContract = _isTokenWasmSmartContract;
@@ -164,7 +163,7 @@ function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
 }
 function _isChainEvmCompatible(chainInfo) {
-  return !!chainInfo.evmInfo;
+  return chainInfo.evmInfo !== undefined && chainInfo.evmInfo !== null;
 }
 function _isNativeToken(tokenInfo) {
   return tokenInfo.assetType === _types._AssetType.NATIVE;
@@ -219,11 +218,6 @@ function _isChainSupportWasmNft(chainInfo) {
   var _chainInfo$substrateI8, _chainInfo$substrateI9;
   return ((_chainInfo$substrateI8 = chainInfo.substrateInfo) === null || _chainInfo$substrateI8 === void 0 ? void 0 : (_chainInfo$substrateI9 = _chainInfo$substrateI8.supportSmartContract) === null || _chainInfo$substrateI9 === void 0 ? void 0 : _chainInfo$substrateI9.includes(_types._AssetType.PSP34)) || false;
 }
-const _isSupportOrdinal = chain => {
-  const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
-  return chains.includes(chain);
-};
-exports._isSupportOrdinal = _isSupportOrdinal;
 function _getNftTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EventService = void 0;
-var _utils = require("@subwallet/extension-base/utils");
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -25,20 +24,16 @@ class EventService extends _eventemitter.default {
     this.waitDatabaseReady = this.generateWaitPromise('database.ready');
     this.waitKeyringReady = this.generateWaitPromise('keyring.ready');
     this.waitAccountReady = this.generateWaitPromise('account.ready');
-    // TODO: Need to merge logic on web-runner file
-    this.waitInjectReady = _utils.TARGET_ENV === 'webapp' ? this.generateWaitPromise('inject.ready') : Promise.resolve(true);
     this.waitChainReady = this.generateWaitPromise('chain.ready');
     this.waitAssetReady = this.generateWaitPromise('asset.ready');
     this.waitMigrateReady = this.generateWaitPromise('migration.done');
     this.waitCampaignReady = this.generateWaitPromise('campaign.ready');
     this.waitBuyTokenReady = this.generateWaitPromise('buy.tokens.ready');
     this.waitBuyServiceReady = this.generateWaitPromise('buy.services.ready');
-    this.waitEarningReady = this.generateWaitPromise('earning.ready');
   }
   generateWaitPromise(eventType) {
     return new Promise(resolve => {
       this.once(eventType, isReady => {
-        console.log('===LOG generateWaitPromise eventType', eventType);
         resolve(isReady);
       });
     });

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

@@ -28,7 +28,6 @@ class KeyringService {
   });
   constructor(eventService) {
     this.eventService = eventService;
-    this.injected = false;
     this.eventService.waitCryptoReady.then(() => {
       this.currentAccountStore.get('CurrentAccountInfo', rs => {
         rs && this.currentAccountSubject.next(rs);
@@ -141,19 +140,8 @@ class KeyringService {
         currentGenesisHash: null
       });
     }
-    if (!this.injected) {
-      this.eventService.emit('inject.ready', true);
-      this.injected = true;
-    }
   }
-  removeInjectAccounts(_addresses) {
-    const addresses = _addresses.map(address => {
-      try {
-        return _uiKeyring.keyring.getPair(address).address;
-      } catch (error) {
-        return address;
-      }
-    });
+  removeInjectAccounts(addresses) {
     const currentAddress = this.currentAccountSubject.value.address;
     const afterAccounts = Object.keys(this.accounts).filter(address => addresses.indexOf(address) < 0);
     if (afterAccounts.length === 1) {
@@ -178,7 +166,7 @@ class KeyringService {
     await new Promise(resolve => {
       setTimeout(() => {
         resolve();
-      }, 1500);
+      }, 500);
     });
     this.updateKeyringState();
     this.currentAccountSubject.next({

package/cjs/services/migration-service/scripts/MigrateLedgerAccount.js

@@ -18,7 +18,7 @@ class MigrateLedgerAccount extends _Base.default {
         const store = new _stores.AccountsStore();
         const update = (key, value) => {
           var _value$meta;
-          if (key.startsWith('account:') && value !== null && value !== void 0 && value.meta && (0, _util.isString)((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
+          if (key.startsWith('account:') && value.meta && (0, _util.isString)((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
             const newValue = {
               ...value
             };

package/cjs/services/migration-service/scripts/MigrateTransactionHistory.js

@@ -19,7 +19,7 @@ class MigrateTransactionHistory extends _Base.default {
     const chainInfoMap = state.getChainInfoMap();
     const assetList = Object.values(state.getAssetRegistry());
     try {
-      const db = new _dexie.default('SubWalletDB_v2');
+      const db = new _dexie.default('SubWalletDB');
       const dexieDB = await db.open();
       const transactionTable = dexieDB.table('transactions');
       const oldTransactionData = await transactionTable.toArray();

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.EVERYTIME = void 0;
-var _DeleteEarningData = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData"));
-var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
@@ -43,13 +41,10 @@ var _default = {
   '1.1.6-01': _MigrateWalletReference.default,
   '1.1.7': _DeleteChain.default,
   '1.1.13-01': _MigrateTokenDecimals.default,
-  // '1.1.13-02-2': EnableEarningChains,
-  '1.1.13-03': _DeleteEarningData.default,
   '1.1.17-01': _MigratePioneerProvider.default,
   '1.1.17-03': _EnableVaraChain.default,
   '1.1.24-01': _MigrateProvidersV1M1P.default,
-  '1.1.26-01': _MigratePolygonUSDCProvider.default,
-  '1.1.28-01': _MigrateEarningVersion.default
+  '1.1.26-01': _MigratePolygonUSDCProvider.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/cjs/services/notification-service/NotificationService.js

@@ -39,7 +39,7 @@ class NotificationService {
       type: 'basic',
       title,
       message,
-      iconUrl: '/images/icon-128.png',
+      iconUrl: './images/icon-128.png',
       priority: 2,
       isClickable: !!link || !!onClick,
       buttons