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

package/background/KoniTypes.d.ts

@@ -4,6 +4,7 @@ import { Resolver } from '@subwallet/extension-base/background/handlers/State';
 import { AccountAuthType, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountSubscribe, RequestAccountUnsubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList } from '@subwallet/extension-base/background/types';
 import { AppConfig, BrowserConfig, OSConfig } from '@subwallet/extension-base/constants';
 import { RequestOptimalTransferProcess } from '@subwallet/extension-base/services/balance-service/helpers';
+import { CardanoTransactionConfig } from '@subwallet/extension-base/services/balance-service/transfer/cardano-transfer';
 import { TonTransactionConfig } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
@@ -14,7 +15,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalSwapPathParams, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitTransfer, RequestSubscribeTransfer, ResponseSubscribeTransfer } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -320,6 +321,9 @@ export interface UiSettings {
     unlockType: WalletUnlockType;
     enableChainPatrol: boolean;
     notificationSetup: NotificationSetup;
+    isAcknowledgedUnifiedAccountMigration: boolean;
+    isUnifiedAccountMigrationInProgress: boolean;
+    isUnifiedAccountMigrationDone: boolean;
     walletReference: string;
     allowOneSign: boolean;
 }
@@ -369,7 +373,9 @@ export declare enum TransactionDirection {
 export declare enum ChainType {
     EVM = "evm",
     SUBSTRATE = "substrate",
-    TON = "ton"
+    BITCOIN = "bitcoin",
+    TON = "ton",
+    CARDANO = "cardano"
 }
 export declare enum ExtrinsicType {
     TRANSFER_BALANCE = "transfer.balance",
@@ -839,6 +845,11 @@ export interface TonSignRequest {
     hashPayload: string;
     canSign: boolean;
 }
+export interface CardanoSignRequest {
+    account: AccountJson;
+    hashPayload: string;
+    canSign: boolean;
+}
 export interface ErrorValidation {
     message: string;
     name: string;
@@ -848,12 +859,18 @@ export interface EvmSignatureRequest extends EvmSignRequest {
     type: string;
     payload: unknown;
     errors?: ErrorValidation[];
+    processId?: string;
 }
 export interface TonSignatureRequest extends TonSignRequest {
     id: string;
     type: string;
     payload: unknown;
 }
+export interface CardanoSignatureRequest extends CardanoSignRequest {
+    id: string;
+    type: string;
+    payload: unknown;
+}
 export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignRequest {
     estimateGas: string;
     parseData: EvmTransactionData;
@@ -861,8 +878,10 @@ export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignReq
     errors?: ErrorValidation[];
 }
 export declare type TonSendTransactionRequest = TonTransactionConfig;
+export declare type CardanoSendTransactionRequest = CardanoTransactionConfig;
 export declare type EvmWatchTransactionRequest = EvmSendTransactionRequest;
 export declare type TonWatchTransactionRequest = TonSendTransactionRequest;
+export declare type CardanoWatchTransactionRequest = CardanoSendTransactionRequest;
 export interface ConfirmationsQueueItemOptions {
     requiredPassword?: boolean;
     address?: string;
@@ -919,22 +938,35 @@ export interface ConfirmationDefinitionsTon {
     tonSendTransactionRequest: [ConfirmationsQueueItem<TonSendTransactionRequest>, ConfirmationResult<string>];
     tonWatchTransactionRequest: [ConfirmationsQueueItem<TonWatchTransactionRequest>, ConfirmationResult<string>];
 }
+export interface ConfirmationDefinitionsCardano {
+    cardanoSignatureRequest: [ConfirmationsQueueItem<CardanoSignatureRequest>, ConfirmationResult<string>];
+    cardanoSendTransactionRequest: [ConfirmationsQueueItem<CardanoSendTransactionRequest>, ConfirmationResult<string>];
+    cardanoWatchTransactionRequest: [ConfirmationsQueueItem<CardanoWatchTransactionRequest>, ConfirmationResult<string>];
+}
 export declare type ConfirmationType = keyof ConfirmationDefinitions;
 export declare type ConfirmationTypeTon = keyof ConfirmationDefinitionsTon;
+export declare type ConfirmationTypeCardano = keyof ConfirmationDefinitionsCardano;
 export declare type ConfirmationsQueue = {
     [CT in ConfirmationType]: Record<string, ConfirmationDefinitions[CT][0]>;
 };
 export declare type ConfirmationsQueueTon = {
     [CT in ConfirmationTypeTon]: Record<string, ConfirmationDefinitionsTon[CT][0]>;
 };
+export declare type ConfirmationsQueueCardano = {
+    [CT in ConfirmationTypeCardano]: Record<string, ConfirmationDefinitionsCardano[CT][0]>;
+};
 export declare type RequestConfirmationsSubscribe = null;
 export declare type RequestConfirmationsSubscribeTon = null;
+export declare type RequestConfirmationsSubscribeCardano = null;
 export declare type RequestConfirmationComplete = {
     [CT in ConfirmationType]?: ConfirmationDefinitions[CT][1];
 };
 export declare type RequestConfirmationCompleteTon = {
     [CT in ConfirmationTypeTon]?: ConfirmationDefinitionsTon[CT][1];
 };
+export declare type RequestConfirmationCompleteCardano = {
+    [CT in ConfirmationTypeCardano]?: ConfirmationDefinitionsCardano[CT][1];
+};
 export interface BondingOptionParams {
     chain: string;
     type: StakingType;
@@ -1451,6 +1483,38 @@ export interface ResponseNftImport {
     success: boolean;
     error: string;
 }
+export interface RequestSaveMigrationAcknowledgedStatus {
+    isAcknowledgedUnifiedAccountMigration: boolean;
+}
+export interface RequestSaveUnifiedAccountMigrationInProgress {
+    isUnifiedAccountMigrationInProgress: boolean;
+}
+export interface RequestMigrateUnifiedAndFetchEligibleSoloAccounts {
+    password: string;
+}
+export interface ResponseMigrateUnifiedAndFetchEligibleSoloAccounts {
+    migratedUnifiedAccountIds: string[];
+    soloAccounts: Record<string, SoloAccountToBeMigrated[]>;
+    sessionId: string;
+}
+export interface SoloAccountToBeMigrated {
+    upcomingProxyId: string;
+    proxyId: string;
+    address: string;
+    name: string;
+    chainType: AccountChainType;
+}
+export interface RequestMigrateSoloAccount {
+    soloAccounts: SoloAccountToBeMigrated[];
+    accountName: string;
+    sessionId: string;
+}
+export interface ResponseMigrateSoloAccount {
+    migratedUnifiedAccountId: string;
+}
+export interface RequestPingSession {
+    sessionId: string;
+}
 export declare type _Address = string;
 export declare type _BalanceMetadata = unknown;
 export interface KoniRequestSignatures {
@@ -1583,6 +1647,9 @@ export interface KoniRequestSignatures {
     'pri(settings.saveUnlockType)': [RequestUnlockType, boolean];
     'pri(settings.saveEnableChainPatrol)': [RequestChangeEnableChainPatrol, boolean];
     'pri(settings.saveNotificationSetup)': [NotificationSetup, boolean];
+    'pri(settings.saveUnifiedAccountMigrationInProgress)': [RequestSaveUnifiedAccountMigrationInProgress, boolean];
+    'pri(settings.pingUnifiedAccountMigrationDone)': [null, boolean];
+    'pri(settings.saveMigrationAcknowledgedStatus)': [RequestSaveMigrationAcknowledgedStatus, boolean];
     'pri(settings.saveLanguage)': [RequestChangeLanguage, boolean];
     'pri(settings.savePriceCurrency)': [RequestChangePriceCurrency, boolean];
     'pri(settings.saveShowZeroBalance)': [RequestChangeShowZeroBalance, boolean];
@@ -1629,8 +1696,10 @@ export interface KoniRequestSignatures {
     'pri(customFee.getAmountForPair)': [RequestGetAmountForPair, string];
     'pri(confirmations.subscribe)': [RequestConfirmationsSubscribe, ConfirmationsQueue, ConfirmationsQueue];
     'pri(confirmationsTon.subscribe)': [RequestConfirmationsSubscribeTon, ConfirmationsQueueTon, ConfirmationsQueueTon];
+    'pri(confirmationsCardano.subscribe)': [RequestConfirmationsSubscribeCardano, ConfirmationsQueueCardano, ConfirmationsQueueCardano];
     'pri(confirmations.complete)': [RequestConfirmationComplete, boolean];
     'pri(confirmationsTon.complete)': [RequestConfirmationCompleteTon, boolean];
+    'pri(confirmationsCardano.complete)': [RequestConfirmationCompleteCardano, boolean];
     'pub(utils.getRandom)': [RandomTestRequest, number];
     'pub(accounts.listV2)': [RequestAccountList, InjectedAccount[]];
     'pub(accounts.subscribeV2)': [RequestAccountSubscribe, string, InjectedAccount[]];
@@ -1701,6 +1770,7 @@ export interface KoniRequestSignatures {
     'pri(database.setLocalStorage)': [StorageDataInterface, boolean];
     'pri(database.getLocalStorage)': [string, string | null];
     'pri(swapService.subscribePairs)': [null, SwapPair[], SwapPair[]];
+    'pri(swapService.generateOptimalProcess)': [OptimalSwapPathParams, CommonOptimalPath];
     'pri(swapService.handleSwapRequest)': [SwapRequest, SwapRequestResult];
     'pri(swapService.handleSwapStep)': [SwapSubmitParams, SWTransactionResponse];
     'pri(swapService.getLatestQuote)': [SwapRequest, SwapQuoteResponse];
@@ -1718,6 +1788,9 @@ export interface KoniRequestSignatures {
     'pri(process.transaction.submit)': [RequestSubmitProcessTransaction, SWTransactionResponse];
     'pri(process.subscribe.id)': [RequestSubscribeProcessById, ResponseSubscribeProcessById, ResponseSubscribeProcessById];
     'pri(process.subscribe.alive)': [null, ResponseSubscribeProcessAlive, ResponseSubscribeProcessAlive];
+    'pri(migrate.migrateUnifiedAndFetchEligibleSoloAccounts)': [RequestMigrateUnifiedAndFetchEligibleSoloAccounts, ResponseMigrateUnifiedAndFetchEligibleSoloAccounts];
+    'pri(migrate.migrateSoloAccount)': [RequestMigrateSoloAccount, ResponseMigrateSoloAccount];
+    'pri(migrate.pingSession)': [RequestPingSession, boolean];
 }
 export interface ApplicationMetadataType {
     version: string;

package/background/KoniTypes.js

@@ -62,7 +62,9 @@ export let ChainType;
 (function (ChainType) {
   ChainType["EVM"] = "evm";
   ChainType["SUBSTRATE"] = "substrate";
+  ChainType["BITCOIN"] = "bitcoin";
   ChainType["TON"] = "ton";
+  ChainType["CARDANO"] = "cardano";
 })(ChainType || (ChainType = {}));
 export let ExtrinsicType;
 (function (ExtrinsicType) {

package/cjs/background/KoniTypes.js

@@ -76,7 +76,9 @@ exports.ChainType = ChainType;
 (function (ChainType) {
   ChainType["EVM"] = "evm";
   ChainType["SUBSTRATE"] = "substrate";
+  ChainType["BITCOIN"] = "bitcoin";
   ChainType["TON"] = "ton";
+  ChainType["CARDANO"] = "cardano";
 })(ChainType || (exports.ChainType = ChainType = {}));
 let ExtrinsicType;
 exports.ExtrinsicType = ExtrinsicType;

package/cjs/constants/environment.js

@@ -3,11 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isProductionMode = void 0;
+exports.isProductionMode = exports.BACKEND_API_URL = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
-exports.isProductionMode = isProductionMode;
+exports.isProductionMode = isProductionMode;
+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
+exports.BACKEND_API_URL = BACKEND_API_URL;

package/cjs/constants/signing.js

@@ -12,12 +12,16 @@ var _types = require("@subwallet/extension-base/types");
 const SIGNING_COMPATIBLE_MAP = {
   [_KoniTypes.ChainType.SUBSTRATE]: [_types.AccountChainType.SUBSTRATE, _types.AccountChainType.ETHEREUM],
   [_KoniTypes.ChainType.EVM]: [_types.AccountChainType.ETHEREUM],
-  [_KoniTypes.ChainType.TON]: [_types.AccountChainType.TON]
+  [_KoniTypes.ChainType.BITCOIN]: [_types.AccountChainType.BITCOIN],
+  [_KoniTypes.ChainType.TON]: [_types.AccountChainType.TON],
+  [_KoniTypes.ChainType.CARDANO]: [_types.AccountChainType.CARDANO]
 };
 exports.SIGNING_COMPATIBLE_MAP = SIGNING_COMPATIBLE_MAP;
 const LEDGER_SIGNING_COMPATIBLE_MAP = {
   [_KoniTypes.ChainType.SUBSTRATE]: [_types.AccountChainType.SUBSTRATE],
   [_KoniTypes.ChainType.EVM]: [_types.AccountChainType.ETHEREUM],
-  [_KoniTypes.ChainType.TON]: [_types.AccountChainType.TON]
+  [_KoniTypes.ChainType.BITCOIN]: [_types.AccountChainType.BITCOIN],
+  [_KoniTypes.ChainType.TON]: [_types.AccountChainType.TON],
+  [_KoniTypes.ChainType.CARDANO]: [_types.AccountChainType.CARDANO]
 };
 exports.LEDGER_SIGNING_COMPATIBLE_MAP = LEDGER_SIGNING_COMPATIBLE_MAP;

package/cjs/core/logic-validation/recipientAddress.js

@@ -33,7 +33,10 @@ function getConditions(validateRecipientParams) {
   if ((0, _keyring.isTonAddress)(toAddress)) {
     conditions.push(_types.ValidationCondition.IS_VALID_TON_ADDRESS_FORMAT);
   }
-  if (srcChain === destChainInfo.slug && isSendAction && !destChainInfo.tonInfo) {
+  if ((0, _keyring.isCardanoAddress)(toAddress)) {
+    conditions.push(_types.ValidationCondition.IS_VALID_CARDANO_ADDRESS_FORMAT);
+  }
+  if (srcChain === destChainInfo.slug && isSendAction && !destChainInfo.tonInfo && !destChainInfo.cardanoInfo) {
     conditions.push(_types.ValidationCondition.IS_NOT_DUPLICATE_ADDRESS);
   }
   if (account !== null && account !== void 0 && account.isHardware) {
@@ -73,6 +76,11 @@ function getValidationFunctions(conditions) {
           validationFunctions.push(_utils._isValidTonAddressFormat);
           break;
         }
+      case _types.ValidationCondition.IS_VALID_CARDANO_ADDRESS_FORMAT:
+        {
+          validationFunctions.push(_utils._isValidCardanoAddressFormat);
+          break;
+        }
       case _types.ValidationCondition.IS_NOT_DUPLICATE_ADDRESS:
         {
           validationFunctions.push(_utils._isNotDuplicateAddress);

package/cjs/core/logic-validation/transfer.js

@@ -20,13 +20,14 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _constants = require("@subwallet/extension-base/constants");
 var _systemPallet = require("@subwallet/extension-base/core/substrate/system-pallet");
-var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
+var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils");
+var _utils2 = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils4 = require("@subwallet/extension-base/services/fee-service/utils");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _types = require("@subwallet/extension-base/types");
-var _utils4 = require("@subwallet/extension-base/utils");
+var _utils5 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -46,17 +47,20 @@ function validateTransferRequest(tokenInfo, from, to, value, transferAll) {
   if (!tokenInfo) {
     errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found token from registry')));
   }
-  if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils2._isTokenEvmSmartContract)(tokenInfo) && (0, _utils2._getContractAddressOfToken)(tokenInfo).length === 0) {
+  if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils3._isTokenEvmSmartContract)(tokenInfo) && (0, _utils3._getContractAddressOfToken)(tokenInfo).length === 0) {
     errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found ERC20 address for this token')));
   }
-  if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils2._isTokenTonSmartContract)(tokenInfo) && (0, _utils2._getContractAddressOfToken)(tokenInfo).length === 0) {
+  if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils3._isTokenTonSmartContract)(tokenInfo) && (0, _utils3._getContractAddressOfToken)(tokenInfo).length === 0) {
     errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found TEP74 address for this token')));
   }
+  if ((0, _keyring.isCardanoAddress)(from) && (0, _keyring.isCardanoAddress)(to) && (0, _utils3._isCIP26Token)(tokenInfo) && (0, _utils.getCardanoAssetId)(tokenInfo).length === 0) {
+    errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found policy id of this token')));
+  }
   return errors;
 }
 function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
-  const sendingTokenMinAmount = BigInt((0, _utils2._getTokenMinAmount)(sendingTokenInfo));
-  const nativeTokenMinAmount = (0, _utils2._getTokenMinAmount)(nativeTokenInfo);
+  const sendingTokenMinAmount = BigInt((0, _utils3._getTokenMinAmount)(sendingTokenInfo));
+  const nativeTokenMinAmount = (0, _utils3._getTokenMinAmount)(nativeTokenInfo);
   const warnings = [];
   const errors = [];
   const remainingSendingTokenOfSenderEnoughED = senderSendingTokenTransferable ? senderSendingTokenTransferable - transferAmount >= sendingTokenMinAmount : false;
@@ -68,8 +72,8 @@ function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInf
       warnings.push(warning);
     }
     if (!isReceiverAliveByNativeToken && !isSendingTokenSufficient) {
-      const balanceKeepAlive = (0, _utils4.formatNumber)(nativeTokenMinAmount, (0, _utils2._getAssetDecimals)(nativeTokenInfo), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(nativeTokenInfo) || 6
+      const balanceKeepAlive = (0, _utils5.formatNumber)(nativeTokenMinAmount, (0, _utils3._getAssetDecimals)(nativeTokenInfo), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(nativeTokenInfo) || 6
       });
       const error = new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('The recipient account has less than {{amount}} {{nativeSymbol}}, which can lead to your {{localSymbol}} being lost. Change recipient account and try again', {
         replace: {
@@ -82,8 +86,8 @@ function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInf
     }
     if (!isReceivingAmountPassED) {
       const atLeast = sendingTokenMinAmount - receiverSendingTokenKeepAliveBalance;
-      const atLeastStr = (0, _utils4.formatNumber)(atLeast.toString(), (0, _utils2._getAssetDecimals)(sendingTokenInfo), _utils4.balanceFormatter, {
-        maxNumberFormat: (0, _utils2._getAssetDecimals)(sendingTokenInfo) || 6
+      const atLeastStr = (0, _utils5.formatNumber)(atLeast.toString(), (0, _utils3._getAssetDecimals)(sendingTokenInfo), _utils5.balanceFormatter, {
+        maxNumberFormat: (0, _utils3._getAssetDecimals)(sendingTokenInfo) || 6
       });
       const error = new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to avoid losing funds on the recipient account. Increase amount and try again', {
         replace: {
@@ -96,8 +100,8 @@ function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInf
   }
   if (!isReceivingAmountPassED) {
     const atLeast = sendingTokenMinAmount - receiverSendingTokenKeepAliveBalance;
-    const atLeastStr = (0, _utils4.formatNumber)(atLeast.toString(), (0, _utils2._getAssetDecimals)(sendingTokenInfo), _utils4.balanceFormatter, {
-      maxNumberFormat: (0, _utils2._getAssetDecimals)(sendingTokenInfo) || 6
+    const atLeastStr = (0, _utils5.formatNumber)(atLeast.toString(), (0, _utils3._getAssetDecimals)(sendingTokenInfo), _utils5.balanceFormatter, {
+      maxNumberFormat: (0, _utils3._getAssetDecimals)(sendingTokenInfo) || 6
     });
     const error = new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the recipient account alive. Increase amount and try again', {
       replace: {
@@ -121,14 +125,14 @@ function validateXcmTransferRequest(destTokenInfo, sender, sendingValue) {
 }
 function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, sendingAmount, senderTransferable, receiverNativeBalance, destChainInfo) {
   let isSnowBridge = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  const destMinAmount = (0, _utils2._getTokenMinAmount)(destinationTokenInfo);
+  const destMinAmount = (0, _utils3._getTokenMinAmount)(destinationTokenInfo);
   const minSendingRequired = new _bignumber.default(destMinAmount).multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO);
   let error;
   let warning;
 
   // Check sending token ED for receiver
   if (new _bignumber.default(sendingAmount).lt(minSendingRequired)) {
-    const atLeastStr = (0, _utils4.formatNumber)(minSendingRequired, destinationTokenInfo.decimals || 0, _utils4.balanceFormatter, {
+    const atLeastStr = (0, _utils5.formatNumber)(minSendingRequired, destinationTokenInfo.decimals || 0, _utils5.balanceFormatter, {
       maxNumberFormat: destinationTokenInfo.decimals || 6
     });
     error = new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
@@ -140,13 +144,13 @@ function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, se
   }
 
   // check native token ED on dest chain for receiver
-  const bnKeepAliveBalance = (0, _utils2._isNativeToken)(destinationTokenInfo) ? new _bignumber.default(receiverNativeBalance).plus(sendingAmount) : new _bignumber.default(receiverNativeBalance);
-  if (isSnowBridge && bnKeepAliveBalance.lt((0, _utils2._getChainExistentialDeposit)(destChainInfo))) {
+  const bnKeepAliveBalance = (0, _utils3._isNativeToken)(destinationTokenInfo) ? new _bignumber.default(receiverNativeBalance).plus(sendingAmount) : new _bignumber.default(receiverNativeBalance);
+  if (isSnowBridge && bnKeepAliveBalance.lt((0, _utils3._getChainExistentialDeposit)(destChainInfo))) {
     const {
       decimals,
       symbol
-    } = (0, _utils2._getChainNativeTokenBasicInfo)(destChainInfo);
-    const atLeastStr = (0, _utils4.formatNumber)((0, _utils2._getChainExistentialDeposit)(destChainInfo), decimals || 0, _utils4.balanceFormatter, {
+    } = (0, _utils3._getChainNativeTokenBasicInfo)(destChainInfo);
+    const atLeastStr = (0, _utils5.formatNumber)((0, _utils3._getChainExistentialDeposit)(destChainInfo), decimals || 0, _utils5.balanceFormatter, {
       maxNumberFormat: 6
     });
     error = new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)(' Insufficient {{symbol}} on {{chain}} to cover min balance ({{amount}} {{symbol}})', {
@@ -159,8 +163,8 @@ function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, se
   }
 
   // Check ed for sender
-  if (!(0, _utils2._isNativeToken)(originTokenInfo)) {
-    if (new _bignumber.default(senderTransferable).minus(sendingAmount).lt((0, _utils2._getTokenMinAmount)(originTokenInfo))) {
+  if (!(0, _utils3._isNativeToken)(originTokenInfo)) {
+    if (new _bignumber.default(senderTransferable).minus(sendingAmount).lt((0, _utils3._getTokenMinAmount)(originTokenInfo))) {
       warning = new _TransactionWarning.TransactionWarning(_types.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
     }
   }
@@ -354,7 +358,7 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
   const {
     decimals,
     symbol
-  } = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
+  } = (0, _utils3._getChainNativeTokenBasicInfo)(chainInfo);
   estimateFee.decimals = decimals;
   estimateFee.symbol = symbol;
   if (transaction) {
@@ -363,9 +367,11 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
         estimateFee.value = (await transaction.paymentInfo(validationResponse.address)).partialFee.toString();
       } else if ((0, _helpers.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 ((0, _helpers.isCardanoTransaction)(transaction)) {
+        estimateFee.value = transaction.estimateCardanoFee;
       } else {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
-        const feeCombine = (0, _utils4.combineEthFee)(feeInfo, validationResponse.feeOption, validationResponse.feeCustom);
+        const feeCombine = (0, _utils5.combineEthFee)(feeInfo, validationResponse.feeOption, validationResponse.feeCustom);
         if (transaction.maxFeePerGas) {
           estimateFee.value = new _bignumber.default(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
         } else if (transaction.gasPrice) {
@@ -389,10 +395,10 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
     }
   }
   if (tokenPayFeeInfo) {
-    const estimatedFeeAmount = isTransferLocalTokenAndPayThatTokenAsFee ? (BigInt(estimateFee.value) * BigInt(_utils3.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString() : estimateFee.value;
+    const estimatedFeeAmount = isTransferLocalTokenAndPayThatTokenAsFee ? (BigInt(estimateFee.value) * BigInt(_utils4.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString() : estimateFee.value;
     estimateFee.decimals = tokenPayFeeInfo.decimals || 0;
     estimateFee.symbol = tokenPayFeeInfo.symbol;
-    estimateFee.value = await (0, _utils3.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, tokenPayFeeInfo, estimatedFeeAmount);
+    estimateFee.value = await (0, _utils4.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, tokenPayFeeInfo, estimatedFeeAmount);
   }
   return estimateFee;
 }
@@ -407,7 +413,7 @@ function checkSigningAccountForTransaction(validationResponse, chainInfoMap) {
   if (!pair) {
     validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR, (0, _i18next.t)('Unable to find account')));
   } else {
-    const accountJson = (0, _utils4.pairToAccount)(pair, chainInfoMap);
+    const accountJson = (0, _utils5.pairToAccount)(pair, chainInfoMap);
     if (!accountJson.transactionActions.includes(extrinsicType)) {
       // check if the account can sign the transaction type
       validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('This feature is not available with this account')));
@@ -451,7 +457,7 @@ function checkBalanceWithTransactionFee(validationResponse, transactionInput, na
 
   // todo: only system.pallet has metadata, we should add for other pallets and mechanisms as well
   const isNeedCheckRemainingBalance = !isTransferAll && extrinsicType === _KoniTypes.ExtrinsicType.TRANSFER_BALANCE && nativeTokenAvailable.metadata && (0, _systemPallet._canAccountBeReaped)(nativeTokenAvailable.metadata);
-  const isRemainingBalanceValid = bnNativeTokenAvailable.minus(bnNativeTokenTransferAmount).minus(bnFee).lt((0, _utils2._getTokenMinAmount)(nativeTokenInfo));
+  const isRemainingBalanceValid = bnNativeTokenAvailable.minus(bnNativeTokenTransferAmount).minus(bnFee).lt((0, _utils3._getTokenMinAmount)(nativeTokenInfo));
   if (isNeedCheckRemainingBalance && isRemainingBalanceValid) {
     edAsWarning ? validationResponse.warnings.push(new _TransactionWarning.TransactionWarning(_types.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT)) : validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
   }
@@ -466,7 +472,7 @@ async function checkTonAddressBounceableAndAccountNotActive(tonApi, validationRe
   }
 }
 function isTonAddressBounceable(address) {
-  return (0, _utils.isBounceableAddress)(address);
+  return (0, _utils2.isBounceableAddress)(address);
 }
 async function isAccountActive(tonApi, address) {
   const state = await tonApi.getAccountState(address);

package/cjs/core/types.js

@@ -14,6 +14,7 @@ exports.ValidationCondition = 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 || (exports.ValidationCondition = ValidationCondition = {}));

package/cjs/core/utils.js

@@ -9,6 +9,7 @@ exports._isNotDuplicateAddress = _isNotDuplicateAddress;
 exports._isNotNull = _isNotNull;
 exports._isSupportLedgerAccount = _isSupportLedgerAccount;
 exports._isValidAddressForEcosystem = _isValidAddressForEcosystem;
+exports._isValidCardanoAddressFormat = _isValidCardanoAddressFormat;
 exports._isValidSubstrateAddressFormat = _isValidSubstrateAddressFormat;
 exports._isValidTonAddressFormat = _isValidTonAddressFormat;
 exports.getMaxBigInt = getMaxBigInt;
@@ -70,7 +71,7 @@ function _isValidAddressForEcosystem(validateRecipientParams) {
     toAddress
   } = validateRecipientParams;
   if (!(0, _utils3.isAddressAndChainCompatible)(toAddress, destChainInfo)) {
-    if ((0, _utils2._isChainEvmCompatible)(destChainInfo) || (0, _utils2._isChainSubstrateCompatible)(destChainInfo) || (0, _utils2._isChainTonCompatible)(destChainInfo)) {
+    if ((0, _utils2._isChainEvmCompatible)(destChainInfo) || (0, _utils2._isChainSubstrateCompatible)(destChainInfo) || (0, _utils2._isChainTonCompatible)(destChainInfo) || (0, _utils2._isChainCardanoCompatible)(destChainInfo)) {
       return 'Recipient address must be the same type as sender address';
     }
     return 'Unknown chain type';
@@ -101,6 +102,16 @@ function _isValidTonAddressFormat(validateRecipientParams) {
   }
   return '';
 }
+function _isValidCardanoAddressFormat(validateRecipientParams) {
+  const {
+    destChainInfo,
+    toAddress
+  } = validateRecipientParams;
+  if ((0, _keyring.isCardanoTestnetAddress)(toAddress) !== destChainInfo.isTestnet) {
+    return `Recipient address must be a valid ${destChainInfo.name} address`;
+  }
+  return '';
+}
 function _isNotDuplicateAddress(validateRecipientParams) {
   const {
     fromAddress,

package/cjs/defaults.js

@@ -7,7 +7,7 @@ exports.PORT_MOBILE = exports.PORT_EXTENSION = exports.PORT_CONTENT = exports.PH
 // 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'];
 exports.ALLOWED_PATH = ALLOWED_PATH;
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 exports.PHISHING_PAGE_REDIRECT = PHISHING_PAGE_REDIRECT;

package/cjs/koni/api/dotsama/crowdloan.js

@@ -172,7 +172,7 @@ async function subscribeCrowdloan(addresses, substrateApiMap, callback) {
     const now = Date.now();
     const polkadotAPI = await substrateApiMap[_chainList.COMMON_CHAIN_SLUGS.POLKADOT].isReady;
     const kusamaAPI = await substrateApiMap[_chainList.COMMON_CHAIN_SLUGS.KUSAMA].isReady;
-    const substrateAddresses = (0, _utils.categoryAddresses)(addresses).substrate;
+    const substrateAddresses = (0, _utils.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const hexAddresses = substrateAddresses.map(address => {
       return _typeRegistry.default.createType('AccountId', address).toHex();
     });

package/cjs/koni/api/nft/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NftHandler = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _acala_nft = require("@subwallet/extension-base/koni/api/nft/acala_nft");
 var _assethub_unique = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/assethub_unique"));
 var _bit = require("@subwallet/extension-base/koni/api/nft/bit.country");
@@ -26,13 +27,9 @@ var _ternoa_nft = require("./ternoa_nft");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
-
 function createSubstrateNftApi(chain, substrateApi, addresses) {
-  const {
-    evm: evmAddresses,
-    substrate: substrateAddresses
-  } = (0, _utils2.categoryAddresses)(addresses);
+  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+  const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   if (_constants._NFT_CHAIN_GROUP.acala.includes(chain)) {
     return [new _acala_nft.AcalaNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.karura.includes(chain)) {
@@ -63,11 +60,11 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
   return null;
 }
 function createWasmNftApi(chain, apiProps, addresses) {
-  const substrateAddresses = (0, _utils2.categoryAddresses)(addresses).substrate;
+  const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   return new _wasm_nft.WasmNftApi(apiProps, substrateAddresses, chain);
 }
 function createWeb3NftApi(chain, evmApi, addresses) {
-  const evmAddresses = (0, _utils2.categoryAddresses)(addresses).evm;
+  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
   return new _evm_nft.EvmNftApi(evmApi, evmAddresses, chain);
 }
 const createOrdinalApi = (chain, subscanChain, addresses) => {
@@ -101,10 +98,8 @@ class NftHandler {
   }
   setAddresses(addresses) {
     this.addresses = addresses;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     for (const handler of this.handlers) {
       const useAddresses = handler.isEthereum ? evmAddresses : substrateAddresses;
       handler.setAddresses(useAddresses);
@@ -129,10 +124,8 @@ class NftHandler {
       if (this.needSetupApi) {
         // setup connections for first time use
         this.handlers = [];
-        const {
-          evm: evmAddresses,
-          substrate: substrateAddresses
-        } = (0, _utils2.categoryAddresses)(this.addresses);
+        const evmAddresses = (0, _utils2.getAddressesByChainType)(this.addresses, [_KoniTypes.ChainType.EVM]);
+        const substrateAddresses = (0, _utils2.getAddressesByChainType)(this.addresses, [_KoniTypes.ChainType.SUBSTRATE]);
         Object.entries(this.chainInfoMap).forEach(_ref => {
           let [chain, chainInfo] = _ref;
           if ((0, _utils._isChainSupportNativeNft)(chainInfo)) {

package/cjs/koni/api/staking/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getNominationStakingRewardData = getNominationStakingRewardData;
 exports.getPoolingStakingRewardData = getPoolingStakingRewardData;
 exports.stakingOnChainApi = stakingOnChainApi;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/relayChain");
 var _subsquidStaking = require("@subwallet/extension-base/koni/api/staking/subsquidStaking");
@@ -18,10 +19,8 @@ var _utils2 = require("@subwallet/extension-base/utils");
 
 function stakingOnChainApi(addresses, substrateApiMap, chainInfoMap, stakingCallback, nominatorStateCallback) {
   const filteredApiMap = [];
-  const {
-    evm: evmAddresses,
-    substrate: substrateAddresses
-  } = (0, _utils2.categoryAddresses)(addresses);
+  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+  const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   Object.entries(chainInfoMap).forEach(_ref => {
     let [networkKey, chainInfo] = _ref;
     if (_constants._PURE_EVM_CHAINS.indexOf(networkKey) < 0 && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {