@subwallet/extension-base 1.2.15-0 → 1.2.17-0

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { GearApi } from '@gear-js/api';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
@@ -12,13 +11,13 @@ import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/cont
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { filterAssetsByChainAndType, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
+import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { combineLatest, Observable } from 'rxjs';
-import { BN, BN_ZERO, noop, u8aToHex } from '@polkadot/util';
-import { decodeAddress } from '@polkadot/util-crypto';
+import { BN, BN_ZERO } from '@polkadot/util';
 import { subscribeERC20Interval } from "../evm.js";
 import { subscribeEquilibriumTokenBalance } from "./equilibrium.js";
+import { subscribeGRC20Balance, subscribeVftBalance } from "./gear.js";
 export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substrateApi, evmApi, callback, extrinsicType) => {
   let unsubNativeToken;
   let unsubLocalToken;
@@ -26,6 +25,7 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
   let unsubWasmContractToken;
   let unsubBridgedToken;
   let unsubGrcToken;
+  let unsubVftToken;
   const chain = chainInfo.slug;
   const baseParams = {
     addresses,
@@ -82,17 +82,22 @@ export const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap,
       // Get sub-token for substrate-based chains
       unsubGrcToken = subscribeGRC20Balance(substrateParams);
     }
+    if (_checkSmartContractSupportByChain(chainInfo, _AssetType.VFT)) {
+      // Get sub-token for substrate-based chains
+      unsubVftToken = subscribeVftBalance(substrateParams);
+    }
   } catch (err) {
     console.warn(err);
   }
   return () => {
-    var _unsubGrcToken;
+    var _unsubGrcToken, _unsubVftToken;
     unsubNativeToken && unsubNativeToken();
     unsubLocalToken && unsubLocalToken();
     unsubEvmContractToken && unsubEvmContractToken();
     unsubWasmContractToken && unsubWasmContractToken();
     unsubBridgedToken && unsubBridgedToken();
     (_unsubGrcToken = unsubGrcToken) === null || _unsubGrcToken === void 0 ? void 0 : _unsubGrcToken();
+    (_unsubVftToken = unsubVftToken) === null || _unsubVftToken === void 0 ? void 0 : _unsubVftToken();
   };
 };
 
@@ -421,60 +426,4 @@ const subscribeOrmlTokensPallet = async ({
       }).catch(console.error);
     });
   };
-};
-const subscribeGRC20Balance = ({
-  addresses,
-  assetMap,
-  callback,
-  chainInfo,
-  substrateApi
-}) => {
-  if (!(substrateApi instanceof GearApi)) {
-    console.warn('Cannot subscribe VFT balance without GearApi instance');
-    return noop;
-  }
-  const chain = chainInfo.slug;
-  const psp22ContractMap = {};
-  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.GRC20]);
-  Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
-    psp22ContractMap[slug] = getGRC20ContractPromise(substrateApi, _getContractAddressOfToken(tokenInfo));
-  });
-  const getTokenBalances = () => {
-    Object.values(tokenList).map(async tokenInfo => {
-      try {
-        const contract = psp22ContractMap[tokenInfo.slug];
-        const balances = await Promise.all(addresses.map(async address => {
-          try {
-            const actor = u8aToHex(decodeAddress(address));
-            const _balanceOf = await contract.balanceOf(actor, address);
-            return {
-              address: address,
-              tokenSlug: tokenInfo.slug,
-              free: _balanceOf.toString(10),
-              locked: '0',
-              state: APIItemState.READY
-            };
-          } catch (err) {
-            console.error(`Error on get balance of account ${address} for token ${tokenInfo.slug}`, err);
-            return {
-              address: address,
-              tokenSlug: tokenInfo.slug,
-              free: '0',
-              locked: '0',
-              state: APIItemState.READY
-            };
-          }
-        }));
-        callback(balances);
-      } catch (err) {
-        console.warn(tokenInfo.slug, err); // TODO: error createType
-      }
-    });
-  };
-
-  getTokenBalances();
-  const interval = setInterval(getTokenBalances, SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
-  return () => {
-    clearInterval(interval);
-  };
 };

