@subwallet/extension-base 1.3.6-1 → 1.3.8-0

package/services/chain-service/constants.js

@@ -53,7 +53,8 @@ export const _NFT_CHAIN_GROUP = {
   vara: ['vara_network'],
   avail: ['avail_mainnet'],
   ternoa: ['ternoa', 'ternoa_alphanet'],
-  rari: ['rari']
+  rari: ['rari'],
+  story_odyssey: ['storyOdyssey', 'storyOdyssey_testnet']
 };
 
 // Staking--------------------------------------------------------------------------------------------------------------

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

@@ -8,6 +8,7 @@ import { IMetadataItem } from '@subwallet/extension-base/services/storage-servic
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { ExtraInfo } from '@polkadot-api/merkleize-metadata';
+export declare const filterAssetInfoMap: (chainInfo: Record<string, _ChainInfo>, assets: Record<string, _ChainAsset>, addedChains?: string[]) => Record<string, _ChainAsset>;
 export declare class ChainService {
     private dataMap;
     private dbService;
@@ -29,8 +30,6 @@ export declare class ChainService {
     private assetLogoMapSubject;
     private chainLogoMapSubject;
     private ledgerGenericAllowChainsSubject;
-    private assetMapPatch;
-    private assetLogoPatch;
     private store;
     private assetSettingSubject;
     private logger;
@@ -44,6 +43,8 @@ export declare class ChainService {
     subscribeSwapRefMap(): Subject<Record<string, _AssetRef>>;
     get xcmRefMap(): Record<string, _AssetRef>;
     get swapRefMap(): Record<string, _AssetRef>;
+    getlockChainInfoMap(): boolean;
+    setLockChainInfoMap(isLock: boolean): void;
     getEvmApi(slug: string): import("./handler/EvmApi").EvmApi;
     getEvmApiMap(): Record<string, import("./handler/EvmApi").EvmApi>;
     getSubstrateApi(slug: string): _SubstrateApi;
@@ -61,16 +62,19 @@ export declare class ChainService {
     subscribeChainStateMap(): Subject<Record<string, _ChainState>>;
     subscribeChainStatusMap(): BehaviorSubject<Record<string, _ChainApiStatus>>;
     getAssetRegistry(): Record<string, _ChainAsset>;
+    setAssetRegistry(assetRegistry: Record<string, _ChainAsset>): void;
     getMultiChainAssetMap(): Record<string, _MultiChainAsset>;
     getSmartContractTokens(): Record<string, _ChainAsset>;
     getAssetHubToken(): Record<string, _ChainAsset>;
     getChainInfoMap(): Record<string, _ChainInfo>;
+    setChainInfoMap(chainInfoMap: Record<string, _ChainInfo>): void;
     getEvmChainInfoMap(): Record<string, _ChainInfo>;
     getSubstrateChainInfoMap(): Record<string, _ChainInfo>;
     getAllPriceIds(): string[];
     getNativeTokenInfo(chainSlug: string): _ChainAsset;
     getAssetRefMap(): Record<string, _AssetRef>;
     getChainStateMap(): Record<string, _ChainState>;
+    setChainStateMap(chainStateMap: Record<string, _ChainState>): void;
     getChainStateByKey(key: string): _ChainState;
     getChainStatusMap(): Record<string, _ChainApiStatus>;
     getChainStatusByKey(key: string): _ChainApiStatus;
@@ -99,9 +103,6 @@ export declare class ChainService {
     checkLatestData(): void;
     stopCheckLatestChainData(): void;
     handleLatestChainData(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;
     autoEnableTokens(): Promise<void>;
     handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains: string[]): void;
     handleLatestData(): void;
@@ -115,9 +116,7 @@ export declare class ChainService {
     disableChain(chainSlug: string): boolean;
     private checkExistedPredefinedChain;
     private fetchLatestChainData;
-    private fetchLatestAssetData;
     private fetchLatestPriceIdsData;
-    private fetchLatestAssetRef;
     private fetchLatestLedgerGenericAllowChains;
     private initChains;
     private initAssetRegistry;

package/services/chain-service/index.js

@@ -10,7 +10,7 @@ import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-
 import { TonChainHandler } from '@subwallet/extension-base/services/chain-service/handler/TonChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
 import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -20,26 +20,9 @@ const filterChainInfoMap = (data, ignoredChains) => {
   return Object.fromEntries(Object.entries(data).filter(([slug, info]) => !info.bitcoinInfo && !ignoredChains.includes(slug)));
 };
 const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet', 'storyPartner_testnet'];
-const filterAssetInfoMap = (chainInfo, assets) => {
-  return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain]));
+export const filterAssetInfoMap = (chainInfo, assets, addedChains) => {
+  return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain] || (addedChains === null || addedChains === void 0 ? void 0 : addedChains.includes(info.originChain))));
 };
-
-// const rawAssetRefMap = (assetRefMap: Record<string, _AssetRef>) => {
-//   const result: Record<string, _AssetRef> = {};
-//
-//   Object.entries(assetRefMap).forEach(([key, assetRef]) => {
-//     const originChainInfo = ChainInfoMap[assetRef.srcChain];
-//     const destChainInfo = ChainInfoMap[assetRef.destChain];
-//     const isSnowBridgeXcm = assetRef.path === _AssetRefPath.XCM && _isSnowBridgeXcm(originChainInfo, destChainInfo);
-//
-//     if (!isSnowBridgeXcm) {
-//       result[key] = assetRef;
-//     }
-//   });
-//
-//   return result;
-// };
-
 export class ChainService {
   dataMap = {
     chainInfoMap: {},
@@ -64,8 +47,6 @@ export class ChainService {
   assetLogoMapSubject = new BehaviorSubject(AssetLogoMap);
   chainLogoMapSubject = new BehaviorSubject(ChainLogoMap);
   ledgerGenericAllowChainsSubject = new BehaviorSubject([]);
-  assetMapPatch = JSON.stringify({});
-  assetLogoPatch = JSON.stringify({});
 
   // Todo: Update to new store indexed DB
   store = new AssetSettingStore();
@@ -126,6 +107,12 @@ export class ChainService {
     });
     return result;
   }
+  getlockChainInfoMap() {
+    return this.lockChainInfoMap;
+  }
+  setLockChainInfoMap(isLock) {
+    this.lockChainInfoMap = isLock;
+  }
   getEvmApi(slug) {
     return this.evmChainHandler.getEvmApiByChain(slug);
   }
@@ -174,6 +161,9 @@ export class ChainService {
   getAssetRegistry() {
     return this.dataMap.assetRegistry;
   }
+  setAssetRegistry(assetRegistry) {
+    this.dataMap.assetRegistry = assetRegistry;
+  }
   getMultiChainAssetMap() {
     return MultiChainAssetMap;
   }
@@ -198,6 +188,9 @@ export class ChainService {
   getChainInfoMap() {
     return this.dataMap.chainInfoMap;
   }
+  setChainInfoMap(chainInfoMap) {
+    this.dataMap.chainInfoMap = chainInfoMap;
+  }
   getEvmChainInfoMap() {
     const result = {};
     Object.values(this.getChainInfoMap()).forEach(chainInfo => {
@@ -254,6 +247,9 @@ export class ChainService {
   getChainStateMap() {
     return this.dataMap.chainStateMap;
   }
+  setChainStateMap(chainStateMap) {
+    this.dataMap.chainStateMap = chainStateMap;
+  }
   getChainStateByKey(key) {
     return this.dataMap.chainStateMap[key];
   }
@@ -498,10 +494,10 @@ export class ChainService {
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.assetRegistrySubject.next(this.getAssetRegistry());
+    this.initAssetRefMap();
     this.xcmRefMapSubject.next(this.xcmRefMap);
     await this.initApis();
     await this.initAssetSettings();
-    this.initAssetRefMap();
     await this.autoEnableTokens();
   }
   initAssetRefMap() {
@@ -534,79 +530,25 @@ export class ChainService {
       console.error('Error fetching latest chain data');
     }
   }
-  handleLatestAssetRef(latestBlockedAssetRefList, latestAssetRefMap) {
-    const updatedAssetRefMap = {
-      ...AssetRefMap
-    };
-    if (latestAssetRefMap) {
-      for (const [assetRefKey, assetRef] of Object.entries(latestAssetRefMap)) {
-        updatedAssetRefMap[assetRefKey] = assetRef;
-      }
-    }
-    latestBlockedAssetRefList.forEach(blockedAssetRef => {
-      delete updatedAssetRefMap[blockedAssetRef];
-    });
-    this.dataMap.assetRefMap = updatedAssetRefMap;
-    this.xcmRefMapSubject.next(this.xcmRefMap);
-    this.swapRefMapSubject.next(this.swapRefMap);
-    this.logger.log('Finished updating latest asset ref');
-  }
-  handleLatestPriceId(latestPriceIds) {
-    let isUpdated = false;
-    Object.entries(latestPriceIds).forEach(([slug, priceId]) => {
-      if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
-        isUpdated = true;
-        this.dataMap.assetRegistry[slug].priceId = priceId;
-      }
-    });
-    if (isUpdated) {
-      this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-      this.eventService.emit('asset.updateState', '');
-    }
-    this.logger.log('Finished updating latest price IDs');
-  }
-  handleLatestAssetData(latestAssetInfo, latestAssetLogoMap) {
-    try {
-      if (latestAssetInfo) {
-        const latestAssetPatch = JSON.stringify(latestAssetInfo);
-        if (this.assetMapPatch !== latestAssetPatch) {
-          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), Object.assign({}, this.dataMap.assetRegistry, latestAssetInfo));
-          this.assetMapPatch = latestAssetPatch;
-          this.dataMap.assetRegistry = assetRegistry;
-          this.assetRegistrySubject.next(assetRegistry);
-          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);
-        }
-      }
-      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');
-  }
+
+  // handleLatestPriceId (latestPriceIds: Record<string, string | null>) {
+  //   let isUpdated = false;
+  //
+  //   Object.entries(latestPriceIds).forEach(([slug, priceId]) => {
+  //     if (this.dataMap.assetRegistry[slug] && this.dataMap.assetRegistry[slug].priceId !== priceId) {
+  //       isUpdated = true;
+  //       this.dataMap.assetRegistry[slug].priceId = priceId;
+  //     }
+  //   });
+  //
+  //   if (isUpdated) {
+  //     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
+  //     this.eventService.emit('asset.updateState', '');
+  //   }
+  //
+  //   this.logger.log('Finished updating latest price IDs');
+  // }
+
   async autoEnableTokens() {
     const autoEnableTokens = Object.values(this.dataMap.assetRegistry).filter(asset => _isAssetAutoEnable(asset));
     const assetSettings = this.assetSettingSubject.value;
@@ -640,20 +582,19 @@ export class ChainService {
     this.logger.log('Finished updating latest ledger generic allow chains');
   }
   handleLatestData() {
-    this.fetchLatestAssetData().then(([latestAssetInfo, latestAssetLogoMap]) => {
-      this.eventService.waitAssetReady.then(() => {
-        this.handleLatestAssetData(latestAssetInfo, latestAssetLogoMap);
-      }).catch(console.error);
-    }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
+      this.lockChainInfoMap = true; // do not need to check current lockChainInfoMap because all remains action is fast enough and don't affect this feature.
       this.handleLatestChainData(latestChainInfo);
-    }).catch(console.error);
-    this.fetchLatestAssetRef().then(([latestAssetRef, latestAssetRefMap]) => {
-      this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
-    }).catch(console.error);
-    this.fetchLatestPriceIdsData().then(latestPriceIds => {
-      this.handleLatestPriceId(latestPriceIds);
-    }).catch(console.error);
+      this.lockChainInfoMap = false;
+    }).catch(e => {
+      this.lockChainInfoMap = false;
+      console.error('Error update latest chain data', e);
+    });
+
+    // this.fetchLatestPriceIdsData().then((latestPriceIds) => {
+    //   this.handleLatestPriceId(latestPriceIds);
+    // }).catch(console.error);
+
     this.fetchLatestLedgerGenericAllowChains().then(latestledgerGenericAllowChains => {
       this.handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains);
     }).catch(console.error);
@@ -911,17 +852,10 @@ export class ChainService {
     // }
   }
 
-  async fetchLatestAssetData() {
-    return await Promise.all([fetchPatchData('ChainAsset.json'), fetchPatchData('AssetLogoMap.json')]);
-  }
-
   // @ts-ignore
   async fetchLatestPriceIdsData() {
     return await fetchStaticData('chain-assets/price-map');
   }
-  async fetchLatestAssetRef() {
-    return await Promise.all([fetchStaticData('chain-assets/disabled-xcm-channels'), fetchPatchData('AssetRef.json')]);
-  }
   async fetchLatestLedgerGenericAllowChains() {
     return (await fetchStaticData('chains/ledger-generic-allow-chains')) || [];
   }
@@ -1069,7 +1003,35 @@ export class ChainService {
             });
           }
         } else {
-          // Todo: Remove chain from storage
+          var _storedChainInfo$bitc2;
+          // added chain from patch
+          this.dataMap.chainStateMap[storedSlug] = {
+            currentProvider: storedChainInfo.currentProvider,
+            slug: storedSlug,
+            active: storedChainInfo.active,
+            manualTurnOff
+          };
+          this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
+          newStorageData.push({
+            ...storedChainSettingMap[storedSlug],
+            active: storedChainInfo.active,
+            currentProvider: storedChainInfo.currentProvider,
+            manualTurnOff
+          });
+          mergedChainInfoMap[storedSlug] = {
+            slug: storedSlug,
+            name: storedChainInfo.name,
+            providers: storedChainInfo.providers,
+            evmInfo: storedChainInfo.evmInfo,
+            substrateInfo: storedChainInfo.substrateInfo,
+            bitcoinInfo: (_storedChainInfo$bitc2 = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc2 !== void 0 ? _storedChainInfo$bitc2 : null,
+            tonInfo: storedChainInfo.tonInfo,
+            isTestnet: storedChainInfo.isTestnet,
+            chainStatus: storedChainInfo.chainStatus,
+            icon: storedChainInfo.icon,
+            extraInfo: storedChainInfo.extraInfo
+          };
+          deprecatedChainMap[storedSlug] = storedSlug; // todo: set a better name
         }
       }
 

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

