@subwallet/extension-base 1.3.45-1 → 1.3.47-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.45-1",
+  "version": "1.3.47-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2201,6 +2201,16 @@
       "require": "./cjs/strategy/api-request-strategy/index.js",
       "default": "./strategy/api-request-strategy/index.js"
     },
+    "./strategy/api-request-strategy-v2": {
+      "types": "./strategy/api-request-strategy-v2/index.d.ts",
+      "require": "./cjs/strategy/api-request-strategy-v2/index.js",
+      "default": "./strategy/api-request-strategy-v2/index.js"
+    },
+    "./strategy/api-request-strategy-v2/types": {
+      "types": "./strategy/api-request-strategy-v2/types.d.ts",
+      "require": "./cjs/strategy/api-request-strategy-v2/types.js",
+      "default": "./strategy/api-request-strategy-v2/types.js"
+    },
     "./strategy/api-request-strategy/context/base": {
       "types": "./strategy/api-request-strategy/context/base.d.ts",
       "require": "./cjs/strategy/api-request-strategy/context/base.js",
@@ -2796,6 +2806,7 @@
       "require": "./cjs/utils/staticData/index.js",
       "default": "./utils/staticData/index.js"
     },
+    "./utils/staticData/assetHubStaking.json": "./utils/staticData/assetHubStaking.json",
     "./utils/staticData/blockedActions.json": "./utils/staticData/blockedActions.json",
     "./utils/staticData/blockedActionsFeatures.json": "./utils/staticData/blockedActionsFeatures.json",
     "./utils/staticData/buyServiceInfos.json": "./utils/staticData/buyServiceInfos.json",
@@ -2828,7 +2839,7 @@
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@gear-js/api": "^0.38.1",
+    "@gear-js/api": "^0.42.0",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
     "@metamask/safe-event-emitter": "^2.0.0",
@@ -2854,13 +2865,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.107",
-    "@subwallet/extension-base": "^1.3.45-1",
-    "@subwallet/extension-chains": "^1.3.45-1",
-    "@subwallet/extension-dapp": "^1.3.45-1",
-    "@subwallet/extension-inject": "^1.3.45-1",
+    "@subwallet/chain-list": "0.2.109",
+    "@subwallet/extension-base": "^1.3.47-0",
+    "@subwallet/extension-chains": "^1.3.47-0",
+    "@subwallet/extension-dapp": "^1.3.47-0",
+    "@subwallet/extension-inject": "^1.3.47-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.45-1",
+    "@subwallet/subwallet-api-sdk": "^1.3.47-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
@@ -2893,7 +2904,8 @@
     "moment": "^2.29.4",
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
-    "sails-js": "^0.1.6",
+    "sails-js": "^0.4.2",
+    "sails-js-parser": "^0.4.2",
     "ts-md5": "^1.3.1",
     "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0",

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.45-1'
+  version: '1.3.47-0'
 };

package/page/evm/index.d.ts

@@ -1,29 +1,20 @@
+import type { SendRequest } from '@subwallet/extension-base/page/types';
 import type { EvmProvider } from '@subwallet/extension-inject/types';
+import type { JsonRpcRequest, JsonRpcResponse } from 'json-rpc-engine';
+import type { RequestArguments } from 'web3-core';
 import SafeEventEmitter from '@metamask/safe-event-emitter';
-import { SendRequest } from '@subwallet/extension-base/page/types';
-import { JsonRpcRequest, JsonRpcResponse } from 'json-rpc-engine';
-import { RequestArguments } from 'web3-core';
 interface SendSyncJsonRpcRequest extends JsonRpcRequest<unknown> {
     method: 'net_version';
 }
-export default class SubWalletEvmProvider extends SafeEventEmitter implements EvmProvider {
-    readonly isSubWallet = true;
-    readonly isMetaMask = false;
-    readonly version: string;
-    protected sendMessage: SendRequest;
-    protected _connected: boolean;
-    constructor(sendMessage: SendRequest, version: string);
-    get connected(): boolean;
-    isConnected(): boolean;
-    protected subscribeExtensionEvents(): void;
+export interface SubWalletEvmProvider extends EvmProvider, SafeEventEmitter {
     enable(): Promise<string[]>;
-    on(eventName: string | symbol, listener: (...args: any[]) => void): this;
-    once(eventName: string | symbol, listener: (...args: any[]) => void): this;
-    request<T>({ method, params }: RequestArguments): Promise<T>;
-    private _sendSync;
+    request<T>(args: RequestArguments): Promise<T>;
     send<T>(method: string, params?: T[]): Promise<JsonRpcResponse<T>>;
     send<T>(payload: JsonRpcRequest<unknown>, callback: (error: Error | null, result?: JsonRpcResponse<T>) => void): void;
     send<T>(payload: SendSyncJsonRpcRequest): JsonRpcResponse<T>;
-    sendAsync<T>(payload: JsonRpcRequest<T>, callback: (error: (Error | null), result?: JsonRpcResponse<T>) => void): void;
+    sendAsync<T>(payload: JsonRpcRequest<T>, callback: (error: Error | null, result?: JsonRpcResponse<T>) => void): void;
+    on(eventName: string | symbol, listener: (...args: any[]) => void): this;
+    once(eventName: string | symbol, listener: (...args: any[]) => void): this;
 }
+export declare function createSubWalletEvmProvider(sendMessage: SendRequest, version: string): SubWalletEvmProvider;
 export {};

package/page/evm/index.js

@@ -2,117 +2,45 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import SafeEventEmitter from '@metamask/safe-event-emitter';
-let subscribeFlag = false;
-export default class SubWalletEvmProvider extends SafeEventEmitter {
-  isSubWallet = true;
-  isMetaMask = false;
-  _connected = false;
-  constructor(sendMessage, version) {
-    super();
-    this.version = version;
-    this.sendMessage = sendMessage;
-    this._connected = true;
-  }
-  get connected() {
-    return this._connected;
-  }
-  isConnected() {
-    return this._connected;
-  }
-  subscribeExtensionEvents() {
+export function createSubWalletEvmProvider(sendMessage, version) {
+  const emitter = new SafeEventEmitter();
+  let connected = true;
+  let subscribeFlag = false;
+  const provider = Object.assign(emitter, {
+    isSubWallet: true,
+    isMetaMask: false,
+    version
+  });
+  function subscribeExtensionEvents() {
     if (subscribeFlag) {
       return;
     }
-    this.sendMessage('evm(events.subscribe)', null, ({
+    sendMessage('evm(events.subscribe)', null, ({
       payload,
       type
     }) => {
       if (['connect', 'disconnect', 'accountsChanged', 'chainChanged', 'message', 'data', 'reconnect', 'error'].includes(type)) {
         if (type === 'connect') {
-          this._connected = true;
+          connected = true;
         } else if (type === 'disconnect') {
-          this._connected = false;
+          connected = false;
         }
         const finalType = type === 'data' ? 'message' : type;
-
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        this.emit(finalType, payload);
+        emitter.emit(finalType, payload);
       } else {
         console.warn('Can not handle event', type, payload);
       }
-    }).then(done => {
+    }).then(() => {
       subscribeFlag = true;
     }).catch(() => {
       subscribeFlag = false;
     });
-    subscribeFlag = true;
-  }
-  async enable() {
-    return this.request({
-      method: 'eth_requestAccounts'
-    });
-  }
-  on(eventName, listener) {
-    this.subscribeExtensionEvents();
-    super.on(eventName, listener);
-    return this;
   }
-  once(eventName, listener) {
-    this.subscribeExtensionEvents();
-    super.once(eventName, listener);
-    return this;
-  }
-  request({
-    method,
-    params
-  }) {
-    // if (!this._isEnable) {
-    //   if (method === 'eth_accounts') {
-    //     return this.request<T>({ method: 'eth_requestAccounts' });
-    //   }
-    // }
-
-    // Subscribe events
-    switch (method) {
-      case 'eth_requestAccounts':
-        return new Promise((resolve, reject) => {
-          const origin = document.title !== '' ? document.title : window.location.hostname;
-          this.sendMessage('pub(authorize.tabV2)', {
-            origin,
-            accountAuthTypes: ['evm']
-          }).then(() => {
-            // Return account list
-            this.request({
-              method: 'eth_accounts'
-            }).then(accounts => {
-              // @ts-ignore
-              resolve(accounts);
-            }).catch(e => {
-              reject(e);
-            });
-          }).catch(e => {
-            reject(e);
-          });
-        });
-      default:
-        return new Promise((resolve, reject) => {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          this.sendMessage('evm(request)', {
-            params,
-            method
-          }).then(result => {
-            resolve(result);
-          }).catch(e => {
-            reject(e);
-          });
-        });
-    }
-  }
-  _sendSync(payload) {
+  const _sendSync = payload => {
     let result;
     switch (payload.method) {
       case 'net_version':
-        result = this.version ? `SubWallet v${this.version}` : null;
+        result = version ? `SubWallet v${version}` : null;
         break;
       default:
         throw new Error(`Not support ${payload.method}`);
@@ -122,28 +50,61 @@ export default class SubWalletEvmProvider extends SafeEventEmitter {
       jsonrpc: payload.jsonrpc,
       result
     };
-  }
-  send(methodOrPayload, callbackOrArgs) {
+  };
+  provider.isConnected = () => connected;
+  provider.request = arg => {
+    if (arg.method === 'eth_requestAccounts') {
+      const origin = document.title || window.location.hostname;
+      return sendMessage('pub(authorize.tabV2)', {
+        origin,
+        accountAuthTypes: ['evm']
+      }).then(() => provider.request({
+        method: 'eth_accounts'
+      }));
+    }
+    return sendMessage('evm(request)', arg);
+  };
+  provider.send = (methodOrPayload, callbackOrArgs) => {
     if (typeof methodOrPayload === 'string' && (!callbackOrArgs || Array.isArray(callbackOrArgs))) {
-      return this.request({
+      return provider.request({
         method: methodOrPayload,
         params: callbackOrArgs
       });
-    } else if (methodOrPayload && typeof methodOrPayload === 'object' && typeof callbackOrArgs === 'function') {
-      return this.request(methodOrPayload).then(rs => {
-        callbackOrArgs(rs);
+    } else if (typeof methodOrPayload === 'object' && typeof callbackOrArgs === 'function') {
+      return provider.request(methodOrPayload).then(result => {
+        callbackOrArgs(null, result);
       });
     }
-    return this._sendSync(methodOrPayload);
-  }
-  sendAsync(payload, callback) {
-    this.request(payload).then(result => {
-      // @ts-ignore
+    return _sendSync(methodOrPayload);
+  };
+  provider.enable = async () => {
+    const accounts = await provider.request({
+      method: 'eth_requestAccounts'
+    });
+    connected = accounts.length > 0;
+    return accounts;
+  };
+  provider.sendAsync = (payload, callback) => {
+    provider.request(payload).then(result => {
       callback(null, {
+        id: payload.id,
+        jsonrpc: payload.jsonrpc,
+        // @ts-ignore
         result
       });
     }).catch(e => {
       callback(e);
     });
-  }
+  };
+  provider.on = (eventName, listener) => {
+    subscribeExtensionEvents();
+    SafeEventEmitter.prototype.on.call(emitter, eventName, listener);
+    return provider;
+  };
+  provider.once = (eventName, listener) => {
+    subscribeExtensionEvents();
+    SafeEventEmitter.prototype.once.call(emitter, eventName, listener);
+    return provider;
+  };
+  return provider;
 }

package/page/index.js

@@ -5,7 +5,7 @@ import { ProviderError } from '@subwallet/extension-base/background/errors/Provi
 import { ProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import SubWalletBitcoinProvider from '@subwallet/extension-base/page/bitcoin';
 import SubWalletCardanoProvider from '@subwallet/extension-base/page/cardano';
-import SubWalletEvmProvider from '@subwallet/extension-base/page/evm';
+import { createSubWalletEvmProvider } from '@subwallet/extension-base/page/evm';
 import Injected from '@subwallet/extension-base/page/substrate';
 import { MESSAGE_ORIGIN_PAGE } from "../defaults.js";
 import { getId } from "../utils/getId.js";
@@ -43,9 +43,11 @@ export function sendMessage(message, request, subscriber) {
 
 export async function enable(origin, opt) {
   const accountAuthTypes = (opt === null || opt === void 0 ? void 0 : opt.accountAuthType) === 'both' ? ['substrate', 'evm'] : [(opt === null || opt === void 0 ? void 0 : opt.accountAuthType) || 'substrate'];
+  const canConnectSubstrateEcdsa = accountAuthTypes.includes('evm');
   await sendMessage('pub(authorize.tabV2)', {
     origin,
-    accountAuthTypes
+    accountAuthTypes,
+    canConnectSubstrateEcdsa
   });
   return new Injected(sendMessage);
 }
@@ -69,7 +71,7 @@ export function handleResponse(data) {
   }
 }
 export function initEvmProvider(version) {
-  return new SubWalletEvmProvider(sendMessage, version);
+  return createSubWalletEvmProvider(sendMessage, version);
 }
 export function initCardanoProvider() {
   return new SubWalletCardanoProvider(sendMessage);

package/page/substrate/Accounts.js

@@ -9,7 +9,8 @@ export default class Accounts {
   }
   get(anyType) {
     return sendRequest('pub(accounts.listV2)', {
-      anyType
+      anyType,
+      isSubstrateConnector: true
     });
   }
   subscribe(cb) {

package/services/balance-service/helpers/subscribe/index.d.ts

@@ -1,15 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _BitcoinApi, _CardanoApi, _EvmApi, _SubstrateApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';
-import { AccountJson, BalanceItem } from '@subwallet/extension-base/types';
-/**
- * @function getAccountJsonByAddress
- * @desc Get account info by address
- * <p>
- *   Note: Use on the background only
- * </p>
- * @param {string} address - Address
- * @returns {AccountJson|null}  - Account info or null if not found
- */
-export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;
+import { BalanceItem } from '@subwallet/extension-base/types';
 export declare function subscribeBalance(addresses: string[], chains: string[], tokens: string[], _chainAssetMap: Record<string, _ChainAsset>, _chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, tonApiMap: Record<string, _TonApi>, cardanoApiMap: Record<string, _CardanoApi>, bitcoinApiMap: Record<string, _BitcoinApi>, callback: (rs: BalanceItem[]) => void, extrinsicType?: ExtrinsicType): () => void;

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

@@ -5,82 +5,11 @@ import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { subscribeBitcoinBalance } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/bitcoin';
 import { subscribeCardanoBalance } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano';
-import { _getSubstrateGenesisHash, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isPureBitcoinChain, _isPureCardanoChain, _isPureEvmChain, _isPureTonChain } from '@subwallet/extension-base/services/chain-service/utils';
-import { filterAssetsByChainAndType, getAddressesByChainTypeMap, pairToAccount } from '@subwallet/extension-base/utils';
-import keyring from '@subwallet/ui-keyring';
+import { _isPureBitcoinChain, _isPureCardanoChain, _isPureEvmChain, _isPureTonChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { filterAddressByChainInfo, filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import { subscribeTonBalance } from "./ton/ton.js";
 import { subscribeEVMBalance } from "./evm.js";
 import { subscribeSubstrateBalance } from "./substrate/index.js";
-
-/**
- * @function getAccountJsonByAddress
- * @desc Get account info by address
- * <p>
- *   Note: Use on the background only
- * </p>
- * @param {string} address - Address
- * @returns {AccountJson|null}  - Account info or null if not found
- */
-export const getAccountJsonByAddress = address => {
-  try {
-    const pair = keyring.getPair(address);
-    if (pair) {
-      return pairToAccount(pair);
-    } else {
-      return null;
-    }
-  } catch (e) {
-    console.warn(e);
-    return null;
-  }
-};
-
-/** Filter addresses to subscribe by chain info */
-const filterAddress = (addresses, chainInfo) => {
-  const {
-    _bitcoin,
-    bitcoin,
-    cardano,
-    evm,
-    substrate,
-    ton
-  } = getAddressesByChainTypeMap(addresses, chainInfo);
-  if (_isChainEvmCompatible(chainInfo)) {
-    return [evm, [bitcoin, substrate, ton, cardano, _bitcoin].flat()];
-  } else if (_isChainBitcoinCompatible(chainInfo)) {
-    return [bitcoin, [evm, substrate, ton, cardano, _bitcoin].flat()];
-  } else if (_isChainTonCompatible(chainInfo)) {
-    return [ton, [bitcoin, evm, substrate, cardano, _bitcoin].flat()];
-  } else if (_isChainCardanoCompatible(chainInfo)) {
-    return [cardano, [bitcoin, evm, substrate, ton, _bitcoin].flat()];
-  } else {
-    const fetchList = [];
-    const unfetchList = [];
-    substrate.forEach(address => {
-      const account = getAccountJsonByAddress(address);
-      if (account) {
-        if (account.isHardware) {
-          if (account.isGeneric) {
-            fetchList.push(address);
-          } else {
-            const availGen = account.availableGenesisHashes || [];
-            const gen = _getSubstrateGenesisHash(chainInfo);
-            if (availGen.includes(gen)) {
-              fetchList.push(address);
-            } else {
-              unfetchList.push(address);
-            }
-          }
-        } else {
-          fetchList.push(address);
-        }
-      } else {
-        fetchList.push(address);
-      }
-    });
-    return [fetchList, [unfetchList, bitcoin, evm, ton, cardano, _bitcoin].flat()];
-  }
-};
 const handleUnsupportedOrPendingAddresses = (addresses, chainSlug, chainAssetMap, state, callback) => {
   const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20, _AssetType.VFT, _AssetType.TEP74, _AssetType.CIP26]);
   const now = new Date().getTime();
@@ -106,7 +35,7 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
   // Looping over each chain
   const unsubList = Object.values(chainInfoMap).map(async chainInfo => {
     const chainSlug = chainInfo.slug;
-    const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
+    const [useAddresses, notSupportAddresses] = filterAddressByChainInfo(addresses, chainInfo);
     if (notSupportAddresses.length) {
       handleUnsupportedOrPendingAddresses(notSupportAddresses, chainSlug, chainAssetMap, APIItemState.NOT_SUPPORT, callback);
     }

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

@@ -324,17 +324,15 @@ const subscribeTokensAccountsPallet = async ({
   const tokensAccountsKey = 'query_tokens_accounts';
   const tokenTypes = includeNativeToken ? [_AssetType.NATIVE, _AssetType.LOCAL] : [_AssetType.LOCAL];
   const tokenMap = filterAssetsByChainAndType(assetMap, chainInfo.slug, tokenTypes);
-
-  // Hotfix balance for gdot
-  const getGdotBalance = async () => {
-    const gdotBalances = await queryGdotBalance(substrateApi, addresses, assetMap[gdotSlug], extrinsicType);
-    callback(gdotBalances);
-  };
   const unsubList = await Promise.all(Object.values(tokenMap).map(tokenInfo => {
-    // Hotfix balance for gdot
-    if (tokenInfo.slug === gdotSlug) {
+    var _tokenInfo$metadata;
+    if ((_tokenInfo$metadata = tokenInfo.metadata) !== null && _tokenInfo$metadata !== void 0 && _tokenInfo$metadata.isGigaToken) {
       return timer(0, CRON_REFRESH_PRICE_INTERVAL).subscribe(() => {
-        getGdotBalance().catch(console.error);
+        const getGigaTokenBalance = async () => {
+          const gigaTokenBalances = await queryGigaTokenBalance(substrateApi, addresses, assetMap[tokenInfo.slug], extrinsicType);
+          callback(gigaTokenBalances);
+        };
+        getGigaTokenBalance().catch(console.error);
       });
     }
     try {
@@ -543,11 +541,7 @@ const subscribeSubnetAlphaPallet = async ({
     clearInterval(interval);
   };
 };
-
-// Hot fix for gdot balance
-
-const gdotSlug = 'hydradx_main-LOCAL-GDOT';
-async function queryGdotBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
+async function queryGigaTokenBalance(substrateApi, addresses, tokenInfo, extrinsicType) {
   return await Promise.all(addresses.map(async address => {
     const _balanceInfo = await substrateApi.api.call.currenciesApi.account(_getTokenOnChainAssetId(tokenInfo), address);
     const balanceInfo = _balanceInfo.toPrimitive();

package/services/buy-service/index.js

@@ -15,6 +15,8 @@ const convertSupportType = support => {
       return AccountChainType.CARDANO;
     case 'TON':
       return AccountChainType.TON;
+    case 'BITCOIN':
+      return AccountChainType.BITCOIN;
     default:
       return null;
   }

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

@@ -140,6 +140,7 @@ export declare class ChainService {
     private fetchLatestLedgerGenericAllowChains;
     private fetchLatestPriorityTokens;
     private fetchLatestSufficientChains;
+    fetchAhMapChain(): Promise<Record<string, string>>;
     private initChains;
     private initAssetRegistry;
     private updateChainStateMapSubscription;

package/services/chain-service/index.js

@@ -1018,6 +1018,9 @@ export class ChainService {
   async fetchLatestSufficientChains() {
     return (await fetchStaticData('chains/supported-sufficient-chains')) || [];
   }
+  async fetchAhMapChain() {
+    return await fetchStaticData('asset-hub-staking-map');
+  }
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
     const defaultChainInfoMap = filterChainInfoMap(ChainInfoMap, ignoredList);

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

@@ -2,7 +2,7 @@ import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from
 import { BasicTokenInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _ChainState, _DataMap } from '@subwallet/extension-base/services/chain-service/types';
 import { IChain } from '@subwallet/extension-base/services/storage-service/databases';
-import { AccountChainType } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountSignMode } from '@subwallet/extension-base/types';
 import { KeypairType } from '@subwallet/keyring/types';
 export declare function _isCustomChain(slug: string): boolean;
 export declare function _isCustomAsset(slug: string): boolean;
@@ -40,6 +40,8 @@ export declare function _getTokenOnChainInfo(tokenInfo: _ChainAsset): Record<str
 export declare function _isBridgedToken(tokenInfo: _ChainAsset): boolean;
 export declare function _getTokenMinAmount(tokenInfo: _ChainAsset): string;
 export declare function _isChainEvmCompatible(chainInfo: _ChainInfo): boolean;
+export declare function _isChainCompatibleLedgerEvm(chainInfo: _ChainInfo): boolean;
+export declare function _isSubstrateEvmCompatibleChain(chainInfo: _ChainInfo): boolean;
 export declare function _isChainBitcoinCompatible(chainInfo: _ChainInfo): boolean;
 export declare function _isChainTonCompatible(chainInfo: _ChainInfo): boolean;
 export declare function _isChainCardanoCompatible(chainInfo: _ChainInfo): boolean;
@@ -68,6 +70,7 @@ export declare function _getNftTypesSupportedByChain(chainInfo: _ChainInfo): _As
 export declare function _getTokenTypesSupportedByChain(chainInfo: _ChainInfo): _AssetType[];
 export declare function _getChainNativeTokenBasicInfo(chainInfo: _ChainInfo): BasicTokenInfo;
 export declare function _getChainNativeTokenSlug(chainInfo: _ChainInfo): string;
+export declare function _getChainSubstrateTokenSymbol(chainInfo: _ChainInfo): string;
 export declare function _isLocalToken(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenEvmSmartContract(tokenInfo: _ChainAsset): boolean;
 export declare function _isTokenTonSmartContract(tokenInfo: _ChainAsset): boolean;
@@ -119,6 +122,11 @@ export declare function updateLatestChainInfo(currentDataMap: _DataMap, latestCh
     needUpdateChainApiList: _ChainInfo[];
 };
 export declare const _chainInfoToChainType: (chainInfo: _ChainInfo) => AccountChainType;
-export declare const _isChainInfoCompatibleWithAccountInfo: (chainInfo: _ChainInfo, accountChainType: AccountChainType, accountType: KeypairType) => boolean;
+interface AccountInfo {
+    chainType: AccountChainType;
+    type: KeypairType;
+    signMode?: AccountSignMode;
+}
+export declare const _isChainInfoCompatibleWithAccountInfo: (chainInfo: _ChainInfo, accountInfo: AccountInfo) => boolean;
 export declare const _getAssetNetuid: (assetInfo: _ChainAsset) => number;
 export * from './patch';

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

@@ -4,7 +4,7 @@
 import { _AssetRefPath, _AssetType, _ChainStatus, _SubstrateChainType } from '@subwallet/chain-list/types';
 import { _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _CUSTOM_PREFIX, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { AccountChainType } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountSignMode } from '@subwallet/extension-base/types';
 import { BitcoinMainnetKeypairTypes, BitcoinTestnetKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export function _isCustomChain(slug) {
@@ -142,6 +142,12 @@ export function _getTokenMinAmount(tokenInfo) {
 export function _isChainEvmCompatible(chainInfo) {
   return !!chainInfo.evmInfo;
 }
+export function _isChainCompatibleLedgerEvm(chainInfo) {
+  return !!chainInfo.evmInfo && chainInfo.evmInfo.evmChainId > 0;
+}
+export function _isSubstrateEvmCompatibleChain(chainInfo) {
+  return !!chainInfo.evmInfo && !!chainInfo.substrateInfo;
+}
 export function _isChainBitcoinCompatible(chainInfo) {
   return !!chainInfo.bitcoinInfo;
 }
@@ -312,6 +318,13 @@ export function _getChainNativeTokenSlug(chainInfo) {
   }
   return `${chainInfo.slug}-${_AssetType.NATIVE}-${_getChainNativeTokenBasicInfo(chainInfo).symbol}`;
 }
+export function _getChainSubstrateTokenSymbol(chainInfo) {
+  if (chainInfo.substrateInfo) {
+    return chainInfo.substrateInfo.symbol || '';
+  } else {
+    return '';
+  }
+}
 export function _isLocalToken(tokenInfo) {
   return tokenInfo.assetType === _AssetType.LOCAL;
 }
@@ -419,6 +432,9 @@ export function _getBlockExplorerFromChain(chainInfo) {
   } else if (_isPureBitcoinChain(chainInfo)) {
     var _chainInfo$bitcoinInf;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$bitcoinInf = chainInfo.bitcoinInfo) === null || _chainInfo$bitcoinInf === void 0 ? void 0 : _chainInfo$bitcoinInf.blockExplorer;
+  } else if (_isPureTonChain(chainInfo)) {
+    var _chainInfo$tonInfo;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$tonInfo = chainInfo.tonInfo) === null || _chainInfo$tonInfo === void 0 ? void 0 : _chainInfo$tonInfo.blockExplorer;
   } else {
     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;
@@ -594,11 +610,22 @@ export const _chainInfoToChainType = chainInfo => {
   }
   return AccountChainType.SUBSTRATE;
 };
-export const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountChainType, accountType) => {
+export const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) => {
+  const {
+    chainType: accountChainType,
+    signMode: accountSignMode,
+    type: accountType
+  } = accountInfo;
   if (accountChainType === AccountChainType.SUBSTRATE) {
     return _isPureSubstrateChain(chainInfo) && SubstrateKeypairTypes.includes(accountType);
   }
   if (accountChainType === AccountChainType.ETHEREUM) {
+    if (accountSignMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+      return _isSubstrateEvmCompatibleChain(chainInfo) && EthereumKeypairTypes.includes(accountType);
+    }
+    if (accountSignMode === AccountSignMode.GENERIC_LEDGER) {
+      return _isChainCompatibleLedgerEvm(chainInfo) && EthereumKeypairTypes.includes(accountType);
+    }
     return _isChainEvmCompatible(chainInfo) && EthereumKeypairTypes.includes(accountType);
   }
   if (accountChainType === AccountChainType.TON) {