@subwallet/extension-base 1.2.27-0 → 1.2.29-0

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -13,8 +13,8 @@ class MigrateAssetSetting extends _Base.default {
   async run() {
     try {
       const changeSlugsMap = {
-        'bobMainnet-LOCAL-wBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3': 'bobMainnet-LOCAL-WBTC-0x03C7054BCB39f7b2e5B2c7AcB37583e32D70Cfa3',
-        'hydradx_main-LOCAL-LRNA': 'hydradx_main-LOCAL-H2O'
+        'polygon-NATIVE-MATIC': 'polygon-NATIVE-POL',
+        '5irechain_mainnet-NATIVE-5IRE': '5irechain_mainnet-NATIVE-5ire'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/cjs/services/migration-service/scripts/index.js

@@ -61,8 +61,8 @@ var _default = {
   '1.1.33-01': _MigrateLedgerAccountV.default,
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.46-01': _AutoEnableSomeTokens.default,
-  '1.1.69-03': _MigrateAssetSetting.default,
-  '1.1.69-02': _MigrateTransactionHistoryBySymbol.default,
+  '1.2.28-01': _MigrateAssetSetting.default,
+  '1.2.28-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
   '1.2.13-01': _ReloadMetadata.default,
   '1.2.14-01': _ClearMetadataDatabase.default

package/cjs/services/mkt-campaign-service/index.js

@@ -247,35 +247,59 @@ class MktCampaignService {
         const isValidArr = conditionBalance.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionEarning && conditionEarning.length) {
         const isValidArr = conditionEarning.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionNft && conditionNft.length) {
         const isValidArr = conditionNft.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionCrowdloan && conditionCrowdloan.length) {
         const isValidArr = conditionCrowdloan.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
       if (conditionHasMoney && conditionHasMoney.length) {
         const isValidArr = conditionHasMoney.map(condition => {
           return conditionMap[JSON.stringify(condition)];
         });
-        isPassValidation.push(isValidArr.some(i => i));
+        if (item.comparison_operator === 'AND') {
+          isPassValidation.push(isValidArr.every(i => i));
+        } else {
+          isPassValidation.push(isValidArr.some(i => i));
+        }
       }
     }
     if (isPassValidation && isPassValidation.length) {
-      return isPassValidation.some(_i => _i);
+      if (item.comparison_operator === 'AND') {
+        return isPassValidation.every(_i => _i);
+      } else {
+        return isPassValidation.some(_i => _i);
+      }
     } else {
       return true;
     }

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

@@ -26,7 +26,6 @@ class EvmRequestHandler {
   confirmationsQueueSubject = new _rxjs.BehaviorSubject({
     addNetworkRequest: {},
     addTokenRequest: {},
-    switchNetworkRequest: {},
     evmSignatureRequest: {},
     evmSendTransactionRequest: {},
     evmWatchTransactionRequest: {},

package/cjs/services/swap-service/handler/hydradx-handler.js

@@ -256,7 +256,7 @@ class HydradxHandler {
 
         switch (defaultError) {
           case _sdk.PoolError.InsufficientTradingAmount:
-            return new _SwapError.SwapError(_swap2.SwapErrorType.SWAP_NOT_ENOUGH_BALANCE);
+            return new _SwapError.SwapError(_swap2.SwapErrorType.NOT_MEET_MIN_SWAP);
           case _sdk.PoolError.TradeNotAllowed:
             return new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
           case _sdk.PoolError.MaxInRatioExceeded:

package/cjs/services/wallet-connect-service/index.js

@@ -57,6 +57,7 @@ var _option = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("option");
 var _updateSessions = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("updateSessions");
 var _onSessionProposal = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionProposal");
 var _onSessionRequest = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onSessionRequest");
+var _onPingReply = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("onPingReply");
 var _createListener = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("createListener");
 var _removeListener = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("removeListener");
 var _checkClient = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("checkClient");
@@ -72,6 +73,9 @@ class WalletConnectService {
     Object.defineProperty(this, _createListener, {
       value: _createListener2
     });
+    Object.defineProperty(this, _onPingReply, {
+      value: _onPingReply2
+    });
     Object.defineProperty(this, _onSessionRequest, {
       value: _onSessionRequest2
     });
@@ -318,11 +322,31 @@ function _onSessionRequest2(requestEvent) {
     }).catch(console.error);
   }
 }
+async function _onPingReply2(_ref4) {
+  let {
+    topic
+  } = _ref4;
+  // Doc: https://specs.walletconnect.com/2.0/specs/clients/sign/session-events#session_ping
+
+  (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
+  try {
+    var _requestSession$names, _requestSession$names2;
+    const requestSession = this.getSession(topic);
+    const sessionAccounts = (((_requestSession$names = requestSession.namespaces.eip155) === null || _requestSession$names === void 0 ? void 0 : _requestSession$names.accounts) || []).concat(((_requestSession$names2 = requestSession.namespaces.polkadot) === null || _requestSession$names2 === void 0 ? void 0 : _requestSession$names2.accounts) || []);
+    if (sessionAccounts.length > 0 && (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) {
+      await (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client].ping({
+        topic
+      });
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}
 function _createListener2() {
   var _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19;
   (_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
   (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', data => console.log('ping', data));
+  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_ping', (0, _classPrivateFieldLooseBase2.default)(this, _onPingReply)[_onPingReply].bind(this));
   (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_event', data => console.log('event', data));
   (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_update', data => console.log('update', data));
   (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));

package/constants/index.d.ts

@@ -29,5 +29,6 @@ export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";
 export declare const ORDINAL_METHODS: string[];
+export declare const PERMISSIONS_TO_REVOKE: string[];
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -32,5 +32,6 @@ export const GAS_PRICE_RATIO = 1 + 2 / 100;
 export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';
 export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
+export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
 export * from "./staking.js";
 export * from "./storage.js";

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/xcm-parser.d.ts

@@ -47,8 +47,9 @@ export declare function _getXcmMultiLocation(originChainInfo: _ChainInfo, destCh
         interior: unknown;
     };
 };
-export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
-export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): string;
+export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
+export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): string;
 export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isSnowBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
+export declare function _isMythosFromHydrationToMythos(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
 export declare function _adaptX1Interior(assetIdentifier: Record<string, any>, version: number): Record<string, any>;

package/core/substrate/xcm-parser.js

@@ -46,8 +46,8 @@ export function _getXcmMultiLocation(originChainInfo, destChainInfo, version, re
     }
   };
 }
-export function _isXcmTransferUnstable(originChainInfo, destChainInfo) {
-  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo);
+export function _isXcmTransferUnstable(originChainInfo, destChainInfo, assetSlug) {
+  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) || _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug);
 }
 function getAssetHubBridgeUnstableWarning(originChainInfo) {
   switch (originChainInfo.slug) {
@@ -62,16 +62,21 @@ function getAssetHubBridgeUnstableWarning(originChainInfo) {
 function getSnowBridgeUnstableWarning(originChainInfo) {
   switch (originChainInfo.slug) {
     case COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 70$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $70 and takes up to 1 hour to complete. Continue at your own risk';
     case COMMON_CHAIN_SLUGS.ETHEREUM:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 5$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $5 and takes up to 1 hour to complete. Continue at your own risk';
     default:
       return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a high fee and takes up to 1 hour to complete. Continue at your own risk';
   }
 }
-export function _getXcmUnstableWarning(originChainInfo, destChainInfo) {
+function getMythosFromHydrationToMythosWarning() {
+  return 'Cross-chain transfer of this token requires a high transaction fee. Do you want to continue?';
+}
+export function _getXcmUnstableWarning(originChainInfo, destChainInfo, assetSlug) {
   if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
     return getSnowBridgeUnstableWarning(originChainInfo);
+  } else if (_isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug)) {
+    return getMythosFromHydrationToMythosWarning();
   } else {
     return getAssetHubBridgeUnstableWarning(originChainInfo);
   }
@@ -82,6 +87,9 @@ export function _isXcmWithinSameConsensus(originChainInfo, destChainInfo) {
 export function _isSnowBridgeXcm(originChainInfo, destChainInfo) {
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && (_isPureEvmChain(originChainInfo) || _isPureEvmChain(destChainInfo));
 }
+export function _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug) {
+  return originChainInfo.slug === 'hydradx_main' && destChainInfo.slug === 'mythos' && assetSlug === 'hydradx_main-LOCAL-MYTH';
+}
 
 // ---------------------------------------------------------------------------------------------------------------------
 
@@ -195,7 +203,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', 'statemine-LOCAL-DOT'].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/Extension.js

@@ -1711,11 +1711,11 @@ export default class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    const isFromSnowBridgeXcm = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
+    const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
-      if (isFromSnowBridgeXcm) {
+      if (isSnowBridgeEvmTransfer) {
         const evmApi = this.#koniState.getEvmApi(originNetworkKey);
         extrinsic = await createSnowBridgeExtrinsic({
           destinationTokenInfo,
@@ -1785,7 +1785,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
-      chainType: !isFromSnowBridgeXcm ? ChainType.SUBSTRATE : ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings: inputData.transferAll,
       isTransferAll: inputData.transferAll,

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[]>;