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

package/services/chain-service/index.js

@@ -11,7 +11,7 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { _isAssetAutoEnable, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, fetchPatchData, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
-import { addLazy, fetchStaticData, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
+import { addLazy, fetchStaticData, filterAssetsByChainAndType, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
@@ -271,13 +271,7 @@ export class ChainService {
     return destinationTokenInfo;
   }
   getAssetByChainAndType(chainSlug, assetTypes) {
-    const result = {};
-    Object.values(this.getAssetRegistry()).forEach(assetInfo => {
-      if (assetTypes.includes(assetInfo.assetType) && assetInfo.originChain === chainSlug) {
-        result[assetInfo.slug] = assetInfo;
-      }
-    });
-    return result;
+    return filterAssetsByChainAndType(this.getAssetRegistry(), chainSlug, assetTypes);
   }
   getSmartContractNfts() {
     const result = [];
@@ -454,7 +448,7 @@ export class ChainService {
   stopCheckLatestChainData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
   }
-  handleLatestProviderData(latestChainInfo) {
+  handleLatestChainData(latestChainInfo) {
     try {
       if (latestChainInfo && latestChainInfo.length > 0) {
         const {
@@ -531,6 +525,17 @@ export class ChainService {
           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');
     }
@@ -550,8 +555,6 @@ export class ChainService {
       const chainState = chainStateMap[originChain];
       if (!assetState) {
         // If this asset not has asset setting, this token is not enabled before (not turned off before)
-        // @ts-ignore
-        // TODO: Merge issue detect balance to define manualTurnOff props
         if (!chainState || !chainState.manualTurnOff) {
           await this.updateAssetSetting(assetSlug, {
             visible: true
@@ -567,7 +570,7 @@ export class ChainService {
       }).catch(console.error);
     }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
-      this.handleLatestProviderData(latestChainInfo);
+      this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
     this.fetchLatestAssetRef().then(([latestAssetRef, latestAssetRefMap]) => {
       this.handleLatestAssetRef(latestAssetRef, latestAssetRefMap);
@@ -644,7 +647,8 @@ export class ChainService {
     this.dbService.updateChainStore({
       ...chainInfo,
       active: true,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
     }).catch(console.error);
     chainStateMap[chainSlug].active = true;
     await this.initApiForChain(chainInfo);
@@ -669,7 +673,8 @@ export class ChainService {
         this.dbService.updateChainStore({
           ...chainInfo,
           active: true,
-          currentProvider: chainStateMap[chainSlug].currentProvider
+          currentProvider: chainStateMap[chainSlug].currentProvider,
+          manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
         }).catch(console.error);
         chainStateMap[chainSlug].active = true;
         await this.initApiForChain(chainInfo);
@@ -696,13 +701,15 @@ export class ChainService {
     }
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
+    chainStateMap[chainSlug].manualTurnOff = true;
     // Set disconnect state for inactive chain
     this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
       active: false,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: true
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
@@ -794,7 +801,8 @@ export class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
-          active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
+          active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
+          manualTurnOff: false
         };
         this.updateChainConnectionStatus(chainInfo.slug, _ChainConnectionStatus.DISCONNECTED);
 
@@ -802,13 +810,15 @@ export class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
-          currentProvider: providerKey
+          currentProvider: providerKey,
+          manualTurnOff: false
         });
       });
     } else {
       const mergedChainInfoMap = defaultChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         const chainInfo = defaultChainInfoMap[storedSlug];
+        const manualTurnOff = !!storedChainInfo.manualTurnOff;
 
         // Network existed on change list
         // check predefined chains first, keep setting for providers and currentProvider
@@ -847,13 +857,15 @@ export class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
-            active: canActive && storedChainInfo.active
+            active: canActive && storedChainInfo.active,
+            manualTurnOff
           };
           this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: selectedProvider
+            currentProvider: selectedProvider,
+            manualTurnOff
           });
         } else if (_isCustomChain(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
@@ -869,13 +881,15 @@ export class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(duplicatedDefaultSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider,
+              manualTurnOff
             });
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
@@ -896,13 +910,16 @@ export class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider // TODO: review
+              currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
+              manualTurnOff
             });
           }
         } else {
@@ -916,13 +933,15 @@ export class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
-            active: _DEFAULT_ACTIVE_CHAINS.includes(slug)
+            active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
+            manualTurnOff: false
           };
           this.updateChainConnectionStatus(slug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
-            currentProvider: Object.keys(chainInfo.providers)[0]
+            currentProvider: Object.keys(chainInfo.providers)[0],
+            manualTurnOff: false
           });
         }
       });
