@subwallet/extension-base 1.3.36-0 → 1.3.37-0

package/background/KoniTypes.d.ts

@@ -98,6 +98,11 @@ export interface ResultResolver {
     result: boolean;
     accounts: string[];
 }
+export interface RequestSwitchCurrentNetworkAuthorization {
+    url: string;
+    networkKey: string;
+    authSwitchNetworkType: AccountAuthType;
+}
 export declare enum StakingType {
     NOMINATED = "nominated",
     POOLED = "pooled",

package/background/types.d.ts

@@ -4,7 +4,7 @@ import type { KeyringPairs$Json } from '@subwallet/ui-keyring/types';
 import type { JsonRpcResponse } from '@polkadot/rpc-provider/types';
 import type { SignerPayloadJSON, SignerPayloadRaw } from '@polkadot/types/types';
 import type { HexString } from '@polkadot/util/types';
-import { KoniRequestSignatures, NetworkJson } from '@subwallet/extension-base/background/KoniTypes';
+import { KoniRequestSignatures, NetworkJson, RequestSwitchCurrentNetworkAuthorization } from '@subwallet/extension-base/background/KoniTypes';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { AccountJson } from '@subwallet/extension-base/types';
 import { TypeRegistry } from '@polkadot/types';
@@ -68,6 +68,7 @@ export interface RequestSignatures extends KoniRequestSignatures {
     'pri(authorize.reject)': [RequestAuthorizeReject, boolean];
     'pri(authorize.requests)': [RequestAuthorizeSubscribe, boolean, AuthorizeRequest[]];
     'pri(authorize.toggle)': [string, ResponseAuthorizeList];
+    'pri(authorize.switchCurrentNetwork)': [RequestSwitchCurrentNetworkAuthorization, ResponseAuthorizeList];
     'pri(derivation.create)': [RequestDeriveCreate, boolean];
     'pri(derivation.validate)': [RequestDeriveValidate, ResponseDeriveValidate];
     'pri(json.batchRestore)': [RequestBatchRestore, void];

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

@@ -24,6 +24,7 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _types = require("@subwallet/extension-base/types");
 var _utils = require("@subwallet/extension-base/utils");
+var _cardano = require("@subwallet/extension-base/utils/cardano");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
@@ -567,8 +568,10 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
 async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   const {
     address,
+    authInfo,
     errors,
-    pair: pair_
+    pair: pair_,
+    type
   } = payload_;
   const payload = payload_.payloadAfterValidated;
   const {
@@ -590,6 +593,15 @@ async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   if (!(0, _keyring.isCardanoAddress)(address)) {
     handleError('Not found cardano address');
   }
+  const currentCardanoNetwork = koni.requestService.getDAppChainInfo({
+    autoActive: true,
+    accessType: 'cardano',
+    defaultChain: authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap[type],
+    url
+  });
+  if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
+    handleError('Invalid address network');
+  }
   const pair = pair_ || _uiKeyring.keyring.getPair(address);
   if (!(pair !== null && pair !== void 0 && pair.meta.isExtneral)) {
     canSign = true;

package/cjs/koni/background/handlers/Extension.js

@@ -682,6 +682,64 @@ class KoniExtension {
       });
     });
   }
