@subwallet/extension-base 1.3.22-0 → 1.3.23-0

package/cjs/utils/account/derive/validate.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateUnifiedDerivationPath = exports.validateTonDerivationPath = exports.validateSr25519DerivationPath = exports.validateOtherSubstrateDerivationPath = exports.validateEvmDerivationPath = exports.validateDerivationPath = void 0;
+exports.validateUnifiedDerivationPath = exports.validateTonDerivationPath = exports.validateSr25519DerivationPath = exports.validateOtherSubstrateDerivationPath = exports.validateEvmDerivationPath = exports.validateDerivationPath = exports.validateCardanoDerivationPath = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -105,6 +105,38 @@ const validateTonDerivationPath = raw => {
   }
 };
 exports.validateTonDerivationPath = validateTonDerivationPath;
+const validateCardanoDerivationPath = raw => {
+  const reg = /^m\/1852'\/1815'\/(\d+)'(\/\d+')?$/;
+  if (raw.match(reg)) {
+    const [, firstIndex, secondData] = raw.match(reg);
+    const first = parseInt(firstIndex, 10);
+    const autoIndexes = [first];
+    let depth;
+    let suri = `//${first}`;
+    if (first === 0) {
+      depth = 0;
+    } else {
+      depth = 1;
+    }
+    if (secondData) {
+      const [, secondIndex] = secondData.match(/\/(\d+)/);
+      const second = parseInt(secondIndex, 10);
+      autoIndexes.push(second);
+      depth = 2;
+      suri += `//${second}`;
+    }
+    return {
+      depth,
+      type: 'cardano',
+      suri,
+      derivationPath: raw,
+      autoIndexes
+    };
+  } else {
+    return undefined;
+  }
+};
+exports.validateCardanoDerivationPath = validateCardanoDerivationPath;
 const validateSr25519DerivationPath = raw => {
   const reg = /\/(\/?)([^/]+)/g;
   const parts = raw.match(reg);
@@ -167,11 +199,13 @@ const validateDerivationPath = (raw, type) => {
       return validateSr25519DerivationPath(raw);
     } else if (type === 'ed25519' || type === 'ecdsa') {
       return validateOtherSubstrateDerivationPath(raw, type);
+    } else if (type === 'cardano') {
+      return validateCardanoDerivationPath(raw);
     } else {
       return undefined;
     }
   } else {
-    return validateUnifiedDerivationPath(raw) || validateEvmDerivationPath(raw) || validateTonDerivationPath(raw) || validateSr25519DerivationPath(raw);
+    return validateUnifiedDerivationPath(raw) || validateEvmDerivationPath(raw) || validateTonDerivationPath(raw) || validateSr25519DerivationPath(raw) || validateCardanoDerivationPath(raw);
   }
 };
 exports.validateDerivationPath = validateDerivationPath;

package/cjs/utils/account/transform.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformAddresses = exports.transformAddress = exports.transformAccounts = exports.transformAccount = exports.singleAddressToAccount = exports.pairToAccount = exports.getAccountTransactionActions = exports.getAccountTokenTypes = exports.getAccountSignMode = exports.getAccountChainType = exports.getAccountActions = exports.createAccountProxyId = exports.convertAccountProxyType = exports.combineAllAccountProxy = exports.combineAccountsWithSubjectInfo = exports.combineAccountsWithKeyPair = exports._combineAccounts = void 0;
+exports.transformAddresses = exports.transformAddress = exports.transformAccounts = exports.transformAccount = exports.singleAddressToAccount = exports.pairToAccount = exports.getDefaultKeypairTypeFromAccountChainType = exports.getAccountTransactionActions = exports.getAccountTokenTypes = exports.getAccountSignMode = exports.getAccountChainTypeFromKeypairType = exports.getAccountActions = exports.createAccountProxyId = exports.convertAccountProxyType = exports.combineAllAccountProxy = exports.combineAccountsWithSubjectInfo = exports.combineAccountsWithKeyPair = exports._combineAccounts = void 0;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -39,10 +39,24 @@ const createAccountProxyId = (_suri, derivationPath) => {
   return (0, _utilCrypto.blake2AsHex)(data, 256);
 };
 exports.createAccountProxyId = createAccountProxyId;
