@subwallet/extension-base 1.1.31-beta.0 → 1.1.33-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"));
@@ -83,10 +81,6 @@ class KoniState {
     ready: false,
     data: {}
   };
-
-  // earning
-  yieldPoolInfoSubject = new _rxjs.Subject();
-  yieldPositionSubject = new _rxjs.Subject();
   lazyMap = {};
   // Handle the general status of the extension
   generalStatus = _types.ServiceStatus.INITIALIZING;
@@ -106,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');
@@ -256,7 +248,6 @@ class KoniState {
   }
   async startSubscription() {
     await this.eventService.waitKeyringReady;
-    await this.eventService.waitAssetReady;
     this.dbService.subscribeChainStakingMetadata([], data => {
       this.chainStakingMetadataSubject.next(data);
     });
@@ -267,8 +258,8 @@ class KoniState {
     this.keyringService.accountSubject.subscribe(accounts => {
       // TODO: improve this
       unsub && unsub.unsubscribe();
-      unsub = this.dbService.subscribeYieldPosition(Object.keys(accounts), data => {
-        this.yieldPositionSubject.next(data);
+      unsub = this.dbService.subscribeNominatorMetadata(Object.keys(accounts), data => {
+        this.stakingNominatorMetadataSubject.next(data);
       });
     });
   }
@@ -363,22 +354,6 @@ class KoniState {
   async getPooledStakingRecordsByAddress(addresses) {
     return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
-  async getPooledPositionByAddress(addresses) {
-    return this.dbService.getYieldNominationPoolPosition(addresses, this.activeChainSlugs);
-  }
-  subscribeYieldPoolInfo() {
-    return this.yieldPoolInfoSubject;
-  }
-  subscribeYieldPosition() {
-    return this.yieldPositionSubject;
-  }
-  getYieldPoolInfo() {
-    return this.dbService.getYieldPools();
-  }
-  getYieldPositionInfo() {
-    const addresses = this.getDecodedAddresses(this.keyringService.currentAccount.address);
-    return this.dbService.getYieldPositionByAddress(addresses);
-  }
   subscribeMantaPayConfig() {
     return this.mantaPayConfigSubject;
   }
@@ -1790,28 +1765,5 @@ class KoniState {
       specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0')
     };
   }
-  updateYieldPoolInfo(data) {
-    this.dbService.updateYieldPoolStore(data).catch(e => this.logger.warn(e));
-  }
-  resetYieldPoolInfo(chains) {
-    this.dbService.subscribeYieldPoolInfo(chains, data => {
-      // TODO: no unsub
-      this.yieldPoolInfoSubject.next(data);
-    });
-  }
-  updateYieldPosition(data) {
-    this.dbService.updateYieldPosition(data).catch(e => this.logger.warn(e));
-  }
-  getYieldPoolStakingInfo(chain, poolType) {
-    return this.dbService.getYieldPoolStakingInfo(chain, poolType);
-  }
-  getCrowdloanContributions(_ref11) {
-    let {
-      address,
-      page,
-      relayChain
-    } = _ref11;
-    return this.subscanService.getCrowdloanContributions(relayChain, address, page);
-  }
 }
 exports.default = KoniState;

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

@@ -424,15 +424,32 @@ class KoniTabs {
     } = _ref13;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
+    const chainIdDec = parseInt(chainId, 16);
     const evmState = await this.getEvmState(url);
     if (evmState.chainId === chainId) {
       return null;
     }
-    const [networkKey] = this.#koniState.findNetworkKeyByChainId(parseInt(chainId, 16));
+    const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdDec);
     if (networkKey) {
       await this.#koniState.switchEvmNetworkByUrl((0, _utils2.stripUrl)(url), networkKey);
     } else {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+      const onlineData = await (0, _utils2.getEVMChainInfo)(chainIdDec);
+      if (onlineData) {
+        const chainData = {
+          chainId: chainId,
+          rpcUrls: onlineData.rpc.filter(url => url.startsWith('https://')),
+          chainName: onlineData.name,
+          blockExplorerUrls: onlineData.explorers.map(explorer => explorer.url),
+          nativeCurrency: onlineData.nativeCurrency,
+          requestId: id
+        };
+        await this.addEvmChain(id, url, {
+          method: 'wallet_addEthereumChain',
+          params: [chainData]
+        });
+      } else {
+        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+      }
     }
     return null;
   }

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

@@ -7,6 +7,7 @@ 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");
@@ -21,9 +22,7 @@ class KoniSubscription {
     crowdloan: undefined,
     balance: undefined,
     stakingOnChain: undefined,
-    essentialChainStakingMetadata: undefined,
-    yieldPoolStats: undefined,
-    yieldPosition: undefined
+    essentialChainStakingMetadata: undefined
   };
   constructor(state, dbService) {
     this.dbService = dbService;
@@ -59,7 +58,6 @@ class KoniSubscription {
     var _this$state$keyringSe;
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
-    this.subscribeYieldPools(this.state.getChainInfoMap(), this.state.getAssetRegistry(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap(), currentAddress);
     if (currentAddress) {
       this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
@@ -73,9 +71,6 @@ class KoniSubscription {
         return;
       }
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
-
-      // @ts-ignore
-      this.subscribeYieldPools(serviceInfo.chainInfoMap, serviceInfo.assetRegistry, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm, address);
       if (!address) {
         return;
       }
@@ -111,72 +106,6 @@ class KoniSubscription {
       this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(console.error);
   }
-  subscribeYieldPools(chainInfoMap, assetInfoMap, substrateApiMap, evmApiMap, address, onlyRunOnFirstTime) {
-    this.updateSubscription('yieldPoolStats', this.initYieldPoolStatsSubscription(substrateApiMap, evmApiMap, onlyRunOnFirstTime));
-    if (address) {
-      const addresses = this.state.getDecodedAddresses(address);
-      if (!addresses.length) {
-        return;
-      }
-      this.updateSubscription('yieldPosition', this.initYieldPositionSubscription(addresses, substrateApiMap, evmApiMap, chainInfoMap, assetInfoMap));
-    }
-  }
-  initYieldPositionSubscription(addresses, substrateApiMap, evmApiMap, chainInfoMap, assetInfoMap, onlyRunOnFirstTime) {
-    let cancel = false;
-    const updateYieldPoolStats = data => {
-      this.state.updateYieldPosition(data);
-    };
-    let unsub = _util.noop;
-    this.state.earningService.subscribePoolPositions(addresses, updateYieldPoolStats).then(rs => {
-      if (cancel) {
-        rs();
-      } else {
-        if (onlyRunOnFirstTime) {
-          rs && rs();
-        } else {
-          unsub = rs;
-        }
-      }
-    }).catch(console.error);
-    return () => {
-      cancel = true;
-      unsub && unsub();
-    };
-  }
-  initYieldPoolStatsSubscription(substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
-    let cancel = false;
-    this.state.resetYieldPoolInfo(Object.keys(this.state.getChainInfoMap()));
-    const updateYieldPoolStats = data => {
-      this.state.updateYieldPoolInfo(data);
-    };
-
-    // const unsub = subscribeYieldPoolStats(substrateApiMap, evmApiMap, this.state.getActiveChainInfoMap(), this.state.getAssetRegistry(), updateYieldPoolStats);
-    let unsub = _util.noop;
-    this.state.earningService.subscribePoolsInfo(updateYieldPoolStats).then(rs => {
-      if (cancel) {
-        rs();
-      } else {
-        if (onlyRunOnFirstTime) {
-          rs && rs();
-        } else {
-          unsub = rs;
-        }
-      }
-    }).catch(console.error);
-
-    //
-    // if (onlyRunOnFirstTime) {
-    //   unsub && unsub();
-    //
-    //   return;
-    // }
-
-    return () => {
-      cancel = true;
-      // unsub && unsub();
-      unsub && unsub();
-    };
-  }
   subscribeStakingOnChain(address, substrateApiMap, onlyRunOnFirstTime) {
     this.state.resetStaking(address);
     const addresses = this.state.getDecodedAddresses(address);
@@ -252,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) {
@@ -301,38 +234,47 @@ class KoniSubscription {
     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.earningService.updateEarningReward(result);
-    };
-    await Promise.all([this.state.earningService.getPoolReward(addresses, updateState)]);
-  }
-  async subscribeEarningRewardHistoryInterval(address) {
-    const addresses = this.state.getDecodedAddresses(address);
-    if (!addresses.length) {
-      return;
-    }
-    const updateState = result => {
-      this.state.earningService.updateEarningRewardHistory(result);
+      this.state.updateStakingReward(result);
     };
-    await Promise.all([this.state.earningService.fetchPoolRewardHistory(addresses, updateState)]);
+    await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), (0, _paraChain.getAmplitudeUnclaimedStakingReward)(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
   async reloadStaking() {
-    // const currentAddress = this.state.keyringService.currentAccount?.address;
-
-    // this.subscribeYieldPools(this.state.getSubstrateApiMap());
-
+    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$keyringSe2;
-    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
+    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.31-1'
+  version: '1.1.33-0'
 };
 exports.packageInfo = packageInfo;

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');
@@ -53,6 +50,7 @@ class CampaignService {
             endTime,
             startTime,
             isDone: false,
+            isArchive: false,
             campaignId,
             type: _KoniTypes.CampaignDataType.BANNER,
             buttons,
@@ -73,6 +71,7 @@ class CampaignService {
           endTime,
           startTime,
           isDone: false,
+          isArchive: false,
           campaignId,
           type: _KoniTypes.CampaignDataType.NOTIFICATION,
           buttons,
@@ -85,6 +84,23 @@ class CampaignService {
       const exists = await this.#state.dbService.getCampaign(campaign.slug);
       if (!exists) {
         await this.#state.dbService.upsertCampaign(campaign);
+      } else {
+        const data = {
+          ...campaign,
+          isDone: exists.isDone
+        };
+        await this.#state.dbService.upsertCampaign(data);
+      }
+    }
+    const allCampaign = await this.#state.dbService.getAllCampaign();
+    for (const stored of allCampaign) {
+      const exists = campaigns.find(campaign => campaign.slug === stored.slug);
+      if (!exists) {
+        const data = {
+          ...stored,
+          isArchive: true
+        };
+        await this.#state.dbService.upsertCampaign(data);
       }
     }
     this.#state.eventService.emit('campaign.ready', true);

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.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.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");
@@ -40,7 +40,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge']
@@ -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,
@@ -96,7 +111,9 @@ const _STAKING_ERA_LENGTH_MAP = {
   kate: 6,
   creditcoin: 24,
   vara_network: 12,
-  goldberg_testnet: 24
+  goldberg_testnet: 24,
+  manta_network: 6,
+  krest_network: 4
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _EXPECTED_BLOCK_TIME = {
@@ -251,7 +268,7 @@ const _XCM_TYPE = {
   PR: `${_types._SubstrateChainType.PARACHAIN}-${_types._SubstrateChainType.RELAYCHAIN}` // UMP
 };
 exports._XCM_TYPE = _XCM_TYPE;
-const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS, 'vara_network', 'bifrost_dot', 'parallel', 'acala', 'interlay'];
+const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS, 'vara_network'];
 exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
 const EVM_PASS_CONNECT_STATUS = {
   arbitrum_one: ['*']

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;

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;
@@ -162,7 +161,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;
@@ -217,11 +216,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,8 +24,6 @@ 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');
@@ -37,7 +34,6 @@ class EventService extends _eventemitter.default {
   generateWaitPromise(eventType) {
     return new Promise(resolve => {
       this.once(eventType, isReady => {
-        console.log('===LOG generateWaitPromise eventType', eventType);
         resolve(isReady);
       });
     });

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

@@ -173,14 +173,18 @@ class HistoryService {
 
   // Insert history with check override origin 'app'
   async addHistoryItems(historyItems) {
-    // Prevent override record with original is 'app'
-    const appRecords = this.historySubject.value.filter(item => item.origin === 'app');
-    const excludeKeys = appRecords.map(item => {
-      return `${item.chain}-${item.extrinsicHash}`;
-    });
-    const updateRecords = historyItems.filter(item => {
-      const key = `${item.chain}-${item.extrinsicHash}`;
-      return item.origin === 'app' || !excludeKeys.includes(key);
+    const updateRecords = [];
+    const appItems = this.historySubject.value.filter(i => i.origin === 'app');
+    historyItems.forEach(item => {
+      const needUpdateItem = appItems.find(item_ => item_.extrinsicHash === item.extrinsicHash && item.chain === item_.chain && item.address === item_.address);
+      if (needUpdateItem) {
+        updateRecords.push({
+          ...needUpdateItem,
+          status: item.status
+        });
+        return;
+      }
+      updateRecords.push(item);
     });
     await this.dbService.upsertHistory(updateRecords);
     this.historySubject.next(await this.dbService.getHistories());

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();