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

package/cjs/services/earning-service/service.js

@@ -30,6 +30,7 @@ const fetchPoolsData = async () => {
 class EarningService {
   handlers = {};
   handlerCache = new Map();
+  inactivePoolSlug = new Set();
   earningRewardSubject = new _rxjs.BehaviorSubject({
     ready: false,
     data: {}
@@ -43,6 +44,7 @@ class EarningService {
   yieldPositionListSubject = new _rxjs.BehaviorSubject([]); // virtual list of yieldPositionSubject with filter values
 
   useOnlineCacheOnly = true;
+  inactivePoolReady = (0, _utils2.createPromiseHandler)();
   constructor(state) {
     this.state = state;
     this.dbService = state.dbService;
@@ -60,10 +62,23 @@ class EarningService {
       }
     }
     const minAmountPercent = {};
+    const ahMapChain = await this.state.chainService.fetchAhMapChain();
     for (const chain of chains) {
       const handlers = [];
+      const chainInfo = this.state.getChainInfo(chain);
+      const symbol = (0, _utils._getChainSubstrateTokenSymbol)(chainInfo);
       if (_constants2._STAKING_CHAIN_GROUP.relay.includes(chain)) {
-        handlers.push(new _handlers.RelayNativeStakingPoolHandler(this.state, chain));
+        if (_constants2._STAKING_CHAIN_GROUP.assetHub.includes(chain)) {
+          continue;
+        }
+        const ahChain = ahMapChain[chain];
+        if (ahChain) {
+          handlers.push(new _handlers.RelayNativeStakingPoolHandler(this.state, ahChain));
+          const relaySlug = _handlers.RelayNativeStakingPoolHandler.generateSlug(symbol, chain);
+          this.inactivePoolSlug.add(relaySlug);
+        } else {
+          handlers.push(new _handlers.RelayNativeStakingPoolHandler(this.state, chain));
+        }
       }
       if (_constants2._STAKING_CHAIN_GROUP.para.includes(chain)) {
         handlers.push(new _handlers.ParaNativeStakingPoolHandler(this.state, chain));
@@ -84,7 +99,14 @@ class EarningService {
         handlers.push(new _mythos.default(this.state, chain));
       }
       if (_constants2._STAKING_CHAIN_GROUP.nominationPool.includes(chain)) {
-        handlers.push(new _handlers.NominationPoolHandler(this.state, chain));
+        const ahChain = ahMapChain[chain];
+        if (ahChain) {
+          handlers.push(new _handlers.NominationPoolHandler(this.state, ahChain));
+          const relaySlug = _handlers.NominationPoolHandler.generateSlug(symbol, chain);
+          this.inactivePoolSlug.add(relaySlug);
+        } else {
+          handlers.push(new _handlers.NominationPoolHandler(this.state, chain));
+        }
       }
       if (_constants2._STAKING_CHAIN_GROUP.liquidStaking.includes(chain)) {
         if (chain === 'bifrost_dot') {
@@ -117,6 +139,7 @@ class EarningService {
     }
     minAmountPercent.default = _base.default.defaultMinAmountPercent;
     this.minAmountPercentSubject.next(minAmountPercent);
+    this.inactivePoolReady.resolve();
 
     // Emit earning ready
     this.eventService.emit('earning.ready', true);
@@ -136,7 +159,7 @@ class EarningService {
       next: data => {
         const activeMap = this.state.getActiveChainInfoMap();
         const activePositions = Object.values(data).filter(item => {
-          return !!activeMap[item.chain];
+          return !!activeMap[item.chain] && !this.inactivePoolSlug.has(item.slug);
         });
         this.yieldPositionListSubject.next(Object.values(activePositions));
       }
@@ -319,7 +342,9 @@ class EarningService {
     const yieldPoolInfo = {};
     const existedYieldPoolInfo = await this.dbService.getYieldPools();
     existedYieldPoolInfo.forEach(info => {
-      yieldPoolInfo[info.slug] = info;
+      if (!this.inactivePoolSlug.has(info.slug)) {
+        yieldPoolInfo[info.slug] = info;
+      }
     });
     this.yieldPoolInfoSubject.next(yieldPoolInfo);
   }
@@ -354,6 +379,10 @@ class EarningService {
   }
   async fetchingPoolsInfoOnline() {
     const onlineData = await fetchPoolsData();
+    await this.inactivePoolReady.promise;
+    for (const inactiveSlug of this.inactivePoolSlug) {
+      delete onlineData[inactiveSlug];
+    }
     Object.values(onlineData).forEach(item => {
       this.updateYieldPoolInfo(item);
     });
@@ -396,14 +425,11 @@ class EarningService {
   async subscribePoolPositions(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
       if (activeChains.includes(handler.chain)) {
-        const chainInfo = handler.chainInfo;
-        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        const [useAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, handler.chainInfo);
         handler.subscribePoolPosition(useAddresses, callback).then(unsub => {
           if (cancel) {
             unsub();
@@ -451,7 +477,9 @@ class EarningService {
     const existedYieldPosition = await this.dbService.getYieldNominationPoolPosition(addresses, this.state.activeChainSlugs);
     const yieldPositionInfo = this.yieldPositionSubject.getValue();
     existedYieldPosition.forEach(item => {
-      yieldPositionInfo[this._getYieldPositionKey(item.slug, item.address)] = item;
+      if (!this.inactivePoolSlug.has(item.slug)) {
+        yieldPositionInfo[this._getYieldPositionKey(item.slug, item.address)] = item;
+      }
     });
     this.yieldPositionSubject.next(yieldPositionInfo);
   }
@@ -543,14 +571,11 @@ class EarningService {
   async getPoolReward(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
       if (activeChains.includes(handler.chain)) {
-        const chainInfo = handler.chainInfo;
-        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        const [useAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, handler.chainInfo);
         handler.getPoolReward(useAddresses, callback).then(unsub => {
           if (cancel) {
             unsub();
@@ -599,14 +624,11 @@ class EarningService {
   async fetchPoolRewardHistory(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
       if (activeChains.includes(handler.chain)) {
-        const chainInfo = handler.chainInfo;
-        const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+        const [useAddresses] = (0, _utils2.filterAddressByChainInfo)(addresses, handler.chainInfo);
         handler.getPoolRewardHistory(useAddresses, callback).then(unsub => {
           if (cancel) {
             unsub();

package/cjs/services/keyring-service/context/handlers/Json.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AccountJsonHandler = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _types = require("@subwallet/extension-base/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
@@ -326,7 +327,7 @@ class AccountJsonHandler extends _Base.AccountBaseHandler {
         let [, proxy] = _ref8;
         return _proxyIds.includes(proxy.id);
       }));
-      const addresses = Object.values(_account).filter(account => _proxyIds.includes(account.id)).flatMap(proxy => proxy.accounts.map(account => account.address));
+      const addresses = Object.values(_account).filter(account => _proxyIds.includes(account.id) && account.accountType !== _types.AccountProxyType.LEDGER).flatMap(proxy => proxy.accounts.map(account => account.address));
       const rs = await _uiKeyring.keyring.backupAccounts(password, addresses);
       if (Object.keys(modifyPairs).length && Object.keys(accountProxies).length) {
         rs.accountProxies = accountProxies;

package/cjs/services/keyring-service/context/handlers/Ledger.js

@@ -101,6 +101,7 @@ class AccountLedgerHandler extends _Base.AccountBaseHandler {
         isEthereum,
         isGeneric,
         isLedgerRecovery,
+        isSubstrateECDSA,
         name,
         originGenesisHash
       } = account;
@@ -112,9 +113,13 @@ class AccountLedgerHandler extends _Base.AccountBaseHandler {
         genesisHash,
         originGenesisHash,
         isGeneric,
-        isLedgerRecovery
+        isLedgerRecovery,
+        isSubstrateECDSA
       };
-      const type = isEthereum ? 'ethereum' : 'sr25519';
+      let type = 'sr25519';
+      if (isEthereum || isSubstrateECDSA) {
+        type = 'ethereum';
+      }
       const pair = _uiKeyring.keyring.keyring.createFromAddress(address, {
         ...baseMeta,
         isExternal: true,

package/cjs/services/request-service/handler/AuthRequestHandler.js

@@ -55,6 +55,9 @@ class AuthRequestHandler {
       } else if (!value.currentNetworkMap) {
         value.currentNetworkMap = {};
       }
+      if (existKeyBothConnectAuthType) {
+        value.canConnectSubstrateEcdsa = true;
+      }
       acc[key] = {
         ...value
       };
@@ -91,6 +94,18 @@ class AuthRequestHandler {
       [v]: value
     }), {});
   }
+  getEcdsaAddressList() {
+    const addressList = Object.keys(this.keyringService.context.pairs);
+    const pairs = this.keyringService.context.pairs;
+    const ecdsaAddressList = new Set();
+    addressList.forEach(address => {
+      const pair = pairs[address];
+      if (pair && pair.json.meta.isSubstrateECDSA) {
+        ecdsaAddressList.add(address);
+      }
+    });
+    return ecdsaAddressList;
+  }
   get numAuthRequestsV2() {
     return Object.keys(this.#authRequestsV2).length;
   }
@@ -201,6 +216,7 @@ class AuthRequestHandler {
   }
   authCompleteV2 = (id, url, resolve, reject) => {
     const isAllowedMap = this.getAddressList();
+    const ecdsaAddressList = this.getEcdsaAddressList();
     const complete = (result, cb, accounts) => {
       const isAllowed = result === true;
       let isCancelled = false;
@@ -221,6 +237,7 @@ class AuthRequestHandler {
         idStr,
         request: {
           allowedAccounts,
+          canConnectSubstrateEcdsa,
           origin
         },
         url
@@ -228,10 +245,9 @@ class AuthRequestHandler {
 
       // Note: accountAuthTypes represents the accountAuthType of this request
       //       allowedAccounts is a list of connected accounts that exist for this origin during this request.
-
       if (accountAuthTypes.length !== _constants.ALL_ACCOUNT_AUTH_TYPES.length) {
         const backupAllowed = (allowedAccounts || []).filter(a => {
-          if ((0, _utilCrypto.isEthereumAddress)(a) && !accountAuthTypes.includes('evm')) {
+          if ((0, _utilCrypto.isEthereumAddress)(a) && (canConnectSubstrateEcdsa || !ecdsaAddressList.has(a)) && !accountAuthTypes.includes('evm')) {
             return true;
           }
           if ((0, _keyring.isSubstrateAddress)(a) && !accountAuthTypes.includes('substrate')) {
@@ -294,7 +310,8 @@ class AuthRequestHandler {
           currentNetworkMap: existed ? {
             ...defaultNetworkMap,
             ...existed.currentNetworkMap
-          } : defaultNetworkMap
+          } : defaultNetworkMap,
+          canConnectSubstrateEcdsa: canConnectSubstrateEcdsa || (existed === null || existed === void 0 ? void 0 : existed.canConnectSubstrateEcdsa)
         };
         this.setAuthorize(authorizeList, () => {
           cb();
@@ -326,6 +343,7 @@ class AuthRequestHandler {
     const idStr = (0, _utils2.stripUrl)(url);
     const isAllowedDappConnectBothType = !!_constants2.DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL.find(url_ => url.includes(url_));
     let accountAuthTypes = [...new Set(isAllowedDappConnectBothType ? ['evm', 'substrate'] : request.accountAuthTypes || ['substrate'])];
+    let canConnectSubstrateEcdsa = !!request.canConnectSubstrateEcdsa || isAllowedDappConnectBothType;
     if (!authList) {
       authList = {};
     }
@@ -360,6 +378,9 @@ class AuthRequestHandler {
         if (accountAuthTypes && _request.accountAuthTypes) {
           const filteredAccountAuthTypes = new Set([..._request.accountAuthTypes, ...accountAuthTypes]);
           accountAuthTypes = [...filteredAccountAuthTypes];
+          if (_request.request.canConnectSubstrateEcdsa) {
+            canConnectSubstrateEcdsa = true;
+          }
         }
         mergeKeys.push(key);
       }
@@ -391,9 +412,10 @@ class AuthRequestHandler {
         return allowed ? address : '';
       }).filter(item => item !== '');
       let allowedListByRequestType = [...request.allowedAccounts];
+      const ecdsaAddressList = this.getEcdsaAddressList();
       allowedListByRequestType = accountAuthTypes.reduce((list, accountAuthType) => {
         if (accountAuthType === 'evm') {
-          list.push(...allowedListByRequestType.filter(a => (0, _utilCrypto.isEthereumAddress)(a)));
+          list.push(...allowedListByRequestType.filter(a => (0, _utilCrypto.isEthereumAddress)(a) && (canConnectSubstrateEcdsa || !ecdsaAddressList.has(a))));
         } else if (accountAuthType === 'substrate') {
           list.push(...allowedListByRequestType.filter(a => (0, _keyring.isSubstrateAddress)(a)));
         } else if (accountAuthType === 'ton') {
@@ -424,7 +446,8 @@ class AuthRequestHandler {
           origin,
           url,
           accountAuthTypes: _constants.ALL_ACCOUNT_AUTH_TYPES,
-          currentNetworkMap: {}
+          currentNetworkMap: {},
+          canConnectSubstrateEcdsa
         };
         this.setAuthorize(authList);
         return true;
@@ -436,7 +459,8 @@ class AuthRequestHandler {
       idStr,
       request: {
         ...request,
-        accountAuthTypes
+        accountAuthTypes,
+        canConnectSubstrateEcdsa
       },
       url,
       accountAuthTypes: accountAuthTypes || ['substrate']

package/cjs/types/account/info/keyring.js

@@ -55,6 +55,7 @@ exports.AccountSignMode = AccountSignMode;
   AccountSignMode["QR"] = "qr";
   AccountSignMode["LEGACY_LEDGER"] = "legacy-ledger";
   AccountSignMode["GENERIC_LEDGER"] = "generic-ledger";
+  AccountSignMode["ECDSA_SUBSTRATE_LEDGER"] = "ecdsa-substrate-ledger";
   AccountSignMode["READ_ONLY"] = "readonly";
   AccountSignMode["ALL_ACCOUNT"] = "all";
   AccountSignMode["INJECTED"] = "injected";

package/cjs/utils/account/analyze.js

@@ -64,7 +64,7 @@ const _analyzeAddress = async (data, accountProxies, contacts, chainInfo, substr
   for (const accountProxy of accountProxies) {
     const _name = accountProxy.name.trim().toLowerCase();
     const nameCondition = isNameValid(_data, _name);
-    const filterAccounts = accountProxy.accounts.filter(account => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, account.chainType, account.type));
+    const filterAccounts = accountProxy.accounts.filter(account => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, account));
     for (const account of filterAccounts) {
       const addressCondition = isStrValidWithAddress(_data, account, chainInfo);
       const condition = nameCondition !== 'invalid' ? nameCondition : addressCondition;
@@ -92,7 +92,10 @@ const _analyzeAddress = async (data, accountProxies, contacts, chainInfo, substr
       }
     }
   }
-  const filterContacts = contacts.filter(contact => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, contact.chainType, (0, _keyring.getKeypairTypeByAddress)(contact.address)));
+  const filterContacts = contacts.filter(contact => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, {
+    chainType: contact.chainType,
+    type: (0, _keyring.getKeypairTypeByAddress)(contact.address)
+  }));
 
   // Filter address book addresses
   for (const contact of filterContacts) {

package/cjs/utils/account/common.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAccountChainTypeForAddress = exports._reformatAddressWithChain = void 0;
+exports.getAccountJsonByAddress = exports.getAccountChainTypeForAddress = exports.filterAddressByChainInfo = exports._reformatAddressWithChain = void 0;
 exports.getAddressesByChainType = getAddressesByChainType;
 exports.getAddressesByChainTypeMap = getAddressesByChainTypeMap;
 exports.isAccountAll = isAccountAll;
@@ -16,6 +16,7 @@ var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _validate = require("@subwallet/keyring/utils/address/validate");
+var _uiKeyring = require("@subwallet/ui-keyring");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -141,4 +142,94 @@ const modifyAccountName = (type, name, modify) => {
   }
   return network ? [name, network].join(' - ') : name;
 };
-exports.modifyAccountName = modifyAccountName;
+
+/**
+ * @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
+ */
+exports.modifyAccountName = modifyAccountName;
+const getAccountJsonByAddress = address => {
+  try {
+    const pair = _uiKeyring.keyring.getPair(address);
+    if (pair) {
+      return (0, _utils2.pairToAccount)(pair);
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+};
+
+/** Filter addresses to subscribe by chain info */
+exports.getAccountJsonByAddress = getAccountJsonByAddress;
+const filterAddressByChainInfo = (addresses, chainInfo) => {
+  const {
+    _bitcoin,
+    bitcoin,
+    cardano,
+    evm,
+    substrate,
+    ton
+  } = getAddressesByChainTypeMap(addresses, chainInfo);
+  if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+    const [fetchList, unFetchList] = processEvmAndSubstrateAddresses(evm, chainInfo);
+    return [fetchList, [...unFetchList, ...bitcoin, ...ton, ...substrate, ...cardano, ..._bitcoin].flat()];
+  } else if ((0, _utils._isChainBitcoinCompatible)(chainInfo)) {
+    return [bitcoin, [...evm, ...substrate, ...ton, ...cardano, ..._bitcoin].flat()];
+  } else if ((0, _utils._isChainTonCompatible)(chainInfo)) {
+    return [ton, [...bitcoin, ...evm, ...substrate, ...cardano, ..._bitcoin].flat()];
+  } else if ((0, _utils._isChainCardanoCompatible)(chainInfo)) {
+    return [cardano, [...bitcoin, ...evm, ...substrate, ...ton, ..._bitcoin].flat()];
+  } else {
+    const [fetchList, unFetchList] = processEvmAndSubstrateAddresses(substrate, chainInfo);
+    return [fetchList, [...unFetchList, ...bitcoin, ...evm, ...ton, ...cardano, ..._bitcoin].flat()];
+  }
+};
+exports.filterAddressByChainInfo = filterAddressByChainInfo;
+const processEvmAndSubstrateAddresses = (addressList, chainInfo) => {
+  const fetchList = [];
+  const unFetchList = [];
+  const isEvm = (0, _utilCrypto.isEthereumAddress)(addressList[0]);
+  addressList.forEach(address => {
+    const account = getAccountJsonByAddress(address);
+    if (account) {
+      if (account.isHardware) {
+        if (isEvm) {
+          if (account.isGeneric && account.isSubstrateECDSA) {
+            if ((0, _utils._isSubstrateEvmCompatibleChain)(chainInfo)) {
+              fetchList.push(address);
+            } else {
+              unFetchList.push(address);
+            }
+          } else {
+            fetchList.push(address);
+          }
+        } else {
+          if (account.isGeneric) {
+            fetchList.push(address);
+          } else {
+            const availGen = account.availableGenesisHashes || [];
+            const gen = (0, _utils._getSubstrateGenesisHash)(chainInfo);
+            if (availGen.includes(gen)) {
+              fetchList.push(address);
+            } else {
+              unFetchList.push(address);
+            }
+          }
+        }
+      } else {
+        fetchList.push(address);
+      }
+    } else {
+      fetchList.push(address);
+    }
+  });
+  return [fetchList, unFetchList];
+};

package/cjs/utils/account/transform.js

@@ -71,6 +71,9 @@ const getAccountSignMode = (address, _meta) => {
       if (meta.isExternal) {
         if (meta.isHardware) {
           if (meta.isGeneric) {
+            if (meta.isSubstrateECDSA) {
+              return _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER;
+            }
             return _types2.AccountSignMode.GENERIC_LEDGER;
           } else {
             return _types2.AccountSignMode.LEGACY_LEDGER;
@@ -244,6 +247,11 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
       result.push(...CLAIM_AVAIL_BRIDGE);
     }
     return result;
+  } else if (signMode === _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+    // Only for account substrate with ECDSA scheme format
+    const result = [];
+    result.push(...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, _KoniTypes.ExtrinsicType.TRANSFER_XCM, _KoniTypes.ExtrinsicType.SWAP, _KoniTypes.ExtrinsicType.CROWDLOAN);
+    return result;
   }
   return [];
 };
@@ -380,6 +388,7 @@ const convertAccountProxyType = accountSignMode => {
   switch (accountSignMode) {
     case _types2.AccountSignMode.GENERIC_LEDGER:
     case _types2.AccountSignMode.LEGACY_LEDGER:
+    case _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER:
       return _types2.AccountProxyType.LEDGER;
     case _types2.AccountSignMode.QR:
       return _types2.AccountProxyType.QR;
@@ -490,6 +499,7 @@ const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
       switch (account.signMode) {
         case _types2.AccountSignMode.GENERIC_LEDGER:
         case _types2.AccountSignMode.LEGACY_LEDGER:
+        case _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER:
           specialChain = account.specialChain;
           break;
       }

package/cjs/utils/asset.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterAssetsByChainAndType = exports.filterAlphaAssetsByChain = void 0;
+exports.isSubstrateEcdsaLedgerAssetSupported = exports.filterAssetsByChainAndType = exports.filterAlphaAssetsByChain = void 0;
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -31,4 +31,11 @@ const filterAlphaAssetsByChain = (chainAssetMap, chain) => {
   });
   return result;
 };
-exports.filterAlphaAssetsByChain = filterAlphaAssetsByChain;
+exports.filterAlphaAssetsByChain = filterAlphaAssetsByChain;
+const isSubstrateEcdsaLedgerAssetSupported = (chainsAsset, chainInfo) => {
+  if (!(0, _utils._isSubstrateEvmCompatibleChain)(chainInfo)) {
+    return false;
+  }
+  return (0, _utils._isNativeToken)(chainsAsset) || !(0, _utils._getContractAddressOfToken)(chainsAsset);
+};
+exports.isSubstrateEcdsaLedgerAssetSupported = isSubstrateEcdsaLedgerAssetSupported;

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.paraSpellChainMap = exports.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.paraSpellChainMap = exports.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.assetHubStakingMap = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -42,7 +42,10 @@ const oldChainPrefix = require('./oldChainPrefix.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.oldChainPrefix = oldChainPrefix;
 const paraSpellChainMap = require('./paraSpellChainMap.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.paraSpellChainMap = paraSpellChainMap;
+const assetHubStakingMap = require('./assetHubStaking.json');
+exports.assetHubStakingMap = assetHubStakingMap;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
@@ -58,6 +61,7 @@ exports.StaticKey = StaticKey;
   StaticKey["BLOCKED_ACTIONS"] = "blocked-actions";
   StaticKey["OLD_CHAIN_PREFIX"] = "old-chain-prefix";
   StaticKey["PARASPELL_CHAIN_MAP"] = "paraspell-chain-map";
+  StaticKey["ASSET_HUB_STAKING_MAP"] = "asset-hub-staking-map";
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
@@ -71,6 +75,7 @@ const staticData = {
   [StaticKey.REMIND_NOTIFICATION_TIME]: remindNotificationTime,
   [StaticKey.BLOCKED_ACTIONS]: blockedActions,
   [StaticKey.OLD_CHAIN_PREFIX]: oldChainPrefix,
-  [StaticKey.PARASPELL_CHAIN_MAP]: paraSpellChainMap
+  [StaticKey.PARASPELL_CHAIN_MAP]: paraSpellChainMap,
+  [StaticKey.ASSET_HUB_STAKING_MAP]: assetHubStakingMap
 };
 exports.staticData = staticData;

package/core/logic-validation/request.js

@@ -7,6 +7,7 @@ import { CardanoProviderError } from '@subwallet/extension-base/background/error
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BitcoinProviderErrorType, CardanoProviderErrorType, EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { BN_ZERO, combineEthFee, createPromiseHandler, isSameAddress, reformatAddress, stripUrl, wait } from '@subwallet/extension-base/utils';
 import { validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
@@ -247,7 +248,8 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
   const transactionParams = payload.payloadAfterValidated;
   const {
     address: fromAddress,
-    networkKey
+    networkKey,
+    pair: pair_
   } = payload;
   const evmApi = koni.getEvmApi(networkKey || '');
   const web3 = evmApi === null || evmApi === void 0 ? void 0 : evmApi.api;
@@ -285,8 +287,25 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
   if (!fromAddress || !isEthereumAddress(fromAddress)) {
     handleError('the sender address must be the ethereum address type');
   }
-  if (transaction.to && !isEthereumAddress(transaction.to)) {
-    handleError('invalid recipient address');
+  const pair = pair_ || keyring.getPair(fromAddress);
+  if (!pair) {
+    handleError('Not found address to sign');
+  }
+  if (pair_ !== null && pair_ !== void 0 && pair_.meta.isSubstrateECDSA) {
+    handleError('Substrate account can not send this transaction');
+  }
+  const evmNetwork = koni.getChainInfo(networkKey || '');
+  if (transaction.to) {
+    if (!isEthereumAddress(transaction.to)) {
+      handleError('invalid recipient address');
+    } else {
+      try {
+        const pairTo = keyring.getPair(transaction.to);
+        if (pairTo && pairTo.meta.isSubstrateECDSA && !_isSubstrateEvmCompatibleChain(evmNetwork)) {
+          handleError('substrate account cannot receive this token');
+        }
+      } catch (e) {}
+    }
   }
   if (fromAddress === transaction.to) {
     handleError('receiving address must be different from sending address');
@@ -382,7 +401,6 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
     handleError(e.message);
   }
   const hasError = errors && errors.length > 0 || !networkKey;
-  const evmNetwork = koni.getChainInfo(networkKey || '');
   let isToContract = false;
   let hashPayload = '';
   let parseData = '';
@@ -433,6 +451,12 @@ export async function validationEvmSignMessageMiddleware(koni, url, payload_) {
     handleError('Not found address or payload to sign');
   }
   const pair = pair_ || keyring.getPair(address);
+  if (!pair) {
+    handleError('Not found address to sign');
+  }
+  if (pair_ !== null && pair_ !== void 0 && pair_.meta.isSubstrateECDSA) {
+    handleError('Substrate account can not sign this message');
+  }
   if (method) {
     if (['eth_sign', 'personal_sign', 'eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) < 0) {
       handleError('Unsupported action');
@@ -984,6 +1008,9 @@ export function convertErrorMessage(message_, name) {
   if (message.includes('insufficient balance') || message.includes('insufficient funds')) {
     return [t('Insufficient balance on the sender address. Top up your balance and try again'), t('Unable to sign transaction')];
   }
+  if (message.includes('substrate') && message.includes('receive this token')) {
+    return [t('The recipient account is a Ledger Polkadot (EVM) account, which is not supported for this transaction. Change recipient account and try again'), t('Invalid account type')];
+  }
 
   // Sign Message
   if (message.includes('not found address or payload to sign')) {

package/core/types.d.ts

@@ -1,6 +1,6 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { AccountJson } from '@subwallet/extension-base/types';
-export declare type LedgerMustCheckType = 'polkadot' | 'migration' | 'unnecessary';
+export declare type LedgerMustCheckType = 'polkadot' | 'migration' | 'polkadot_ecdsa' | 'unnecessary';
 export declare enum ValidationCondition {
     IS_NOT_NULL = "IS_NOT_NULL",
     IS_ADDRESS = "IS_ADDRESS",
@@ -20,6 +20,7 @@ export declare enum ActionType {
 export interface ValidateRecipientParams {
     srcChain: string;
     destChainInfo: _ChainInfo;
+    assetInfo?: _ChainAsset;
     fromAddress: string;
     toAddress: string;
     account: AccountJson | null;