@@ -525,8 +525,6 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
     }
     if (currentChainInfo) {
       needUpdate = true;
-      currentChainInfo.extraInfo = latestChainInfo.extraInfo;
-      currentChainInfo.chainStatus = latestChainInfo.chainStatus;
       if (Object.keys(currentChainInfo.providers).length === 0) {
         currentChainInfo.chainStatus = _ChainStatus.INACTIVE;
       }

package/services/chain-service/utils/patch.d.ts

@@ -1 +1,16 @@
-export declare function fetchPatchData<T>(slug: string): Promise<T | null>;
+import { _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
+export interface PatchInfo {
+    patchVersion: string;
+    appliedVersion: string;
+    fetchedDate: string;
+    ChainInfo: Record<string, _ChainInfo>;
+    ChainInfoHashMap: Record<string, string>;
+    ChainAsset: Record<string, _ChainAsset>;
+    ChainAssetHashMap: Record<string, string>;
+    MultiChainAsset: Record<string, _MultiChainAsset>;
+    MultiChainAssetHashMap: Record<string, string>;
+    ChainLogoMap: Record<string, string>;
+    AssetLogoMap: Record<string, string>;
+    mAssetLogoMap: Record<string, string>;
+}
+export declare function fetchPatchData<T>(): Promise<T | null>;

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

@@ -4,10 +4,14 @@
 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.62';
-export async function fetchPatchData(slug) {
+const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
+const ChainListVersion = '0.2.95'; // update this when build chainlist
+
+// todo: move this interface to chainlist
+
+export async function fetchPatchData() {
   try {
-    const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);
+    const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${fetchFile}`);
     const timeout = new Promise(resolve => {
       const id = setTimeout(() => {
         clearTimeout(id);

package/services/earning-service/handlers/native-staking/para-chain.js

@@ -301,7 +301,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     for (const collator of _allCollators) {
       const _collatorAddress = collator[0].toHuman();
       const collatorAddress = _collatorAddress[0];
-      if (allCollatorsPool.includes(collatorAddress)) {
+      if (selectedCollators.includes(collatorAddress)) {
         const collatorInfo = collator[1].toPrimitive();
         const bnTotalStake = new BN(collatorInfo.totalCounted);
         const bnOwnStake = new BN(collatorInfo.bond);
@@ -324,7 +324,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
       }
     }
     await Promise.all(allCollators.map(async collator => {
-      if (allCollatorsPool.includes(collator.address)) {
+      if (selectedCollators.includes(collator.address)) {
         // noted: number of blocks = total points / points per block
         const _collatorPoints = await apiProps.api.query.parachainStaking.awardedPts(parseInt(round.current) - 1, collator.address);
         const collatorPoints = _collatorPoints.toPrimitive();
@@ -355,10 +355,11 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
   async getParachainPoolTargets() {
     const apiProps = await this.substrateApi.isReady;
     const allCollators = [];
-    const [_allCollators, _collatorCommission] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission()]);
+    const [_allCollators, _collatorCommission, _selectedCandidates] = await Promise.all([apiProps.api.query.parachainStaking.candidateInfo.entries(), apiProps.api.query.parachainStaking.collatorCommission(), apiProps.api.query.parachainStaking.selectedCandidates()]);
     const maxDelegationPerCollator = apiProps.api.consts.parachainStaking.maxTopDelegationsPerCandidate.toString();
     const rawCollatorCommission = _collatorCommission.toHuman();
     const collatorCommission = parseFloat(rawCollatorCommission.split('%')[0]);
+    const selectedCollators = _selectedCandidates.toPrimitive();
     for (const collator of _allCollators) {
       const _collatorAddress = collator[0].toHuman();
       const collatorAddress = _collatorAddress[0];
@@ -368,20 +369,22 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
       const bnOtherStake = bnTotalStake.sub(bnOwnStake);
       const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
       const maxNominatorRewarded = parseInt(maxDelegationPerCollator);
-      allCollators.push({
-        commission: 0,
-        expectedReturn: 0,
-        address: collatorAddress,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: bnOtherStake.toString(),
-        nominatorCount: collatorInfo.delegationCount,
-        blocked: false,
-        isVerified: false,
-        minBond: bnMinBond.toString(),
-        chain: this.chain,
-        isCrowded: collatorInfo.delegationCount ? collatorInfo.delegationCount >= maxNominatorRewarded : false
-      });
+      if (selectedCollators.includes(collatorAddress)) {
+        allCollators.push({
+          commission: 0,
+          expectedReturn: 0,
+          address: collatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: bnOtherStake.toString(),
+          nominatorCount: collatorInfo.delegationCount,
+          blocked: false,
+          isVerified: false,
+          minBond: bnMinBond.toString(),
+          chain: this.chain,
+          isCrowded: collatorInfo.delegationCount ? collatorInfo.delegationCount >= maxNominatorRewarded : false
+        });
+      }
     }
     const extraInfoMap = {};
     await Promise.all(allCollators.map(async collator => {

package/services/environment-service/stores/Environment.d.ts

@@ -0,0 +1,10 @@
+import { EnvConfig } from '@subwallet/extension-base/constants';
+import { StoreSubject } from '@subwallet/extension-base/services/keyring-service/context/stores/Base';
+import { EnvironmentStore } from '@subwallet/extension-base/stores';
+import { BehaviorSubject } from 'rxjs';
+export declare class EnvironmentStoreSubject extends StoreSubject<EnvConfig> {
+    store: EnvironmentStore;
+    subject: BehaviorSubject<EnvConfig>;
+    key: string;
+    defaultValue: {};
+}

package/services/environment-service/stores/Environment.js

@@ -0,0 +1,12 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { StoreSubject } from '@subwallet/extension-base/services/keyring-service/context/stores/Base';
+import { EnvironmentStore } from '@subwallet/extension-base/stores';
+import { BehaviorSubject } from 'rxjs';
+export class EnvironmentStoreSubject extends StoreSubject {
+  store = new EnvironmentStore();
+  subject = new BehaviorSubject({});
+  key = 'Environment';
+  defaultValue = {};
+}

package/services/fee-service/utils/index.js

@@ -4,6 +4,7 @@
 import { GAS_PRICE_RATIO, NETWORK_MULTI_GAS_FEE } from '@subwallet/extension-base/constants';
 import { BN_WEI, BN_ZERO } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
+import { POLYGON_GAS_INDEXER } from "../../balance-service/transfer/xcm/polygonBridge.js";
 const INFURA_API_KEY = process.env.INFURA_API_KEY || '';
 const INFURA_API_KEY_SECRET = process.env.INFURA_API_KEY_SECRET || '';
 const INFURA_AUTH = 'Basic ' + Buffer.from(INFURA_API_KEY + ':' + INFURA_API_KEY_SECRET).toString('base64');
@@ -91,6 +92,19 @@ export const calculateGasFeeParams = async (web3, networkKey, useOnline = true,
     } catch (e) {}
   }
   try {
+    if (networkKey === 'polygonzkEvm_cardona' || networkKey === 'polygonZkEvm') {
+      const isTestnet = networkKey === 'polygonzkEvm_cardona';
+      const gasDomain = isTestnet ? POLYGON_GAS_INDEXER.TESTNET : POLYGON_GAS_INDEXER.MAINNET;
+      const gasResponse = await fetch(`${gasDomain}`).then(res => res.json());
+      const gasPriceInWei = gasResponse.standard * 1e9 + 200000;
+      return {
+        gasPrice: gasPriceInWei.toString(),
+        maxFeePerGas: undefined,
+        maxPriorityFeePerGas: undefined,
+        baseGasFee: undefined,
+        busyNetwork: false
+      };
+    }
     const numBlock = 20;
     const rewardPercent = [];
     for (let i = 0; i <= 100; i = i + 5) {

package/services/inapp-notification-service/consts.d.ts

@@ -1,4 +1,4 @@
-import { getAvailBridgeClaimDescription, getClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { getAvailBridgeClaimDescription, getClaimDescription, getPolygonBridgeClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from './utils';
 export declare const NotificationTitleMap: {
     WITHDRAW: string;
     CLAIM: string;
@@ -6,6 +6,7 @@ export declare const NotificationTitleMap: {
     RECEIVE: string;
     CLAIM_AVAIL_BRIDGE_ON_AVAIL: string;
     CLAIM_AVAIL_BRIDGE_ON_ETHEREUM: string;
+    CLAIM_POLYGON_BRIDGE: string;
 };
 export declare const NotificationDescriptionMap: {
     WITHDRAW: typeof getWithdrawDescription;
@@ -14,5 +15,6 @@ export declare const NotificationDescriptionMap: {
     RECEIVE: typeof getReceiveDescription;
     CLAIM_AVAIL_BRIDGE_ON_AVAIL: typeof getAvailBridgeClaimDescription;
     CLAIM_AVAIL_BRIDGE_ON_ETHEREUM: typeof getAvailBridgeClaimDescription;
+    CLAIM_POLYGON_BRIDGE: typeof getPolygonBridgeClaimDescription;
 };
 export declare const ONE_DAY_MILLISECOND: number;

package/services/inapp-notification-service/consts.js

@@ -1,15 +1,16 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { NotificationActionType } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
-import { getAvailBridgeClaimDescription, getClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { NotificationActionType } from "./interfaces.js";
+import { getAvailBridgeClaimDescription, getClaimDescription, getPolygonBridgeClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from "./utils/index.js";
 export const NotificationTitleMap = {
   [NotificationActionType.WITHDRAW]: '[{{accountName}}] WITHDRAW {{tokenSymbol}}',
   [NotificationActionType.CLAIM]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
   [NotificationActionType.SEND]: '[{{accountName}}] SEND {{tokenSymbol}}',
   [NotificationActionType.RECEIVE]: '[{{accountName}}] RECEIVE {{tokenSymbol}}',
   [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_AVAIL]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
-  [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: '[{{accountName}}] CLAIM {{tokenSymbol}}'
+  [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
+  [NotificationActionType.CLAIM_POLYGON_BRIDGE]: '[{{accountName}}] CLAIM {{tokenSymbol}}'
 };
 export const NotificationDescriptionMap = {
   [NotificationActionType.WITHDRAW]: getWithdrawDescription,
@@ -17,6 +18,7 @@ export const NotificationDescriptionMap = {
   [NotificationActionType.SEND]: getSendDescription,
   [NotificationActionType.RECEIVE]: getReceiveDescription,
   [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_AVAIL]: getAvailBridgeClaimDescription,
-  [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: getAvailBridgeClaimDescription
+  [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: getAvailBridgeClaimDescription,
+  [NotificationActionType.CLAIM_POLYGON_BRIDGE]: getPolygonBridgeClaimDescription
 };
 export const ONE_DAY_MILLISECOND = 1000 * 24 * 60 * 60;

package/services/inapp-notification-service/index.d.ts

@@ -3,7 +3,7 @@ import { CronServiceInterface, ServiceStatus } from '@subwallet/extension-base/s
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { _BaseNotificationInfo, _NotificationInfo, NotificationActionType } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
-import { AvailBridgeTransaction } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { AvailBridgeTransaction, PolygonTransaction } from '@subwallet/extension-base/services/inapp-notification-service/utils';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { GetNotificationParams, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -25,9 +25,17 @@ export declare class InappNotificationService implements CronServiceInterface {
     cleanUpOldNotifications(overdueTime?: number): Promise<number>;
     passValidateNotification(candidateNotification: _BaseNotificationInfo, comparedNotifications: _NotificationInfo[], remindTimeConfigInHrs: Record<NotificationActionType, number>): boolean;
     validateAndWriteNotificationsToDB(notifications: _BaseNotificationInfo[], address: string): Promise<void>;
-    cronCreateAvailBridgeClaimNotification(): void;
+    cronCreateBridgeClaimNotification(): void;
+    getCategorizedAddresses(): {
+        substrate: string[];
+        evm: string[];
+        ton: string[];
+        bitcoin: string[];
+    };
     createAvailBridgeClaimNotification(): void;
     processWriteAvailBridgeClaim(address: string, transactions: AvailBridgeTransaction[], token: _ChainAsset): Promise<void>;
+    createPolygonClaimableTransactions(): Promise<void>;
+    processPolygonClaimNotification(address: string, transactions: PolygonTransaction[], token: _ChainAsset): Promise<void>;
     start(): Promise<void>;
     startCron(): Promise<void>;
     stop(): Promise<void>;