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

package/core/utils.js

@@ -4,9 +4,11 @@
 import { _AssetType } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { ActionType } from '@subwallet/extension-base/core/types';
 import { tonAddressInfo } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
-import { _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isBridgedToken, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { isAddressAndChainCompatible, isSameAddress, reformatAddress } from '@subwallet/extension-base/utils';
+import { _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isBridgedToken, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainCompatibleLedgerEvm, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible, _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { AccountChainType, AccountSignMode } from '@subwallet/extension-base/types';
+import { isAddressAndChainCompatible, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, reformatAddress } from '@subwallet/extension-base/utils';
 import { isAddress, isCardanoTestnetAddress, isTonAddress } from '@subwallet/keyring';
 import { getBitcoinAddressInfo, validateBitcoinAddress } from '@subwallet/keyring/utils';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -122,7 +124,9 @@ export function _isNotDuplicateAddress(validateRecipientParams) {
 export function _isSupportLedgerAccount(validateRecipientParams) {
   const {
     account,
+    actionType,
     allowLedgerGenerics,
+    assetInfo,
     destChainInfo
   } = validateRecipientParams;
   if (account !== null && account !== void 0 && account.isHardware) {
@@ -135,6 +139,24 @@ export function _isSupportLedgerAccount(validateRecipientParams) {
         return 'Your Ledger account is not supported by {{network}} network.'.replace('{{network}}', destChainName);
       }
     } else {
+      if (account.chainType === AccountChainType.ETHEREUM) {
+        // For ecdsa substrate account in polkadot ledger app
+        if (account.signMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+          if (actionType === ActionType.SEND_NFT) {
+            return 'Ledger Polkadot (EVM) address is not supported for NFT transfer';
+          }
+          if (!_isSubstrateEvmCompatibleChain(destChainInfo)) {
+            return 'Ledger Polkadot (EVM) address is not supported for this transfer';
+          } else if (assetInfo && !isSubstrateEcdsaLedgerAssetSupported(assetInfo, destChainInfo)) {
+            return 'Ledger Polkadot (EVM) address is not supported for this transfer';
+          }
+        } else {
+          if (!_isChainCompatibleLedgerEvm(destChainInfo)) {
+            return 'Ledger EVM address is not supported for this transfer';
+          }
+        }
+      }
+
       // For ledger generic
       const ledgerCheck = ledgerMustCheckNetwork(account);
       if (ledgerCheck !== 'unnecessary' && !allowLedgerGenerics.includes(destChainInfo.slug)) {

package/koni/background/handlers/Extension.js

@@ -11,6 +11,7 @@ import { CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicTyp
 import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, BTC_DUST_AMOUNT, LATEST_SESSION } from '@subwallet/extension-base/constants';
 import { additionalValidateTransferForRecipient, validateTransferRequest, validateXcmMinAmountToMythos, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { ActionType } from '@subwallet/extension-base/core/types';
 import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
@@ -47,7 +48,7 @@ import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectN
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
-import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { getKeypairTypeByAddress, isAddress, isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
@@ -296,16 +297,32 @@ export default class KoniExtension {
   }
   async subscribeInputAddressData(request, id, port) {
     const {
+      actionType,
       chain,
-      data
+      data,
+      token
     } = request;
     const cb = createSubscription(id, port);
-    const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
+    const combineFunction = async (chainInfoMap, tokenInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
       const contacts = transformAddresses(_contacts);
       const chainInfo = chainInfoMap[chain];
+      const tokenInfo = tokenInfoMap[token || ''];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await _analyzeAddress(data, accountProxies, contacts, chainInfo, substrateApi);
+      const accountProxiesFiltered = accountProxies.filter(accountProxy => {
+        var _accountProxy$account;
+        const signMode = (_accountProxy$account = accountProxy.accounts[0]) === null || _accountProxy$account === void 0 ? void 0 : _accountProxy$account.signMode;
+        if (signMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+          if (actionType === ActionType.SEND_NFT) {
+            return false;
+          }
+          if (tokenInfo) {
+            return isSubstrateEcdsaLedgerAssetSupported(tokenInfo, chainInfo);
+          }
+        }
+        return true;
+      });
+      const rs = await _analyzeAddress(data, accountProxiesFiltered, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -314,16 +331,19 @@ export default class KoniExtension {
     const accountObservable = this.#koniState.keyringService.context.observable.accounts;
     const contactObservable = this.#koniState.keyringService.context.observable.contacts;
     const chainInfoMapObservable = this.#koniState.chainService.subscribeChainInfoMap().asObservable();
+    const tokenInfoMapObservable = this.#koniState.chainService.subscribeAssetRegistry().asObservable();
     const subscription = combineLatest({
       chainInfoMap: chainInfoMapObservable,
+      tokenInfoMap: tokenInfoMapObservable,
       accountProxies: accountObservable,
       contacts: contactObservable
     }).subscribe(({
       accountProxies,
       chainInfoMap,
-      contacts
+      contacts,
+      tokenInfoMap
     }) => {
-      combineFunction(chainInfoMap, accountProxies, contacts).then(rs => cb(rs)).catch(console.error);
+      combineFunction(chainInfoMap, tokenInfoMap, accountProxies, contacts).then(rs => cb(rs)).catch(console.error);
     });
     this.createUnsubscriptionHandle(id, () => {
       subscription.unsubscribe();
@@ -334,7 +354,8 @@ export default class KoniExtension {
     const accountProxyMap = this.#koniState.keyringService.context.value.accounts;
     const contacts = this.#koniState.keyringService.context.value.contacts;
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
-    return combineFunction(chainInfoMap, accountProxyMap, contacts);
+    const tokenInfoMap = this.#koniState.chainService.getAssetRegistry();
+    return combineFunction(chainInfoMap, tokenInfoMap, accountProxyMap, contacts);
   }
 
   /**
@@ -1242,6 +1263,8 @@ export default class KoniExtension {
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
     const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
     const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
+    const pairFrom = keyring.getPair(from);
+    const isSubstrateECDSATransaction = pairFrom.meta.isSubstrateECDSA;
     const extrinsicType = isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN;
     let chainType = ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1258,7 +1281,7 @@ export default class KoniExtension {
       extrinsicType
     });
     try {
-      if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(transferTokenInfo)) {
+      if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(transferTokenInfo) && !isSubstrateECDSATransaction) {
         chainType = ChainType.EVM;
         const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = this.#koniState.getEvmApi(chain);

package/koni/background/handlers/Tabs.js

@@ -26,7 +26,7 @@ import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { hexStripPrefix, isArray, isNumber, u8aToHex } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTypes) {
+function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTypes, isSubstrateConnector) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   const authTypeFilter = ({
     json,
@@ -55,6 +55,12 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
       if (type === 'cardano' && json.meta.isReadOnly) {
         return false;
       }
+      const canConnectSubstrateEcdsa = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.canConnectSubstrateEcdsa) && isSubstrateConnector;
+
+      // If the dApp has not connected to the Substrate type yet, we do not return Substrate ECDSA accounts.
+      if (type === 'ethereum' && json.meta.isSubstrateECDSA && !canConnectSubstrateEcdsa) {
+        return false;
+      }
       return true;
     } else {
       return true;
@@ -267,7 +273,8 @@ export default class KoniTabs {
   }
   async accountsListV2(url, {
     accountAuthType,
-    anyType
+    anyType,
+    isSubstrateConnector
   }) {
     const authInfo = await this.getAuthInfo(url);
     const accountAuthTypes = [];
@@ -287,7 +294,7 @@ export default class KoniTabs {
         accountAuthTypes.push('cardano');
       }
     }
-    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes);
+    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes, isSubstrateConnector);
   }
 
   // TODO: Update logic
@@ -311,7 +318,7 @@ export default class KoniTabs {
             }
           }
           const accounts = this.#koniState.keyringService.context.pairs;
-          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes));
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes, true));
         }).catch(console.error);
       }),
       url

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.45-1",
+  "version": "1.3.46-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2796,6 +2796,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",
@@ -2855,12 +2856,12 @@
     "@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/extension-base": "^1.3.46-0",
+    "@subwallet/extension-chains": "^1.3.46-0",
+    "@subwallet/extension-dapp": "^1.3.46-0",
+    "@subwallet/extension-inject": "^1.3.46-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.45-1",
+    "@subwallet/subwallet-api-sdk": "^1.3.46-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.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.46-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/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;