@subwallet/extension-base 1.3.12-1 → 1.3.13-0

package/background/KoniTypes.d.ts

@@ -211,6 +211,16 @@ export interface MetadataItem {
     types: Record<string, Record<string, string> | string>;
     userExtensions?: ExtDef;
     hexV15?: HexString;
+    tokenInfo?: {
+        ss58Format: number;
+        tokenDecimals: number;
+        tokenSymbol: string;
+    };
+}
+export interface MetadataV15Item {
+    genesisHash: string;
+    specVersion: string;
+    hexV15?: HexString;
 }
 export interface CrowdloanItem {
     state: APIItemState;

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

@@ -47,7 +47,6 @@ var _stores = require("@subwallet/extension-base/stores");
 var _types3 = require("@subwallet/extension-base/types");
 var _utils5 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
-var _extensionChains = require("@subwallet/extension-chains");
 var _keyring = require("@subwallet/keyring");
 var _types4 = require("@subwallet/keyring/types");
 var _uiKeyring = require("@subwallet/ui-keyring");
@@ -58,6 +57,7 @@ var _rxjs = require("rxjs");
 var _types5 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
+var _utils7 = require("../utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -2320,7 +2320,7 @@ class KoniExtension {
     }
   }
 
-  /// Signing substrate request
+  // Signing substrate request
   async signingApprovePasswordV2(_ref43) {
     let {
       id
@@ -2336,7 +2336,7 @@ class KoniExtension {
 
     // unlike queued.account.address the following
     // address is encoded with the default prefix
-    // which what is used for password caching mapping
+    // which is used for password caching mapping
     const {
       address
     } = pair;
@@ -2350,63 +2350,15 @@ class KoniExtension {
     const {
       payload
     } = request;
-    let registry;
+    let registry = new _types5.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      let metadata;
-
-      /**
-       *  Get the metadata for the genesisHash
-       *  @todo: need to handle case metadata store in db
-      */
-      metadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
-      if (metadata) {
-        // we have metadata, expand it and extract the info/registry
-        const expanded = (0, _extensionChains.metadataExpand)(metadata, false);
-        registry = expanded.registry;
-        registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+      const allRegistry = [(0, _utils7.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils7.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils7.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
+      if (allRegistry.length === 0) {
+        registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        metadata = await this.#koniState.chainService.getMetadataByHash(payload.genesisHash);
-        if (metadata) {
-          var _chainInfo$substrateI, _chainInfo$substrateI2, _chainInfo$substrateI3, _chainInfo$substrateI4;
-          registry = new _types5.TypeRegistry();
-          const _metadata = new _types5.Metadata(registry, metadata.hexValue);
-          registry.register(metadata.types);
-          registry.setChainProperties(registry.createType('ChainProperties', {
-            ss58Format: (_chainInfo$substrateI = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.addressPrefix) !== null && _chainInfo$substrateI !== void 0 ? _chainInfo$substrateI : 42,
-            tokenDecimals: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals,
-            tokenSymbol: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI4 = chainInfo.substrateInfo) === null || _chainInfo$substrateI4 === void 0 ? void 0 : _chainInfo$substrateI4.symbol
-          }));
-          registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
-        } else {
-          // we have no metadata, create a new registry
-          registry = new _types5.TypeRegistry();
-          registry.setSignedExtensions(payload.signedExtensions);
-        }
+        registry = (0, _utils7.getSuitableRegistry)(allRegistry, payload);
       }
-      if (!metadata) {
-        /*
-        * Some networks must have metadata to signing,
-        * so if the chain not active (cannot use metadata from api), it must be rejected
-        *  */
-        if (chainInfo && (_constants2._API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _constants2._API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug)) // The special case for chains that need metadata to signing
-        ) {
-          // For case the chain does not have any provider
-          if (!Object.keys(chainInfo.providers).length) {
-            reject(new Error('{{chain}} network does not have any provider to connect, please update metadata from dApp'.replaceAll('{{chain}}', chainInfo.name)));
-            return false;
-          }
-          const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
-          if (!isChainActive) {
-            reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
-            return false;
-          }
-          registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
-        }
-      }
-    } else {
-      // for non-payload, just create a registry to use
-      registry = new _types5.TypeRegistry();
     }
     const result = request.sign(registry, pair);
     resolve({

package/cjs/koni/background/utils.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSuitableRegistry = getSuitableRegistry;
+exports.setupApiRegistry = setupApiRegistry;
+exports.setupDappRegistry = setupDappRegistry;
+exports.setupDatabaseRegistry = setupDatabaseRegistry;
+var _bundle = require("@subwallet/extension-chains/bundle");
+var _types = require("@polkadot/types");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+function getSuitableRegistry(registries, payload) {
+  const payloadSpecVersion = parseInt(payload.specVersion);
+  const sortedRegistries = registries.filter(registrySource => registrySource.registry !== undefined).map(registrySource => {
+    const specVersion = Number(registrySource.specVersion);
+    const distance = Math.abs(specVersion - payloadSpecVersion);
+    const isHigher = specVersion >= payloadSpecVersion;
+    return {
+      registry: registrySource.registry,
+      specVersion,
+      distance,
+      isHigher
+    };
+  }).sort((a, b) => {
+    if (a.distance !== b.distance) {
+      return a.distance - b.distance;
+    }
+    return b.specVersion - a.specVersion;
+  });
+  return sortedRegistries[0].registry;
+}
+function setupApiRegistry(chainInfo, koniState) {
+  if (!chainInfo) {
+    return null;
+  }
+  const api = koniState.getSubstrateApi(chainInfo.slug).api;
+  const apiSpecVersion = api === null || api === void 0 ? void 0 : api.runtimeVersion.specVersion.toString();
+  const registry = api === null || api === void 0 ? void 0 : api.registry;
+  return {
+    registry,
+    specVersion: apiSpecVersion
+  };
+}
+function setupDatabaseRegistry(metadata, chainInfo, payload) {
+  if (!metadata || !metadata.genesisHash || !chainInfo) {
+    return null;
+  }
+  const registry = new _types.TypeRegistry();
+  const _metadata = new _types.Metadata(registry, metadata.hexValue);
+  registry.register(metadata.types);
+  registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo));
+  registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+  return {
+    registry,
+    specVersion: metadata.specVersion
+  };
+}
+function setupDappRegistry(metadata, payload) {
+  if (!metadata || !metadata.genesisHash) {
+    return null;
+  }
+  const expanded = (0, _bundle.metadataExpand)(metadata, false);
+  const registry = expanded.registry;
+  registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+  return {
+    registry,
+    specVersion: metadata.specVersion
+  };
+}

package/cjs/packageInfo.js

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

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

@@ -1749,27 +1749,34 @@ class ChainService {
   upsertMetadata(chain, metadata) {
     return this.dbService.stores.metadata.upsertMetadata(chain, metadata);
   }
+  getMetadataV15(chain) {
+    return this.dbService.stores.metadataV15.getMetadata(chain);
+  }
+  upsertMetadataV15(chain, metadata) {
+    return this.dbService.stores.metadataV15.upsertMetadata(chain, metadata);
+  }
   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);
+  getExtraInfo(metadata) {
+    var _tokenInfo$tokenDecim, _tokenInfo$tokenSymbo, _tokenInfo$ss58Format;
+    const tokenInfo = metadata.tokenInfo;
     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
+      decimals: (_tokenInfo$tokenDecim = tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.tokenDecimals) !== null && _tokenInfo$tokenDecim !== void 0 ? _tokenInfo$tokenDecim : 0,
+      tokenSymbol: (_tokenInfo$tokenSymbo = tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.tokenSymbol) !== null && _tokenInfo$tokenSymbo !== void 0 ? _tokenInfo$tokenSymbo : 'Unit',
+      base58Prefix: (_tokenInfo$ss58Format = tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.ss58Format) !== null && _tokenInfo$ss58Format !== void 0 ? _tokenInfo$ss58Format : 42
     };
   }
   async calculateMetadataHash(chain) {
     const metadata = await this.getMetadata(chain);
-    if (!metadata || !metadata.hexV15) {
+    const metadataV15 = await this.getMetadataV15(chain);
+    if (!metadata || !metadataV15 || !metadataV15.hexV15) {
       return undefined;
     }
-    const extraInfo = this.getExtraInfo(chain);
+    const extraInfo = this.getExtraInfo(metadata);
     const specVersion = parseInt(metadata.specVersion);
     const specName = metadata.specName;
-    const hexV15 = metadata.hexV15;
+    const hexV15 = metadataV15.hexV15;
     return (0, _utils2.calculateMetadataHash)({
       ...extraInfo,
       specVersion,
@@ -1778,13 +1785,14 @@ class ChainService {
   }
   async shortenMetadata(chain, txBlob) {
     const metadata = await this.getMetadata(chain);
-    if (!metadata || !metadata.hexV15) {
+    const metadataV15 = await this.getMetadataV15(chain);
+    if (!metadata || !metadataV15 || !metadataV15.hexV15) {
       return undefined;
     }
-    const extraInfo = this.getExtraInfo(chain);
+    const extraInfo = this.getExtraInfo(metadata);
     const specVersion = parseInt(metadata.specVersion);
     const specName = metadata.specName;
-    const hexV15 = metadata.hexV15;
+    const hexV15 = metadataV15.hexV15;
     return (0, _utils2.getShortMetadata)(txBlob, {
       ...extraInfo,
       specVersion,

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

@@ -67,9 +67,9 @@ var _default = {
   '1.2.28-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
   '1.2.13-01': _ReloadMetadata.default,
-  '1.2.14-01': _ClearMetadataDatabase.default,
   '1.2.32-01': _MigratePairData.default,
-  '1.3.6-01': _MigrateTransactionHistoryBridge.default
+  '1.3.6-01': _MigrateTransactionHistoryBridge.default,
+  '1.3.10-01': _ClearMetadataDatabase.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/cjs/services/storage-service/DatabaseService.js

@@ -45,6 +45,7 @@ class DatabaseService {
       transaction: new _dbStores.TransactionStore(this._db.transactions),
       migration: new _dbStores.MigrationStore(this._db.migrations),
       metadata: new _dbStores.MetadataStore(this._db.metadata),
+      metadataV15: new _dbStores.MetadataV15Store(this._db.metadataV15),
       chain: new _dbStores.ChainStore(this._db.chain),
       asset: new _dbStores.AssetStore(this._db.asset),
       // yield

package/cjs/services/storage-service/databases/index.js

@@ -53,6 +53,9 @@ class KoniDatabase extends _dexie.default {
     this.conditionalVersion(7, {
       inappNotification: 'id, address, proxyId, [proxyId+actionType], actionType'
     });
+    this.conditionalVersion(8, {
+      metadataV15: 'genesisHash, chain'
+    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {

package/cjs/services/storage-service/db-stores/MetadataV15.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _BaseStoreWithChain = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithChain"));
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MetadataV15Store extends _BaseStoreWithChain.default {
+  getMetadata(chain) {
+    return this.table.where('chain').equals(chain).first();
+  }
+  upsertMetadata(chain, metadata) {
+    return this.table.put(metadata, chain);
+  }
+  getMetadataByGenesisHash(genesisHash) {
+    return this.table.get(genesisHash);
+  }
+  updateMetadataByGenesisHash(genesisHash, metadata) {
+    return this.table.put(metadata, genesisHash);
+  }
+}
+exports.default = MetadataV15Store;

package/cjs/services/storage-service/db-stores/index.js

@@ -34,6 +34,12 @@ Object.defineProperty(exports, "MetadataStore", {
     return _Metadata.default;
   }
 });
+Object.defineProperty(exports, "MetadataV15Store", {
+  enumerable: true,
+  get: function () {
+    return _MetadataV.default;
+  }
+});
 Object.defineProperty(exports, "MigrationStore", {
   enumerable: true,
   get: function () {
@@ -79,5 +85,6 @@ var _Staking = _interopRequireDefault(require("./Staking"));
 var _Transaction = _interopRequireDefault(require("./Transaction"));
 var _Migration = _interopRequireDefault(require("./Migration"));
 var _Metadata = _interopRequireDefault(require("./Metadata"));
+var _MetadataV = _interopRequireDefault(require("./MetadataV15"));
 var _Chain = _interopRequireDefault(require("./Chain"));
 var _Asset = _interopRequireDefault(require("./Asset"));

package/cjs/utils/metadata.js

@@ -3,13 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getShortMetadata = exports.calculateMetadataHash = exports.cacheMetadata = exports._isRuntimeUpdated = void 0;
+exports.statics = exports.getShortMetadata = exports.calculateMetadataHash = exports.cacheMetadata = exports._isRuntimeUpdated = exports.DEFAULT_SS58 = exports.DEFAULT_DECIMALS = void 0;
+var _types = require("@polkadot/types");
 var _typesKnown = require("@polkadot/types-known");
 var _util = require("@polkadot/util");
+var _defaults = require("@polkadot/util-crypto/address/defaults");
 var _merkleizeMetadata2 = require("@polkadot-api/merkleize-metadata");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const statics = {
+  api: undefined,
+  registry: new _types.TypeRegistry()
+};
+exports.statics = statics;
+const DEFAULT_DECIMALS = statics.registry.createType('u32', 12);
+exports.DEFAULT_DECIMALS = DEFAULT_DECIMALS;
+const DEFAULT_SS58 = statics.registry.createType('u32', _defaults.defaults.prefix);
+exports.DEFAULT_SS58 = DEFAULT_SS58;
 const _isRuntimeUpdated = signedExtensions => {
   return signedExtensions ? signedExtensions.includes('CheckMetadataHash') : false;
 };
@@ -24,36 +35,72 @@ const getShortMetadata = (blob, extraInfo, metadata) => {
   return (0, _util.u8aToHex)(_merkleizeMetadata.getProofForExtrinsicPayload(blob));
 };
 exports.getShortMetadata = getShortMetadata;
-const cacheMetadata = (chain, substrateApi, chainService) => {
-  // Update metadata to database with async methods
-  substrateApi.api.isReady.then(async api => {
+const updateMetadataV15 = async (chain, api, chainService) => {
+  try {
     const currentSpecVersion = api.runtimeVersion.specVersion.toString();
-    const specName = api.runtimeVersion.specName.toString();
     const genesisHash = api.genesisHash.toHex();
-    const metadata = await (chainService === null || chainService === void 0 ? void 0 : chainService.getMetadata(chain));
+    const metadata = await (chainService === null || chainService === void 0 ? void 0 : chainService.getMetadataV15(chain));
 
     // 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
-    let hexV15;
-    const metadataV15 = await api.call.metadata.metadataAtVersion(15);
-    if (!metadataV15.isEmpty) {
-      hexV15 = metadataV15.unwrap().toHex();
+    if (api.call.metadata.metadataAtVersion) {
+      const metadataV15 = await api.call.metadata.metadataAtVersion(15);
+      if (!metadataV15.isEmpty) {
+        const hexV15 = metadataV15.unwrap().toHex();
+        const updateMetadata = {
+          chain: chain,
+          genesisHash: genesisHash,
+          specVersion: currentSpecVersion,
+          hexV15
+        };
+        chainService === null || chainService === void 0 ? void 0 : chainService.upsertMetadataV15(chain, {
+          ...updateMetadata
+        }).catch(console.error);
+      }
     }
-    chainService === null || chainService === void 0 ? void 0 : chainService.upsertMetadata(chain, {
-      chain: chain,
-      genesisHash: genesisHash,
-      specName: specName,
-      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),
-      hexV15
-    }).catch(console.error);
+  } catch (err) {
+    console.error('Error:', err);
+  }
+};
+const updateMetadata = async (chain, api, chainService) => {
+  const currentSpecVersion = api.runtimeVersion.specVersion.toString();
+  const genesisHash = api.genesisHash.toHex();
+  const specName = api.runtimeVersion.specName.toString();
+  const metadata = await (chainService === null || chainService === void 0 ? void 0 : chainService.getMetadata(chain));
+
+  // Avoid date existed metadata
+  if (metadata && metadata.specVersion === currentSpecVersion && metadata.genesisHash === genesisHash) {
+    return;
+  }
+  const systemChain = api.runtimeChain;
+  const metadataHex = api.runtimeMetadata.toHex();
+  const registry = api.registry;
+  const tokenInfo = {
+    ss58Format: (0, _util.isNumber)(registry.chainSS58) ? registry.chainSS58 : DEFAULT_SS58.toNumber(),
+    tokenDecimals: (registry.chainDecimals || [DEFAULT_DECIMALS.toNumber()])[0],
+    tokenSymbol: (registry.chainTokens || _util.formatBalance.getDefaults().unit)[0]
+  };
+  const updateMetadata = {
+    chain: chain,
+    genesisHash: genesisHash,
+    specName: specName,
+    specVersion: currentSpecVersion,
+    hexValue: metadataHex,
+    types: (0, _typesKnown.getSpecTypes)(api.registry, systemChain, api.runtimeVersion.specName, api.runtimeVersion.specVersion),
+    userExtensions: (0, _typesKnown.getSpecExtensions)(api.registry, systemChain, api.runtimeVersion.specName),
+    tokenInfo
+  };
+  chainService === null || chainService === void 0 ? void 0 : chainService.upsertMetadata(chain, {
+    ...updateMetadata
+  }).catch(console.error);
+};
+const cacheMetadata = (chain, substrateApi, chainService) => {
+  // Update metadata to database with async methods
+  substrateApi.api.isReady.then(api => {
+    updateMetadata(chain, api, chainService).catch(console.error);
+    updateMetadataV15(chain, api, chainService).catch(console.error);
   }).catch(console.error);
 };
 exports.cacheMetadata = cacheMetadata;

package/koni/background/handlers/Extension.js

@@ -31,7 +31,7 @@ import { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, create
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
-import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
+import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenMinAmount, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
@@ -42,7 +42,6 @@ import { AccountsStore } from '@subwallet/extension-base/stores';
 import { BasicTxErrorType, BasicTxWarningCode, StakingTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
 import { _analyzeAddress, BN_ZERO, combineAllAccountProxy, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, toBNString, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
-import { metadataExpand } from '@subwallet/extension-chains';
 import { getKeypairTypeByAddress, isAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';
@@ -50,9 +49,10 @@ import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { combineLatest, Subject } from 'rxjs';
-import { Metadata, TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types';
 import { assert, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex } from '@polkadot/util';
 import { decodeAddress, isEthereumAddress } from '@polkadot/util-crypto';
+import { getSuitableRegistry, setupApiRegistry, setupDappRegistry, setupDatabaseRegistry } from "../utils.js";
 export function isJsonPayload(value) {
   return value.genesisHash !== undefined;
 }
@@ -2264,7 +2264,7 @@ export default class KoniExtension {
     }
   }
 
-  /// Signing substrate request
+  // Signing substrate request
   async signingApprovePasswordV2({
     id
   }) {
@@ -2279,7 +2279,7 @@ export default class KoniExtension {
 
     // unlike queued.account.address the following
     // address is encoded with the default prefix
-    // which what is used for password caching mapping
+    // which is used for password caching mapping
     const {
       address
     } = pair;
@@ -2293,63 +2293,15 @@ export default class KoniExtension {
     const {
       payload
     } = request;
-    let registry;
+    let registry = new TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      let metadata;
-
-      /**
-       *  Get the metadata for the genesisHash
-       *  @todo: need to handle case metadata store in db
-      */
-      metadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
-      if (metadata) {
-        // we have metadata, expand it and extract the info/registry
-        const expanded = metadataExpand(metadata, false);
-        registry = expanded.registry;
-        registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+      const allRegistry = [setupApiRegistry(chainInfo, this.#koniState), setupDatabaseRegistry(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), setupDappRegistry(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
+      if (allRegistry.length === 0) {
+        registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        metadata = await this.#koniState.chainService.getMetadataByHash(payload.genesisHash);
-        if (metadata) {
-          var _chainInfo$substrateI, _chainInfo$substrateI2, _chainInfo$substrateI3, _chainInfo$substrateI4;
-          registry = new TypeRegistry();
-          const _metadata = new Metadata(registry, metadata.hexValue);
-          registry.register(metadata.types);
-          registry.setChainProperties(registry.createType('ChainProperties', {
-            ss58Format: (_chainInfo$substrateI = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.addressPrefix) !== null && _chainInfo$substrateI !== void 0 ? _chainInfo$substrateI : 42,
-            tokenDecimals: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals,
-            tokenSymbol: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI4 = chainInfo.substrateInfo) === null || _chainInfo$substrateI4 === void 0 ? void 0 : _chainInfo$substrateI4.symbol
-          }));
-          registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
-        } else {
-          // we have no metadata, create a new registry
-          registry = new TypeRegistry();
-          registry.setSignedExtensions(payload.signedExtensions);
-        }
+        registry = getSuitableRegistry(allRegistry, payload);
       }
-      if (!metadata) {
-        /*
-        * Some networks must have metadata to signing,
-        * so if the chain not active (cannot use metadata from api), it must be rejected
-        *  */
-        if (chainInfo && (_API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug)) // The special case for chains that need metadata to signing
-        ) {
-          // For case the chain does not have any provider
-          if (!Object.keys(chainInfo.providers).length) {
-            reject(new Error('{{chain}} network does not have any provider to connect, please update metadata from dApp'.replaceAll('{{chain}}', chainInfo.name)));
-            return false;
-          }
-          const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
-          if (!isChainActive) {
-            reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
-            return false;
-          }
-          registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
-        }
-      }
-    } else {
-      // for non-payload, just create a registry to use
-      registry = new TypeRegistry();
     }
     const result = request.sign(registry, pair);
     resolve({

package/koni/background/utils.d.ts

@@ -0,0 +1,13 @@
+import { _ChainInfo } from '@subwallet/chain-list/types';
+import { MetadataItem } from '@subwallet/extension-base/background/KoniTypes';
+import { MetadataDef } from '@subwallet/extension-inject/types';
+import { Registry, SignerPayloadJSON } from '@polkadot/types/types';
+import KoniState from './handlers/State';
+export interface RegistrySource {
+    registry: Registry;
+    specVersion: string | number;
+}
+export declare function getSuitableRegistry(registries: RegistrySource[], payload: SignerPayloadJSON): Registry;
+export declare function setupApiRegistry(chainInfo: _ChainInfo | undefined, koniState: KoniState): RegistrySource | null;
+export declare function setupDatabaseRegistry(metadata: MetadataItem, chainInfo: _ChainInfo | undefined, payload: SignerPayloadJSON): RegistrySource | null;
+export declare function setupDappRegistry(metadata: MetadataDef, payload: SignerPayloadJSON): RegistrySource | null;

package/koni/background/utils.js

@@ -0,0 +1,63 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { metadataExpand } from '@subwallet/extension-chains/bundle';
+import { Metadata, TypeRegistry } from '@polkadot/types';
+export function getSuitableRegistry(registries, payload) {
+  const payloadSpecVersion = parseInt(payload.specVersion);
+  const sortedRegistries = registries.filter(registrySource => registrySource.registry !== undefined).map(registrySource => {
+    const specVersion = Number(registrySource.specVersion);
+    const distance = Math.abs(specVersion - payloadSpecVersion);
+    const isHigher = specVersion >= payloadSpecVersion;
+    return {
+      registry: registrySource.registry,
+      specVersion,
+      distance,
+      isHigher
+    };
+  }).sort((a, b) => {
+    if (a.distance !== b.distance) {
+      return a.distance - b.distance;
+    }
+    return b.specVersion - a.specVersion;
+  });
+  return sortedRegistries[0].registry;
+}
+export function setupApiRegistry(chainInfo, koniState) {
+  if (!chainInfo) {
+    return null;
+  }
+  const api = koniState.getSubstrateApi(chainInfo.slug).api;
+  const apiSpecVersion = api === null || api === void 0 ? void 0 : api.runtimeVersion.specVersion.toString();
+  const registry = api === null || api === void 0 ? void 0 : api.registry;
+  return {
+    registry,
+    specVersion: apiSpecVersion
+  };
+}
+export function setupDatabaseRegistry(metadata, chainInfo, payload) {
+  if (!metadata || !metadata.genesisHash || !chainInfo) {
+    return null;
+  }
+  const registry = new TypeRegistry();
+  const _metadata = new Metadata(registry, metadata.hexValue);
+  registry.register(metadata.types);
+  registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo));
+  registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+  return {
+    registry,
+    specVersion: metadata.specVersion
+  };
+}
+export function setupDappRegistry(metadata, payload) {
+  if (!metadata || !metadata.genesisHash) {
+    return null;
+  }
+  const expanded = metadataExpand(metadata, false);
+  const registry = expanded.registry;
+  registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+  return {
+    registry,
+    specVersion: metadata.specVersion
+  };
+}

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.12-1",
+  "version": "1.3.13-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -568,6 +568,11 @@
       "require": "./cjs/koni/background/subscription.js",
       "default": "./koni/background/subscription.js"
     },
+    "./koni/background/utils": {
+      "types": "./koni/background/utils.d.ts",
+      "require": "./cjs/koni/background/utils.js",
+      "default": "./koni/background/utils.js"
+    },
     "./package.json": "./package.json",
     "./packageInfo.js": {
       "types": "./packageInfo.d.ts",
@@ -1681,6 +1686,11 @@
       "require": "./cjs/services/storage-service/db-stores/Metadata.js",
       "default": "./services/storage-service/db-stores/Metadata.js"
     },
+    "./services/storage-service/db-stores/MetadataV15": {
+      "types": "./services/storage-service/db-stores/MetadataV15.d.ts",
+      "require": "./cjs/services/storage-service/db-stores/MetadataV15.js",
+      "default": "./services/storage-service/db-stores/MetadataV15.js"
+    },
     "./services/storage-service/db-stores/Migration": {
       "types": "./services/storage-service/db-stores/Migration.d.ts",
       "require": "./cjs/services/storage-service/db-stores/Migration.js",
@@ -2504,10 +2514,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.97",
-    "@subwallet/extension-base": "^1.3.12-1",
-    "@subwallet/extension-chains": "^1.3.12-1",
-    "@subwallet/extension-dapp": "^1.3.12-1",
-    "@subwallet/extension-inject": "^1.3.12-1",
+    "@subwallet/extension-base": "^1.3.13-0",
+    "@subwallet/extension-chains": "^1.3.13-0",
+    "@subwallet/extension-dapp": "^1.3.13-0",
+    "@subwallet/extension-inject": "^1.3.13-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.12-1'
+  version: '1.3.13-0'
 };

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

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AssetSetting, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { AssetSetting, MetadataItem, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
 import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
-import { IMetadataItem } from '@subwallet/extension-base/services/storage-service/databases';
+import { IMetadataItem, IMetadataV15Item } 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';
@@ -155,8 +155,10 @@ export declare class ChainService {
     resetWallet(resetAll: boolean): void;
     getMetadata(chain: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
     upsertMetadata(chain: string, metadata: IMetadataItem): import("dexie").PromiseExtended<unknown>;
+    getMetadataV15(chain: string): import("dexie").PromiseExtended<IMetadataV15Item | undefined>;
+    upsertMetadataV15(chain: string, metadata: IMetadataV15Item): import("dexie").PromiseExtended<unknown>;
     getMetadataByHash(hash: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
-    getExtraInfo(chain: string): Omit<ExtraInfo, 'specVersion' | 'specName'>;
+    getExtraInfo(metadata: MetadataItem): Omit<ExtraInfo, 'specVersion' | 'specName'>;
     calculateMetadataHash(chain: string): Promise<string | undefined>;
     shortenMetadata(chain: string, txBlob: string): Promise<string | undefined>;
     getSubscanChainMap(reverse?: boolean): Record<string, string>;

package/services/chain-service/index.js

@@ -1720,27 +1720,34 @@ export class ChainService {
   upsertMetadata(chain, metadata) {
     return this.dbService.stores.metadata.upsertMetadata(chain, metadata);
   }
+  getMetadataV15(chain) {
+    return this.dbService.stores.metadataV15.getMetadata(chain);
+  }
+  upsertMetadataV15(chain, metadata) {
+    return this.dbService.stores.metadataV15.upsertMetadata(chain, metadata);
+  }
   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);
+  getExtraInfo(metadata) {
+    var _tokenInfo$tokenDecim, _tokenInfo$tokenSymbo, _tokenInfo$ss58Format;
+    const tokenInfo = metadata.tokenInfo;
     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
+      decimals: (_tokenInfo$tokenDecim = tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.tokenDecimals) !== null && _tokenInfo$tokenDecim !== void 0 ? _tokenInfo$tokenDecim : 0,
+      tokenSymbol: (_tokenInfo$tokenSymbo = tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.tokenSymbol) !== null && _tokenInfo$tokenSymbo !== void 0 ? _tokenInfo$tokenSymbo : 'Unit',
+      base58Prefix: (_tokenInfo$ss58Format = tokenInfo === null || tokenInfo === void 0 ? void 0 : tokenInfo.ss58Format) !== null && _tokenInfo$ss58Format !== void 0 ? _tokenInfo$ss58Format : 42
     };
   }
   async calculateMetadataHash(chain) {
     const metadata = await this.getMetadata(chain);
-    if (!metadata || !metadata.hexV15) {
+    const metadataV15 = await this.getMetadataV15(chain);
+    if (!metadata || !metadataV15 || !metadataV15.hexV15) {
       return undefined;
     }
-    const extraInfo = this.getExtraInfo(chain);
+    const extraInfo = this.getExtraInfo(metadata);
     const specVersion = parseInt(metadata.specVersion);
     const specName = metadata.specName;
-    const hexV15 = metadata.hexV15;
+    const hexV15 = metadataV15.hexV15;
     return calculateMetadataHash({
       ...extraInfo,
       specVersion,
@@ -1749,13 +1756,14 @@ export class ChainService {
   }
   async shortenMetadata(chain, txBlob) {
     const metadata = await this.getMetadata(chain);
-    if (!metadata || !metadata.hexV15) {
+    const metadataV15 = await this.getMetadataV15(chain);
+    if (!metadata || !metadataV15 || !metadataV15.hexV15) {
       return undefined;
     }
-    const extraInfo = this.getExtraInfo(chain);
+    const extraInfo = this.getExtraInfo(metadata);
     const specVersion = parseInt(metadata.specVersion);
     const specName = metadata.specName;
-    const hexV15 = metadata.hexV15;
+    const hexV15 = metadataV15.hexV15;
     return getShortMetadata(txBlob, {
       ...extraInfo,
       specVersion,

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

@@ -59,9 +59,9 @@ export default {
   '1.2.28-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash,
   '1.2.13-01': ReloadMetadata,
-  '1.2.14-01': ClearMetadataDatabase,
   '1.2.32-01': MigratePairData,
-  '1.3.6-01': MigrateTransactionHistoryBridge
+  '1.3.6-01': MigrateTransactionHistoryBridge,
+  '1.3.10-01': ClearMetadataDatabase
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/storage-service/DatabaseService.d.ts

@@ -3,7 +3,7 @@ import { ChainStakingMetadata, CrowdloanItem, MantaPayConfig, NftCollection, Nft
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { _NotificationInfo } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { IBalance, ICampaign, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
-import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
+import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MetadataV15Store, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
 import CampaignStore from '@subwallet/extension-base/services/storage-service/db-stores/Campaign';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import InappNotificationStore from '@subwallet/extension-base/services/storage-service/db-stores/InappNotification';
@@ -30,6 +30,7 @@ export default class DatabaseService {
         transaction: TransactionStore;
         migration: MigrationStore;
         metadata: MetadataStore;
+        metadataV15: MetadataV15Store;
         chain: ChainStore;
         asset: AssetStore;
         yieldPoolInfo: YieldPoolStore;

package/services/storage-service/DatabaseService.js

@@ -3,7 +3,7 @@
 
 import { APIItemState, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniDatabase from '@subwallet/extension-base/services/storage-service/databases';
-import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
+import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MetadataV15Store, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
 import CampaignStore from '@subwallet/extension-base/services/storage-service/db-stores/Campaign';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import InappNotificationStore from '@subwallet/extension-base/services/storage-service/db-stores/InappNotification';
@@ -37,6 +37,7 @@ export default class DatabaseService {
       transaction: new TransactionStore(this._db.transactions),
       migration: new MigrationStore(this._db.migrations),
       metadata: new MetadataStore(this._db.metadata),
+      metadataV15: new MetadataV15Store(this._db.metadataV15),
       chain: new ChainStore(this._db.chain),
       asset: new AssetStore(this._db.asset),
       // yield

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

@@ -1,5 +1,5 @@
 import { _AssetRef, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { CampaignData, ChainStakingMetadata, CrowdloanItem, MetadataItem, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { CampaignData, ChainStakingMetadata, CrowdloanItem, MetadataItem, MetadataV15Item, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 import { _NotificationInfo } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { BalanceItem, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import Dexie, { Table } from 'dexie';
@@ -36,6 +36,8 @@ export interface IMigration {
 }
 export interface IMetadataItem extends MetadataItem, DefaultChainDoc {
 }
+export interface IMetadataV15Item extends MetadataV15Item, DefaultChainDoc {
+}
 export declare type IMantaPayLedger = any;
 export declare type ICampaign = CampaignData;
 export interface IAssetRef extends _AssetRef {
@@ -51,6 +53,7 @@ export default class KoniDatabase extends Dexie {
     transactions: Table<ITransactionHistoryItem, object>;
     migrations: Table<IMigration, object>;
     metadata: Table<IMetadataItem, object>;
+    metadataV15: Table<IMetadataV15Item, object>;
     chain: Table<IChain, object>;
     asset: Table<_ChainAsset, object>;
     chainStakingMetadata: Table<ChainStakingMetadata, object>;

package/services/storage-service/databases/index.js

@@ -43,6 +43,9 @@ export default class KoniDatabase extends Dexie {
     this.conditionalVersion(7, {
       inappNotification: 'id, address, proxyId, [proxyId+actionType], actionType'
     });
+    this.conditionalVersion(8, {
+      metadataV15: 'genesisHash, chain'
+    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {

package/services/storage-service/db-stores/MetadataV15.d.ts

@@ -0,0 +1,8 @@
+import BaseStoreWithChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithChain';
+import { IMetadataV15Item } from '../databases';
+export default class MetadataV15Store extends BaseStoreWithChain<IMetadataV15Item> {
+    getMetadata(chain: string): import("dexie").PromiseExtended<IMetadataV15Item | undefined>;
+    upsertMetadata(chain: string, metadata: IMetadataV15Item): import("dexie").PromiseExtended<unknown>;
+    getMetadataByGenesisHash(genesisHash: string): import("dexie").PromiseExtended<IMetadataV15Item | undefined>;
+    updateMetadataByGenesisHash(genesisHash: string, metadata: IMetadataV15Item): import("dexie").PromiseExtended<unknown>;
+}

package/services/storage-service/db-stores/MetadataV15.js

@@ -0,0 +1,18 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseStoreWithChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithChain';
+export default class MetadataV15Store extends BaseStoreWithChain {
+  getMetadata(chain) {
+    return this.table.where('chain').equals(chain).first();
+  }
+  upsertMetadata(chain, metadata) {
+    return this.table.put(metadata, chain);
+  }
+  getMetadataByGenesisHash(genesisHash) {
+    return this.table.get(genesisHash);
+  }
+  updateMetadataByGenesisHash(genesisHash, metadata) {
+    return this.table.put(metadata, genesisHash);
+  }
+}

package/services/storage-service/db-stores/index.d.ts

@@ -7,5 +7,6 @@ export { default as StakingStore } from './Staking';
 export { default as TransactionStore } from './Transaction';
 export { default as MigrationStore } from './Migration';
 export { default as MetadataStore } from './Metadata';
+export { default as MetadataV15Store } from './MetadataV15';
 export { default as ChainStore } from './Chain';
 export { default as AssetStore } from './Asset';

package/services/storage-service/db-stores/index.js

@@ -10,5 +10,6 @@ export { default as StakingStore } from "./Staking.js";
 export { default as TransactionStore } from "./Transaction.js";
 export { default as MigrationStore } from "./Migration.js";
 export { default as MetadataStore } from "./Metadata.js";
+export { default as MetadataV15Store } from "./MetadataV15.js";
 export { default as ChainStore } from "./Chain.js";
 export { default as AssetStore } from "./Asset.js";

package/utils/metadata.d.ts

@@ -1,8 +1,18 @@
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { ApiPromise } from '@polkadot/api';
+import { TypeRegistry } from '@polkadot/types';
 import { HexString } from '@polkadot/util/types';
 import { ExtraInfo } from '@polkadot-api/merkleize-metadata';
+interface Statics {
+    api: ApiPromise;
+    registry: TypeRegistry;
+}
+export declare const statics: Statics;
+export declare const DEFAULT_DECIMALS: import("@polkadot/types").U32;
+export declare const DEFAULT_SS58: import("@polkadot/types").U32;
 export declare const _isRuntimeUpdated: (signedExtensions?: string[]) => boolean;
 export declare const calculateMetadataHash: (extraInfo: ExtraInfo, metadataV15: HexString) => string;
 export declare const getShortMetadata: (blob: HexString, extraInfo: ExtraInfo, metadata: HexString) => string;
 export declare const cacheMetadata: (chain: string, substrateApi: _SubstrateApi, chainService?: ChainService) => void;
+export {};

package/utils/metadata.js

@@ -1,9 +1,17 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { TypeRegistry } from '@polkadot/types';
 import { getSpecExtensions, getSpecTypes } from '@polkadot/types-known';
-import { u8aToHex } from '@polkadot/util';
+import { formatBalance, isNumber, u8aToHex } from '@polkadot/util';
+import { defaults as addressDefaults } from '@polkadot/util-crypto/address/defaults';
 import { merkleizeMetadata } from '@polkadot-api/merkleize-metadata';
+export const statics = {
+  api: undefined,
+  registry: new TypeRegistry()
+};
+export const DEFAULT_DECIMALS = statics.registry.createType('u32', 12);
+export const DEFAULT_SS58 = statics.registry.createType('u32', addressDefaults.prefix);
 export const _isRuntimeUpdated = signedExtensions => {
   return signedExtensions ? signedExtensions.includes('CheckMetadataHash') : false;
 };
@@ -15,35 +23,71 @@ export const getShortMetadata = (blob, extraInfo, metadata) => {
   const _merkleizeMetadata = merkleizeMetadata(metadata, extraInfo);
   return u8aToHex(_merkleizeMetadata.getProofForExtrinsicPayload(blob));
 };
-export const cacheMetadata = (chain, substrateApi, chainService) => {
-  // Update metadata to database with async methods
-  substrateApi.api.isReady.then(async api => {
+const updateMetadataV15 = async (chain, api, chainService) => {
+  try {
     const currentSpecVersion = api.runtimeVersion.specVersion.toString();
-    const specName = api.runtimeVersion.specName.toString();
     const genesisHash = api.genesisHash.toHex();
-    const metadata = await (chainService === null || chainService === void 0 ? void 0 : chainService.getMetadata(chain));
+    const metadata = await (chainService === null || chainService === void 0 ? void 0 : chainService.getMetadataV15(chain));
 
     // 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
-    let hexV15;
-    const metadataV15 = await api.call.metadata.metadataAtVersion(15);
-    if (!metadataV15.isEmpty) {
-      hexV15 = metadataV15.unwrap().toHex();
+    if (api.call.metadata.metadataAtVersion) {
+      const metadataV15 = await api.call.metadata.metadataAtVersion(15);
+      if (!metadataV15.isEmpty) {
+        const hexV15 = metadataV15.unwrap().toHex();
+        const updateMetadata = {
+          chain: chain,
+          genesisHash: genesisHash,
+          specVersion: currentSpecVersion,
+          hexV15
+        };
+        chainService === null || chainService === void 0 ? void 0 : chainService.upsertMetadataV15(chain, {
+          ...updateMetadata
+        }).catch(console.error);
+      }
     }
-    chainService === null || chainService === void 0 ? void 0 : chainService.upsertMetadata(chain, {
-      chain: chain,
-      genesisHash: genesisHash,
-      specName: specName,
-      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),
-      hexV15
-    }).catch(console.error);
+  } catch (err) {
+    console.error('Error:', err);
+  }
+};
+const updateMetadata = async (chain, api, chainService) => {
+  const currentSpecVersion = api.runtimeVersion.specVersion.toString();
+  const genesisHash = api.genesisHash.toHex();
+  const specName = api.runtimeVersion.specName.toString();
+  const metadata = await (chainService === null || chainService === void 0 ? void 0 : chainService.getMetadata(chain));
+
+  // Avoid date existed metadata
+  if (metadata && metadata.specVersion === currentSpecVersion && metadata.genesisHash === genesisHash) {
+    return;
+  }
+  const systemChain = api.runtimeChain;
+  const metadataHex = api.runtimeMetadata.toHex();
+  const registry = api.registry;
+  const tokenInfo = {
+    ss58Format: isNumber(registry.chainSS58) ? registry.chainSS58 : DEFAULT_SS58.toNumber(),
+    tokenDecimals: (registry.chainDecimals || [DEFAULT_DECIMALS.toNumber()])[0],
+    tokenSymbol: (registry.chainTokens || formatBalance.getDefaults().unit)[0]
+  };
+  const updateMetadata = {
+    chain: chain,
+    genesisHash: genesisHash,
+    specName: specName,
+    specVersion: currentSpecVersion,
+    hexValue: metadataHex,
+    types: getSpecTypes(api.registry, systemChain, api.runtimeVersion.specName, api.runtimeVersion.specVersion),
+    userExtensions: getSpecExtensions(api.registry, systemChain, api.runtimeVersion.specName),
+    tokenInfo
+  };
+  chainService === null || chainService === void 0 ? void 0 : chainService.upsertMetadata(chain, {
+    ...updateMetadata
+  }).catch(console.error);
+};
+export const cacheMetadata = (chain, substrateApi, chainService) => {
+  // Update metadata to database with async methods
+  substrateApi.api.isReady.then(api => {
+    updateMetadata(chain, api, chainService).catch(console.error);
+    updateMetadataV15(chain, api, chainService).catch(console.error);
   }).catch(console.error);
 };