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

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/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();
   }
 }

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

@@ -1,14 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import AutoEnableSomeTokens from '@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens';
-import ReloadMetadata from '@subwallet/extension-base/services/migration-service/scripts/databases/ReloadMetadata';
-import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
-import MigrateRemoveGenesisHash from '@subwallet/extension-base/services/migration-service/scripts/MigrateRemoveGenesisHash';
-import MigrateTransactionHistoryBySymbol from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol';
+import AutoEnableSomeTokens from "./databases/AutoEnableSomeTokens.js";
 import ClearMetadataDatabase from "./databases/ClearMetadataDatabase.js";
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
 import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
+import ReloadMetadata from "./databases/ReloadMetadata.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -16,6 +13,7 @@ import MigratePolygonUSDCProvider from "./tokens/MigratePolygonUSDCProvider.js";
 import AutoEnableChainsTokens from "./AutoEnableChainsTokens.js";
 import DeleteChain from "./DeleteChain.js";
 import DeleteChainStaking from "./DeleteChainStaking.js";
+import DeleteEarningData from "./DeleteEarningData.js";
 import EnableVaraChain from "./EnableVaraChain.js";
 import MigrateAuthUrls from "./MigrateAuthUrls.js";
 import MigrateAutoLock from "./MigrateAutoLock.js";
@@ -24,9 +22,11 @@ import MigrateImportedToken from "./MigrateImportedToken.js";
 import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
 import MigrateLedgerAccountV2 from "./MigrateLedgerAccountV2.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
+import MigrateRemoveGenesisHash from "./MigrateRemoveGenesisHash.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
+import MigrateTransactionHistoryBySymbol from "./MigrateTransactionHistoryBySymbol.js";
 import MigrateWalletReference from "./MigrateWalletReference.js";
 export const EVERYTIME = '__everytime__';
 export default {
@@ -56,8 +56,8 @@ export default {
   '1.1.69-03': MigrateAssetSetting,
   '1.1.69-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash,
-  '1.2.1-01': ClearMetadataDatabase,
-  '1.2.13-01': ReloadMetadata
+  '1.2.13-01': ReloadMetadata,
+  '1.2.14-01': ClearMetadataDatabase
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/transaction-service/index.js

@@ -14,7 +14,7 @@ import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { _isRuntimeUpdated, anyNumberToBN, getMetadataHash, reformatAddress } from '@subwallet/extension-base/utils';
+import { _isRuntimeUpdated, anyNumberToBN, reformatAddress } from '@subwallet/extension-base/utils';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { BN_ZERO } from '@subwallet/extension-base/utils/number';
@@ -1030,20 +1030,25 @@ export default class TransactionService {
     const signerOption = {
       signer: {
         signPayload: async payload => {
-          const signing = await this.state.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload);
+          const {
+            signature,
+            signedTransaction
+          } = await this.state.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload);
           return {
             id: new Date().getTime(),
-            signature: signing.signature
+            signature,
+            signedTransaction
           };
         }
-      }
+      },
+      withSignedTransaction: true
     };
     if (_isRuntimeUpdated(signedExtensions)) {
-      try {
-        const metadataHash = await getMetadataHash(chain);
+      const metadataHash = await this.state.chainService.calculateMetadataHash(chain);
+      if (metadataHash) {
         signerOption.mode = 1;
-        signerOption.metadataHash = `0x${metadataHash}`;
-      } catch (e) {}
+        signerOption.metadataHash = metadataHash;
+      }
     }
     extrinsic.signAsync(address, signerOption).then(async rs => {
       // Emit signed event

package/types/metadata.d.ts

@@ -1,6 +1,13 @@
-export interface ResponseShortenMetadata {
-    txMetadata: string;
+export interface RequestMetadataHash {
+    chain: string;
 }
 export interface ResponseMetadataHash {
     metadataHash: string;
 }
+export interface RequestShortenMetadata {
+    chain: string;
+    txBlob: string;
+}
+export interface ResponseShortenMetadata {
+    txMetadata: string;
+}

package/utils/gear/combine.d.ts

@@ -0,0 +1,10 @@
+import { ApiPromise } from '@polkadot/api';
+import { GRC20 } from './grc20';
+import { VFT } from './vft';
+export declare const DEFAULT_GEAR_ADDRESS: {
+    ALICE: string;
+    BOB: string;
+};
+export declare const GEAR_DEFAULT_ADDRESS = "5EYCAe5ijiYfAXEth5DGRKiKuVjTXQKr877tUPz6eLz2t9aG";
+export declare function getGRC20ContractPromise(apiPromise: ApiPromise, contractAddress: string): GRC20;
+export declare function getVFTContractPromise(apiPromise: ApiPromise, contractAddress: string): VFT;

package/utils/gear/combine.js

@@ -0,0 +1,18 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { GRC20 } from "./grc20.js";
+import { VFT } from "./vft.js";
+export const DEFAULT_GEAR_ADDRESS = {
+  ALICE: '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
+  BOB: '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'
+};
+export const GEAR_DEFAULT_ADDRESS = '5EYCAe5ijiYfAXEth5DGRKiKuVjTXQKr877tUPz6eLz2t9aG';
+export function getGRC20ContractPromise(apiPromise, contractAddress) {
+  const gearApi = apiPromise;
+  return new GRC20(gearApi, contractAddress);
+}
+export function getVFTContractPromise(apiPromise, contractAddress) {
+  const gearApi = apiPromise;
+  return new VFT(gearApi, contractAddress);
+}

package/utils/gear/grc20.d.ts

@@ -1,29 +1,27 @@
 /// <reference types="node" />
 import { GearApi } from '@gear-js/api';
-import { TransactionBuilder } from 'sails-js';
-import { ApiPromise } from '@polkadot/api';
-export declare type ActorId = `0x${string}`;
-export declare type U256 = bigint;
-export declare const DEFAULT_GEAR_ADDRESS: {
-    ALICE: string;
-    BOB: string;
-};
+import { ActorId, TransactionBuilder } from 'sails-js';
+import { TypeRegistry } from '@polkadot/types';
 export declare class GRC20 {
     api: GearApi;
     programId: `0x${string}`;
-    private registry;
+    readonly registry: TypeRegistry;
+    readonly service: Grc20Service;
     constructor(api: GearApi, programId?: `0x${string}`);
-    newCtorFromCode(code: Uint8Array | Buffer, name: string, symbol: string, decimals: number | string): TransactionBuilder<null>;
-    newCtorFromCodeId(codeId: `0x${string}`, name: string, symbol: string, decimals: number | string): TransactionBuilder<null>;
-    approve(spender: ActorId, value: U256): TransactionBuilder<boolean>;
-    fromTransfer(from: ActorId, to: ActorId, value: U256): TransactionBuilder<boolean>;
-    setBalance(newBalance: U256): TransactionBuilder<boolean>;
-    transfer(to: ActorId, value: U256): TransactionBuilder<boolean>;
-    allowance(owner: ActorId, spender: ActorId, originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<U256>;
-    balanceOf(owner: ActorId, originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<U256>;
-    decimals(originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<number | string>;
+    newCtorFromCode(code: Uint8Array | Buffer, name: string, symbol: string, decimals: number): TransactionBuilder<null>;
+    newCtorFromCodeId(codeId: `0x${string}`, name: string, symbol: string, decimals: number): TransactionBuilder<null>;
+}
+export declare class Grc20Service {
+    private _program;
+    constructor(_program: GRC20);
+    approve(spender: ActorId, value: number | string | bigint): TransactionBuilder<boolean>;
+    fromTransfer(from: ActorId, to: ActorId, value: number | string | bigint): TransactionBuilder<boolean>;
+    setBalance(newBalance: number | string | bigint): TransactionBuilder<boolean>;
+    transfer(to: ActorId, value: number | string | bigint): TransactionBuilder<boolean>;
+    allowance(owner: ActorId, spender: ActorId, originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<bigint>;
+    balanceOf(owner: ActorId, originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<bigint>;
+    decimals(originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<number>;
     name(originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<string>;
     symbol(originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<string>;
-    totalSupply(originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<U256>;
+    totalSupply(originAddress: string, value?: number | string | bigint, atBlock?: `0x${string}`): Promise<bigint>;
 }
-export declare function getGRC20ContractPromise(apiPromise: ApiPromise, contractAddress: string): GRC20;