@subwallet/extension-base 1.1.34-0 → 1.1.35-0

package/cjs/constants/staking.js

@@ -11,7 +11,7 @@ const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
   vara_network: 29,
-  aleph: 55
+  aleph: 82
 };
 exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;
 const MAX_NOMINATIONS = '16';

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.34-0'
+  version: '1.1.35-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/constants.js

@@ -278,7 +278,7 @@ const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
 exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
-const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 300000;
+const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
 
 // TODO: review
 exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = LATEST_CHAIN_DATA_FETCHING_INTERVAL;

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

@@ -410,7 +410,10 @@ class ChainService {
 
     // TODO: reconsider the flow of initiation
     this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
-    this.dataMap.assetRefMap = _chainList.AssetRefMap;
+    // const storedAssetRefMap = await this.dbService.getAssetRefMap();
+    //
+    // this.dataMap.assetRefMap = storedAssetRefMap && Object.values(storedAssetRefMap).length > 0 ? storedAssetRefMap : AssetRefMap;
+
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -418,10 +421,31 @@ class ChainService {
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
     await this.initAssetSettings();
+    await this.initAssetRefMap();
     this.checkLatestData();
   }
+  async initAssetRefMap() {
+    try {
+      const fetchPromise = this.fetchLatestBlockedAssetRef();
+      const timeout = new Promise(resolve => {
+        const id = setTimeout(() => {
+          clearTimeout(id);
+          resolve(null);
+        }, 1000);
+      });
+      const disabledAssetRefs = (await Promise.race([timeout, fetchPromise])) || null;
+      if (disabledAssetRefs) {
+        this.handleLatestBlockedAssetRef(disabledAssetRefs);
+      } else {
+        this.dataMap.assetRefMap = _chainList.AssetRefMap;
+      }
+    } catch (e) {
+      this.dataMap.assetRefMap = _chainList.AssetRefMap;
+    }
+  }
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
+    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), _constants.LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {
@@ -446,6 +470,19 @@ class ChainService {
       console.error('Error fetching latest chain data');
     }
   }
+  handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
+    const updatedAssetRefMap = {
+      ..._chainList.AssetRefMap
+    };
+    latestBlockedAssetRefList.forEach(blockedAssetRef => {
+      delete updatedAssetRefMap[blockedAssetRef];
+    });
+    this.dataMap.assetRefMap = updatedAssetRefMap;
+
+    // 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(_ref3 => {
       let [slug, priceId] = _ref3;