@@ -1039,7 +1058,8 @@ export class ChainService {
     this.dbService.updateChainStore({
       ...targetChainInfo,
       active: targetChainState.active,
-      currentProvider: targetChainState.currentProvider
+      currentProvider: targetChainState.currentProvider,
+      manualTurnOff: !targetChainState.active || !!targetChainState.manualTurnOff
     }).then(() => {
       this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
@@ -1103,7 +1123,8 @@ export class ChainService {
     chainStateMap[newChainSlug] = {
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
-      slug: newChainSlug
+      slug: newChainSlug,
+      manualTurnOff: false
     };
 
     // const chainStatusMap = this.getChainStatusMap();
@@ -1138,6 +1159,7 @@ export class ChainService {
     this.dbService.updateChainStore({
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
+      manualTurnOff: false,
       ...chainInfo
     }).then(() => {
       this.eventService.emit('chain.add', newChainSlug);
@@ -1576,4 +1598,16 @@ export class ChainService {
     });
     return result;
   }
+  get detectBalanceChainSlugMap() {
+    const result = {};
+    const chainInfoMap = this.getChainInfoMap();
+    for (const [key, chainInfo] of Object.entries(chainInfoMap)) {
+      var _chainInfo$extraInfo;
+      const chainBalanceSlug = ((_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.chainBalanceSlug) || '';
+      if (chainBalanceSlug) {
+        result[chainBalanceSlug] = key;
+      }
+    }
+    return result;
+  }
 }

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

@@ -22,6 +22,7 @@ export interface _ChainState {
     slug: string;
     active: boolean;
     currentProvider: string;
+    manualTurnOff: boolean;
 }
 export interface _ChainApiStatus {
     slug: string;

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

@@ -400,10 +400,11 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
   const currentChainStateMap = currentDataMap.chainStateMap;
   const storedChainInfoList = [];
   const needUpdateChainApiList = [];
-  latestChainInfoList.forEach(latestChainInfo => {
+  for (const latestChainInfo of latestChainInfoList) {
     const currentChainInfo = currentChainInfoMap[latestChainInfo.slug];
     const currentChainState = currentChainStateMap[latestChainInfo.slug];
     const currentChainProviderValue = currentChainInfo === null || currentChainInfo === void 0 ? void 0 : currentChainInfo.providers[currentChainState === null || currentChainState === void 0 ? void 0 : currentChainState.currentProvider];
+    let needUpdate = false;
     if (currentChainInfo && currentChainState) {
       const preservedProvider = {};
       Object.entries(currentChainInfo.providers).forEach(([providerKey, providerValue]) => {
@@ -424,12 +425,19 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
         currentChainState.currentProvider = providerKey;
         needUpdateChainApiList.push(currentChainInfo);
       }
+      needUpdate = true;
+    }
+    if (currentChainInfo) {
+      needUpdate = true;
+      currentChainInfo.extraInfo = latestChainInfo.extraInfo;
+    }
+    if (needUpdate) {
       storedChainInfoList.push({
         ...currentChainInfo,
         ...currentChainState
       });
     }
-  });
+  }
   return {
     storedChainInfoList,
     needUpdateChainApiList

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

@@ -5,7 +5,7 @@ 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';
+const ChainListVersion = '0.2.54';
 export async function fetchPatchData(slug) {
   try {
     const fetchPromise = fetch(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -192,7 +192,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
-    const inputTokenContract = getERC20Contract(this.chain, _getContractAddressOfToken(inputTokenInfo), this.state.getEvmApiMap());
+    const inputTokenContract = getERC20Contract(_getContractAddressOfToken(inputTokenInfo), evmApi);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
     const allowanceCall = inputTokenContract.methods.allowance(params.address, _getContractAddressOfToken(derivativeTokenInfo));
     const [allowance, gasPrice] = await Promise.all([
@@ -257,7 +257,7 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     const derivativeTokenInfo = this.state.getAssetBySlug(this.derivativeAssets[0]);
     const derivativeTokenContractAddress = _getContractAddressOfToken(derivativeTokenInfo);
     const evmApi = this.evmApi;
-    const inputTokenContract = getERC20Contract(this.chain, _getContractAddressOfToken(inputTokenInfo), this.state.getEvmApiMap());
+    const inputTokenContract = getERC20Contract(_getContractAddressOfToken(inputTokenInfo), evmApi);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
     const approveCall = inputTokenContract.methods.approve(derivativeTokenContractAddress, MAX_INT); // TODO: need test

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

@@ -149,7 +149,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
         for (const scheduledRequest of delegationScheduledRequests) {
           if (reformatAddress(scheduledRequest.delegator, 0) === reformatAddress(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
+            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
             const remainingEra = scheduledRequest.whenExecutable - currentRound;
             const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];

package/services/migration-service/scripts/AutoEnableChainsTokens.js

@@ -6,7 +6,7 @@ import { keyring } from '@subwallet/ui-keyring';
 export default class AutoEnableChainsTokens extends BaseMigrationJob {
   async run() {
     const accounts = keyring.getAccounts();
-    await this.state.autoEnableChains(accounts.map(({
+    await this.state.balanceService.autoEnableChains(accounts.map(({
       address
     }) => address));
   }

package/services/storage-service/DatabaseService.js

@@ -11,6 +11,7 @@ import NominatorMetadataStore from '@subwallet/extension-base/services/storage-s
 import YieldPoolStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore';
 import YieldPositionStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore';
 import { reformatAddress } from '@subwallet/extension-base/utils';
+import keyring from '@subwallet/ui-keyring';
 import { exportDB } from 'dexie-export-import';
 import { logger as createLogger } from '@polkadot/util';
 export const DEXIE_BACKUP_TABLES = ['chain', 'asset', 'migrations', 'transactions', 'campaign'];
@@ -63,7 +64,12 @@ export default class DatabaseService {
 
   // Balance
   async getStoredBalance() {
-    return this.stores.balance.table.toArray();
+    const addresses = keyring.getPairs().map(({
+      address
+    }) => address);
+
+    // Filter not exist address
+    return this.stores.balance.table.filter(obj => addresses.includes(obj.address)).toArray();
   }
   async updateBalanceStore(item) {
     if (item.state === APIItemState.READY) {

package/services/storage-service/databases/index.d.ts

@@ -15,6 +15,7 @@ export interface IBalance extends BalanceItem, DefaultAddressDoc {
 export interface IChain extends _ChainInfo {
     active: boolean;
     currentProvider: string;
+    manualTurnOff: boolean;
 }
 export interface ICrowdloanItem extends CrowdloanItem, DefaultAddressDoc, DefaultChainDoc {
 }

package/stores/DetectAccountBalance.d.ts

@@ -0,0 +1,5 @@
+import { DetectBalanceCache } from '@subwallet/extension-base/background/KoniTypes';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class DetectAccountBalanceStore extends SubscribableStore<DetectBalanceCache> {
+    constructor();
+}

package/stores/DetectAccountBalance.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { EXTENSION_PREFIX } from '@subwallet/extension-base/defaults';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class DetectAccountBalanceStore extends SubscribableStore {
+  constructor() {
+    super(EXTENSION_PREFIX ? `${EXTENSION_PREFIX}DetectBalanceCache` : null);
+  }
+}

package/types/{balance.d.ts → balance/index.d.ts}

@@ -1,4 +1,7 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
+import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { ApiPromise } from '@polkadot/api';
 import { BN } from '@polkadot/util';
 export interface TokenBalanceRaw {
     reserved: BN;
@@ -37,3 +40,16 @@ export interface BalanceJson {
     reset?: boolean;
     details: BalanceMap;
 }
+export interface SubscribeBasePalletBalance {
+    addresses: string[];
+    assetMap: Record<string, _ChainAsset>;
+    chainInfo: _ChainInfo;
+    callback: (rs: BalanceItem[]) => void;
+}
+export interface SubscribeSubstratePalletBalance extends SubscribeBasePalletBalance {
+    substrateApi: ApiPromise;
+    includeNativeToken?: boolean;
+}
+export interface SubscribeEvmPalletBalance extends SubscribeBasePalletBalance {
+    evmApi: _EvmApi;
+}

package/types/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export * from "./balance.js";
+export * from "./balance/index.js";
 export * from "./buy.js";
 export * from "./campaigns/index.js";
 export * from "./fee/index.js";

package/utils/asset.d.ts

@@ -0,0 +1,2 @@
+import { _AssetType, _ChainAsset } from '@subwallet/chain-list/types';
+export declare const filterAssetsByChainAndType: (chainAssetMap: Record<string, _ChainAsset>, chain: string, assetTypes: _AssetType[]) => Record<string, _ChainAsset>;

package/utils/asset.js

@@ -0,0 +1,12 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export const filterAssetsByChainAndType = (chainAssetMap, chain, assetTypes) => {
+  const result = {};
+  Object.values(chainAssetMap).forEach(assetInfo => {
+    if (assetTypes.includes(assetInfo.assetType) && assetInfo.originChain === chain) {
+      result[assetInfo.slug] = assetInfo;
+    }
+  });
+  return result;
+};

package/utils/index.d.ts

@@ -42,6 +42,7 @@ export declare const swParseIPFSUrl: (input: string) => string | undefined;
 export declare function wait(milliseconds: number): Promise<void>;
 export * from './account';
 export * from './array';
+export * from './asset';
 export * from './environment';
 export * from './eth';
 export * from './number';

package/utils/index.js

@@ -344,6 +344,7 @@ export function wait(milliseconds) {
 }
 export * from "./account.js";
 export * from "./array.js";
+export * from "./asset.js";
 export * from "./environment.js";
 export * from "./eth.js";
 export * from "./number.js";