@subwallet/extension-base 1.2.10-0 → 1.2.11-0

package/cjs/utils/index.js

@@ -212,6 +212,18 @@ Object.keys(_lazy).forEach(function (key) {
     }
   });
 });
+var _metadata = require("./metadata");
+Object.keys(_metadata).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _metadata[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _metadata[key];
+    }
+  });
+});
 var _number = require("./number");
 Object.keys(_number).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/utils/metadata.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getShortMetadata = exports.getMetadataHash = exports._isRuntimeUpdated = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const LEDGER_API_URL = 'https://ledger-api.subwallet.app';
+const createUrl = path => `${LEDGER_API_URL}/${path}`;
+const _isRuntimeUpdated = signedExtensions => {
+  return signedExtensions.includes('CheckMetadataHash');
+};
+exports._isRuntimeUpdated = _isRuntimeUpdated;
+const getMetadataHash = async chain => {
+  const data = {
+    id: chain
+  };
+  const resp = await fetch(createUrl('node/metadata/hash'), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(data)
+  });
+  const rs = await resp.json();
+  return rs.metadataHash;
+};
+exports.getMetadataHash = getMetadataHash;
+const getShortMetadata = async (chain, blob) => {
+  const data = {
+    chain: {
+      id: chain
+    },
+    txBlob: blob
+  };
+  const resp = await fetch(createUrl('transaction/metadata'), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(data)
+  });
+  const rs = await resp.json();
+  return rs.txMetadata;
+};
+exports.getShortMetadata = getShortMetadata;

package/cjs/utils/registry.js