@@ -461,6 +498,9 @@ 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);
@@ -666,6 +706,9 @@ class ChainService {
   async fetchLatestPriceIdsData() {
     return await (0, _utils2.fetchStaticData)('chain-assets/price-map');
   }
+  async fetchLatestBlockedAssetRef() {
+    return await (0, _utils2.fetchStaticData)('chain-assets/disabled-xcm-channels');
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = _chainList.ChainInfoMap;

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

@@ -47,8 +47,10 @@ class DatabaseService {
       nominatorMetadata: new _NominatorMetadata.default(this._db.nominatorMetadata),
       mantaPay: new _MantaPay.default(this._db.mantaPay),
       campaign: new _Campaign.default(this._db.campaign)
+      // assetRef: new AssetRefStore(this._db.assetRef)
     };
   }
+
   async updatePriceStore(priceData) {
     await this.stores.price.table.put(priceData);
   }
@@ -324,5 +326,37 @@ class DatabaseService {
   async getExportJson() {
     return JSON.parse(await this.exportDB());
   }
+
+  // public setAssetRef (assetRef: Record<string, _AssetRef>) {
+  //   const assetRefList = Object.entries(assetRef).map(([slug, item]) => {
+  //     return {
+  //       slug,
+  //       ...item
+  //     } as IAssetRef;
+  //   });
+  //
+  //   return this.stores.assetRef.bulkUpsert(assetRefList);
+  // }
+  //
+  // public getAssetRef (slug: string) {
+  //   return this.stores.assetRef.getAssetRef(slug);
+  // }
+  //
+  // public async getAssetRefMap (): Promise<Record<string, _AssetRef>> {
+  //   const assetRefList = await this.stores.assetRef.getAll();
+  //   const assetRefObj: Record<string, _AssetRef> = {};
+  //
+  //   assetRefList.forEach((item) => {
+  //     assetRefObj[item.slug] = {
+  //       ...item
+  //     };
+  //   });
+  //
+  //   return assetRefObj;
+  // }
+  //
+  // public subscribeAssetRef () {
+  //   return this.stores.assetRef.subscribeAssetRef();
+  // }
 }
 exports.default = DatabaseService;

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

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _BaseStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStore"));
+var _dexie = require("dexie");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class AssetRefStore extends _BaseStore.default {
+  async getAll() {
+    return this.table.toArray();
+  }
+  async getAssetRef(slug) {
+    return this.table.get(slug);
+  }
+  subscribeAssetRef() {
+    return (0, _dexie.liveQuery)(async () => await this.table.toArray());
+  }
+}
+exports.default = AssetRefStore;

package/constants/staking.js

@@ -5,6 +5,6 @@ export const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
   vara_network: 29,
-  aleph: 55
+  aleph: 82
 };
 export const MAX_NOMINATIONS = '16';

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.34-0",
+  "version": "1.1.35-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -978,6 +978,11 @@
       "require": "./cjs/services/storage-service/db-stores/Asset.js",
       "default": "./services/storage-service/db-stores/Asset.js"
     },
+    "./services/storage-service/db-stores/AssetRef": {
+      "types": "./services/storage-service/db-stores/AssetRef.d.ts",
+      "require": "./cjs/services/storage-service/db-stores/AssetRef.js",
+      "default": "./services/storage-service/db-stores/AssetRef.js"
+    },
     "./services/storage-service/db-stores/Balance": {
       "types": "./services/storage-service/db-stores/Balance.d.ts",
       "require": "./cjs/services/storage-service/db-stores/Balance.js",
@@ -1399,10 +1404,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.39",
-    "@subwallet/extension-base": "^1.1.34-0",
-    "@subwallet/extension-chains": "^1.1.34-0",
-    "@subwallet/extension-dapp": "^1.1.34-0",
-    "@subwallet/extension-inject": "^1.1.34-0",
+    "@subwallet/extension-base": "^1.1.35-0",
+    "@subwallet/extension-chains": "^1.1.35-0",
+    "@subwallet/extension-dapp": "^1.1.35-0",
+    "@subwallet/extension-inject": "^1.1.35-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.34-0'
+  version: '1.1.35-0'
 };

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

@@ -96,7 +96,7 @@ export declare const EVM_PASS_CONNECT_STATUS: Record<string, string[]>;
 export declare const EVM_REFORMAT_DECIMALS: {
     acala: string[];
 };
-export declare const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 300000;
+export declare const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
 export declare const _CHAIN_INFO_SRC: string;
 export declare const _CHAIN_ASSET_SRC: string;
 export declare const _ASSET_REF_SRC: string;

package/services/chain-service/constants.js