-const getAccountChainType = type => {
-  return type ? _types3.EthereumKeypairTypes.includes(type) ? _types2.AccountChainType.ETHEREUM : _types3.TonKeypairTypes.includes(type) ? _types2.AccountChainType.TON : _types3.BitcoinKeypairTypes.includes(type) ? _types2.AccountChainType.BITCOIN : _types2.AccountChainType.SUBSTRATE : _types2.AccountChainType.SUBSTRATE;
+const getAccountChainTypeFromKeypairType = type => {
+  return type ? _types3.EthereumKeypairTypes.includes(type) ? _types2.AccountChainType.ETHEREUM : _types3.TonKeypairTypes.includes(type) ? _types2.AccountChainType.TON : _types3.BitcoinKeypairTypes.includes(type) ? _types2.AccountChainType.BITCOIN : _types3.CardanoKeypairTypes.includes(type) ? _types2.AccountChainType.CARDANO : _types2.AccountChainType.SUBSTRATE : _types2.AccountChainType.SUBSTRATE;
 };
-exports.getAccountChainType = getAccountChainType;
+exports.getAccountChainTypeFromKeypairType = getAccountChainTypeFromKeypairType;
+const getDefaultKeypairTypeFromAccountChainType = type => {
+  if (type === _types2.AccountChainType.ETHEREUM) {
+    return 'ethereum';
+  } else if (type === _types2.AccountChainType.TON) {
+    return 'ton';
+  } else if (type === _types2.AccountChainType.BITCOIN) {
+    return 'bitcoin-84';
+  } else if (type === _types2.AccountChainType.CARDANO) {
+    return 'cardano';
+  } else {
+    return 'sr25519';
+  }
+};
+exports.getDefaultKeypairTypeFromAccountChainType = getDefaultKeypairTypeFromAccountChainType;
 const getAccountSignMode = (address, _meta) => {
   const meta = _meta;
   if (!address || !meta) {
@@ -77,6 +91,7 @@ const getAccountActions = (signMode, networkType, type, _meta, parentAccount) =>
   const result = [];
   const meta = _meta;
 
+  // todo: check this function for Cardano
   // JSON
   if (signMode === _types2.AccountSignMode.PASSWORD) {
     result.push(_types2.AccountActions.EXPORT_JSON);
@@ -156,6 +171,8 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
         return [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...OTHER_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...EVM_ACTIONS];
       case _types2.AccountChainType.TON:
         return [...BASE_TRANSFER_ACTIONS];
+      case _types2.AccountChainType.CARDANO:
+        return [...BASE_TRANSFER_ACTIONS];
     }
   } else if (signMode === _types2.AccountSignMode.QR) {
     switch (networkType) {
@@ -165,6 +182,8 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
         return [...(_constants.isProductionMode ? [] : [...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, ...EARN_STDOT_ACTIONS, ...CLAIM_AVAIL_BRIDGE, ...OTHER_ACTIONS, ...EVM_ACTIONS])];
       case _types2.AccountChainType.TON:
         return [];
+      case _types2.AccountChainType.CARDANO:
+        return [];
     }
   } else if (signMode === _types2.AccountSignMode.GENERIC_LEDGER) {
     switch (networkType) {
@@ -180,6 +199,8 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
         _KoniTypes.ExtrinsicType.SEND_NFT, _KoniTypes.ExtrinsicType.SWAP];
       case _types2.AccountChainType.TON:
         return [...BASE_TRANSFER_ACTIONS];
+      case _types2.AccountChainType.CARDANO:
+        return [];
     }
   } else if (signMode === _types2.AccountSignMode.LEGACY_LEDGER) {
     // Only for Substrate
@@ -240,6 +261,8 @@ const getAccountTokenTypes = type => {
     case 'bitcoin-86':
     case 'bittest-86':
       return [_types._AssetType.NATIVE, _types._AssetType.RUNE, _types._AssetType.BRC20];
+    case 'cardano':
+      return [_types._AssetType.NATIVE, _types._AssetType.CIP26];
     default:
       return [];
   }
@@ -265,7 +288,7 @@ exports.getAccountTokenTypes = getAccountTokenTypes;
 const transformAccount = (address, _type, meta, chainInfoMap, parentAccount) => {
   const signMode = getAccountSignMode(address, meta);
   const type = _type || (0, _keyring.getKeypairTypeByAddress)(address);
-  const chainType = getAccountChainType(type);
+  const chainType = getAccountChainTypeFromKeypairType(type);
   let specialChain;
   if (!chainInfoMap) {
     return {
@@ -329,7 +352,7 @@ const transformAccounts = accounts => Object.values(accounts).map(data => single
 exports.transformAccounts = transformAccounts;
 const transformAddress = (address, meta) => {
   const type = (0, _keyring.getKeypairTypeByAddress)(address);
-  const chainType = getAccountChainType(type);
+  const chainType = getAccountChainTypeFromKeypairType(type);
   return {
     address,
     ...meta,
@@ -411,6 +434,7 @@ const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
     let tokenTypes = [];
     let accountActions = [];
     let specialChain;
+    let isNeedMigrateUnifiedAccount;
     if (value.accounts.length > 1) {
       accountType = _types2.AccountProxyType.UNIFIED;
       chainTypes = Array.from(value.accounts.reduce((rs, account) => rs.add(account.chainType), new Set()));
@@ -420,6 +444,9 @@ const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
         }
         return rs;
       }, new Set()));
+      if (chainTypes.length < _types2.SUPPORTED_ACCOUNT_CHAIN_TYPES.length) {
+        isNeedMigrateUnifiedAccount = true;
+      }
 
       /* Account actions */
 
@@ -451,6 +478,9 @@ const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
       if (account.chainType === _types2.AccountChainType.TON) {
         accountActions = accountActions.filter(action => action !== _types2.AccountActions.DERIVE);
       }
+      if (chainTypes.length === 1 && accountActions.includes(_types2.AccountActions.EXPORT_MNEMONIC) && account.isMasterAccount && account.type !== 'ton-native') {
+        isNeedMigrateUnifiedAccount = true;
+      }
       switch (account.signMode) {
         case _types2.AccountSignMode.GENERIC_LEDGER:
         case _types2.AccountSignMode.LEGACY_LEDGER:
@@ -464,7 +494,8 @@ const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
       chainTypes,
       specialChain,
       tokenTypes,
-      accountActions
+      accountActions,
+      isNeedMigrateUnifiedAccount
     }];
   }));
   const deepSearchParentId = parentId => {
@@ -543,15 +574,9 @@ const combineAllAccountProxy = accountProxies => {
   const tokenTypes = new Set();
   const specialChain = accountProxies.length === 1 ? accountProxies[0].specialChain : undefined;
   for (const accountProxy of accountProxies) {
-    // Have 4 network types, but at the moment, we only support 3 network types
-    if (chainTypes.size === 3) {
-      break;
-    }
     for (const chainType of accountProxy.chainTypes) {
       chainTypes.add(chainType);
     }
-  }
-  for (const accountProxy of accountProxies) {
     for (const tokenType of accountProxy.tokenTypes) {
       tokenTypes.add(tokenType);
     }

package/cjs/utils/fee/transfer.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.detectTransferTxType = exports.calculateXCMMaxTransferable = exports.calculateTransferMaxTransferable = exports.calculateMaxTransferable = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
+var _consts = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/consts");
+var _cardanoTransfer = require("@subwallet/extension-base/services/balance-service/transfer/cardano-transfer");
 var _smartContract = require("@subwallet/extension-base/services/balance-service/transfer/smart-contract");
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _tonTransfer = require("@subwallet/extension-base/services/balance-service/transfer/ton-transfer");
@@ -39,6 +41,8 @@ const detectTransferTxType = (srcToken, srcChain, destChain) => {
       return 'evm';
     } else if ((0, _utils._isChainTonCompatible)(srcChain) && (0, _utils._isTokenTransferredByTon)(srcToken)) {
       return 'ton';
+    } else if ((0, _utils._isChainCardanoCompatible)(srcChain) && (0, _utils._isTokenTransferredByCardano)(srcToken)) {
+      return 'cardano';
     } else {
       return 'substrate';
     }
@@ -64,6 +68,7 @@ exports.calculateMaxTransferable = calculateMaxTransferable;
 const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) => {
   const {
     address,
+    cardanoApi,
     destChain,
     evmApi,
     feeCustom,
@@ -128,8 +133,21 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
         // currently not used
         tonApi
       });
+    } else if ((0, _keyring.isCardanoAddress)(address) && (0, _utils._isTokenTransferredByCardano)(srcToken)) {
+      const isTransferNativeToken = (0, _utils._isNativeToken)(srcToken);
+      [transaction] = await (0, _cardanoTransfer.createCardanoTransaction)({
+        tokenInfo: srcToken,
+        from: address,
+        to: address,
+        networkKey: srcChain.slug,
+        value: isTransferNativeToken ? '1000000' : '1',
+        cardanoTtlOffset: _consts.DEFAULT_CARDANO_TTL_OFFSET,
+        transferAll: false,
+        cardanoApi,
+        nativeTokenInfo: nativeToken
+      });
     } else {
-      [transaction] = await (0, _token.createTransferExtrinsic)({
+      [transaction] = await (0, _token.createSubstrateExtrinsic)({
         transferAll: false,
         value: '0',
         from: address,
@@ -174,12 +192,27 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
         estimatedFee
       };
     } else {
-      if (transaction && (0, _helpers.isTonTransaction)(transaction)) {
-        estimatedFee = transaction.estimateFee;
-        feeOptions = {
-          ...fee,
-          estimatedFee: estimatedFee
-        };
+      if (transaction) {
+        if ((0, _helpers.isTonTransaction)(transaction)) {
+          estimatedFee = transaction.estimateFee;
+          feeOptions = {
+            ...fee,
+            estimatedFee: estimatedFee
+          };
+        } else if ((0, _helpers.isCardanoTransaction)(transaction)) {
+          estimatedFee = transaction.estimateCardanoFee;
+          feeOptions = {
+            ...fee,
+            estimatedFee: estimatedFee
+          };
+        } else {
+          // Not implemented yet
+          estimatedFee = '0';
+          feeOptions = {
+            ...fee,
+            estimatedFee: '0'
+          };
+        }
       } else {
         // Not implemented yet
         estimatedFee = '0';

package/cjs/utils/index.js

@@ -577,8 +577,8 @@ function isAddressAndChainCompatible(address, chain) {
   const isEvmCompatible = (0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(chain);
   const isTonCompatible = (0, _keyring.isTonAddress)(address) && (0, _utils._isChainTonCompatible)(chain);
   const isSubstrateCompatible = !(0, _utilCrypto.isEthereumAddress)(address) && !(0, _keyring.isTonAddress)(address) && (0, _utils._isChainSubstrateCompatible)(chain); // todo: need isSubstrateAddress util function to check exactly
-
-  return isEvmCompatible || isSubstrateCompatible || isTonCompatible;
+  const isCardanoCompatible = (0, _keyring.isCardanoAddress)(address) && (0, _utils._isChainCardanoCompatible)(chain);
+  return isEvmCompatible || isSubstrateCompatible || isTonCompatible || isCardanoCompatible;
 }
 function getDomainFromUrl(url) {
   return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.remindNotificationTime = 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.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -36,7 +36,10 @@ const remindNotificationTime = require('./remindNotificationTime.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.remindNotificationTime = remindNotificationTime;
 const blockedActions = require('./blockedActions.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.blockedActions = blockedActions;
+const oldChainPrefix = require('./oldChainPrefix.json');
+exports.oldChainPrefix = oldChainPrefix;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
@@ -50,6 +53,7 @@ exports.StaticKey = StaticKey;
   StaticKey["BLOCKED_ACTIONS_FEATURES"] = "blocked-actions-features";
   StaticKey["REMIND_NOTIFICATION_TIME"] = "remind-notification-time";
   StaticKey["BLOCKED_ACTIONS"] = "blocked-actions";
+  StaticKey["OLD_CHAIN_PREFIX"] = "old-chain-prefix";
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
@@ -61,6 +65,7 @@ const staticData = {
   [StaticKey.BUY_TOKEN_CONFIGS]: buyTokenConfigs,
   [StaticKey.BLOCKED_ACTIONS_FEATURES]: blockedActionsFeatures,
   [StaticKey.REMIND_NOTIFICATION_TIME]: remindNotificationTime,
-  [StaticKey.BLOCKED_ACTIONS]: blockedActions
+  [StaticKey.BLOCKED_ACTIONS]: blockedActions,
+  [StaticKey.OLD_CHAIN_PREFIX]: oldChainPrefix
 };
 exports.staticData = staticData;

package/constants/environment.d.ts

@@ -1 +1,2 @@
 export declare const isProductionMode: boolean;
+export declare const BACKEND_API_URL: string;

package/constants/environment.js

@@ -3,4 +3,5 @@
 
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
-export const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
+export const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
+export const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://sw-services.subwallet.app/api'); // TODO: Rollback dev URL

package/constants/signing.js

@@ -6,10 +6,14 @@ import { AccountChainType } from '@subwallet/extension-base/types';
 export const SIGNING_COMPATIBLE_MAP = {
   [ChainType.SUBSTRATE]: [AccountChainType.SUBSTRATE, AccountChainType.ETHEREUM],
   [ChainType.EVM]: [AccountChainType.ETHEREUM],
-  [ChainType.TON]: [AccountChainType.TON]
+  [ChainType.BITCOIN]: [AccountChainType.BITCOIN],
+  [ChainType.TON]: [AccountChainType.TON],
+  [ChainType.CARDANO]: [AccountChainType.CARDANO]
 };
 export const LEDGER_SIGNING_COMPATIBLE_MAP = {
   [ChainType.SUBSTRATE]: [AccountChainType.SUBSTRATE],
   [ChainType.EVM]: [AccountChainType.ETHEREUM],
-  [ChainType.TON]: [AccountChainType.TON]
+  [ChainType.BITCOIN]: [AccountChainType.BITCOIN],
+  [ChainType.TON]: [AccountChainType.TON],
+  [ChainType.CARDANO]: [AccountChainType.CARDANO]
 };

package/core/logic-validation/recipientAddress.js

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ActionType, ValidationCondition } from '@subwallet/extension-base/core/types';
-import { _isAddress, _isNotDuplicateAddress, _isNotNull, _isSupportLedgerAccount, _isValidAddressForEcosystem, _isValidSubstrateAddressFormat, _isValidTonAddressFormat } from '@subwallet/extension-base/core/utils';
+import { _isAddress, _isNotDuplicateAddress, _isNotNull, _isSupportLedgerAccount, _isValidAddressForEcosystem, _isValidCardanoAddressFormat, _isValidSubstrateAddressFormat, _isValidTonAddressFormat } from '@subwallet/extension-base/core/utils';
 import { AccountSignMode } from '@subwallet/extension-base/types';
 import { detectTranslate } from '@subwallet/extension-base/utils';
-import { isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
+import { isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
 function getConditions(validateRecipientParams) {
   const {
     account,
@@ -27,7 +27,10 @@ function getConditions(validateRecipientParams) {
   if (isTonAddress(toAddress)) {
     conditions.push(ValidationCondition.IS_VALID_TON_ADDRESS_FORMAT);
   }
-  if (srcChain === destChainInfo.slug && isSendAction && !destChainInfo.tonInfo) {
+  if (isCardanoAddress(toAddress)) {
+    conditions.push(ValidationCondition.IS_VALID_CARDANO_ADDRESS_FORMAT);
+  }
+  if (srcChain === destChainInfo.slug && isSendAction && !destChainInfo.tonInfo && !destChainInfo.cardanoInfo) {
     conditions.push(ValidationCondition.IS_NOT_DUPLICATE_ADDRESS);
   }
   if (account !== null && account !== void 0 && account.isHardware) {
@@ -67,6 +70,11 @@ function getValidationFunctions(conditions) {
           validationFunctions.push(_isValidTonAddressFormat);
           break;
         }
+      case ValidationCondition.IS_VALID_CARDANO_ADDRESS_FORMAT:
+        {
+          validationFunctions.push(_isValidCardanoAddressFormat);
+          break;
+        }
       case ValidationCondition.IS_NOT_DUPLICATE_ADDRESS:
         {
           validationFunctions.push(_isNotDuplicateAddress);

package/core/logic-validation/transfer.js

@@ -6,14 +6,15 @@ import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { LEDGER_SIGNING_COMPATIBLE_MAP, SIGNING_COMPATIBLE_MAP, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { _canAccountBeReaped, _isAccountActive } from '@subwallet/extension-base/core/substrate/system-pallet';
+import { getCardanoAssetId } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils';
 import { isBounceableAddress } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getAssetDecimals, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isNativeToken, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isCIP26Token, _isNativeToken, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool, FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE } from '@subwallet/extension-base/services/fee-service/utils';
-import { isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
+import { isCardanoTransaction, isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, TransferTxErrorType } from '@subwallet/extension-base/types';
 import { balanceFormatter, combineEthFee, formatNumber, pairToAccount } from '@subwallet/extension-base/utils';
-import { isTonAddress } from '@subwallet/keyring';
+import { isCardanoAddress, isTonAddress } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
@@ -36,6 +37,9 @@ export function validateTransferRequest(tokenInfo, from, to, value, transferAll)
   if (isTonAddress(from) && isTonAddress(to) && _isTokenTonSmartContract(tokenInfo) && _getContractAddressOfToken(tokenInfo).length === 0) {
     errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Not found TEP74 address for this token')));
   }
+  if (isCardanoAddress(from) && isCardanoAddress(to) && _isCIP26Token(tokenInfo) && getCardanoAssetId(tokenInfo).length === 0) {
+    errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Not found policy id of this token')));
+  }
   return errors;
 }
 export function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
@@ -346,6 +350,8 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
         estimateFee.value = (await transaction.paymentInfo(validationResponse.address)).partialFee.toString();
       } else if (isTonTransaction(transaction)) {
         estimateFee.value = transaction.estimateFee; // todo: might need to update logic estimate fee inside for future actions excluding normal transfer Ton and Jetton
+      } else if (isCardanoTransaction(transaction)) {
+        estimateFee.value = transaction.estimateCardanoFee;
       } else {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
         const feeCombine = combineEthFee(feeInfo, validationResponse.feeOption, validationResponse.feeCustom);

package/core/substrate/xcm-parser.d.ts

@@ -1,6 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _Address } from '@subwallet/extension-base/background/KoniTypes';
-export declare function _getXcmDestWeight(originChainInfo: _ChainInfo): 5000000000 | "Unlimited";
+export declare function _getXcmDestWeight(originChainInfo: _ChainInfo): "Unlimited" | 5000000000;
 export declare function _getXcmBeneficiary(destChainInfo: _ChainInfo, recipient: _Address, version: number): {
     [x: string]: {
         parents: number;

package/core/types.d.ts

@@ -7,6 +7,7 @@ export declare enum ValidationCondition {
     IS_VALID_ADDRESS_FOR_ECOSYSTEM = "IS_VALID_ADDRESS_FOR_ECOSYSTEM",
     IS_VALID_SUBSTRATE_ADDRESS_FORMAT = "IS_VALID_SUBSTRATE_ADDRESS_FORMAT",
     IS_VALID_TON_ADDRESS_FORMAT = "IS_VALID_TON_ADDRESS_FORMAT",
+    IS_VALID_CARDANO_ADDRESS_FORMAT = "IS_VALID_CARDANO_ADDRESS_FORMAT",
     IS_NOT_DUPLICATE_ADDRESS = "IS_NOT_DUPLICATE_ADDRESS",
     IS_SUPPORT_LEDGER_ACCOUNT = "IS_SUPPORT_LEDGER_ACCOUNT"
 }

package/core/types.js

@@ -8,6 +8,7 @@ export let ValidationCondition;
   ValidationCondition["IS_VALID_ADDRESS_FOR_ECOSYSTEM"] = "IS_VALID_ADDRESS_FOR_ECOSYSTEM";
   ValidationCondition["IS_VALID_SUBSTRATE_ADDRESS_FORMAT"] = "IS_VALID_SUBSTRATE_ADDRESS_FORMAT";
   ValidationCondition["IS_VALID_TON_ADDRESS_FORMAT"] = "IS_VALID_TON_ADDRESS_FORMAT";
+  ValidationCondition["IS_VALID_CARDANO_ADDRESS_FORMAT"] = "IS_VALID_CARDANO_ADDRESS_FORMAT";
   ValidationCondition["IS_NOT_DUPLICATE_ADDRESS"] = "IS_NOT_DUPLICATE_ADDRESS";
   ValidationCondition["IS_SUPPORT_LEDGER_ACCOUNT"] = "IS_SUPPORT_LEDGER_ACCOUNT";
 })(ValidationCondition || (ValidationCondition = {}));

package/core/utils.d.ts

@@ -10,5 +10,6 @@ export declare function _isAddress(validateRecipientParams: ValidateRecipientPar
 export declare function _isValidAddressForEcosystem(validateRecipientParams: ValidateRecipientParams): string;
 export declare function _isValidSubstrateAddressFormat(validateRecipientParams: ValidateRecipientParams): string;
 export declare function _isValidTonAddressFormat(validateRecipientParams: ValidateRecipientParams): string;
+export declare function _isValidCardanoAddressFormat(validateRecipientParams: ValidateRecipientParams): string;
 export declare function _isNotDuplicateAddress(validateRecipientParams: ValidateRecipientParams): string;
 export declare function _isSupportLedgerAccount(validateRecipientParams: ValidateRecipientParams): string;

package/core/utils.js

@@ -4,9 +4,9 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
 import { tonAddressInfo } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
-import { _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainCardanoCompatible, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { isAddressAndChainCompatible, isSameAddress, reformatAddress } from '@subwallet/extension-base/utils';
-import { isAddress, isTonAddress } from '@subwallet/keyring';
+import { isAddress, isCardanoTestnetAddress, isTonAddress } from '@subwallet/keyring';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export function getStrictMode(type, extrinsicType) {
   if (type === BalanceAccountType.FrameSystemAccountInfo) {
@@ -54,7 +54,7 @@ export function _isValidAddressForEcosystem(validateRecipientParams) {
     toAddress
   } = validateRecipientParams;
   if (!isAddressAndChainCompatible(toAddress, destChainInfo)) {
-    if (_isChainEvmCompatible(destChainInfo) || _isChainSubstrateCompatible(destChainInfo) || _isChainTonCompatible(destChainInfo)) {
+    if (_isChainEvmCompatible(destChainInfo) || _isChainSubstrateCompatible(destChainInfo) || _isChainTonCompatible(destChainInfo) || _isChainCardanoCompatible(destChainInfo)) {
       return 'Recipient address must be the same type as sender address';
     }
     return 'Unknown chain type';
@@ -85,6 +85,16 @@ export function _isValidTonAddressFormat(validateRecipientParams) {
   }
   return '';
 }
+export function _isValidCardanoAddressFormat(validateRecipientParams) {
+  const {
+    destChainInfo,
+    toAddress
+  } = validateRecipientParams;
+  if (isCardanoTestnetAddress(toAddress) !== destChainInfo.isTestnet) {
+    return `Recipient address must be a valid ${destChainInfo.name} address`;
+  }
+  return '';
+}
 export function _isNotDuplicateAddress(validateRecipientParams) {
   const {
     fromAddress,

package/defaults.d.ts

@@ -1,4 +1,4 @@
-declare const ALLOWED_PATH: readonly ["/", "/settings/security", "/transaction-submission", "/accounts/connect-ledger", "/accounts/restore-json", "/accounts/detail", "/accounts/new-seed-phrase"];
+declare const ALLOWED_PATH: readonly ["/", "/settings/security", "/transaction-submission", "/accounts/connect-ledger", "/accounts/restore-json", "/accounts/detail", "/accounts/new-seed-phrase", "/migrate-account"];
 declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
 declare const EXTENSION_PREFIX: string;
 declare const ID_PREFIX: string;

package/defaults.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const ALLOWED_PATH = ['/', '/settings/security', '/transaction-submission', '/accounts/connect-ledger', '/accounts/restore-json', '/accounts/detail', '/accounts/new-seed-phrase'];
+const ALLOWED_PATH = ['/', '/settings/security', '/transaction-submission', '/accounts/connect-ledger', '/accounts/restore-json', '/accounts/detail', '/accounts/new-seed-phrase', '/migrate-account'];
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
 const ID_PREFIX = process.env.ID_PREFIX || EXTENSION_PREFIX || '';

package/koni/api/dotsama/crowdloan.js

@@ -3,10 +3,10 @@
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _FundStatus } from '@subwallet/chain-list/types';
-import { APIItemState, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
+import { APIItemState, ChainType, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ACALA_REFRESH_CROWDLOAN_INTERVAL } from '@subwallet/extension-base/constants';
 import registry from '@subwallet/extension-base/koni/api/dotsama/typeRegistry';
-import { categoryAddresses, fetchJson, reformatAddress } from '@subwallet/extension-base/utils';
+import { fetchJson, getAddressesByChainType, reformatAddress } from '@subwallet/extension-base/utils';
 import { fetchStaticData } from '@subwallet/extension-base/utils/fetchStaticData';
 import { BN } from '@polkadot/util';
 const STATUS_MAP = {
@@ -164,7 +164,7 @@ export async function subscribeCrowdloan(addresses, substrateApiMap, callback) {
     const now = Date.now();
     const polkadotAPI = await substrateApiMap[COMMON_CHAIN_SLUGS.POLKADOT].isReady;
     const kusamaAPI = await substrateApiMap[COMMON_CHAIN_SLUGS.KUSAMA].isReady;
-    const substrateAddresses = categoryAddresses(addresses).substrate;
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     const hexAddresses = substrateAddresses.map(address => {
       return registry.createType('AccountId', address).toHex();
     });

package/koni/api/nft/index.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { AcalaNftApi } from '@subwallet/extension-base/koni/api/nft/acala_nft';
 import AssetHubUniquesPalletApi from '@subwallet/extension-base/koni/api/nft/assethub_unique';
 import { BitCountryNftApi } from '@subwallet/extension-base/koni/api/nft/bit.country';
@@ -10,21 +11,18 @@ import { KaruraNftApi } from '@subwallet/extension-base/koni/api/nft/karura_nft'
 import OrdinalNftApi from '@subwallet/extension-base/koni/api/nft/ordinal_nft';
 import { RmrkNftApi } from '@subwallet/extension-base/koni/api/nft/rmrk_nft';
 import { UniqueNftApi } from '@subwallet/extension-base/koni/api/nft/unique_network_nft';
-// import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
 import { VaraNftApi } from '@subwallet/extension-base/koni/api/nft/vara_nft';
 import { WasmNftApi } from '@subwallet/extension-base/koni/api/nft/wasm_nft';
 import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft, _isSupportOrdinal } from '@subwallet/extension-base/services/chain-service/utils';
-import { categoryAddresses, targetIsWeb } from '@subwallet/extension-base/utils';
+import { getAddressesByChainType, targetIsWeb } from '@subwallet/extension-base/utils';
 import AssetHubNftsPalletApi from "./assethub_nft/index.js";
 import { RariNftApi } from "./rari/index.js";
 import { OdysseyNftApi } from "./story_odyssey_nft/index.js";
 import { TernoaNftApi } from "./ternoa_nft/index.js";
 function createSubstrateNftApi(chain, substrateApi, addresses) {
-  const {
-    evm: evmAddresses,
-    substrate: substrateAddresses
-  } = categoryAddresses(addresses);
+  const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+  const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
   if (_NFT_CHAIN_GROUP.acala.includes(chain)) {
     return [new AcalaNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.karura.includes(chain)) {
@@ -55,11 +53,11 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
   return null;
 }
 function createWasmNftApi(chain, apiProps, addresses) {
-  const substrateAddresses = categoryAddresses(addresses).substrate;
+  const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
   return new WasmNftApi(apiProps, substrateAddresses, chain);
 }
 function createWeb3NftApi(chain, evmApi, addresses) {
-  const evmAddresses = categoryAddresses(addresses).evm;
+  const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
   return new EvmNftApi(evmApi, evmAddresses, chain);
 }
 const createOrdinalApi = (chain, subscanChain, addresses) => {
@@ -93,10 +91,8 @@ export class NftHandler {
   }
   setAddresses(addresses) {
     this.addresses = addresses;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = categoryAddresses(addresses);
+    const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
+    const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
     for (const handler of this.handlers) {
       const useAddresses = handler.isEthereum ? evmAddresses : substrateAddresses;
       handler.setAddresses(useAddresses);
@@ -121,10 +117,8 @@ export class NftHandler {
       if (this.needSetupApi) {
         // setup connections for first time use
         this.handlers = [];
-        const {
-          evm: evmAddresses,
-          substrate: substrateAddresses
-        } = categoryAddresses(this.addresses);
+        const evmAddresses = getAddressesByChainType(this.addresses, [ChainType.EVM]);
+        const substrateAddresses = getAddressesByChainType(this.addresses, [ChainType.SUBSTRATE]);
         Object.entries(this.chainInfoMap).forEach(([chain, chainInfo]) => {
           if (_isChainSupportNativeNft(chainInfo)) {
             if (this.substrateApiMap[chain]) {