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

package/services/chain-service/index.js

@@ -213,9 +213,8 @@ export class ChainService {
   getActiveChainInfos() {
     const result = {};
     Object.values(this.getChainStateMap()).forEach(chainState => {
-      const chainInfo = this.getChainInfoByKey(chainState.slug);
-      if (chainState.active && chainInfo && chainInfo.chainStatus === _ChainStatus.ACTIVE) {
-        result[chainState.slug] = chainInfo;
+      if (chainState.active) {
+        result[chainState.slug] = this.getChainInfoByKey(chainState.slug);
       }
     });
     return result;
@@ -397,8 +396,7 @@ export class ChainService {
 
     // TODO: reconsider the flow of initiation
     this.multiChainAssetMapSubject.next(MultiChainAssetMap);
-    const storedAssetRefMap = await this.dbService.getAssetRefMap();
-    this.dataMap.assetRefMap = storedAssetRefMap && Object.values(storedAssetRefMap).length > 0 ? storedAssetRefMap : AssetRefMap;
+    this.dataMap.assetRefMap = AssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -410,8 +408,6 @@ export class ChainService {
   }
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
-    this.handleLatestData();
-    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {
@@ -436,18 +432,6 @@ export 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 = 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(([slug, priceId]) => {
       if (this.dataMap.assetRegistry[slug]) {
@@ -462,9 +446,6 @@ export 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);
@@ -668,9 +649,6 @@ export class ChainService {
   async fetchLatestPriceIdsData() {
     return await fetchStaticData('chain-assets/price-map');
   }
-  async fetchLatestBlockedAssetRef() {
-    return await fetchStaticData('chain-assets/disabled-xcm-channels');
-  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = ChainInfoMap;

package/services/chain-service/utils.d.ts

@@ -31,7 +31,6 @@ export declare function _getChainSubstrateAddressPrefix(chainInfo: _ChainInfo):
 export declare function _isChainSupportNativeNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportEvmNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportWasmNft(chainInfo: _ChainInfo): boolean;
-export declare const _isSupportOrdinal: (chain: string) => boolean;
 export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getChainNativeTokenBasicInfo(chainInfo: _ChainInfo): BasicTokenInfo;

package/services/chain-service/utils.js

@@ -92,7 +92,7 @@ export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
 }
 export function _isChainEvmCompatible(chainInfo) {
-  return !!chainInfo.evmInfo;
+  return chainInfo.evmInfo !== undefined && chainInfo.evmInfo !== null;
 }
 export function _isNativeToken(tokenInfo) {
   return tokenInfo.assetType === _AssetType.NATIVE;
@@ -147,10 +147,6 @@ export 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(_AssetType.PSP34)) || false;
 }
-export const _isSupportOrdinal = chain => {
-  const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
-  return chains.includes(chain);
-};
 export function _getNftTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {

package/services/event-service/index.d.ts

@@ -8,14 +8,12 @@ export declare class EventService extends EventEmitter<EventRegistry> {
     readonly waitDatabaseReady: Promise<boolean>;
     readonly waitKeyringReady: Promise<boolean>;
     readonly waitAccountReady: Promise<boolean>;
-    readonly waitInjectReady: Promise<boolean>;
     readonly waitChainReady: Promise<boolean>;
     readonly waitAssetReady: Promise<boolean>;
     readonly waitMigrateReady: Promise<boolean>;
     readonly waitCampaignReady: Promise<boolean>;
     readonly waitBuyTokenReady: Promise<boolean>;
     readonly waitBuyServiceReady: Promise<boolean>;
-    readonly waitEarningReady: Promise<boolean>;
     constructor();
     private generateWaitPromise;
     private setLazyTimeout;

package/services/event-service/index.js

@@ -3,7 +3,6 @@
 
 // Stateless service handle runtime event on background
 
-import { TARGET_ENV } from '@subwallet/extension-base/utils';
 import EventEmitter from 'eventemitter3';
 const DEFAULT_LAZY_TIME = 300;
 const LONG_LAZY_TIME = 900;
@@ -18,20 +17,16 @@ export class EventService extends EventEmitter {
     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 = 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/services/event-service/types.d.ts

@@ -5,20 +5,12 @@ export interface EventRegistry {
     'general.wakeup': [boolean];
     'crypto.ready': [boolean];
     'database.ready': [boolean];
-    /** Password state ready  */
     'keyring.ready': [boolean];
-    /** Update current account  */
     'account.updateCurrent': [CurrentAccountInfo];
-    /** Account list loaded  */
     'account.ready': [boolean];
-    /** Add a new account  */
     'account.add': [string];
-    /** Update account */
     'account.update': [string];
-    /** Remove a account  */
     'account.remove': [string];
-    /** Inject account done  */
-    'inject.ready': [boolean];
     'chain.ready': [boolean];
     'chain.add': [string];
     'chain.updateState': [string];
@@ -36,7 +28,6 @@ export interface EventRegistry {
     'campaign.ready': [boolean];
     'buy.tokens.ready': [boolean];
     'buy.services.ready': [boolean];
-    'earning.ready': [boolean];
 }
 export declare type EventType = keyof EventRegistry;
 export declare const COMMON_RELOAD_EVENTS: EventType[];

package/services/keyring-service/index.d.ts

@@ -10,7 +10,6 @@ export declare class KeyringService {
     readonly addressesSubject: BehaviorSubject<SubjectInfo>;
     readonly accountSubject: BehaviorSubject<SubjectInfo>;
     private beforeAccount;
-    private injected;
     readonly keyringStateSubject: BehaviorSubject<KeyringState>;
     constructor(eventService: EventService);
     private subscribeAccounts;
@@ -22,6 +21,6 @@ export declare class KeyringService {
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
     lock(): void;
     addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
-    removeInjectAccounts(_addresses: string[]): void;
+    removeInjectAccounts(addresses: string[]): void;
     resetWallet(resetAll: boolean): Promise<void>;
 }

package/services/keyring-service/index.js

@@ -22,7 +22,6 @@ export class KeyringService {
   });
   constructor(eventService) {
     this.eventService = eventService;
-    this.injected = false;
     this.eventService.waitCryptoReady.then(() => {
       this.currentAccountStore.get('CurrentAccountInfo', rs => {
         rs && this.currentAccountSubject.next(rs);
@@ -134,19 +133,8 @@ export 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 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) {
@@ -171,7 +159,7 @@ export class KeyringService {
     await new Promise(resolve => {
       setTimeout(() => {
         resolve();
-      }, 1500);
+      }, 500);
     });
     this.updateKeyringState();
     this.currentAccountSubject.next({

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

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

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

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

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

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
-import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -35,12 +33,9 @@ export default {
   '1.1.6-01': MigrateWalletReference,
   '1.1.7': DeleteChain,
   '1.1.13-01': MigrateTokenDecimals,
-  // '1.1.13-02-2': EnableEarningChains,
-  '1.1.13-03': DeleteEarningData,
   '1.1.17-01': MigratePioneerProvider,
   '1.1.17-03': EnableVaraChain,
   '1.1.24-01': MigrateProvidersV1M1P24,
-  '1.1.26-01': MigratePolygonUSDCProvider,
-  '1.1.28-01': MigrateEarningVersion
+  '1.1.26-01': MigratePolygonUSDCProvider
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/notification-service/NotificationService.js

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

package/services/storage-service/DatabaseService.d.ts

@@ -1,17 +1,14 @@
-import { _AssetRef, _ChainAsset } from '@subwallet/chain-list/types';
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { ChainStakingMetadata, CrowdloanItem, MantaPayConfig, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, StakingType, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 import { EventService } from '@subwallet/extension-base/services/event-service';
-import { IAssetRef, IBalance, ICampaign, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
+import { IBalance, ICampaign, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
 import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
-import AssetRefStore from '@subwallet/extension-base/services/storage-service/db-stores/AssetRef';
 import CampaignStore from '@subwallet/extension-base/services/storage-service/db-stores/Campaign';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import MantaPayStore from '@subwallet/extension-base/services/storage-service/db-stores/MantaPay';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
 import { HistoryQuery } from '@subwallet/extension-base/services/storage-service/db-stores/Transaction';
-import YieldPoolStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore';
-import YieldPositionStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore';
-import { BalanceItem, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { BalanceItem } from '@subwallet/extension-base/types';
 import { Subscription } from 'dexie';
 import { DexieExportJsonStructure } from 'dexie-export-import';
 export declare const DEXIE_BACKUP_TABLES: string[];
@@ -30,18 +27,14 @@ export default class DatabaseService {
         metadata: MetadataStore;
         chain: ChainStore;
         asset: AssetStore;
-        yieldPoolInfo: YieldPoolStore;
-        yieldPosition: YieldPositionStore;
         chainStakingMetadata: ChainStakingMetadataStore;
         nominatorMetadata: NominatorMetadataStore;
         mantaPay: MantaPayStore;
         campaign: CampaignStore;
-        assetRef: AssetRefStore;
     };
     private logger;
     private nftSubscription;
     private stakingSubscription;
-    private yieldInfoSubscription;
     constructor(eventService: EventService);
     updatePriceStore(priceData: PriceJson): Promise<void>;
     getPriceStore(): Promise<PriceJson | undefined>;
@@ -90,22 +83,6 @@ export default class DatabaseService {
     subscribeMantaPayConfig(chain: string, callback: (data: MantaPayConfig[]) => void): void;
     getMantaPayConfig(chain: string): Promise<any[]>;
     getMantaPayFirstConfig(chain: string): Promise<any>;
-    removeOldEarningData(): Promise<void>;
-    updateYieldPoolStore(data: YieldPoolInfo): Promise<void>;
-    updateYieldPoolsStore(data: YieldPoolInfo[]): Promise<void>;
-    deleteYieldPoolInfo(slugs: string[]): Promise<void>;
-    getYieldPools(): Promise<YieldPoolInfo[]>;
-    getYieldPoolStakingInfo(chain: string, poolType: YieldPoolType): Promise<YieldPoolInfo | undefined>;
-    getYieldPool(slug: string): Promise<YieldPoolInfo | undefined>;
-    getYieldPositionByAddressAndSlug(address: string, slug: string): Promise<YieldPositionInfo | undefined>;
-    subscribeYieldPoolInfo(chains: string[], callback: (data: YieldPoolInfo[]) => void): Subscription;
-    removeYieldPositionByAddresses(addresses: string[]): import("dexie").PromiseExtended<number>;
-    removeYieldPositionByChains(chains: string[]): import("dexie").PromiseExtended<number>;
-    updateYieldPosition(data: YieldPositionInfo): Promise<void>;
-    updateYieldPositions(data: YieldPositionInfo[]): Promise<void>;
-    getYieldPositionByAddress(addresses: string[]): Promise<YieldPositionInfo[]>;
-    subscribeYieldPosition(addresses: string[], callback: (data: YieldPositionInfo[]) => void): Subscription;
-    getYieldNominationPoolPosition(addresses: string[], chains: string[]): Promise<YieldPositionInfo[]>;
     getAllCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     subscribeProcessingCampaign(): import("dexie").Observable<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     getProcessingCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
@@ -114,8 +91,4 @@ export default class DatabaseService {
     exportDB(): Promise<string>;
     importDB(data: string): Promise<boolean>;
     getExportJson(): Promise<DexieExportJsonStructure>;
-    setAssetRef(assetRef: Record<string, _AssetRef>): Promise<unknown>;
-    getAssetRef(slug: string): Promise<IAssetRef | undefined>;
-    getAssetRefMap(): Promise<Record<string, _AssetRef>>;
-    subscribeAssetRef(): import("dexie").Observable<IAssetRef[]>;
 }

package/services/storage-service/DatabaseService.js

@@ -4,13 +4,10 @@
 import { APIItemState, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniDatabase from '@subwallet/extension-base/services/storage-service/databases';
 import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
-import AssetRefStore from '@subwallet/extension-base/services/storage-service/db-stores/AssetRef';
 import CampaignStore from '@subwallet/extension-base/services/storage-service/db-stores/Campaign';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import MantaPayStore from '@subwallet/extension-base/services/storage-service/db-stores/MantaPay';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
-import YieldPoolStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore';
-import YieldPositionStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import { exportDB } from 'dexie-export-import';
 import { logger as createLogger } from '@polkadot/util';
@@ -37,15 +34,11 @@ export default class DatabaseService {
       metadata: new MetadataStore(this._db.metadata),
       chain: new ChainStore(this._db.chain),
       asset: new AssetStore(this._db.asset),
-      // yield
-      yieldPoolInfo: new YieldPoolStore(this._db.yieldPoolInfo),
-      yieldPosition: new YieldPositionStore(this._db.yieldPosition),
       // staking
       chainStakingMetadata: new ChainStakingMetadataStore(this._db.chainStakingMetadata),
       nominatorMetadata: new NominatorMetadataStore(this._db.nominatorMetadata),
       mantaPay: new MantaPayStore(this._db.mantaPay),
-      campaign: new CampaignStore(this._db.campaign),
-      assetRef: new AssetRefStore(this._db.assetRef)
+      campaign: new CampaignStore(this._db.campaign)
     };
   }
   async updatePriceStore(priceData) {
@@ -279,64 +272,6 @@ export default 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() {
@@ -380,29 +315,4 @@ export default class DatabaseService {
   async getExportJson() {
     return JSON.parse(await this.exportDB());
   }
-  setAssetRef(assetRef) {
-    const assetRefList = Object.entries(assetRef).map(([slug, item]) => {
-      return {
-        slug,
-        ...item
-      };
-    });
-    return this.stores.assetRef.bulkUpsert(assetRefList);
-  }
-  getAssetRef(slug) {
-    return this.stores.assetRef.getAssetRef(slug);
-  }
-  async getAssetRefMap() {
-    const assetRefList = await this.stores.assetRef.getAll();
-    const assetRefObj = {};
-    assetRefList.forEach(item => {
-      assetRefObj[item.slug] = {
-        ...item
-      };
-    });
-    return assetRefObj;
-  }
-  subscribeAssetRef() {
-    return this.stores.assetRef.subscribeAssetRef();
-  }
 }

package/services/storage-service/databases/index.d.ts

@@ -1,6 +1,6 @@
-import { _AssetRef, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { CampaignData, ChainStakingMetadata, CrowdloanItem, MetadataItem, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
-import { BalanceItem, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { BalanceItem } from '@subwallet/extension-base/types';
 import Dexie, { Table } from 'dexie';
 export interface DefaultChainDoc {
     chain: string;
@@ -31,9 +31,6 @@ export interface IMetadataItem extends MetadataItem, DefaultChainDoc {
 }
 export declare type IMantaPayLedger = any;
 export declare type ICampaign = CampaignData;
-export interface IAssetRef extends _AssetRef {
-    slug: string;
-}
 export default class KoniDatabase extends Dexie {
     price: Table<PriceJson, object>;
     balances: Table<IBalance, object>;
@@ -48,11 +45,8 @@ export default class KoniDatabase extends Dexie {
     asset: Table<_ChainAsset, object>;
     chainStakingMetadata: Table<ChainStakingMetadata, object>;
     nominatorMetadata: Table<NominatorMetadata, object>;
-    yieldPoolInfo: Table<YieldPoolInfo, object>;
-    yieldPosition: Table<YieldPositionInfo, object>;
     mantaPay: Table<IMantaPayLedger, object>;
     campaign: Table<ICampaign, object>;
-    assetRef: Table<IAssetRef, object>;
     private schemaVersion;
     constructor(name?: string, schemaVersion?: number);
     private conditionalVersion;

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

@@ -31,15 +31,8 @@ export default class KoniDatabase extends Dexie {
       mantaPay: 'key, chain'
     });
     this.conditionalVersion(4, {
-      yieldPoolInfo: 'slug, chain, type',
-      yieldPosition: '[slug+chain+address], [address+slug], address, chain'
-    });
-    this.conditionalVersion(5, {
       campaign: 'slug'
     });
-    this.conditionalVersion(5, {
-      assetRef: 'slug'
-    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {

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

@@ -1,12 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { StakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import BaseStoreWithAddressAndChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain';
-import { EarningStatus } from '@subwallet/extension-base/types';
 import { liveQuery } from 'dexie';
 export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain {
   async getAll() {
-    return this.table.filter(item => item.status !== EarningStatus.NOT_STAKING).toArray();
+    return this.table.filter(item => item.status !== StakingStatus.NOT_STAKING).toArray();
   }
   subscribeByAddresses(addresses) {
     return liveQuery(() => this.getByAddress(addresses));
@@ -15,7 +15,7 @@ export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain
     return liveQuery(() => this.getAll());
   }
   getByAddress(addresses) {
-    return this.table.where('address').anyOfIgnoreCase(addresses).and(item => item.status !== EarningStatus.NOT_STAKING).toArray();
+    return this.table.where('address').anyOfIgnoreCase(addresses).and(item => item.status !== StakingStatus.NOT_STAKING).toArray();
   }
   async removeByAddress(address) {
     return this.table.where('address').anyOfIgnoreCase(address).delete();

package/services/subscan-service/index.d.ts

@@ -1,4 +1,4 @@
-import { CrowdloanContributionsResponse, ExtrinsicItem, ExtrinsicsListResponse, IMultiChainBalance, RequestBlockRange, RewardHistoryListResponse, SubscanRequest, TransferItem, TransfersListResponse } from '@subwallet/extension-base/services/subscan-service/types';
+import { CrowdloanContributionsResponse, ExtrinsicItem, ExtrinsicsListResponse, IMultiChainBalance, RequestBlockRange, TransferItem, TransfersListResponse } from '@subwallet/extension-base/services/subscan-service/types';
 export declare class SubscanService {
     private subscanChainMap;
     private limitRate;
@@ -15,7 +15,7 @@ export declare class SubscanService {
     });
     private getApiUrl;
     private postRequest;
-    addRequest<T>(run: SubscanRequest<T>['run']): Promise<T>;
+    private addRequest;
     private process;
     checkSupportedSubscanChain(chain: string): boolean;
     setSubscanChainMap(subscanChainMap: Record<string, string>): void;
@@ -31,5 +31,4 @@ export declare class SubscanService {
         page: number;
         record: number;
     }): Promise<Record<string, TransferItem[]>>;
-    getRewardHistoryList(chain: string, address: string, page?: number): Promise<RewardHistoryListResponse>;
 }

package/services/subscan-service/index.js

@@ -237,19 +237,4 @@ export class SubscanService {
     await _getTransferItems(0);
     return resultMap;
   }
-  getRewardHistoryList(chain, address, page = 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('SubscanService.getRewardHistoryList', await rs.text());
-      }
-      const jsonData = await rs.json();
-      return jsonData.data;
-    });
-  }
 }

package/services/subscan-service/types.d.ts

@@ -175,23 +175,3 @@ export declare type RequestBlockRange = {
     from: number | null;
     to: number | null;
 };
-export interface RewardHistoryItem {
-    block_num: number;
-    extrinsic_idx: number;
-    stash: string;
-    account: string;
-    module_id: string;
-    event_id: string;
-    event_method: string;
-    params: string;
-    extrinsic_hash: string;
-    event_idx: number;
-    amount: string;
-    block_timestamp: number;
-    event_index: string;
-    extrinsic_index: string;
-}
-export interface RewardHistoryListResponse {
-    count: number;
-    list: null | RewardHistoryItem[];
-}

package/services/transaction-service/event-parser/index.d.ts

@@ -1,7 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { ExtrinsicType, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 import { EventRecord } from '@polkadot/types/interfaces';
 export declare function parseXcmEventLogs(historyItem: Partial<TransactionHistoryItem>, eventLogs: EventRecord[], chain: string, sendingTokenInfo: _ChainAsset, chainInfo: _ChainInfo): void;
 export declare function parseTransferEventLogs(historyItem: Partial<TransactionHistoryItem>, eventLogs: EventRecord[], chain: string, sendingTokenInfo: _ChainAsset, chainInfo: _ChainInfo): void;
-export declare function parseLiquidStakingEvents(historyItem: Partial<TransactionHistoryItem>, eventLogs: EventRecord[], inputTokenInfo: _ChainAsset, chainInfo: _ChainInfo, feePaidWithInputAsset: boolean, extrinsicType: ExtrinsicType): void;
-export declare function parseLiquidStakingFastUnstakeEvents(historyItem: Partial<TransactionHistoryItem>, eventLogs: EventRecord[], chainInfo: _ChainInfo, extrinsicType: ExtrinsicType): void;