@subwallet/extension-base 1.1.50-0 → 1.1.51-1

package/cjs/koni/background/handlers/Extension.js

@@ -3270,20 +3270,16 @@ class KoniExtension {
   }
   async subscribeAssetRegistry(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    let ready = false;
+    await this.#koniState.eventService.waitAssetOnlineReady;
     const assetRegistrySubscription = this.#koniState.subscribeAssetRegistry().subscribe({
       next: rs => {
-        if (ready) {
-          cb(rs);
-        }
+        cb(rs);
       }
     });
     this.createUnsubscriptionHandle(id, assetRegistrySubscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    await this.#koniState.eventService.waitAssetReady;
-    ready = true;
     return this.#koniState.getAssetRegistry();
   }
   subscribeMultiChainAssetMap(id, port) {

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.50-0'
+  version: '1.1.51-1'
 };
 exports.packageInfo = packageInfo;

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

@@ -520,39 +520,38 @@ class ChainService {
     }
     this.logger.log('Finished updating latest price IDs');
   }
-  handleLatestAssetData(_latestAssetInfo, _latestAssetLogoMap) {
+  handleLatestAssetData(latestAssetInfo, latestAssetLogoMap) {
     try {
-      let needUpdate = false;
-      const latestAssetInfo = _latestAssetInfo || {};
-      const latestAssetLogoMap = _latestAssetLogoMap || {};
-      const latestAssetPatch = JSON.stringify(latestAssetInfo);
-      const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
-      if (this.assetMapPatch !== latestAssetPatch) {
-        needUpdate = true;
-        const assetRegistry = {
-          ..._chainList.ChainAssetMap,
-          ...latestAssetInfo
-        };
-        this.assetMapPatch = latestAssetPatch;
-        this.dataMap.assetRegistry = assetRegistry;
-        this.assetRegistrySubject.next(assetRegistry);
-      }
-      if (this.assetLogoPatch !== latestAssetLogoPatch) {
-        const logoMap = {
-          ..._chainList.AssetLogoMap,
-          ...latestAssetLogoMap
-        };
-        this.assetLogoPatch = latestAssetLogoPatch;
-        this.assetLogoMapSubject.next(logoMap);
+      if (latestAssetInfo) {
+        const latestAssetPatch = JSON.stringify(latestAssetInfo);
+        if (this.assetMapPatch !== latestAssetPatch) {
+          const assetRegistry = {
+            ..._chainList.ChainAssetMap,
+            ...latestAssetInfo
+          };
+          this.assetMapPatch = latestAssetPatch;
+          this.dataMap.assetRegistry = assetRegistry;
+          this.assetRegistrySubject.next(assetRegistry);
+          this.autoEnableTokens().then(() => {
+            this.eventService.emit('asset.updateState', '');
+          }).catch(console.error);
+        }
       }
-      if (needUpdate) {
-        this.autoEnableTokens().then(() => {
-          this.eventService.emit('asset.updateState', '');
-        }).catch(console.error);
+      if (latestAssetLogoMap) {
+        const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+        if (this.assetLogoPatch !== latestAssetLogoPatch) {
+          const logoMap = {
+            ..._chainList.AssetLogoMap,
+            ...latestAssetLogoMap
+          };
+          this.assetLogoPatch = latestAssetLogoPatch;
+          this.assetLogoMapSubject.next(logoMap);
+        }
       }
     } catch (e) {
       console.error('Error fetching latest asset data');
     }
+    this.eventService.emit('asset.online.ready', true);
     this.logger.log('Finished updating latest asset');
   }
   async autoEnableTokens() {

package/cjs/services/chain-service/utils/patch.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchPatchData = fetchPatchData;
-var _packageInfo = require("@subwallet/chain-list/packageInfo");
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -13,9 +12,10 @@ var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
+const ChainListVersion = '0.2.53';
 async function fetchPatchData(slug) {
   try {
-    const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${_packageInfo.packageInfo.version}/${slug}`);
+    const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
         clearTimeout(id);

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

@@ -29,6 +29,7 @@ class EventService extends _eventemitter.default {
     this.waitInjectReady = _utils.TARGET_ENV === 'webapp' ? this.generateWaitPromise('inject.ready') : Promise.resolve(true);
     this.waitChainReady = this.generateWaitPromise('chain.ready');
     this.waitAssetReady = this.generateWaitPromise('asset.ready');
+    this.waitAssetOnlineReady = this.generateWaitPromise('asset.online.ready');
     this.waitMigrateReady = this.generateWaitPromise('migration.done');
     this.waitCampaignReady = this.generateWaitPromise('campaign.ready');
     this.waitBuyTokenReady = this.generateWaitPromise('buy.tokens.ready');

package/koni/background/handlers/Extension.js

@@ -3184,20 +3184,16 @@ export default class KoniExtension {
   }
   async subscribeAssetRegistry(id, port) {
     const cb = createSubscription(id, port);
-    let ready = false;
+    await this.#koniState.eventService.waitAssetOnlineReady;
     const assetRegistrySubscription = this.#koniState.subscribeAssetRegistry().subscribe({
       next: rs => {
-        if (ready) {
-          cb(rs);
-        }
+        cb(rs);
       }
     });
     this.createUnsubscriptionHandle(id, assetRegistrySubscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    await this.#koniState.eventService.waitAssetReady;
-    ready = true;
     return this.#koniState.getAssetRegistry();
   }
   subscribeMultiChainAssetMap(id, port) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.50-0",
+  "version": "1.1.51-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1802,10 +1802,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.53",
-    "@subwallet/extension-base": "^1.1.50-0",
-    "@subwallet/extension-chains": "^1.1.50-0",
-    "@subwallet/extension-dapp": "^1.1.50-0",
-    "@subwallet/extension-inject": "^1.1.50-0",
+    "@subwallet/extension-base": "^1.1.51-1",
+    "@subwallet/extension-chains": "^1.1.51-1",
+    "@subwallet/extension-dapp": "^1.1.51-1",
+    "@subwallet/extension-inject": "^1.1.51-1",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@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.50-0'
+  version: '1.1.51-1'
 };

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

@@ -86,7 +86,7 @@ export declare class ChainService {
     handleLatestProviderData(latestChainInfo: _ChainInfo[]): void;
     handleLatestAssetRef(latestBlockedAssetRefList: string[], latestAssetRefMap: Record<string, _AssetRef> | null): void;
     handleLatestPriceId(latestPriceIds: Record<string, string | null>): void;
-    handleLatestAssetData(_latestAssetInfo: Record<string, _ChainAsset> | null, _latestAssetLogoMap: Record<string, string> | null): void;
+    handleLatestAssetData(latestAssetInfo: Record<string, _ChainAsset> | null, latestAssetLogoMap: Record<string, string> | null): void;
     autoEnableTokens(): Promise<void>;
     handleLatestData(): void;
     private initApis;

package/services/chain-service/index.js

@@ -503,39 +503,38 @@ export class ChainService {
     }
     this.logger.log('Finished updating latest price IDs');
   }
-  handleLatestAssetData(_latestAssetInfo, _latestAssetLogoMap) {
+  handleLatestAssetData(latestAssetInfo, latestAssetLogoMap) {
     try {
-      let needUpdate = false;
-      const latestAssetInfo = _latestAssetInfo || {};
-      const latestAssetLogoMap = _latestAssetLogoMap || {};
-      const latestAssetPatch = JSON.stringify(latestAssetInfo);
-      const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
-      if (this.assetMapPatch !== latestAssetPatch) {
-        needUpdate = true;
-        const assetRegistry = {
-          ...ChainAssetMap,
-          ...latestAssetInfo
-        };
-        this.assetMapPatch = latestAssetPatch;
-        this.dataMap.assetRegistry = assetRegistry;
-        this.assetRegistrySubject.next(assetRegistry);
-      }
-      if (this.assetLogoPatch !== latestAssetLogoPatch) {
-        const logoMap = {
-          ...AssetLogoMap,
-          ...latestAssetLogoMap
-        };
-        this.assetLogoPatch = latestAssetLogoPatch;
-        this.assetLogoMapSubject.next(logoMap);
+      if (latestAssetInfo) {
+        const latestAssetPatch = JSON.stringify(latestAssetInfo);
+        if (this.assetMapPatch !== latestAssetPatch) {
+          const assetRegistry = {
+            ...ChainAssetMap,
+            ...latestAssetInfo
+          };
+          this.assetMapPatch = latestAssetPatch;
+          this.dataMap.assetRegistry = assetRegistry;
+          this.assetRegistrySubject.next(assetRegistry);
+          this.autoEnableTokens().then(() => {
+            this.eventService.emit('asset.updateState', '');
+          }).catch(console.error);
+        }
       }
-      if (needUpdate) {
-        this.autoEnableTokens().then(() => {
-          this.eventService.emit('asset.updateState', '');
-        }).catch(console.error);
+      if (latestAssetLogoMap) {
+        const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+        if (this.assetLogoPatch !== latestAssetLogoPatch) {
+          const logoMap = {
+            ...AssetLogoMap,
+            ...latestAssetLogoMap
+          };
+          this.assetLogoPatch = latestAssetLogoPatch;
+          this.assetLogoMapSubject.next(logoMap);
+        }
       }
     } catch (e) {
       console.error('Error fetching latest asset data');
     }
+    this.eventService.emit('asset.online.ready', true);
     this.logger.log('Finished updating latest asset');
   }
   async autoEnableTokens() {

package/services/chain-service/utils/patch.js

@@ -1,14 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { packageInfo as chainListInfo } from '@subwallet/chain-list/packageInfo';
 import fetch from 'cross-fetch';
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
+const ChainListVersion = '0.2.53';
 export async function fetchPatchData(slug) {
   try {
-    const fetchPromise = fetch(`${fetchDomain}/patch/${chainListInfo.version}/${slug}`);
+    const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
         clearTimeout(id);

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

@@ -11,6 +11,7 @@ export declare class EventService extends EventEmitter<EventRegistry> {
     readonly waitInjectReady: Promise<boolean>;
     readonly waitChainReady: Promise<boolean>;
     readonly waitAssetReady: Promise<boolean>;
+    readonly waitAssetOnlineReady: Promise<boolean>;
     readonly waitMigrateReady: Promise<boolean>;
     readonly waitCampaignReady: Promise<boolean>;
     readonly waitBuyTokenReady: Promise<boolean>;

package/services/event-service/index.js

@@ -22,6 +22,7 @@ export class EventService extends EventEmitter {
     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.waitAssetOnlineReady = this.generateWaitPromise('asset.online.ready');
     this.waitMigrateReady = this.generateWaitPromise('migration.done');
     this.waitCampaignReady = this.generateWaitPromise('campaign.ready');
     this.waitBuyTokenReady = this.generateWaitPromise('buy.tokens.ready');

package/services/event-service/types.d.ts

@@ -23,6 +23,7 @@ export interface EventRegistry {
     'chain.add': [string];
     'chain.updateState': [string];
     'asset.ready': [boolean];
+    'asset.online.ready': [boolean];
     'asset.updateState': [string];
     'transaction.done': [SWTransaction];
     'transaction.failed': [SWTransaction | undefined];