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

package/core/logic-validation/request.d.ts

@@ -1,7 +1,8 @@
-import { ConfirmationType } from '@subwallet/extension-base/background/KoniTypes';
+import { ConfirmationType, ErrorValidation } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { AuthUrlInfo } from '@subwallet/extension-base/services/request-service/types';
 import { KeyringPair } from '@subwallet/keyring/types';
+import Joi from 'joi';
 export declare type ValidateStepFunction = (koni: KoniState, url: string, payload: PayloadValidated, topic?: string) => Promise<PayloadValidated>;
 export interface PayloadValidated {
     networkKey: string;
@@ -14,6 +15,25 @@ export interface PayloadValidated {
     confirmationType?: ConfirmationType;
     errors: Error[];
 }
+export declare type SignTypedDataMessageV3V4 = {
+    types: Record<string, unknown>;
+    domain: Record<string, unknown>;
+    primaryType: string;
+    message: unknown;
+};
+export declare type DataMessageParam = Record<string, unknown>[] | string | SignTypedDataMessageV3V4;
+export interface TypedMessageParams {
+    from: string;
+    data: DataMessageParam;
+}
+export interface PersonalMessageParams {
+    data: string;
+    from: string;
+}
+export declare const joiValidate: Joi.ObjectSchema<any>;
+export declare function validateSignMessageData(messageData: PersonalMessageParams): string;
+export declare function validateTypedSignMessageDataV1(messageData: TypedMessageParams): Record<string, unknown>[];
+export declare function validateTypedSignMessageDataV3V4(messageData: TypedMessageParams): SignTypedDataMessageV3V4;
 export declare function generateValidationProcess(koni: KoniState, url: string, payloadValidate: PayloadValidated, validationMiddlewareSteps: ValidateStepFunction[], topic?: string): Promise<PayloadValidated>;
 export declare function validationAuthMiddleware(koni: KoniState, url: string, payload: PayloadValidated): Promise<PayloadValidated>;
 export declare function validationConnectMiddleware(koni: KoniState, url: string, payload: PayloadValidated): Promise<PayloadValidated>;
@@ -21,3 +41,4 @@ export declare function validationEvmDataTransactionMiddleware(koni: KoniState,
 export declare function validationEvmSignMessageMiddleware(koni: KoniState, url: string, payload_: PayloadValidated): Promise<PayloadValidated>;
 export declare function validationAuthWCMiddleware(koni: KoniState, url: string, payload: PayloadValidated, topic?: string): Promise<PayloadValidated>;
 export declare function convertErrorMessage(message_: string, name?: string): string[];
+export declare function convertErrorFormat(errors: Error[]): ErrorValidation[];

package/core/logic-validation/request.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { typedSignatureHash } from '@metamask/eth-sig-util';
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BasicTxErrorType, EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
@@ -12,8 +13,105 @@ import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import BN from 'bn.js';
 import { t } from 'i18next';
+import Joi from 'joi';
 import { isString } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
+export const joiValidate = Joi.object({
+  types: Joi.object().pattern(Joi.string(),
+  // Key của object types
+  Joi.array().items(Joi.object({
+    name: Joi.string().required(),
+    type: Joi.string().required()
+  }))).required(),
+  primaryType: Joi.string().required(),
+  domain: Joi.object().required(),
+  message: Joi.object().required()
+});
+function validateAddress(address, propertyName) {
+  if (!address || typeof address !== 'string' || !isEthereumAddress(address)) {
+    throw new Error(`Invalid "${propertyName}" address: ${address} must be a valid string.`);
+  }
+}
+export 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;
+}
+export 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
+    typedSignatureHash(messageData.data);
+    return messageData.data;
+  } catch (e) {
+    throw new Error('Invalid message "data": Expected EIP712 typed data.');
+  }
+}
+export 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;
+}
 export async function generateValidationProcess(koni, url, payloadValidate, validationMiddlewareSteps, topic) {
   let resultValidated = payloadValidate;
   for (const step of validationMiddlewareSteps) {
@@ -315,7 +413,7 @@ export async function validationEvmSignMessageMiddleware(koni, url, payload_) {
     const [message, name] = convertErrorMessage(message_);
     const error = new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, message, undefined, name);
     console.error(error);
-    errors.push(new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, message, undefined, name));
+    errors.push(error);
   };
   if (address === '' || !payload) {
     handleError('Not found address or payload to sign');
@@ -329,26 +427,47 @@ export 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');
@@ -429,7 +548,7 @@ export function convertErrorMessage(message_, name) {
     return [t('Re-enable the network or change RPC on the extension and try again'), t('Unstable network connection')];
   }
   if (message.includes('network is currently not supported')) {
-    return [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'), t('Network not supported')];
+    return [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'), t('Network not supported')];
   }
 
   // Authentication
@@ -466,10 +585,22 @@ export function convertErrorMessage(message_, name) {
 
   // Sign Message
   if (message.includes('not found address or payload to sign')) {
-    return [t('An error occurred when signing this request. Try again or contact support at agent@subwallet.app'), t('Unable to sign message')];
+    return [t('An error occurred when signing this request. Try again or contact support at agent@subwallet.app'), t('Unable to sign')];
   }
   if (message.includes('unsupported method') || message.includes('unsupported action')) {
     return [t('This sign method is not supported by SubWallet. Try again or contact support at agent@subwallet.app'), t('Method not supported')];
   }
-  return [message, name || ''];
+  if (message.includes('eip712 typed data') || message.includes('invalid message')) {
+    return [t('An error occurred when attempting to sign this request. Contact support at email: agent@subwallet.app'), t('Unable to sign')];
+  }
+  return [message, name || 'Error'];
+}
+export function convertErrorFormat(errors) {
+  if (errors.length > 0) {
+    return [{
+      name: errors[0].name,
+      message: errors[0].message
+    }];
+  }
+  return [];
 }

package/core/substrate/assets-pallet.d.ts

@@ -1,4 +1,8 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { PalletAssetsAssetAccount } from '@subwallet/extension-base/core/substrate/types';
-export declare function _getAssetsPalletTransferable(accountInfo: PalletAssetsAssetAccount | undefined, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
-export declare function _getAssetsPalletLockedBalance(accountInfo: PalletAssetsAssetAccount | undefined): bigint;
+import { PalletAssetsAssetAccount, PalletAssetsAssetAccountWithoutStatus, PalletAssetsAssetAccountWithStatus } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getAssetsPalletTransferable(accountInfo: PalletAssetsAssetAccount, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getAssetsPalletLocked(accountInfo: PalletAssetsAssetAccount): bigint;
+export declare function _getAssetsPalletTransferableWithStatus(accountInfo: PalletAssetsAssetAccountWithStatus, existentialDeposit: string, strictMode?: boolean): bigint;
+export declare function _getAssetsPalletTransferableWithoutStatus(accountInfo: PalletAssetsAssetAccountWithoutStatus, existentialDeposit: string, strictMode?: boolean): bigint;
+export declare function _getAssetsPalletLockedWithStatus(accountInfo: PalletAssetsAssetAccountWithStatus): bigint;
+export declare function _getAssetsPalletLockedWithoutStatus(accountInfo: PalletAssetsAssetAccountWithoutStatus): bigint;

package/core/substrate/assets-pallet.js

@@ -3,26 +3,38 @@
 
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
 import { _getAppliedExistentialDeposit, getStrictMode } from '@subwallet/extension-base/core/utils';
+function isWithStatus(accountInfo) {
+  return accountInfo.status !== undefined && accountInfo.isFrozen === undefined;
+}
 export function _getAssetsPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = getStrictMode(BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  const bnAppliedExistentialDeposit = _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;
 }
-export function _getAssetsPalletLockedBalance(accountInfo) {
-  let bnLocked = BigInt(0);
-  if (!accountInfo) {
-    return bnLocked;
+export 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;
+}
+
+// ----------------------------------------------------------------------
+
+export function _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+export function _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  return !accountInfo.isFrozen ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+export function _getAssetsPalletLockedWithStatus(accountInfo) {
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
+}
+export function _getAssetsPalletLockedWithoutStatus(accountInfo) {
+  return accountInfo.isFrozen ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/core/substrate/foreign-asset-pallet.d.ts

@@ -1,4 +1,4 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { PalletAssetsAssetAccount } from '@subwallet/extension-base/core/substrate/types';
-export declare function _getForeignAssetPalletTransferable(accountInfo: PalletAssetsAssetAccount | undefined, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
-export declare function _getForeignAssetPalletLockedBalance(accountInfo: PalletAssetsAssetAccount | undefined): bigint;
+import { PalletAssetsAssetAccountWithStatus } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getForeignAssetPalletTransferable(accountInfo: PalletAssetsAssetAccountWithStatus, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getForeignAssetPalletLockedBalance(accountInfo: PalletAssetsAssetAccountWithStatus): bigint;

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

@@ -5,15 +5,8 @@ import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/typ
 import { _getAppliedExistentialDeposit, getStrictMode } from '@subwallet/extension-base/core/utils';
 export function _getForeignAssetPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = getStrictMode(BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  if (!accountInfo || accountInfo.status !== 'Liquid') {
-    return BigInt(0);
-  }
-  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
-  return BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - _getAppliedExistentialDeposit(existentialDeposit, strictMode) : BigInt(0);
 }
 export 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/core/substrate/types.d.ts

@@ -24,12 +24,16 @@ export declare type OrmlTokensAccountData = {
     reserved: number;
     frozen: number;
 };
-export declare type PalletAssetsAssetAccount = {
+export declare type PalletAssetsAssetAccountWithStatus = {
     balance: number | string;
     status: 'Frozen' | 'Liquid' | 'Blocked';
     reason: Record<string, unknown>;
     extra: unknown;
 };
+export declare type PalletAssetsAssetAccountWithoutStatus = Omit<PalletAssetsAssetAccountWithStatus, 'status'> & {
+    isFrozen: boolean;
+};
+export declare type PalletAssetsAssetAccount = PalletAssetsAssetAccountWithStatus | PalletAssetsAssetAccountWithoutStatus;
 export declare type PalletNominationPoolsPoolMember = {
     poolId: number;
     points: number;

package/core/substrate/xcm-parser.js

@@ -195,7 +195,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/koni/api/staking/bonding/utils.js

@@ -103,6 +103,7 @@ export function calculateTernoaValidatorReturn(rewardPerValidator, validatorStak
 export function calculateValidatorStakedReturn(chainStakedReturn, totalValidatorStake, avgStake, commission) {
   const bnAdjusted = avgStake.mul(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/koni/background/handlers/State.d.ts

@@ -145,7 +145,6 @@ export default class KoniState {
     setCurrentAccount(data: CurrentAccountInfo, callback?: () => void, preventOneAccount?: boolean): void;
     setAccountTie(address: string, genesisHash: string | null): boolean;
     switchEvmNetworkByUrl(shortenUrl: string, networkKey: string): Promise<void>;
-    switchNetworkAccount(id: string, url: string, networkKey: string, changeAddress?: string): Promise<boolean>;
     addNetworkConfirm(id: string, url: string, networkData: _NetworkUpsertParams): Promise<null>;
     addTokenConfirm(id: string, url: string, tokenInfo: AddTokenRequestExternal): Promise<true>;
     get metaSubject(): BehaviorSubject<import("@subwallet/extension-base/background/types").MetadataRequest[]>;

package/koni/background/handlers/State.js

@@ -6,7 +6,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
-import { generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
+import { convertErrorFormat, generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
@@ -35,7 +35,7 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { isAccountAll, isManifestV3, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
@@ -548,44 +548,6 @@ export default 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(({
-      isApproved
-    }) => {
-      if (isApproved) {
-        const useAddress = changeAddress || address;
-        if (chainInfo && !_isChainEnabled(chainState)) {
-          this.enableChain(networkKey).catch(console.error);
-        }
-        if (useAddress !== ALL_ACCOUNT_KEY) {
-          const pair = keyring.getPair(useAddress);
-          assert(pair, t('Unable to find account'));
-          keyring.saveAccountMeta(pair, {
-            ...pair.meta,
-            genesisHash: _getSubstrateGenesisHash(chainInfo)
-          });
-        }
-        if (address !== changeAddress || _getSubstrateGenesisHash(chainInfo) !== currentGenesisHash || isApproved) {
-          this.setCurrentAccount({
-            address: useAddress,
-            currentGenesisHash: _getSubstrateGenesisHash(chainInfo)
-          });
-        }
-      }
-      return isApproved;
-    });
-  }
   async addNetworkConfirm(id, url, networkData) {
     return this.requestService.addConfirmation(id, url, 'addNetworkRequest', networkData).then(async ({
       isApproved
@@ -1098,9 +1060,10 @@ export default class KoniState {
     };
     const validationSteps = [topic ? validationAuthWCMiddleware : validationAuthMiddleware, validationEvmSignMessageMiddleware];
     const result = await generateValidationProcess(this, url, payloadValidation, validationSteps, topic);
+    const errorsFormated = convertErrorFormat(result.errors);
     const payloadAfterValidated = {
       ...result.payloadAfterValidated,
-      errors: result.errors,
+      errors: errorsFormated,
       id
     };
     return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(({
@@ -1161,9 +1124,13 @@ export default class KoniState {
       errors,
       networkKey: networkKey_
     } = result;
-    if (errors && errors.length > 0 && confirmationType) {
+    const errorsFormated = 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(EvmProviderErrorType.USER_REJECTED_REQUEST);
         });
       }
@@ -1172,7 +1139,7 @@ export default class KoniState {
     const networkKey = networkKey_ || '';
     const requestPayload = {
       ...transactionValidated,
-      errors: errors
+      errors: errorsFormated
     };
     const eType = transactionValidated.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE;
     const transactionData = {
@@ -1232,14 +1199,17 @@ export default class KoniState {
   async onMV3Update() {
     const migrationStatus = await SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
-      // Open migration tab
-      const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
-      await openPopup(url);
+      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
+        // 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);

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

@@ -34,6 +34,7 @@ export default class KoniTabs {
     private getEvmCurrentAccount;
     private getEvmState;
     private getEvmPermission;
+    private revokePermissions;
     private switchEvmChain;
     private addEvmToken;
     private addEvmChain;