@subwallet/extension-base 1.1.28-beta.1 → 1.1.30-0

package/services/campaign-service/index.js

@@ -5,21 +5,18 @@ import { CampaignDataType } from '@subwallet/extension-base/background/KoniTypes
 import { TARGET_ENV } from '@subwallet/extension-base/utils';
 import { fetchStaticData } from '@subwallet/extension-base/utils/fetchStaticData';
 import { runCampaign } from "./helpers.js";
-const targetEnvs = ['extension', 'mobile'];
 export default class CampaignService {
   #state;
   constructor(state) {
     this.#state = state;
   }
   init() {
-    if (targetEnvs.includes(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 fetchStaticData('marketing-campaigns');

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

@@ -33,6 +33,17 @@ export declare const _NFT_CHAIN_GROUP: {
     bitcountry: string[];
     vara: string[];
 };
+export declare const _STAKING_CHAIN_GROUP: {
+    relay: string[];
+    para: string[];
+    astar: string[];
+    amplitude: string[];
+    kilt: string[];
+    nominationPool: string[];
+    bifrost: string[];
+    aleph: string[];
+    ternoa: string[];
+};
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
 export declare const _EXPECTED_BLOCK_TIME: Record<string, number>;
 export declare const _PARACHAIN_INFLATION_DISTRIBUTION: Record<string, Record<string, number>>;

package/services/chain-service/constants.js

@@ -52,6 +52,19 @@ export const _NFT_CHAIN_GROUP = {
 
 // Staking--------------------------------------------------------------------------------------------------------------
 
+export 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'],
+  astar: ['astar', 'shiden', 'shibuya'],
+  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
+  // amplitude and kilt only share some common logic
+  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']
+};
 export const _STAKING_ERA_LENGTH_MAP = {
   // in hours
   alephTest: 24,
@@ -229,7 +242,7 @@ export const _XCM_TYPE = {
   PR: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.RELAYCHAIN}` // UMP
 };
 
-export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network', 'bifrost_dot', 'parallel', 'acala', 'interlay'];
+export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network'];
 export const EVM_PASS_CONNECT_STATUS = {
   arbitrum_one: ['*']
 };

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

@@ -30,7 +30,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,7 +8,6 @@ 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>;

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,8 +17,6 @@ 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');
@@ -30,7 +27,6 @@ export class EventService extends EventEmitter {
   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];

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 EnableEarningChains from '@subwallet/extension-base/services/migration-service/scripts/EnableEarningChains';
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -35,8 +33,6 @@ export default {
   '1.1.6-01': MigrateWalletReference,
   '1.1.7': DeleteChain,
   '1.1.13-01': MigrateTokenDecimals,
-  '1.1.13-02': EnableEarningChains,
-  '1.1.13-03': DeleteEarningData,
   '1.1.17-01': MigratePioneerProvider,
   '1.1.17-03': EnableVaraChain,
   '1.1.24-01': MigrateProvidersV1M1P24,

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

@@ -8,9 +8,7 @@ import ChainStakingMetadataStore from '@subwallet/extension-base/services/storag
 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[];
@@ -29,8 +27,6 @@ export default class DatabaseService {
         metadata: MetadataStore;
         chain: ChainStore;
         asset: AssetStore;
-        yieldPoolInfo: YieldPoolStore;
-        yieldPosition: YieldPositionStore;
         chainStakingMetadata: ChainStakingMetadataStore;
         nominatorMetadata: NominatorMetadataStore;
         mantaPay: MantaPayStore;
@@ -39,7 +35,6 @@ export default class DatabaseService {
     private logger;
     private nftSubscription;
     private stakingSubscription;
-    private yieldInfoSubscription;
     constructor(eventService: EventService);
     updatePriceStore(priceData: PriceJson): Promise<void>;
     getPriceStore(): Promise<PriceJson | undefined>;
@@ -88,17 +83,6 @@ export default class DatabaseService {
     subscribeMantaPayConfig(chain: string, callback: (data: MantaPayConfig[]) => void): void;
     getMantaPayConfig(chain: string): Promise<any[]>;
     getMantaPayFirstConfig(chain: string): Promise<any>;
-    updateYieldPoolStore(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;
-    updateYieldPosition(data: YieldPositionInfo): Promise<void>;
-    getYieldPositionByAddress(addresses: string[]): Promise<YieldPositionInfo[]>;
-    subscribeYieldPosition(addresses: string[], callback: (data: YieldPositionInfo[]) => void): Subscription;
-    getYieldNominationPoolPosition(addresses: string[], chains: string[]): Promise<YieldPositionInfo[]>;
     subscribeProcessingCampaign(): import("dexie").Observable<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     getProcessingCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     getCampaign(slug: string): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData | undefined>;

package/services/storage-service/DatabaseService.js

@@ -8,8 +8,6 @@ import CampaignStore from '@subwallet/extension-base/services/storage-service/db
 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';
@@ -36,9 +34,6 @@ 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),
@@ -277,48 +272,6 @@ export default class DatabaseService {
     return this.stores.mantaPay.getFirstConfig(chain);
   }
 
-  /* Earning */
-
-  async updateYieldPoolStore(data) {
-    await this.stores.yieldPoolInfo.upsert(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;
-  }
-  async updateYieldPosition(data) {
-    await this.stores.yieldPosition.upsert(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 */
 
   subscribeProcessingCampaign() {

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

@@ -1,6 +1,6 @@
 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;
@@ -45,8 +45,6 @@ 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>;
     private schemaVersion;

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

@@ -31,10 +31,6 @@ 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'
     });
   }

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, 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;

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;

package/services/transaction-service/event-parser/index.js

@@ -1,8 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
 export function parseXcmEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chainInfo) {
   for (let index = 0; index < eventLogs.length; index++) {
     const record = eventLogs[index];
@@ -66,59 +65,4 @@ export function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTok
       }
     }
   }
-}
-export function parseLiquidStakingEvents(historyItem, eventLogs, inputTokenInfo, chainInfo, feePaidWithInputAsset, extrinsicType) {
-  if (feePaidWithInputAsset) {
-    historyItem.fee = {
-      value: '0',
-      // TODO
-      symbol: _getAssetSymbol(inputTokenInfo),
-      decimals: _getAssetDecimals(inputTokenInfo)
-    };
-  } else {
-    for (let index = 0; index < eventLogs.length; index++) {
-      const record = eventLogs[index];
-      const {
-        decimals: nativeDecimals,
-        symbol: nativeSymbol
-      } = _getChainNativeTokenBasicInfo(chainInfo);
-      const section = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'tokens' : 'balances';
-      const eventMethod = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'withdrawn' : 'withdraw';
-      if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
-        var _record$event$data$9;
-        if ((_record$event$data$9 = record.event.data[2]) !== null && _record$event$data$9 !== void 0 && _record$event$data$9.toString()) {
-          var _record$event$data$10;
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          historyItem.fee = {
-            value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
-            symbol: nativeSymbol,
-            decimals: nativeDecimals
-          };
-        }
-      }
-    }
-  }
-}
-export function parseLiquidStakingFastUnstakeEvents(historyItem, eventLogs, chainInfo, extrinsicType) {
-  for (let index = 0; index < eventLogs.length; index++) {
-    const record = eventLogs[index];
-    const {
-      decimals: nativeDecimals,
-      symbol: nativeSymbol
-    } = _getChainNativeTokenBasicInfo(chainInfo);
-    const section = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'tokens' : 'balances';
-    const eventMethod = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'withdrawn' : 'withdraw';
-    if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
-      var _record$event$data$11;
-      if ((_record$event$data$11 = record.event.data[2]) !== null && _record$event$data$11 !== void 0 && _record$event$data$11.toString()) {
-        var _record$event$data$12;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        historyItem.fee = {
-          value: ((_record$event$data$12 = record.event.data[2]) === null || _record$event$data$12 === void 0 ? void 0 : _record$event$data$12.toString()) || '0',
-          symbol: nativeSymbol,
-          decimals: nativeDecimals
-        };
-      }
-    }
-  }
 }

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

@@ -30,7 +30,7 @@ const typeName = type => {
     case ExtrinsicType.STAKING_BOND:
       return 'Bond';
     case ExtrinsicType.STAKING_UNBOND:
-      return 'Unstake';
+      return 'Unbond';
     case ExtrinsicType.STAKING_CLAIM_REWARD:
       return 'Claim reward';
     case ExtrinsicType.STAKING_WITHDRAW:
@@ -45,8 +45,6 @@ const typeName = type => {
       return 'Cancel compounding';
     case ExtrinsicType.STAKING_POOL_WITHDRAW:
       return 'Withdraw pool';
-    case ExtrinsicType.JOIN_YIELD_POOL:
-      return 'Start earning';
     case ExtrinsicType.UNKNOWN:
     default:
       return 'unknown';

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

@@ -1,15 +1,27 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { BalanceService } from '@subwallet/extension-base/services/balance-service';
+import { ChainService } from '@subwallet/extension-base/services/chain-service';
+import { EventService } from '@subwallet/extension-base/services/event-service';
+import { HistoryService } from '@subwallet/extension-base/services/history-service';
+import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
+import RequestService from '@subwallet/extension-base/services/request-service';
+import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SWTransaction, SWTransactionInput, SWTransactionResponse, TransactionEmitter } from '@subwallet/extension-base/services/transaction-service/types';
 import { BehaviorSubject } from 'rxjs';
 import { TransactionConfig } from 'web3-core';
 import { HexString } from '@polkadot/util/types';
 export default class TransactionService {
-    private readonly state;
+    private readonly balanceService;
+    private readonly chainService;
+    private readonly databaseService;
+    private readonly eventService;
+    private readonly historyService;
+    private readonly notificationService;
+    private readonly requestService;
     private readonly transactionSubject;
     private readonly watchTransactionSubscribes;
     private get transactions();
-    constructor(state: KoniState);
+    constructor(chainService: ChainService, eventService: EventService, requestService: RequestService, balanceService: BalanceService, historyService: HistoryService, notificationService: NotificationService, databaseService: DatabaseService);
     private get allTransactions();
     private get processingTransactions();
     getTransaction(id: string): SWTransaction;
@@ -35,6 +47,5 @@ export default class TransactionService {
     private signAndSendEvmTransaction;
     private signAndSendSubstrateTransaction;
     private handleTransactionTimeout;
-    private handlePostEarningTransaction;
     resetWallet(): void;
 }