@@ -252,7 +252,7 @@ export const EVM_PASS_CONNECT_STATUS = {
 export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
-export const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 300000;
+export const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
 
 // TODO: review
 const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';

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

@@ -71,9 +71,11 @@ export declare class ChainService {
     deleteAssetsByChain(chainSlug: string): void;
     deleteCustomAssets(targetAssets: string[]): void;
     init(): Promise<void>;
+    initAssetRefMap(): Promise<void>;
     checkLatestData(): void;
     stopCheckLatestChainData(): void;
     handleLatestProviderData(latestChainInfo: _ChainInfo[]): void;
+    handleLatestBlockedAssetRef(latestBlockedAssetRefList: string[]): void;
     handleLatestPriceId(latestPriceIds: Record<string, string | null>): void;
     handleLatestData(): void;
     private initApis;
@@ -86,6 +88,7 @@ export declare class ChainService {
     private checkExistedPredefinedChain;
     private fetchLatestChainData;
     private fetchLatestPriceIdsData;
+    private fetchLatestBlockedAssetRef;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;

package/services/chain-service/index.js

@@ -396,7 +396,10 @@ export class ChainService {
 
     // TODO: reconsider the flow of initiation
     this.multiChainAssetMapSubject.next(MultiChainAssetMap);
-    this.dataMap.assetRefMap = AssetRefMap;
+    // const storedAssetRefMap = await this.dbService.getAssetRefMap();
+    //
+    // this.dataMap.assetRefMap = storedAssetRefMap && Object.values(storedAssetRefMap).length > 0 ? storedAssetRefMap : AssetRefMap;
+
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.updateChainStateMapSubscription();
@@ -404,10 +407,31 @@ export class ChainService {
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
     await this.initAssetSettings();
+    await this.initAssetRefMap();
     this.checkLatestData();
   }
+  async initAssetRefMap() {
+    try {
+      const fetchPromise = this.fetchLatestBlockedAssetRef();
+      const timeout = new Promise(resolve => {
+        const id = setTimeout(() => {
+          clearTimeout(id);
+          resolve(null);
+        }, 1000);
+      });
+      const disabledAssetRefs = (await Promise.race([timeout, fetchPromise])) || null;
+      if (disabledAssetRefs) {
+        this.handleLatestBlockedAssetRef(disabledAssetRefs);
+      } else {
+        this.dataMap.assetRefMap = AssetRefMap;
+      }
+    } catch (e) {
+      this.dataMap.assetRefMap = AssetRefMap;
+    }
+  }
   checkLatestData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
+    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {
@@ -432,6 +456,19 @@ export class ChainService {
       console.error('Error fetching latest chain data');
     }
   }
+  handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
+    const updatedAssetRefMap = {
+      ...AssetRefMap
+    };
+    latestBlockedAssetRefList.forEach(blockedAssetRef => {
+      delete updatedAssetRefMap[blockedAssetRef];
+    });
+    this.dataMap.assetRefMap = updatedAssetRefMap;
+
+    // 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]) {
@@ -446,6 +483,9 @@ 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);
@@ -649,6 +689,9 @@ 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/storage-service/DatabaseService.js

@@ -39,8 +39,10 @@ export default class DatabaseService {
       nominatorMetadata: new NominatorMetadataStore(this._db.nominatorMetadata),
       mantaPay: new MantaPayStore(this._db.mantaPay),
       campaign: new CampaignStore(this._db.campaign)
+      // assetRef: new AssetRefStore(this._db.assetRef)
     };
   }
+
   async updatePriceStore(priceData) {
     await this.stores.price.table.put(priceData);
   }
@@ -315,4 +317,36 @@ export default class DatabaseService {
   async getExportJson() {
     return JSON.parse(await this.exportDB());
   }
+
+  // public setAssetRef (assetRef: Record<string, _AssetRef>) {
+  //   const assetRefList = Object.entries(assetRef).map(([slug, item]) => {
+  //     return {
+  //       slug,
+  //       ...item
+  //     } as IAssetRef;
+  //   });
+  //
+  //   return this.stores.assetRef.bulkUpsert(assetRefList);
+  // }
+  //
+  // public getAssetRef (slug: string) {
+  //   return this.stores.assetRef.getAssetRef(slug);
+  // }
+  //
+  // public async getAssetRefMap (): Promise<Record<string, _AssetRef>> {
+  //   const assetRefList = await this.stores.assetRef.getAll();
+  //   const assetRefObj: Record<string, _AssetRef> = {};
+  //
+  //   assetRefList.forEach((item) => {
+  //     assetRefObj[item.slug] = {
+  //       ...item
+  //     };
+  //   });
+  //
+  //   return assetRefObj;
+  // }
+  //
+  // public 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 } 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>;

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());
+  }
+}