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

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/services/chain-service/constants.js

@@ -263,7 +263,7 @@ const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
 exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
-const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 30000;
+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

@@ -411,8 +411,10 @@ class ChainService {
 
     // TODO: reconsider the flow of initiation
     this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
-    const storedAssetRefMap = await this.dbService.getAssetRefMap();
-    this.dataMap.assetRefMap = storedAssetRefMap && Object.values(storedAssetRefMap).length > 0 ? storedAssetRefMap : _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();
@@ -420,12 +422,33 @@ 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.handleLatestData();
+    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), _constants.LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {
@@ -451,14 +474,15 @@ class ChainService {
     }
   }
   handleLatestBlockedAssetRef(latestBlockedAssetRefList) {
-    if (latestBlockedAssetRefList.length > 0) {
-      latestBlockedAssetRefList.forEach(blockedAssetRef => {
-        delete this.dataMap.assetRefMap[blockedAssetRef];
-      });
-    } else {
-      this.dataMap.assetRefMap = _chainList.AssetRefMap;
-    }
-    this.dbService.setAssetRef(this.dataMap.assetRefMap).catch(console.error);
+    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');
   }

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

@@ -8,7 +8,6 @@ exports.default = exports.DEXIE_BACKUP_TABLES = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _databases = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/databases"));
 var _dbStores = require("@subwallet/extension-base/services/storage-service/db-stores");
-var _AssetRef2 = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/AssetRef"));
 var _Campaign = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/Campaign"));
 var _ChainStakingMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata"));
 var _MantaPay = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/MantaPay"));
@@ -52,10 +51,11 @@ class DatabaseService {
       chainStakingMetadata: new _ChainStakingMetadata.default(this._db.chainStakingMetadata),
       nominatorMetadata: new _NominatorMetadata.default(this._db.nominatorMetadata),
       mantaPay: new _MantaPay.default(this._db.mantaPay),
-      campaign: new _Campaign.default(this._db.campaign),
-      assetRef: new _AssetRef2.default(this._db.assetRef)
+      campaign: new _Campaign.default(this._db.campaign)
+      // assetRef: new AssetRefStore(this._db.assetRef)
     };
   }
+
   async updatePriceStore(priceData) {
     await this.stores.price.table.put(priceData);
   }
@@ -389,31 +389,37 @@ class DatabaseService {
   async getExportJson() {
     return JSON.parse(await this.exportDB());
   }
-  setAssetRef(assetRef) {
-    const assetRefList = Object.entries(assetRef).map(_ref => {
-      let [slug, item] = _ref;
-      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();
-  }
+
+  // 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/databases/index.js

@@ -46,9 +46,6 @@ class KoniDatabase extends _dexie.default {
     this.conditionalVersion(5, {
       campaign: 'slug'
     });
-    this.conditionalVersion(5, {
-      assetRef: 'slug'
-    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {

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.33-beta.1",
+  "version": "1.1.33-beta.2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",

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

@@ -84,7 +84,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 = 30000;
+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

@@ -238,7 +238,7 @@ export const EVM_PASS_CONNECT_STATUS = {
 export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
-export const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 30000;
+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,6 +71,7 @@ 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;

package/services/chain-service/index.js

@@ -397,8 +397,10 @@ 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;
+    // 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();
@@ -406,12 +408,33 @@ 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.handleLatestData();
+    this.handleLatestData();
     this.refreshLatestChainDataTimeOut = setInterval(this.handleLatestData.bind(this), LATEST_CHAIN_DATA_FETCHING_INTERVAL);
   }
   stopCheckLatestChainData() {
@@ -437,14 +460,15 @@ export class ChainService {
     }
   }
   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);
+    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');
   }

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

@@ -1,9 +1,8 @@
-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';
@@ -36,7 +35,6 @@ export default class DatabaseService {
         nominatorMetadata: NominatorMetadataStore;
         mantaPay: MantaPayStore;
         campaign: CampaignStore;
-        assetRef: AssetRefStore;
     };
     private logger;
     private nftSubscription;
@@ -114,8 +112,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,7 +4,6 @@
 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';
@@ -44,10 +43,11 @@ 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),
-      assetRef: new AssetRefStore(this._db.assetRef)
+      campaign: new CampaignStore(this._db.campaign)
+      // assetRef: new AssetRefStore(this._db.assetRef)
     };
   }
+
   async updatePriceStore(priceData) {
     await this.stores.price.table.put(priceData);
   }
@@ -380,29 +380,36 @@ 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();
-  }
+
+  // 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

@@ -52,7 +52,6 @@ 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,9 +37,6 @@ 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) {