package/services/balance-service/transfer/token.js

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { GearApi } from '@gear-js/api';
+import { _AssetType } from '@subwallet/chain-list/types';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/contract-handler/wasm';
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenTransferredByEvm, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
-import { getGRC20ContractPromise } from '@subwallet/extension-base/utils';
+import { getGRC20ContractPromise, getVFTContractPromise } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { BN, u8aToHex } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
@@ -53,12 +54,12 @@ export const createTransferExtrinsic = async ({
     }, to, value, {});
     transferAmount = value;
   } else if (_isTokenGearSmartContract(tokenInfo) && api instanceof GearApi) {
-    const contractPromise = getGRC20ContractPromise(api, _getContractAddressOfToken(tokenInfo));
-    const transaction = await contractPromise.transfer(u8aToHex(decodeAddress(to)), BigInt(value)) // Create transfer transaction
+    const contractPromise = tokenInfo.assetType === _AssetType.GRC20 ? getGRC20ContractPromise(api, _getContractAddressOfToken(tokenInfo)) : getVFTContractPromise(api, _getContractAddressOfToken(tokenInfo));
+    const transaction = await contractPromise.service.transfer(u8aToHex(decodeAddress(to)), value) // Create transfer transaction
     .withAccount(from) // Set sender account
     .calculateGas(); // Add account arg to extrinsic
 
-    transfer = transaction.tx;
+    transfer = transaction.extrinsic;
     transferAmount = value;
   } else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey)) {
     if (!_isNativeToken(tokenInfo)) {

package/services/chain-service/handler/SubstrateApi.d.ts

@@ -39,7 +39,7 @@ export declare class SubstrateApi implements _SubstrateApi {
     constructor(chainSlug: string, apiUrl: string, { externalApiPromise, metadata, providerName }?: _ApiOptions);
     get isReady(): Promise<_SubstrateApi>;
     updateApiUrl(apiUrl: string): Promise<void>;
-    connect(): void;
+    connect(_callbackUpdateMetadata?: (substrateApi: _SubstrateApi) => void): void;
     disconnect(): Promise<void>;
     recoverConnect(): Promise<void>;
     destroy(): Promise<void>;

package/services/chain-service/handler/SubstrateApi.js

@@ -159,14 +159,16 @@ export class SubstrateApi {
     this.provider = this.createProvider(apiUrl);
     this.api = this.createApi(this.provider);
   }
-  connect() {
+  connect(_callbackUpdateMetadata) {
     if (this.api.isConnected) {
       this.updateConnectionStatus(_ChainConnectionStatus.CONNECTED);
+      _callbackUpdateMetadata === null || _callbackUpdateMetadata === void 0 ? void 0 : _callbackUpdateMetadata(this);
     } else {
       this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
       this.api.connect().then(() => {
         this.api.isReady.then(() => {
           this.updateConnectionStatus(_ChainConnectionStatus.CONNECTED);
+          _callbackUpdateMetadata === null || _callbackUpdateMetadata === void 0 ? void 0 : _callbackUpdateMetadata(this);
         }).catch(console.error);
       }).catch(console.error);
     }

package/services/chain-service/handler/SubstrateChainHandler.d.ts

@@ -19,6 +19,7 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     private getPsp22TokenInfo;
     private getPsp34TokenInfo;
     private getGrc20TokenInfo;
+    private getVftTokenInfo;
     getSubstrateContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
     setSubstrateApi(chainSlug: string, substrateApi: SubstrateApi): void;
     destroySubstrateApi(chainSlug: string): void;

package/services/chain-service/handler/SubstrateChainHandler.js

@@ -6,9 +6,8 @@ import { _AssetType } from '@subwallet/chain-list/types';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
 import { SubstrateApi } from '@subwallet/extension-base/services/chain-service/handler/SubstrateApi';
-import { DEFAULT_GEAR_ADDRESS, getGRC20ContractPromise } from '@subwallet/extension-base/utils';
+import { cacheMetadata, GEAR_DEFAULT_ADDRESS, getGRC20ContractPromise, getVFTContractPromise } from '@subwallet/extension-base/utils';
 import { ContractPromise } from '@polkadot/api-contract';
-import { getSpecExtensions, getSpecTypes } from '@polkadot/types-known';
 import { BN } from '@polkadot/util';
 import { logger as createLogger } from '@polkadot/util/logger';
 import { _PSP22_ABI, _PSP34_ABI } from "../../../koni/api/contract-handler/utils/index.js";
@@ -137,12 +136,26 @@ export class SubstrateChainHandler extends AbstractChainHandler {
   }
   async getGrc20TokenInfo(apiPromise, contractAddress) {
     if (!(apiPromise instanceof GearApi)) {
-      console.warn('Cannot subscribe VFT balance without GearApi instance');
+      console.warn('Cannot subscribe GRC20 balance without GearApi instance');
       return ['', -1, '', true];
     }
     let contractError = false;
     const tokenContract = getGRC20ContractPromise(apiPromise, contractAddress);
-    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.name(DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.symbol(DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.decimals(DEFAULT_GEAR_ADDRESS.ALICE)]);
+    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(GEAR_DEFAULT_ADDRESS)]);
+    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
+    if (!nameRes || !symbolRes) {
+      contractError = true;
+    }
+    return [nameRes, decimals, symbolRes, contractError];
+  }
+  async getVftTokenInfo(apiPromise, contractAddress) {
+    if (!(apiPromise instanceof GearApi)) {
+      console.warn('Cannot subscribe VFT balance without GearApi instance');
+      return ['', -1, '', true];
+    }
+    let contractError = false;
+    const tokenContract = getVFTContractPromise(apiPromise, contractAddress);
+    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(GEAR_DEFAULT_ADDRESS)]);
     const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
     if (!nameRes || !symbolRes) {
       contractError = true;
@@ -168,6 +181,9 @@ export class SubstrateChainHandler extends AbstractChainHandler {
         case _AssetType.GRC20:
           [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
           break;
+        case _AssetType.VFT:
+          [name, decimals, symbol, contractError] = await this.getVftTokenInfo(apiPromise, contractAddress);
+          break;
       }
       return {
         name,
@@ -199,31 +215,9 @@ export class SubstrateChainHandler extends AbstractChainHandler {
   } = {}) {
     var _this$parent2;
     const existed = this.substrateApiMap[chainSlug];
-    const metadata = await ((_this$parent2 = this.parent) === null || _this$parent2 === void 0 ? void 0 : _this$parent2.getMetadata(chainSlug));
     const updateMetadata = substrateApi => {
       // Update metadata to database with async methods
-      substrateApi.api.isReady.then(async api => {
-        var _this$parent3;
-        const currentSpecVersion = api.runtimeVersion.specVersion.toString();
-        const genesisHash = api.genesisHash.toHex();
-
-        // Avoid date existed metadata
-        if (metadata && metadata.specVersion === currentSpecVersion && metadata.genesisHash === genesisHash) {
-          return;
-        }
-        const systemChain = await api.rpc.system.chain();
-        // const _metadata: Option<OpaqueMetadata> = await api.call.metadata.metadataAtVersion(15);
-        // const metadataHex = _metadata.isSome ? _metadata.unwrap().toHex().slice(2) : ''; // Need unwrap to create metadata object
-
-        (_this$parent3 = this.parent) === null || _this$parent3 === void 0 ? void 0 : _this$parent3.upsertMetadata(chainSlug, {
-          chain: chainSlug,
-          genesisHash: genesisHash,
-          specVersion: currentSpecVersion,
-          hexValue: api.runtimeMetadata.toHex(),
-          types: getSpecTypes(api.registry, systemChain, api.runtimeVersion.specName, api.runtimeVersion.specVersion),
-          userExtensions: getSpecExtensions(api.registry, systemChain, api.runtimeVersion.specName)
-        }).catch(console.error);
-      }).catch(console.error);
+      cacheMetadata(chainSlug, substrateApi, this.parent);
     };
 
     // Return existed to avoid re-init metadata
@@ -237,6 +231,7 @@ export class SubstrateChainHandler extends AbstractChainHandler {
       updateMetadata(existed);
       return existed;
     }
+    const metadata = await ((_this$parent2 = this.parent) === null || _this$parent2 === void 0 ? void 0 : _this$parent2.getMetadata(chainSlug));
     const apiObject = new SubstrateApi(chainSlug, apiUrl, {
       providerName,
       metadata,

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

@@ -7,6 +7,7 @@ import { EventService } from '@subwallet/extension-base/services/event-service';
 import { IMetadataItem } from '@subwallet/extension-base/services/storage-service/databases';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { BehaviorSubject, Subject } from 'rxjs';
+import { ExtraInfo } from '@polkadot-api/merkleize-metadata';
 export declare class ChainService {
     private dataMap;
     private dbService;
@@ -141,6 +142,9 @@ export declare class ChainService {
     getMetadata(chain: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
     upsertMetadata(chain: string, metadata: IMetadataItem): import("dexie").PromiseExtended<unknown>;
     getMetadataByHash(hash: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
+    getExtraInfo(chain: string): Omit<ExtraInfo, 'specVersion' | 'specName'>;
+    calculateMetadataHash(chain: string): Promise<string | undefined>;
+    shortenMetadata(chain: string, txBlob: string): Promise<string | undefined>;
     getSubscanChainMap(reverse?: boolean): Record<string, string>;
     get detectBalanceChainSlugMap(): Record<string, string>;
     getFeeTokensByChain(chainSlug: string): string[];

package/services/chain-service/index.js

@@ -11,14 +11,14 @@ 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, _isAssetCanPayTxFee, _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, filterAssetsByChainAndType, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
+import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
 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'];
+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'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(([, info]) => chainInfo[info.originChain]));
 };
@@ -233,7 +233,7 @@ export class ChainService {
     return Object.entries(this.dataMap.chainStateMap).filter(([, chainState]) => _isChainEnabled(chainState)).map(([key]) => key);
   }
   getSupportedSmartContractTypes() {
-    return [_AssetType.ERC20, _AssetType.ERC721, _AssetType.PSP22, _AssetType.PSP34, _AssetType.GRC20, _AssetType.GRC721];
+    return [_AssetType.ERC20, _AssetType.ERC721, _AssetType.PSP22, _AssetType.PSP34, _AssetType.GRC20, _AssetType.GRC721, _AssetType.VFT];
   }
   getActiveChainInfoMap() {
     const result = {};
@@ -1449,7 +1449,7 @@ export class ChainService {
   async getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     if ([_AssetType.ERC721, _AssetType.ERC20].includes(tokenType)) {
       return await this.evmChainHandler.getEvmContractTokenInfo(contractAddress, tokenType, originChain);
-    } else if ([_AssetType.PSP34, _AssetType.PSP22, _AssetType.GRC20].includes(tokenType)) {
+    } else if ([_AssetType.PSP34, _AssetType.PSP22, _AssetType.GRC20, _AssetType.VFT].includes(tokenType)) {
       return await this.substrateChainHandler.getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
     }
     return {
@@ -1667,6 +1667,9 @@ export class ChainService {
       this.deleteCustomAssets(customToken);
     }
   }
+
+  /* Metadata */
+
   getMetadata(chain) {
     return this.dbService.stores.metadata.getMetadata(chain);
   }
@@ -1676,6 +1679,48 @@ export class ChainService {
   getMetadataByHash(hash) {
     return this.dbService.stores.metadata.getMetadataByGenesisHash(hash);
   }
+  getExtraInfo(chain) {
+    var _chainInfo$substrateI2, _chainInfo$substrateI3, _chainInfo$substrateI4, _chainInfo$substrateI5, _chainInfo$substrateI6, _chainInfo$substrateI7;
+    const chainInfo = this.getChainInfoByKey(chain);
+    return {
+      decimals: (_chainInfo$substrateI2 = (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals) !== null && _chainInfo$substrateI2 !== void 0 ? _chainInfo$substrateI2 : 0,
+      tokenSymbol: (_chainInfo$substrateI4 = (_chainInfo$substrateI5 = chainInfo.substrateInfo) === null || _chainInfo$substrateI5 === void 0 ? void 0 : _chainInfo$substrateI5.symbol) !== null && _chainInfo$substrateI4 !== void 0 ? _chainInfo$substrateI4 : 'Unit',
+      base58Prefix: (_chainInfo$substrateI6 = (_chainInfo$substrateI7 = chainInfo.substrateInfo) === null || _chainInfo$substrateI7 === void 0 ? void 0 : _chainInfo$substrateI7.addressPrefix) !== null && _chainInfo$substrateI6 !== void 0 ? _chainInfo$substrateI6 : 42
+    };
+  }
+  async calculateMetadataHash(chain) {
+    const metadata = await this.getMetadata(chain);
+    if (!metadata || !metadata.hexV15) {
+      return undefined;
+    }
+    const extraInfo = this.getExtraInfo(chain);
+    const specVersion = parseInt(metadata.specVersion);
+    const specName = metadata.specName;
+    const hexV15 = metadata.hexV15;
+    return calculateMetadataHash({
+      ...extraInfo,
+      specVersion,
+      specName
+    }, hexV15);
+  }
+  async shortenMetadata(chain, txBlob) {
+    const metadata = await this.getMetadata(chain);
+    if (!metadata || !metadata.hexV15) {
+      return undefined;
+    }
+    const extraInfo = this.getExtraInfo(chain);
+    const specVersion = parseInt(metadata.specVersion);
+    const specName = metadata.specName;
+    const hexV15 = metadata.hexV15;
+    return getShortMetadata(txBlob, {
+      ...extraInfo,
+      specVersion,
+      specName
+    }, hexV15);
+  }
+
+  /* Metadata */
+
   getSubscanChainMap(reverse) {
     const result = {};
     const chainInfoMap = this.getChainInfoMap();

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

@@ -71,6 +71,7 @@ export interface _SubstrateApiState {
 export interface _SubstrateApi extends _SubstrateApiState, _ChainBaseApi {
     api: ApiPromise;
     isReady: Promise<_SubstrateApi>;
+    connect: (_callbackUpdateMetadata?: (substrateApi: _SubstrateApi) => void) => void;
     specName: string;
     specVersion: string;
     systemChain: string;

package/services/chain-service/types.js

@@ -12,6 +12,6 @@ export let _ChainConnectionStatus;
   _ChainConnectionStatus["CONNECTING"] = "CONNECTING";
 })(_ChainConnectionStatus || (_ChainConnectionStatus = {}));
 export const _CUSTOM_PREFIX = 'custom-';
-export const _FUNGIBLE_CONTRACT_STANDARDS = [_AssetType.ERC20, _AssetType.PSP22, _AssetType.GRC20];
+export const _FUNGIBLE_CONTRACT_STANDARDS = [_AssetType.ERC20, _AssetType.PSP22, _AssetType.GRC20, _AssetType.VFT];
 export const _NFT_CONTRACT_STANDARDS = [_AssetType.PSP34, _AssetType.ERC721];
 export const _SMART_CONTRACT_STANDARDS = [..._FUNGIBLE_CONTRACT_STANDARDS, ..._NFT_CONTRACT_STANDARDS];

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

@@ -48,6 +48,7 @@ export declare function _isChainSupportWasmNft(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportEvmERC20(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportWasmPSP22(chainInfo: _ChainInfo): boolean;
 export declare function _isChainSupportGRC20(chainInfo: _ChainInfo): boolean;
+export declare function _isChainSupportVFT(chainInfo: _ChainInfo): boolean;
 export declare const _isSupportOrdinal: (chain: string) => boolean;
 export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];

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

@@ -181,6 +181,10 @@ export function _isChainSupportGRC20(chainInfo) {
   var _chainInfo$substrateI12, _chainInfo$substrateI13;
   return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_AssetType.GRC20)) || false;
 }
+export function _isChainSupportVFT(chainInfo) {
+  var _chainInfo$substrateI14, _chainInfo$substrateI15;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : (_chainInfo$substrateI15 = _chainInfo$substrateI14.supportSmartContract) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.includes(_AssetType.VFT)) || false;
+}
 export const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
   return chains.includes(chain);
@@ -207,7 +211,7 @@ export function _getTokenTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
     chainInfo.substrateInfo.supportSmartContract.forEach(assetType => {
-      if ([_AssetType.PSP22, _AssetType.GRC20].includes(assetType)) {
+      if ([_AssetType.PSP22, _AssetType.GRC20, _AssetType.VFT].includes(assetType)) {
         result.push(assetType);
       }
     });
@@ -264,7 +268,7 @@ export function _isAssetSmartContractNft(assetInfo) {
   return [_AssetType.PSP34, _AssetType.ERC721].includes(assetInfo.assetType);
 }
 export function _isTokenGearSmartContract(tokenInfo) {
-  return [_AssetType.GRC20, _AssetType.GRC721].includes(tokenInfo.assetType);
+  return [_AssetType.GRC20, _AssetType.GRC721, _AssetType.VFT].includes(tokenInfo.assetType);
 }
 export function _parseAssetRefKey(originTokenSlug, destinationTokenSlug) {
   return `${originTokenSlug}___${destinationTokenSlug}`;
@@ -296,12 +300,12 @@ export function _isRelayChain(chainInfo) {
   return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
 }
 export function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI14;
-  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI16;
+  return ((_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.chainType) === _SubstrateChainType.RELAYCHAIN;
 }
 export function _isSubstrateParaChain(chainInfo) {
-  var _chainInfo$substrateI15;
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI15 = chainInfo.substrateInfo) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.chainType) === _SubstrateChainType.PARACHAIN;
+  var _chainInfo$substrateI17;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.chainType) === _SubstrateChainType.PARACHAIN;
 }
 export function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo4;
@@ -346,8 +350,8 @@ export function _getBlockExplorerFromChain(chainInfo) {
     var _chainInfo$evmInfo5;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.blockExplorer;
   } else {
-    var _chainInfo$substrateI16;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.blockExplorer;
+    var _chainInfo$substrateI18;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.blockExplorer;
   }
   if (!blockExplorer) {
     return undefined;
@@ -373,8 +377,8 @@ export const _isAssetAutoEnable = chainAsset => {
   return chainAsset.metadata ? !!chainAsset.metadata.autoEnable : false;
 };
 export function _getCrowdloanUrlFromChain(chainInfo) {
-  var _chainInfo$substrateI17;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.crowdloanUrl) || '';
+  var _chainInfo$substrateI19;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI19 = chainInfo.substrateInfo) === null || _chainInfo$substrateI19 === void 0 ? void 0 : _chainInfo$substrateI19.crowdloanUrl) || '';
 }
 export function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_CUSTOM_PREFIX);
@@ -410,8 +414,8 @@ export function _isMantaZkAsset(chainAsset) {
   return _MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_ZK_ASSET_PREFIX);
 }
 export function _getChainExistentialDeposit(chainInfo) {
-  var _chainInfo$substrateI18;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.existentialDeposit) || '0';
+  var _chainInfo$substrateI20;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI20 = chainInfo.substrateInfo) === null || _chainInfo$substrateI20 === void 0 ? void 0 : _chainInfo$substrateI20.existentialDeposit) || '0';
 }
 export function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {

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

@@ -3,7 +3,7 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, ExtrinsicType, StakingTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
+import { calculateAlephZeroValidatorReturn, calculateChainStakedReturnV2, calculateInflation, calculateTernoaValidatorReturn, calculateValidatorStakedReturn, getAvgValidatorEraReward, getCommission, getMaxValidatorErrorMessage, getMinStakeErrorMessage, getRelayBlockedValidatorList, getRelayEraRewardMap, getRelayMaxNominations, getRelayTopValidatorByPoints, getRelayValidatorPointsMap, getRelayWaitingValidatorList, getSupportedDaysByHistoryDepth } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { _STAKING_CHAIN_GROUP, _UPDATED_RUNTIME_STAKING_GROUP, MaxEraRewardPointsEras } from '@subwallet/extension-base/services/earning-service/constants';
@@ -313,11 +313,20 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const topValidatorList = getRelayTopValidatorByPoints(validatorPointsMap);
     const validators = _validators;
     const blockedValidatorList = getRelayBlockedValidatorList(validators);
+    const waitingValidatorList = getRelayWaitingValidatorList(validators);
+    const _waitingValidatorLedger = await chainApi.api.query.staking.ledger.multi(waitingValidatorList);
+    const waitingValidatorLedger = {};
+    if (_waitingValidatorLedger) {
+      waitingValidatorList.forEach((validator, i) => {
+        const validatorLedger = _waitingValidatorLedger[i].toPrimitive();
+        waitingValidatorLedger[validator] = new BigN(validatorLedger.total).toFixed();
+      });
+    }
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new BN(_totalEraStake.toString());
     const minBond = _minBond.toPrimitive();
-    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -352,11 +361,15 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       const validatorStake = applyDecimal(totalStakeMap[validator.address], decimals).toNumber();
       return calculateTernoaValidatorReturn(rewardPerValidator.toNumber(), validatorStake, commission);
     } else {
-      const bnValidatorStake = applyDecimal(totalStakeMap[validator.address], decimals);
-      return calculateValidatorStakedReturn(totalApy, bnValidatorStake, bnAvgStake, commission);
+      if (!totalStakeMap[validator.address]) {
+        return totalApy;
+      } else {
+        const bnValidatorStake = applyDecimal(totalStakeMap[validator.address], decimals);
+        return calculateValidatorStakedReturn(totalApy, bnValidatorStake, bnAvgStake, commission);
+      }
     }
   }
-  parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
+  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
     const allValidatorAddresses = [];
     const validatorInfoList = [];
@@ -406,6 +419,27 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         });
       }
     }