+  async switchCurrentNetworkAuthorization(_ref19) {
+    let {
+      authSwitchNetworkType,
+      networkKey,
+      url
+    } = _ref19;
+    const authUrls = await this.#koniState.getAuthList();
+    const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+    const chainState = this.#koniState.getChainStateByKey(networkKey);
+    const {
+      promise,
+      resolve
+    } = (0, _utils7.createPromiseHandler)();
+    const typeInfoMap = {
+      substrate: 'substrateInfo',
+      evm: 'evmInfo',
+      cardano: 'cardanoInfo',
+      ton: 'tonInfo'
+    };
+    const typeInfoKey = typeInfoMap[authSwitchNetworkType];
+    if (!typeInfoKey || !chainInfo[typeInfoKey]) {
+      throw new Error((0, _i18next.t)('Network {{networkKey}} is not {{authSwitchNetworkType}}', {
+        replace: {
+          networkKey,
+          authSwitchNetworkType
+        }
+      }));
+    }
+    const authUrl = authUrls[url];
+    if (!authUrl) {
+      throw new Error((0, _i18next.t)('Not found {{url}} in auth list', {
+        replace: {
+          url
+        }
+      }));
+    }
+    if (chainInfo && !(0, _utils5._isChainEnabled)(chainState)) {
+      await this.enableChainWithPriorityAssets({
+        chainSlug: networkKey,
+        enableTokens: true
+      });
+    }
+    if (!authUrl.accountAuthTypes.includes(authSwitchNetworkType)) {
+      throw new Error((0, _i18next.t)('Network {{networkKey}} is not supported by {{authSwitchNetworkType}}', {
+        replace: {
+          networkKey,
+          authSwitchNetworkType
+        }
+      }));
+    }
+    authUrl.currentNetworkMap[authSwitchNetworkType] = networkKey;
+    this.#koniState.setAuthorize(authUrls, () => {
+      resolve({
+        list: authUrls
+      });
+    });
+    return promise;
+  }
   changeAuthorization(data, id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     this._changeAuthorization(data.url, data.connectValue, items => {
@@ -778,10 +836,10 @@ class KoniExtension {
     this.#koniState.updateSetting('theme', data);
     return true;
   }
-  setCamera(_ref19) {
+  setCamera(_ref20) {
     let {
       camera
-    } = _ref19;
+    } = _ref20;
     this.#koniState.updateSetting('camera', camera);
     return true;
   }
@@ -789,17 +847,17 @@ class KoniExtension {
     this.#koniState.updateSetting('browserConfirmationType', data);
     return true;
   }
-  setAutoLockTime(_ref20) {
+  setAutoLockTime(_ref21) {
     let {
       autoLockTime
-    } = _ref20;
+    } = _ref21;
     this.#koniState.updateSetting('timeAutoLock', autoLockTime);
     return true;
   }
-  setUnlockType(_ref21) {
+  setUnlockType(_ref22) {
     let {
       unlockType
-    } = _ref21;
+    } = _ref22;
     this.#koniState.updateSetting('unlockType', unlockType);
     return true;
   }
@@ -816,10 +874,10 @@ class KoniExtension {
     });
     return await this.getSettings();
   }
-  setEnableChainPatrol(_ref22) {
+  setEnableChainPatrol(_ref23) {
     let {
       enable
-    } = _ref22;
+    } = _ref23;
     this.#koniState.updateSetting('enableChainPatrol', enable);
     return true;
   }
@@ -827,17 +885,17 @@ class KoniExtension {
     this.#koniState.updateSetting('notificationSetup', request);
     return true;
   }
-  saveMigrationAcknowledgedStatus(_ref23) {
+  saveMigrationAcknowledgedStatus(_ref24) {
     let {
       isAcknowledgedUnifiedAccountMigration
-    } = _ref23;
+    } = _ref24;
     this.#koniState.updateSetting('isAcknowledgedUnifiedAccountMigration', isAcknowledgedUnifiedAccountMigration);
     return true;
   }
-  saveUnifiedAccountMigrationInProgress(_ref24) {
+  saveUnifiedAccountMigrationInProgress(_ref25) {
     let {
       isUnifiedAccountMigrationInProgress
-    } = _ref24;
+    } = _ref25;
     this.#koniState.updateSetting('isUnifiedAccountMigrationInProgress', isUnifiedAccountMigrationInProgress);
     return true;
   }
@@ -845,31 +903,31 @@ class KoniExtension {
     this.#koniState.updateSetting('isUnifiedAccountMigrationInProgress', false);
     return true;
   }
-  setShowZeroBalance(_ref25) {
+  setShowZeroBalance(_ref26) {
     let {
       show
-    } = _ref25;
+    } = _ref26;
     this.#koniState.updateSetting('isShowZeroBalance', show);
     return true;
   }
-  setLanguage(_ref26) {
+  setLanguage(_ref27) {
     let {
       language
-    } = _ref26;
+    } = _ref27;
     this.#koniState.updateSetting('language', language);
     return true;
   }
-  setShowBalance(_ref27) {
+  setShowBalance(_ref28) {
     let {
       enable
-    } = _ref27;
+    } = _ref28;
     this.#koniState.updateSetting('isShowBalance', enable);
     return true;
   }
-  setAllowOneSign(_ref28) {
+  setAllowOneSign(_ref29) {
     let {
       allowOneSign
-    } = _ref28;
+    } = _ref29;
     this.#koniState.updateSetting('allowOneSign', allowOneSign);
     return true;
   }
@@ -918,11 +976,11 @@ class KoniExtension {
   async getPrice() {
     return this.#koniState.priceService.getPrice();
   }
-  async getHistoryTokenPrice(_ref29) {
+  async getHistoryTokenPrice(_ref30) {
     let {
       priceId,
       timeframe
-    } = _ref29;
+    } = _ref30;
     return this.#koniState.priceService.getHistoryTokenPriceData(priceId, timeframe);
   }
   checkCoinGeckoPriceSupport(priceId) {
@@ -943,10 +1001,10 @@ class KoniExtension {
       price: currentPrice
     };
   }
-  async setPriceCurrency(_ref30) {
+  async setPriceCurrency(_ref31) {
     let {
       currency
-    } = _ref30;
+    } = _ref31;
     return await this.#koniState.priceService.setPriceCurrency(currency);
   }
   subscribePrice(id, port) {
@@ -1154,11 +1212,11 @@ class KoniExtension {
     // Re-filter
     return historySubject.getValue().filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address)));
   }