@@ -9,12 +9,13 @@ var _types = require("@polkadot/types");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const createRegistry = (chain, rawMetadata) => {
+const createRegistry = (chain, data) => {
   var _chain$substrateInfo;
   const registry = new _types.TypeRegistry();
-  const metadata = new _types.Metadata(registry, rawMetadata);
-  registry.setMetadata(metadata);
+  const metadata = new _types.Metadata(registry, data.rawMetadata);
   const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chain);
+  registry.register(data.types);
+  registry.setMetadata(metadata, undefined, data.userExtensions);
   registry.setChainProperties(registry.createType('ChainProperties', {
     ss58Format: ((_chain$substrateInfo = chain.substrateInfo) === null || _chain$substrateInfo === void 0 ? void 0 : _chain$substrateInfo.addressPrefix) || 42,
     tokenDecimals: tokenInfo.decimals,

package/koni/background/handlers/Extension.js

@@ -35,13 +35,14 @@ import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
+import { metadataExpand } from '@subwallet/extension-chains';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { Subject } from 'rxjs';
-import { TypeRegistry } from '@polkadot/types';
+import { Metadata, TypeRegistry } from '@polkadot/types';
 import { assert, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
 import { base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
@@ -347,7 +348,8 @@ export default class KoniExtension {
   // TODO: move to request service
   signingApproveSignature({
     id,
-    signature
+    signature,
+    signedTransaction
   }) {
     const queued = this.#koniState.getSignRequest(id);
     assert(queued, t('Unable to proceed. Please try again'));
@@ -356,7 +358,8 @@ export default class KoniExtension {
     } = queued;
     resolve({
       id,
-      signature
+      signature,
+      signedTransaction
     });
     return true;
   }
@@ -2148,6 +2151,7 @@ export default class KoniExtension {
         genesisHash,
         hardwareType,
         isEthereum,
+        isGeneric,
         name
       } = account;
       let result;
@@ -2157,7 +2161,8 @@ export default class KoniExtension {
         accountIndex,
         addressOffset,
         genesisHash,
-        originGenesisHash: genesisHash
+        originGenesisHash: genesisHash,
+        isGeneric
       };
       if (isEthereum) {
         result = keyring.keyring.addFromAddress(address, {
@@ -2898,7 +2903,7 @@ export default class KoniExtension {
   }
 
   /// Signing substrate request
-  signingApprovePasswordV2({
+  async signingApprovePasswordV2({
     id
   }) {
     const queued = this.#koniState.getSignRequest(id);
@@ -2926,22 +2931,42 @@ export default class KoniExtension {
     const {
       payload
     } = request;
-    let registry = new TypeRegistry();
+    let registry;
     let isEvm = false;
     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
       */
-      const currentMetadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
-
-      // set the registry before calling the sign function
-      registry.setSignedExtensions(payload.signedExtensions, currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.userExtensions);
-      if (currentMetadata) {
-        registry.register(currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.types);
+      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);
+      } else {
+        metadata = await this.#koniState.chainService.getMetadataByHash(payload.genesisHash);
+        if (metadata) {
+          var _chainInfo$substrateI, _chainInfo$substrateI2, _chainInfo$substrateI3;
+          registry = new TypeRegistry();
+          const _metadata = new Metadata(registry, metadata.hexValue);
+          registry.register(metadata.types);
+          registry.setChainProperties(registry.createType('ChainProperties', {
+            ss58Format: (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI = chainInfo.substrateInfo) === null || _chainInfo$substrateI === void 0 ? void 0 : _chainInfo$substrateI.addressPrefix) || 42,
+            tokenDecimals: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.decimals,
+            tokenSymbol: chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.symbol
+          }));
+          registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+        } else {
+          // we have no metadata, create a new registry
+          registry = new TypeRegistry();
+          registry.setSignedExtensions(payload.signedExtensions);
+        }
       }
-      const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      if (!currentMetadata) {
+      if (!metadata) {
         /*
         * Some networks must have metadata to signing,
         * so if the chain not active (cannot use metadata from api), it must be rejected
@@ -2964,6 +2989,9 @@ export default class KoniExtension {
       if (chainInfo) {
         isEvm = _isChainEvmCompatible(chainInfo);
       }
+    } else {
+      // for non-payload, just create a registry to use
+      registry = new TypeRegistry();
     }
     const result = request.sign(registry, pair);
     resolve({
@@ -3603,11 +3631,15 @@ export default class KoniExtension {
   }) {
     const {
       metadata,
-      specVersion
+      specVersion,
+      types,
+      userExtensions
     } = await this.#koniState.findMetadata(genesisHash);
     return {
       rawMetadata: metadata,
-      specVersion
+      specVersion,
+      types,
+      userExtensions
     };
   }
   async resolveDomainByAddress(request) {

package/koni/background/handlers/State.d.ts

@@ -255,6 +255,8 @@ export default class KoniState {
     findMetadata(hash: string): Promise<{
         metadata: string;
         specVersion: number;
+        types: Record<string, string | Record<string, string>>;
+        userExtensions: import("@polkadot/types/extrinsic/signedExtensions/types").ExtDef | undefined;
     }>;
     getCrowdloanContributions({ address, page, relayChain }: RequestCrowdloanContributions): Promise<import("../../../services/subscan-service/types").CrowdloanContributionsResponse>;
 }

package/koni/background/handlers/State.js

@@ -1791,7 +1791,9 @@ export default class KoniState {
     const metadata = await this.chainService.getMetadataByHash(hash);
     return {
       metadata: (metadata === null || metadata === void 0 ? void 0 : metadata.hexValue) || '',
-      specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0')
+      specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0'),
+      types: (metadata === null || metadata === void 0 ? void 0 : metadata.types) || {},
+      userExtensions: metadata === null || metadata === void 0 ? void 0 : metadata.userExtensions
     };
   }
   getCrowdloanContributions({

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.10-0",
+  "version": "1.2.11-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -956,6 +956,11 @@
       "require": "./cjs/services/migration-service/scripts/AutoEnableChainsTokens.js",
       "default": "./services/migration-service/scripts/AutoEnableChainsTokens.js"
     },
+    "./services/migration-service/scripts/ClearMetadataDatabase": {
+      "types": "./services/migration-service/scripts/ClearMetadataDatabase.d.ts",
+      "require": "./cjs/services/migration-service/scripts/ClearMetadataDatabase.js",
+      "default": "./services/migration-service/scripts/ClearMetadataDatabase.js"
+    },
     "./services/migration-service/scripts/ClearOldStorage": {
       "types": "./services/migration-service/scripts/ClearOldStorage.d.ts",
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
@@ -1036,6 +1041,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateLedgerAccount.js",
       "default": "./services/migration-service/scripts/MigrateLedgerAccount.js"
     },
+    "./services/migration-service/scripts/MigrateLedgerAccountV2": {
+      "types": "./services/migration-service/scripts/MigrateLedgerAccountV2.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateLedgerAccountV2.js",
+      "default": "./services/migration-service/scripts/MigrateLedgerAccountV2.js"
+    },
     "./services/migration-service/scripts/MigrateNetworkSettings": {
       "types": "./services/migration-service/scripts/MigrateNetworkSettings.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateNetworkSettings.js",
@@ -1636,6 +1646,11 @@
       "require": "./cjs/types/fee/fee.js",
       "default": "./types/fee/fee.js"
     },
+    "./types/metadata": {
+      "types": "./types/metadata.d.ts",
+      "require": "./cjs/types/metadata.js",
+      "default": "./types/metadata.js"
+    },
     "./types/ordinal": {
       "types": "./types/ordinal.d.ts",
       "require": "./cjs/types/ordinal.js",
@@ -1836,6 +1851,11 @@
       "require": "./cjs/utils/lazy.js",
       "default": "./utils/lazy.js"
     },
+    "./utils/metadata": {
+      "types": "./utils/metadata.d.ts",
+      "require": "./cjs/utils/metadata.js",
+      "default": "./utils/metadata.js"
+    },
     "./utils/mv3": {
       "types": "./utils/mv3.d.ts",
       "require": "./cjs/utils/mv3.js",
@@ -1920,6 +1940,7 @@
     "@polkadot/rpc-provider": "^11.0.3",
     "@polkadot/types": "^11.0.3",
     "@polkadot/types-augment": "^11.0.3",
+    "@polkadot/types-known": "^10.12.4",
     "@polkadot/ui-settings": "^3.6.6",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
@@ -1928,10 +1949,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.70",
-    "@subwallet/extension-base": "^1.2.10-0",
-    "@subwallet/extension-chains": "^1.2.10-0",
-    "@subwallet/extension-dapp": "^1.2.10-0",
-    "@subwallet/extension-inject": "^1.2.10-0",
+    "@subwallet/extension-base": "^1.2.11-0",
+    "@subwallet/extension-chains": "^1.2.11-0",
+    "@subwallet/extension-dapp": "^1.2.11-0",
+    "@subwallet/extension-inject": "^1.2.11-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

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.2.10-0'
+  version: '1.2.11-0'
 };

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

@@ -49,12 +49,16 @@ const filterAddress = (addresses, chainInfo) => {
       const account = getAccountJsonByAddress(address);
       if (account) {
         if (account.isHardware) {
-          const availGen = account.availableGenesisHashes || [];
-          const gen = _getSubstrateGenesisHash(chainInfo);
-          if (availGen.includes(gen)) {
+          if (account.isGeneric) {
             fetchList.push(address);
           } else {
-            unfetchList.push(address);
+            const availGen = account.availableGenesisHashes || [];
+            const gen = _getSubstrateGenesisHash(chainInfo);
+            if (availGen.includes(gen)) {
+              fetchList.push(address);
+            } else {
+              unfetchList.push(address);
+            }
           }
         } else {
           fetchList.push(address);

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

@@ -13,10 +13,21 @@ import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { goldbergRpc, goldbergTypes, spec as availSpec } from 'avail-js-sdk';
 import { BehaviorSubject } from 'rxjs';
 import { ApiPromise, WsProvider } from '@polkadot/api';
-import { typesBundle } from '@polkadot/apps-config/api';
+import { typesBundle as _typesBundle } from '@polkadot/apps-config/api';
 import { TypeRegistry } from '@polkadot/types/create';
 import { formatBalance } from '@polkadot/util';
 import { defaults as addressDefaults } from '@polkadot/util-crypto/address/defaults';
+const typesBundle = {
+  ..._typesBundle
+};
+
+// Override avail spec for signedExtensions
+const _availSpec = {
+  signedExtensions: availSpec.signedExtensions
+};
+if (typesBundle.spec) {
+  typesBundle.spec.avail = _availSpec;
+}
 export class SubstrateApi {
   useLightClient = false;
   isApiReady = false;
@@ -58,6 +69,7 @@ export class SubstrateApi {
       provider,
       typesBundle,
       registry: this.registry,
+      // This line makes this object registry to be the same as the api registry
       noInitWarn: true
     };
     if (this.metadata) {
@@ -71,32 +83,26 @@ export class SubstrateApi {
     if (externalApiPromise) {
       api = externalApiPromise;
     } else if (_API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
-      api = new ApiPromise(acalaOptions({
-        provider,
-        noInitWarn: true
-      }));
+      api = new ApiPromise(acalaOptions(apiOption));
     } else if (_API_OPTIONS_CHAIN_GROUP.turing.includes(this.chainSlug)) {
       api = new ApiPromise({
-        provider,
+        ...apiOption,
         rpc: oakRpc,
-        types: oakTypes,
-        noInitWarn: true
+        types: oakTypes
       });
     } else if (_API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
       api = new ApiPromise({
-        provider,
+        ...apiOption,
         rpc: availSpec.rpc,
         types: availSpec.types,
-        signedExtensions: availSpec.signedExtensions,
-        noInitWarn: true
+        signedExtensions: availSpec.signedExtensions
       });
     } else if (_API_OPTIONS_CHAIN_GROUP.goldberg.includes(this.chainSlug)) {
       api = new ApiPromise({
-        provider,
+        ...apiOption,
         rpc: goldbergRpc,
         types: goldbergTypes,
-        signedExtensions: availSpec.signedExtensions,
-        noInitWarn: true
+        signedExtensions: availSpec.signedExtensions
       });
     } else if (_API_OPTIONS_CHAIN_GROUP.gear.includes(this.chainSlug)) {
       api = new GearApi({

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

@@ -8,6 +8,7 @@ import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-s
 import { SubstrateApi } from '@subwallet/extension-base/services/chain-service/handler/SubstrateApi';
 import { DEFAULT_GEAR_ADDRESS, getGRC20ContractPromise } 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";
@@ -198,6 +199,32 @@ 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);
+    };
 
     // Return existed to avoid re-init metadata
     if (existed) {
@@ -205,9 +232,11 @@ export class SubstrateChainHandler extends AbstractChainHandler {
       if (apiUrl !== existed.apiUrl) {
         await existed.updateApiUrl(apiUrl);
       }
+
+      // Update data in case of existed api (if needed - old provider cannot connect)
+      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,
@@ -215,21 +244,7 @@ export class SubstrateChainHandler extends AbstractChainHandler {
     });
     apiObject.connectionStatusSubject.subscribe(this.handleConnection.bind(this, chainSlug));
     onUpdateStatus && apiObject.connectionStatusSubject.subscribe(onUpdateStatus);
-
-    // Update metadata to database with async methods
-    apiObject.isReady.then(api => {
-      var _this$parent3;
-      // Avoid date existed metadata
-      if (metadata && metadata.specVersion === api.specVersion && metadata.genesisHash === api.api.genesisHash.toHex()) {
-        return;
-      }
-      (_this$parent3 = this.parent) === null || _this$parent3 === void 0 ? void 0 : _this$parent3.upsertMetadata(chainSlug, {
-        chain: chainSlug,
-        genesisHash: api.api.genesisHash.toHex(),
-        specVersion: api.specVersion,
-        hexValue: api.api.runtimeMetadata.toHex()
-      }).catch(console.error);
-    }).catch(console.error);
+    updateMetadata(apiObject);
     return apiObject;
   }
 }

package/services/migration-service/scripts/ClearMetadataDatabase.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class ClearMetadataDatabase extends BaseMigrationJob {
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,11 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class ClearMetadataDatabase extends BaseMigrationJob {
+  async run() {
+    // Clear all old metadata data
+    await this.state.dbService.stores.metadata.clear();
+    return Promise.resolve();
+  }
+}

package/services/migration-service/scripts/MigrateLedgerAccountV2.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '../Base';
+export default class MigrateLedgerAccountV2 extends BaseMigrationJob {
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,42 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { AccountsStore } from '@subwallet/extension-base/stores';
+import { isString } from '@polkadot/util';
+import { isEthereumAddress } from '@polkadot/util-crypto';
+import BaseMigrationJob from "../Base.js";
+export default class MigrateLedgerAccountV2 extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        const store = new AccountsStore();
+        const update = (key, value) => {
+          var _value$meta;
+          if (key.startsWith('account:') && value.meta && isString((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
+            const newValue = {
+              ...value
+            };
+            if (value.meta.isHardware) {
+              const isEther = isEthereumAddress(value.address);
+              if (isEther) {
+                newValue.meta.isGeneric = true;
+              } else {
+                newValue.meta.isGeneric = !newValue.meta.originGenesisHash;
+              }
+            }
+            newValue.meta.availableGenesisHashes = [value.meta.originGenesisHash];
+            store.set(key, newValue);
+          }
+        };
+        store.allMap(map => {
+          Object.entries(map).forEach(([key, value]) => {
+            update(key, value);
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

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

@@ -12,6 +12,7 @@ import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
 import MigratePolygonUSDCProvider from "./tokens/MigratePolygonUSDCProvider.js";
 import AutoEnableChainsTokens from "./AutoEnableChainsTokens.js";
+import ClearMetadataDatabase from "./ClearMetadataDatabase.js";
 import DeleteChain from "./DeleteChain.js";
 import DeleteChainStaking from "./DeleteChainStaking.js";
 import EnableVaraChain from "./EnableVaraChain.js";
@@ -20,6 +21,7 @@ import MigrateAutoLock from "./MigrateAutoLock.js";
 import MigrateChainPatrol from "./MigrateChainPatrol.js";
 import MigrateImportedToken from "./MigrateImportedToken.js";
 import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
+import MigrateLedgerAccountV2 from "./MigrateLedgerAccountV2.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
@@ -47,11 +49,13 @@ export default {
   '1.1.24-01': MigrateProvidersV1M1P24,
   '1.1.26-01': MigratePolygonUSDCProvider,
   '1.1.28-01': MigrateEarningVersion,
+  '1.1.33-01': MigrateLedgerAccountV2,
   '1.1.41-01': DeleteChainStaking,
   '1.1.46-01': AutoEnableSomeTokens,
   '1.1.69-03': MigrateAssetSetting,
   '1.1.69-02': MigrateTransactionHistoryBySymbol,
-  '1.2.69-01': MigrateRemoveGenesisHash
+  '1.2.69-01': MigrateRemoveGenesisHash,
+  '1.2.1-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 { anyNumberToBN, reformatAddress } from '@subwallet/extension-base/utils';
+import { _isRuntimeUpdated, anyNumberToBN, getMetadataHash, 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';
@@ -189,7 +189,7 @@ export default class TransactionService {
   }
   async sendTransaction(transaction) {
     // Send Transaction
-    const emitter = transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : await this.signAndSendEvmTransaction(transaction);
+    const emitter = await (transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : this.signAndSendEvmTransaction(transaction));
     const {
       eventsHandler
     } = transaction;
@@ -1010,7 +1010,7 @@ export default class TransactionService {
     }
     return emitter;
   }
-  signAndSendSubstrateTransaction({
+  async signAndSendSubstrateTransaction({
     address,
     chain,
     id,
@@ -1024,7 +1024,10 @@ export default class TransactionService {
       warnings: [],
       extrinsicHash: id
     };
-    transaction.signAsync(address, {
+    const extrinsic = transaction;
+    const registry = extrinsic.registry;
+    const signedExtensions = registry.signedExtensions;
+    const signerOption = {
       signer: {
         signPayload: async payload => {
           const signing = await this.state.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload);
@@ -1034,7 +1037,15 @@ export default class TransactionService {
           };
         }
       }
-    }).then(async rs => {
+    };
+    if (_isRuntimeUpdated(signedExtensions)) {
+      try {
+        const metadataHash = await getMetadataHash(chain);
+        signerOption.mode = 1;
+        signerOption.metadataHash = `0x${metadataHash}`;
+      } catch (e) {}
+    }
+    extrinsic.signAsync(address, signerOption).then(async rs => {
       // Emit signed event
       emitter.emit('signed', eventData);