+    for (const waitingValidator of Object.keys(waitingValidatorList)) {
+      if (!allValidatorAddresses.includes(waitingValidator)) {
+        allValidatorAddresses.push(waitingValidator);
+        validatorInfoList.push({
+          address: waitingValidator,
+          totalStake: waitingValidatorList[waitingValidator],
+          ownStake: waitingValidatorList[waitingValidator],
+          otherStake: '0',
+          nominatorCount: 0,
+          // to be added later
+          commission: 0,
+          expectedReturn: 0,
+          blocked: false,
+          isVerified: false,
+          minBond: minBond.toString(),
+          isCrowded: false,
+          eraRewardPoint: '0',
+          topQuartile: false
+        });
+      }
+    }
     return [totalStakeMap, allValidatorAddresses, validatorInfoList];
   }
   /* Get pool targets */

package/services/earning-service/service.js

@@ -137,6 +137,9 @@ export default class EarningService {
           if (event.type === 'account.remove') {
             removedAddresses.push(event.data[0]);
           }
+          if (event.type === 'account.add') {
+            delayReload = true;
+          }
           if (event.type === 'chain.updateState') {
             const chainState = this.state.getChainStateByKey(event.data[0]);
             if (chainState && !_isChainEnabled(chainState)) {

package/services/migration-service/scripts/databases/ClearMetadataDatabase.js

@@ -2,10 +2,26 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { cacheMetadata, waitTimeout } from '@subwallet/extension-base/utils';
 export default class ClearMetadataDatabase extends BaseMigrationJob {
   async run() {
     // Clear all old metadata data
     await this.state.dbService.stores.metadata.clear();
+    const activeChains = this.state.chainService.getActiveChains();
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const reloadChains = activeChains.filter(chain => {
+      var _chainInfoMap$chain$s;
+      return !!((_chainInfoMap$chain$s = chainInfoMap[chain].substrateInfo) !== null && _chainInfoMap$chain$s !== void 0 && _chainInfoMap$chain$s.genesisHash);
+    });
+    for (const chain of reloadChains) {
+      const substrateApi = this.state.chainService.getSubstrateApi(chain);
+      const callback = substrateApi => {
+        cacheMetadata(chain, substrateApi, this.state.chainService);
+      };
+      Promise.race([substrateApi.isReady, waitTimeout(2000)]).finally(() => {
+        substrateApi === null || substrateApi === void 0 ? void 0 : substrateApi.connect(callback);
+      });
+    }
     return Promise.resolve();
   }
 }