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

package/services/earning-service/handlers/special.js

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
@@ -201,13 +200,16 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
         const altInputTokenBalance = await this.state.balanceService.getTokenFreeBalance(address, altInputTokenInfo.originChain, altInputTokenSlug);
         const bnAltInputTokenBalance = new BN(altInputTokenBalance.value || '0');
         if (bnAltInputTokenBalance.gt(BN_ZERO)) {
+          const altChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
+          const symbol = altInputTokenInfo.symbol;
+          const networkName = altChainInfo.name;
           const step = {
             metadata: {
               sendingValue: bnAmount.toString(),
               originTokenInfo: altInputTokenInfo,
               destinationTokenInfo: inputTokenInfo
             },
-            name: 'Transfer DOT from Polkadot',
+            name: `Transfer ${symbol} from ${networkName}`,
             type: YieldStepType.XCM
           };
           const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
@@ -404,7 +406,9 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       amount
     } = data;
     const destinationTokenSlug = this.inputAsset;
-    const originChainInfo = this.state.getChainInfo(COMMON_CHAIN_SLUGS.POLKADOT);
+    const altInputTokenSlug = this.altInputAsset || '';
+    const altInputTokenInfo = this.state.getAssetBySlug(altInputTokenSlug);
+    const originChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
     const originTokenSlug = _getChainNativeTokenSlug(originChainInfo);
     const originTokenInfo = this.state.getAssetBySlug(originTokenSlug);
     const destinationTokenInfo = this.state.getAssetBySlug(destinationTokenSlug);

package/services/earning-service/service.js

@@ -12,7 +12,7 @@ import { YieldPoolType } from '@subwallet/extension-base/types';
 import { addLazy, categoryAddresses, createPromiseHandler } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { BehaviorSubject } from 'rxjs';
-import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler } from "./handlers/index.js";
+import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler } from "./handlers/index.js";
 const POOLS_DATA_URLS = 'https://sw-static-cache.pages.dev/earning/yield-pools.json';
 const fetchPoolsData = async () => {
   const res = await fetch(POOLS_DATA_URLS);
@@ -70,6 +70,7 @@ export default class EarningService {
       if (_STAKING_CHAIN_GROUP.liquidStaking.includes(chain)) {
         if (chain === 'bifrost_dot') {
           handlers.push(new BifrostLiquidStakingPoolHandler(this.state, chain));
+          handlers.push(new BifrostMantaLiquidStakingPoolHandler(this.state, chain));
         }
         if (chain === 'acala') {
           handlers.push(new AcalaLiquidStakingPoolHandler(this.state, chain));

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

@@ -1,8 +1,9 @@
-import { _ChainAsset } from '@subwallet/chain-list/types';
+import { _AssetRef, _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 { IBalance, ICampaign, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
+import { IAssetRef, 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';
@@ -35,6 +36,7 @@ export default class DatabaseService {
         nominatorMetadata: NominatorMetadataStore;
         mantaPay: MantaPayStore;
         campaign: CampaignStore;
+        assetRef: AssetRefStore;
     };
     private logger;
     private nftSubscription;
@@ -112,4 +114,8 @@ 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,6 +4,7 @@
 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';
@@ -43,7 +44,8 @@ export default class DatabaseService {
       chainStakingMetadata: new ChainStakingMetadataStore(this._db.chainStakingMetadata),
       nominatorMetadata: new NominatorMetadataStore(this._db.nominatorMetadata),
       mantaPay: new MantaPayStore(this._db.mantaPay),
-      campaign: new CampaignStore(this._db.campaign)
+      campaign: new CampaignStore(this._db.campaign),
+      assetRef: new AssetRefStore(this._db.assetRef)
     };
   }
   async updatePriceStore(priceData) {
@@ -378,4 +380,29 @@ 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,4 +1,4 @@
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _AssetRef, _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 Dexie, { Table } from 'dexie';
@@ -31,6 +31,9 @@ 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>;
@@ -49,6 +52,7 @@ export default class KoniDatabase extends Dexie {
     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

@@ -37,6 +37,9 @@ export default class KoniDatabase extends Dexie {
     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/AssetRef.d.ts

@@ -0,0 +1,7 @@
+import { IAssetRef } from '@subwallet/extension-base/services/storage-service/databases';
+import BaseStore from '@subwallet/extension-base/services/storage-service/db-stores/BaseStore';
+export default class AssetRefStore extends BaseStore<IAssetRef> {
+    getAll(): Promise<IAssetRef[]>;
+    getAssetRef(slug: string): Promise<IAssetRef | undefined>;
+    subscribeAssetRef(): import("dexie").Observable<IAssetRef[]>;
+}

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

@@ -0,0 +1,16 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseStore from '@subwallet/extension-base/services/storage-service/db-stores/BaseStore';
+import { liveQuery } from 'dexie';
+export default class AssetRefStore extends BaseStore {
+  async getAll() {
+    return this.table.toArray();
+  }
+  async getAssetRef(slug) {
+    return this.table.get(slug);
+  }
+  subscribeAssetRef() {
+    return liveQuery(async () => await this.table.toArray());
+  }
+}

package/services/transaction-service/index.js

@@ -522,6 +522,7 @@ export default class TransactionService {
       case ExtrinsicType.MINT_QDOT:
       case ExtrinsicType.MINT_LDOT:
       case ExtrinsicType.MINT_SDOT:
+      case ExtrinsicType.MINT_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case ExtrinsicType.MINT_VDOT:
@@ -575,12 +576,14 @@ export default class TransactionService {
           break;
         }
       case ExtrinsicType.UNSTAKE_VDOT:
+      case ExtrinsicType.UNSTAKE_VMANTA:
       case ExtrinsicType.UNSTAKE_LDOT:
       case ExtrinsicType.UNSTAKE_SDOT:
       case ExtrinsicType.UNSTAKE_STDOT:
       case ExtrinsicType.REDEEM_STDOT:
       case ExtrinsicType.REDEEM_LDOT:
       case ExtrinsicType.REDEEM_SDOT:
+      case ExtrinsicType.REDEEM_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case ExtrinsicType.REDEEM_VDOT:

package/types/yield/actions/join/step.d.ts

@@ -39,6 +39,7 @@ export declare enum YieldStepType {
     NOMINATE = "NOMINATE",
     JOIN_NOMINATION_POOL = "JOIN_NOMINATION_POOL",
     MINT_VDOT = "MINT_VDOT",
+    MINT_VMANTA = "MINT_VMANTA",
     MINT_LDOT = "MINT_LDOT",
     MINT_QDOT = "MINT_QDOT",
     MINT_SDOT = "MINT_SDOT",

package/types/yield/actions/join/step.js

@@ -38,6 +38,7 @@ export let YieldStepType;
   YieldStepType["NOMINATE"] = "NOMINATE";
   YieldStepType["JOIN_NOMINATION_POOL"] = "JOIN_NOMINATION_POOL";
   YieldStepType["MINT_VDOT"] = "MINT_VDOT";
+  YieldStepType["MINT_VMANTA"] = "MINT_VMANTA";
   YieldStepType["MINT_LDOT"] = "MINT_LDOT";
   YieldStepType["MINT_QDOT"] = "MINT_QDOT";
   YieldStepType["MINT_SDOT"] = "MINT_SDOT";