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

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,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() {

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

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,19 +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 transactionSubject;
+    private readonly balanceService;
+    private readonly chainService;
+    private readonly databaseService;
     private readonly eventService;
     private readonly historyService;
     private readonly notificationService;
-    private readonly chainService;
+    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;
@@ -40,6 +48,5 @@ export default class TransactionService {
     private signAndSendEvmTransaction;
     private signAndSendSubstrateTransaction;
     private handleTransactionTimeout;
-    private handlePostEarningTransaction;
     resetWallet(): void;
 }