@subwallet/extension-base 1.2.26-0 → 1.2.28-0

package/background/KoniTypes.d.ts

@@ -958,26 +958,26 @@ export interface EvmSendTransactionParams {
     data?: string;
     gas?: string | number;
 }
-export interface SwitchNetworkRequest {
-    networkKey: string;
-    address?: string;
-}
 export interface EvmSignRequest {
     account: AccountJson;
     hashPayload: string;
     canSign: boolean;
 }
+export interface ErrorValidation {
+    message: string;
+    name: string;
+}
 export interface EvmSignatureRequest extends EvmSignRequest {
     id: string;
     type: string;
     payload: unknown;
-    errors?: Error[];
+    errors?: ErrorValidation[];
 }
 export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignRequest {
     estimateGas: string;
     parseData: EvmTransactionData;
     isToContract: boolean;
-    errors?: TransactionError[];
+    errors?: ErrorValidation[];
 }
 export declare type EvmWatchTransactionRequest = EvmSendTransactionRequest;
 export interface ConfirmationsQueueItemOptions {
@@ -1020,12 +1020,11 @@ export interface AddTokenRequestExternal {
 export interface ErrorNetworkConnection {
     networkKey: string;
     address: string;
-    errors: Error[];
+    errors: ErrorValidation[];
 }
 export interface ConfirmationDefinitions {
     addNetworkRequest: [ConfirmationsQueueItem<_NetworkUpsertParams>, ConfirmationResult<null>];
     addTokenRequest: [ConfirmationsQueueItem<AddTokenRequestExternal>, ConfirmationResult<boolean>];
-    switchNetworkRequest: [ConfirmationsQueueItem<SwitchNetworkRequest>, ConfirmationResult<boolean>];
     evmSignatureRequest: [ConfirmationsQueueItem<EvmSignatureRequest>, ConfirmationResult<string>];
     evmSendTransactionRequest: [ConfirmationsQueueItem<EvmSendTransactionRequest>, ConfirmationResult<string>];
     evmWatchTransactionRequest: [ConfirmationsQueueItem<EvmWatchTransactionRequest>, ConfirmationResult<string>];

package/cjs/constants/index.js

@@ -34,9 +34,10 @@ var _exportNames = {
   GAS_PRICE_RATIO: true,
   NETWORK_MULTI_GAS_FEE: true,
   ORDINAL_COLLECTION: true,
-  ORDINAL_METHODS: true
+  ORDINAL_METHODS: true,
+  PERMISSIONS_TO_REVOKE: true
 };
-exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.PERMISSIONS_TO_REVOKE = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -125,4 +126,6 @@ exports.NETWORK_MULTI_GAS_FEE = NETWORK_MULTI_GAS_FEE;
 const ORDINAL_COLLECTION = '__Ordinal__';
 exports.ORDINAL_COLLECTION = ORDINAL_COLLECTION;
 const ORDINAL_METHODS = ['drc-20', 'pol-20'];
-exports.ORDINAL_METHODS = ORDINAL_METHODS;
+exports.ORDINAL_METHODS = ORDINAL_METHODS;
+const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
+exports.PERMISSIONS_TO_REVOKE = PERMISSIONS_TO_REVOKE;

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

@@ -4,13 +4,19 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.convertErrorFormat = convertErrorFormat;
 exports.convertErrorMessage = convertErrorMessage;
 exports.generateValidationProcess = generateValidationProcess;
+exports.joiValidate = void 0;
+exports.validateSignMessageData = validateSignMessageData;
+exports.validateTypedSignMessageDataV1 = validateTypedSignMessageDataV1;
+exports.validateTypedSignMessageDataV3V4 = validateTypedSignMessageDataV3V4;
 exports.validationAuthMiddleware = validationAuthMiddleware;
 exports.validationAuthWCMiddleware = validationAuthWCMiddleware;
 exports.validationConnectMiddleware = validationConnectMiddleware;
 exports.validationEvmDataTransactionMiddleware = validationEvmDataTransactionMiddleware;
 exports.validationEvmSignMessageMiddleware = validationEvmSignMessageMiddleware;
+var _ethSigUtil = require("@metamask/eth-sig-util");
 var _EvmProviderError = require("@subwallet/extension-base/background/errors/EvmProviderError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -22,11 +28,109 @@ var _utils3 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _bn = _interopRequireDefault(require("bn.js"));
 var _i18next = require("i18next");
+var _joi = _interopRequireDefault(require("joi"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+const joiValidate = _joi.default.object({
+  types: _joi.default.object().pattern(_joi.default.string(),
+  // Key của object types
+  _joi.default.array().items(_joi.default.object({
+    name: _joi.default.string().required(),
+    type: _joi.default.string().required()
+  }))).required(),
+  primaryType: _joi.default.string().required(),
+  domain: _joi.default.object().required(),
+  message: _joi.default.object().required()
+});
+exports.joiValidate = joiValidate;
+function validateAddress(address, propertyName) {
+  if (!address || typeof address !== 'string' || !(0, _utilCrypto.isEthereumAddress)(address)) {
+    throw new Error(`Invalid "${propertyName}" address: ${address} must be a valid string.`);
+  }
+}
+function validateSignMessageData(messageData) {
+  const {
+    data,
+    from
+  } = messageData;
+  validateAddress(from, 'from');
+  if (!data || typeof data !== 'string') {
+    throw new Error(`Invalid message "data": ${data} must be a valid string.`);
+  }
+  return data;
+}
+function validateTypedSignMessageDataV1(messageData) {
+  validateAddress(messageData.from, 'from');
+  if (!messageData.data || !Array.isArray(messageData.data)) {
+    throw new Error(
+    // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+    `Invalid message "data": ${messageData.data} must be a valid array.`);
+  }
+  try {
+    // typedSignatureHash will throw if the data is invalid.
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (0, _ethSigUtil.typedSignatureHash)(messageData.data);
+    return messageData.data;
+  } catch (e) {
+    throw new Error('Invalid message "data": Expected EIP712 typed data.');
+  }
+}
+function validateTypedSignMessageDataV3V4(messageData) {
+  validateAddress(messageData.from, 'from');
+  if (!messageData.data || Array.isArray(messageData.data) || typeof messageData.data !== 'object' && typeof messageData.data !== 'string') {
+    throw new Error('Invalid message "data": Must be a valid string or object.');
+  }
+  let data;
+  if (typeof messageData.data === 'object') {
+    data = messageData.data;
+  } else {
+    try {
+      data = JSON.parse(messageData.data);
+    } catch (e) {
+      throw new Error('Invalid message "data" must be passed as a valid JSON string.');
+    }
+  }
+  const validation = joiValidate.validate(data);
+  if (validation.error) {
+    throw new Error('Invalid message "data" must conform to EIP-712 schema. See https://git.io/fNtcx.');
+  }
+
+  // if (!currentChainId) {
+  //   throw new Error('Current chainId cannot be null or undefined.');
+  // }
+
+  // let { chainId } = data.domain;
+  //
+  // if (chainId) {
+  //   if (typeof chainId === 'string') {
+  //     chainId = parseInt(chainId, chainId.startsWith('0x') ? 16 : 10);
+  //   }
+  //
+  //   const activeChainId = parseInt(currentChainId, 16);
+  //
+  //   if (Number.isNaN(activeChainId)) {
+  //     throw new Error(
+  //       // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+  //       // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+  //       `Cannot sign messages for chainId "${chainId}", because MetaMask is switching networks.`
+  //     );
+  //   }
+  //
+  //   if (chainId !== activeChainId) {
+  //     throw new Error(
+  //       // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+  //       // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+  //       `Provided chainId "${chainId}" must match the active chainId "${activeChainId}"`
+  //     );
+  //   }
+  // }
+  return data;
+}
 async function generateValidationProcess(koni, url, payloadValidate, validationMiddlewareSteps, topic) {
   let resultValidated = payloadValidate;
   for (const step of validationMiddlewareSteps) {
@@ -328,7 +432,7 @@ async function validationEvmSignMessageMiddleware(koni, url, payload_) {
     const [message, name] = convertErrorMessage(message_);
     const error = new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, message, undefined, name);
     console.error(error);
-    errors.push(new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, message, undefined, name));
+    errors.push(error);
   };
   if (address === '' || !payload) {
     handleError('Not found address or payload to sign');
@@ -342,26 +446,47 @@ async function validationEvmSignMessageMiddleware(koni, url, payload_) {
     if (['eth_sign', 'personal_sign', 'eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) < 0) {
       handleError('Unsupported action');
     }
-    if (['eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) > -1) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-assignment
-      payload = JSON.parse(payload);
-    }
-    switch (method) {
-      case 'personal_sign':
-        canSign = true;
-        hashPayload = payload;
-        break;
-      case 'eth_sign':
-      case 'eth_signTypedData':
-      case 'eth_signTypedData_v1':
-      case 'eth_signTypedData_v3':
-      case 'eth_signTypedData_v4':
-        if (!account.isExternal) {
+    try {
+      switch (method) {
+        case 'personal_sign':
           canSign = true;
-        }
-        break;
-      default:
-        handleError('Unsupported action');
+          payload = validateSignMessageData({
+            data: payload,
+            from: address
+          });
+          hashPayload = payload;
+          break;
+        case 'eth_sign':
+          if (!account.isExternal) {
+            canSign = true;
+          }
+          break;
+        case 'eth_signTypedData':
+        case 'eth_signTypedData_v1':
+          if (!account.isExternal) {
+            canSign = true;
+          }
+          payload = validateTypedSignMessageDataV1({
+            data: payload,
+            from: address
+          });
+          break;
+        case 'eth_signTypedData_v3':
+        case 'eth_signTypedData_v4':
+          if (!account.isExternal) {
+            canSign = true;
+          }
+          payload = validateTypedSignMessageDataV3V4({
+            data: payload,
+            from: address
+          });
+          break;
+        default:
+          throw new Error('Unsupported action');
+      }
+    } catch (e) {
+      console.error(e);
+      handleError(e.message);
     }
   } else {
     handleError('Unsupported method');
@@ -442,7 +567,7 @@ function convertErrorMessage(message_, name) {
     return [(0, _i18next.t)('Re-enable the network or change RPC on the extension and try again'), (0, _i18next.t)('Unstable network connection')];
   }
   if (message.includes('network is currently not supported')) {
-    return [(0, _i18next.t)('This network is not yet supported on SubWallet. |Import the network|https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks| on SubWallet and try again'), (0, _i18next.t)('Network not supported')];
+    return [(0, _i18next.t)('This network is not yet supported on SubWallet. (Import the network)[https://docs.subwallet.app/main/extension-user-guide/customize-your-networks#import-networks] on SubWallet and try again'), (0, _i18next.t)('Network not supported')];
   }
 
   // Authentication
@@ -479,10 +604,22 @@ function convertErrorMessage(message_, name) {
 
   // Sign Message
   if (message.includes('not found address or payload to sign')) {
-    return [(0, _i18next.t)('An error occurred when signing this request. Try again or contact support at agent@subwallet.app'), (0, _i18next.t)('Unable to sign message')];
+    return [(0, _i18next.t)('An error occurred when signing this request. Try again or contact support at agent@subwallet.app'), (0, _i18next.t)('Unable to sign')];
   }
   if (message.includes('unsupported method') || message.includes('unsupported action')) {
     return [(0, _i18next.t)('This sign method is not supported by SubWallet. Try again or contact support at agent@subwallet.app'), (0, _i18next.t)('Method not supported')];
   }
-  return [message, name || ''];
+  if (message.includes('eip712 typed data') || message.includes('invalid message')) {
+    return [(0, _i18next.t)('An error occurred when attempting to sign this request. Contact support at email: agent@subwallet.app'), (0, _i18next.t)('Unable to sign')];
+  }
+  return [message, name || 'Error'];
+}
+function convertErrorFormat(errors) {
+  if (errors.length > 0) {
+    return [{
+      name: errors[0].name,
+      message: errors[0].message
+    }];
+  }
+  return [];
 }

package/cjs/core/substrate/assets-pallet.js

@@ -3,33 +3,49 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._getAssetsPalletLockedBalance = _getAssetsPalletLockedBalance;
+exports._getAssetsPalletLocked = _getAssetsPalletLocked;
+exports._getAssetsPalletLockedWithStatus = _getAssetsPalletLockedWithStatus;
+exports._getAssetsPalletLockedWithoutStatus = _getAssetsPalletLockedWithoutStatus;
 exports._getAssetsPalletTransferable = _getAssetsPalletTransferable;
+exports._getAssetsPalletTransferableWithStatus = _getAssetsPalletTransferableWithStatus;
+exports._getAssetsPalletTransferableWithoutStatus = _getAssetsPalletTransferableWithoutStatus;
 var _types = require("@subwallet/extension-base/core/substrate/types");
 var _utils = require("@subwallet/extension-base/core/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+function isWithStatus(accountInfo) {
+  return accountInfo.status !== undefined && accountInfo.isFrozen === undefined;
+}
 function _getAssetsPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
-  let bnTransferable = BigInt(0);
-  if (!accountInfo) {
-    return BigInt(0);
-  }
-  if (['Liquid'].includes(accountInfo.status)) {
-    bnTransferable = BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  if (isWithStatus(accountInfo)) {
+    return _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode);
+  } else {
+    return _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode);
   }
-  return bnTransferable;
 }
-function _getAssetsPalletLockedBalance(accountInfo) {
-  let bnLocked = BigInt(0);
-  if (!accountInfo) {
-    return bnLocked;
+function _getAssetsPalletLocked(accountInfo) {
+  if (isWithStatus(accountInfo)) {
+    return _getAssetsPalletLockedWithStatus(accountInfo);
+  } else {
+    return _getAssetsPalletLockedWithoutStatus(accountInfo);
   }
-  if (!['Liquid'].includes(accountInfo.status)) {
-    // todo: check case accountInfo has isFrozen?
-    bnLocked = BigInt(accountInfo.balance);
-  }
-  return bnLocked;
+}
+
+// ----------------------------------------------------------------------
+
+function _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+function _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
+  return !accountInfo.isFrozen ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+function _getAssetsPalletLockedWithStatus(accountInfo) {
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
+}
+function _getAssetsPalletLockedWithoutStatus(accountInfo) {
+  return accountInfo.isFrozen ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/cjs/core/substrate/foreign-asset-pallet.js

@@ -12,15 +12,8 @@ var _utils = require("@subwallet/extension-base/core/utils");
 
 function _getForeignAssetPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  if (!accountInfo || accountInfo.status !== 'Liquid') {
-    return BigInt(0);
-  }
-  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
-  return BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode) : BigInt(0);
 }
 function _getForeignAssetPalletLockedBalance(accountInfo) {
-  if (!accountInfo || accountInfo.status === 'Liquid') {
-    return BigInt(0);
-  }
-  return BigInt(accountInfo.balance);
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/cjs/core/substrate/xcm-parser.js

@@ -209,7 +209,8 @@ function _getAssetIdentifier(tokenInfo, version) {
   if (!_assetIdentifier) {
     throw new Error('Asset must have multilocation');
   }
-  const assetIdentifier = _adaptX1Interior(structuredClone(_assetIdentifier), version);
+  const assetIdentifier = ['statemint-LOCAL-KSM'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
+  ? _assetIdentifier : _adaptX1Interior(structuredClone(_assetIdentifier), version);
   return version >= 4 // from V4, Concrete is removed
   ? assetIdentifier : {
     Concrete: assetIdentifier

package/cjs/koni/api/staking/bonding/utils.js

@@ -144,6 +144,7 @@ function calculateTernoaValidatorReturn(rewardPerValidator, validatorStake, comm
 function calculateValidatorStakedReturn(chainStakedReturn, totalValidatorStake, avgStake, commission) {
   const bnAdjusted = avgStake.mul(_util.BN_HUNDRED).div(totalValidatorStake);
   const adjusted = bnAdjusted.toNumber() * chainStakedReturn;
+  // todo: should calculated in bignumber instead number?
   const stakedReturn = (adjusted > Number.MAX_SAFE_INTEGER ? Number.MAX_SAFE_INTEGER : adjusted) / 100;
   return stakedReturn * (100 - commission) / 100; // Deduct commission
 }

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

@@ -559,50 +559,11 @@ class KoniState {
       }));
     }
   }
-  async switchNetworkAccount(id, url, networkKey, changeAddress) {
-    const chainInfo = this.chainService.getChainInfoByKey(networkKey);
-    const chainState = this.chainService.getChainStateByKey(networkKey);
-    const {
-      address,
-      currentGenesisHash
-    } = this.keyringService.currentAccount;
-    return this.requestService.addConfirmation(id, url, 'switchNetworkRequest', {
-      networkKey,
-      address: changeAddress
-    }, {
-      address: changeAddress
-    }).then(_ref2 => {
-      let {
-        isApproved
-      } = _ref2;
-      if (isApproved) {
-        const useAddress = changeAddress || address;
-        if (chainInfo && !(0, _utils._isChainEnabled)(chainState)) {
-          this.enableChain(networkKey).catch(console.error);
-        }
-        if (useAddress !== _constants.ALL_ACCOUNT_KEY) {
-          const pair = _uiKeyring.keyring.getPair(useAddress);
-          (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
-          _uiKeyring.keyring.saveAccountMeta(pair, {
-            ...pair.meta,
-            genesisHash: (0, _utils._getSubstrateGenesisHash)(chainInfo)
-          });
-        }
-        if (address !== changeAddress || (0, _utils._getSubstrateGenesisHash)(chainInfo) !== currentGenesisHash || isApproved) {
-          this.setCurrentAccount({
-            address: useAddress,
-            currentGenesisHash: (0, _utils._getSubstrateGenesisHash)(chainInfo)
-          });
-        }
-      }
-      return isApproved;
-    });
-  }
   async addNetworkConfirm(id, url, networkData) {
-    return this.requestService.addConfirmation(id, url, 'addNetworkRequest', networkData).then(async _ref3 => {
+    return this.requestService.addConfirmation(id, url, 'addNetworkRequest', networkData).then(async _ref2 => {
       let {
         isApproved
-      } = _ref3;
+      } = _ref2;
       if (isApproved) {
         if (networkData.mode === 'insert') {
           await this.upsertChainInfo(networkData);
@@ -616,10 +577,10 @@ class KoniState {
     });
   }
   async addTokenConfirm(id, url, tokenInfo) {
-    return this.requestService.addConfirmation(id, url, 'addTokenRequest', tokenInfo).then(async _ref4 => {
+    return this.requestService.addConfirmation(id, url, 'addTokenRequest', tokenInfo).then(async _ref3 => {
       let {
         isApproved
-      } = _ref4;
+      } = _ref3;
       if (isApproved) {
         await this.upsertCustomToken({
           originChain: tokenInfo.originChain,
@@ -991,8 +952,8 @@ class KoniState {
     if (!genesisHash) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref5 => {
-      let [networkKey, chainInfo] = _ref5;
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref4 => {
+      let [networkKey, chainInfo] = _ref4;
       return (0, _utils._getSubstrateGenesisHash)(chainInfo) === genesisHash;
     });
     if (rs) {
@@ -1009,9 +970,9 @@ class KoniState {
     if (!chainId) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref6 => {
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref5 => {
       var _chainInfo$evmInfo;
-      let [networkKey, chainInfo] = _ref6;
+      let [networkKey, chainInfo] = _ref5;
       return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
     });
     if (rs) {
@@ -1027,11 +988,11 @@ class KoniState {
     }
     return Object.values(_constants2._PREDEFINED_SINGLE_MODES).find(item => item.networkKeys.includes(networkKey));
   }
-  accountExportPrivateKey(_ref7) {
+  accountExportPrivateKey(_ref6) {
     let {
       address,
       password
-    } = _ref7;
+    } = _ref6;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const exportedJson = _uiKeyring.keyring.backupAccount(_uiKeyring.keyring.getPair(address), password);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -1041,11 +1002,11 @@ class KoniState {
       publicKey: (0, _util.u8aToHex)(decoded.publicKey)
     };
   }
-  checkPublicAndSecretKey(_ref8) {
+  checkPublicAndSecretKey(_ref7) {
     let {
       publicKey,
       secretKey
-    } = _ref8;
+    } = _ref7;
     try {
       const _secret = (0, _util.hexStripPrefix)(secretKey);
       if (_secret.length === 64) {
@@ -1119,16 +1080,17 @@ class KoniState {
     };
     const validationSteps = [topic ? _logicValidation.validationAuthWCMiddleware : _logicValidation.validationAuthMiddleware, _logicValidation.validationEvmSignMessageMiddleware];
     const result = await (0, _logicValidation.generateValidationProcess)(this, url, payloadValidation, validationSteps, topic);
+    const errorsFormated = (0, _logicValidation.convertErrorFormat)(result.errors);
     const payloadAfterValidated = {
       ...result.payloadAfterValidated,
-      errors: result.errors,
+      errors: errorsFormated,
       id
     };
-    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(_ref9 => {
+    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(_ref8 => {
       let {
         isApproved,
         payload
-      } = _ref9;
+      } = _ref8;
       if (isApproved) {
         if (payload) {
           return payload;
@@ -1184,9 +1146,13 @@ class KoniState {
       errors,
       networkKey: networkKey_
     } = result;
-    if (errors && errors.length > 0 && confirmationType) {
+    const errorsFormated = (0, _logicValidation.convertErrorFormat)(errors);
+    if (errorsFormated && errorsFormated.length > 0 && confirmationType) {
       if (ERROR_CONFIRMATION_TYPE.includes(confirmationType)) {
-        return this.requestService.addConfirmation(id, url, confirmationType, result, {}).then(() => {
+        return this.requestService.addConfirmation(id, url, confirmationType, {
+          ...result,
+          errors: errorsFormated
+        }, {}).then(() => {
           throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
         });
       }
@@ -1195,7 +1161,7 @@ class KoniState {
     const networkKey = networkKey_ || '';
     const requestPayload = {
       ...transactionValidated,
-      errors: errors
+      errors: errorsFormated
     };
     const eType = transactionValidated.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE;
     const transactionData = {
@@ -1255,14 +1221,17 @@ class KoniState {
   async onMV3Update() {
     const migrationStatus = await _storage.SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
-      // Open migration tab
-      const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
-      await (0, _PopupHandler.openPopup)(url);
+      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
+        // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
+      } else {
+        this.migrateMV3LocalStorage(JSON.stringify(self.localStorage)).catch(console.error);
+      }
     }
   }
-
   async migrateMV3LocalStorage(data) {
     try {
       const parsedData = JSON.parse(data);
@@ -1312,11 +1281,11 @@ class KoniState {
       const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
     }
   }
-  async setStorageFromWS(_ref10) {
+  async setStorageFromWS(_ref9) {
     let {
       key,
       value
-    } = _ref10;
+    } = _ref9;
     try {
       const jsonData = JSON.stringify(value);
       await _storage.SWStorage.instance.setItem(key, jsonData);
@@ -1717,12 +1686,12 @@ class KoniState {
 
   /* Metadata */
 
-  getCrowdloanContributions(_ref11) {
+  getCrowdloanContributions(_ref10) {
     let {
       address,
       page,
       relayChain
-    } = _ref11;
+    } = _ref10;
     return this.subscanService.getCrowdloanContributions(relayChain, address, page);
   }
 }