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

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;
@@ -410,9 +409,8 @@ class ChainService {
     await this.eventService.waitDatabaseReady;
 
     // TODO: reconsider the flow of initiation
-    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_constants._ASSET_REF_SRC, _chainList.AssetRefMap), this.fetchLatestData(_constants._MULTI_CHAIN_ASSET_SRC, _chainList.MultiChainAssetMap)]);
-    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
-    this.dataMap.assetRefMap = latestAssetRefMap;
+    this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
+    this.dataMap.assetRefMap = _chainList.AssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -420,16 +418,64 @@ class ChainService {
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
     await this.initAssetSettings();
+    this.checkLatestData();
   }
+  checkLatestData() {
+    clearInterval(this.refreshLatestChainDataTimeOut);
+    this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), _constants.LATEST_CHAIN_DATA_FETCHING_INTERVAL);
+  }
+  stopCheckLatestChainData() {
+    clearInterval(this.refreshLatestChainDataTimeOut);
+  }
+  handleLatestProviderData(latestChainInfo) {
+    try {
+      if (latestChainInfo && latestChainInfo.length > 0) {
+        const {
+          needUpdateChainApiList,
+          storedChainInfoList
+        } = (0, _utils.updateLatestChainInfo)(this.dataMap, latestChainInfo);
+        this.dbService.bulkUpdateChainStore(storedChainInfoList).catch(console.error);
+        this.updateChainSubscription();
+        needUpdateChainApiList.forEach(chainInfo => {
+          console.log('Updating chain API for', chainInfo.slug);
+          this.initApiForChain(chainInfo).catch(console.error);
+        });
+        this.logger.log('Finished updating latest RPC providers');
+      }
+    } catch (e) {
+      console.error('Error fetching latest chain data');
+    }
+  }
+  handleLatestPriceId(latestPriceIds) {
+    Object.entries(latestPriceIds).forEach(_ref3 => {
+      let [slug, priceId] = _ref3;
+      if (this.dataMap.assetRegistry[slug]) {
+        this.dataMap.assetRegistry[slug].priceId = priceId;
+      }
+    });
+    this.assetRegistrySubject.next(this.dataMap.assetRegistry);
+    this.eventService.emit('asset.updateState', '');
+    this.logger.log('Finished updating latest price IDs');
+  }
+  handleLatestData() {
+    this.fetchLatestChainData().then(latestChainInfo => {
+      this.handleLatestProviderData(latestChainInfo);
+    }).catch(console.error);
+
+    // this.fetchLatestPriceIdsData().then((latestPriceIds) => {
+    //   this.handleLatestPriceId(latestPriceIds);
+    // }).catch(console.error);
+  }
+
   async initApis() {
     const chainInfoMap = this.getChainInfoMap();
     const chainStateMap = this.getChainStateMap();
-    await Promise.all(Object.entries(chainInfoMap).filter(_ref3 => {
+    await Promise.all(Object.entries(chainInfoMap).filter(_ref4 => {
       var _chainStateMap$slug;
-      let [slug] = _ref3;
+      let [slug] = _ref4;
       return (_chainStateMap$slug = chainStateMap[slug]) === null || _chainStateMap$slug === void 0 ? void 0 : _chainStateMap$slug.active;
-    }).map(_ref4 => {
-      let [, chainInfo] = _ref4;
+    }).map(_ref5 => {
+      let [, chainInfo] = _ref5;
       try {
         return this.initApiForChain(chainInfo);
       } catch (e) {
@@ -578,8 +624,8 @@ class ChainService {
     }
     return duplicatedSlug;
   }
-  async fetchLatestData(src, defaultValue) {
-    return Promise.resolve(defaultValue);
+  async fetchLatestChainData() {
+    return await (0, _utils2.fetchStaticData)('chains');
     // try {
     //   const timeout = new Promise((resolve) => {
     //     const id = setTimeout(() => {
@@ -616,9 +662,13 @@ class ChainService {
     // }
   }
 
+  // @ts-ignore
+  async fetchLatestPriceIdsData() {
+    return await (0, _utils2.fetchStaticData)('chain-assets/price-map');
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
-    const latestChainInfoMap = await this.fetchLatestData(_constants._CHAIN_INFO_SRC, _chainList.ChainInfoMap);
+    const defaultChainInfoMap = _chainList.ChainInfoMap;
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -627,10 +677,13 @@ class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = latestChainInfoMap;
-      Object.values(latestChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = defaultChainInfoMap;
+      Object.values(defaultChainInfoMap).forEach(chainInfo => {
+        const {
+          providerKey
+        } = (0, _utils.randomizeProvider)(chainInfo.providers);
         this.dataMap.chainStateMap[chainInfo.slug] = {
-          currentProvider: Object.keys(chainInfo.providers)[0],
+          currentProvider: providerKey,
           slug: chainInfo.slug,
           connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
@@ -640,15 +693,15 @@ class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
-          currentProvider: Object.keys(chainInfo.providers)[0]
+          currentProvider: providerKey
         });
       });
     } else {
-      const mergedChainInfoMap = latestChainInfoMap;
+      const mergedChainInfoMap = defaultChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        const chainInfo = latestChainInfoMap[storedSlug];
+        const chainInfo = defaultChainInfoMap[storedSlug];
 
-        // Network is existed on change list
+        // Network existed on change list
         // check predefined chains first, keep setting for providers and currentProvider
         if (chainInfo) {
           // Keep customer provider only
@@ -663,23 +716,27 @@ class ChainService {
             }
           }
           mergedChainInfoMap[storedSlug].providers = providers;
-
-          // Merge current provider
-          let currentProvider = storedChainInfo.currentProvider;
-          const providerValue = storedChainInfo.providers[currentProvider] || '';
-          if (!providers[currentProvider]) {
-            currentProvider = Object.keys(providers)[0];
-            for (const [key, value] of Object.entries(providers)) {
-              if (providerValue === value) {
-                currentProvider = key;
-                break;
-              }
+          const {
+            providerKey
+          } = (0, _utils.randomizeProvider)(providers);
+          let selectedProvider = providerKey;
+          const storedProviderKey = storedChainInfo.currentProvider;
+          const storedProviderValue = storedChainInfo.providers[storedProviderKey] || '';
+          if (storedProviderValue !== null && storedProviderValue !== void 0 && storedProviderValue.startsWith('light') || storedProviderKey !== null && storedProviderKey !== void 0 && storedProviderKey.startsWith(_types3._CUSTOM_PREFIX)) {
+            const savedProviderKey = Object.keys(providers).find(key => providers[key] === storedProviderValue);
+            if (savedProviderKey) {
+              selectedProvider = savedProviderKey;
             }
           }
+
+          // Merge current provider
+          // let currentProvider = storedChainInfo.currentProvider;
+          // const providerValue = storedChainInfo.providers[selectedProvider] || '';
+
           const hasProvider = Object.values(providers).length > 0;
           const canActive = hasProvider && chainInfo.chainStatus === _types._ChainStatus.ACTIVE;
           this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: currentProvider,
+            currentProvider: selectedProvider,
             slug: storedSlug,
             connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
@@ -687,13 +744,13 @@ class ChainService {
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: currentProvider
+            currentProvider: selectedProvider
           });
         } else if ((0, _utils._isCustomChain)(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
-          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
+          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(defaultChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
             mergedChainInfoMap[duplicatedDefaultSlug].providers = {
@@ -718,6 +775,7 @@ class ChainService {
               slug: storedSlug,
               name: storedChainInfo.name,
               providers: storedChainInfo.providers,
+              // TODO: review
               evmInfo: storedChainInfo.evmInfo,
               substrateInfo: storedChainInfo.substrateInfo,
               isTestnet: storedChainInfo.isTestnet,
@@ -727,6 +785,7 @@ class ChainService {
             };
             this.dataMap.chainStateMap[storedSlug] = {
               currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
               slug: storedSlug,
               connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
@@ -734,7 +793,7 @@ class ChainService {
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider // TODO: review
             });
           }
         } else {
@@ -743,8 +802,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref5 => {
-        let [slug, chainInfo] = _ref5;
+      Object.entries(mergedChainInfoMap).forEach(_ref6 => {
+        let [slug, chainInfo] = _ref6;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -767,7 +826,7 @@ class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
-    const latestAssetRegistry = await this.fetchLatestData(_constants._CHAIN_ASSET_SRC, _chainList.ChainAssetMap);
+    const latestAssetRegistry = _chainList.ChainAssetMap;
     const availableChains = Object.values(this.dataMap.chainInfoMap).filter(info => info.chainStatus === _types._ChainStatus.ACTIVE).map(chainInfo => chainInfo.slug);
 
     // Fill out zk assets from latestAssetRegistry if not supported
@@ -1217,9 +1276,11 @@ class ChainService {
   }
   async stopAllChainApis() {
     await Promise.all([this.substrateChainHandler.sleep(), this.evmChainHandler.sleep()]);
+    this.stopCheckLatestChainData();
   }
   async resumeAllChainApis() {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
+    this.checkLatestData();
   }
   checkAndUpdateStatusMapForChain(chainSlug) {
     const substrateApiMap = this.getSubstrateApiMap();
@@ -1355,10 +1416,10 @@ class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return await this.fetchLatestData(_constants._CHAIN_LOGO_MAP_SRC, _chainList.ChainLogoMap);
+    return Promise.resolve(_chainList.ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return await this.fetchLatestData(_constants._ASSET_LOGO_MAP_SRC, _chainList.AssetLogoMap);
+    return Promise.resolve(_chainList.AssetLogoMap);
   }
   resetWallet(resetAll) {
     if (resetAll) {

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;
@@ -68,6 +67,8 @@ exports._isXcmPathSupported = _isXcmPathSupported;
 exports._parseAssetRefKey = _parseAssetRefKey;
 exports._parseMetadataForSmartContractAsset = _parseMetadataForSmartContractAsset;
 exports.findChainInfoByHalfGenesisHash = exports.findChainInfoByChainId = void 0;
+exports.randomizeProvider = randomizeProvider;
+exports.updateLatestChainInfo = updateLatestChainInfo;
 var _types = require("@subwallet/chain-list/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
@@ -162,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;
@@ -217,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) {
@@ -435,4 +431,70 @@ const findChainInfoByChainId = (chainMap, chainId) => {
 exports.findChainInfoByChainId = findChainInfoByChainId;
 function _isMantaZkAsset(chainAsset) {
   return _constants._MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_constants._ZK_ASSET_PREFIX);
+}
+function randomizeProvider(providers, excludedKeys) {
+  if (Object.keys(providers).length === 0) {
+    return {
+      providerKey: '',
+      providerValue: ''
+    };
+  }
+  let isValid = false;
+  let selectedProviderKey = '';
+  let selectedProviderValue = '';
+  while (!isValid) {
+    var _selectedProviderValu, _selectedProviderKey;
+    const randomProvider = Math.floor(Math.random() * Object.keys(providers).length);
+    selectedProviderKey = Object.keys(providers)[randomProvider];
+    selectedProviderValue = providers[selectedProviderKey];
+    if (!((_selectedProviderValu = selectedProviderValue) !== null && _selectedProviderValu !== void 0 && _selectedProviderValu.startsWith('light')) && !((_selectedProviderKey = selectedProviderKey) !== null && _selectedProviderKey !== void 0 && _selectedProviderKey.startsWith(_types2._CUSTOM_PREFIX)) && !(excludedKeys !== null && excludedKeys !== void 0 && excludedKeys.includes(selectedProviderKey))) {
+      // if it's light client, then re-randomize
+      isValid = true;
+    }
+  }
+  return {
+    providerKey: selectedProviderKey,
+    providerValue: selectedProviderValue
+  };
+}
+function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
+  const currentChainInfoMap = currentDataMap.chainInfoMap;
+  const currentChainStateMap = currentDataMap.chainStateMap;
+  const storedChainInfoList = [];
+  const needUpdateChainApiList = [];
+  latestChainInfoList.forEach(latestChainInfo => {
+    const currentChainInfo = currentChainInfoMap[latestChainInfo.slug];
+    const currentChainState = currentChainStateMap[latestChainInfo.slug];
+    const currentChainProviderValue = currentChainInfo === null || currentChainInfo === void 0 ? void 0 : currentChainInfo.providers[currentChainState === null || currentChainState === void 0 ? void 0 : currentChainState.currentProvider];
+    if (currentChainInfo && currentChainState) {
+      const preservedProvider = {};
+      Object.entries(currentChainInfo.providers).forEach(_ref => {
+        let [providerKey, providerValue] = _ref;
+        if (providerValue !== null && providerValue !== void 0 && providerValue.startsWith('light') || providerKey !== null && providerKey !== void 0 && providerKey.startsWith(_types2._CUSTOM_PREFIX)) {
+          preservedProvider[providerKey] = providerValue;
+        }
+      });
+      currentChainInfo.providers = {
+        ...latestChainInfo.providers,
+        ...preservedProvider
+      };
+      const currentProviderNotFound = !Object.keys(currentChainInfo.providers).includes(currentChainState.currentProvider);
+      const currentProviderUpdated = Object.keys(currentChainInfo.providers).includes(currentChainState.currentProvider) && !Object.values(currentChainInfo.providers).includes(currentChainProviderValue);
+      if (currentChainInfo.chainStatus === _types._ChainStatus.ACTIVE && (currentProviderNotFound || currentProviderUpdated)) {
+        const {
+          providerKey
+        } = randomizeProvider(currentChainInfo.providers);
+        currentChainState.currentProvider = providerKey;
+        needUpdateChainApiList.push(currentChainInfo);
+      }
+      storedChainInfoList.push({
+        ...currentChainInfo,
+        ...currentChainState
+      });
+    }
+  });
+  return {
+    storedChainInfoList,
+    needUpdateChainApiList
+  };
 }

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

package/cjs/services/storage-service/DatabaseService.js

@@ -12,8 +12,6 @@ var _Campaign = _interopRequireDefault(require("@subwallet/extension-base/servic
 var _ChainStakingMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata"));
 var _MantaPay = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/MantaPay"));
 var _NominatorMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata"));
-var _YieldPoolStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore"));
-var _YieldPositionStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore"));
 var _utils = require("@subwallet/extension-base/utils");
 var _dexieExportImport = require("dexie-export-import");
 var _util = require("@polkadot/util");
@@ -44,9 +42,6 @@ class DatabaseService {
       metadata: new _dbStores.MetadataStore(this._db.metadata),
       chain: new _dbStores.ChainStore(this._db.chain),
       asset: new _dbStores.AssetStore(this._db.asset),
-      // yield
-      yieldPoolInfo: new _YieldPoolStore.default(this._db.yieldPoolInfo),
-      yieldPosition: new _YieldPositionStore.default(this._db.yieldPosition),
       // staking
       chainStakingMetadata: new _ChainStakingMetadata.default(this._db.chainStakingMetadata),
       nominatorMetadata: new _NominatorMetadata.default(this._db.nominatorMetadata),
@@ -286,64 +281,6 @@ class DatabaseService {
     return this.stores.mantaPay.getFirstConfig(chain);
   }
 
-  /* Earning */
-
-  async removeOldEarningData() {
-    await this.stores.yieldPoolInfo.clear();
-    await this.stores.yieldPosition.clear();
-  }
-  async updateYieldPoolStore(data) {
-    await this.stores.yieldPoolInfo.upsert(data);
-  }
-  async updateYieldPoolsStore(data) {
-    await this.stores.yieldPoolInfo.bulkUpsert(data);
-  }
-  async deleteYieldPoolInfo(slugs) {
-    await this.stores.yieldPoolInfo.bulkDelete(slugs);
-  }
-  async getYieldPools() {
-    return this.stores.yieldPoolInfo.getAll();
-  }
-  async getYieldPoolStakingInfo(chain, poolType) {
-    return this.stores.yieldPoolInfo.getByChainAndType(chain, poolType);
-  }
-  async getYieldPool(slug) {
-    return this.stores.yieldPoolInfo.getBySlug(slug);
-  }
-  async getYieldPositionByAddressAndSlug(address, slug) {
-    return this.stores.yieldPosition.getByAddressAndSlug(address, slug);
-  }
-  subscribeYieldPoolInfo(chains, callback) {
-    this.yieldInfoSubscription && this.yieldInfoSubscription.unsubscribe();
-    this.yieldInfoSubscription = this.stores.yieldPoolInfo.subscribeYieldPoolInfo(chains).subscribe({
-      next: data => callback && callback(data)
-    });
-    return this.yieldInfoSubscription;
-  }
-  removeYieldPositionByAddresses(addresses) {
-    return this.stores.yieldPosition.removeByAddresses(addresses);
-  }
-  removeYieldPositionByChains(chains) {
-    return this.stores.yieldPosition.removeByChains(chains);
-  }
-  async updateYieldPosition(data) {
-    await this.stores.yieldPosition.upsert(data);
-  }
-  async updateYieldPositions(data) {
-    await this.stores.yieldPosition.bulkUpsert(data);
-  }
-  async getYieldPositionByAddress(addresses) {
-    return this.stores.yieldPosition.getByAddress(addresses);
-  }
-  subscribeYieldPosition(addresses, callback) {
-    return this.stores.yieldPosition.subscribeYieldPositions(addresses).subscribe({
-      next: data => callback && callback(data)
-    });
-  }
-  async getYieldNominationPoolPosition(addresses, chains) {
-    return this.stores.yieldPosition.getByAddressAndChains(addresses, chains);
-  }
-
   /* Campaign */
 
   getAllCampaign() {

package/cjs/services/storage-service/databases/index.js

@@ -40,10 +40,6 @@ class KoniDatabase extends _dexie.default {
       mantaPay: 'key, chain'
     });
     this.conditionalVersion(4, {
-      yieldPoolInfo: 'slug, chain, type',
-      yieldPosition: '[slug+chain+address], [address+slug], address, chain'
-    });
-    this.conditionalVersion(5, {
       campaign: 'slug'
     });
   }

package/cjs/services/storage-service/db-stores/NominatorMetadata.js

@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _BaseStoreWithAddressAndChain = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain"));
-var _types = require("@subwallet/extension-base/types");
 var _dexie = require("dexie");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 class NominatorMetadataStore extends _BaseStoreWithAddressAndChain.default {
   async getAll() {
-    return this.table.filter(item => item.status !== _types.EarningStatus.NOT_STAKING).toArray();
+    return this.table.filter(item => item.status !== _KoniTypes.StakingStatus.NOT_STAKING).toArray();
   }
   subscribeByAddresses(addresses) {
     return (0, _dexie.liveQuery)(() => this.getByAddress(addresses));
@@ -22,7 +22,7 @@ class NominatorMetadataStore extends _BaseStoreWithAddressAndChain.default {
     return (0, _dexie.liveQuery)(() => this.getAll());
   }
   getByAddress(addresses) {
-    return this.table.where('address').anyOfIgnoreCase(addresses).and(item => item.status !== _types.EarningStatus.NOT_STAKING).toArray();
+    return this.table.where('address').anyOfIgnoreCase(addresses).and(item => item.status !== _KoniTypes.StakingStatus.NOT_STAKING).toArray();
   }
   async removeByAddress(address) {
     return this.table.where('address').anyOfIgnoreCase(address).delete();

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

@@ -252,21 +252,5 @@ class SubscanService {
     await _getTransferItems(0);
     return resultMap;
   }
-  getRewardHistoryList(chain, address) {
-    let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    return this.addRequest(async () => {
-      const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/account/reward_slash'), {
-        page,
-        category: 'Reward',
-        row: 10,
-        address
-      });
-      if (rs.status !== 200) {
-        throw new _SWError.SWError('SubscanService.getRewardHistoryList', await rs.text());
-      }
-      const jsonData = await rs.json();
-      return jsonData.data;
-    });
-  }
 }
 exports.SubscanService = SubscanService;