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

package/utils/account/common.d.ts

@@ -1,6 +1,6 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
-import { AccountChainType } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson } from '@subwallet/extension-base/types';
 import { KeypairType } from '@subwallet/keyring/types';
 export declare function isAccountAll(address?: string): boolean;
 export declare function reformatAddress(address: string, networkPrefix?: number, isEthereum?: boolean, ignoreError?: boolean): string;
@@ -17,4 +17,16 @@ export declare function getAddressesByChainTypeMap(addresses: string[], chainInf
 export declare function quickFormatAddressToCompare(address?: string): string | undefined;
 /** @deprecated */
 export declare const modifyAccountName: (type: KeypairType, name: string, modify: boolean) => string;
+/**
+ * @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;
+/** Filter addresses to subscribe by chain info */
+export declare const filterAddressByChainInfo: (addresses: string[], chainInfo: _ChainInfo) => [string[], string[]];
 export {};

package/utils/account/common.js

@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { _chainInfoToChainType, _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
+import { _chainInfoToChainType, _getChainSubstrateAddressPrefix, _getSubstrateGenesisHash, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainTonCompatible, _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { AccountChainType } from '@subwallet/extension-base/types';
-import { getAccountChainTypeFromKeypairType } from '@subwallet/extension-base/utils';
+import { getAccountChainTypeFromKeypairType, pairToAccount } from '@subwallet/extension-base/utils';
 import { decodeAddress, encodeAddress, getKeypairTypeByAddress, isAddress, isBitcoinAddress, isCardanoAddress, isTonAddress } from '@subwallet/keyring';
 import { getBitcoinAddressInfo } from '@subwallet/keyring/utils/address/validate';
+import { keyring } from '@subwallet/ui-keyring';
 import { ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export function isAccountAll(address) {
   return address === ALL_ACCOUNT_KEY;
@@ -123,4 +124,92 @@ export const modifyAccountName = (type, name, modify) => {
       break;
   }
   return network ? [name, network].join(' - ') : name;
+};
+
+/**
+ * @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 */
+export const filterAddressByChainInfo = (addresses, chainInfo) => {
+  const {
+    _bitcoin,
+    bitcoin,
+    cardano,
+    evm,
+    substrate,
+    ton
+  } = getAddressesByChainTypeMap(addresses, chainInfo);
+  if (_isChainEvmCompatible(chainInfo)) {
+    const [fetchList, unFetchList] = processEvmAndSubstrateAddresses(evm, chainInfo);
+    return [fetchList, [...unFetchList, ...bitcoin, ...ton, ...substrate, ...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, unFetchList] = processEvmAndSubstrateAddresses(substrate, chainInfo);
+    return [fetchList, [...unFetchList, ...bitcoin, ...evm, ...ton, ...cardano, ..._bitcoin].flat()];
+  }
+};
+const processEvmAndSubstrateAddresses = (addressList, chainInfo) => {
+  const fetchList = [];
+  const unFetchList = [];
+  const isEvm = isEthereumAddress(addressList[0]);
+  addressList.forEach(address => {
+    const account = getAccountJsonByAddress(address);
+    if (account) {
+      if (account.isHardware) {
+        if (isEvm) {
+          if (account.isGeneric && account.isSubstrateECDSA) {
+            if (_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 = _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/utils/account/transform.js

@@ -62,6 +62,9 @@ export const getAccountSignMode = (address, _meta) => {
       if (meta.isExternal) {
         if (meta.isHardware) {
           if (meta.isGeneric) {
+            if (meta.isSubstrateECDSA) {
+              return AccountSignMode.ECDSA_SUBSTRATE_LEDGER;
+            }
             return AccountSignMode.GENERIC_LEDGER;
           } else {
             return AccountSignMode.LEGACY_LEDGER;
@@ -233,6 +236,11 @@ export const getAccountTransactionActions = (signMode, networkType, type, _meta,
       result.push(...CLAIM_AVAIL_BRIDGE);
     }
     return result;
+  } else if (signMode === 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, ExtrinsicType.TRANSFER_XCM, ExtrinsicType.SWAP, ExtrinsicType.CROWDLOAN);
+    return result;
   }
   return [];
 };
@@ -352,6 +360,7 @@ export const convertAccountProxyType = accountSignMode => {
   switch (accountSignMode) {
     case AccountSignMode.GENERIC_LEDGER:
     case AccountSignMode.LEGACY_LEDGER:
+    case AccountSignMode.ECDSA_SUBSTRATE_LEDGER:
       return AccountProxyType.LEDGER;
     case AccountSignMode.QR:
       return AccountProxyType.QR;
@@ -460,6 +469,7 @@ export const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
       switch (account.signMode) {
         case AccountSignMode.GENERIC_LEDGER:
         case AccountSignMode.LEGACY_LEDGER:
+        case AccountSignMode.ECDSA_SUBSTRATE_LEDGER:
           specialChain = account.specialChain;
           break;
       }

package/utils/asset.d.ts

@@ -1,3 +1,4 @@
-import { _AssetType, _ChainAsset } from '@subwallet/chain-list/types';
+import { _AssetType, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 export declare const filterAssetsByChainAndType: (chainAssetMap: Record<string, _ChainAsset>, chain: string, assetTypes: _AssetType[]) => Record<string, _ChainAsset>;
 export declare const filterAlphaAssetsByChain: (chainAssetMap: Record<string, _ChainAsset>, chain: string) => Record<string, _ChainAsset>;
+export declare const isSubstrateEcdsaLedgerAssetSupported: (chainsAsset: _ChainAsset, chainInfo: _ChainInfo) => boolean;

package/utils/asset.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _AssetType } from '@subwallet/chain-list/types';
-import { _getAssetNetuid } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetNetuid, _getContractAddressOfToken, _isNativeToken, _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
 export const filterAssetsByChainAndType = (chainAssetMap, chain, assetTypes) => {
   const result = {};
   Object.values(chainAssetMap).forEach(assetInfo => {
@@ -23,4 +23,10 @@ export const filterAlphaAssetsByChain = (chainAssetMap, chain) => {
     }
   });
   return result;
+};
+export const isSubstrateEcdsaLedgerAssetSupported = (chainsAsset, chainInfo) => {
+  if (!_isSubstrateEvmCompatibleChain(chainInfo)) {
+    return false;
+  }
+  return _isNativeToken(chainsAsset) || !_getContractAddressOfToken(chainsAsset);
 };

package/utils/staticData/assetHubStaking.json

@@ -0,0 +1 @@
+{}

package/utils/staticData/index.d.ts

@@ -11,6 +11,7 @@ export declare const remindNotificationTime: Record<NotificationActionType, numb
 export declare const blockedActions: Record<string, EnvConfig>;
 export declare const oldChainPrefix: Record<string, EnvConfig>;
 export declare const paraSpellChainMap: Record<string, EnvConfig>;
+export declare const assetHubStakingMap: Record<string, EnvConfig>;
 export declare enum StaticKey {
     BUY_SERVICE_INFOS = "buy-service-infos",
     CHAINS = "chains",
@@ -23,7 +24,8 @@ export declare enum StaticKey {
     REMIND_NOTIFICATION_TIME = "remind-notification-time",
     BLOCKED_ACTIONS = "blocked-actions",
     OLD_CHAIN_PREFIX = "old-chain-prefix",
-    PARASPELL_CHAIN_MAP = "paraspell-chain-map"
+    PARASPELL_CHAIN_MAP = "paraspell-chain-map",
+    ASSET_HUB_STAKING_MAP = "asset-hub-staking-map"
 }
 export declare const staticData: {
     chains: import("@subwallet/chain-list/types")._ChainInfo[];
@@ -38,4 +40,5 @@ export declare const staticData: {
     "blocked-actions": Record<string, EnvConfig>;
     "old-chain-prefix": Record<string, EnvConfig>;
     "paraspell-chain-map": Record<string, EnvConfig>;
+    "asset-hub-staking-map": Record<string, EnvConfig>;
 };

package/utils/staticData/index.js

@@ -25,6 +25,8 @@ export const blockedActions = require("./blockedActions.json");
 export const oldChainPrefix = require("./oldChainPrefix.json");
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 export const paraSpellChainMap = require("./paraSpellChainMap.json");
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+export const assetHubStakingMap = require("./assetHubStaking.json");
 export let StaticKey;
 (function (StaticKey) {
   StaticKey["BUY_SERVICE_INFOS"] = "buy-service-infos";
@@ -39,6 +41,7 @@ export let 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 || (StaticKey = {}));
 export const staticData = {
   [StaticKey.CHAINS]: Object.values(ChainInfoMap),
@@ -52,5 +55,6 @@ export 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
 };