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

package/background/KoniTypes.d.ts

@@ -8,7 +8,7 @@ import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCus
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { BalanceJson, BuyServiceInfo, BuyTokenInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestGetYieldPoolTargets, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseEarlyValidateYield, ResponseGetYieldPoolTargets, StorageDataInterface, SubmitYieldStepData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo, YieldValidationStatus } from '@subwallet/extension-base/types';
+import { BalanceJson, BuyServiceInfo, BuyTokenInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestGetYieldPoolTargets, RequestMetadataHash, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseEarlyValidateYield, ResponseGetYieldPoolTargets, ResponseMetadataHash, ResponseShortenMetadata, StorageDataInterface, SubmitYieldStepData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo, YieldValidationStatus } from '@subwallet/extension-base/types';
 import { CommonOptimalPath } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
 import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
@@ -201,10 +201,12 @@ export interface NftCollectionJson {
 }
 export interface MetadataItem {
     genesisHash: string;
+    specName: string;
     specVersion: string;
     hexValue: HexString;
     types: Record<string, Record<string, string> | string>;
     userExtensions?: ExtDef;
+    hexV15?: HexString;
 }
 export interface CrowdloanItem {
     state: APIItemState;
@@ -998,6 +1000,7 @@ export interface AddNetworkRequestExternal {
         decimals: number;
     };
 }