-  subscribeHistoryByChainAndAddress(_ref31, id, port) {
+  subscribeHistoryByChainAndAddress(_ref32, id, port) {
     let {
       address,
       chain
-    } = _ref31;
+    } = _ref32;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscribeHistoriesResponse = this.#koniState.historyService.subscribeHistories(chain, address, cb);
     this.createUnsubscriptionHandle(id, subscribeHistoriesResponse.unsubscribe);
@@ -1726,28 +1784,28 @@ class KoniExtension {
   disableChain(networkKey) {
     return this.#koniState.disableChain(networkKey);
   }
-  async enableChain(_ref32) {
+  async enableChain(_ref33) {
     let {
       chainSlug,
       enableTokens
-    } = _ref32;
+    } = _ref33;
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
-  async enableChainWithPriorityAssets(_ref33) {
+  async enableChainWithPriorityAssets(_ref34) {
     let {
       chainSlug,
       enableTokens
-    } = _ref33;
+    } = _ref34;
     return await this.#koniState.enableChainWithPriorityAssets(chainSlug, enableTokens);
   }
   async reconnectChain(chainSlug) {
     return this.#koniState.chainService.reconnectChain(chainSlug);
   }
-  async validateNetwork(_ref34) {
+  async validateNetwork(_ref35) {
     let {
       existedChainSlug,
       provider
-    } = _ref34;
+    } = _ref35;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1819,13 +1877,13 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressTransferableBalance(_ref35) {
+  async getAddressTransferableBalance(_ref36) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref35;
+    } = _ref36;
     if (token && _constants2._MANTA_ZK_CHAIN_GROUP.includes(networkKey)) {
       const tokenInfo = this.#koniState.chainService.getAssetBySlug(token);
       if (tokenInfo.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
@@ -1834,13 +1892,13 @@ class KoniExtension {
     }
     return await this.#koniState.balanceService.getTransferableBalance(address, networkKey, token, extrinsicType);
   }
-  async getAddressTotalBalance(_ref36) {
+  async getAddressTotalBalance(_ref37) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref36;
+    } = _ref37;
     return await this.#koniState.balanceService.getTotalBalance(address, networkKey, token, extrinsicType);
   }
   async subscribeMaxTransferable(request, id, port) {
@@ -1892,11 +1950,11 @@ class KoniExtension {
       freeBalance: freeBalanceSubject,
       fee: feeSubject
     }).subscribe({
-      next: _ref37 => {
+      next: _ref38 => {
         let {
           fee,
           freeBalance
-        } = _ref37;
+        } = _ref38;
         (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
@@ -1930,13 +1988,13 @@ class KoniExtension {
     });
     return (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee);
   }
-  async subscribeAddressTransferableBalance(_ref38, id, port) {
+  async subscribeAddressTransferableBalance(_ref39, id, port) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref38;
+    } = _ref39;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const convertData = data => {
       return {
@@ -1987,11 +2045,11 @@ class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(_ref39) {
+  async enableChains(_ref40) {
     let {
       chainSlugs,
       enableTokens
-    } = _ref39;
+    } = _ref40;
     try {
       await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
         chainSlug,
@@ -2124,30 +2182,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref40) {
+  parseSubstrateTransaction(_ref41) {
     let {
       data,
       networkKey
-    } = _ref40;
+    } = _ref41;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref41) {
+  async parseEVMRLP(_ref42) {
     let {
       data
-    } = _ref41;
+    } = _ref42;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref42) {
+  qrSignSubstrate(_ref43) {
     let {
       address,
       data,
       networkKey
-    } = _ref42;
+    } = _ref43;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     if (pair.isLocked) {
@@ -2164,13 +2222,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref43) {
+  async qrSignEVM(_ref44) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref43;
+    } = _ref44;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2254,11 +2312,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref44) {
+  async getBondingOptions(_ref45) {
     let {
       chain,
       type
-    } = _ref44;
+    } = _ref45;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2448,12 +2506,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref45) {
+  async parseContractInput(_ref46) {
     let {
       chainId,
       contract,
       data
-    } = _ref45;
+    } = _ref46;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2553,10 +2611,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref46) {
+  keyringUnlock(_ref47) {
     let {
       password
-    } = _ref46;
+    } = _ref47;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
       // this.#koniState.initMantaPay(password)
@@ -2587,11 +2645,11 @@ class KoniExtension {
 
   // Export mnemonic
 
-  keyringExportMnemonic(_ref47) {
+  keyringExportMnemonic(_ref48) {
     let {
       address,
       password
-    } = _ref47;
+    } = _ref48;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2601,10 +2659,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref48) {
+  async resetWallet(_ref49) {
     let {
       resetAll
-    } = _ref48;
+    } = _ref49;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2620,10 +2678,10 @@ class KoniExtension {
   }
 
   // Signing substrate request
-  async signingApprovePasswordV2(_ref49) {
+  async signingApprovePasswordV2(_ref50) {
     let {
       id
-    } = _ref49;
+    } = _ref50;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
@@ -2782,10 +2840,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref50) {
+  getTransaction(_ref51) {
     let {
       id
-    } = _ref50;
+    } = _ref51;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
       transaction,
@@ -2796,8 +2854,8 @@ class KoniExtension {
   async subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs, processMap) {
-      return Object.fromEntries(Object.entries(rs).map(_ref51 => {
-        let [key, value] = _ref51;
+      return Object.fromEntries(Object.entries(rs).map(_ref52 => {
+        let [key, value] = _ref52;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const {
           additionalValidator,
@@ -2822,11 +2880,11 @@ class KoniExtension {
     const subscription = (0, _rxjs.combineLatest)({
       transactions: transactionsObservable,
       processMap: processTransactionObservable
-    }).subscribe(_ref52 => {
+    }).subscribe(_ref53 => {
       let {
         processMap,
         transactions
-      } = _ref52;
+      } = _ref53;
       cb(convertRs(transactions, processMap));
     });
     port.onDisconnect.addListener(() => {
@@ -2847,10 +2905,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref53) {
+  async reloadCron(_ref54) {
     let {
       data
-    } = _ref53;
+    } = _ref54;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -2893,10 +2951,10 @@ class KoniExtension {
   }
 
   // Phishing detect
-  async passPhishingPage(_ref54) {
+  async passPhishingPage(_ref55) {
     let {
       url
-    } = _ref54;
+    } = _ref55;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
@@ -2917,10 +2975,10 @@ class KoniExtension {
   /// Wallet connect
 
   // Connect
-  async connectWalletConnect(_ref55) {
+  async connectWalletConnect(_ref56) {
     let {
       uri
-    } = _ref55;
+    } = _ref56;
     await this.#koniState.walletConnectService.connect(uri);
     return true;
   }
@@ -2933,11 +2991,11 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allConnectWCRequests;
   }
-  async approveWalletConnectSession(_ref56) {
+  async approveWalletConnectSession(_ref57) {
     let {
       accounts: selectedAccounts,
       id
-    } = _ref56;
+    } = _ref57;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
       throw new Error('The proposal has been expired');
@@ -2949,8 +3007,8 @@ class KoniExtension {
     const availableNamespaces = {};
     const namespaces = {};
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    Object.entries(requiredNamespaces).forEach(_ref57 => {
-      let [key, namespace] = _ref57;
+    Object.entries(requiredNamespaces).forEach(_ref58 => {
+      let [key, namespace] = _ref58;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
@@ -2963,8 +3021,8 @@ class KoniExtension {
         throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
-    Object.entries(optionalNamespaces).forEach(_ref58 => {
-      let [key, namespace] = _ref58;
+    Object.entries(optionalNamespaces).forEach(_ref59 => {
+      let [key, namespace] = _ref59;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const supportChains = namespace.chains.filter(chain => (0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap)) || [];
@@ -2988,8 +3046,8 @@ class KoniExtension {
         }
       }
     });
-    Object.entries(availableNamespaces).forEach(_ref59 => {
-      let [key, namespace] = _ref59;
+    Object.entries(availableNamespaces).forEach(_ref60 => {
+      let [key, namespace] = _ref60;
       if (namespace.chains) {
         const accounts = selectedAccounts.filter(address => {
           const [_namespace] = address.split(':');
@@ -3013,10 +3071,10 @@ class KoniExtension {
     request.resolve();
     return true;
   }
-  async rejectWalletConnectSession(_ref60) {
+  async rejectWalletConnectSession(_ref61) {
     let {
       id
-    } = _ref60;
+    } = _ref61;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     const wcId = request.request.id;
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
@@ -3038,10 +3096,10 @@ class KoniExtension {
     });
     return this.#koniState.walletConnectService.sessions;
   }
-  async disconnectWalletConnectSession(_ref61) {
+  async disconnectWalletConnectSession(_ref62) {
     let {
       topic
-    } = _ref61;
+    } = _ref62;
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
@@ -3054,18 +3112,18 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allNotSupportWCRequests;
   }
-  approveWalletConnectNotSupport(_ref62) {
+  approveWalletConnectNotSupport(_ref63) {
     let {
       id
-    } = _ref62;
+    } = _ref63;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.resolve();
     return true;
   }
-  rejectWalletConnectNotSupport(_ref63) {
+  rejectWalletConnectNotSupport(_ref64) {
     let {
       id
-    } = _ref63;
+    } = _ref64;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.reject(new Error('USER_REJECTED'));
     return true;
@@ -3073,11 +3131,11 @@ class KoniExtension {
 
   /// Manta
 
-  async enableMantaPay(_ref64) {
+  async enableMantaPay(_ref65) {
     let {
       address,
       password
-    } = _ref64;
+    } = _ref65;
     // always takes the current account
     function timeout() {
       return new Promise(resolve => setTimeout(resolve, 1500));
@@ -3167,11 +3225,11 @@ class KoniExtension {
   async disableMantaPay(address) {
     return this.#koniState.disableMantaPay(address);
   }
-  async isTonBounceableAddress(_ref65) {
+  async isTonBounceableAddress(_ref66) {
     let {
       address,
       chain
-    } = _ref65;
+    } = _ref66;
     try {
       const tonApi = this.#koniState.getTonApi(chain);
       const state = await tonApi.getAccountState(address);
@@ -3217,10 +3275,10 @@ class KoniExtension {
 
   /* Metadata */
 
-  async findRawMetadata(_ref66) {
+  async findRawMetadata(_ref67) {
     let {
       genesisHash
-    } = _ref66;
+    } = _ref67;
     const {
       metadata,
       specVersion,
@@ -3234,20 +3292,20 @@ class KoniExtension {
       userExtensions
     };
   }
-  async calculateMetadataHash(_ref67) {
+  async calculateMetadataHash(_ref68) {
     let {
       chain
-    } = _ref67;
+    } = _ref68;
     const hash = await this.#koniState.calculateMetadataHash(chain);
     return {
       metadataHash: hash || ''
     };
   }
-  async shortenMetadata(_ref68) {
+  async shortenMetadata(_ref69) {
     let {
       chain,
       txBlob
-    } = _ref68;
+    } = _ref69;
     const shorten = await this.#koniState.shortenMetadata(chain, txBlob);
     return {
       txMetadata: shorten || ''
@@ -3600,18 +3658,18 @@ class KoniExtension {
 
   /* Campaign */
 
-  unlockDotCheckCanMint(_ref69) {
+  unlockDotCheckCanMint(_ref70) {
     let {
       address,
       network,
       slug
-    } = _ref69;
+    } = _ref70;
     return this.#koniState.mintCampaignService.unlockDotCampaign.canMint(address, slug, network);
   }
-  unlockDotSubscribeMintedData(id, port, _ref70) {
+  unlockDotSubscribeMintedData(id, port, _ref71) {
     let {
       transactionId
-    } = _ref70;
+    } = _ref71;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.mintCampaignService.unlockDotCampaign.subscribeMintedNft(transactionId, cb);
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
@@ -3643,10 +3701,10 @@ class KoniExtension {
     });
     return filterBanner(await this.#koniState.campaignService.getProcessingCampaign());
   }
-  async completeCampaignBanner(_ref71) {
+  async completeCampaignBanner(_ref72) {
     let {
       slug
-    } = _ref71;
+    } = _ref72;
     const campaign = await this.#koniState.dbService.getCampaign(slug);
     if (campaign) {
       await this.#koniState.dbService.upsertCampaign({
@@ -4181,8 +4239,8 @@ class KoniExtension {
                         resolve();
                       }
                     };
-                    this.#koniState.balanceService.subscribeTransferableBalance(address, waitXcmData.chain, waitXcmData.token, waitXcmData.nextTxType, onRs).then(_ref72 => {
-                      let [_unsub, rs] = _ref72;
+                    this.#koniState.balanceService.subscribeTransferableBalance(address, waitXcmData.chain, waitXcmData.token, waitXcmData.nextTxType, onRs).then(_ref73 => {
+                      let [_unsub, rs] = _ref73;
                       unsub = _unsub;
                       onRs(rs);
                     }).catch(console.error);
@@ -4344,6 +4402,8 @@ class KoniExtension {
         return this.getAuthListV2();
       case 'pri(authorize.toggle)':
         return this.toggleAuthorization2(request);
+      case 'pri(authorize.switchCurrentNetwork)':
+        return this.switchCurrentNetworkAuthorization(request);
       case 'pri(settings.changeBalancesVisibility)':
         return await this.toggleBalancesVisibility();
 

package/cjs/koni/background/handlers/State.js

@@ -1117,13 +1117,13 @@ class KoniState {
     if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
       autoActiveChain = true;
     }
-    const currentEvmNetwork = this.requestService.getDAppChainInfo({
+    const currentCardanoNetwork = this.requestService.getDAppChainInfo({
       autoActive: autoActiveChain,
       accessType: 'cardano',
       defaultChain: networkKey,
       url
     });
-    networkKey = (currentEvmNetwork === null || currentEvmNetwork === void 0 ? void 0 : currentEvmNetwork.slug) || 'cardano';
+    networkKey = (currentCardanoNetwork === null || currentCardanoNetwork === void 0 ? void 0 : currentCardanoNetwork.slug) || 'cardano';
     const allUtxos = await this.chainService.getUtxosByAddress(currentAddress, networkKey);
     const outputTransactionUnSpend = CardanoWasm.TransactionOutputs.new();
     inputs.to_js_value().forEach(input => {
@@ -1160,12 +1160,23 @@ class KoniState {
         values: (0, _helper.convertValueToAsset)(output)
       };
       if ((0, _utils3.isSameAddress)(currentAddress, address)) {
+        if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
+          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.ACCOUNT_CHANGED, (0, _i18next.t)('Current network is changed'));
+        }
         transactionValue = transactionValue.checked_add(amount);
         addressInputAmountMap[address].isOwner = true;
         addressOutputAmountMap[address].isOwner = true;
       }
+
+      // Check if address is valid with current network
+      if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
+        throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('Current network is not match with input address'));
+      }
     }
     for (const address in addressOutputMap) {
+      if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
+        throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('Current network is not match with output address'));
+      }
       if (!addressInputAmountMap[address] && !addressOutputMap[address].is_zero()) {
         addressOutputAmountMap[address] = {
           values: (0, _helper.convertValueToAsset)(addressOutputMap[address]),
@@ -1274,13 +1285,7 @@ class KoniState {
   async onMV3Update() {
     const migrationStatus = await _storage.SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
-      if (_utils3.isManifestV3) {
-        // Open migration tab
-        const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
-        await (0, _PopupHandler.openPopup)(url);
-
-        // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
-      } else {
+      if (!_utils3.isManifestV3) {
         this.migrateMV3LocalStorage(JSON.stringify(self.localStorage)).catch(console.error);
       }
     }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.36-0'
+  version: '1.3.37-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -273,7 +273,10 @@ class AuthRequestHandler {
           origin,
           url,
           accountAuthTypes: [...new Set([...accountAuthTypes, ...((existed === null || existed === void 0 ? void 0 : existed.accountAuthTypes) || [])])],
-          currentNetworkMap: existed ? existed.currentNetworkMap : defaultNetworkMap
+          currentNetworkMap: existed ? {
+            ...defaultNetworkMap,
+            ...existed.currentNetworkMap
+          } : defaultNetworkMap
         };
         this.setAuthorize(authorizeList, () => {
           cb();

package/cjs/utils/cardano.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertCardanoHexToBech32 = exports.convertCardanoAddressToHex = void 0;
+exports.validateAddressNetwork = exports.convertCardanoHexToBech32 = exports.convertCardanoAddressToHex = void 0;
 var _cardanoSerializationLibNodejs = require("@emurgo/cardano-serialization-lib-nodejs");
+var _keyring = require("@subwallet/keyring");
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -17,4 +18,11 @@ const convertCardanoHexToBech32 = hexAddress => {
   const addr = _cardanoSerializationLibNodejs.Address.from_hex(hexAddress);
   return addr.to_bech32();
 };
-exports.convertCardanoHexToBech32 = convertCardanoHexToBech32;
+exports.convertCardanoHexToBech32 = convertCardanoHexToBech32;
+const validateAddressNetwork = (address, chainInfo) => {
+  if (!(chainInfo !== null && chainInfo !== void 0 && chainInfo.cardanoInfo) || !chainInfo.isTestnet) {
+    return (0, _keyring.isCardanoMainnetAddress)(address);
+  }
+  return (0, _keyring.isCardanoTestnetAddress)(address);
+};
+exports.validateAddressNetwork = validateAddressNetwork;

package/core/logic-validation/request.js

@@ -8,6 +8,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { CardanoProviderErrorType, EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { BN_ZERO, combineEthFee, createPromiseHandler, isSameAddress, stripUrl, wait } from '@subwallet/extension-base/utils';
+import { validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { isCardanoAddress, isSubstrateAddress } from '@subwallet/keyring';
@@ -547,8 +548,10 @@ export function validationAuthWCMiddleware(koni, url, payload, topic) {
 export async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   const {
     address,
+    authInfo,
     errors,
-    pair: pair_
+    pair: pair_,
+    type
   } = payload_;
   const payload = payload_.payloadAfterValidated;
   const {
@@ -570,6 +573,15 @@ export async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   if (!isCardanoAddress(address)) {
     handleError('Not found cardano address');
   }
+  const currentCardanoNetwork = koni.requestService.getDAppChainInfo({
+    autoActive: true,
+    accessType: 'cardano',
+    defaultChain: authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap[type],
+    url
+  });
+  if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+    handleError('Invalid address network');
+  }
   const pair = pair_ || keyring.getPair(address);
   if (!(pair !== null && pair !== void 0 && pair.meta.isExtneral)) {
     canSign = true;

package/koni/background/handlers/Extension.d.ts

@@ -59,6 +59,7 @@ export default class KoniExtension {
     private changeAuthorizationAll;
     private _changeAuthorization;
     toggleAuthorization2(url: string): Promise<ResponseAuthorizeList>;
+    private switchCurrentNetworkAuthorization;
     private changeAuthorization;
     private _changeAuthorizationPerAcc;
     private _changeAuthorizationBlock;

package/koni/background/handlers/Extension.js

@@ -36,7 +36,7 @@ import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge }
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
 import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _isAssetSmartContractNft, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isNativeTokenBySlug, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _isAssetSmartContractNft, _isChainEnabled, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isNativeTokenBySlug, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool } from '@subwallet/extension-base/services/fee-service/utils';
 import { batchExtrinsicSetFeeHydration, getAssetHubTokensCanPayFee, getHydrationTokensCanPayFee } from '@subwallet/extension-base/services/fee-service/utils/tokenPayFee';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
@@ -45,7 +45,7 @@ import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectN
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
-import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, createTransactionFromRLP, detectTransferTxType, getAccountSignMode, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, getAccountSignMode, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { getKeypairTypeByAddress, isAddress, isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
@@ -648,6 +648,63 @@ export default class KoniExtension {
       });
     });
   }
+  async switchCurrentNetworkAuthorization({
+    authSwitchNetworkType,
+    networkKey,
+    url
+  }) {
+    const authUrls = await this.#koniState.getAuthList();
+    const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+    const chainState = this.#koniState.getChainStateByKey(networkKey);
+    const {
+      promise,
+      resolve
+    } = createPromiseHandler();
+    const typeInfoMap = {
+      substrate: 'substrateInfo',
+      evm: 'evmInfo',
+      cardano: 'cardanoInfo',
+      ton: 'tonInfo'
+    };
+    const typeInfoKey = typeInfoMap[authSwitchNetworkType];
+    if (!typeInfoKey || !chainInfo[typeInfoKey]) {
+      throw new Error(t('Network {{networkKey}} is not {{authSwitchNetworkType}}', {
+        replace: {
+          networkKey,
+          authSwitchNetworkType
+        }
+      }));
+    }
+    const authUrl = authUrls[url];
+    if (!authUrl) {
+      throw new Error(t('Not found {{url}} in auth list', {
+        replace: {
+          url
+        }
+      }));
+    }
+    if (chainInfo && !_isChainEnabled(chainState)) {
+      await this.enableChainWithPriorityAssets({
+        chainSlug: networkKey,
+        enableTokens: true
+      });
+    }
+    if (!authUrl.accountAuthTypes.includes(authSwitchNetworkType)) {
+      throw new Error(t('Network {{networkKey}} is not supported by {{authSwitchNetworkType}}', {
+        replace: {
+          networkKey,
+          authSwitchNetworkType
+        }
+      }));
+    }
+    authUrl.currentNetworkMap[authSwitchNetworkType] = networkKey;
+    this.#koniState.setAuthorize(authUrls, () => {
+      resolve({
+        list: authUrls
+      });
+    });
+    return promise;
+  }
   changeAuthorization(data, id, port) {
     const cb = createSubscription(id, port);
     this._changeAuthorization(data.url, data.connectValue, items => {
@@ -4255,6 +4312,8 @@ export default class KoniExtension {
         return this.getAuthListV2();
       case 'pri(authorize.toggle)':
         return this.toggleAuthorization2(request);
+      case 'pri(authorize.switchCurrentNetwork)':
+        return this.switchCurrentNetworkAuthorization(request);
       case 'pri(settings.changeBalancesVisibility)':
         return await this.toggleBalancesVisibility();
 

package/koni/background/handlers/State.js

@@ -41,7 +41,7 @@ import WalletConnectService from '@subwallet/extension-base/services/wallet-conn
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { addLazy, isManifestV3, isSameAddress, reformatAddress, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
-import { convertCardanoHexToBech32 } from '@subwallet/extension-base/utils/cardano';
+import { convertCardanoHexToBech32, validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import { keyring } from '@subwallet/ui-keyring';
@@ -1094,13 +1094,13 @@ export default class KoniState {
     if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
       autoActiveChain = true;
     }
-    const currentEvmNetwork = this.requestService.getDAppChainInfo({
+    const currentCardanoNetwork = this.requestService.getDAppChainInfo({
       autoActive: autoActiveChain,
       accessType: 'cardano',
       defaultChain: networkKey,
       url
     });
-    networkKey = (currentEvmNetwork === null || currentEvmNetwork === void 0 ? void 0 : currentEvmNetwork.slug) || 'cardano';
+    networkKey = (currentCardanoNetwork === null || currentCardanoNetwork === void 0 ? void 0 : currentCardanoNetwork.slug) || 'cardano';
     const allUtxos = await this.chainService.getUtxosByAddress(currentAddress, networkKey);
     const outputTransactionUnSpend = CardanoWasm.TransactionOutputs.new();
     inputs.to_js_value().forEach(input => {
@@ -1137,12 +1137,23 @@ export default class KoniState {
         values: convertValueToAsset(output)
       };
       if (isSameAddress(currentAddress, address)) {
+        if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+          throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED, t('Current network is changed'));
+        }
         transactionValue = transactionValue.checked_add(amount);
         addressInputAmountMap[address].isOwner = true;
         addressOutputAmountMap[address].isOwner = true;
       }
+
+      // Check if address is valid with current network
+      if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Current network is not match with input address'));
+      }
     }
     for (const address in addressOutputMap) {
+      if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Current network is not match with output address'));
+      }
       if (!addressInputAmountMap[address] && !addressOutputMap[address].is_zero()) {
         addressOutputAmountMap[address] = {
           values: convertValueToAsset(addressOutputMap[address]),
@@ -1250,13 +1261,7 @@ export default class KoniState {
   async onMV3Update() {
     const migrationStatus = await SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
-      if (isManifestV3) {
-        // Open migration tab
-        const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
-        await openPopup(url);
-
-        // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
-      } else {
+      if (!isManifestV3) {
         this.migrateMV3LocalStorage(JSON.stringify(self.localStorage)).catch(console.error);
       }
     }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.36-0",
+  "version": "1.3.37-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2710,20 +2710,20 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.104",
-    "@subwallet/extension-base": "^1.3.36-0",
-    "@subwallet/extension-chains": "^1.3.36-0",
-    "@subwallet/extension-dapp": "^1.3.36-0",
-    "@subwallet/extension-inject": "^1.3.36-0",
+    "@subwallet/extension-base": "^1.3.37-0",
+    "@subwallet/extension-chains": "^1.3.37-0",
+    "@subwallet/extension-dapp": "^1.3.37-0",
+    "@subwallet/extension-inject": "^1.3.37-0",
     "@subwallet/keyring": "^0.1.11",
-    "@subwallet/subwallet-api-sdk": "^1.3.36-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.37-0",
     "@subwallet/ui-keyring": "^0.1.11",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
     "@ton/ton": "^15.0.0",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "^2.14.0",
-    "@walletconnect/types": "^2.14.0",
-    "@walletconnect/utils": "^2.14.0",
+    "@walletconnect/sign-client": "^2.20.2",
+    "@walletconnect/types": "^2.20.2",
+    "@walletconnect/utils": "^2.20.2",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.36-0'
+  version: '1.3.37-0'
 };

package/services/chain-service/types.d.ts

@@ -15,8 +15,8 @@ import { ChainProperties, ChainType, RuntimeVersion } from '@polkadot/types/inte
 import { AnyJson, Registry } from '@polkadot/types/types';
 export interface _DataMap {
     chainInfoMap: Record<string, _ChainInfo>;
-    chainStateMap: Record<string, _ChainState>;
     assetRegistry: Record<string, _ChainAsset>;
+    chainStateMap: Record<string, _ChainState>;
     assetRefMap: Record<string, _AssetRef>;
 }
 export declare enum _ChainConnectionStatus {

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

@@ -260,7 +260,10 @@ export default class AuthRequestHandler {
           origin,
           url,
           accountAuthTypes: [...new Set([...accountAuthTypes, ...((existed === null || existed === void 0 ? void 0 : existed.accountAuthTypes) || [])])],
-          currentNetworkMap: existed ? existed.currentNetworkMap : defaultNetworkMap
+          currentNetworkMap: existed ? {
+            ...defaultNetworkMap,
+            ...existed.currentNetworkMap
+          } : defaultNetworkMap
         };
         this.setAuthorize(authorizeList, () => {
           cb();

package/utils/cardano.d.ts

@@ -1,2 +1,4 @@
+import { _ChainInfo } from '@subwallet/chain-list/types';
 export declare const convertCardanoAddressToHex: (bech32Address: string) => string;
 export declare const convertCardanoHexToBech32: (hexAddress: string) => string;
+export declare const validateAddressNetwork: (address: string, chainInfo?: _ChainInfo) => boolean;

package/utils/cardano.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Address } from '@emurgo/cardano-serialization-lib-nodejs';
+import { isCardanoMainnetAddress, isCardanoTestnetAddress } from '@subwallet/keyring';
 export const convertCardanoAddressToHex = bech32Address => {
   const addr = Address.from_bech32(bech32Address);
   return addr.to_hex();
@@ -9,4 +10,10 @@ export const convertCardanoAddressToHex = bech32Address => {
 export const convertCardanoHexToBech32 = hexAddress => {
   const addr = Address.from_hex(hexAddress);
   return addr.to_bech32();
+};
+export const validateAddressNetwork = (address, chainInfo) => {
+  if (!(chainInfo !== null && chainInfo !== void 0 && chainInfo.cardanoInfo) || !chainInfo.isTestnet) {
+    return isCardanoMainnetAddress(address);
+  }
+  return isCardanoTestnetAddress(address);
 };