+export declare type AddNetworkToRequestConnect = AddNetworkRequestExternal;
 export interface AddTokenRequestExternal {
     slug?: string;
     contractAddress: string;
@@ -1756,6 +1759,8 @@ export interface KoniRequestSignatures {
     'pri(walletConnect.notSupport.approve)': [RequestApproveWalletConnectNotSupport, boolean];
     'pri(walletConnect.notSupport.reject)': [RequestRejectWalletConnectNotSupport, boolean];
     'pri(metadata.find)': [RequestFindRawMetadata, ResponseFindRawMetadata];
+    'pri(metadata.hash)': [RequestMetadataHash, ResponseMetadataHash];
+    'pri(metadata.transaction.shorten)': [RequestShortenMetadata, ResponseShortenMetadata];
     'pri(campaign.unlockDot.canMint)': [RequestUnlockDotCheckCanMint, boolean];
     'pri(campaign.unlockDot.subscribe)': [RequestUnlockDotSubscribeMintedData, UnlockDotTransactionNft, UnlockDotTransactionNft];
     'pri(campaign.banner.subscribe)': [null, CampaignBanner[], CampaignBanner[]];

package/cjs/constants/staking.js

@@ -20,7 +20,8 @@ const PREDEFINED_EARNING_POOL = {
   kusama: [80],
   vara_network: [62, 29, 50],
   aleph: [82],
-  availTuringTest: [11]
+  availTuringTest: [11],
+  avail_mainnet: [4]
 };
 exports.PREDEFINED_EARNING_POOL = PREDEFINED_EARNING_POOL;
 const MAX_NOMINATIONS = '16';

package/cjs/koni/api/staking/bonding/utils.js

@@ -26,6 +26,7 @@ exports.getRelayEraRewardMap = getRelayEraRewardMap;
 exports.getRelayMaxNominations = getRelayMaxNominations;
 exports.getRelayTopValidatorByPoints = getRelayTopValidatorByPoints;
 exports.getRelayValidatorPointsMap = getRelayValidatorPointsMap;
+exports.getRelayWaitingValidatorList = getRelayWaitingValidatorList;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getSupportedDaysByHistoryDepth = getSupportedDaysByHistoryDepth;
@@ -436,6 +437,20 @@ function getRelayBlockedValidatorList(validators) {
   }
   return blockValidatorList;
 }
+function getRelayWaitingValidatorList(validators) {
+  const waitingValidators = [];
+  for (const validator of validators) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorAddress = validator[0].toHuman()[0];
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    const validatorPrefs = validator[1].toHuman();
+    const isBlocked = validatorPrefs.blocked;
+    if (!isBlocked) {
+      waitingValidators.push(validatorAddress);
+    }
+  }
+  return waitingValidators;
+}
 function getRelayEraRewardMap(eraRewardPointArray, startEraForPoints) {
   const eraRewardMap = {};
   for (const item of eraRewardPointArray) {

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

@@ -3734,7 +3734,7 @@ class KoniExtension {
     };
   }
 
-  /// Metadata
+  /* Metadata */
 
   async findRawMetadata(_ref90) {
     let {
@@ -3753,6 +3753,28 @@ class KoniExtension {
       userExtensions
     };
   }
+  async calculateMetadataHash(_ref91) {
+    let {
+      chain
+    } = _ref91;
+    const hash = await this.#koniState.calculateMetadataHash(chain);
+    return {
+      metadataHash: hash || ''
+    };
+  }
+  async shortenMetadata(_ref92) {
+    let {
+      chain,
+      txBlob
+    } = _ref92;
+    const shorten = await this.#koniState.shortenMetadata(chain, txBlob);
+    return {
+      txMetadata: shorten || ''
+    };
+  }
+
+  /* Metadata */
+
   async resolveDomainByAddress(request) {
     const chainApi = this.#koniState.getSubstrateApi(request.chain);
     return await (0, _domain.resolveAzeroDomainToAddress)(request.domain, request.chain, chainApi.api);
@@ -3990,18 +4012,18 @@ class KoniExtension {
 
   /* Campaign */
 
-  unlockDotCheckCanMint(_ref91) {
+  unlockDotCheckCanMint(_ref93) {
     let {
       address,
       network,
       slug
-    } = _ref91;
+    } = _ref93;
     return this.#koniState.mintCampaignService.unlockDotCampaign.canMint(address, slug, network);
   }
-  unlockDotSubscribeMintedData(id, port, _ref92) {
+  unlockDotSubscribeMintedData(id, port, _ref94) {
     let {
       transactionId
-    } = _ref92;
+    } = _ref94;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.mintCampaignService.unlockDotCampaign.subscribeMintedNft(transactionId, cb);
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
@@ -4033,10 +4055,10 @@ class KoniExtension {
     });
     return filterBanner(await this.#koniState.campaignService.getProcessingCampaign());
   }
-  async completeCampaignBanner(_ref93) {
+  async completeCampaignBanner(_ref95) {
     let {
       slug
-    } = _ref93;
+    } = _ref95;
     const campaign = await this.#koniState.dbService.getCampaign(slug);
     if (campaign) {
       await this.#koniState.dbService.upsertCampaign({
@@ -4693,6 +4715,10 @@ class KoniExtension {
       // Metadata
       case 'pri(metadata.find)':
         return this.findRawMetadata(request);
+      case 'pri(metadata.hash)':
+        return this.calculateMetadataHash(request);
+      case 'pri(metadata.transaction.shorten)':
+        return this.shortenMetadata(request);
 
       /* Campaign */
       case 'pri(campaign.banner.subscribe)':

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

@@ -1813,7 +1813,8 @@ class KoniState {
     return (_this$chainService34 = this.chainService) === null || _this$chainService34 === void 0 ? void 0 : (_this$chainService34$ = _this$chainService34.mantaPay) === null || _this$chainService34$ === void 0 ? void 0 : _this$chainService34$.subscribeSyncState();
   }
 
-  // Metadata
+  /* Metadata */
+
   async findMetadata(hash) {
     const metadata = await this.chainService.getMetadataByHash(hash);
     return {
@@ -1823,6 +1824,15 @@ class KoniState {
       userExtensions: metadata === null || metadata === void 0 ? void 0 : metadata.userExtensions
     };
   }
+  async calculateMetadataHash(chain) {
+    return this.chainService.calculateMetadataHash(chain);
+  }
+  async shortenMetadata(chain, txBlob) {
+    return this.chainService.shortenMetadata(chain, txBlob);
+  }
+
+  /* Metadata */
+
   getCrowdloanContributions(_ref11) {
     let {
       address,

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.2.15-0'
+  version: '1.2.17-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -96,7 +96,7 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
     const chainSlug = chainInfo.slug;
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
     if (notSupportAddresses.length) {
-      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20]);
+      const tokens = (0, _utils2.filterAssetsByChainAndType)(chainAssetMap, chainSlug, [_types._AssetType.NATIVE, _types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.LOCAL, _types._AssetType.GRC20, _types._AssetType.VFT]);
       const now = new Date().getTime();
       Object.values(tokens).forEach(token => {
         const items = notSupportAddresses.map(address => ({

package/cjs/services/balance-service/helpers/subscribe/substrate/gear.js

@@ -0,0 +1,135 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.subscribeVftBalance = exports.subscribeGRC20Balance = void 0;
+var _api = require("@gear-js/api");
+var _types = require("@subwallet/chain-list/types");
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _constants = require("@subwallet/extension-base/constants");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
+var _util = require("@polkadot/util");
+var _utilCrypto = require("@polkadot/util-crypto");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const subscribeGRC20Balance = _ref => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref;
+  if (!(substrateApi instanceof _api.GearApi)) {
+    console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+    return _util.noop;
+  }
+  const chain = chainInfo.slug;
+  const grc20ContractMap = {};
+  const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.GRC20]);
+  Object.entries(tokenList).forEach(_ref2 => {
+    let [slug, tokenInfo] = _ref2;
+    grc20ContractMap[slug] = (0, _utils2.getGRC20ContractPromise)(substrateApi, (0, _utils._getContractAddressOfToken)(tokenInfo));
+  });
+  const getTokenBalances = () => {
+    Object.values(tokenList).map(async tokenInfo => {
+      try {
+        const contract = grc20ContractMap[tokenInfo.slug];
+        const balances = await Promise.all(addresses.map(async address => {
+          try {
+            const actor = (0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(address));
+            const _balanceOf = await contract.service.balanceOf(actor, address);
+            return {
+              address: address,
+              tokenSlug: tokenInfo.slug,
+              free: _balanceOf.toString(10),
+              locked: '0',
+              state: _KoniTypes.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: _KoniTypes.APIItemState.READY
+            };
+          }
+        }));
+        callback(balances);
+      } catch (err) {
+        console.warn(tokenInfo.slug, err); // TODO: error createType
+      }
+    });
+  };
+
+  getTokenBalances();
+  const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
+  return () => {
+    clearInterval(interval);
+  };
+};
+exports.subscribeGRC20Balance = subscribeGRC20Balance;
+const subscribeVftBalance = _ref3 => {
+  let {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    substrateApi
+  } = _ref3;
+  if (!(substrateApi instanceof _api.GearApi)) {
+    console.warn('Cannot subscribe VFT balance without GearApi instance');
+    return _util.noop;
+  }
+  const chain = chainInfo.slug;
+  const vftContractMap = {};
+  const tokenList = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.VFT]);
+  Object.entries(tokenList).forEach(_ref4 => {
+    let [slug, tokenInfo] = _ref4;
+    vftContractMap[slug] = (0, _utils2.getVFTContractPromise)(substrateApi, (0, _utils._getContractAddressOfToken)(tokenInfo));
+  });
+  const getTokenBalances = () => {
+    Object.values(tokenList).map(async tokenInfo => {
+      try {
+        const contract = vftContractMap[tokenInfo.slug];
+        const balances = await Promise.all(addresses.map(async address => {
+          try {
+            const actor = (0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(address));
+            const _balanceOf = await contract.service.balanceOf(actor, address);
+            return {
+              address: address,
+              tokenSlug: tokenInfo.slug,
+              free: _balanceOf.toString(10),
+              locked: '0',
+              state: _KoniTypes.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: _KoniTypes.APIItemState.READY
+            };
+          }
+        }));
+        callback(balances);
+      } catch (err) {
+        console.warn(tokenInfo.slug, err); // TODO: error createType
+      }
+    });
+  };
+
+  getTokenBalances();
+  const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
+  return () => {
+    clearInterval(interval);
+  };
+};
+exports.subscribeVftBalance = subscribeVftBalance;

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.subscribeSubstrateBalance = void 0;
-var _api = require("@gear-js/api");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -20,9 +19,9 @@ var _utils3 = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
-var _utilCrypto = require("@polkadot/util-crypto");
 var _evm = require("../evm");
 var _equilibrium = require("./equilibrium");
+var _gear = require("./gear");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -33,6 +32,7 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
   let unsubWasmContractToken;
   let unsubBridgedToken;
   let unsubGrcToken;
+  let unsubVftToken;
   const chain = chainInfo.slug;
   const baseParams = {
     addresses,
@@ -87,19 +87,24 @@ const subscribeSubstrateBalance = async (addresses, chainInfo, assetMap, substra
     }
     if ((0, _utils2._checkSmartContractSupportByChain)(chainInfo, _types._AssetType.GRC20)) {
       // Get sub-token for substrate-based chains
-      unsubGrcToken = subscribeGRC20Balance(substrateParams);
+      unsubGrcToken = (0, _gear.subscribeGRC20Balance)(substrateParams);
+    }
+    if ((0, _utils2._checkSmartContractSupportByChain)(chainInfo, _types._AssetType.VFT)) {
+      // Get sub-token for substrate-based chains
+      unsubVftToken = (0, _gear.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();
   };
 };
 
@@ -437,62 +442,4 @@ const subscribeOrmlTokensPallet = async _ref8 => {
       }).catch(console.error);
     });
   };
-};
-const subscribeGRC20Balance = _ref9 => {
-  let {
-    addresses,
-    assetMap,
-    callback,
-    chainInfo,
-    substrateApi
-  } = _ref9;
-  if (!(substrateApi instanceof _api.GearApi)) {
-    console.warn('Cannot subscribe VFT balance without GearApi instance');
-    return _util.noop;
-  }
-  const chain = chainInfo.slug;
-  const psp22ContractMap = {};
-  const tokenList = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.GRC20]);
-  Object.entries(tokenList).forEach(_ref10 => {
-    let [slug, tokenInfo] = _ref10;
-    psp22ContractMap[slug] = (0, _utils3.getGRC20ContractPromise)(substrateApi, (0, _utils2._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 = (0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(address));
-            const _balanceOf = await contract.balanceOf(actor, address);
-            return {
-              address: address,
-              tokenSlug: tokenInfo.slug,
-              free: _balanceOf.toString(10),
-              locked: '0',
-              state: _KoniTypes.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: _KoniTypes.APIItemState.READY
-            };
-          }
-        }));
-        callback(balances);
-      } catch (err) {
-        console.warn(tokenInfo.slug, err); // TODO: error createType
-      }
-    });
-  };
-
-  getTokenBalances();
-  const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
-  return () => {
-    clearInterval(interval);
-  };
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTransferMockTxFee = exports.createTransferExtrinsic = void 0;
 var _api = require("@gear-js/api");
+var _types = require("@subwallet/chain-list/types");
 var _wasm = require("@subwallet/extension-base/koni/api/contract-handler/wasm");
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/wasm/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
@@ -61,12 +62,12 @@ const createTransferExtrinsic = async _ref => {
     }, to, value, {});
     transferAmount = value;
   } else if ((0, _utils2._isTokenGearSmartContract)(tokenInfo) && api instanceof _api.GearApi) {
-    const contractPromise = (0, _utils4.getGRC20ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
-    const transaction = await contractPromise.transfer((0, _util.u8aToHex)((0, _utilCrypto.decodeAddress)(to)), BigInt(value)) // Create transfer transaction
+    const contractPromise = tokenInfo.assetType === _types._AssetType.GRC20 ? (0, _utils4.getGRC20ContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo)) : (0, _utils4.getVFTContractPromise)(api, (0, _utils2._getContractAddressOfToken)(tokenInfo));
+    const transaction = await contractPromise.service.transfer((0, _util.u8aToHex)((0, _utilCrypto.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 (_constants._TRANSFER_CHAIN_GROUP.acala.includes(networkKey)) {
     if (!(0, _utils2._isNativeToken)(tokenInfo)) {

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

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

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

@@ -11,7 +11,6 @@ var _AbstractChainHandler = require("@subwallet/extension-base/services/chain-se
 var _SubstrateApi2 = require("@subwallet/extension-base/services/chain-service/handler/SubstrateApi");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _apiContract = require("@polkadot/api-contract");
-var _typesKnown = require("@polkadot/types-known");
 var _util = require("@polkadot/util");
 var _logger = require("@polkadot/util/logger");
 var _utils3 = require("../../../koni/api/contract-handler/utils");
@@ -144,12 +143,26 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
   }
   async getGrc20TokenInfo(apiPromise, contractAddress) {
     if (!(apiPromise instanceof _api.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 = (0, _utils2.getGRC20ContractPromise)(apiPromise, contractAddress);
-    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.name(_utils2.DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.symbol(_utils2.DEFAULT_GEAR_ADDRESS.ALICE), tokenContract.decimals(_utils2.DEFAULT_GEAR_ADDRESS.ALICE)]);
+    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(_utils2.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 _api.GearApi)) {
+      console.warn('Cannot subscribe VFT balance without GearApi instance');
+      return ['', -1, '', true];
+    }
+    let contractError = false;
+    const tokenContract = (0, _utils2.getVFTContractPromise)(apiPromise, contractAddress);
+    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(_utils2.GEAR_DEFAULT_ADDRESS)]);
     const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
     if (!nameRes || !symbolRes) {
       contractError = true;
@@ -175,6 +188,9 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
         case _types._AssetType.GRC20:
           [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
           break;
+        case _types._AssetType.VFT:
+          [name, decimals, symbol, contractError] = await this.getVftTokenInfo(apiPromise, contractAddress);
+          break;
       }
       return {
         name,
@@ -207,31 +223,9 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
       providerName
     } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     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: (0, _typesKnown.getSpecTypes)(api.registry, systemChain, api.runtimeVersion.specName, api.runtimeVersion.specVersion),
-          userExtensions: (0, _typesKnown.getSpecExtensions)(api.registry, systemChain, api.runtimeVersion.specName)
-        }).catch(console.error);
-      }).catch(console.error);
+      (0, _utils2.cacheMetadata)(chainSlug, substrateApi, this.parent);
     };
 
     // Return existed to avoid re-init metadata
@@ -245,6 +239,7 @@ class SubstrateChainHandler extends _AbstractChainHandler.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 _SubstrateApi2.SubstrateApi(chainSlug, apiUrl, {
       providerName,
       metadata,